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 1/9] net: vlan: don't adjust MAC header in __vlan_insert_inner_tag() unless set
Date:   Fri, 21 Apr 2023 01:55:53 +0300
Message-Id: <20230420225601.2358327-2-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?T46/nrInAgsV9YpHhwlNybpGThHwEPTOVWgGkIBwK6b9mEiQpbNHEgiqiYxp?=
 =?us-ascii?Q?bSlJuPor7qqwLE0YU2diZM9LDsamfDqn+Sl9rE50LZLbuhVPDs1r7XVM1r4G?=
 =?us-ascii?Q?JXGIYyh2wrtuFm2sbJxG2f7B7iSxfFPjeuHVOZt0bKOnbwrlxPvhEbr1pmS3?=
 =?us-ascii?Q?1t30JdgQv9CzYZZAspT7FaGj/MTQOrKBPEDyK6Ydc4cvQgOhjGZDom9H2C0n?=
 =?us-ascii?Q?GRH0Mkc3nEQFPHeOxEzQI+aZ51myG92QaeS3FUOub2ZTA918MeyJETmOTZfn?=
 =?us-ascii?Q?pStcNZ1QDofEEUrfad8BrdvU21RavTBoHR7Oru/b66DvTJ1YFuW1nfwmwmW+?=
 =?us-ascii?Q?eR8u8xF3t53Jr8hOGLAkuUMnNHnvbdQxujD98PwLmvP2JpZLQ6kKWLRGYWOI?=
 =?us-ascii?Q?XLjiXy2BQf5n/ulj8q11poF0WjaobrjywodDTtNJGSfCX1RZ2bsgVXuWHGuS?=
 =?us-ascii?Q?U6MZG32UFCmjR0ph7/ESjQAodKfIbBa4ib9Y6aZeQ00NU6Q1XQHJHnXvZdVw?=
 =?us-ascii?Q?FLjNkVpV6b47htJlkkhe1hv3eN7c8M7mwSnp5c7pX53excnafKZv5ofhR1Ad?=
 =?us-ascii?Q?UDE/lK+B/N15b2Jlf4BRdi6D8K129l20cGa01v4O00vODFR1anWyQkPCwYkz?=
 =?us-ascii?Q?snn23KxdEDpR9AKSzA3I/ypzCwIxnpgbBZ0gCRVfpvQ7BSe4Hb+BOqNHXZD4?=
 =?us-ascii?Q?m+6pECLeCxUJbSb77OfKfFoka1W9GQGEF2VuOagsAMpRBbRU91VelReH923x?=
 =?us-ascii?Q?ii8nOuKvkkWA2XDByk8V/SlvrvGYNvbkOwk21XXrr3wQJxa0OBFkN97vsDuK?=
 =?us-ascii?Q?Sr6hrHvTjAIOhO+s23BjCHmEkygZ6w4QV16HNGBTQKK4ail7pfzGNzrlGDi+?=
 =?us-ascii?Q?gkpUhIo+qdNV/y6AZp6AdPf0bsLZhVHPOu/5aTZe3rNZ/5bX3YJWUJBO7sKf?=
 =?us-ascii?Q?0gvMnh2D4rknXNkNwf9eHooyFDXkokH4z8Ym7tsCYADTt1+LHxGTilSY1Zr+?=
 =?us-ascii?Q?7BjmvLWCzLw5OlffBDOJh526wiLHjvXoNgbckpl+Hm3LFbfH9SEh2WxnG90h?=
 =?us-ascii?Q?TSZjm8zP0lqRUhtJu7VFISCYyh037bfGv3k/nb8U5pbLKA3PrD62p869qhWD?=
 =?us-ascii?Q?Bi+Tl1AXPHP1wwgnLWwMo0LYNbxjHMyqR0LN1sYUZJA0XEAdHKd9x72aQ6wX?=
 =?us-ascii?Q?4/L7SzzZdrgn0aTvgGP9VtFVhxS60fDY58jMmYYZPmw6Cf+BzeamdAk+vekm?=
 =?us-ascii?Q?Xy5XxO1kPeQ3bO2MOVQ3Fm00lk7kIh2NkWoL+pDoYLiDyYPITwrp788sUBaM?=
 =?us-ascii?Q?s65lFu9BvreNulxiHYFa5PtqFUmOLYV4td4h8cmnr05JpdNzh5ER/eYkqJfr?=
 =?us-ascii?Q?O59LIHMhU6w3tgu0jpzve1J/XLH8Q08plpnBkzxtpj9h3y4regCTw0dolQoX?=
 =?us-ascii?Q?QXFdCzREngxTXhFJHkWvaGEAy5JR4rfSoapGG8XL/oYi4tVvme6PaIlokZmr?=
 =?us-ascii?Q?lIjenTk6LGIN3mYGcqvlMJkEYI9GqJq84nLiqThYztZSOYHHvYB8rGPxt1vJ?=
 =?us-ascii?Q?2i3XiKDXEMnuWJNSWBihQSnWARBiq48FyvC/Aq+SqLISL4mUQ9tKicj9FS+y?=
 =?us-ascii?Q?ig=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9b0d48ca-7637-4674-a67d-08db41f27081
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:13.0029
 (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: 9fZiXbFr3hdJJ4wveZgW25U0pL4/ZSffIaxi4GPHC92FyW9dJEHebr2eBG4YPZgG0tl08lWh6dHLmk1lhvCwww==
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

This is a preparatory change for the deletion of skb_reset_mac_header(skb)
from __dev_queue_xmit(). After that deletion, skb_mac_header(skb) will
no longer be set in TX paths, from which __vlan_insert_inner_tag() can
still be called (perhaps indirectly).

If we don't make this change, then an unset MAC header (equal to ~0U)
will become set after the adjustment with VLAN_HLEN.

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>
---
 include/linux/if_vlan.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 6864b89ef868..90b76d63c11c 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -351,7 +351,8 @@ static inline int __vlan_insert_inner_tag(struct sk_buff *skb,
 	/* Move the mac header sans proto to the beginning of the new header. */
 	if (likely(mac_len > ETH_TLEN))
 		memmove(skb->data, skb->data + VLAN_HLEN, mac_len - ETH_TLEN);
-	skb->mac_header -= VLAN_HLEN;
+	if (skb_mac_header_was_set(skb))
+		skb->mac_header -= VLAN_HLEN;
 
 	veth = (struct vlan_ethhdr *)(skb->data + mac_len - ETH_HLEN);
 
-- 
2.34.1