[dpdk-dev] net/virtio: fix advertised Rx offload capabilities
diff mbox

Message ID 1484154325-32204-1-git-send-email-olivier.matz@6wind.com
State Superseded, archived
Delegated to: Yuanhan Liu
Headers show

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel compilation success Compilation OK

Commit Message

Olivier Matz Jan. 11, 2017, 5:05 p.m. UTC
When the virtio PMD is used on top of a vhost that does not support
offloads, Rx offload capabilities are still advertised by
virtio_dev_info_get(). But if an application tries to start the PMD with
Rx offloads enabled (rxmode.hw_ip_checksum = 1), the initialization of
the device will fail with -ENOTSUP and the following log:

  rx ip checksum not available on this host

This patch fixes the Rx offload capabilities returned by
virtio_dev_info_get() to be consistent with features advertised by the
host.

Fixes: 96cb6711939e ("net/virtio: support Rx checksum offload")
Fixes: 86d59b21468a ("net/virtio: support LRO")

CC: stable@dpdk.org
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 drivers/net/virtio/virtio_ethdev.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

Comments

Yuanhan Liu Jan. 16, 2017, 6:12 a.m. UTC | #1
On Wed, Jan 11, 2017 at 06:05:25PM +0100, Olivier Matz wrote:
> When the virtio PMD is used on top of a vhost that does not support
> offloads, Rx offload capabilities are still advertised by
> virtio_dev_info_get(). But if an application tries to start the PMD with
> Rx offloads enabled (rxmode.hw_ip_checksum = 1), the initialization of
> the device will fail with -ENOTSUP and the following log:
> 
>   rx ip checksum not available on this host
> 
> This patch fixes the Rx offload capabilities returned by
> virtio_dev_info_get() to be consistent with features advertised by the
> host.
> 
> Fixes: 96cb6711939e ("net/virtio: support Rx checksum offload")
> Fixes: 86d59b21468a ("net/virtio: support LRO")

Hi Olivier,

This patch doesn't apply cleanly on top of next-virtio repo, would you
midn to send v2, so that I can apply?

Thanks.

	--yliu
Olivier Matz Jan. 17, 2017, 10:33 a.m. UTC | #2
On Mon, 16 Jan 2017 14:12:43 +0800, Yuanhan Liu
<yuanhan.liu@linux.intel.com> wrote:
> On Wed, Jan 11, 2017 at 06:05:25PM +0100, Olivier Matz wrote:
> > When the virtio PMD is used on top of a vhost that does not support
> > offloads, Rx offload capabilities are still advertised by
> > virtio_dev_info_get(). But if an application tries to start the PMD
> > with Rx offloads enabled (rxmode.hw_ip_checksum = 1), the
> > initialization of the device will fail with -ENOTSUP and the
> > following log:
> > 
> >   rx ip checksum not available on this host
> > 
> > This patch fixes the Rx offload capabilities returned by
> > virtio_dev_info_get() to be consistent with features advertised by
> > the host.
> > 
> > Fixes: 96cb6711939e ("net/virtio: support Rx checksum offload")
> > Fixes: 86d59b21468a ("net/virtio: support LRO")  
> 
> Hi Olivier,
> 
> This patch doesn't apply cleanly on top of next-virtio repo, would you
> midn to send v2, so that I can apply?

Sure, will do.

Patch
diff mbox

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 817fedf..0d7f587 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1629,7 +1629,7 @@  virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet
 static void
 virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
-	uint64_t tso_mask;
+	uint64_t tso_mask, host_features;
 	struct virtio_hw *hw = dev->data->dev_private;
 
 	dev_info->pci_dev = hw->dev;
@@ -1643,18 +1643,25 @@  virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 	dev_info->default_txconf = (struct rte_eth_txconf) {
 		.txq_flags = ETH_TXQ_FLAGS_NOOFFLOADS
 	};
-	dev_info->rx_offload_capa =
-		DEV_RX_OFFLOAD_TCP_CKSUM |
-		DEV_RX_OFFLOAD_UDP_CKSUM |
-		DEV_RX_OFFLOAD_TCP_LRO;
-	dev_info->tx_offload_capa = 0;
 
+	host_features = hw->vtpci_ops->get_features(hw);
+	dev_info->rx_offload_capa = 0;
+	if (host_features & (1ULL << VIRTIO_NET_F_GUEST_CSUM)) {
+		dev_info->rx_offload_capa |=
+			DEV_RX_OFFLOAD_TCP_CKSUM |
+			DEV_RX_OFFLOAD_UDP_CKSUM;
+	}
+	tso_mask = (1ULL << VIRTIO_NET_F_GUEST_TSO4) |
+		(1ULL << VIRTIO_NET_F_GUEST_TSO6);
+	if ((host_features & tso_mask) == tso_mask)
+		dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_TCP_LRO;
+
+	dev_info->tx_offload_capa = 0;
 	if (hw->guest_features & (1ULL << VIRTIO_NET_F_CSUM)) {
 		dev_info->tx_offload_capa |=
 			DEV_TX_OFFLOAD_UDP_CKSUM |
 			DEV_TX_OFFLOAD_TCP_CKSUM;
 	}
-
 	tso_mask = (1ULL << VIRTIO_NET_F_HOST_TSO4) |
 		(1ULL << VIRTIO_NET_F_HOST_TSO6);
 	if ((hw->guest_features & tso_mask) == tso_mask)