From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>,
Chenbo Xia <chenbo.xia@intel.com>,
stable@dpdk.org
Subject: [dpdk-stable] [PATCH v2] net/virtio-user: fix advertising of protocol features
Date: Fri, 18 Dec 2020 14:23:52 +0100 [thread overview]
Message-ID: <20201218132352.15834-1-olivier.matz@6wind.com> (raw)
In-Reply-To: <20201218125217.12963-1-olivier.matz@6wind.com>
When connected to a vhost-user backend, the flag
VHOST_USER_F_PROTOCOL_FEATURES is not advertised, preventing to do
multiqueue (the VHOST_USER_PROTOCOL_F_MQ protocol feature is ignored by
some backends if the VHOST_USER_F_PROTOCOL_FEATURES feature is not set).
When setting vhost-user features, advertise this flag if it was
advertised by our peer.
Fixes: 8e7561054ac7 ("net/virtio: support vhost-user protocol features")
Cc: stable@dpdk.org
Suggested-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
v2
* fix obvious fallthrough case, sorry for the noise
drivers/net/virtio/virtio_user/vhost_user.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index b93e65c60b..350eed4182 100644
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -297,13 +297,18 @@ vhost_user_sock(struct virtio_user_dev *dev,
if (has_reply_ack)
msg.flags |= VHOST_USER_NEED_REPLY_MASK;
/* Fallthrough */
- case VHOST_USER_SET_FEATURES:
case VHOST_USER_SET_PROTOCOL_FEATURES:
case VHOST_USER_SET_LOG_BASE:
msg.payload.u64 = *((__u64 *)arg);
msg.size = sizeof(m.payload.u64);
break;
+ case VHOST_USER_SET_FEATURES:
+ msg.payload.u64 = *((__u64 *)arg) | (dev->device_features &
+ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES));
+ msg.size = sizeof(m.payload.u64);
+ break;
+
case VHOST_USER_SET_OWNER:
case VHOST_USER_RESET_OWNER:
break;
--
2.25.1
next prev parent reply other threads:[~2020-12-18 13:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 12:52 [dpdk-stable] [PATCH] " Olivier Matz
2020-12-18 13:23 ` Olivier Matz [this message]
2020-12-22 10:48 ` [dpdk-stable] [PATCH v2] " Maxime Coquelin
2021-01-08 9:15 ` 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=20201218132352.15834-1-olivier.matz@6wind.com \
--to=olivier.matz@6wind.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=stable@dpdk.org \
/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).