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>,
        Madalin Bucur <madalin.bucur@nxp.com>
Subject: [PATCH v2 net-next 3/9] net: dpaa: avoid one skb_reset_mac_header() in dpaa_enable_tx_csum()
Date:   Fri, 21 Apr 2023 01:55:55 +0300
Message-Id: <20230420225601.2358327-4-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?Ae8Y7RebDJgBCgaYfNynzCIjx+DQODXw1jbJ0Bfnar0bb5Cj+ROCvwRCFOwd?=
 =?us-ascii?Q?GDKam3Go+tnZV3Gcs4oNxF7PqE1QwoFut8b8/zk5MsQTkvx+zd+7AwHiQ+KA?=
 =?us-ascii?Q?5nGXKIGQZn7k0ntMO6QRrGfy+5SjHmc7hBYwXDSARj76MGbJuhyv5o63PK9a?=
 =?us-ascii?Q?5PIOVp3PDTOf0SfeN/dPIkLF8jxsxgCq38zx5NSvVUFh4WPoauLqhFpvZmPi?=
 =?us-ascii?Q?bvyNqRSjg+FxZaC0A0XtdbHWhsfRN3MQEROcBfbrModaJzr5vXSLgMAIRHQr?=
 =?us-ascii?Q?8WzBrTo7h6n3xDgcBBswZ4aCSjEWEDanWCBcNuoSVYlgEY/nXoMTXpw/iuja?=
 =?us-ascii?Q?dyE8BB9mUs/kjTtNpZ8vFzDs6ogLIuIAoGnJ4+4jYgDUfPFg5lqvfSbVRZXx?=
 =?us-ascii?Q?S4+DVZl6F9j1TUr9LNPhCvbphbU8YN6oIXij7P+gv1/fXz/Y8s6xUuL7YfVL?=
 =?us-ascii?Q?01h49GKW08EdYEJkrOhc3RO3cxMYTLlGw3Z6hktW62kDwpB3rQsVpgOn/n43?=
 =?us-ascii?Q?tf/tv96OU6sViEQl2A+bh3c0IC9NRQLAxPN4o7kopVIBoY1WNQ0xpT+Yk8md?=
 =?us-ascii?Q?Bhjof8ZsJ4+Dvtpn0vI2zFPdfGM2oDza3bHzEQrTQfueQ4S92lKCpWsr+D1k?=
 =?us-ascii?Q?vXN/nou3KFIa4wDNczajuJIqCEaL072/kZdPYMLfnowb5Eq4F04w/h9+EixX?=
 =?us-ascii?Q?Wafo26F4oVadj5KhdC+gMHTz+UaN0moLEDIAtZV6JQKpXRMahXGL5GIfoISy?=
 =?us-ascii?Q?lCTbax1090htrxtaj2VAbmdtpFKmWHMU38hJVm1wAq7gVz+/W6wetdkxT0Vu?=
 =?us-ascii?Q?DkqZvd2d1dMHuL0ZRgCtNPqRnlWBPfGTVby9BvRS8rSaw6OoNv6xiT3VjIdu?=
 =?us-ascii?Q?LlhH9Ags+wbumNn5qijWOGjQ0uFcaA2rE2JdyXgi6gvoBRB3y19nySl+jBB5?=
 =?us-ascii?Q?yxBhAvtjT9wBVv0h2ihB73uvHx36sl+HD5IUj3YATPdv1NGxKFrz6KntEFjy?=
 =?us-ascii?Q?QVXzp1iBZmNuZKbMQCdfjEnyf+t85cM9TnuTgge9l0sKX063otdum7kmLDbn?=
 =?us-ascii?Q?2H6zPFx46XkShTw2vaFkZWnQ843VPtEt65qMZrbQpgrH1T2Zc7+LxTO+pvvC?=
 =?us-ascii?Q?fRkfWOD3zA7EXH6HeHzN0er7OmkA2U/5ENY/odwObTxfYWyv0+Ii+MhrGZJp?=
 =?us-ascii?Q?0+xR5TJgviLwQwbAe9oHVYexOLKcKbSjZbTyHcptgpQvZ5JN3oyOybLq+mGr?=
 =?us-ascii?Q?08IRdJbIXejjQetD4VaJpf97/0wooxdgH5OZZcA+6TfqCJ2wiCD+AyGvIEVT?=
 =?us-ascii?Q?medAh6AxPH00m3M7scqlqjjE9uzYS8azlprifTupo25ml2nNsFuUjhLAuC0/?=
 =?us-ascii?Q?2Gd9V7yxCodDZgflxjLdSBjXCc2/dS6ESSffywK1TC6coQhXpHuKN2XfWvCN?=
 =?us-ascii?Q?rzmpAuhzxO8iWz6nhgCjoQ+Ynqxf23g3UY/lRedBRo2i80ZVdwAbQReIs0O3?=
 =?us-ascii?Q?CzWFEAlsKFiH4tp60aUZbetr14/0gtMPFLkIfBX2MShZT9g6YldNM/q0y6Lh?=
 =?us-ascii?Q?zkvdJVni94KE5+tJBri+Nv99oBRleanfa/MiXt60mPhA1rghmsJhcVDGkd6P?=
 =?us-ascii?Q?NA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 740889cd-4b4c-452b-e7c8-08db41f27168
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:14.5078
 (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: fEhX7h+3Rybu3H4Yzy5bRC6SFLUxCzfPRBnuGz8RuVfC7gw8T0glfSR7II7TkrjpVQFiO/F5bmU59Kz/mlOaEg==
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

It appears that dpaa_enable_tx_csum() only calls skb_reset_mac_header()
to get to the VLAN header using skb_mac_header().

We can use skb_vlan_eth_hdr() to get to the VLAN header based on
skb->data directly. This avoids spending a few cycles to set
skb->mac_header.

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>
---
Cc: Madalin Bucur <madalin.bucur@nxp.com>

 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 9318a2554056..1fa676308c5e 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -1482,13 +1482,8 @@ static int dpaa_enable_tx_csum(struct dpaa_priv *priv,
 	parse_result = (struct fman_prs_result *)parse_results;
 
 	/* If we're dealing with VLAN, get the real Ethernet type */
-	if (ethertype == ETH_P_8021Q) {
-		/* We can't always assume the MAC header is set correctly
-		 * by the stack, so reset to beginning of skb->data
-		 */
-		skb_reset_mac_header(skb);
-		ethertype = ntohs(vlan_eth_hdr(skb)->h_vlan_encapsulated_proto);
-	}
+	if (ethertype == ETH_P_8021Q)
+		ethertype = ntohs(skb_vlan_eth_hdr(skb)->h_vlan_encapsulated_proto);
 
 	/* Fill in the relevant L3 parse result fields
 	 * and read the L4 protocol type
-- 
2.34.1