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:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        linux-kernel@vger.kernel.org,
        Simon Horman <simon.horman@corigine.com>
Subject: [PATCH v2 net-next 5/9] net: dsa: tag_ksz: do not rely on skb_mac_header() in TX paths
Date:   Fri, 21 Apr 2023 01:55:57 +0300
Message-Id: <20230420225601.2358327-6-vladimir.oltean@nxp.com>
In-Reply-To: <20230420225601.2358327-1-vladimir.oltean@nxp.com>
References: <20230420225601.2358327-1-vladimir.oltean@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?H1rJMhvxAZm9EEfs0UPy2PhbsHzT0iAr3+lwWO2F109m3mnvP+fi4hTzATwU?=
 =?us-ascii?Q?daa6eZmTGgFZhJsZF2dHJTMah2mWDUeOKm+HxIhL91hvfYd7LpiG0ruXkjgP?=
 =?us-ascii?Q?0SdY0SlGfJ0j2DpRmtDeoHU6DPrk8iet6j2zlFhqij4UMKl4VMf+hbZHtgq3?=
 =?us-ascii?Q?eSwEUTuI3uTv2dt2cV3qth9I6Lsv9g7s8P4aDqgys561rChJQEMEBXL0ydhJ?=
 =?us-ascii?Q?jiAWWhC69GE/JMkAllN0OSa+mymwMLCxA4PU4xIsiYcFjWwPwaFO4qcACPOH?=
 =?us-ascii?Q?RfBmuYIfYKNuvm1zqlYoo4NRl3181WKHTX3gmxW0gMRQpy4EMK6NWYg8xSWX?=
 =?us-ascii?Q?DSxvOG9Qn6nhWvF/pmYugKpdXR+UKxmcrsO7WHteyEXbeuwDDwF2EUIB9dy+?=
 =?us-ascii?Q?m/7VfbY5c6YWNbgAhR5kAeV/of8YwIktxbIMfKvJawRfVQjmxHLgDXD64E0f?=
 =?us-ascii?Q?Zar3BCwo2a/D9xqSZcuGtLrOld2IPit/6sIMFu1r7y3zWb3HqWqHMrwj4ZF0?=
 =?us-ascii?Q?gfOW57GU/NadYhG0Th95tUFeCx0YHh90E4I5ARLFVAdM7xGDvc9NqwKUDTrJ?=
 =?us-ascii?Q?mT7N/lZJwKk9iVoj6s4BJ/Jl1mMPwlgorgH+3gJOnl9WGPI2TDSWdfG97Y84?=
 =?us-ascii?Q?xp96ZbolvS1aXEYJlyy/ETKPexFdGPYU+jD6esG4vuSe8XIq2I7lHormNq3z?=
 =?us-ascii?Q?+yYxYkw/2rRV1IfriHfcNUhh6xT0sqY2hAv9V3ZqIUrEK6rWkLhFh1n2SmGL?=
 =?us-ascii?Q?kxskXMziItOhSHvmNZzrx8qqcfBi5LTwM/1Ud0Pkz9QXubB/d5iYGZbqkBID?=
 =?us-ascii?Q?s88yr7YwpB6oCgjhf5i0O2zlkZ967ipRLF6QhzU8NSyWLGdQCeZHMFpGJTIW?=
 =?us-ascii?Q?LsAIXFh4G5Fh5zlDKwix754yICd/f6uxUBZ76IIT4IwK2OtLtGnlCfSl/kmp?=
 =?us-ascii?Q?dM2g5zbdp+qTP8ZJ67Lezzhu/RnTtMUPunmalc/5oxwcq/2zyoFMd7feaNOd?=
 =?us-ascii?Q?SuwJh/nkF5b48w2S25pedUoJyGLwjn8sGNeXKnRn1+Qzij3xleWL3NgxBqv4?=
 =?us-ascii?Q?rgfFAwDFF9y05OEqZrflncfG/7/V8n5RLkn/gNXWyXCuP2knhmVhms7k8n4Z?=
 =?us-ascii?Q?a5qagc70N9FPvaJwxLo7m3BqpJL9ibvlAtrFZ4gPy7L+OpZxK2M6W1Ya0cTL?=
 =?us-ascii?Q?/q1NuDGDcQrLNZ2FLFzob74H1WWmNg2BRRhNkIROB87QNr9siBFFdsPn6cQI?=
 =?us-ascii?Q?VAHeEkmvqCIrnll2z/aAQGlKmvWZHM1q2ZhPg6YsBvqIximeWaLAbeXrCbrX?=
 =?us-ascii?Q?15uNbutxeqfG1N/D4TGVGgA7Z6KVfs9ub/onezIa7hldlhZ4HQBBkr394b/0?=
 =?us-ascii?Q?3FZE+l/kvnJTtBACUOEyVLqATA7IV1xEYkPkEQ95a7vBJuZek8nRPxpEn+Pv?=
 =?us-ascii?Q?Go4Z9fC5ftD/xzjROqvUlNniUtc8F46/38gkNzmJIg3jByRjJSqRT/PopH5H?=
 =?us-ascii?Q?tqiiPDCp2bR5585IWHc2hrztiEhGTVtAvn73auoIGK2GejEXPTkIyhFGoq5o?=
 =?us-ascii?Q?sBlypSCDUGKC9+1PYwVmwirFYT4/rCXzRXi18t7lLh8XTwPdpdLmNP6vlpcz?=
 =?us-ascii?Q?Uw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 96dde338-b4f8-4fd5-3d78-08db41f27244
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2023 22:56:15.9452
 (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: MlHW8kGpgNiU7dVGE7xP7hZeRM3Ae32xHOqXvljW/+MTrOwVyrSJx/teHxJxPJtUz/XpUlbaKfsXRU7LqnzBMg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9213
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
        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

skb_mac_header() will no longer be available in the TX path when
reverting commit 6d1ccff62780 ("net: reset mac header in
dev_start_xmit()"). As preparation for that, let's use skb_eth_hdr() to
get to the Ethernet header's MAC DA instead, helper which assumes this
header is located at skb->data (assumption which holds true here).

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
 net/dsa/tag_ksz.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
index 0eb1c7784c3d..ea100bd25939 100644
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -120,18 +120,18 @@ static struct sk_buff *ksz_common_rcv(struct sk_buff *skb,
 static struct sk_buff *ksz8795_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct dsa_port *dp = dsa_slave_to_port(dev);
+	struct ethhdr *hdr;
 	u8 *tag;
-	u8 *addr;
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_help(skb))
 		return NULL;
 
 	/* Tag encoding */
 	tag = skb_put(skb, KSZ_INGRESS_TAG_LEN);
-	addr = skb_mac_header(skb);
+	hdr = skb_eth_hdr(skb);
 
 	*tag = 1 << dp->index;
-	if (is_link_local_ether_addr(addr))
+	if (is_link_local_ether_addr(hdr->h_dest))
 		*tag |= KSZ8795_TAIL_TAG_OVERRIDE;
 
 	return skb;
@@ -273,8 +273,8 @@ static struct sk_buff *ksz9477_xmit(struct sk_buff *skb,
 	u16 queue_mapping = skb_get_queue_mapping(skb);
 	u8 prio = netdev_txq_to_tc(dev, queue_mapping);
 	struct dsa_port *dp = dsa_slave_to_port(dev);
+	struct ethhdr *hdr;
 	__be16 *tag;
-	u8 *addr;
 	u16 val;
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_help(skb))
@@ -284,13 +284,13 @@ static struct sk_buff *ksz9477_xmit(struct sk_buff *skb,
 	ksz_xmit_timestamp(dp, skb);
 
 	tag = skb_put(skb, KSZ9477_INGRESS_TAG_LEN);
-	addr = skb_mac_header(skb);
+	hdr = skb_eth_hdr(skb);
 
 	val = BIT(dp->index);
 
 	val |= FIELD_PREP(KSZ9477_TAIL_TAG_PRIO, prio);
 
-	if (is_link_local_ether_addr(addr))
+	if (is_link_local_ether_addr(hdr->h_dest))
 		val |= KSZ9477_TAIL_TAG_OVERRIDE;
 
 	*tag = cpu_to_be16(val);
@@ -337,7 +337,7 @@ static struct sk_buff *ksz9893_xmit(struct sk_buff *skb,
 	u16 queue_mapping = skb_get_queue_mapping(skb);
 	u8 prio = netdev_txq_to_tc(dev, queue_mapping);
 	struct dsa_port *dp = dsa_slave_to_port(dev);
-	u8 *addr;
+	struct ethhdr *hdr;
 	u8 *tag;
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_help(skb))
@@ -347,13 +347,13 @@ static struct sk_buff *ksz9893_xmit(struct sk_buff *skb,
 	ksz_xmit_timestamp(dp, skb);
 
 	tag = skb_put(skb, KSZ_INGRESS_TAG_LEN);
-	addr = skb_mac_header(skb);
+	hdr = skb_eth_hdr(skb);
 
 	*tag = BIT(dp->index);
 
 	*tag |= FIELD_PREP(KSZ9893_TAIL_TAG_PRIO, prio);
 
-	if (is_link_local_ether_addr(addr))
+	if (is_link_local_ether_addr(hdr->h_dest))
 		*tag |= KSZ9893_TAIL_TAG_OVERRIDE;
 
 	return ksz_defer_xmit(dp, skb);
-- 
2.34.1