[dpdk-stable] patch 'net/virtio: add missing supported features' has been queued to LTS release 16.11.9

[Luca Boccassi]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/05/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Luca Boccassi

---
>From 02be74f19bd0dbd4226a1e028731755c3e914f28 Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Fri, 21 Sep 2018 20:52:43 +0800
Subject: [PATCH] net/virtio: add missing supported features

[ upstream commit 66908eff12627c3dd09b0e1f3801d57b425f2e23 ]

The virtio features VIRTIO_NET_F_CSUM, VIRTIO_NET_F_HOST_TSO4
and VIRTIO_NET_F_HOST_TSO6 are supported by the virtio PMD.
But they are missing in the supported feature set. And since
below commit:

commit 4174a7b59d05 ("net/virtio: improve Tx offload features negotiation")

Virtio PMD will announce the Tx offloading capabilities based
on the features read from the device. And virtio-user won't
report the features which are not in virtio-PMD's supported
feature set. So since that commit, virtio-user won't announce
the DEV_TX_OFFLOAD_UDP_CKSUM, DEV_TX_OFFLOAD_TCP_CKSUM and
DEV_TX_OFFLOAD_TCP_TSO offloading capabilities even if the
vhost backend supports them.

This patch adds these missing features, and virtio-user will
report them if the backend supports them.

Fixes: 142678d42959 ("net/virtio-user: fix wrongly get/set features")

Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_ethdev.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
index c491ec1b02..5122792a3a 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -74,7 +74,11 @@
 	(VIRTIO_PMD_DEFAULT_GUEST_FEATURES |	\
 	 1u << VIRTIO_NET_F_GUEST_CSUM	   |	\
 	 1u << VIRTIO_NET_F_GUEST_TSO4     |	\
-	 1u << VIRTIO_NET_F_GUEST_TSO6)
+	 1u << VIRTIO_NET_F_GUEST_TSO6     |	\
+	 1u << VIRTIO_NET_F_CSUM           |	\
+	 1u << VIRTIO_NET_F_HOST_TSO4      |	\
+	 1u << VIRTIO_NET_F_HOST_TSO6)
+
 /*
  * CQ function prototype
  */
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-03 17:44:54.640397853 +0100
+++ 0003-net-virtio-add-missing-supported-features.patch	2018-10-03 17:44:54.566534589 +0100
@@ -1,8 +1,10 @@
-From 66908eff12627c3dd09b0e1f3801d57b425f2e23 Mon Sep 17 00:00:00 2001
+From 02be74f19bd0dbd4226a1e028731755c3e914f28 Mon Sep 17 00:00:00 2001
 From: Tiwei Bie <tiwei.bie at intel.com>
 Date: Fri, 21 Sep 2018 20:52:43 +0800
 Subject: [PATCH] net/virtio: add missing supported features
 
+[ upstream commit 66908eff12627c3dd09b0e1f3801d57b425f2e23 ]
+
 The virtio features VIRTIO_NET_F_CSUM, VIRTIO_NET_F_HOST_TSO4
 and VIRTIO_NET_F_HOST_TSO6 are supported by the virtio PMD.
 But they are missing in the supported feature set. And since
@@ -22,19 +24,18 @@
 report them if the backend supports them.
 
 Fixes: 142678d42959 ("net/virtio-user: fix wrongly get/set features")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
 ---
- drivers/net/virtio/virtio_ethdev.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ drivers/net/virtio/virtio_ethdev.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
-index b726ad1084..e0f80e5a48 100644
+index c491ec1b02..5122792a3a 100644
 --- a/drivers/net/virtio/virtio_ethdev.h
 +++ b/drivers/net/virtio/virtio_ethdev.h
-@@ -40,7 +40,10 @@
+@@ -74,7 +74,11 @@
  	(VIRTIO_PMD_DEFAULT_GUEST_FEATURES |	\
  	 1u << VIRTIO_NET_F_GUEST_CSUM	   |	\
  	 1u << VIRTIO_NET_F_GUEST_TSO4     |	\
@@ -43,9 +44,10 @@
 +	 1u << VIRTIO_NET_F_CSUM           |	\
 +	 1u << VIRTIO_NET_F_HOST_TSO4      |	\
 +	 1u << VIRTIO_NET_F_HOST_TSO6)
- 
++
  /*
   * CQ function prototype
+  */
 -- 
 2.19.0