* [PATCH v2 0/2] virtio_ring: check desc == NULL when packed and indirect
@ 2021-09-27 10:54 Xuan Zhuo
2021-09-27 10:54 ` [PATCH v2 1/2] virtio_ring: fix style of virtqueue_add_indirect_packed Xuan Zhuo
2021-09-27 10:54 ` [PATCH v2 2/2] virtio_ring: check desc == NULL when packed and indirect Xuan Zhuo
0 siblings, 2 replies; 7+ messages in thread
From: Xuan Zhuo @ 2021-09-27 10:54 UTC (permalink / raw)
To: virtualization; +Cc: David S. Miller, Tiwei Bie, Michael S. Tsirkin
In the case of packed, use indirect desc, since desc is allocated by
kmalloc_array(), we should check whether its return value is NULL.
This patch alloc desc inside virtqueue_add_packe(), if desc == NULL,
fall back to not using indirect.
v2:
Separate the style fix into a single patch.
Xuan Zhuo (2):
virtio_ring: fix style of virtqueue_add_indirect_packed
virtio_ring: check desc == NULL when packed and indirect
drivers/virtio/virtio_ring.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
--
2.31.0
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v2 1/2] virtio_ring: fix style of virtqueue_add_indirect_packed 2021-09-27 10:54 [PATCH v2 0/2] virtio_ring: check desc == NULL when packed and indirect Xuan Zhuo @ 2021-09-27 10:54 ` Xuan Zhuo 2021-09-28 3:14 ` Jason Wang 2021-09-27 10:54 ` [PATCH v2 2/2] virtio_ring: check desc == NULL when packed and indirect Xuan Zhuo 1 sibling, 1 reply; 7+ messages in thread From: Xuan Zhuo @ 2021-09-27 10:54 UTC (permalink / raw) To: virtualization; +Cc: David S. Miller, Tiwei Bie, Michael S. Tsirkin Fix the style problem of virtqueue_add_indirect_packed(). The next patch involves the modification of this function. Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> --- drivers/virtio/virtio_ring.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index dd95dfd85e98..91a46c4da87d 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -1050,12 +1050,12 @@ static struct vring_packed_desc *alloc_indirect_packed(unsigned int total_sg, } static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq, - struct scatterlist *sgs[], - unsigned int total_sg, - unsigned int out_sgs, - unsigned int in_sgs, - void *data, - gfp_t gfp) + struct scatterlist *sgs[], + unsigned int total_sg, + unsigned int out_sgs, + unsigned int in_sgs, + void *data, + gfp_t gfp) { struct vring_packed_desc *desc; struct scatterlist *sg; -- 2.31.0 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] virtio_ring: fix style of virtqueue_add_indirect_packed 2021-09-27 10:54 ` [PATCH v2 1/2] virtio_ring: fix style of virtqueue_add_indirect_packed Xuan Zhuo @ 2021-09-28 3:14 ` Jason Wang 2021-10-19 8:15 ` Xuan Zhuo 0 siblings, 1 reply; 7+ messages in thread From: Jason Wang @ 2021-09-28 3:14 UTC (permalink / raw) To: Xuan Zhuo; +Cc: Michael S. Tsirkin, David S. Miller, Tiwei Bie, virtualization On Mon, Sep 27, 2021 at 6:54 PM Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote: > > Fix the style problem of virtqueue_add_indirect_packed(). The next patch > involves the modification of this function. > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> > --- > drivers/virtio/virtio_ring.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) Acked-by: Jason Wang <jasowang@redhat.com> > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index dd95dfd85e98..91a46c4da87d 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -1050,12 +1050,12 @@ static struct vring_packed_desc *alloc_indirect_packed(unsigned int total_sg, > } > > static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq, > - struct scatterlist *sgs[], > - unsigned int total_sg, > - unsigned int out_sgs, > - unsigned int in_sgs, > - void *data, > - gfp_t gfp) > + struct scatterlist *sgs[], > + unsigned int total_sg, > + unsigned int out_sgs, > + unsigned int in_sgs, > + void *data, > + gfp_t gfp) > { > struct vring_packed_desc *desc; > struct scatterlist *sg; > -- > 2.31.0 > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] virtio_ring: fix style of virtqueue_add_indirect_packed 2021-09-28 3:14 ` Jason Wang @ 2021-10-19 8:15 ` Xuan Zhuo 2021-10-19 10:38 ` Michael S. Tsirkin 0 siblings, 1 reply; 7+ messages in thread From: Xuan Zhuo @ 2021-10-19 8:15 UTC (permalink / raw) To: Jason Wang; +Cc: Michael S. Tsirkin, David S. Miller, Tiwei Bie, virtualization On Tue, 28 Sep 2021 11:14:47 +0800, Jason Wang <jasowang@redhat.com> wrote: > On Mon, Sep 27, 2021 at 6:54 PM Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote: > > > > Fix the style problem of virtqueue_add_indirect_packed(). The next patch > > involves the modification of this function. > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> > > --- > > drivers/virtio/virtio_ring.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > Acked-by: Jason Wang <jasowang@redhat.com> Hi, this patch set seems to have not been merged, is there something wrong with me? Thanks. > > > > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > > index dd95dfd85e98..91a46c4da87d 100644 > > --- a/drivers/virtio/virtio_ring.c > > +++ b/drivers/virtio/virtio_ring.c > > @@ -1050,12 +1050,12 @@ static struct vring_packed_desc *alloc_indirect_packed(unsigned int total_sg, > > } > > > > static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq, > > - struct scatterlist *sgs[], > > - unsigned int total_sg, > > - unsigned int out_sgs, > > - unsigned int in_sgs, > > - void *data, > > - gfp_t gfp) > > + struct scatterlist *sgs[], > > + unsigned int total_sg, > > + unsigned int out_sgs, > > + unsigned int in_sgs, > > + void *data, > > + gfp_t gfp) > > { > > struct vring_packed_desc *desc; > > struct scatterlist *sg; > > -- > > 2.31.0 > > > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] virtio_ring: fix style of virtqueue_add_indirect_packed 2021-10-19 8:15 ` Xuan Zhuo @ 2021-10-19 10:38 ` Michael S. Tsirkin 0 siblings, 0 replies; 7+ messages in thread From: Michael S. Tsirkin @ 2021-10-19 10:38 UTC (permalink / raw) To: Xuan Zhuo; +Cc: David S. Miller, Tiwei Bie, virtualization On Tue, Oct 19, 2021 at 04:15:41PM +0800, Xuan Zhuo wrote: > On Tue, 28 Sep 2021 11:14:47 +0800, Jason Wang <jasowang@redhat.com> wrote: > > On Mon, Sep 27, 2021 at 6:54 PM Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote: > > > > > > Fix the style problem of virtqueue_add_indirect_packed(). The next patch > > > involves the modification of this function. > > > > > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> > > > --- > > > drivers/virtio/virtio_ring.c | 12 ++++++------ > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > Acked-by: Jason Wang <jasowang@redhat.com> > > Hi, this patch set seems to have not been merged, is there something wrong with me? > > Thanks. there's no problem as such. something like "align arguments to the open ( to make it look prettier" would be more correct. > > > > > > > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > > > index dd95dfd85e98..91a46c4da87d 100644 > > > --- a/drivers/virtio/virtio_ring.c > > > +++ b/drivers/virtio/virtio_ring.c > > > @@ -1050,12 +1050,12 @@ static struct vring_packed_desc *alloc_indirect_packed(unsigned int total_sg, > > > } > > > > > > static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq, > > > - struct scatterlist *sgs[], > > > - unsigned int total_sg, > > > - unsigned int out_sgs, > > > - unsigned int in_sgs, > > > - void *data, > > > - gfp_t gfp) > > > + struct scatterlist *sgs[], > > > + unsigned int total_sg, > > > + unsigned int out_sgs, > > > + unsigned int in_sgs, > > > + void *data, > > > + gfp_t gfp) > > > { > > > struct vring_packed_desc *desc; > > > struct scatterlist *sg; > > > -- > > > 2.31.0 > > > > > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] virtio_ring: check desc == NULL when packed and indirect 2021-09-27 10:54 [PATCH v2 0/2] virtio_ring: check desc == NULL when packed and indirect Xuan Zhuo 2021-09-27 10:54 ` [PATCH v2 1/2] virtio_ring: fix style of virtqueue_add_indirect_packed Xuan Zhuo @ 2021-09-27 10:54 ` Xuan Zhuo 2021-09-28 3:20 ` Jason Wang 1 sibling, 1 reply; 7+ messages in thread From: Xuan Zhuo @ 2021-09-27 10:54 UTC (permalink / raw) To: virtualization; +Cc: David S. Miller, Tiwei Bie, Michael S. Tsirkin In the case of packed, use indirect desc, since desc is allocated by kmalloc_array(), we should check whether its return value is NULL. This patch alloc desc inside virtqueue_add_packe(), if desc == NULL, fall back to not using indirect. Fixes: 1ce9e6055fa ("virtio_ring: introduce packed ring support") Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> --- drivers/virtio/virtio_ring.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 91a46c4da87d..62323c27bfe4 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -1051,20 +1051,19 @@ static struct vring_packed_desc *alloc_indirect_packed(unsigned int total_sg, static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq, struct scatterlist *sgs[], + struct vring_packed_desc *desc, unsigned int total_sg, unsigned int out_sgs, unsigned int in_sgs, void *data, gfp_t gfp) { - struct vring_packed_desc *desc; struct scatterlist *sg; unsigned int i, n, err_idx; u16 head, id; dma_addr_t addr; head = vq->packed.next_avail_idx; - desc = alloc_indirect_packed(total_sg, gfp); if (unlikely(vq->vq.num_free < 1)) { pr_debug("Can't add buf len 1 - avail = 0\n"); @@ -1191,9 +1190,14 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq, BUG_ON(total_sg == 0); - if (virtqueue_use_indirect(_vq, total_sg)) - return virtqueue_add_indirect_packed(vq, sgs, total_sg, - out_sgs, in_sgs, data, gfp); + if (virtqueue_use_indirect(_vq, total_sg)) { + desc = alloc_indirect_packed(total_sg, gfp); + if (desc) + return virtqueue_add_indirect_packed(vq, sgs, desc, + total_sg, + out_sgs, in_sgs, + data, gfp); + } head = vq->packed.next_avail_idx; avail_used_flags = vq->packed.avail_used_flags; -- 2.31.0 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] virtio_ring: check desc == NULL when packed and indirect 2021-09-27 10:54 ` [PATCH v2 2/2] virtio_ring: check desc == NULL when packed and indirect Xuan Zhuo @ 2021-09-28 3:20 ` Jason Wang 0 siblings, 0 replies; 7+ messages in thread From: Jason Wang @ 2021-09-28 3:20 UTC (permalink / raw) To: Xuan Zhuo; +Cc: Michael S. Tsirkin, David S. Miller, Tiwei Bie, virtualization On Mon, Sep 27, 2021 at 6:54 PM Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote: > > In the case of packed, use indirect desc, since desc is allocated by > kmalloc_array(), we should check whether its return value is NULL. > > This patch alloc desc inside virtqueue_add_packe(), if desc == NULL, > fall back to not using indirect. > > Fixes: 1ce9e6055fa ("virtio_ring: introduce packed ring support") > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Acked-by: Jason Wang <jasowang@redhat.com> > --- > drivers/virtio/virtio_ring.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 91a46c4da87d..62323c27bfe4 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -1051,20 +1051,19 @@ static struct vring_packed_desc *alloc_indirect_packed(unsigned int total_sg, > > static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq, > struct scatterlist *sgs[], > + struct vring_packed_desc *desc, > unsigned int total_sg, > unsigned int out_sgs, > unsigned int in_sgs, > void *data, > gfp_t gfp) > { > - struct vring_packed_desc *desc; > struct scatterlist *sg; > unsigned int i, n, err_idx; > u16 head, id; > dma_addr_t addr; > > head = vq->packed.next_avail_idx; > - desc = alloc_indirect_packed(total_sg, gfp); > > if (unlikely(vq->vq.num_free < 1)) { > pr_debug("Can't add buf len 1 - avail = 0\n"); > @@ -1191,9 +1190,14 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq, > > BUG_ON(total_sg == 0); > > - if (virtqueue_use_indirect(_vq, total_sg)) > - return virtqueue_add_indirect_packed(vq, sgs, total_sg, > - out_sgs, in_sgs, data, gfp); > + if (virtqueue_use_indirect(_vq, total_sg)) { > + desc = alloc_indirect_packed(total_sg, gfp); > + if (desc) > + return virtqueue_add_indirect_packed(vq, sgs, desc, > + total_sg, > + out_sgs, in_sgs, > + data, gfp); > + } > > head = vq->packed.next_avail_idx; > avail_used_flags = vq->packed.avail_used_flags; > -- > 2.31.0 > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-10-19 10:38 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-09-27 10:54 [PATCH v2 0/2] virtio_ring: check desc == NULL when packed and indirect Xuan Zhuo 2021-09-27 10:54 ` [PATCH v2 1/2] virtio_ring: fix style of virtqueue_add_indirect_packed Xuan Zhuo 2021-09-28 3:14 ` Jason Wang 2021-10-19 8:15 ` Xuan Zhuo 2021-10-19 10:38 ` Michael S. Tsirkin 2021-09-27 10:54 ` [PATCH v2 2/2] virtio_ring: check desc == NULL when packed and indirect Xuan Zhuo 2021-09-28 3:20 ` Jason Wang
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.