From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id C50042BE3; Tue, 9 Oct 2018 10:05:07 +0200 (CEST) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Oct 2018 01:05:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,359,1534834800"; d="scan'208";a="264091134" Received: from btwcube1.sh.intel.com (HELO debian) ([10.67.104.158]) by orsmga005.jf.intel.com with ESMTP; 09 Oct 2018 01:04:49 -0700 Date: Tue, 9 Oct 2018 16:03:34 +0800 From: Tiwei Bie To: Maxime Coquelin Cc: dev@dpdk.org, zhihong.wang@intel.com, jfreimann@redhat.com, nicknickolaev@gmail.com, i.maximets@samsung.com, bruce.richardson@intel.com, alejandro.lucero@netronome.com, dgilbert@redhat.com, stable@dpdk.org Message-ID: <20181009080333.GA23638@debian> References: <20181008152557.14275-1-maxime.coquelin@redhat.com> <20181008152557.14275-2-maxime.coquelin@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20181008152557.14275-2-maxime.coquelin@redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [dpdk-stable] [PATCH v4 01/19] vhost: fix messages error checks X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2018 08:05:08 -0000 On Mon, Oct 08, 2018 at 05:25:39PM +0200, Maxime Coquelin wrote: > Return of message handling has now changed to an enum that can > take non-negative value that is not zero in case a reply is > needed. But the code checking the variable afterwards has not > been updated, leading to success messages handling being > treated as errors. > > Fixes: 2f270595c05d ("vhost: rework message handling as a callback array") Fixline should be: Fixes: 0bff510b5ea6 ("vhost: unify message handling function signature") > > Signed-off-by: Maxime Coquelin > Acked-by: Ilya Maximets > --- > lib/librte_vhost/vhost_user.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c > index 7ef3fb4a4..060b41893 100644 > --- a/lib/librte_vhost/vhost_user.c > +++ b/lib/librte_vhost/vhost_user.c > @@ -1783,7 +1783,7 @@ vhost_user_msg_handler(int vid, int fd) > } > > skip_to_post_handle: > - if (!ret && dev->extern_ops.post_msg_handle) { > + if (ret != VH_RESULT_ERR && dev->extern_ops.post_msg_handle) { > uint32_t need_reply; > > ret = (*dev->extern_ops.post_msg_handle)( > @@ -1800,10 +1800,10 @@ vhost_user_msg_handler(int vid, int fd) > vhost_user_unlock_all_queue_pairs(dev); > > if (msg.flags & VHOST_USER_NEED_REPLY) { > - msg.payload.u64 = !!ret; > + msg.payload.u64 = ret == VH_RESULT_ERR; > msg.size = sizeof(msg.payload.u64); > send_vhost_reply(fd, &msg); > - } else if (ret) { > + } else if (ret == VH_RESULT_ERR) { > RTE_LOG(ERR, VHOST_CONFIG, > "vhost message handling failed.\n"); > return -1; We also need to take care of the return value of .pre_msg_handle() and .post_msg_handle(). Otherwise, errors could be ignored. > -- > 2.17.1 >