From 580f3af31c99824bdd1cc331035096e34de5ca01 Mon Sep 17 00:00:00 2001 From: Ivan Ilchenko Date: Thu, 2 Sep 2021 17:39:39 +0300 Subject: [PATCH] net/virtio: fix device configure without jumbo Rx offload Use max-pkt-len only if jumbo frames offload is requested since otherwise this field isn't valid. Fixes: 8b90e4358112 ("net/virtio: set offload flag for jumbo frames") Fixes: 4e8169eb0d2d ("net/virtio: fix Rx scatter offload") Cc: stable@dpdk.org Signed-off-by: Ivan Ilchenko Signed-off-by: Andrew Rybchenko Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 51fa85b078..da1633d77e 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2103,10 +2103,14 @@ virtio_dev_configure(struct rte_eth_dev *dev) return ret; } - if (rxmode->max_rx_pkt_len > hw->max_mtu + ether_hdr_len) + if ((rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) && + (rxmode->max_rx_pkt_len > hw->max_mtu + ether_hdr_len)) req_features &= ~(1ULL << VIRTIO_NET_F_MTU); - hw->max_rx_pkt_len = rxmode->max_rx_pkt_len; + if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) + hw->max_rx_pkt_len = rxmode->max_rx_pkt_len; + else + hw->max_rx_pkt_len = ether_hdr_len + dev->data->mtu; if (rx_offloads & (DEV_RX_OFFLOAD_UDP_CKSUM | DEV_RX_OFFLOAD_TCP_CKSUM))