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 9121EA0524 for ; Fri, 5 Feb 2021 12:33:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A2DC40682; Fri, 5 Feb 2021 12:33:02 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 47FEA40682 for ; Fri, 5 Feb 2021 12:33:01 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id j11so5739607wmi.3 for ; Fri, 05 Feb 2021 03:33:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=swzFFoRBivKRnfhuetr4XwADhXAjDNK6XF+YpICe0pg=; b=hOBHDU8N+MFv4IZMRJlvCrqiBHra2+cJEWeRvvZb3D2MzoT48WH7QU+sg3KOZXoi9a gwlmjEbEg1qRo0P1Iv4KldndTLUugmllnO+0p16yMzHHz2v/0t6UF4WLitIQgsPtT87B er1w1vpe5sc3r8PSbi8opigAGUc52Z7FqNECHaTNNbMy1sYqHaPnZ5gFodhtMs7dDzk+ DTQrHTrfoGCLMgn9udTvvkpzUKCy3Ku1sN0ts2N+Xhl2+Sh6oS9kCmVpuNoVnOa6MJY/ ydhygsHNBx12e15/gwzUZpYVW8fWPuBDtY4ileiUbO7lfawRYkHTw8Q+SG3dD0ceAnix dLBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=swzFFoRBivKRnfhuetr4XwADhXAjDNK6XF+YpICe0pg=; b=SRXb/slWPAszm4wh1RD4X87oEZBDU8r94Qd6G5dG60CoPVNFJXHhZOxa3cVqRfU+Dk iGOvNKtrBIysv3LLqtineU39E4u9oI+JGA7vg4/tG5XyOj+kWhmDgwimkMwq6Hq6tShm 6GcR0X3t2KIA0fM7UGQwW3b5smvGkWLaBXyCEHYzqMG3l3rwjP96jau9z5/3fttZdRdW zkFjahuiHjngXOs0IT+R1oxiSn/EXFu8xQ4SWpX7sxwErQKxfvCN+FF+uDWOnvePRD3N vyWhr8iNjYhU3qEaP+hNpUMMOuhDrDEl4Pm4yqYHpGk1IgX2PpCKUDJZXw16QvlHaQg6 3ueA== X-Gm-Message-State: AOAM531Eildf0fkIFbK2/qwZrAR94kLXvm9aWcuk3TFaSDKhCAWCdNam ho/dLdycMqdAzflqiwh4DJfXPCtRsgPwaWdg X-Google-Smtp-Source: ABdhPJzKGht5JtUml5jsukZB3/30NsUw4TKjIKntz4yK7ZxiajEgFJp4q1xu6mn+9XPsXUhfrsnXEg== X-Received: by 2002:a05:600c:354c:: with SMTP id i12mr3236781wmq.51.1612524781045; Fri, 05 Feb 2021 03:33:01 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c9sm12859897wrw.76.2021.02.05.03.32.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:00 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Lijun Ou , dpdk stable Date: Fri, 5 Feb 2021 11:17:14 +0000 Message-Id: <20210205111920.1272063-148-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix jumbo frame flag condition for MTU set' has been queued to stable release 20.11.1 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" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/825fcdb26dd57849331d68fb3d88c57b0714e5d3 Thanks. Luca Boccassi --- >From 825fcdb26dd57849331d68fb3d88c57b0714e5d3 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:12 +0000 Subject: [PATCH] net/hns3: fix jumbo frame flag condition for MTU set [ upstream commit 3ec35c64be8f93619a04e725bf4af9ecb5329ef0 ] The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition, but the Ether overhead is larger than 18 when it supports dual VLAN tags. That will cause the jumbo flag rx offload is wrong when MTU size is 'RTE_ETHER_MTU'. This fix will change the boundary condition with 'HSN3_DEFAULT_FRAME_LEN', that perhaps impacts the cases of the jumbo frame related. Fixes: 1f5ca0b460cd ("net/hns3: support some device operations") Fixes: a5475d61fa34 ("net/hns3: support VF") Signed-off-by: Steve Yang Acked-by: Lijun Ou --- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 3f6ba61a37..03d6df716d 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2458,7 +2458,7 @@ hns3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) } rte_spinlock_lock(&hw->lock); - is_jumbo_frame = frame_size > RTE_ETHER_MAX_LEN ? true : false; + is_jumbo_frame = frame_size > HNS3_DEFAULT_FRAME_LEN ? true : false; frame_size = RTE_MAX(frame_size, HNS3_DEFAULT_FRAME_LEN); /* diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 0366b9d4dc..d47af417bf 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -928,7 +928,7 @@ hns3vf_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) rte_spinlock_unlock(&hw->lock); return ret; } - if (frame_size > RTE_ETHER_MAX_LEN) + if (mtu > RTE_ETHER_MTU) dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:35.933267946 +0000 +++ 0148-net-hns3-fix-jumbo-frame-flag-condition-for-MTU-set.patch 2021-02-05 11:18:29.058695910 +0000 @@ -1 +1 @@ -From 3ec35c64be8f93619a04e725bf4af9ecb5329ef0 Mon Sep 17 00:00:00 2001 +From 825fcdb26dd57849331d68fb3d88c57b0714e5d3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3ec35c64be8f93619a04e725bf4af9ecb5329ef0 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 90544fe328..bf633a3d71 100644 +index 3f6ba61a37..03d6df716d 100644 @@ -29 +30 @@ -@@ -2467,7 +2467,7 @@ hns3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +@@ -2458,7 +2458,7 @@ hns3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) @@ -39 +40 @@ -index f09cabcd82..ef03fb1c4e 100644 +index 0366b9d4dc..d47af417bf 100644