Skip to content

Commit

Permalink
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/gi…
Browse files Browse the repository at this point in the history 
…t/mst/vhost

Pull virtio updates from Michael Tsirkin:
 "A small number of improvements all over the place"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_vdpa: remove redundant check on desc
  virtio_fs: store actual queue index in mq_map
  virtio_fs: add informative log for new tag discovery
  virtio: Make vring_new_virtqueue support packed vring
  virtio_pmem: Add freeze/restore callbacks
  vdpa/mlx5: Fix suboptimal range on iotlb iteration
  • Loading branch information
Linus Torvalds committed Nov 27, 2024
2 parents 4aca98a + 6a39bb1 commit 2a50b1e
Show file tree
Hide file tree
Showing 5 changed files with 152 additions and 117 deletions.
24 changes: 24 additions & 0 deletions drivers/nvdimm/virtio_pmem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,28 @@ static void virtio_pmem_remove(struct virtio_device *vdev)
virtio_reset_device(vdev);
}

static int virtio_pmem_freeze(struct virtio_device *vdev)
{
vdev->config->del_vqs(vdev);
virtio_reset_device(vdev);

return 0;
}

static int virtio_pmem_restore(struct virtio_device *vdev)
{
int ret;

ret = init_vq(vdev->priv);
if (ret) {
dev_err(&vdev->dev, "failed to initialize virtio pmem's vq\n");
return ret;
}
virtio_device_ready(vdev);

return 0;
}

static unsigned int features[] = {
VIRTIO_PMEM_F_SHMEM_REGION,
};
Expand All @@ -155,6 +177,8 @@ static struct virtio_driver virtio_pmem_driver = {
.validate = virtio_pmem_validate,
.probe = virtio_pmem_probe,
.remove = virtio_pmem_remove,
.freeze = virtio_pmem_freeze,
.restore = virtio_pmem_restore,
};

module_virtio_driver(virtio_pmem_driver);
Expand Down
4 changes: 1 addition & 3 deletions drivers/vdpa/mlx5/core/mr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
unsigned long lgcd = 0;
int log_entity_size;
unsigned long size;
u64 start = 0;
int err;
struct page *pg;
unsigned int nsg;
Expand All @@ -379,10 +378,9 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
struct device *dma = mvdev->vdev.dma_dev;

for (map = vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1);
map; map = vhost_iotlb_itree_next(map, start, mr->end - 1)) {
map; map = vhost_iotlb_itree_next(map, mr->start, mr->end - 1)) {
size = maplen(map, mr);
lgcd = gcd(lgcd, size);
start += size;
}
log_entity_size = ilog2(lgcd);

Expand Down
225 changes: 119 additions & 106 deletions drivers/virtio/virtio_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,6 @@ struct vring_virtqueue {
#endif
};

static struct virtqueue *__vring_new_virtqueue(unsigned int index,
struct vring_virtqueue_split *vring_split,
struct virtio_device *vdev,
bool weak_barriers,
bool context,
bool (*notify)(struct virtqueue *),
void (*callback)(struct virtqueue *),
const char *name,
struct device *dma_dev);
static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num);
static void vring_free(struct virtqueue *_vq);

Expand Down Expand Up @@ -1135,6 +1126,64 @@ static int vring_alloc_queue_split(struct vring_virtqueue_split *vring_split,
return 0;
}

static struct virtqueue *__vring_new_virtqueue_split(unsigned int index,
struct vring_virtqueue_split *vring_split,
struct virtio_device *vdev,
bool weak_barriers,
bool context,
bool (*notify)(struct virtqueue *),
void (*callback)(struct virtqueue *),
const char *name,
struct device *dma_dev)
{
struct vring_virtqueue *vq;
int err;

vq = kmalloc(sizeof(*vq), GFP_KERNEL);
if (!vq)
return NULL;

vq->packed_ring = false;
vq->vq.callback = callback;
vq->vq.vdev = vdev;
vq->vq.name = name;
vq->vq.index = index;
vq->vq.reset = false;
vq->we_own_ring = false;
vq->notify = notify;
vq->weak_barriers = weak_barriers;
#ifdef CONFIG_VIRTIO_HARDEN_NOTIFICATION
vq->broken = true;
#else
vq->broken = false;
#endif
vq->dma_dev = dma_dev;
vq->use_dma_api = vring_use_dma_api(vdev);

vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
!context;
vq->event = virtio_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX);

