lkml.org 
[lkml]   [2021]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 05/17] vhost-vdpa: Fail the vhost_vdpa_set_status() on reset failure
    Date
    Re-read the device status to ensure it's set to zero during
    resetting. Otherwise, fail the vhost_vdpa_set_status() after timeout.

    Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
    ---
    drivers/vhost/vdpa.c | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
    index b07aa161f7ad..dd05c1e1133c 100644
    --- a/drivers/vhost/vdpa.c
    +++ b/drivers/vhost/vdpa.c
    @@ -157,7 +157,7 @@ static long vhost_vdpa_set_status(struct vhost_vdpa *v, u8 __user *statusp)
    struct vdpa_device *vdpa = v->vdpa;
    const struct vdpa_config_ops *ops = vdpa->config;
    u8 status, status_old;
    - int nvqs = v->nvqs;
    + int timeout = 0, nvqs = v->nvqs;
    u16 i;

    if (copy_from_user(&status, statusp, sizeof(status)))
    @@ -173,6 +173,15 @@ static long vhost_vdpa_set_status(struct vhost_vdpa *v, u8 __user *statusp)
    return -EINVAL;

    ops->set_status(vdpa, status);
    + if (status == 0) {
    + while (ops->get_status(vdpa)) {
    + timeout += 20;
    + if (timeout > VDPA_RESET_TIMEOUT_MS)
    + return -EIO;
    +
    + msleep(20);
    + }
    + }

    if ((status & VIRTIO_CONFIG_S_DRIVER_OK) && !(status_old & VIRTIO_CONFIG_S_DRIVER_OK))
    for (i = 0; i < nvqs; i++)
    --
    2.11.0
    \
     
     \ /
      Last update: 2021-07-29 09:36    [W:4.606 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site