From: Adrian Moreno <amorenoz@redhat.com>
To: dev@dpdk.org
Cc: yinan.wang@intel.com, patrick.fu@intel.com, chenbo.xia@intel.com,
zhihong.wang@intel.com, maxime.coquelin@redhat.com,
Adrian Moreno <amorenoz@redhat.com>,
stable@dpdk.org
Subject: [dpdk-stable] [PATCH v3 2/6] net/virtio-user: don't set/get_status until FEATURES_OK
Date: Mon, 26 Oct 2020 17:39:26 +0100 [thread overview]
Message-ID: <20201026163930.94032-3-amorenoz@redhat.com> (raw)
In-Reply-To: <20201026163930.94032-1-amorenoz@redhat.com>
According to the virtio spec, ACK and DRIVER status bits should be set
before feature negotiation.
However, until the protocol features are negotiated, the driver does not
know if the device actually supports those vhost-user messages.
Therefore, until FEATURES_OK is set, the GET/SET_STATUS messages should
not be sent.
Fixes: 57912824615f ("net/virtio-user: support vhost status setting")
Cc: maxime.coquelin@redhat.com
Cc: stable@dpdk.org
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Signed-off-by: Adrian Moreno <amorenoz@redhat.com>
---
drivers/net/virtio/virtio_user/vhost_user.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index ef290c357..450d77e92 100644
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -278,8 +278,9 @@ vhost_user_sock(struct virtio_user_dev *dev,
switch (req) {
case VHOST_USER_GET_STATUS:
- if (!(dev->protocol_features &
- (1ULL << VHOST_USER_PROTOCOL_F_STATUS)))
+ if (!(dev->status & VIRTIO_CONFIG_STATUS_FEATURES_OK) ||
+ (!(dev->protocol_features &
+ (1ULL << VHOST_USER_PROTOCOL_F_STATUS))))
return 0;
/* Fallthrough */
case VHOST_USER_GET_FEATURES:
@@ -288,8 +289,9 @@ vhost_user_sock(struct virtio_user_dev *dev,
break;
case VHOST_USER_SET_STATUS:
- if (!(dev->protocol_features &
- (1ULL << VHOST_USER_PROTOCOL_F_STATUS)))
+ if (!(dev->status & VIRTIO_CONFIG_STATUS_FEATURES_OK) ||
+ (!(dev->protocol_features &
+ (1ULL << VHOST_USER_PROTOCOL_F_STATUS))))
return 0;
if (has_reply_ack)
--
2.26.2
next prev parent reply other threads:[~2020-10-26 16:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201026163930.94032-1-amorenoz@redhat.com>
2020-10-26 16:39 ` [dpdk-stable] [PATCH v3 1/6] net/virtio-user: fix backend selection if stat fails Adrian Moreno
2020-10-26 16:39 ` Adrian Moreno [this message]
2020-10-26 16:39 ` [dpdk-stable] [PATCH v3 5/6] net/virtio-user: don't assume vhost status feature Adrian Moreno
2020-10-28 10:37 ` Maxime Coquelin
2020-10-26 16:39 ` [dpdk-stable] [PATCH v3 6/6] net/virtio-user: set status on socket reconnect Adrian Moreno
2020-10-28 11:01 ` 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=20201026163930.94032-3-amorenoz@redhat.com \
--to=amorenoz@redhat.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=patrick.fu@intel.com \
--cc=stable@dpdk.org \
--cc=yinan.wang@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).