From: "Liu, Yu Y" <yu.y.liu@intel.com>
To: Jens Freimann <jfreimann@redhat.com>,
"Yang, Zhiyong" <zhiyong.yang@intel.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>,
"yliu@fridaylinux.org" <yliu@fridaylinux.org>,
"maxime.coquelin@redhat.com" <maxime.coquelin@redhat.com>,
"Yao, Lei A" <lei.a.yao@intel.com>
Subject: Re: [dpdk-dev] [PATCH] vhost: fix vhost-user init failed
Date: Wed, 12 Jul 2017 02:41:09 +0000 [thread overview]
Message-ID: <D9E7459352598649B9DF0563CBC90AEB6B3610FF@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <20170710094827.zdykowebtm3m3w2k@dhcp-192-218.str.redhat.com>
This is needed for RC2 as lots of test cases are affected.
Thanks & Regards,
Yu Liu
-----Original Message-----
From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Jens Freimann
Sent: Monday, July 10, 2017 5:48 PM
To: Yang, Zhiyong <zhiyong.yang@intel.com>
Cc: dev@dpdk.org; yliu@fridaylinux.org; maxime.coquelin@redhat.com; Yao, Lei A <lei.a.yao@intel.com>
Subject: Re: [dpdk-dev] [PATCH] vhost: fix vhost-user init failed
On Mon, Jul 10, 2017 at 04:06:48PM +0800, Zhiyong Yang wrote:
>Exception handling is executed in the normal path and it will cause
>vhost-user init failure.
>Fixes: d6983a70e259("vhost: check return of pthread calls")
>
>Reported-by: Lei Yao <lei.a.yao@intel.com>
>Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
>---
> lib/librte_vhost/socket.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
>index 57b86c0..9d2049c 100644
>--- a/lib/librte_vhost/socket.c
>+++ b/lib/librte_vhost/socket.c
>@@ -668,7 +668,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
> }
>
> vhost_user.vsockets[vhost_user.vsocket_cnt++] = vsocket;
>-
>+ goto out;
> out_mutex:
> if (pthread_mutex_destroy(&vsocket->conn_mutex)) {
> RTE_LOG(ERR, VHOST_CONFIG,
Thanks for fixing this!
Sorry for introducing this bug, I was about to send this before I saw your fix:
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 57b86c0..b2158a7 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -668,6 +668,9 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
}
vhost_user.vsockets[vhost_user.vsocket_cnt++] = vsocket;
+out:
+ pthread_mutex_unlock(&vhost_user.mutex);
+ return ret;
out_mutex:
if (pthread_mutex_destroy(&vsocket->conn_mutex)) { @@ -677,9 +680,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
out_free:
free(vsocket->path);
free(vsocket);
-out:
pthread_mutex_unlock(&vhost_user.mutex);
-
return ret;
}
Both works fine, so I leave it up to the maintainers how to fix.
Reviewed-by: Jens Freimann <jfreimann@redhat.com>
next prev parent reply other threads:[~2017-07-12 2:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-10 8:06 Zhiyong Yang
2017-07-10 9:38 ` Maxime Coquelin
2017-07-10 9:48 ` Jens Freimann
2017-07-12 2:41 ` Liu, Yu Y [this message]
2017-07-14 2:43 ` Yuanhan Liu
2017-07-13 8:18 ` Yao, Lei A
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=D9E7459352598649B9DF0563CBC90AEB6B3610FF@SHSMSX101.ccr.corp.intel.com \
--to=yu.y.liu@intel.com \
--cc=dev@dpdk.org \
--cc=jfreimann@redhat.com \
--cc=lei.a.yao@intel.com \
--cc=maxime.coquelin@redhat.com \
--cc=yliu@fridaylinux.org \
--cc=zhiyong.yang@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).