if (virtio_has_feature(vdev, VIRTIO_F_ORDER_PLATFORM))
vq->weak_barriers = false;

err = vring_alloc_state_extra_split(vring_split);
if (err) {
kfree(vq);
return NULL;
}

virtqueue_vring_init_split(vring_split, vq);

virtqueue_init(vq, vring_split->vring.num);
virtqueue_vring_attach_split(vq, vring_split);

spin_lock(&vdev->vqs_list_lock);
list_add_tail(&vq->vq.list, &vdev->vqs);
spin_unlock(&vdev->vqs_list_lock);
return &vq->vq;
}

static struct virtqueue *vring_create_virtqueue_split(
unsigned int index,
unsigned int num,
Expand All @@ -1157,7 +1206,7 @@ static struct virtqueue *vring_create_virtqueue_split(
if (err)
return NULL;

vq = __vring_new_virtqueue(index, &vring_split, vdev, weak_barriers,
vq = __vring_new_virtqueue_split(index, &vring_split, vdev, weak_barriers,
context, notify, callback, name, dma_dev);
if (!vq) {
vring_free_split(&vring_split, vdev, dma_dev);
Expand Down Expand Up @@ -2055,36 +2104,29 @@ static void virtqueue_reinit_packed(struct vring_virtqueue *vq)
virtqueue_vring_init_packed(&vq->packed, !!vq->vq.callback);
}

static struct virtqueue *vring_create_virtqueue_packed(
unsigned int index,
unsigned int num,
unsigned int vring_align,
struct virtio_device *vdev,
bool weak_barriers,
bool may_reduce_num,
bool context,
bool (*notify)(struct virtqueue *),
void (*callback)(struct virtqueue *),
const char *name,
struct device *dma_dev)
static struct virtqueue *__vring_new_virtqueue_packed(unsigned int index,
struct vring_virtqueue_packed *vring_packed,
struct virtio_device *vdev,
bool weak_barriers,
bool context,
bool (*notify)(struct virtqueue *),
void (*callback)(struct virtqueue *),
const char *name,
struct device *dma_dev)
{
struct vring_virtqueue_packed vring_packed = {};
struct vring_virtqueue *vq;
int err;

if (vring_alloc_queue_packed(&vring_packed, vdev, num, dma_dev))
goto err_ring;

vq = kmalloc(sizeof(*vq), GFP_KERNEL);
if (!vq)
goto err_vq;
return NULL;

vq->vq.callback = callback;
vq->vq.vdev = vdev;
vq->vq.name = name;
vq->vq.index = index;
vq->vq.reset = false;
vq->we_own_ring = true;
vq->we_own_ring = false;
vq->notify = notify;
vq->weak_barriers = weak_barriers;
#ifdef CONFIG_VIRTIO_HARDEN_NOTIFICATION
Expand All @@ -2103,26 +2145,52 @@ static struct virtqueue *vring_create_virtqueue_packed(
if (virtio_has_feature(vdev, VIRTIO_F_ORDER_PLATFORM))
vq->weak_barriers = false;

err = vring_alloc_state_extra_packed(&vring_packed);
if (err)
goto err_state_extra;
err = vring_alloc_state_extra_packed(vring_packed);
if (err) {
kfree(vq);
return NULL;
}

virtqueue_vring_init_packed(&vring_packed, !!callback);
virtqueue_vring_init_packed(vring_packed, !!callback);

virtqueue_init(vq, num);
virtqueue_vring_attach_packed(vq, &vring_packed);
virtqueue_init(vq, vring_packed->vring.num);
virtqueue_vring_attach_packed(vq, vring_packed);

spin_lock(&vdev->vqs_list_lock);
list_add_tail(&vq->vq.list, &vdev->vqs);
spin_unlock(&vdev->vqs_list_lock);
return &vq->vq;
}

err_state_extra:
kfree(vq);
err_vq:
vring_free_packed(&vring_packed, vdev, dma_dev);
err_ring:
return NULL;
static struct virtqueue *vring_create_virtqueue_packed(
unsigned int index,
unsigned int num,
unsigned int vring_align,
struct virtio_device *vdev,
bool weak_barriers,
bool may_reduce_num,
bool context,
bool (*notify)(struct virtqueue *),
void (*callback)(struct virtqueue *),
const char *name,
struct device *dma_dev)
{
struct vring_virtqueue_packed vring_packed = {};
struct virtqueue *vq;

if (vring_alloc_queue_packed(&vring_packed, vdev, num, dma_dev))
return NULL;

vq = __vring_new_virtqueue_packed(index, &vring_packed, vdev, weak_barriers,
context, notify, callback, name, dma_dev);
if (!vq) {
vring_free_packed(&vring_packed, vdev, dma_dev);
return NULL;
}

to_vvq(vq)->we_own_ring = true;

return vq;
}

static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
Expand Down Expand Up @@ -2650,68 +2718,6 @@ irqreturn_t vring_interrupt(int irq, void *_vq)
}
EXPORT_SYMBOL_GPL(vring_interrupt);

/* Only available for split ring */
static struct virtqueue *__vring_new_virtqueue(unsigned int index,
struct vring_virtqueue_split *vring_split,
struct virtio_device *vdev,
bool weak_barriers,
bool context,
bool (*notify)(struct virtqueue *),
void (*callback)(struct virtqueue *),
const char *name,
struct device *dma_dev)
{
struct vring_virtqueue *vq;
int err;

if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED))
return NULL;

vq = kmalloc(sizeof(*vq), GFP_KERNEL);
if (!vq)
return NULL;

vq->packed_ring = false;
vq->vq.callback = callback;
vq->vq.vdev = vdev;
vq->vq.name = name;
vq->vq.index = index;
vq->vq.reset = false;
vq->we_own_ring = false;
vq->notify = notify;
vq->weak_barriers = weak_barriers;
#ifdef CONFIG_VIRTIO_HARDEN_NOTIFICATION
vq->broken = true;
#else
vq->broken = false;
#endif
vq->dma_dev = dma_dev;
vq->use_dma_api = vring_use_dma_api(vdev);

vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
!context;
vq->event = virtio_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX);

if (virtio_has_feature(vdev, VIRTIO_F_ORDER_PLATFORM))
vq->weak_barriers = false;

err = vring_alloc_state_extra_split(vring_split);
if (err) {
kfree(vq);
return NULL;
}

virtqueue_vring_init_split(vring_split, vq);

virtqueue_init(vq, vring_split->vring.num);
virtqueue_vring_attach_split(vq, vring_split);

spin_lock(&vdev->vqs_list_lock);
list_add_tail(&vq->vq.list, &vdev->vqs);
spin_unlock(&vdev->vqs_list_lock);
return &vq->vq;
}

