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, Madalin Bucur <madalin.bucur@nxp.com>
Subject: [PATCH v2 net-next 0/9] Remove skb_mac_header() dependency in DSA xmit path
Date:   Fri, 21 Apr 2023 01:55:52 +0300
Message-Id: <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?ve94UxeB0xCY0yfWC5jK8T8QmLhhMPzx+29QUk9jNUyVfAL+Waox9Naz4e1N?=
 =?us-ascii?Q?d0n7xbWeltLWwDj80wGqyAwtcrMwkM+1zy9rGMJAD8nCJliWEEHsDz5reLrB?=
 =?us-ascii?Q?+U0wJecYSUw5lNHVmsagcLpEsbuKkefFLV2U4JHdMMcgkgsHjTotylZMsOFf?=
 =?us-ascii?Q?BKsWzBsZsqUee42Vo5gx0sNzKRs1zVQ7sfT9khcnjt8D/F4ebTMM9AQMSZZM?=
 =?us-ascii?Q?J0Ri7BAk4WauDFTKm1o5q+YvLw8Cz7vQeDBCfI2wxJmR4v+Wf9VSP9Qup4jm?=
 =?us-ascii?Q?vTiP7JaTnIDzPSaL2VkJvppDINFmqGsUue9Dt6tPb5+2RLEAaOCe5HCrshTd?=
 =?us-ascii?Q?Sfnneox0ZFVdCsNZ2FF5GReMPs6SQaGWDWKCiiL0thBbVdc1NmwMqRUVSDtT?=
 =?us-ascii?Q?DpwDmLeJC+msZFJf4F6l48Krze1YepESPiizNg7KFdcOzEvG6I7gjfvPRNU6?=
 =?us-ascii?Q?nbBq45TgitSDUFCn0l7vACnJKp3aqhMHS88XYT+yvuB8jZwhet4SuSIyD3lK?=
 =?us-ascii?Q?qL/79ssDfxb5QT4kFaZ6jbF+l9G9XMCdMFY6/fHtB+WHnR25A7VhP4ulC6GN?=
 =?us-ascii?Q?aQpFOYOO4k225v8kqnVHGdZorIsKWLnrGF3e6oXA4EnVeZ9f/obY05urtRL8?=
 =?us-ascii?Q?DlAadqrb9pSllFffKFTzaFsP8+470mSg44OFwceSfH+ty1NFcxoV7O5Q3Kbl?=
 =?us-ascii?Q?qi1IV7RFH/YLWUoSJpHWxY7vSNBDGTpmnQQBb2dsojeHadt076/7HQ1bUShp?=
 =?us-ascii?Q?VcVAlvr1gUeiLHSoFlNoxv5vRXDQ+Xm1XVnsohEg9nWwb5jL7qowiAZGZSjU?=
 =?us-ascii?Q?rNlBK+AUN5hIgWNKvwrCd9cpsLsd0dhUKUD0clzbBuql4BoguCOdlFwkkIp6?=
 =?us-ascii?Q?Yze/arjm23k12sxea6/n4NgISbV54FlDRYqWJLCSH7+4k7rHls6BG/smFdtO?=
 =?us-ascii?Q?N7zBGV6vQ+Vh1mGeoUP106wG00m1hoMIIS9Qbw2tY56NUOJq3c0mIKzJEklT?=
 =?us-ascii?Q?FR7J4/r0w/iX1bghDAaFUAlMA3YThbAbctFhTSLLXW9CSN113A0OFwK/6XG8?=
 =?us-ascii?Q?5HQZM5zjn7gpYoEngMbspFvmCD/34I3AvTNn3sn1/dv3gr9a4YC0iXVyAWxC?=
 =?us-ascii?Q?FYS+P42hb0h5u9SPsuY9JvlEWHJk90W4/6Z3WvaVo69L5PcGKjB+K2GU3MDl?=
 =?us-ascii?Q?ZRwHc4ZfCCG2ZHC1r18W2wtD3SKSMvQh2X3fCIthnDjhv73t846C3IIF/4K4?=
 =?us-ascii?Q?NAYPFTxpYixffWcn4xdu8oil2+BpDpDinQHNztPswFSmNzFBXekiESXcpvCH?=
 =?us-ascii?Q?FfBIGf8CypAj7Tn6uMiZdoXtdLwJPIt6p4bI3BHed3dkLXvxeo7PPZ7LHAX1?=
 =?us-ascii?Q?fTXhTJYhBdLrOH6OqecXCt30xsWLhK0D3FwNhKmXDlsMQvMNg3JFZIqu47mr?=
 =?us-ascii?Q?anwc6geS7GSQPSoaT9yRhKHAcbYDofaGQVCcYvOopHo1sUn6f9jxP2G5dkWS?=
 =?us-ascii?Q?PuC2iXH+MEn8mlUrY0VobsKqe+s0+lONqyxQVIkWZpNGuF+0fs7mNSBrknoN?=
 =?us-ascii?Q?J5JMCkvDsqriwokuHOMb5CNeXLkCrzssxY9ZSkoFUlI9idATr/QZcdsHKKNM?=
 =?us-ascii?Q?uw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9bb9aceb-f42b-42d1-36fc-08db41f2700f
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:12.2606
 (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: 1CMJXnxAnMlzZtLUhxzJZauSTAQsw5uO1+z2MaiqEpSfy92zAosX913gYg6aRKpe06s4pKx5UBGk3+JTPaFPWQ==
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

Eric started working on removing skb_mac_header() assumptions from the
networking xmit path, and I offered to help for DSA:
https://lore.kernel.org/netdev/20230321164519.1286357-1-edumazet@google.com/

The majority of this patch set is a straightforward replacement of
skb_mac_header() with skb->data (hidden either behind skb_eth_hdr(), or
behind skb_vlan_eth_hdr()). The only patch which is more "interesting"
is 9/9.

Another potential caller of __skb_vlan_pop() on xmit (and therefore
also of skb_mac_header()) is tcf_vlan_act(), but I haven't had the time
to investigate that (enough to submit changes other than what's here).

v1->v2:
- 09/09: document the vlan_tci argument of vlan_remove_tag() in the kdoc

v1 at:
https://lore.kernel.org/netdev/20230322233823.1806736-1-vladimir.oltean@nxp.com/

Cc: Madalin Bucur <madalin.bucur@nxp.com>

Vladimir Oltean (9):
  net: vlan: don't adjust MAC header in __vlan_insert_inner_tag() unless
    set
  net: vlan: introduce skb_vlan_eth_hdr()
  net: dpaa: avoid one skb_reset_mac_header() in dpaa_enable_tx_csum()
  net: dsa: tag_ocelot: do not rely on skb_mac_header() for VLAN xmit
  net: dsa: tag_ksz: do not rely on skb_mac_header() in TX paths
  net: dsa: tag_sja1105: don't rely on skb_mac_header() in TX paths
  net: dsa: tag_sja1105: replace skb_mac_header() with vlan_eth_hdr()
  net: dsa: update TX path comments to not mention skb_mac_header()
  net: dsa: tag_ocelot: call only the relevant portion of
    __skb_vlan_pop() on TX

 .../net/ethernet/broadcom/bnx2x/bnx2x_cmn.c   |  3 +-
 drivers/net/ethernet/emulex/benet/be_main.c   |  2 +-
 .../net/ethernet/freescale/dpaa/dpaa_eth.c    |  9 ++---
 .../net/ethernet/hisilicon/hns3/hns3_enet.c   |  2 +-
 drivers/net/ethernet/intel/i40e/i40e_txrx.c   |  2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |  2 +-
 .../ethernet/qlogic/netxen/netxen_nic_main.c  |  2 +-
 .../net/ethernet/qlogic/qlcnic/qlcnic_io.c    |  4 +--
 drivers/net/ethernet/sfc/tx_tso.c             |  2 +-
 .../net/ethernet/stmicro/stmmac/stmmac_main.c |  7 ++--
 drivers/staging/gdm724x/gdm_lte.c             |  4 +--
 include/linux/if_vlan.h                       | 36 +++++++++++++++++--
 net/batman-adv/soft-interface.c               |  2 +-
 net/core/skbuff.c                             |  8 +----
 net/dsa/tag.h                                 |  2 +-
 net/dsa/tag_8021q.c                           |  4 +--
 net/dsa/tag_ksz.c                             | 18 +++++-----
 net/dsa/tag_ocelot.c                          |  4 +--
 net/dsa/tag_sja1105.c                         |  4 +--
 19 files changed, 66 insertions(+), 51 deletions(-)

-- 
2.34.1