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 8FB83A0524 for ; Fri, 5 Feb 2021 12:33:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A2D1188A0F; Fri, 5 Feb 2021 12:33:49 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mails.dpdk.org (Postfix) with ESMTP id 02FF840682 for ; Fri, 5 Feb 2021 12:33:49 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id 7so7378719wrz.0 for ; Fri, 05 Feb 2021 03:33:49 -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=8kOFCrTKyzmCo4aMDLkY8iJQgb9GcQARWy+XKo102Pc=; b=Nl6rQi3U3zoeylxyjNNjycb+8qWI+rKWJMTfp7mqS3QeMbbgt/bcAy7oJzrikXzrLx si9sJjck6gVHS4JiFQRlGKkDba4AReqyPvepJQloo2ePZfPb9WA0aQoFqGFEvSRJiSR+ mDaBKLX7HRe++GRjdFnuTr0NWHBGDRQLJAnkA6XWwV3faVj+SxX3eN6HaUroleT9u2YB YMu6OLXRTieSS1jv1mGiwAsLnhGprn0pTkYDhQjDFcdwnmWKUrhq7RujwyWc6L48X63B 5eoVSwBFrOpIXJWvFIMSoNXvF5GpabuTcj+73MhTgx6CnS03mQhnNlGfSbFrmKpc62r1 aZpA== 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=8kOFCrTKyzmCo4aMDLkY8iJQgb9GcQARWy+XKo102Pc=; b=HcCrY8fZhP1mZS34uIqoKbs97BbK0MLl6ZFknO4z/NgW6mbYLLPcDNntC3eB5JDuRu cAIb0gFYadMfsJmqGRbGwYqOrueaQw0rBXk+DMyq9UFyUd1/Vq8Zg/iNAOucEK9UcPig TLcALfDBYupxV1voWx1zJ3BFIpnsN2lNGr59R1jG/o6KbpoPSdrvmMyal4TKADB3/6Hz tC7mP9mY4Rr40VYGZGcPDk8fesiIPVCoU+okRVxVrxWFS0pxeDIgl3n0gnXlrb3YLAnJ qId61zP+X9gJmlczcibxwff0BV3IUxChOjuun3Pfit9ok6YpmatGTC0Xr5iE48CbxmIM EEDw== X-Gm-Message-State: AOAM532cG8t2/PGKn75wGLK/62eoahCZfWVj64to20TllZfYNVsO8zgG 8C5NPyD6/QZV3nKXXYaZ3I4= X-Google-Smtp-Source: ABdhPJx+6V/Eao3NF6wbxxWHixf/xDGy9XkF5XUNiIZknroqqzs+JeSQj7pnhVjl5xs4DjKVrEOAXA== X-Received: by 2002:adf:f6c4:: with SMTP id y4mr4426613wrp.127.1612524828809; Fri, 05 Feb 2021 03:33:48 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l10sm11858698wro.4.2021.02.05.03.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:48 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Feb 2021 11:17:28 +0000 Message-Id: <20210205111920.1272063-162-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/hinic: 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/4d55d2fb91722fb1cab5f81ecf0ed2ab7922cfce Thanks. Luca Boccassi --- >From 4d55d2fb91722fb1cab5f81ecf0ed2ab7922cfce Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:26 +0000 Subject: [PATCH] net/hinic: fix jumbo frame flag condition for MTU set [ upstream commit e542ab51ab27356ed2f2797b3ec2887ec0226bcf ] The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition. If the Ether overhead is larger than 18 when it supports VLAN tag, that will cause the jumbo flag rx offload is wrong when MTU size is 'RTE_ETHER_MTU'. This fix will normalize the boundary condition with 'RTE_ETHER_MTU' and overhead even though current overhead is 18. Fixes: 254bd849b132 ("net/hinic: set jumbo frame offload flag") Signed-off-by: Steve Yang Reviewed-by: Ferruh Yigit --- drivers/net/hinic/hinic_pmd_ethdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c index 62642354cf..5a2c171099 100644 --- a/drivers/net/hinic/hinic_pmd_ethdev.c +++ b/drivers/net/hinic/hinic_pmd_ethdev.c @@ -75,6 +75,9 @@ #define HINIC_PKTLEN_TO_MTU(pktlen) \ ((pktlen) - (ETH_HLEN + ETH_CRC_LEN)) +/* The max frame size with default MTU */ +#define HINIC_ETH_MAX_LEN (RTE_ETHER_MTU + ETH_HLEN + ETH_CRC_LEN) + /* lro numer limit for one packet */ #define HINIC_LRO_WQE_NUM_DEFAULT 8 @@ -1556,7 +1559,7 @@ static int hinic_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) /* update max frame size */ frame_size = HINIC_MTU_TO_PKTLEN(mtu); - if (frame_size > RTE_ETHER_MAX_LEN) + if (frame_size > HINIC_ETH_MAX_LEN) 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:36.543728714 +0000 +++ 0162-net-hinic-fix-jumbo-frame-flag-condition-for-MTU-set.patch 2021-02-05 11:18:29.110696899 +0000 @@ -1 +1 @@ -From e542ab51ab27356ed2f2797b3ec2887ec0226bcf Mon Sep 17 00:00:00 2001 +From 4d55d2fb91722fb1cab5f81ecf0ed2ab7922cfce Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e542ab51ab27356ed2f2797b3ec2887ec0226bcf ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org