patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] net/virtio-user: fix advertising of protocol features
@ 2020-12-18 12:52 Olivier Matz
  2020-12-18 13:23 ` [dpdk-stable] [PATCH v2] " Olivier Matz
  0 siblings, 1 reply; 4+ messages in thread
From: Olivier Matz @ 2020-12-18 12:52 UTC (permalink / raw)
  To: dev; +Cc: Maxime Coquelin, Chenbo Xia, stable

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>
---
 drivers/net/virtio/virtio_user/vhost_user.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index b93e65c60b..5e8a5c293e 100644
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -298,6 +298,10 @@ vhost_user_sock(struct virtio_user_dev *dev,
 			msg.flags |= VHOST_USER_NEED_REPLY_MASK;
 		/* Fallthrough */
 	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_PROTOCOL_FEATURES:
 	case VHOST_USER_SET_LOG_BASE:
 		msg.payload.u64 = *((__u64 *)arg);
-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [dpdk-stable] [PATCH v2] net/virtio-user: fix advertising of protocol features
  2020-12-18 12:52 [dpdk-stable] [PATCH] net/virtio-user: fix advertising of protocol features Olivier Matz
@ 2020-12-18 13:23 ` Olivier Matz
  2020-12-22 10:48   ` Maxime Coquelin
  2021-01-08  9:15   ` Maxime Coquelin
  0 siblings, 2 replies; 4+ messages in thread
From: Olivier Matz @ 2020-12-18 13:23 UTC (permalink / raw)
  To: dev; +Cc: Maxime Coquelin, Chenbo Xia, stable

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [dpdk-stable] [PATCH v2] net/virtio-user: fix advertising of protocol features
  2020-12-18 13:23 ` [dpdk-stable] [PATCH v2] " Olivier Matz
@ 2020-12-22 10:48   ` Maxime Coquelin
  2021-01-08  9:15   ` Maxime Coquelin
  1 sibling, 0 replies; 4+ messages in thread
From: Maxime Coquelin @ 2020-12-22 10:48 UTC (permalink / raw)
  To: Olivier Matz, dev; +Cc: Chenbo Xia, stable



On 12/18/20 2:23 PM, Olivier Matz wrote:
> 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;
> 

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks!
Maxime


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [dpdk-stable] [PATCH v2] net/virtio-user: fix advertising of protocol features
  2020-12-18 13:23 ` [dpdk-stable] [PATCH v2] " Olivier Matz
  2020-12-22 10:48   ` Maxime Coquelin
@ 2021-01-08  9:15   ` Maxime Coquelin
  1 sibling, 0 replies; 4+ messages in thread
From: Maxime Coquelin @ 2021-01-08  9:15 UTC (permalink / raw)
  To: Olivier Matz, dev; +Cc: Chenbo Xia, stable



On 12/18/20 2:23 PM, Olivier Matz wrote:
> 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(-)


Series applied to dpdk-next-virtio/main.

Thanks,
Maxime


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-01-08  9:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-18 12:52 [dpdk-stable] [PATCH] net/virtio-user: fix advertising of protocol features Olivier Matz
2020-12-18 13:23 ` [dpdk-stable] [PATCH v2] " Olivier Matz
2020-12-22 10:48   ` Maxime Coquelin
2021-01-08  9:15   ` Maxime Coquelin

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git