Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
From:   Wei Fang <wei.fang@nxp.com>
To:     davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, shenwei.wang@nxp.com, xiaoning.wang@nxp.com,
        netdev@vger.kernel.org
Cc:     radu-andrei.bulie@nxp.com, linux-kernel@vger.kernel.org,
        linux-imx@nxp.com
Subject: [PATCH net] net: fec: correct queue selection
Date:   Thu,  7 Dec 2023 16:38:01 +0800
Message-Id: <20231207083801.233704-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?yg4X0ejig4FU5+Tm0pPXrJN2oEMm3au8bbbbmxhnFdhskWo/zCe1ka3TfkqW?=
 =?us-ascii?Q?UCsWvqsj8uYAhkaVlSyPd79MHAeKkmW/glnmazziGJX6149fmsNW3Uk7m2NS?=
 =?us-ascii?Q?FRCGK+awwDSFOg2vy7iGGAJrB3F/3tEg6MdaIjB3Ti1zJ7YKzCltqg+B4F1T?=
 =?us-ascii?Q?jT8DcM8LczFo3rmtomYX4829AJ5SEUCRWu6FwIZXGAaCe7k9eJRJz1eV4EZC?=
 =?us-ascii?Q?wty/Ys1KXV05BV1sh3EjDCkyiQH7hEjLS2eAnHqPTxBFj0D4XincIaHAaGLN?=
 =?us-ascii?Q?4XM9vx1GGhvbDl0dInsNBr21FnwfLihpiuxtwiBPbi7yLsWRKCIl6XMM685Z?=
 =?us-ascii?Q?8lXco0fKv/m81KYyKIkhMNZrG/jFMvWxsBG3SNwBmHKWcPbToFTt/L0FejDl?=
 =?us-ascii?Q?or+tlEMX8C4iy8U+yQQZ2q55/YyM9U14J0oPq/2YDrX19BIJp0MIWRBFY5rO?=
 =?us-ascii?Q?i9djGWCmwH9aC8SHj6ArR1zWLd5FA8H3c6IJOYfX7qfx1LdEAmLFslTqtppC?=
 =?us-ascii?Q?wcCkiTmwTkwQUzuQD6CD241pyd+aEBHC+z/HZot6JdEcaQW7yi+r2sVnFwBA?=
 =?us-ascii?Q?k9KM/fUKwUfOwWnhZz1qqCG3VqACVK5c70dpXq8amPCEfKSrvR5SqIZySgp+?=
 =?us-ascii?Q?hNm0o9M/INx2Ar2Po1hIlO7jGes10KQFF5pXmRjuHrYKwal/zMs/1Sujmqvt?=
 =?us-ascii?Q?FKPGLvYZ8kDbyLaNqQx80s7vjP8R5mfIIt6vxwD3TmgJoC3DXwar0UT42Hee?=
 =?us-ascii?Q?gqCKOc66i6p95798IZyN3U12d/OsqCPZpQzBFsTElLXFM30Atf6TlVPZ7Vx7?=
 =?us-ascii?Q?T6WHJbe/oMboWMGRwOd52R7k3TIxjm46UDfFyUm3n5R02AGWbOyz3soVZQiE?=
 =?us-ascii?Q?H31QvysACPEypsdwOV5z2/veADsgPKKAYh1iZUsBawKhr7K8HdrIYkyuUjpY?=
 =?us-ascii?Q?w7wq4pQezAaET3wMJy2pIJHT3ttUaY1dfLC1+SUyJ0uGb0Qfrt2yDeHYAO5M?=
 =?us-ascii?Q?4my9nR8SxTGapIBW6ZOzaWpCYScH4/THfgG536OYimLle/MKb5ipqO+ZkTCp?=
 =?us-ascii?Q?G8iITqI96dwPEKpPVqzv9a42v2zmiY20fosRjNxTJxiilQlYoszWHXxb53F7?=
 =?us-ascii?Q?wJUF4UvO8tRZqxsvdAkcZbmOUepIj7qJtPIUU/rRk+1WHzjH0eluZAIXIM6o?=
 =?us-ascii?Q?Z6GdfCcN6l7atxyBysQfUmQMuZ/Gb9V7bm3RII4jEN5+M3YzbzhxtBEVlp73?=
 =?us-ascii?Q?leSOMV0GMEmkh9a4DK99VLEdbuDW1IovZeUJBgL9TFjzSzkdwrsEApnsWzd9?=
 =?us-ascii?Q?/ab+VBIselNmlvLIqnOQ2/f5jnBBKzz/3jVBYjgcApB+KYL1Mpy/Pei60Lr1?=
 =?us-ascii?Q?nLuNWiu155guCfm7pYQY6eqhiWt/6etf66mYuuZ2XHQfO0f5zJm5/6SmUe25?=
 =?us-ascii?Q?eCOftbj2vfsKM8BkUMa3tmllrLs/XBVbQIHTfX/HGsjFFkSXE0RcySOZ8oRn?=
 =?us-ascii?Q?P2YoP9nwjQBEumQ4fC0LaNoGWpoSiz0baHSpRGcUA3EypFaLrTfY/OvGs2qh?=
 =?us-ascii?Q?EqPT7LguBlvtTWdbS7ROM1qcs0WKFfyRQSi0eRlE?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c7ee5707-291a-4a8b-060a-08dbf7011cdf
