From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 25168A0C4D for ; Thu, 2 Sep 2021 16:39:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 17D9640142; Thu, 2 Sep 2021 16:39:55 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id E74734003C; Thu, 2 Sep 2021 16:39:52 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 122) id 7CB547F6C2; Thu, 2 Sep 2021 17:39:52 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id 545B37F5F5; Thu, 2 Sep 2021 17:39:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 545B37F5F5 Authentication-Results: shelob.oktetlabs.ru/545B37F5F5; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: Maxime Coquelin , Chenbo Xia , Jens Freimann , Ivan Ilchenko Cc: dev@dpdk.org, Ferruh Yigit , Ivan Ilchenko , stable@dpdk.org Date: Thu, 2 Sep 2021 17:39:39 +0300 Message-Id: <20210902143939.45596-1-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH] net/virtio: fix device configure without jumbo Rx offload X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" From: Ivan Ilchenko 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 --- 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 e58085a2c9..9bce6833db 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2099,10 +2099,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)) -- 2.30.2