From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, tiwei.bie@intel.com, zhihong.wang@intel.com,
jfreimann@redhat.com, nicknickolaev@gmail.com,
i.maximets@samsung.com, bruce.richardson@intel.com,
alejandro.lucero@netronome.com
Cc: dgilbert@redhat.com, stable@dpdk.org,
Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-stable] [PATCH v2 01/17] vhost: fix messages error checks
Date: Tue, 2 Oct 2018 11:36:35 +0200 [thread overview]
Message-ID: <20181002093651.24795-2-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20181002093651.24795-1-maxime.coquelin@redhat.com>
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: 4e601952cae6 ("vhost: message handling implemented as a callback array")
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
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;
--
2.17.1
next prev parent reply other threads:[~2018-10-02 9:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 9:36 [dpdk-stable] [PATCH v2 00/17] vhost: add postcopy live-migration support Maxime Coquelin
2018-10-02 9:36 ` Maxime Coquelin [this message]
2018-10-02 14:15 ` [dpdk-stable] [PATCH v2 01/17] vhost: fix messages error checks Ilya Maximets
2018-10-03 7:50 ` Maxime Coquelin
2018-10-03 7:57 ` Ilya Maximets
2018-10-03 8:02 ` Maxime Coquelin
2018-10-03 8:32 ` Ilya Maximets
2018-10-03 9:07 ` Ilya Maximets
2018-10-03 14:39 ` Maxime Coquelin
2018-10-04 5:42 ` Ilya Maximets
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 02/17] vhost: fix return code of messages requiring replies Maxime Coquelin
2018-10-03 13:26 ` Ilya Maximets
2018-10-03 14:49 ` Maxime Coquelin
2018-10-04 5:49 ` Ilya Maximets
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 03/17] vhost: fix error handling when mem table gets updated Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 04/17] vhost: define postcopy protocol flag Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 05/17] vhost: add number of fds to vhost-user messages and use it Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 06/17] vhost: pass socket fd to message handling callbacks Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 07/17] vhost: enable fds passing when sending vhost-user messages Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 08/17] vhost: add config flag for postcopy feature Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 09/17] vhost: introduce postcopy's advise message Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 10/17] vhost: add support for postcopy's listen message Maxime Coquelin
2018-10-02 14:11 ` Ilya Maximets
2018-10-03 7:46 ` Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 11/17] vhost: register new regions with userfaultfd Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 12/17] vhost: avoid useless VhostUserMemory copy Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 13/17] vhost: send userfault range addresses back to qemu Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 14/17] vhost: add support to postcopy's end request Maxime Coquelin
2018-10-02 14:18 ` Ilya Maximets
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 15/17] vhost: enable postcopy protocol feature Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 16/17] vhost: add flag to enable postcopy live-migration Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 17/17] net/vhost: add parameter to enable postcopy support 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=20181002093651.24795-2-maxime.coquelin@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=alejandro.lucero@netronome.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=dgilbert@redhat.com \
--cc=i.maximets@samsung.com \
--cc=jfreimann@redhat.com \
--cc=nicknickolaev@gmail.com \
--cc=stable@dpdk.org \
--cc=tiwei.bie@intel.com \
--cc=zhihong.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).