| Message ID | 20180403095904.11152-1-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi. [This is an automated email] This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all The bot has also determined it's probably a bug fixing patch. (score: 97.5752) The bot has tested the following trees: v4.15.15, v4.14.32, v4.9.92, v4.4.126, v4.15.15: Build OK! v4.14.32: Build OK! v4.9.92: Build OK! v4.4.126: Build OK! Please let us know if you'd like to have this patch included in a stable tree. -- Thanks. Sasha
On Tue, Apr 03, 2018 at 11:59:04AM +0200, Gerd Hoffmann wrote: > Wait until we have enough space in the virt queue to actually queue up > our request. Avoids the guest spinning in case we have a non-zero > amount of free entries but not enough for the request. Ping airlied, can you please either pick it up or review so I can commit myself? thanks, Gerd > Cc: stable@vger.kernel.org > Reported-by: Alain Magloire <amagloire@blackberry.com> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > drivers/gpu/drm/virtio/virtgpu_vq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c > index 48e4f1df6e..020070d483 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_vq.c > +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c > @@ -293,7 +293,7 @@ static int virtio_gpu_queue_ctrl_buffer_locked(struct virtio_gpu_device *vgdev, > ret = virtqueue_add_sgs(vq, sgs, outcnt, incnt, vbuf, GFP_ATOMIC); > if (ret == -ENOSPC) { > spin_unlock(&vgdev->ctrlq.qlock); > - wait_event(vgdev->ctrlq.ack_queue, vq->num_free); > + wait_event(vgdev->ctrlq.ack_queue, vq->num_free >= outcnt + incnt); > spin_lock(&vgdev->ctrlq.qlock); > goto retry; > } else { > @@ -368,7 +368,7 @@ static int virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev, > ret = virtqueue_add_sgs(vq, sgs, outcnt, 0, vbuf, GFP_ATOMIC); > if (ret == -ENOSPC) { > spin_unlock(&vgdev->cursorq.qlock); > - wait_event(vgdev->cursorq.ack_queue, vq->num_free); > + wait_event(vgdev->cursorq.ack_queue, vq->num_free >= outcnt); > spin_lock(&vgdev->cursorq.qlock); > goto retry; > } else { > -- > 2.9.3 >
Reviewed-by: Dave Airlie <airlied@redhat.com> On Fri., 20 Apr. 2018, 17:23 Gerd Hoffmann, <kraxel@redhat.com> wrote: > On Tue, Apr 03, 2018 at 11:59:04AM +0200, Gerd Hoffmann wrote: > > Wait until we have enough space in the virt queue to actually queue up > > our request. Avoids the guest spinning in case we have a non-zero > > amount of free entries but not enough for the request. > > Ping airlied, can you please either pick it up or review so I can commit > myself? > > thanks, > Gerd > > > Cc: stable@vger.kernel.org > > Reported-by: Alain Magloire <amagloire@blackberry.com> > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > --- > > drivers/gpu/drm/virtio/virtgpu_vq.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c > b/drivers/gpu/drm/virtio/virtgpu_vq.c > > index 48e4f1df6e..020070d483 100644 > > --- a/drivers/gpu/drm/virtio/virtgpu_vq.c > > +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c > > @@ -293,7 +293,7 @@ static int > virtio_gpu_queue_ctrl_buffer_locked(struct virtio_gpu_device *vgdev, > > ret = virtqueue_add_sgs(vq, sgs, outcnt, incnt, vbuf, GFP_ATOMIC); > > if (ret == -ENOSPC) { > > spin_unlock(&vgdev->ctrlq.qlock); > > - wait_event(vgdev->ctrlq.ack_queue, vq->num_free); > > + wait_event(vgdev->ctrlq.ack_queue, vq->num_free >= outcnt > + incnt); > > spin_lock(&vgdev->ctrlq.qlock); > > goto retry; > > } else { > > @@ -368,7 +368,7 @@ static int virtio_gpu_queue_cursor(struct > virtio_gpu_device *vgdev, > > ret = virtqueue_add_sgs(vq, sgs, outcnt, 0, vbuf, GFP_ATOMIC); > > if (ret == -ENOSPC) { > > spin_unlock(&vgdev->cursorq.qlock); > > - wait_event(vgdev->cursorq.ack_queue, vq->num_free); > > + wait_event(vgdev->cursorq.ack_queue, vq->num_free >= > outcnt); > > spin_lock(&vgdev->cursorq.qlock); > > goto retry; > > } else { > > -- > > 2.9.3 > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel >
On 20 April 2018 at 17:22, Gerd Hoffmann <kraxel@redhat.com> wrote: > On Tue, Apr 03, 2018 at 11:59:04AM +0200, Gerd Hoffmann wrote: >> Wait until we have enough space in the virt queue to actually queue up >> our request. Avoids the guest spinning in case we have a non-zero >> amount of free entries but not enough for the request. > > Ping airlied, can you please either pick it up or review so I can commit > myself? Just in case it got lost from my phone, Reviewed-by: Dave Airlie <airlied@redhat.com> > > thanks, > Gerd > >> Cc: stable@vger.kernel.org >> Reported-by: Alain Magloire <amagloire@blackberry.com> >> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> >> --- >> drivers/gpu/drm/virtio/virtgpu_vq.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c >> index 48e4f1df6e..020070d483 100644 >> --- a/drivers/gpu/drm/virtio/virtgpu_vq.c >> +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c >> @@ -293,7 +293,7 @@ static int virtio_gpu_queue_ctrl_buffer_locked(struct virtio_gpu_device *vgdev, >> ret = virtqueue_add_sgs(vq, sgs, outcnt, incnt, vbuf, GFP_ATOMIC); >> if (ret == -ENOSPC) { >> spin_unlock(&vgdev->ctrlq.qlock); >> - wait_event(vgdev->ctrlq.ack_queue, vq->num_free); >> + wait_event(vgdev->ctrlq.ack_queue, vq->num_free >= outcnt + incnt); >> spin_lock(&vgdev->ctrlq.qlock); >> goto retry; >> } else { >> @@ -368,7 +368,7 @@ static int virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev, >> ret = virtqueue_add_sgs(vq, sgs, outcnt, 0, vbuf, GFP_ATOMIC); >> if (ret == -ENOSPC) { >> spin_unlock(&vgdev->cursorq.qlock); >> - wait_event(vgdev->cursorq.ack_queue, vq->num_free); >> + wait_event(vgdev->cursorq.ack_queue, vq->num_free >= outcnt); >> spin_lock(&vgdev->cursorq.qlock); >> goto retry; >> } else { >> -- >> 2.9.3 >> > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index 48e4f1df6e..020070d483 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -293,7 +293,7 @@ static int virtio_gpu_queue_ctrl_buffer_locked(struct virtio_gpu_device *vgdev, ret = virtqueue_add_sgs(vq, sgs, outcnt, incnt, vbuf, GFP_ATOMIC); if (ret == -ENOSPC) { spin_unlock(&vgdev->ctrlq.qlock); - wait_event(vgdev->ctrlq.ack_queue, vq->num_free); + wait_event(vgdev->ctrlq.ack_queue, vq->num_free >= outcnt + incnt); spin_lock(&vgdev->ctrlq.qlock); goto retry; } else { @@ -368,7 +368,7 @@ static int virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev, ret = virtqueue_add_sgs(vq, sgs, outcnt, 0, vbuf, GFP_ATOMIC); if (ret == -ENOSPC) { spin_unlock(&vgdev->cursorq.qlock); - wait_event(vgdev->cursorq.ack_queue, vq->num_free); + wait_event(vgdev->cursorq.ack_queue, vq->num_free >= outcnt); spin_lock(&vgdev->cursorq.qlock); goto retry; } else {
Wait until we have enough space in the virt queue to actually queue up our request. Avoids the guest spinning in case we have a non-zero amount of free entries but not enough for the request. Cc: stable@vger.kernel.org Reported-by: Alain Magloire <amagloire@blackberry.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- drivers/gpu/drm/virtio/virtgpu_vq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)