From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: David Marchand <david.marchand@redhat.com>, dev@dpdk.org
Cc: chenbo.xia@intel.com, jiayu.hu@intel.com, yuanx.wang@intel.com,
xuan.ding@intel.com, stable@dpdk.org,
Patrick Fu <patrick.fu@intel.com>
Subject: Re: [RFC PATCH v2 4/9] vhost: fix async access
Date: Thu, 31 Mar 2022 10:00:27 +0200 [thread overview]
Message-ID: <4c729841-7599-d94b-4104-2a4f78f2e961@redhat.com> (raw)
In-Reply-To: <20220330134956.18927-5-david.marchand@redhat.com>
Hi Jiayu,
On 3/30/22 15:49, David Marchand wrote:
> vq->async accesses must be protected with vq->access_lock.
>
> Fixes: eb666d24085f ("vhost: fix async unregister deadlock")
> Fixes: 0c0935c5f794 ("vhost: allow to check in-flight packets for async vhost")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> lib/vhost/vhost.c | 25 ++++++++++---------------
> 1 file changed, 10 insertions(+), 15 deletions(-)
Could you please test and review below patch?
We may want to apply it early, before the annotation series is applied.
Thanks!
Maxime
> diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
> index 2f96a28dac..a93e41f314 100644
> --- a/lib/vhost/vhost.c
> +++ b/lib/vhost/vhost.c
> @@ -1753,27 +1753,23 @@ rte_vhost_async_channel_unregister(int vid, uint16_t queue_id)
> if (vq == NULL)
> return ret;
>
> - ret = 0;
> -
> - if (!vq->async)
> - return ret;
> -
> if (!rte_spinlock_trylock(&vq->access_lock)) {
> VHOST_LOG_CONFIG(ERR, "(%s) failed to unregister async channel, virtqueue busy.\n",
> dev->ifname);
> - return -1;
> + return ret;
> }
>
> - if (vq->async->pkts_inflight_n) {
> + if (!vq->async) {
> + ret = 0;
> + } else if (vq->async->pkts_inflight_n) {
> VHOST_LOG_CONFIG(ERR, "(%s) failed to unregister async channel.\n", dev->ifname);
> VHOST_LOG_CONFIG(ERR, "(%s) inflight packets must be completed before unregistration.\n",
> dev->ifname);
> - ret = -1;
> - goto out;
> + } else {
> + vhost_free_async_mem(vq);
> + ret = 0;
> }
>
> - vhost_free_async_mem(vq);
> -out:
> rte_spinlock_unlock(&vq->access_lock);
>
> return ret;
> @@ -1891,9 +1887,6 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id)
> if (vq == NULL)
> return ret;
>
> - if (!vq->async)
> - return ret;
> -
> if (!rte_spinlock_trylock(&vq->access_lock)) {
> VHOST_LOG_CONFIG(DEBUG,
> "(%s) failed to check in-flight packets. virtqueue busy.\n",
> @@ -1901,7 +1894,9 @@ rte_vhost_async_get_inflight(int vid, uint16_t queue_id)
> return ret;
> }
>
> - ret = vq->async->pkts_inflight_n;
> + if (vq->async)
> + ret = vq->async->pkts_inflight_n;
> +
> rte_spinlock_unlock(&vq->access_lock);
>
> return ret;
next prev parent reply other threads:[~2022-03-31 8:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220328121758.26632-1-david.marchand@redhat.com>
2022-03-28 12:17 ` [RFC PATCH 1/5] vhost: fix missing virtqueue lock protection David Marchand
2022-03-28 12:17 ` [RFC PATCH 3/5] vhost: fix async access David Marchand
[not found] ` <20220330134956.18927-1-david.marchand@redhat.com>
2022-03-30 13:49 ` [RFC PATCH v2 1/9] vhost: fix missing virtqueue lock protection David Marchand
2022-03-30 13:49 ` [RFC PATCH v2 4/9] vhost: fix async access David Marchand
2022-03-31 8:00 ` Maxime Coquelin [this message]
2022-03-31 10:23 ` Hu, Jiayu
2022-04-04 6:57 ` Pai G, Sunil
[not found] ` <20220411110013.18624-1-david.marchand@redhat.com>
2022-04-11 11:00 ` [RFC PATCH v3 3/8] " David Marchand
2022-04-21 19:21 ` Maxime Coquelin
2022-05-17 13:24 ` 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=4c729841-7599-d94b-4104-2a4f78f2e961@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=chenbo.xia@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=jiayu.hu@intel.com \
--cc=patrick.fu@intel.com \
--cc=stable@dpdk.org \
--cc=xuan.ding@intel.com \
--cc=yuanx.wang@intel.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).