From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: David Marchand <david.marchand@redhat.com>, dev@dpdk.org
Cc: ssimma@nvidia.com, Chenbo Xia <chenbox@nvidia.com>,
Eelco Chaudron <echaudro@redhat.com>
Subject: Re: [PATCH] vhost: fix vring addr update with vDPA
Date: Mon, 11 Mar 2024 11:16:41 +0100 [thread overview]
Message-ID: <0d97733e-53fe-4cc5-a5ba-24c590ece31d@redhat.com> (raw)
In-Reply-To: <20240307103443.609960-1-david.marchand@redhat.com>
On 3/7/24 11:34, David Marchand wrote:
> For vDPA devices, vq are not locked once the device has been configured
> at runtime.
>
> On the other hand, we need to hold the vq lock to evaluate vq->access_ok,
> invalidate vring addresses and translate them.
>
> Move vring address update earlier and, when vDPA is configured, skip parts
> which expect lock to be taken.
>
> Bugzilla ID: 1394
> Fixes: 741dc052eaf9 ("vhost: annotate virtqueue access checks")
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> No change, just resending for CI.
>
> ---
> lib/vhost/vhost_user.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
> index 3aba32c95a..7fe1687f08 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c
> @@ -986,17 +986,20 @@ vhost_user_set_vring_addr(struct virtio_net **pdev,
> /* addr->index refers to the queue index. The txq 1, rxq is 0. */
> vq = dev->virtqueue[ctx->msg.payload.addr.index];
>
> - /* vhost_user_lock_all_queue_pairs locked all qps */
> - VHOST_USER_ASSERT_LOCK(dev, vq, VHOST_USER_SET_VRING_ADDR);
> -
> - access_ok = vq->access_ok;
> -
> /*
> * Rings addresses should not be interpreted as long as the ring is not
> * started and enabled
> */
> memcpy(&vq->ring_addrs, addr, sizeof(*addr));
>
> + if (dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)
> + goto out;
> +
> + /* vhost_user_lock_all_queue_pairs locked all qps */
> + VHOST_USER_ASSERT_LOCK(dev, vq, VHOST_USER_SET_VRING_ADDR);
> +
> + access_ok = vq->access_ok;
> +
> vring_invalidate(dev, vq);
>
> if ((vq->enabled && (dev->features &
> @@ -1006,6 +1009,7 @@ vhost_user_set_vring_addr(struct virtio_net **pdev,
> *pdev = dev;
> }
>
> +out:
> return RTE_VHOST_MSG_RESULT_OK;
> }
>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
next prev parent reply other threads:[~2024-03-11 10:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 10:34 David Marchand
2024-03-11 10:16 ` Maxime Coquelin [this message]
2024-03-13 14:45 ` David Marchand
-- strict thread matches above, loose matches on Subject: below --
2024-03-05 9:13 David Marchand
2024-03-05 13:28 ` David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0d97733e-53fe-4cc5-a5ba-24c590ece31d@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=chenbox@nvidia.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=echaudro@redhat.com \
--cc=ssimma@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).