struct virtqueue *vring_create_virtqueue(
unsigned int index,
unsigned int num,
Expand Down Expand Up @@ -2846,7 +2852,6 @@ int virtqueue_reset(struct virtqueue *_vq,
}
EXPORT_SYMBOL_GPL(virtqueue_reset);

/* Only available for split ring */
struct virtqueue *vring_new_virtqueue(unsigned int index,
unsigned int num,
unsigned int vring_align,
Expand All @@ -2860,11 +2865,19 @@ struct virtqueue *vring_new_virtqueue(unsigned int index,
{
struct vring_virtqueue_split vring_split = {};

if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED))
return NULL;
if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED)) {
struct vring_virtqueue_packed vring_packed = {};

vring_packed.vring.num = num;
vring_packed.vring.desc = pages;
return __vring_new_virtqueue_packed(index, &vring_packed,
vdev, weak_barriers,
context, notify, callback,
name, vdev->dev.parent);
}

vring_init(&vring_split.vring, num, pages, vring_align);
return __vring_new_virtqueue(index, &vring_split, vdev, weak_barriers,
return __vring_new_virtqueue_split(index, &vring_split, vdev, weak_barriers,
context, notify, callback, name,
vdev->dev.parent);
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/virtio/virtio_vdpa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,14 +364,13 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
struct virtio_vdpa_device *vd_dev = to_virtio_vdpa_device(vdev);
struct vdpa_device *vdpa = vd_get_vdpa(vdev);
const struct vdpa_config_ops *ops = vdpa->config;
struct irq_affinity default_affd = { 0 };
struct cpumask *masks;
struct vdpa_callback cb;
bool has_affinity = desc && ops->set_vq_affinity;
int i, err, queue_idx = 0;

if (has_affinity) {
masks = create_affinity_masks(nvqs, desc ? desc : &default_affd);
masks = create_affinity_masks(nvqs, desc);
if (!masks)
return -ENOMEM;
}
Expand Down
Loading

0 comments on commit 2a50b1e

Please sign in to comment.