| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 27 Jul 2022 12:29:37 +0800
From: Jason Wang <jasowang@...hat.com>
To: Xuan Zhuo <xuanzhuo@...ux.alibaba.com>,
virtualization@...ts.linux-foundation.org
Cc: Richard Weinberger <richard@....at>,
Anton Ivanov <anton.ivanov@...bridgegreys.com>,
Johannes Berg <johannes@...solutions.net>,
"Michael S. Tsirkin" <mst@...hat.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Hans de Goede <hdegoede@...hat.com>,
Mark Gross <markgross@...nel.org>,
Vadim Pasternak <vadimp@...dia.com>,
Bjorn Andersson <bjorn.andersson@...aro.org>,
Mathieu Poirier <mathieu.poirier@...aro.org>,
Cornelia Huck <cohuck@...hat.com>,
Halil Pasic <pasic@...ux.ibm.com>,
Eric Farman <farman@...ux.ibm.com>,
Heiko Carstens <hca@...ux.ibm.com>,
Vasily Gorbik <gor@...ux.ibm.com>,
Alexander Gordeev <agordeev@...ux.ibm.com>,
Christian Borntraeger <borntraeger@...ux.ibm.com>,
Sven Schnelle <svens@...ux.ibm.com>,
Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Jesper Dangaard Brouer <hawk@...nel.org>,
John Fastabend <john.fastabend@...il.com>,
Vincent Whitchurch <vincent.whitchurch@...s.com>,
linux-um@...ts.infradead.org, netdev@...r.kernel.org,
platform-driver-x86@...r.kernel.org,
linux-remoteproc@...r.kernel.org, linux-s390@...r.kernel.org,
kvm@...r.kernel.org, bpf@...r.kernel.org,
kangjie.xu@...ux.alibaba.com
Subject: Re: [PATCH v13 18/42] virtio_ring: packed: extract the logic of alloc
queue
在 2022/7/26 15:22, Xuan Zhuo 写道:
> Separate the logic of packed to create vring queue.
>
> This feature is required for subsequent virtuqueue reset vring.
>
> Signed-off-by: Xuan Zhuo <xuanzhuo@...ux.alibaba.com>
Acked-by: Jason Wang <jasowang@...hat.com>
> ---
> drivers/virtio/virtio_ring.c | 80 +++++++++++++++++++++++-------------
> 1 file changed, 51 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 891900b31c3d..10cc2b7e3588 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -1857,19 +1857,10 @@ static void vring_free_packed(struct vring_virtqueue_packed *vring_packed,
> kfree(vring_packed->desc_extra);
> }
>
> -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)
> +static int vring_alloc_queue_packed(struct vring_virtqueue_packed *vring_packed,
> + struct virtio_device *vdev,
> + u32 num)
> {
> - struct vring_virtqueue *vq;
> struct vring_packed_desc *ring;
> struct vring_packed_desc_event *driver, *device;
> dma_addr_t ring_dma_addr, driver_event_dma_addr, device_event_dma_addr;
> @@ -1881,7 +1872,11 @@ static struct virtqueue *vring_create_virtqueue_packed(
> &ring_dma_addr,
> GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);
> if (!ring)
> - goto err_ring;
> + goto err;
> +
> + vring_packed->vring.desc = ring;
> + vring_packed->ring_dma_addr = ring_dma_addr;
> + vring_packed->ring_size_in_bytes = ring_size_in_bytes;
>
> event_size_in_bytes = sizeof(struct vring_packed_desc_event);
>
> @@ -1889,13 +1884,47 @@ static struct virtqueue *vring_create_virtqueue_packed(
> &driver_event_dma_addr,
> GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);
> if (!driver)
> - goto err_driver;
> + goto err;
> +
> + vring_packed->vring.driver = driver;
> + vring_packed->event_size_in_bytes = event_size_in_bytes;
> + vring_packed->driver_event_dma_addr = driver_event_dma_addr;
>
> device = vring_alloc_queue(vdev, event_size_in_bytes,
> &device_event_dma_addr,
> GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);
> if (!device)
> - goto err_device;
> + goto err;
> +
> + vring_packed->vring.device = device;
> + vring_packed->device_event_dma_addr = device_event_dma_addr;
> +
> + vring_packed->vring.num = num;
> +
> + return 0;
> +
> +err:
> + vring_free_packed(vring_packed, vdev);
> + return -ENOMEM;
> +}
> +
> +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 vring_virtqueue_packed vring_packed = {};
> + struct vring_virtqueue *vq;
> +
> + if (vring_alloc_queue_packed(&vring_packed, vdev, num))
> + goto err_ring;
>
> vq = kmalloc(sizeof(*vq), GFP_KERNEL);
> if (!vq)
> @@ -1918,17 +1947,14 @@ static struct virtqueue *vring_create_virtqueue_packed(
> vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
> !context;
>
> - vq->packed.ring_dma_addr = ring_dma_addr;
> - vq->packed.driver_event_dma_addr = driver_event_dma_addr;
> - vq->packed.device_event_dma_addr = device_event_dma_addr;
> + vq->packed.ring_dma_addr = vring_packed.ring_dma_addr;
> + vq->packed.driver_event_dma_addr = vring_packed.driver_event_dma_addr;
> + vq->packed.device_event_dma_addr = vring_packed.device_event_dma_addr;
>
> - vq->packed.ring_size_in_bytes = ring_size_in_bytes;
> - vq->packed.event_size_in_bytes = event_size_in_bytes;
> + vq->packed.ring_size_in_bytes = vring_packed.ring_size_in_bytes;
> + vq->packed.event_size_in_bytes = vring_packed.event_size_in_bytes;
>
> - vq->packed.vring.num = num;
> - vq->packed.vring.desc = ring;
> - vq->packed.vring.driver = driver;
> - vq->packed.vring.device = device;
> + vq->packed.vring = vring_packed.vring;
>
> vq->packed.next_avail_idx = 0;
> vq->packed.avail_wrap_counter = 1;
> @@ -1967,11 +1993,7 @@ static struct virtqueue *vring_create_virtqueue_packed(
> err_desc_state:
> kfree(vq);
> err_vq:
> - vring_free_queue(vdev, event_size_in_bytes, device, device_event_dma_addr);
> -err_device:
> - vring_free_queue(vdev, event_size_in_bytes, driver, driver_event_dma_addr);
> -err_driver:
> - vring_free_queue(vdev, ring_size_in_bytes, ring, ring_dma_addr);
> + vring_free_packed(&vring_packed, vdev);
> err_ring:
> return NULL;
> }
Powered by blists - more mailing lists