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 6E522A0524 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 5DD7540682; 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 C638640682 for ; Fri, 5 Feb 2021 12:33:47 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id c4so7270024wru.9 for ; Fri, 05 Feb 2021 03:33:47 -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=Cv1uwTCsNatseqLPC7ELItSnHrhE6USjwAxTtY2H+ug=; b=pB9Ae8hdFaLdQZZn8QRfWzAvYZFb3vBKoB0dJ5xvreaju9Vag4iMMmBMqFSg4u+cgv Dpi8PFvpcRWpvSQd6N275Q+JtTaWpON09kMT+dKLpY6blD0iutMqjI0JBpD5Gy9hgGT2 /JkMxWZl8/zIOegUJKfM+Qf8DdSjeBjwnhme3+zihCcYwnb21EKvp4tMp0CsbSmgJIg3 Oqpd/FoOmMYluMWKbUT3iqBqPh3NYPl73lKw2WHpVhlYF9/of7dI//U4Wo6l9IVCv6kR WVb8zbwpdPepKnbPXFZM+HjS7LltCcgty6U2YwVMxihKQHJvv3P7lUdcUfK+82Wkz0nX /Fug== 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=Cv1uwTCsNatseqLPC7ELItSnHrhE6USjwAxTtY2H+ug=; b=frbTMQ8Lj8zPw3R/+BQJTcgeW7B6d/yR+HBnCZ4LF7NnelYMYKcnjvbwe5LXAYdozr E51ZqRZQw95Kbi3Hkfm7l0yQDdpDXpQFv+BOideu542XyNDNIdCte6uq9TfCgbZz5XHc bxxpGMtPWKaBCg+AouQ36u+PFJd5IAHFRd7/bpl7PgSl16oLs/C8yA/cXrMuJ9TJONuP y5v9HRkPFYc0K9U9vwp4E4awMp4Wy7WuF7zQTVR8vNjgaA6kKWPh+8R/vXYOEL+amB1N iQsxC3W7xb6NnjFUxr17HwXxR9XkvK640HeMhVRYH4gn8nDQgLBMFLUf7QGQEulIkmrp aheQ== X-Gm-Message-State: AOAM531I9nXV4Wkjc9O2uB/OrrvpfzTtuCKyjSDWlJiWdvuilvPZwBCE Fa8SvetyFT+41jm4EJwtsBU= X-Google-Smtp-Source: ABdhPJz7aDNDpP/kVFMWDc754CnyNmnkwpHXdrWXz1socrbCdoRNrsaJ0ZrM5dehs9C0GzfSu9LsVw== X-Received: by 2002:a5d:6d06:: with SMTP id e6mr4561607wrq.425.1612524827552; Fri, 05 Feb 2021 03:33:47 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u3sm13098479wre.54.2021.02.05.03.33.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:46 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Feb 2021 11:17:27 +0000 Message-Id: <20210205111920.1272063-161-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/enetc: 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/b60c9ab0dcd9fb18c470e8da1e11de2850b29c25 Thanks. Luca Boccassi --- >From b60c9ab0dcd9fb18c470e8da1e11de2850b29c25 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:25 +0000 Subject: [PATCH] net/enetc: fix jumbo frame flag condition for MTU set [ upstream commit 4d44217b0641c19e750b57c7392c4531c91dda7f ] 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: 5d5589b0c858 ("net/enetc: support MTU update and jumbo frames") Signed-off-by: Steve Yang Reviewed-by: Ferruh Yigit --- drivers/net/enetc/enetc.h | 4 ++++ drivers/net/enetc/enetc_ethdev.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h index 14ef3bc18b..7163633bce 100644 --- a/drivers/net/enetc/enetc.h +++ b/drivers/net/enetc/enetc.h @@ -29,6 +29,10 @@ /* maximum frame size supported */ #define ENETC_MAC_MAXFRM_SIZE 9600 +/* The max frame size with default MTU */ +#define ENETC_ETH_MAX_LEN (RTE_ETHER_MTU + \ + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN) + /* * upper_32_bits - return bits 32-63 of a number * @n: the number we're accessing diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c index 6ff3022874..4d2c9c0474 100644 --- a/drivers/net/enetc/enetc_ethdev.c +++ b/drivers/net/enetc/enetc_ethdev.c @@ -677,7 +677,7 @@ enetc_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) return -EINVAL; } - if (frame_size > RTE_ETHER_MAX_LEN) + if (frame_size > ENETC_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.504451184 +0000 +++ 0161-net-enetc-fix-jumbo-frame-flag-condition-for-MTU-set.patch 2021-02-05 11:18:29.110696899 +0000 @@ -1 +1 @@ -From 4d44217b0641c19e750b57c7392c4531c91dda7f Mon Sep 17 00:00:00 2001 +From b60c9ab0dcd9fb18c470e8da1e11de2850b29c25 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4d44217b0641c19e750b57c7392c4531c91dda7f ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org