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 3DDD1A0C47 for ; Tue, 14 Sep 2021 13:18:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2EC07410E0; Tue, 14 Sep 2021 13:18:02 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 25D824003C; Tue, 14 Sep 2021 13:18:00 +0200 (CEST) Received: from [192.168.38.17] (aros.oktetlabs.ru [192.168.38.17]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id 81CA47F4FD; Tue, 14 Sep 2021 14:17:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 81CA47F4FD DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru; s=default; t=1631618279; bh=YA7TE8U3MY9sglCwrgMBbcijPXM4+NUSGO4wenU68EY=; h=Subject:To:Cc:References:From:Date:In-Reply-To; b=PmVReoMSBEOv2lNGIBiBJlwC4sQJOpFz+MC2KMyGpOtooH+ZPLdBMFWmpKNYYizoQ cZWJk8s2bcjOg/0qM9UfUEbsuuY4dPNwvuaukcirvDpP3Sc5d9jIax9GN87f3GY4ub mk5mQbsnUAP5Wh/33K+ARNOFvmzMB2NMbgQRfjPI= To: Maxime Coquelin , Chenbo Xia , Jens Freimann , Ivan Ilchenko Cc: dev@dpdk.org, Ferruh Yigit , stable@dpdk.org References: <20210902143939.45596-1-andrew.rybchenko@oktetlabs.ru> From: Andrew Rybchenko Organization: OKTET Labs Message-ID: <0b7f2784-5f08-b209-d719-741012d4bd47@oktetlabs.ru> Date: Tue, 14 Sep 2021 14:17:59 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [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" On 9/14/21 2:07 PM, Maxime Coquelin wrote: > > > On 9/2/21 4:39 PM, Andrew Rybchenko wrote: >> 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)) >> > > Reviewed-by: Maxime Coquelin Maxime, please, make letters lower case in From E-mail on applying.