From patchwork Mon Aug 9 11:57:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 494869 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A988C4338F for ; Mon, 9 Aug 2021 11:57:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B41C61052 for ; Mon, 9 Aug 2021 11:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233565AbhHIL6K (ORCPT ); Mon, 9 Aug 2021 07:58:10 -0400 Received: from mail-eopbgr40056.outbound.protection.outlook.com ([40.107.4.56]:40885 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234753AbhHIL6I (ORCPT ); Mon, 9 Aug 2021 07:58:08 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O9mBYeE2RlryBu9hU+tOpcwe+DpxkANSKeBSC6gat8GeB+b65dFnhf6gsm4pW/zfefaEHATIc+hmfbrUN3tk513sD1sD1N3lutLock5PL910L3WeFmYKOhpHW0PLUskFExLGs59EtifMG2ZmCCJwoIJaHiSuvNWoVDFWPBrR3niTYaIvP9bgylIbW1yFCDxkuLEAAZ7hjKBhTf39RfVPvWiQkJaGdiwFK4TeTJqMc35itHNu9G7UPizrss38QtKKyozsBvbNEAHvOQ9JYSPYCmp8N7ByPhF7YRDMgfFgu1jBbNlVvt1Xh6rujVTHQghBPtyETJRYPtlzVsHSxjZ8Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1QJHAeSk3Fsfy49ttyF6P0515sbYhrDghDYzVYNQ/Vk=; b=DenJ4S0kWpXsa6bW6wcyYS7MDym4ZJd8+n9lprTBD7QNWldETzToKEnF+qByFkuA4TsKWmrfmfZqiBzw89qCyNo2NElvb9+gZw5SN3B2hVxfMqIDTPTwW7q5HS87nEsb5lW3ZIAQ2DOKexDAMlOIgmxxJ19NlygP/lh/qKvL5hKrcNdk3LoETHGNm/k4O2sywL27us9CoeD/7qch/RInFrC40VcAHfhFODATDlddwSSWM6T9wam7EYRHaSotHtQfm4GlITxVarZEcKReELFEGtfUm7ZyoyQxcnFHwtdc10YVXGr60nPkXAthFrGCnuQRmmP8oA53WDsM2CvX/ckBOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1QJHAeSk3Fsfy49ttyF6P0515sbYhrDghDYzVYNQ/Vk=; b=hHTFPEhgrOas7truK31Ye568YubrZw237+5X0ZMWalU6IFRkovY/15BFwWXArq+/MSwDNvBE7JE3JWY8huk7bcauwfnbSLbLkybvysp1CO2pJ5ZAqF79y/cd68n5auTs5XaB4WELnuGRnyW1bpMozNOnLt0XJl1bt1MogkorTTY= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3712.eurprd04.prod.outlook.com (2603:10a6:803:1c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Mon, 9 Aug 2021 11:57:45 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0%2]) with mapi id 15.20.4394.023; Mon, 9 Aug 2021 11:57:45 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Vladimir Oltean , Linus Walleij , DENG Qingfang , John Crispin , Sean Wang , Landen Chao Subject: [RFC PATCH net-next 1/4] net: dsa: create a helper that strips EtherType DSA headers on RX Date: Mon, 9 Aug 2021 14:57:19 +0300 Message-Id: <20210809115722.351383-2-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210809115722.351383-1-vladimir.oltean@nxp.com> References: <20210809115722.351383-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: VE1PR03CA0012.eurprd03.prod.outlook.com (2603:10a6:802:a0::24) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.25.144.60) by VE1PR03CA0012.eurprd03.prod.outlook.com (2603:10a6:802:a0::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Mon, 9 Aug 2021 11:57:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 046e2b5c-7295-4695-dabe-08d95b2ce638 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3712: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BhmE978uDa9N/OMCOhePDiWKY1tXFxHsm7mgpKneMUIz/Yz2VJSeIpNDSe3maAjT+4T08Esmgc1AjNR6pobBh5gW0M/5dNykk1oGPEFg+7Zh53wCaHwbgyQjTwxJ0wl3bP0LQQWodEE0NO3404dxqbsK+05VOkDSJRgnXCOlWGVZCeNvITVG7BnbXWUvaf0zwTacx4ptt8timvBm4w8POQPY3UtIhMoCWovvSxuX+HFhlm9+arzsDOWQ1hnBd3tG8QdtZlJ0oYXnMt1VbBTPOd7/m1TRzTMbHcY7TeA/AonnUVeW9SfYqZp3ohdEsK+np4sYnPMb8ymjDHiRZhacUflVrMI56V/+JLNKRC1K9gpmsRRPNL91+0DfYVmmsTZDm0XOx1km8qNXVNXF1SJympp6iNm5V8pmzIC2PBocxdEC6jWBvi3RhNQ0brpVTAHgaPxZ285IYmZu/LgygPA/vxJvAN9Zzu8JZ7FjZWrNeTdB5Mz6ZeKQJdsY8EdF+hm7li/jtog8mMhI+2m88JWk/mZROO5bVi+7MCkxHS6l4mLj0bvBOcAd4Mgl2aKp+0N7zao4a60dNWQ7rp041N5vj2n81b1JJdXvc5E5e+lL17a+oXHElUJ8VZAFPPc70tWvigNPG1BCvwxc/p4p2DZa01ZRFsdAk/IKJ57ayM9UqSXoznfEzlww3I8lo+33sakYj79J72c6uU0bB3jal6g1lIjiLW4zh3Ro+RC/7NZ7SlE= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(136003)(39860400002)(366004)(346002)(44832011)(6486002)(6666004)(5660300002)(36756003)(52116002)(38350700002)(4326008)(38100700002)(2616005)(86362001)(956004)(66556008)(66476007)(7416002)(6512007)(316002)(66946007)(26005)(110136005)(2906002)(54906003)(6506007)(1076003)(8676002)(8936002)(83380400001)(478600001)(186003)(83323001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oVC9aGJ9GV9L5RAZQb9J0tbr6O8p9nbaKSWoUPmAE5syNa+S/MVAEWA286NyLHlPCvNOSzt+adt9Sd4KA75eM/V47PDAw0dDfuEx5Rk+9Sw8tQspLTcsuGfaDNozTbFqrpI5kHXvjSxQNOCojBOSNAGqwYl8hJ8oA/mjywt4ta70vNiolIOpDx/mlDfKfJ2SADuupmqHPUX3ZswDIgVBQtErUIiknyQgFFoO83pgTVenjEjM5gEKQRrpf4uDz9RURKR+4Y9Jy2whjUkmBngwh6wcGKfSbw7GUMaP2k/GJXFpnXW4MMtfliQohqzH550kts7RZoDL7VkFctDy0Y5XrfAU+o6H080en0dzkLo1MaoubU2kTcHTK5xA2pq28AzK00Yovn1TIrAMOdgAxwyCXC+lbw+ZgLnbIozrqUoyoH/5K435RJkBkSZ0HxsGzTNw077GhUzsFd9CFcIv7kDiMVPMqGEcqdjkVPrZRMRgyhJErqwncdOMCgpm4sC1Jojv3QwMosxGU45SOrVQ0yNdFep/D7h7p1wAW/3cVB9p/50J1IzvhEVQjK3evu6X8GFkmHLdO2SVOq04QKG50dWwNUjHLgt5cLS1wXL8NBWNfGaruf1TbxTgEGfbkFl9Lmbd+WS3yleuK/A5TRwFOn+rTPyb5FjzXxzuVQ/1hJgMEwS8PefTMHa1Ab1tFOeiiGjFjVj3+uO9bbX2zCO2wRpx+3aZ1RGKOmjIMwZIfwc+HiiLHSGP45R8BltmfBRQAxmuhilRVwjWxl7NI9rycGiN8nPEZf0siZXHCmgwQMxTkD3s3nDQGGoosGvueQ6GOcz/B8r0TiqgooS5GPAw5Gfic2IkwvhR0D3eyke04nTbea9tvU7KO8H05u1jBfRPCDq6KC9DVFFCjZ7xZxo5UNmuv6o8Pr+HJ/MBOSZ3WeDejnViBtpWHkHlZoPE9uSAwXULWNfMgZ07/fk54vqXGwULrJoD02Rppd7UhXV6kapxP8pJiAEcUo78clk7dOvCqsXT482p4shmJO8EAVSPpzSKuV3NXeFX2/23VY171R7aF02uAlv/O+Aa2DoBu/zuxOix0DU3ozGdF2CvpN1dsE+uaMmaXJPjGuWXs4uImO1mVa8hYpP0VNJfBEPaxUOJkDK9nbJw3wadC9xxduGmWNgOuD3upOvk6XxJDuIG2+gHydIR2APFm2AMOXyINdt5UXYNWDlVSSzaQxdIGV9EQ0u3TOlDLd+LS1UbOhq/rG39IFMNcZsxaXoOMw3a9cRXmL3o0tNvDTUqd9Fgz/sBDP9bHtLuRfsprlAfNng484LKYtSmC1dQT+0DMzCrZ0lBnjy8 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 046e2b5c-7295-4695-dabe-08d95b2ce638 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2021 11:57:45.0679 (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: uZjdk0esPH2HCVQEka6uA2I5rbBOhCjNp7dJaqnkIGIUh0YTFacCSq85FUvS7oai6bBcWtIy4prlL4J3bQ9bRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3712 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org All header taggers open-code a memmove that is fairly not all that obvious, and we can hide the details behind a helper function, since the only thing specific to the driver is the length of the header tag. Signed-off-by: Vladimir Oltean Reviewed-by: Linus Walleij --- net/dsa/dsa_priv.h | 26 ++++++++++++++++++++++++++ net/dsa/tag_brcm.c | 10 ++-------- net/dsa/tag_dsa.c | 8 ++------ net/dsa/tag_lan9303.c | 5 +++-- net/dsa/tag_mtk.c | 4 +--- net/dsa/tag_qca.c | 3 +-- net/dsa/tag_rtl4_a.c | 5 +---- net/dsa/tag_sja1105.c | 4 +--- 8 files changed, 37 insertions(+), 28 deletions(-) diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 9575cabd3ec3..8a12ec1f9d21 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -452,6 +452,32 @@ static inline void dsa_default_offload_fwd_mark(struct sk_buff *skb) skb->offload_fwd_mark = !!(dp->bridge_dev); } +/* Helper for removing DSA header tags from packets in the RX path. + * Must not be called before skb_pull(len). + * skb->data + * | + * v + * | | | | | | | | | | | | | | | | | | | + * +-----------------------+-----------------------+---------------+-------+ + * | Destination MAC | Source MAC | DSA header | EType | + * +-----------------------+-----------------------+---------------+-------+ + * | | + * <----- len -----> <----- len -----> + * | + * >>>>>>> v + * >>>>>>> | | | | | | | | | | | | | | | + * >>>>>>> +-----------------------+-----------------------+-------+ + * >>>>>>> | Destination MAC | Source MAC | EType | + * +-----------------------+-----------------------+-------+ + * ^ + * | + * skb->data + */ +static inline void dsa_strip_etype_header(struct sk_buff *skb, int len) +{ + memmove(skb->data - ETH_HLEN, skb->data - ETH_HLEN - len, 2 * ETH_ALEN); +} + /* switch.c */ int dsa_switch_register_notifier(struct dsa_switch *ds); void dsa_switch_unregister_notifier(struct dsa_switch *ds); diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c index 96e93b544a0d..2fc546b31ad8 100644 --- a/net/dsa/tag_brcm.c +++ b/net/dsa/tag_brcm.c @@ -190,10 +190,7 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev) if (!nskb) return nskb; - /* Move the Ethernet DA and SA */ - memmove(nskb->data - ETH_HLEN, - nskb->data - ETH_HLEN - BRCM_TAG_LEN, - 2 * ETH_ALEN); + dsa_strip_etype_header(skb, BRCM_TAG_LEN); return nskb; } @@ -270,10 +267,7 @@ static struct sk_buff *brcm_leg_tag_rcv(struct sk_buff *skb, dsa_default_offload_fwd_mark(skb); - /* Move the Ethernet DA and SA */ - memmove(skb->data - ETH_HLEN, - skb->data - ETH_HLEN - BRCM_LEG_TAG_LEN, - 2 * ETH_ALEN); + dsa_strip_etype_header(skb, BRCM_LEG_TAG_LEN); return skb; } diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index e32f8160e895..ad9c841c998f 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -312,14 +312,10 @@ static struct sk_buff *dsa_rcv_ll(struct sk_buff *skb, struct net_device *dev, memcpy(dsa_header, new_header, DSA_HLEN); if (extra) - memmove(skb->data - ETH_HLEN, - skb->data - ETH_HLEN - extra, - 2 * ETH_ALEN); + dsa_strip_etype_header(skb, extra); } else { skb_pull_rcsum(skb, DSA_HLEN); - memmove(skb->data - ETH_HLEN, - skb->data - ETH_HLEN - DSA_HLEN - extra, - 2 * ETH_ALEN); + dsa_strip_etype_header(skb, DSA_HLEN + extra); } return skb; diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c index 58d3a0e712d2..af13c0a9cb41 100644 --- a/net/dsa/tag_lan9303.c +++ b/net/dsa/tag_lan9303.c @@ -112,8 +112,9 @@ static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev) * and the current ethertype field. */ skb_pull_rcsum(skb, 2 + 2); - memmove(skb->data - ETH_HLEN, skb->data - (ETH_HLEN + LAN9303_TAG_LEN), - 2 * ETH_ALEN); + + dsa_strip_etype_header(skb, LAN9303_TAG_LEN); + if (!(lan9303_tag1 & LAN9303_TAG_RX_TRAPPED_TO_CPU)) dsa_default_offload_fwd_mark(skb); diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c index bbf37c031d44..6a78e9f146e5 100644 --- a/net/dsa/tag_mtk.c +++ b/net/dsa/tag_mtk.c @@ -80,9 +80,7 @@ static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev) /* Remove MTK tag and recalculate checksum. */ skb_pull_rcsum(skb, MTK_HDR_LEN); - memmove(skb->data - ETH_HLEN, - skb->data - ETH_HLEN - MTK_HDR_LEN, - 2 * ETH_ALEN); + dsa_strip_etype_header(skb, MTK_HDR_LEN); /* Get source port information */ port = (hdr & MTK_HDR_RECV_SOURCE_PORT_MASK); diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c index 6e3136990491..f9fc881da591 100644 --- a/net/dsa/tag_qca.c +++ b/net/dsa/tag_qca.c @@ -72,8 +72,7 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev) /* Remove QCA tag and recalculate checksum */ skb_pull_rcsum(skb, QCA_HDR_LEN); - memmove(skb->data - ETH_HLEN, skb->data - ETH_HLEN - QCA_HDR_LEN, - ETH_HLEN - QCA_HDR_LEN); + dsa_strip_etype_header(skb, QCA_HDR_LEN); /* Get source port information */ port = (hdr & QCA_HDR_RECV_SOURCE_PORT_MASK); diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c index aaddca3c0245..ff8707ff0c5b 100644 --- a/net/dsa/tag_rtl4_a.c +++ b/net/dsa/tag_rtl4_a.c @@ -108,10 +108,7 @@ static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb, /* Remove RTL4 tag and recalculate checksum */ skb_pull_rcsum(skb, RTL4_A_HDR_LEN); - /* Move ethernet DA and SA in front of the data */ - memmove(skb->data - ETH_HLEN, - skb->data - ETH_HLEN - RTL4_A_HDR_LEN, - 2 * ETH_ALEN); + dsa_strip_etype_header(skb, RTL4_A_HDR_LEN); dsa_default_offload_fwd_mark(skb); diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c index fc4cde775e50..5e8234079d08 100644 --- a/net/dsa/tag_sja1105.c +++ b/net/dsa/tag_sja1105.c @@ -571,9 +571,7 @@ static struct sk_buff *sja1110_rcv_inband_control_extension(struct sk_buff *skb, /* Advance skb->data past the DSA header */ skb_pull_rcsum(skb, SJA1110_HEADER_LEN); - /* Remove the DSA header */ - memmove(skb->data - ETH_HLEN, skb->data - ETH_HLEN - SJA1110_HEADER_LEN, - 2 * ETH_ALEN); + dsa_strip_etype_header(skb, SJA1110_HEADER_LEN); /* With skb->data in its final place, update the MAC header * so that eth_hdr() continues to works properly. From patchwork Mon Aug 9 11:57:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 494250 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8562AC4338F for ; Mon, 9 Aug 2021 11:57:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60D796056C for ; Mon, 9 Aug 2021 11:57:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234873AbhHIL6O (ORCPT ); Mon, 9 Aug 2021 07:58:14 -0400 Received: from mail-eopbgr40056.outbound.protection.outlook.com ([40.107.4.56]:40885 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234818AbhHIL6J (ORCPT ); Mon, 9 Aug 2021 07:58:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AEsQMmg05860Y3wam+bqx+4LhUOSnZuJeKXJrNPfGkhtZ8E3dq0xK3sogS3nHiqVQ6B4iwKI4HYdfwbAbueLbNbG9VkaEBZx4iO4wdVnF2i/FWKfM7Cc2mL0oHhG/Fnm4YKR3vYeT1VYPn7XgOwasa3SunQwPyACEEiX0ZdUz9h+qwxDFobKPUiGn7b17Z3n7F5sORCfuURHK2Mr76+3xVl7U6V2HvesTl9exBomc3wHyEHxF1VCQ5ExdW/uVNV8rf3q/0DoUGvlKS1/BbP7OqD1nxI2i//5Vm2gRLNsC5tIYgWsLiSNlsilqGvNqa68nqOu5QZ7TBx70T+sn2+y+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PpVbRLxD+YGj/DI5JeUoTiZsiRwexZ1F5OjlAbewWt0=; b=DnWVPxwd8YJbwpqieo6gKmxor7LzXnpVkV2C4iP0PiqItsws+lJ86enRLa1pBBhyScdXUxxpOljbysD4ZCm7eiPhR8XaPqd9rNzDN76MDeUC9EdOEKXMQHG3nVMXEbo2M6+RQoZ9toOlZB8yx2qYTs005lw5xOlg1L4hRI+zcROseK3Zh80IVJpRbIQZVoWmSejPJoXU7mIb3yAO/UUhLu0N7VZ3hJH0nJVD6nyurg9E6MJD7y23/wLAVGHh03KfDTkFqvwELfi+XuC9X/dGhOyLwUPxSlSZTBSq1maHwrzNwNg4ubc3g1/RRjnzyg+KiqCpShNSDOoHfBpbSYzDOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PpVbRLxD+YGj/DI5JeUoTiZsiRwexZ1F5OjlAbewWt0=; b=QCBmsbnbmQgnAR0wmrA+byY0bMBmE1tdf8tYB/eDYaOwDyKrmnJkMMooZntfuufMIMfj+Nsso5QBsFddlhSF205F0B6caZwznqNQbcKVPF0+N1EOYiLP+AqMoL63XlAqmRSInxOtMHcw9yCL4IjmeDJdUBiVUvah7WDSF5dQjNE= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3712.eurprd04.prod.outlook.com (2603:10a6:803:1c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Mon, 9 Aug 2021 11:57:45 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0%2]) with mapi id 15.20.4394.023; Mon, 9 Aug 2021 11:57:45 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Vladimir Oltean , Linus Walleij , DENG Qingfang , John Crispin , Sean Wang , Landen Chao Subject: [RFC PATCH net-next 2/4] net: dsa: create a helper which allocates space for EtherType DSA headers Date: Mon, 9 Aug 2021 14:57:20 +0300 Message-Id: <20210809115722.351383-3-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210809115722.351383-1-vladimir.oltean@nxp.com> References: <20210809115722.351383-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: VE1PR03CA0012.eurprd03.prod.outlook.com (2603:10a6:802:a0::24) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.25.144.60) by VE1PR03CA0012.eurprd03.prod.outlook.com (2603:10a6:802:a0::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Mon, 9 Aug 2021 11:57:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4d7c872a-57a5-47c3-445f-08d95b2ce69e X-MS-TrafficTypeDiagnostic: VI1PR0402MB3712: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uatR86fPpyT7l/1Hh7e5Cll2hizbGJMjgGleyJ5cLJPLSB5zm7ZVu21mLJxuOe9P5NrSR8nZlKi12ybXZY8+foyyhuo2cyTVV8FPvNJY02vsNpGtdNP1tGmgpLF22HJKBqIK5WuQ6H473c3WKhO5MbHV0IurLyCOmBFYNFKzDoAdMYbtznILdrfNbM+sQFu0YAzqDipUDCyDAUrkQitV6GU3OjDCbNjbTi0CL2emoIZ+6+fpBa7nB8b0zTN4zfw/5pFNx4CvnMA+ArbpXvgpgA1IDkL2KK7YRbPgsgAXB/6pTUgQyS6bX4GmfcskpeczmCsUDZZuYqzqpm6DrzEctpvxxmUTFJgqkPGNb64mDjSBRlWDTLRZwu2o11seOhsORjE3Fd/bjqsquXVLW0jcpIe45mZSDGMBVejafqPmkKmkqYKOmshBeoSWi1g5H+E3j+Px2rf9wSwc6sPlmn0vEGNTdQOHtzX4/bHGsIV6k6jjiboSDY+b6GG9e4f1hg1hRB1lluBiy2XBa0WKPm/LecTtBw/1tbJGBEsQp+8K/pOBAP+xLIgOP/5GpVt/jTqefr4ZQQVtYRvWA//nulkE3xmr1bZy6TVfV8judprt0CZtHnERrW08ng9BSSUufhGxDW0J1X31L77xeSfWb6NhRqdib23OMPcrHW1ZjjrZvIyszDMGVFc31DILbn8SCyj7d8dH6g/+5nd4mabjM0kQuw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(136003)(39860400002)(366004)(346002)(44832011)(6486002)(6666004)(5660300002)(36756003)(52116002)(38350700002)(4326008)(38100700002)(2616005)(86362001)(956004)(66556008)(66476007)(7416002)(6512007)(316002)(66946007)(26005)(110136005)(2906002)(54906003)(6506007)(1076003)(8676002)(8936002)(83380400001)(478600001)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gG0bSAjZgEM6a1/QNoDkAfvZdstrGOPrly1+WurFhy9N2rq8EAO+cR1skP7zBaO1U45olisVHqlsD4TiR+SdIkCf9E1HQgcGQmxgomhwWc27wB8Mw0GtFCbjHJpArOOMKl5kMpUxUisobcL2S5zJGeTs0gsuuHANfZtW4bLrcxhkVgkZBNIp4MRMI9QLQYx+hkqK5IlgGhh7JLttORc34iKWjBRqw/RrotrnxbEqVoKAPm+eSGWsAQ9EYzjoQtmM+rUX59YA16PFmovxG85zKkgXUOHxNpiBIffrqhTWcIgcmJAHeGophJThdy41goNpIq3uiOwtjtXNH3j+aLidU1XAf2q+avLK2a/XcreJtufe+9dUqWKNNvs2cI9HO/5CcbPKS9e/qSqy5ra6UmcvSojchNCqihW+i0WBzzonwtiTHnYo/PpbDPCCodi3zQYefrMyhBF9maZv0GH5sKiGNg2aKJ0CqXspNXseckrlL1Rq6OQ2AxWUwi7c9vNe2ba5hQFY0i2myIncrpMiRMDKB2Gpqw2V4uN9tD9x9u4df23lnuI4zPm+pHfER1tmFTA6NB62wAcKrrAwRQMj3aBAaM7uHvY8GPyjCYjnrU2iT4jaUCwi0JyXrYNI7ayFyTq2iUbO5BV4t9lVP8belyOpY9K3P/JtSJKSqZvHazVzap2hrwWBbzpqs6n8kFfRrkT31OastL7qkoqsTMqHlry6Jx6bNoAjbafnFJp67ogkUqCcNYmC0ZmBbYpO7umpcMDAO4K3tp2VIPxB4mrnyukAA5E2BFpj7Lmwn0JpG30BpI8J35dLVb/Aya3ESxNXBOj7mIbNUaMnL7zcA/cxOeYmWTL1VYoJrbVcjGpKONMs4GvjqrxtiXR2Ins0WSDzVbnEZdBH1pXL+zRHGadleV3nD+dBuUdbk7hW+zTfNKxsteoNuyqSobQoXWGDMWVgAQCfcJhcnkFT5arOCLGrmSrcSGqZTqACbVKBQGv7lCO6+zltEUcfm8JnR3kAVOdcRiM/4X05S2muJ4hhh5Cv/CkpfDn0SG4qT4IsnU3SEaLMY2JqrpCU3a6KVtWw5LmtgdXDqb+88DiqKFIm9jFrFTUThzKGxJRxE3HEgT+mE8sgtvwdrHEalrcRiQDP7QTqAZVIMhoh7BaWjvUlMbjf+MiExUVO4N97VCwJOZBRCFFNoCvGIsC/GQ4BCiBdyLJn3F8yz1Wionxtl7uY3mGKwsVOUNLKoM5yXUERCcKJi+nwIXPn0cPuu7fyFEk67JumpPu7OEEPh7tPAyKXCyP7ynWW6ucEoPuyzIS8+0bqnsrLfuapQAPC3z543RCWSzAqKP0g X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d7c872a-57a5-47c3-445f-08d95b2ce69e X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2021 11:57:45.6895 (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: Biq4k4cE9DGHdqgFsG9T79OhNAaVglPdYG9CW9ZsUT2rkbys21HuQK3W4QXX2OqT+7++U1dDkKvHqDKmHrKTmQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3712 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hide away the memmove used by DSA EtherType header taggers to shift the MAC SA and DA to the left to make room for the header, after they've called skb_push(). The call to skb_push() is still left explicit in drivers, to be symmetric with dsa_strip_etype_header, and because not all callers can be refactored to do it (for example, brcm_tag_xmit_ll has common code for a pre-Ethernet DSA tag and an EtherType DSA tag). Signed-off-by: Vladimir Oltean Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Reviewed-by: Linus Walleij --- net/dsa/dsa_priv.h | 29 +++++++++++++++++++++++++++++ net/dsa/tag_brcm.c | 4 ++-- net/dsa/tag_dsa.c | 4 ++-- net/dsa/tag_lan9303.c | 2 +- net/dsa/tag_mtk.c | 2 +- net/dsa/tag_qca.c | 2 +- net/dsa/tag_rtl4_a.c | 2 +- net/dsa/tag_sja1105.c | 3 +-- 8 files changed, 38 insertions(+), 10 deletions(-) diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 8a12ec1f9d21..28e1fbe64ee0 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -478,6 +478,35 @@ static inline void dsa_strip_etype_header(struct sk_buff *skb, int len) memmove(skb->data - ETH_HLEN, skb->data - ETH_HLEN - len, 2 * ETH_ALEN); } +/* Helper for creating space for DSA header tags in TX path packets. + * Must not be called before skb_push(len). + * + * Before: + * + * <<<<<<< | | | | | | | | | | | | | | | + * ^ <<<<<<< +-----------------------+-----------------------+-------+ + * | <<<<<<< | Destination MAC | Source MAC | EType | + * | +-----------------------+-----------------------+-------+ + * <----- len -----> + * | + * | + * skb->data + * + * After: + * + * | | | | | | | | | | | | | | | | | | | + * +-----------------------+-----------------------+---------------+-------+ + * | Destination MAC | Source MAC | DSA header | EType | + * +-----------------------+-----------------------+---------------+-------+ + * ^ | | + * | <----- len -----> + * skb->data + */ +static inline void dsa_alloc_etype_header(struct sk_buff *skb, int len) +{ + memmove(skb->data, skb->data + len, 2 * ETH_ALEN); +} + /* switch.c */ int dsa_switch_register_notifier(struct dsa_switch *ds); void dsa_switch_unregister_notifier(struct dsa_switch *ds); diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c index 2fc546b31ad8..c62a89bb8de3 100644 --- a/net/dsa/tag_brcm.c +++ b/net/dsa/tag_brcm.c @@ -99,7 +99,7 @@ static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb, skb_push(skb, BRCM_TAG_LEN); if (offset) - memmove(skb->data, skb->data + BRCM_TAG_LEN, offset); + dsa_alloc_etype_header(skb, BRCM_TAG_LEN); brcm_tag = skb->data + offset; @@ -228,7 +228,7 @@ static struct sk_buff *brcm_leg_tag_xmit(struct sk_buff *skb, skb_push(skb, BRCM_LEG_TAG_LEN); - memmove(skb->data, skb->data + BRCM_LEG_TAG_LEN, 2 * ETH_ALEN); + dsa_alloc_etype_header(skb, BRCM_LEG_TAG_LEN); brcm_tag = skb->data + 2 * ETH_ALEN; diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index ad9c841c998f..ab2c63859d12 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -166,7 +166,7 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, if (skb->protocol == htons(ETH_P_8021Q)) { if (extra) { skb_push(skb, extra); - memmove(skb->data, skb->data + extra, 2 * ETH_ALEN); + dsa_alloc_etype_header(skb, extra); } /* Construct tagged DSA tag from 802.1Q tag. */ @@ -181,7 +181,7 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, } } else { skb_push(skb, DSA_HLEN + extra); - memmove(skb->data, skb->data + DSA_HLEN + extra, 2 * ETH_ALEN); + dsa_alloc_etype_header(skb, DSA_HLEN + extra); /* Construct untagged DSA tag. */ dsa_header = skb->data + 2 * ETH_ALEN + extra; diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c index af13c0a9cb41..e8ad3727433e 100644 --- a/net/dsa/tag_lan9303.c +++ b/net/dsa/tag_lan9303.c @@ -62,7 +62,7 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev) skb_push(skb, LAN9303_TAG_LEN); /* make room between MACs and Ether-Type */ - memmove(skb->data, skb->data + LAN9303_TAG_LEN, 2 * ETH_ALEN); + dsa_alloc_etype_header(skb, LAN9303_TAG_LEN); lan9303_tag = (__be16 *)(skb->data + 2 * ETH_ALEN); tag = lan9303_xmit_use_arl(dp, skb->data) ? diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c index 6a78e9f146e5..06d1cfc6d19b 100644 --- a/net/dsa/tag_mtk.c +++ b/net/dsa/tag_mtk.c @@ -41,7 +41,7 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb, default: xmit_tpid = MTK_HDR_XMIT_UNTAGGED; skb_push(skb, MTK_HDR_LEN); - memmove(skb->data, skb->data + MTK_HDR_LEN, 2 * ETH_ALEN); + dsa_alloc_etype_header(skb, MTK_HDR_LEN); } mtk_tag = skb->data + 2 * ETH_ALEN; diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c index f9fc881da591..c68a814188e7 100644 --- a/net/dsa/tag_qca.c +++ b/net/dsa/tag_qca.c @@ -36,7 +36,7 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev) skb_push(skb, QCA_HDR_LEN); - memmove(skb->data, skb->data + QCA_HDR_LEN, 2 * ETH_ALEN); + dsa_alloc_etype_header(skb, QCA_HDR_LEN); phdr = (__be16 *)(skb->data + 2 * ETH_ALEN); /* Set the version field, and set destination port information */ diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c index ff8707ff0c5b..06e901eda298 100644 --- a/net/dsa/tag_rtl4_a.c +++ b/net/dsa/tag_rtl4_a.c @@ -47,7 +47,7 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb, dp->index); skb_push(skb, RTL4_A_HDR_LEN); - memmove(skb->data, skb->data + RTL4_A_HDR_LEN, 2 * ETH_ALEN); + dsa_alloc_etype_header(skb, RTL4_A_HDR_LEN); tag = skb->data + 2 * ETH_ALEN; /* Set Ethertype */ diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c index 5e8234079d08..939161822f31 100644 --- a/net/dsa/tag_sja1105.c +++ b/net/dsa/tag_sja1105.c @@ -245,8 +245,7 @@ static struct sk_buff *sja1110_xmit(struct sk_buff *skb, skb_push(skb, SJA1110_HEADER_LEN); - /* Move Ethernet header to the left, making space for DSA tag */ - memmove(skb->data, skb->data + SJA1110_HEADER_LEN, 2 * ETH_ALEN); + dsa_alloc_etype_header(skb, SJA1110_HEADER_LEN); trailer_pos = skb->len; From patchwork Mon Aug 9 11:57:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 494868 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D76EC4320A for ; Mon, 9 Aug 2021 11:57:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E3E560F35 for ; Mon, 9 Aug 2021 11:57:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235150AbhHIL6Q (ORCPT ); Mon, 9 Aug 2021 07:58:16 -0400 Received: from mail-eopbgr40056.outbound.protection.outlook.com ([40.107.4.56]:40885 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S235148AbhHIL6N (ORCPT ); Mon, 9 Aug 2021 07:58:13 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UO3ysSBH+YaRP6ylIcj15Uf4g4A6ycJxtRa2qQ3NY1hws0Eoxr/hKW3Hu1v1PjQnbejCu2f8T5rqk/qvammUiUomBcy+U2L6hlrFu3LoWBM4BxpnXPEtW2WcsZXeLWxEgT1bF3mmrlv77LWcDi9zF2+rDs1Gnb/iW4XDTbIKbTY3Z/qyrQ+LsiCEUWZsR/1J5rrswnyPLCwStLyL85V25wZ3rTQFl6PkduBzmpX5u6G8M4vDGhEJHZaVRRhgtrsqK2Ol5SykXVt8IrQISKdI9437Vf+ii5A9CZ3Vj9RkNTBNAWvgZjCoR/Y7u2UPzc9XqwxvAq1ne8Wm1mRIPvjPLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0fRf5iVzoHiLMjdx+tXdiEL1+iucDTN9QEFL9/Sj0Cs=; b=MJVth7c+FydcXTcb7A+jJ6KPu0/HcWIehxySaiuM7L5onbmU4686Wb2iOzcAjsNpu2Dcsx49+eF2vQW1JW+gbeQ2/w3Pp1Ega4+P61OZwISMU6Bn9KdSTdefWxeGLkZJ+7ji8HLcUc+Bybc4g8v+7QjMUGMgl1xPEXli2tpGlGTfNreOqiavEgC6r2QK4X1ptQFZkOyBHCdyTJE0lqpswBmilXhMRZC3ltnrTgARQ4gAhowBkNr04lGqAVRChb1yjLyjZzxpWfBiVBLTzdKPxPDnKgu0sEWF7vJ86wMUd7x7hBIPpON5gN0q7ZpfCjWUv5jwJYZq9XOvwF2Ygm8y0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0fRf5iVzoHiLMjdx+tXdiEL1+iucDTN9QEFL9/Sj0Cs=; b=eKcpavOWAX0B78f6YVwgCS2EDMoUo6IO8P33tpi5JyGC7Hc7JxzXsfIPo88sjX5Rx7VVvH9KpmjAucR+KV491QSASKkWUJea23vzpXdgqi81SBYD27xzEZnVkjsrIZbJ5smoktM+baLL6A4bINFrRuLBtolqWiHCbKymyjL+dHM= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3712.eurprd04.prod.outlook.com (2603:10a6:803:1c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Mon, 9 Aug 2021 11:57:46 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0%2]) with mapi id 15.20.4394.023; Mon, 9 Aug 2021 11:57:46 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Vladimir Oltean , Linus Walleij , DENG Qingfang , John Crispin , Sean Wang , Landen Chao Subject: [RFC PATCH net-next 3/4] net: dsa: create a helper for locating EtherType DSA headers on RX Date: Mon, 9 Aug 2021 14:57:21 +0300 Message-Id: <20210809115722.351383-4-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210809115722.351383-1-vladimir.oltean@nxp.com> References: <20210809115722.351383-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: VE1PR03CA0012.eurprd03.prod.outlook.com (2603:10a6:802:a0::24) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.25.144.60) by VE1PR03CA0012.eurprd03.prod.outlook.com (2603:10a6:802:a0::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Mon, 9 Aug 2021 11:57:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be7eff2d-f383-4f1c-e6f5-08d95b2ce6fb X-MS-TrafficTypeDiagnostic: VI1PR0402MB3712: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JhgxT/9eOGQgAe5fkZ2vrD18AjlDwMrBdVkW7ZTC+i65B1YvzC1/QD8c94ctWqOP8F0wcTP95y1r7ODTMN3KxI4zG541rrf3m/MvQk55t08qvBJsFJsC11nMVA0KkgSVilYst8dTLkChhhgKF/MCgM+TD1bIVS0JDXC3bvN9Am8U6wgH5vCnQTzVlKtzSRq1huzXNKrVC6tZDa6cVlAzJqKFnbomDdT+dVZL4B3A0QNfFbSLKqSS3HshKigBUjalZvWbBzeZPW/7JdkPwvwhKXrOWR7J7PmDeqQx9e/K1b4GbHeSdh8ra6jF/vzvuTdJFJv4foXBP0CIQeENiqycgelAIsHkeBhUHqBHTymsimpNFF2RacR8DAQeHSGT0xnXRXqiXeAwI6gKDJ0qzAwKSzE2x4vw3ldubM9I9tHPpkH3JULpGE/4otX590nLtbFBTraqzjbVS15g6Art14VnI2TnXCgliUudmykESk9t8R/wejPbVLn5wkVEAH1ggQ/1M0MDL9aCCp1uj7NnsrbfvzK1gug157bJa7Zp3k5P8VJzQO3Blzzm0w0/+rJWhkYiduWoL151lvFOdlIpqL+78yJWRY9cXUKHf3eUMNrjt7bTCucQ/I82yJZ4TJmvfOvF8lqjoB0TdcE9+WysIIryEeTkzbZbCN74G/SkyY4jw4ATglqzH5MVpaTAg4pZWPm+wCGrurHT6hMVDIfNNyTao3vNxvQxZFT9NvtnbdSw/uc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(136003)(39860400002)(366004)(346002)(44832011)(6486002)(6666004)(5660300002)(36756003)(52116002)(38350700002)(4326008)(38100700002)(2616005)(86362001)(956004)(66556008)(66476007)(7416002)(6512007)(316002)(66946007)(26005)(110136005)(2906002)(54906003)(6506007)(1076003)(8676002)(8936002)(83380400001)(478600001)(186003)(83323001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oRxE9TuvXxbAvvWZcyQGjJyO2jIpml+7CdcvLu3sv1Hhh6LGewDSjQuLQLFW8p5zOhWZlxS2njO3ehm7qcgkZLNqdYb7hX04OjZNVse3Z7PKDrW7V0RnF2/7+1UBaW+7XMj7wE/j4rS5NAvW0NJ76Qsg6RZ7NI2cQjXpaF3V9Zq0AU1z22gJzOJm79ChTaLmoHihq5+Y6EA/BJBvRXoh15bPdrfffItLKKjyrcyGWIRUrjZqN09l3xqYZKa2c7R8v33VJPsuG4cAsl+yLYGsOdUz5tSmq+BIElbSFGBYWMFfLl7RE5CoIgjnEeT7ku0yIDKQTO2xYthxzep2HgTGUXX8Vo81wBGbI/VGrfwTq6yVbW3Y/z4RUmlnMJj9okLnsbUD6bdb9PIXgMRgWvNvS9a/5p7wFXn9qfn1fFFrmtgpgTVF0HZGmUu8IMdAHH5un+NN6FCs+0ktJsRE7BLs6YS/5oscccALq81b/RUyZpJ8i107DwhTpTI8SvWminhN5ikMHmeVOMUezRxhOmBq4wu2vl6HKtRU6DewdJxQtX/3l01AOjDfJbAXg2Xz0mET8Mp0YWEXl1GDewi9rJVOOVlYIcn48idu30j25lx61b74cIJSVt+HS1tRAb37yxoJj3Nfzn4WePXSR7gpfLWNQVCP9jrCMZmr+c12QXxPiaSq9742sie7SkLkzTrtyJsr+uPnl+VJfJZEV4juh43ooFbAh21KaxG/m5C1JWGjv3jikjygDhIaW3rPTfJJoouEHlePJQ4ObbzZJEoHA88yaQsoWjf9Nxy78delhxWekcD/Vp1dwFAltxmBHKTxEbw/lgK33GTxUs3vN4wk89zfWtY1Qo3jeLX1fNJK0YDBJJCwvmSrl76axp8lNj5TJus6pbNkcWL3GdtWswoZzM86eJKhPH1xZra8qhb3SYvRlyr85iCugmL0SvKffcmIIP/tTf3wdBulpMb0YD6u4b6mDITE4uIcA/PNaNAa3mDvoYcABPstr+Jf/blB2PXjIRR+TuR1vQ3Ih14piD3Ng2cgYzkKDpUOBVLk8XDT803lbvKau3f4/NPYaL0R7LpI3UdfOiFyjyN8B6j7BzLV9zCwrCfr9cbyrIFH/pIqX+MTSQF+WD6JWOI5pTeql7jmlxIBHnjnbCoLFwBOYe8lclmCJwsBleWiVOFdQihh69rjcvKKsRecMK91TNWDhIOT4bgdcc+2973Onebv+3hpPpvvrUS4fIs+hS7gUB0WzxhpswJEPSZxA2Xp6KpPKMapNaJ686hMCh/u0lxV6t3uO2kCD0Vy/J8gANa8SJDRa2d0iY/rRtNbJh6VlcMT3I5vnnH6 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: be7eff2d-f383-4f1c-e6f5-08d95b2ce6fb X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2021 11:57:46.2822 (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: G+SmtxRDfhsFOfRkBZ3KUVJZEITV6aCUNIYwOSDg/mylyj/OkWo+ms86hHWtBWTNrG74CsGjw5GaROkWy47jVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3712 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It seems that protocol tagging driver writers are always surprised about the formula they use to reach their EtherType header on RX, which becomes apparent from the fact that there are comments in multiple drivers that mention the same information. Create a helper that returns a void pointer to skb->data - 2, as well as centralize the explanation why that is the case. Signed-off-by: Vladimir Oltean Reviewed-by: Linus Walleij --- net/dsa/dsa_priv.h | 14 ++++++++++++++ net/dsa/tag_brcm.c | 2 +- net/dsa/tag_dsa.c | 2 +- net/dsa/tag_lan9303.c | 8 +------- net/dsa/tag_mtk.c | 6 +----- net/dsa/tag_qca.c | 6 +----- net/dsa/tag_rtl4_a.c | 7 +------ net/dsa/tag_sja1105.c | 2 +- 8 files changed, 21 insertions(+), 26 deletions(-) diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 28e1fbe64ee0..ee194df68902 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -507,6 +507,20 @@ static inline void dsa_alloc_etype_header(struct sk_buff *skb, int len) memmove(skb->data, skb->data + len, 2 * ETH_ALEN); } +/* On RX, eth_type_trans() on the DSA master pulls ETH_HLEN bytes starting from + * skb_mac_header(skb), which leaves skb->data pointing at the first byte after + * what the DSA master perceives as the EtherType (the beginning of the L3 + * protocol). Since DSA EtherType header taggers treat the EtherType as part of + * the DSA tag itself, and the EtherType is 2 bytes in length, the DSA header + * is located 2 bytes behind skb->data. Note that EtherType in this context + * means the first 2 bytes of the DSA header, not the encapsulated EtherType + * that will become visible after the DSA header is stripped. + */ +static inline void *dsa_etype_header_pos_rx(struct sk_buff *skb) +{ + return skb->data - 2; +} + /* switch.c */ int dsa_switch_register_notifier(struct dsa_switch *ds); void dsa_switch_unregister_notifier(struct dsa_switch *ds); diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c index c62a89bb8de3..96dbb8ee2fee 100644 --- a/net/dsa/tag_brcm.c +++ b/net/dsa/tag_brcm.c @@ -254,7 +254,7 @@ static struct sk_buff *brcm_leg_tag_rcv(struct sk_buff *skb, if (unlikely(!pskb_may_pull(skb, BRCM_LEG_PORT_ID))) return NULL; - brcm_tag = skb->data - 2; + brcm_tag = dsa_etype_header_pos_rx(skb); source_port = brcm_tag[5] & BRCM_LEG_PORT_ID; diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index ab2c63859d12..2eeabab27078 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -205,7 +205,7 @@ static struct sk_buff *dsa_rcv_ll(struct sk_buff *skb, struct net_device *dev, u8 *dsa_header; /* The ethertype field is part of the DSA header. */ - dsa_header = skb->data - 2; + dsa_header = dsa_etype_header_pos_rx(skb); cmd = dsa_header[0] >> 6; switch (cmd) { diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c index e8ad3727433e..d06951273127 100644 --- a/net/dsa/tag_lan9303.c +++ b/net/dsa/tag_lan9303.c @@ -86,13 +86,7 @@ static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev) return NULL; } - /* '->data' points into the middle of our special VLAN tag information: - * - * ~ MAC src | 0x81 | 0x00 | 0xyy | 0xzz | ether type - * ^ - * ->data - */ - lan9303_tag = (__be16 *)(skb->data - 2); + lan9303_tag = dsa_etype_header_pos_rx(skb); if (lan9303_tag[0] != htons(ETH_P_8021Q)) { dev_warn_ratelimited(&dev->dev, "Dropping packet due to invalid VLAN marker\n"); diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c index 06d1cfc6d19b..a75f99e5fbe3 100644 --- a/net/dsa/tag_mtk.c +++ b/net/dsa/tag_mtk.c @@ -70,11 +70,7 @@ static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev) if (unlikely(!pskb_may_pull(skb, MTK_HDR_LEN))) return NULL; - /* The MTK header is added by the switch between src addr - * and ethertype at this point, skb->data points to 2 bytes - * after src addr so header should be 2 bytes right before. - */ - phdr = (__be16 *)(skb->data - 2); + phdr = dsa_etype_header_pos_rx(skb); hdr = ntohs(*phdr); /* Remove MTK tag and recalculate checksum. */ diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c index c68a814188e7..79a81569d7ec 100644 --- a/net/dsa/tag_qca.c +++ b/net/dsa/tag_qca.c @@ -58,11 +58,7 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev) if (unlikely(!pskb_may_pull(skb, QCA_HDR_LEN))) return NULL; - /* The QCA header is added by the switch between src addr and Ethertype - * At this point, skb->data points to ethertype so header should be - * right before - */ - phdr = (__be16 *)(skb->data - 2); + phdr = dsa_etype_header_pos_rx(skb); hdr = ntohs(*phdr); /* Make sure the version is correct */ diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c index 06e901eda298..947247d2124e 100644 --- a/net/dsa/tag_rtl4_a.c +++ b/net/dsa/tag_rtl4_a.c @@ -76,12 +76,7 @@ static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb, if (unlikely(!pskb_may_pull(skb, RTL4_A_HDR_LEN))) return NULL; - /* The RTL4 header has its own custom Ethertype 0x8899 and that - * starts right at the beginning of the packet, after the src - * ethernet addr. Apparently skb->data always points 2 bytes in, - * behind the Ethertype. - */ - tag = skb->data - 2; + tag = dsa_etype_header_pos_rx(skb); p = (__be16 *)tag; etype = ntohs(*p); if (etype != RTL4_A_ETHERTYPE) { diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c index 939161822f31..34f3212a6703 100644 --- a/net/dsa/tag_sja1105.c +++ b/net/dsa/tag_sja1105.c @@ -481,11 +481,11 @@ static struct sk_buff *sja1105_rcv(struct sk_buff *skb, static struct sk_buff *sja1110_rcv_meta(struct sk_buff *skb, u16 rx_header) { + u8 *buf = dsa_etype_header_pos_rx(skb) + SJA1110_HEADER_LEN; int switch_id = SJA1110_RX_HEADER_SWITCH_ID(rx_header); int n_ts = SJA1110_RX_HEADER_N_TS(rx_header); struct net_device *master = skb->dev; struct dsa_port *cpu_dp; - u8 *buf = skb->data + 2; struct dsa_switch *ds; int i; From patchwork Mon Aug 9 11:57:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 494249 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABBB7C4338F for ; Mon, 9 Aug 2021 11:57:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89EA960F35 for ; Mon, 9 Aug 2021 11:57:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235210AbhHIL6R (ORCPT ); Mon, 9 Aug 2021 07:58:17 -0400 Received: from mail-eopbgr40056.outbound.protection.outlook.com ([40.107.4.56]:40885 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234840AbhHIL6P (ORCPT ); Mon, 9 Aug 2021 07:58:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HSPg5ul5Uroi6SvYQr6k9wQqtxcRble+h1UBe+aV8724gQ7fxWIO8UzzFfJLUQJX3gTroH1HiJs0l2SnUi2n3NsWsNHdo4EKE8ogYHW4ztooO5yX2cpgkVNQCcAN8g3zJGvW4cmKvhqSUz6fNCM8+tGcWkiq/6/pezBrD8jjMYPWmcpir+JZ5XI32ybudsnILhxQPDOcARNreOIb/gIv0AxOCDgY1r1WG5dKLIgF/dxMG54b/atSd8kGNK+w7whtMBP/O9m/0Z61HceNYGD5BQpUH/hOfzrygfV2Apo25PDhm+PZbBWQYiRSXix5Z4p5Aet4O6yRxfEYVfR4vwvvjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pxeGAZK8Kz0NFoLMwJ0rkare1ml7C30XwCYZ+/GRlBY=; b=KfnuRwYJEqbV/eVs+7ifv4af4Fauxc4i/PTzWoDUFidQDO/1HXFNVLJpSH4lfhi2RuETc2kugkNiwFm2vZI5h2RH3Aw8iCRXPO5Nplf6faK4sqXnZXQvmrCiVHhZfU61GlGxX1kCzC3FY8uSz1ZfrM+XZ30yatDKzq1rMC7r+qQCa1cMY/hQ9gQ3iGjcov3vDZ5uRW2e8iPfeRHk21D0OBpNryVESmfHx3Oj3zEUsTlqrIvvTeqpF9Vs/gQqGGzkKv9Dc9FD4GZ0YH2s9ARbLKtxGHs5bJn2idcJ24eSVIaqmyYQdgqnZitR+tI62NK35tj82HUeTrvYzbaKObjnzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pxeGAZK8Kz0NFoLMwJ0rkare1ml7C30XwCYZ+/GRlBY=; b=dWEC9YHkeJBvCcX32zDLdrCD6IClP/DvAI6ZPncG0HKXUYE+YnIApj+u8trKS2+xVqMksSv1Sh+u/X3qsMdRxhXW2B+5tEIz3lXHYAuN5A4R67ComeTo+SxAaOs/+3ElRgCwfyToJIj6ugV4oEX3K5F2uuOn3r1yWbsQjyVWpbA= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB3712.eurprd04.prod.outlook.com (2603:10a6:803:1c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Mon, 9 Aug 2021 11:57:47 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0%2]) with mapi id 15.20.4394.023; Mon, 9 Aug 2021 11:57:46 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Vladimir Oltean , Linus Walleij , DENG Qingfang , John Crispin , Sean Wang , Landen Chao Subject: [RFC PATCH net-next 4/4] net: dsa: create a helper for locating EtherType DSA headers on TX Date: Mon, 9 Aug 2021 14:57:22 +0300 Message-Id: <20210809115722.351383-5-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210809115722.351383-1-vladimir.oltean@nxp.com> References: <20210809115722.351383-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: VE1PR03CA0012.eurprd03.prod.outlook.com (2603:10a6:802:a0::24) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.25.144.60) by VE1PR03CA0012.eurprd03.prod.outlook.com (2603:10a6:802:a0::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Mon, 9 Aug 2021 11:57:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 92d65704-c099-45dd-1476-08d95b2ce759 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3712: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8XDr+EIHzOlk81l1vz9dRRhyYYU6QaNP/ydIlgDLpU0zFHcwmcdWSJqVFqsAoQaoOGjku6uW9qpWzNusAwWZfwgkqW8amDOKaTf4mtM0MjSBcy4D2J3aRcLl4BpeWxICed0GX42JSMiJG2LAjM6SxjFU3os6gd8LIpYZ5vIhqOMrgpDnM7DTWldujZlR1CyUczNO/FDV+N+hFN6CLY2YI/eFoj5a49WjSRd9W8c1xqn3fAScb7lJjL3U3KSgZ1EqQOcLh9jEpzZkbV5quNNkXEcEvV8drhUw1hbgHWHmJPpuCRkwWe/bc60jA6l9a6+mL5mTTVWwIiBsSjEO1WFT/4RLOyPJJZlm5w5IuvqbZSpR36cuiwBWUzWjy9ASVQx9psvkT7JYU0GhrGSy+DYlwwpyVLbqHtg9e8XI0TWLJj5AkLfZ5W7si6oRKyxHkco8eSUFUq/TNVN1LWFlFkpSwNQ/zWW94HwcT1/bSJgZmmRQvBmoyNqLEsvdo8AojJ2wjO9jjmU+DnfIgCQgmy1R63yxQzdQ4wn5Q8xO4pg83TADkSRL0cFmg7euHokmr9DVsPfcK0ja/sz3rmmn82UA55QogVzeD1INIUXabg00qC/cLxMxZO30wSpttenIRiugqU/L3aszbI+hffAr7h/gwkhaK66+wWYZSzpOoihGgf9+5LXBPqjESsXWIHifFKUcvEXRJtzuK584zDO0Z4MOpw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(136003)(39860400002)(366004)(346002)(44832011)(6486002)(6666004)(5660300002)(36756003)(52116002)(38350700002)(4326008)(38100700002)(2616005)(86362001)(956004)(66556008)(66476007)(7416002)(6512007)(316002)(66946007)(26005)(110136005)(2906002)(54906003)(6506007)(1076003)(8676002)(8936002)(83380400001)(478600001)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 06cm0iKkHeyIUUmleoGZSEXYhuvUEbb/JyWGmc+Z56h909gbTx543A3J8ejQnnSiyfI7XfGbcHfOQcWH4+B+/dJilzssCYrdokuLOBjQQ01C3/SRh318TTFbUs07ybtGb5LeYwGnEcaANWKm5zwraILeRBTYMsxo/Yxmvehj9XTl0W9sRjPcnfdszNTH+GeIeKqKtiAE962620HxA51xj/DglWtdWCN6ivpisnO1m+8/V118oG36Eh+SBAo7jbW/NtOicIqufI4LpuSIrD8pfU+V/b12Oi4Z7ygAjc0H41D7Mk0jukLiNOeO12ITCEnBCBybnmOu+hqCx47S0QeZ6ilrHzJHy1xcU9bmzDAPeBSMve8CUAPSc89Sop977c1zbslms8HZABeo8DOo4Z8IWvZolSJOe84tW8+3uasNHlmnxeE1CNM7uglV4u4n/H9aLug8TYK5TtjlqCvHrLMEuXmjp9gUH8IuUPDNh2q4AcG12TQizo3EflJHSzUR1KoMStqBhHGZ8HDdu+r4kyPLjF3QzRjGEKRlEhZ5dWKKixHus7SI79GRSRHzXxXDLTh8PfNGgt4tbT0cIvjbWakxCjf9lOGJw/c3awcIvwWdBlAfVzNucL4JwK0g0jRhaR4R16TJtF1elW/ff+eGIC8bTzb3eXe40O4QiqYGz2zaRwhoGDHT3KbSLZH9NccpzPAVbs2eqzY6XTyP+0BwyAE8lcA7X7K46RMDNtFf5y77yCFDe0vwm8TRJ0Cy7Td0H51KGUyXGQFq85Dvem77ODyHz7tWpM+tF6jOjpwBjiAoLufDuUqJQDbUVKopK5ERM3RFhtQMzxNohxUA3r/glLt+mh9pgvmtW/s0OMBhCXPFY6ilqRS0CXCHkr63O6igR+5HnmwPLIhIWEy0PFR4TA+em6dasL3BThox3VIUeuF3YSXmn9Xh04isuiNiRcAh1QeEgUEDFupO3pnIr3YTcrsV72fUxYHP64YuSgRbBkQE+N9I4k9K46ILkeRGupu7DvkX9wG0nLaVsfVrZWjA0YA2hpPXq0IuYryVLP/8BIrLb6jxc/dHiy1KVtexXQxTMaJhx7Df8kVEUCl42G4QsvxsFRtfPvXEDpFMBtPR9phEu5t97IW/NmnpQqLyyD1S5NrAf6eaWxbdXviJG00yZoWEYxfEXMOMKsUdz4C9z8hWwuQa7wONzphyks1jORGdYLiXuU/KPbKs4OzT2iLGMoUIScGLvPeyns5N9bUejiXGglp9Bckk+m2WjtZMff/q1YFD5uYMGN6+8c3EKVIpshnoFLDAmjYZEAspySdPK+RSIfcQ5HQ9HV2OKJJ0gydlmloT X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92d65704-c099-45dd-1476-08d95b2ce759 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2021 11:57:46.9038 (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: po1pGR0jhULgmSp6fGgKeTs8jzphvureukGUyFosRpTYYqQEz6vx47KAKqCaP7Jv120SBgNhl+G2aIxxhew9Ww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3712 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Create a similar helper for locating the offset to the DSA header relative to skb->data, and make the existing EtherType header taggers to use it. Signed-off-by: Vladimir Oltean Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Reviewed-by: Linus Walleij --- net/dsa/dsa_priv.h | 9 +++++++++ net/dsa/tag_dsa.c | 6 +++--- net/dsa/tag_lan9303.c | 3 ++- net/dsa/tag_mtk.c | 2 +- net/dsa/tag_qca.c | 2 +- net/dsa/tag_rtl4_a.c | 2 +- net/dsa/tag_sja1105.c | 16 ++++++---------- 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index ee194df68902..9ea637832ea9 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -521,6 +521,15 @@ static inline void *dsa_etype_header_pos_rx(struct sk_buff *skb) return skb->data - 2; } +/* On TX, skb->data points to skb_mac_header(skb), which means that EtherType + * header taggers start exactly where the EtherType is (the EtherType is + * treated as part of the DSA header). + */ +static inline void *dsa_etype_header_pos_tx(struct sk_buff *skb) +{ + return skb->data + 2 * ETH_ALEN; +} + /* switch.c */ int dsa_switch_register_notifier(struct dsa_switch *ds); void dsa_switch_unregister_notifier(struct dsa_switch *ds); diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index 2eeabab27078..77d0ce89ab77 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -170,7 +170,7 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, } /* Construct tagged DSA tag from 802.1Q tag. */ - dsa_header = skb->data + 2 * ETH_ALEN + extra; + dsa_header = dsa_etype_header_pos_tx(skb) + extra; dsa_header[0] = (cmd << 6) | 0x20 | tag_dev; dsa_header[1] = tag_port << 3; @@ -184,7 +184,7 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, dsa_alloc_etype_header(skb, DSA_HLEN + extra); /* Construct untagged DSA tag. */ - dsa_header = skb->data + 2 * ETH_ALEN + extra; + dsa_header = dsa_etype_header_pos_tx(skb) + extra; dsa_header[0] = (cmd << 6) | tag_dev; dsa_header[1] = tag_port << 3; @@ -360,7 +360,7 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev) if (!skb) return NULL; - edsa_header = skb->data + 2 * ETH_ALEN; + edsa_header = dsa_etype_header_pos_tx(skb); edsa_header[0] = (ETH_P_EDSA >> 8) & 0xff; edsa_header[1] = ETH_P_EDSA & 0xff; edsa_header[2] = 0x00; diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c index d06951273127..cb548188f813 100644 --- a/net/dsa/tag_lan9303.c +++ b/net/dsa/tag_lan9303.c @@ -64,7 +64,8 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev) /* make room between MACs and Ether-Type */ dsa_alloc_etype_header(skb, LAN9303_TAG_LEN); - lan9303_tag = (__be16 *)(skb->data + 2 * ETH_ALEN); + lan9303_tag = dsa_etype_header_pos_tx(skb); + tag = lan9303_xmit_use_arl(dp, skb->data) ? LAN9303_TAG_TX_USE_ALR : dp->index | LAN9303_TAG_TX_STP_OVERRIDE; diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c index a75f99e5fbe3..415d8ece242a 100644 --- a/net/dsa/tag_mtk.c +++ b/net/dsa/tag_mtk.c @@ -44,7 +44,7 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb, dsa_alloc_etype_header(skb, MTK_HDR_LEN); } - mtk_tag = skb->data + 2 * ETH_ALEN; + mtk_tag = dsa_etype_header_pos_tx(skb); /* Mark tag attribute on special tag insertion to notify hardware * whether that's a combined special tag with 802.1Q header. diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c index 79a81569d7ec..1ea9401b8ace 100644 --- a/net/dsa/tag_qca.c +++ b/net/dsa/tag_qca.c @@ -37,7 +37,7 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev) skb_push(skb, QCA_HDR_LEN); dsa_alloc_etype_header(skb, QCA_HDR_LEN); - phdr = (__be16 *)(skb->data + 2 * ETH_ALEN); + phdr = dsa_etype_header_pos_tx(skb); /* Set the version field, and set destination port information */ hdr = QCA_HDR_VERSION << QCA_HDR_XMIT_VERSION_S | diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c index 947247d2124e..40811bab4d09 100644 --- a/net/dsa/tag_rtl4_a.c +++ b/net/dsa/tag_rtl4_a.c @@ -48,7 +48,7 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb, skb_push(skb, RTL4_A_HDR_LEN); dsa_alloc_etype_header(skb, RTL4_A_HDR_LEN); - tag = skb->data + 2 * ETH_ALEN; + tag = dsa_etype_header_pos_tx(skb); /* Set Ethertype */ p = (__be16 *)tag; diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c index 34f3212a6703..0ed379a28ab6 100644 --- a/net/dsa/tag_sja1105.c +++ b/net/dsa/tag_sja1105.c @@ -223,7 +223,6 @@ static struct sk_buff *sja1110_xmit(struct sk_buff *skb, u16 tx_vid = dsa_8021q_tx_vid(dp->ds, dp->index); u16 queue_mapping = skb_get_queue_mapping(skb); u8 pcp = netdev_txq_to_tc(netdev, queue_mapping); - struct ethhdr *eth_hdr; __be32 *tx_trailer; __be16 *tx_header; int trailer_pos; @@ -249,23 +248,20 @@ static struct sk_buff *sja1110_xmit(struct sk_buff *skb, trailer_pos = skb->len; - /* On TX, skb->data points to skb_mac_header(skb) */ - eth_hdr = (struct ethhdr *)skb->data; - tx_header = (__be16 *)(eth_hdr + 1); + tx_header = dsa_etype_header_pos_tx(skb); tx_trailer = skb_put(skb, SJA1110_TX_TRAILER_LEN); - eth_hdr->h_proto = htons(ETH_P_SJA1110); - - *tx_header = htons(SJA1110_HEADER_HOST_TO_SWITCH | - SJA1110_TX_HEADER_HAS_TRAILER | - SJA1110_TX_HEADER_TRAILER_POS(trailer_pos)); + tx_header[0] = htons(ETH_P_SJA1110); + tx_header[1] = htons(SJA1110_HEADER_HOST_TO_SWITCH | + SJA1110_TX_HEADER_HAS_TRAILER | + SJA1110_TX_HEADER_TRAILER_POS(trailer_pos)); *tx_trailer = cpu_to_be32(SJA1110_TX_TRAILER_PRIO(pcp) | SJA1110_TX_TRAILER_SWITCHID(dp->ds->index) | SJA1110_TX_TRAILER_DESTPORTS(BIT(dp->index))); if (clone) { u8 ts_id = SJA1105_SKB_CB(clone)->ts_id; - *tx_header |= htons(SJA1110_TX_HEADER_TAKE_TS); + tx_header[1] |= htons(SJA1110_TX_HEADER_TAKE_TS); *tx_trailer |= cpu_to_be32(SJA1110_TX_TRAILER_TSTAMP_ID(ts_id)); }