1. Patchew
  2. QEMU
  3. View series

[PATCH v2] virtio-mem: detach the element from the virtqueue when error occurs

Li Qiang posted 1 patch 3 years, 8 months ago
Test docker-quick@centos7 passed
Test docker-mingw@fedora passed
Test checkpatch passed
Test FreeBSD passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200816142245.17556-1-liq3ea@163.com
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, David Hildenbrand <david@redhat.com>
hw/virtio/virtio-mem.c | 3 +++
1 file changed, 3 insertions(+)
[PATCH v2] virtio-mem: detach the element from the virtqueue when error occurs
Posted by Li Qiang 3 years, 8 months ago 
If error occurs while processing the virtio request we should call
'virtqueue_detach_element' to detach the element from the virtqueue
before free the elem.

Signed-off-by: Li Qiang <liq3ea@163.com>
---
Change since v1:
Change the subject
Avoid using the goto label

 hw/virtio/virtio-mem.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 7740fc613f..e6ffc781b3 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -318,6 +318,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
         if (iov_to_buf(elem->out_sg, elem->out_num, 0, &req, len) < len) {
             virtio_error(vdev, "virtio-mem protocol violation: invalid request"
                          " size: %d", len);
+            virtqueue_detach_element(vq, elem, 0);
             g_free(elem);
             return;
         }
@@ -327,6 +328,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
             virtio_error(vdev, "virtio-mem protocol violation: not enough space"
                          " for response: %zu",
                          iov_size(elem->in_sg, elem->in_num));
+            virtqueue_detach_element(vq, elem, 0);
             g_free(elem);
             return;
         }
@@ -348,6 +350,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
         default:
             virtio_error(vdev, "virtio-mem protocol violation: unknown request"
                          " type: %d", type);
+            virtqueue_detach_element(vq, elem, 0);
             g_free(elem);
             return;
         }
-- 
2.17.1
Re: [PATCH v2] virtio-mem: detach the element from the virtqueue when error occurs
Posted by David Hildenbrand 3 years, 8 months ago 
On 16.08.20 16:22, Li Qiang wrote:
> If error occurs while processing the virtio request we should call
> 'virtqueue_detach_element' to detach the element from the virtqueue
> before free the elem.
> 
> Signed-off-by: Li Qiang <liq3ea@163.com>


Fixes: 910b25766b ("virtio-mem: Paravirtualized memory hot(un)plug")
Acked-by: David Hildenbrand <david@redhat.com>

@MST, can you please pick this up? Thanks!

> ---
> Change since v1:
> Change the subject
> Avoid using the goto label
> 
>  hw/virtio/virtio-mem.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> index 7740fc613f..e6ffc781b3 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -318,6 +318,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
>          if (iov_to_buf(elem->out_sg, elem->out_num, 0, &req, len) < len) {
>              virtio_error(vdev, "virtio-mem protocol violation: invalid request"
>                           " size: %d", len);
> +            virtqueue_detach_element(vq, elem, 0);
>              g_free(elem);
>              return;
>          }
> @@ -327,6 +328,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
>              virtio_error(vdev, "virtio-mem protocol violation: not enough space"
>                           " for response: %zu",
>                           iov_size(elem->in_sg, elem->in_num));
> +            virtqueue_detach_element(vq, elem, 0);
>              g_free(elem);
>              return;
>          }
> @@ -348,6 +350,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
>          default:
>              virtio_error(vdev, "virtio-mem protocol violation: unknown request"
>                           " type: %d", type);
> +            virtqueue_detach_element(vq, elem, 0);
>              g_free(elem);
>              return;
>          }
> 


-- 
Thanks,

David / dhildenb
Re: [PATCH v2] virtio-mem: detach the element from the virtqueue when error occurs
Posted by Li Qiang 3 years, 8 months ago 
Kindly ping.

