patches for DPDK stable branches
 help / color / mirror / Atom feed
From: "Xia, Chenbo" <chenbo.xia@intel.com>
To: "Ma, WenwuX" <wenwux.ma@intel.com>,
	"maxime.coquelin@redhat.com" <maxime.coquelin@redhat.com>,
	"dev@dpdk.org" <dev@dpdk.org>
Cc: "Hu, Jiayu" <jiayu.hu@intel.com>,
	"Wang, Yinan" <yinan.wang@intel.com>,
	"He, Xingguang" <xingguang.he@intel.com>,
	"stable@dpdk.org" <stable@dpdk.org>
Subject: RE: [PATCH v3] vhost: fix deadlock when message handling failed
Date: Sat, 7 May 2022 06:02:50 +0000
Message-ID: <SN6PR11MB350408642DA52A63920416E29CC49@SN6PR11MB3504.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20220507132753.11357-1-wenwux.ma@intel.com>

> -----Original Message-----
> From: Ma, WenwuX <wenwux.ma@intel.com>
> Sent: Saturday, May 7, 2022 9:28 PM
> To: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> dev@dpdk.org
> Cc: Hu, Jiayu <jiayu.hu@intel.com>; Wang, Yinan <yinan.wang@intel.com>; He,
> Xingguang <xingguang.he@intel.com>; Ma, WenwuX <wenwux.ma@intel.com>;
> stable@dpdk.org
> Subject: [PATCH v3] vhost: fix deadlock when message handling failed
> 
> In vhost_user_msg_handler(), if vhost message handling
> failed, we should check whether the queue is locked and
> release the lock before returning. Or, it will cause a
> deadlock later.
> 
> Fixes: 7f31d4ea05ca ("vhost: fix lock on device readiness notification")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
> ---
>  lib/vhost/vhost_user.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
> index 1d390677fa..4baf969ee0 100644
> --- a/lib/vhost/vhost_user.c
> +++ b/lib/vhost/vhost_user.c
> @@ -2976,7 +2976,6 @@ vhost_user_msg_handler(int vid, int fd)
>  		return -1;
>  	}
> 
> -	ret = 0;
>  	request = ctx.msg.request.master;
>  	if (request > VHOST_USER_NONE && request < VHOST_USER_MAX &&
>  			vhost_message_str[request]) {
> @@ -3113,9 +3112,11 @@ vhost_user_msg_handler(int vid, int fd)
>  		send_vhost_reply(dev, fd, &ctx);
>  	} else if (ret == RTE_VHOST_MSG_RESULT_ERR) {
>  		VHOST_LOG_CONFIG(ERR, "(%s) vhost message handling failed.\n",
> dev->ifname);
> -		return -1;
> +		ret = -1;
> +		goto unlock;
>  	}
> 
> +	ret = 0;
>  	for (i = 0; i < dev->nr_vring; i++) {
>  		struct vhost_virtqueue *vq = dev->virtqueue[i];
>  		bool cur_ready = vq_is_ready(dev, vq);
> @@ -3126,10 +3127,11 @@ vhost_user_msg_handler(int vid, int fd)
>  		}
>  	}
> 
> +unlock:
>  	if (unlock_required)
>  		vhost_user_unlock_all_queue_pairs(dev);
> 
> -	if (!virtio_is_ready(dev))
> +	if (ret != 0 || !virtio_is_ready(dev))
>  		goto out;
> 
>  	/*
> @@ -3156,7 +3158,7 @@ vhost_user_msg_handler(int vid, int fd)
>  	}
> 
>  out:
> -	return 0;
> +	return ret;
>  }
> 
>  static int process_slave_message_reply(struct virtio_net *dev,
> --
> 2.25.1

Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>

  reply	other threads:[~2022-05-07  6:02 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20220505134008.2865-1-wenwux.ma@intel.com>
2022-05-05 16:17 ` [PATCH v2] vhost: fix deadlock when handling user messages Wenwu Ma
2022-05-06  8:19   ` Xia, Chenbo
2022-05-07 13:27 ` [PATCH v3] vhost: fix deadlock when message handling failed Wenwu Ma
2022-05-07  6:02   ` Xia, Chenbo [this message]
2022-05-09  3:13   ` Ling, WeiX
2022-05-17 13:15   ` David Marchand
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=SN6PR11MB350408642DA52A63920416E29CC49@SN6PR11MB3504.namprd11.prod.outlook.com \
    --to=chenbo.xia@intel.com \
    --cc=dev@dpdk.org \
    --cc=jiayu.hu@intel.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=stable@dpdk.org \
    --cc=wenwux.ma@intel.com \
    --cc=xingguang.he@intel.com \
    --cc=yinan.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

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git