X-MS-Exchange-CrossTenant-AuthSource: AM5PR04MB3139.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2023 08:47:16.2343
 (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: cyiShRoVVggoFHOxh0kMAD83brpaIU8UYSecXf5+bT84PkMoDM1IfBVmaoc2PILikCt0+GCMilEyzBcPlxi0MA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8652
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 07 Dec 2023 00:47:40 -0800 (PST)

From: Radu Bulie <radu-andrei.bulie@nxp.com>

The old implementation extracted VLAN TCI info from the payload
before the VLAN tag has been pushed in the payload.

Another problem was that the VLAN TCI was extracted even if the
packet did not have VLAN protocol header.

This resulted in invalid VLAN TCI and as a consequence a random
queue was computed.

This patch fixes the above issues and use the VLAN TCI from the
skb if it is present or VLAN TCI from payload if present. If no
VLAN header is present queue 0 is selected.

Fixes: 52c4a1a85f4b ("net: fec: add ndo_select_queue to fix TX bandwidth fluctuations")
Signed-off-by: Radu Bulie <radu-andrei.bulie@nxp.com>
Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
 drivers/net/ethernet/freescale/fec_main.c | 27 +++++++++--------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index c3b7694a7485..e08c7b572497 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3731,31 +3731,26 @@ static int fec_set_features(struct net_device *netdev,
 	return 0;
 }
 
-static u16 fec_enet_get_raw_vlan_tci(struct sk_buff *skb)
-{
-	struct vlan_ethhdr *vhdr;
-	unsigned short vlan_TCI = 0;
-
-	if (skb->protocol == htons(ETH_P_ALL)) {
-		vhdr = (struct vlan_ethhdr *)(skb->data);
-		vlan_TCI = ntohs(vhdr->h_vlan_TCI);
-	}
-
-	return vlan_TCI;
-}
-
 static u16 fec_enet_select_queue(struct net_device *ndev, struct sk_buff *skb,
 				 struct net_device *sb_dev)
 {
 	struct fec_enet_private *fep = netdev_priv(ndev);
-	u16 vlan_tag;
+	u16 vlan_tag = 0;
 
 	if (!(fep->quirks & FEC_QUIRK_HAS_AVB))
 		return netdev_pick_tx(ndev, skb, NULL);
 
-	vlan_tag = fec_enet_get_raw_vlan_tci(skb);
-	if (!vlan_tag)
+	/* VLAN is present in the payload.*/
+	if (eth_type_vlan(skb->protocol)) {
+		struct vlan_ethhdr *vhdr = skb_vlan_eth_hdr(skb);
+
+		vlan_tag = ntohs(vhdr->h_vlan_TCI);
+	/*  VLAN is present in the skb but not yet pushed in the payload.*/
+	} else if (skb_vlan_tag_present(skb)) {
+		vlan_tag = skb->vlan_tci;
+	} else {
 		return vlan_tag;
+	}
 
 	return fec_enet_vlan_pri_to_queue[vlan_tag >> 13];
 }
-- 
2.25.1