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 2/2] net: enetc: correct rx_bytes statistics of XDP
Date:   Fri,  2 Jun 2023 17:46:59 +0800
Message-Id: <20230602094659.965523-3-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?yep+gz874TjzyZhPFFPvBHHSDy1QCWz/6wOyMyezu80AT3T7Wld/94WWqA5S?=
 =?us-ascii?Q?xrltTy0Dq4Sjy5fSqLhTkvhtSNNz5hwQp4tPTDTq8Cmkjs5kkEkW046ZnNLd?=
 =?us-ascii?Q?NWYTB4afXuZQcU4uXOPMhTG8XGUZNvKlPX34xL1JYG134BzIBQ6Zz3uUpdQu?=
 =?us-ascii?Q?MbpzgexLKBFgVisbwIxW7FdAjSQcnd1YCkHlvPTBc3zrMZjTSawo/ytqBJza?=
 =?us-ascii?Q?NXeemW2sbHpt4kvJD51x+gt75VadQO/QAoPomax6DMZoV0ZhJv0Av0lQhVxl?=
 =?us-ascii?Q?m0opAXVrEg2YM9DSsE0gXavRVmBbZXbeyFpCUN7p9UlplYEs6EAydq4mGuKC?=
 =?us-ascii?Q?QrMZ0+NWRj3J3t0an5gFIjqFfQbhre86PCwVke+1FuKimMickaGWXAmDklj5?=
 =?us-ascii?Q?8WivZhVjOTMF65wLj4RTeTfDNwp8q0vXHNrceRkSEWJOhSW6bryIqG29Jr4c?=
 =?us-ascii?Q?5eWGRRf4nEgqINs9LIzUM24D+VIg+gdQnaDPfT9++5zZPT1URI6sTN0OTvl8?=
 =?us-ascii?Q?RTKWC9OE++bwnjMctZfx5S/sxgdGqm7FFmTaNP5GDt6MpKohOo9a0w4f8DEm?=
 =?us-ascii?Q?/6gfXRHJWSOwL5I5aKGAjrRXsgJBQolPw/OpOsf9z5mvOS2kqZjmzid0uMMr?=
 =?us-ascii?Q?BDQqm13NMlMR0LlmuPJVQr6udn3Id8g1Pl/mlsM2JNq06hyZfjgJtgkepWAY?=
 =?us-ascii?Q?9RJNYvqUnXz//TJHtxFqcGD9AmsYKO/crHQSDhYGfc0PrhfZ2dejgga6sRqq?=
 =?us-ascii?Q?IY3NTCNsqdHZkv+GCZFhLnI5auRlFTlY2w5gMsEnUsKKYf2e3sytxeiKIjvX?=
 =?us-ascii?Q?4sps1wWkD3e7IQtFafvxR6gM/4yY/jaheuiogJeMEcS7wfXjBYQ43oEtnHVb?=
 =?us-ascii?Q?9YWMQLgtzOKBgjnKcl4JrWUOh04/IF2JMB1KybehGppAiGRXIk0Xh96uRHCh?=
 =?us-ascii?Q?aOjRERMKkG7SDm3bvUakckDqcdqPSog/yIOQ5o/PAGSwS+B3V1UQdYQNcIG8?=
 =?us-ascii?Q?/gGR/j+U3YIO0ZdKw4DrK+bmPBRAhiZqoCkey9hxsPw7pNY36qLhhJmNsZYM?=
 =?us-ascii?Q?3obH4xiMfWgIQx9E6HkM8bpxMvdddbsmL15ePoaex01Io/hz9F6TKuNVnGe1?=
 =?us-ascii?Q?s4AkAGGtYibinGGx6BdGL6hDa436xf3bYAif5jNgo0RCQJymfRdOxL+bKF1c?=
 =?us-ascii?Q?MoS7AlIgbz0r5LO1EYHLvS9dVTkaazaIDBhKcRFca8y9vflciJ6J5oXMn2MJ?=
 =?us-ascii?Q?JxA7ScxJX7rE5m8r0PovgZCLkir4uyCXfkc6+Cy0TrJOzmh7UDvtV5UjFn1S?=
 =?us-ascii?Q?FTgiaBbz6dz4DXmgpaMRvIpkCGSNIJ0HZ80KKE4nTx4Sr5mkBlIw+fufVehB?=
 =?us-ascii?Q?bgCvuCxgY30KnZeiIGL6u+o7Y996cGgVrl/zc1DESBP1AbNg+oiJZdfQduKs?=
 =?us-ascii?Q?Zfg3CKR3KEqcVbQU5Snv+6iLZoSr1T7WhLwd2bj+xMKv7W2sgdV1/hbCDm9q?=
 =?us-ascii?Q?AFmqcU5kcvsH7q4RYoH45oUKSl9XdnoiVQa+t+LvrlpZeqtjdW+HbnjKEIXI?=
 =?us-ascii?Q?oNJTjJ0kKgslnD+CJqrJnOg91GrWWgW+G62/Vbk2?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7ef0d031-b9f8-4226-0d87-08db634f0534
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:52:04.7351
 (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: G7hX6d9m8eIkgnzA3qF/+gTwP7Sf8Sgaun8JB0LR7/bY4RyhQldCGkoL8R39XM6kUo2n22jGWUQWlAybP7TIVw==
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 statistics of XDP are always zero, because rx_byte_cnt
is not updated after it is initialized to 0. So fix it.

Fixes: d1b15102dd16 ("net: enetc: add support for XDP_DROP and XDP_PASS")
Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
 drivers/net/ethernet/freescale/enetc/enetc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index d6c0f3f46c2a..9e1b2536e9a9 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -1571,6 +1571,14 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,
 		enetc_build_xdp_buff(rx_ring, bd_status, &rxbd, &i,
 				     &cleaned_cnt, &xdp_buff);
 
+		/* 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 += xdp_get_buff_len(&xdp_buff);
+
 		xdp_act = bpf_prog_run_xdp(prog, &xdp_buff);
 
 		switch (xdp_act) {
-- 
2.25.1