Li Qiang <liq3ea@163.com> 于2020年8月16日周日 下午10:23写道：
>
> If error occurs while processing the virtio request we should call
> 'virtqueue_detach_element' to detach the element from the virtqueue
> before free the elem.
>
> Signed-off-by: Li Qiang <liq3ea@163.com>
> ---
> Change since v1:
> Change the subject
> Avoid using the goto label
>
>  hw/virtio/virtio-mem.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> index 7740fc613f..e6ffc781b3 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -318,6 +318,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
>          if (iov_to_buf(elem->out_sg, elem->out_num, 0, &req, len) < len) {
>              virtio_error(vdev, "virtio-mem protocol violation: invalid request"
>                           " size: %d", len);
> +            virtqueue_detach_element(vq, elem, 0);
>              g_free(elem);
>              return;
>          }
> @@ -327,6 +328,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
>              virtio_error(vdev, "virtio-mem protocol violation: not enough space"
>                           " for response: %zu",
>                           iov_size(elem->in_sg, elem->in_num));
> +            virtqueue_detach_element(vq, elem, 0);
>              g_free(elem);
>              return;
>          }
> @@ -348,6 +350,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
>          default:
>              virtio_error(vdev, "virtio-mem protocol violation: unknown request"
>                           " type: %d", type);
> +            virtqueue_detach_element(vq, elem, 0);
>              g_free(elem);
>              return;
>          }
> --
> 2.17.1
>
>
Re: [PATCH v2] virtio-mem: detach the element from the virtqueue when error occurs
Posted by Li Qiang 3 years, 7 months ago 
Ping!

Li Qiang <liq3ea@gmail.com> 于2020年8月28日周五 上午9:21写道：
>
> Kindly ping.
>
> Li Qiang <liq3ea@163.com> 于2020年8月16日周日 下午10:23写道：
> >
> > If error occurs while processing the virtio request we should call
> > 'virtqueue_detach_element' to detach the element from the virtqueue
> > before free the elem.
> >
> > Signed-off-by: Li Qiang <liq3ea@163.com>
> > ---
> > Change since v1:
> > Change the subject
> > Avoid using the goto label
> >
> >  hw/virtio/virtio-mem.c | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> > index 7740fc613f..e6ffc781b3 100644
> > --- a/hw/virtio/virtio-mem.c
> > +++ b/hw/virtio/virtio-mem.c
> > @@ -318,6 +318,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
> >          if (iov_to_buf(elem->out_sg, elem->out_num, 0, &req, len) < len) {
> >              virtio_error(vdev, "virtio-mem protocol violation: invalid request"
> >                           " size: %d", len);
> > +            virtqueue_detach_element(vq, elem, 0);
> >              g_free(elem);
> >              return;
> >          }
> > @@ -327,6 +328,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
> >              virtio_error(vdev, "virtio-mem protocol violation: not enough space"
> >                           " for response: %zu",
> >                           iov_size(elem->in_sg, elem->in_num));
> > +            virtqueue_detach_element(vq, elem, 0);
> >              g_free(elem);
> >              return;
> >          }
> > @@ -348,6 +350,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
> >          default:
> >              virtio_error(vdev, "virtio-mem protocol violation: unknown request"
> >                           " type: %d", type);
> > +            virtqueue_detach_element(vq, elem, 0);
> >              g_free(elem);
> >              return;
> >          }
> > --
> > 2.17.1
> >
> >
Re: [PATCH v2] virtio-mem: detach the element from the virtqueue when error occurs
Posted by Michael S. Tsirkin 3 years, 7 months ago 
For some reason I didn't receive the original email.
Sorry.
Queued now.

