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
Subject: [PATCH net-next 5/9] net: dsa: tag_ksz: do not rely on skb_mac_header() in TX paths
Date:   Thu, 23 Mar 2023 01:38:19 +0200
Message-Id: <20230322233823.1806736-6-vladimir.oltean@nxp.com>
In-Reply-To: <20230322233823.1806736-1-vladimir.oltean@nxp.com>
References: <20230322233823.1806736-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?BSQNfs9N8YCoC/EPAiNueapYRO7JCAbUo6YWnGwQNoTLWrn54Nt2yCFgtq7D?=
 =?us-ascii?Q?lFNKCv2stwB6nX1ddm1L7sn8OS2hVAGG3D6DUBItAWrkGXnNTEIqOCiYVcRK?=
 =?us-ascii?Q?no77ntYu6YdJ42LXD7JgHZfMk1SHf60ZQ7+sLYykXPJ9jsobuG7fHwOsfs2H?=
 =?us-ascii?Q?CS7TR0TkhQVGOPAjjqfw7kTvAVqnfTYDWzIjlpGZttwIgRy1Dt5akW8xVTRX?=
 =?us-ascii?Q?LiEiY25FTjRiTRqwo13q2ACbJsxIzjMAHhfHiGT9vLRTWbzJGjY4j/b9ufeZ?=
 =?us-ascii?Q?/IwmFbaiPN9D8ZeK8+/sizJWXUD6hiWCeplVZyPdV1JVutAmzlHX0d3DLzG/?=
 =?us-ascii?Q?26+3VWSRK8jQekwvnPBrMCpvqsWNL0z1MCwY+m3RzOKw/V5CmAhpqWnMRf2Q?=
 =?us-ascii?Q?6NZOcWXgjayJ9i8UhC15hPth0q74vKaP2z6RZvu0vUsfJ+oFRpF4JBVTiya7?=
 =?us-ascii?Q?8Xt8d8nlR8caHIowGzo+83WyD7us5zLg8E/ec/3ap7eIeqPi8y2uESCZbQUT?=
 =?us-ascii?Q?AtPXQPgREbcvqD3k6Nl2aRWAo9TYdxXiX9iylwh8u4pp/oYaMpo6WLJnnTQq?=
 =?us-ascii?Q?YKRV9W/Ku9qbbaYKBOZgM4XgKbRHerRV+rCnpriUV6U7hr7z2FxBvKcF8fNV?=
 =?us-ascii?Q?N6Kzdw7GaZfC+sv8aNPUFB2tWDtsGxGqsuHJNprT4+g6PwnPXMK23uENQJIG?=
 =?us-ascii?Q?t+tS5oXFnnBZTpc6BtW95i6LxBOrsBulx0K1MSNai66x/d57CGyU847UVwz7?=
 =?us-ascii?Q?a8weMg0aZb419su7U5+QjrA3MJOmRK+mOl7hCCSOaxN4EVIUs6UFzb0gwS7v?=
 =?us-ascii?Q?HscxgVsQPHgvJO7Ev+cYErEnLxuW/mvSvM5+mOaaCgKla9TQ92pZlYTfLIbH?=
 =?us-ascii?Q?W3DAGg0eTiRNcTUz4+WVT8bDssyYyLBULeCBkCqDB611S8Mx5EnFWC8zzjZR?=
 =?us-ascii?Q?F/VW+8JB0oHwwC4JsrtTAAGorg59lrTK4VfNUZrKx/eJD8h3idcEIWgQBFyM?=
 =?us-ascii?Q?O9z1Ghj79JH7Lv3+wB9jF9j57bW0LnslmtGMFFaJTaP3FSkWn9wQvYyrzzxn?=
 =?us-ascii?Q?kJydBoqg0fUu1S7blYcmzLkhSn7gCZNqTfUy2r9zMqjP18RhHxtNjhH02G9A?=
 =?us-ascii?Q?mg8sp4BDX8Wu0KmBeU8gsKrXsySymJwi1EISTuQhwfqfCp5xepTCz7++ouMu?=
 =?us-ascii?Q?RYjZ/2m0UoWW+heG/0OYqQfGjznnAw2n+wd3uWi1bUVYbv/T+mJIRqPfUd6R?=
 =?us-ascii?Q?7dO9Wh/i5EW8RNsNjFLvOQOKNhEs6jj3KBA6lJnUUFn+oqU556Zinuukt5jA?=
 =?us-ascii?Q?ZbohnMvcTaG8rVnklajh0wLT7IGQPXVZyXCL//AzHN/KViKfqnxE36iHXxWv?=
 =?us-ascii?Q?zB9v2XK8jOTROYE9sgP6UghomqpidjCTlIqeAjY+WjfoPS0srzsWpaE2Xc7e?=
 =?us-ascii?Q?6uHhCf5yBE++u64D62/zKs1806QbVeah8dPEwg+19P5MSL36zxgFphDcJrzj?=
 =?us-ascii?Q?OpgqxujCOTVUaJ38FVQaIMyCnbJcb/9j2Jo5HqDjbdUWQXtU3DF2/3cjoZPw?=
 =?us-ascii?Q?a9d6MrWPICprKWSKIqN7uuRm0n7a6rb6mFuRWZ78QkEbYfjoy4vfCldA6H0R?=
 =?us-ascii?Q?4w=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 798b6d7f-d903-4ce5-0f91-08db2b2e90a0
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 23:38:39.9518
 (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: nQx29gAAWjr7iRt5JqVzAz3r4XGqMzS74O6sFbFPafJP20ug/OpuTnQYgF691cT+IQaLMrffEPUJ5zSdYB1PNg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7263
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=unavailable
        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>
---
 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