DPDK patches and discussions
 help / color / mirror / Atom feed
From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: David Marchand <david.marchand@redhat.com>, dev@dpdk.org
Cc: ssimma@nvidia.com, yajunw@nvidia.com,
	"Chenbo Xia" <chenbo.xia@intel.com>,
	"Morten Brørup" <mb@smartsharesystems.com>
Subject: Re: [PATCH] vhost: fix vring enable with VDPA
Date: Thu, 2 Mar 2023 11:42:02 +0100	[thread overview]
Message-ID: <d4728158-643c-7e3a-dfc1-c06372f973dd@redhat.com> (raw)
In-Reply-To: <20230302094808.1519310-1-david.marchand@redhat.com>



On 3/2/23 10:48, David Marchand wrote:
> For VDPA devices, vq are not locked once the device has been configured.
> But we need to hold the vq lock to check if vhost async is enabled.
> 
> Combining VDPA and vhost async does not seem to make much sense, so
> prevent this combination, and only assert the lock is taken when VDPA is
> not configured on this vq.
> 
> Bugzilla ID: 1169
> Fixes: 4b02c2673757 ("vhost: annotate async accesses")
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
>   lib/vhost/vhost.c      | 4 ++--
>   lib/vhost/vhost_user.c | 8 ++++----
>   2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
> index c36dc06a0a..6b73c03224 100644
> --- a/lib/vhost/vhost.c
> +++ b/lib/vhost/vhost.c
> @@ -1754,7 +1754,7 @@ rte_vhost_async_channel_register(int vid, uint16_t queue_id)
>   
>   	vq = dev->virtqueue[queue_id];
>   
> -	if (unlikely(vq == NULL || !dev->async_copy))
> +	if (unlikely(vq == NULL || !dev->async_copy || dev->vdpa_dev))
>   		return -1;
>   
>   	rte_spinlock_lock(&vq->access_lock);
> @@ -1778,7 +1778,7 @@ rte_vhost_async_channel_register_thread_unsafe(int vid, uint16_t queue_id)
>   
>   	vq = dev->virtqueue[queue_id];
>   
> -	if (unlikely(vq == NULL || !dev->async_copy))
> +	if (unlikely(vq == NULL || !dev->async_copy || dev->vdpa_dev))
>   		return -1;
>   
>   	vq_assert_lock(dev, vq);
> diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
> index d702d082dd..daf3458985 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c
> @@ -2177,10 +2177,10 @@ vhost_user_set_vring_enable(struct virtio_net **pdev,
>   		enable, index);
>   
>   	vq = dev->virtqueue[index];
> -	/* vhost_user_lock_all_queue_pairs locked all qps */
> -	vq_assert_lock(dev, vq);
> -	if (enable && vq->async) {
> -		if (vq->async->pkts_inflight_n) {
> +	if (!(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)) {
> +		/* vhost_user_lock_all_queue_pairs locked all qps */
> +		vq_assert_lock(dev, vq);
> +		if (enable && vq->async && vq->async->pkts_inflight_n) {
>   			VHOST_LOG_CONFIG(dev->ifname, ERR,
>   				"failed to enable vring. Inflight packets must be completed first\n");
>   			return RTE_VHOST_MSG_RESULT_ERR;

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime


  reply	other threads:[~2023-03-02 10:42 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-02  9:48 David Marchand
2023-03-02 10:42 ` Maxime Coquelin [this message]
2023-03-03  5:45 ` Xia, Chenbo
2023-03-03 12:54 ` Ali Alnubani
2023-03-06 14:21 ` Maxime Coquelin

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=d4728158-643c-7e3a-dfc1-c06372f973dd@redhat.com \
    --to=maxime.coquelin@redhat.com \
    --cc=chenbo.xia@intel.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=mb@smartsharesystems.com \
    --cc=ssimma@nvidia.com \
    --cc=yajunw@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).