On Mon, Sep 07, 2020 at 09:36:40AM +0800, Li Qiang wrote:
> Ping!
> 
> Li Qiang <liq3ea@gmail.com> 于2020年8月28日周五 上午9:21写道：
> >
> > Kindly ping.
> >
> > Li Qiang <liq3ea@163.com> 于2020年8月16日周日 下午10:23写道：
> > >
> > > If error occurs while processing the virtio request we should call
> > > 'virtqueue_detach_element' to detach the element from the virtqueue
> > > before free the elem.
> > >
> > > Signed-off-by: Li Qiang <liq3ea@163.com>
> > > ---
> > > Change since v1:
> > > Change the subject
> > > Avoid using the goto label
> > >
> > >  hw/virtio/virtio-mem.c | 3 +++
> > >  1 file changed, 3 insertions(+)
> > >
> > > diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> > > index 7740fc613f..e6ffc781b3 100644
> > > --- a/hw/virtio/virtio-mem.c
> > > +++ b/hw/virtio/virtio-mem.c
> > > @@ -318,6 +318,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
> > >          if (iov_to_buf(elem->out_sg, elem->out_num, 0, &req, len) < len) {
> > >              virtio_error(vdev, "virtio-mem protocol violation: invalid request"
> > >                           " size: %d", len);
> > > +            virtqueue_detach_element(vq, elem, 0);
> > >              g_free(elem);
> > >              return;
> > >          }
> > > @@ -327,6 +328,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
> > >              virtio_error(vdev, "virtio-mem protocol violation: not enough space"
> > >                           " for response: %zu",
> > >                           iov_size(elem->in_sg, elem->in_num));
> > > +            virtqueue_detach_element(vq, elem, 0);
> > >              g_free(elem);
> > >              return;
> > >          }
> > > @@ -348,6 +350,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
> > >          default:
> > >              virtio_error(vdev, "virtio-mem protocol violation: unknown request"
> > >                           " type: %d", type);
> > > +            virtqueue_detach_element(vq, elem, 0);
> > >              g_free(elem);
> > >              return;
> > >          }
> > > --
> > > 2.17.1
> > >
> > >
>
Re: [PATCH v2] virtio-mem: detach the element from the virtqueue when error occurs
Posted by Li Qiang 3 years, 7 months ago 
Michael S. Tsirkin <mst@redhat.com> 于2020年9月8日周二 下午10:10写道：
>
> For some reason I didn't receive the original email.
> Sorry.
> Queued now.
>

Kindly notice:
Here is another patch for virtio-pmem.

https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg02639.html


Thanks,
Li Qiang

> On Mon, Sep 07, 2020 at 09:36:40AM +0800, Li Qiang wrote:
> > Ping!
> >
> > Li Qiang <liq3ea@gmail.com> 于2020年8月28日周五 上午9:21写道：
> > >
> > > Kindly ping.
> > >
> > > Li Qiang <liq3ea@163.com> 于2020年8月16日周日 下午10:23写道：
> > > >
> > > > If error occurs while processing the virtio request we should call
> > > > 'virtqueue_detach_element' to detach the element from the virtqueue
> > > > before free the elem.
> > > >
> > > > Signed-off-by: Li Qiang <liq3ea@163.com>
> > > > ---
> > > > Change since v1:
> > > > Change the subject
> > > > Avoid using the goto label
> > > >
> > > >  hw/virtio/virtio-mem.c | 3 +++
> > > >  1 file changed, 3 insertions(+)
> > > >
> > > > diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> > > > index 7740fc613f..e6ffc781b3 100644
> > > > --- a/hw/virtio/virtio-mem.c
> > > > +++ b/hw/virtio/virtio-mem.c
> > > > @@ -318,6 +318,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
> > > >          if (iov_to_buf(elem->out_sg, elem->out_num, 0, &req, len) < len) {
> > > >              virtio_error(vdev, "virtio-mem protocol violation: invalid request"
> > > >                           " size: %d", len);
> > > > +            virtqueue_detach_element(vq, elem, 0);
> > > >              g_free(elem);
> > > >              return;
> > > >          }
> > > > @@ -327,6 +328,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
> > > >              virtio_error(vdev, "virtio-mem protocol violation: not enough space"
> > > >                           " for response: %zu",
> > > >                           iov_size(elem->in_sg, elem->in_num));
> > > > +            virtqueue_detach_element(vq, elem, 0);
> > > >              g_free(elem);
> > > >              return;
> > > >          }
> > > > @@ -348,6 +350,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
> > > >          default:
> > > >              virtio_error(vdev, "virtio-mem protocol violation: unknown request"
> > > >                           " type: %d", type);
> > > > +            virtqueue_detach_element(vq, elem, 0);
> > > >              g_free(elem);
> > > >              return;
> > > >          }
> > > > --
> > > > 2.17.1
> > > >
> > > >
> >
>
Re: [PATCH v2] virtio-mem: detach the element from the virtqueue when error occurs
Posted by David Hildenbrand 3 years, 7 months ago 
On 07.09.20 03:36, Li Qiang wrote:
> Ping!
> 

Michael usually picks up patches and I only ack them. I guess he's busy,
because I acked already ~3 weeks ago

https://lkml.kernel.org/r/254210bc-9e7e-407d-3151-104944930103@redhat.com

-- 
Thanks,

David / dhildenb

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.