Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   wei.fang@nxp.com
To:     claudiu.manoil@nxp.com, vladimir.oltean@nxp.com,
        davem@davemloft.net, edumazet@google.com, kuba@kernel.or,
        pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net,
        hawk@kernel.org, john.fastabend@gmail.com, netdev@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org
Subject: [PATCH net 1/2] net: enetc: correct the statistics of rx bytes
Date:   Fri,  2 Jun 2023 17:46:58 +0800
Message-Id: <20230602094659.965523-2-wei.fang@nxp.com>
In-Reply-To: <20230602094659.965523-1-wei.fang@nxp.com>
References: <20230602094659.965523-1-wei.fang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sopJXL7ssz+2+jrfUlqKVBerFqzAI6Rfty8z9HSkFPvgsV6FRbA9SVAd6BYf?=
 =?us-ascii?Q?fVJDPTqlyF6wwJtCWavleD6kvH1E0TVHZvmtHOLt5hZWFkllRJzVXjhAxxfk?=
 =?us-ascii?Q?VMbIgZIN9xvpLnN4CXfavrQgPtSWXBdOVDf1Nb72ru7cFVvimghcuec/MKMk?=
 =?us-ascii?Q?ArnlIAcurZmdgvW4ru6mTC02sg07CwzUs+87Iwb1lPVe9fA0MYGC5MBfCqn4?=
 =?us-ascii?Q?6MmD6LLjWkuqTWCqSBwghVaSQSXE/YkXVOTp1YD06/W6unr1n7wEyQVODapZ?=
 =?us-ascii?Q?bKF1W0/TIWpn67MKl9i9mq8uQJPbHrT4TfEbH+isOGkhuNjosEt6qInLX42c?=
 =?us-ascii?Q?hJfkeTixxVAr4+xQx3/raf0FPm3YLu/d8NB7784J4AKO5gKkSFvbICWpcnfn?=
 =?us-ascii?Q?v/7/HkRBGxdx/SLimJKolrPWqaB3Zwpmnr2ICtN46fUxb8QgighrHbWNF5j2?=
 =?us-ascii?Q?GoFZCP7RhLgh27TacmAoVLlu5l/mpZB4OtUjyvxtDdUlBP3sNp+XftEOyJ4P?=
 =?us-ascii?Q?4ZOi7LYtMn5wgygru9Z9eEmRFpqsD3c38nSsIunGntFPc+UDsqccJaiFs5Tb?=
 =?us-ascii?Q?3GaFf0rlrFYS4ejM2u3nH7hoFCKuGiqngm2h7qZyYRs5Kpxm62BAM3MDCGkv?=
 =?us-ascii?Q?75EiFfrHcgTeFXCEVhU91D09TwMRmwXllLYIn/fZzHU18Kli/olNjQO1LQ/4?=
 =?us-ascii?Q?Oh485WCtds/Di1hjTc7RDpk/nGIkbXd1Vq9K7ggabxBPM9oh1wSIqLriqTRe?=
 =?us-ascii?Q?tcILm8RFG4PdHHmleTYDLqKrnDm3bYYbwDX9/rXxZYhKxv3hk7NMZuXYYm0q?=
 =?us-ascii?Q?nSjldV7bJBZrs9vMR+FxCHe81SmgG70Ul/ip4QAAGqhkAm/9R0W0xJAodXC9?=
 =?us-ascii?Q?9vWEHPvy3s5+V8HKObVJseouGGeL4AuPTqhtJHp04o2WolTxJu5d6mg8FClZ?=
 =?us-ascii?Q?LiO5K4Rg30f8mG+fvfXAkCEOHjgLZyDyaRtRByeQLfRSQOLNc/n23RppSUBG?=
 =?us-ascii?Q?hEBsXURz/77caDdY0i9h0hhu33F7rkbNNCfN2dmj/JyqZTDliTDDZqnoy61p?=
 =?us-ascii?Q?b1KnQSy/dJOsDk/Kj0VydKb/Gh5vUj1/AJ7FJinJn22Tcj1fra9fSD7kEsKg?=
 =?us-ascii?Q?1fTCs1q+Y2d+/ZKkZ6EmZLAfSEN1O54KB768IOPPckq5JN/5ozuNsQyVF9rL?=
 =?us-ascii?Q?InNVbA0dRCO0rheqBaPh7dePZG+bIBwU3ZeIimRwM4nKYrCKU7J+EU9iBw7t?=
 =?us-ascii?Q?fbUc8xVzDK+RR9eOltj5UBAyvcjmX2KVQwIQU4mjpq987ljIVfdtah+62lt+?=
 =?us-ascii?Q?zWelFCVCeI2MUVAfVbUg/OT4xv34fU6OB6IE6UX3JF2Y/oJYNu5eHR+Jwq0p?=
 =?us-ascii?Q?oQDxmW4u6p9XqsXrpYKb11DxY/IyAIHc1rwpvyIdEq6tEtPzmsgtul+hEHgi?=
 =?us-ascii?Q?vD2Mb0m2snfCYou16LaL1T/TpR9gdc4P7kfUcI/PJJsZYkUQ17k5+ahsH20K?=
 =?us-ascii?Q?waQYTzplDME5r127jX3JT2/YfXwqqC3eIfAQ40E32+8AeEJ0vGcASt0iH44w?=
 =?us-ascii?Q?UagfmhtWQ3wOS293syJuifPue+oaRwnOGzkv6+HW?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6bd598d5-000d-41f6-0b3c-08db634f01d5
X-MS-Exchange-CrossTenant-AuthSource: AM5PR04MB3139.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2023 09:51:58.9090
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: W8IXeHS6yGVFg8+zeB+AZlMTTnAIbNBNvfwfDHeqElF1KdSr3Z+Uo3SPwKEOb6fe4+xkqFB9lTDnAUeo2E76fA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8165
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Wei Fang <wei.fang@nxp.com>

The rx_bytes of struct net_device_stats should count the length of
ethernet frames excluding the FCS. However, there are two problems
with the rx_bytes statistics of the current enetc driver. one is
that the length of VLAN header is not counted if the VLAN extraction
feature is enabled. The other is that the length of L2 header is not
counted, because eth_type_trans() is invoked before updating rx_bytes
which will subtract the length of L2 header from skb->len.
BTW, the rx_bytes statistics of XDP path also have similar problem,
I will fix it in another patch.

Fixes: a800abd3ecb9 ("net: enetc: move skb creation into enetc_build_skb")
Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
 drivers/net/ethernet/freescale/enetc/enetc.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 3c4fa26f0f9b..d6c0f3f46c2a 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -1229,7 +1229,13 @@ static int enetc_clean_rx_ring(struct enetc_bdr *rx_ring,
 		if (!skb)
 			break;
 
-		rx_byte_cnt += skb->len;
+		/* When set, the outer VLAN header is extracted and reported
+		 * in the receive buffer descriptor. So rx_byte_cnt should
+		 * add the length of the extracted VLAN header.
+		 */
+		if (bd_status & ENETC_RXBD_FLAG_VLAN)
+			rx_byte_cnt += VLAN_HLEN;
+		rx_byte_cnt += skb->len + ETH_HLEN;
 		rx_frm_cnt++;
 
 		napi_gro_receive(napi, skb);
-- 
2.25.1