From mboxrd@z Thu Jan 1 00:00:00 1970 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> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: =?us-ascii?Q?oVC9aGJ9GV9L5RAZQb9J0tbr6O8p9nbaKSWoUPmAE5syNa+S/MVAEWA286Ny?= =?us-ascii?Q?LHlPCvNOSzt+adt9Sd4KA75eM/V47PDAw0dDfuEx5Rk+9Sw8tQspLTcsuGfa?= =?us-ascii?Q?DNozTbFqrpI5kHXvjSxQNOCojBOSNAGqwYl8hJ8oA/mjywt4ta70vNiolIOp?= =?us-ascii?Q?Dx/mlDfKfJ2SADuupmqHPUX3ZswDIgVBQtErUIiknyQgFFoO83pgTVenjEjM?= =?us-ascii?Q?5gEKQRrpf4uDz9RURKR+4Y9Jy2whjUkmBngwh6wcGKfSbw7GUMaP2k/GJXFp?= =?us-ascii?Q?nXW4MMtfliQohqzH550kts7RZoDL7VkFctDy0Y5XrfAU+o6H080en0dzkLo1?= =?us-ascii?Q?MaoubU2kTcHTK5xA2pq28AzK00Yovn1TIrAMOdgAxwyCXC+lbw+ZgLnbIozr?= =?us-ascii?Q?qUoyoH/5K435RJkBkSZ0HxsGzTNw077GhUzsFd9CFcIv7kDiMVPMqGEcqdjk?= =?us-ascii?Q?VPrZRMRgyhJErqwncdOMCgpm4sC1Jojv3QwMosxGU45SOrVQ0yNdFep/D7h7?= =?us-ascii?Q?p1wAW/3cVB9p/50J1IzvhEVQjK3evu6X8GFkmHLdO2SVOq04QKG50dWwNUjH?= =?us-ascii?Q?Lgt5cLS1wXL8NBWNfGaruf1TbxTgEGfbkFl9Lmbd+WS3yleuK/A5TRwFOn+r?= =?us-ascii?Q?TPyb5FjzXxzuVQ/1hJgMEwS8PefTMHa1Ab1tFOeiiGjFjVj3+uO9bbX2zCO2?= =?us-ascii?Q?wRpx+3aZ1RGKOmjIMwZIfwc+HiiLHSGP45R8BltmfBRQAxmuhilRVwjWxl7N?= =?us-ascii?Q?I9rycGiN8nPEZf0siZXHCmgwQMxTkD3s3nDQGGoosGvueQ6GOcz/B8r0Tiqg?= =?us-ascii?Q?ooS5GPAw5Gfic2IkwvhR0D3eyke04nTbea9tvU7KO8H05u1jBfRPCDq6KC9D?= =?us-ascii?Q?VFFCjZ7xZxo5UNmuv6o8Pr+HJ/MBOSZ3WeDejnViBtpWHkHlZoPE9uSAwXUL?= =?us-ascii?Q?WNfMgZ07/fk54vqXGwULrJoD02Rppd7UhXV6kapxP8pJiAEcUo78clk7dOvC?= =?us-ascii?Q?qsXT482p4shmJO8EAVSPpzSKuV3NXeFX2/23VY171R7aF02uAlv/O+Aa2DoB?= =?us-ascii?Q?u/zuxOix0DU3ozGdF2CvpN1dsE+uaMmaXJPjGuWXs4uImO1mVa8hYpP0VNJf?= =?us-ascii?Q?BEPaxUOJkDK9nbJw3wadC9xxduGmWNgOuD3upOvk6XxJDuIG2+gHydIR2APF?= =?us-ascii?Q?m2AMOXyINdt5UXYNWDlVSSzaQxdIGV9EQ0u3TOlDLd+LS1UbOhq/rG39IFMN?= =?us-ascii?Q?cZsxaXoOMw3a9cRXmL3o0tNvDTUqd9Fgz/sBDP9bHtLuRfsprlAfNng484LK?= =?us-ascii?Q?YtSmC1dQT+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 --- 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. -- 2.25.1