From patchwork Sat Jul 3 11:56:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 469983 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, 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 5F3F4C07E97 for ; Sat, 3 Jul 2021 11:58:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4362861926 for ; Sat, 3 Jul 2021 11:58:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230244AbhGCMBI (ORCPT ); Sat, 3 Jul 2021 08:01:08 -0400 Received: from mail-eopbgr20072.outbound.protection.outlook.com ([40.107.2.72]:8275 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230209AbhGCMBD (ORCPT ); Sat, 3 Jul 2021 08:01:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NBFnAbBR5m2AmAz0MN9ofObTOrkFzvTlFdbL8g02MXZhar+soDdOUMY1eEHhHG3CRFxTXnUmAcBZlVLzY9Tf1wXOrEYKR7dfcoDk9XhTHRszzwIa1GKzT9UGFBwfq5y/inPddD0EePBg70+jQlX6O6EFIkP3NpWxTIyFjfzg7MAeeD9ocPL7gafvgX/Bw4FuD4ltDuMEmyZdJ3vnUWK8Wj1wKuSarNtmLgr0Bo/00LfNIj7+hOgtCpmOIakv2cukUZneB0gT0uE/7J+8BVWUY1FCEHJT5CZJH0ZUrrpg8SVcWv60rICxCDuhme4i9oMCCGFruL/ciz3OfdJMMuek3A== 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=/8ARGCbzXYmxoVhI/W45fy7wsub+EkJDR8//ZmjXIV0=; b=XM4w9UjhvbXRwMvuZQlQSBLfChaquFWZMuvMk/Jr/MK47bPTYIT6NWD1twJv3XZz5ukJdEwjI/38z3l+LBAUkxEdMBsjyhjFrB9idP+WixBSXi2X1di5mhz/kysfhuSdMCfOONdTOR17R/JxBVcovLHKRf2Kt5X0V3rZ/ji1Y6zsNlRL6SM2jPQp7qRWvWezG8HPF3vjcIUUIVAWizVtSgaudXKchTwJYOtIps3FVUXJhDG71S0nOabatEVDzzNbOc2G63H3aOp3lqo7hGa7cNfB/M2ZIL83h0JWt8VXmVtLCuw60bVBcwoSoJ9Z2WP5tKaxGvTlZRTWmC/RlxUTvQ== 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=/8ARGCbzXYmxoVhI/W45fy7wsub+EkJDR8//ZmjXIV0=; b=UdldaYw4PcFuEjx+U3FA+s70+P9JWLeP7uPnZYH/3YA8Kfxiq4vdgSWVbDvpIApj+WYejlfqc1G9kEOj9NU6RrFUL8wuFl+0xtn1TOUQyo+05vOYnbA4vWUM5bQhTTwbn6QsYxsDY74SZ6I0WWz6IhPwmFl6e77CfcxD04IY+bk= 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 VI1PR0401MB2509.eurprd04.prod.outlook.com (2603:10a6:800:56::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Sat, 3 Jul 2021 11:58:27 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab%7]) with mapi id 15.20.4287.031; Sat, 3 Jul 2021 11:58:27 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Jiri Pirko , Ido Schimmel , Tobias Waldekranz , Roopa Prabhu , Nikolay Aleksandrov , Stephen Hemminger , bridge@lists.linux-foundation.org, Alexander Duyck Subject: [RFC PATCH v2 net-next 01/10] net: dfwd: constrain existing users to macvlan subordinates Date: Sat, 3 Jul 2021 14:56:56 +0300 Message-Id: <20210703115705.1034112-2-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210703115705.1034112-1-vladimir.oltean@nxp.com> References: <20210703115705.1034112-1-vladimir.oltean@nxp.com> X-Originating-IP: [188.26.224.68] X-ClientProxiedBy: PR3P189CA0081.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::26) 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.26.224.68) by PR3P189CA0081.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.23 via Frontend Transport; Sat, 3 Jul 2021 11:58:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 008a85f0-f965-4ed1-b8fe-08d93e19de40 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2509: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y7AKiONQfHFmIheJfwdHIedL9rkavL2MlqgZ0fwDNzvugVmwGVXWYXYdCx8/krG/l0ScKmlWrtZNddCiycLDrU0HR6h8yxI8t9+hirbkRWMy7vtupw/7pK4JxOjNW2ZNXlTpRNJXFfXWL1JUYKvFloKqFJavpIVWnNsEnkWKuQ6xQ/c246VyF/ILxfWWdTR7dGwYzS2ZLZkgU5Ar4q5C8PiXEXHscWY5OZzeiAxE9WH1/YM/VJnLcrbX4EXqrz9/s0y2tznoS0mXqdH4UmXYTFW5a81GRj3d6CfciL8pnPSv0hDurlWVQif+KyuI2MVcDJieL9zptacARie1bqp7DLono+OINmGeAA6gr4DzkeerA/3+EbvmnJuviQ4QUStz1vBQL7C/hPtp0pb3uF7L/Hs1YcfZitb/ld0hVOc2BSJPgUZEnSghWwQHRx585JPiwQskQZmEL/r0PN2UJ86UmQ2ydd3eIvUy85Tc/Hvs/RljQQpaaoB6+uc2KYXWF7kdIhn9BOlTvw4mQy19bVx3TprTeCjfnt9QnUNBM8HRwIg5N6wRTR7MfS1ZVQxpgdAZ3RgPDnSnHVK8oUdmk/GSna9WQuA1erAoELfXQO4SuUpiyKZhNlWbPdGF9bPhh021EfBtmCGW6rfE4QtPN8g+6K/VcuffX8xVuSSu8jNJm82JEYP+COT2cAaS3wTlPwdlH56MyaNuQcGEe4eKbeTZkrsW7fNTFnmlfVD2dpzmzPkv5qY69TrRFOz8DOV45HLI 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)(396003)(376002)(366004)(346002)(136003)(39850400004)(6506007)(2906002)(4326008)(36756003)(2616005)(44832011)(956004)(6666004)(478600001)(7416002)(5660300002)(110136005)(66946007)(26005)(52116002)(1076003)(8676002)(8936002)(316002)(54906003)(66476007)(66556008)(6486002)(38100700002)(16526019)(38350700002)(186003)(83380400001)(86362001)(6512007)(69590400013); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bhAVE4AAj6zIn5zXBD32TxDIseNtbCOUam94Z2dhpG0CRXwQ+uCQ5k+O7erhanDQCoaASU30hcUJeExzZ6FLWR8tPWJqNPIwcOCPpGvnUqncXvZbuQe/UA3Lf4IngTgx3aHOXmZe7NloPqw1sFgSB4H2cVZDKfGQ8bgfDqezT20FRZ95aAXreeEm0T3AplmO/9lluGuMw+1M4pD9OUXRFEL2pklcMIfJbqMwrSkjNeBehQEMDkZrPRE/CfAX8MF3tGq8q/ItOxAUOv/wk2qrysrQpGmJSApnl3oQgmikGOPFeB+Q0TO+NoPULayoMcGfRJXa1lBCzpG9aPyGdNDOgdtsZ1lFDYEBn1l63lwvD2wUTGExx4UAXubF6sFlTsMWr6FPz4Waf4OhatOtPNhrIyPwME1PgnGSAAquxPW8gce6aOjltHI9q+i3XHWk1LPowxT0CixU4CuP2FqbU1vUa24+4FpogGPkV76tmZqhZJ8aFlPC5Zfy/bnoYFKL54tGKTmHHOVq5NrY0S8oPYSnOkN6uzCE5TTl8b9DQe0mo7PdRn+7+KItauqFvGqlD4vc1mLFd6db8RruxCKz6a1IXoIh4Zh0Jt9CluinKBW2krxVt83APru9omFPUCLuy1XfV5SqRMVs3hr9MG6fGZW3YspMWxpu31UXADMuNGYCwNstvAKG4LDHCiQUTBeEuXvzmUU9+weEXAMB6B3nXMSE+rHa+S9LIb6K6xQbnvJBtUfkIvaFWoRN3gEv5eMIz+Hj78vV5hNi1x9FutljfTJSEvpLZxaI3goTqWEE9f0dU1+mURQg0SgoNqdYiU3Akfw6LZvOsk0IwgrhKBQjc2cHvszLbnLo5ArGbWSSf9HEBPa+6X630+95fCfVAZRzEWfmRX3cWnJnjTqSfeksLAvEybti02RwgdEvaMZMEz6oI5zn7MLgvbuDQax04STUJwuMtjA9tc6FDZBrTpcBGmquCICV1ni5Z214Juw1/ONvXO/etRahMVRNyXOGtQaB07IGRI4Fdu28I6gURzSXziMWNLTowjTlPs6jKcn/azQxE8zEeQWL8TSekrpcCvBsdGIsQ1iFOm5jDEwC9/d3PzXR+Oi0bEhBeX+u+Jfbf8sw3QoxfeQ8zL+0zOpFm0RDfbzDcewezEBM6z2cbjoVS1Oxx6hMkV0bJzBXP/D4WuXIrVya3R8zScoJ7ttbUbNSqjTLk66zAh5NsT1qJ2QeTTb0BnNL5B+lNwGZJmVjYXeY5cmqaEYEmloYm7V7yDGbGFdnfR5vckdHTBnBHdk9XdddjKAYDv7NDkEsC8ixgtYm0pGixhbtXqP10akAmCLThWXz X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 008a85f0-f965-4ed1-b8fe-08d93e19de40 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2021 11:58:27.7531 (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: 5hkSIc9L6k+wKEYSFrVtaGkMl3IuCTEY2DO9/tZEyTi95MieXHhLweetRjM6756n9UO5I6oLLHzym4Lv2pAJWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2509 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tobias Waldekranz The dfwd_add/del_station NDOs are currently only used by the macvlan subsystem to request L2 forwarding offload from lower devices. In order add support for other types of devices (like bridges), we constrain the current users to make sure that the subordinate requesting the offload is in fact a macvlan. Signed-off-by: Tobias Waldekranz Signed-off-by: Vladimir Oltean --- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 3 +++ drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +++ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c index 2fb52bd6fc0e..4dba6e6a282d 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c @@ -1352,6 +1352,9 @@ static void *fm10k_dfwd_add_station(struct net_device *dev, int size, i; u16 vid, glort; + if (!netif_is_macvlan(sdev)) + return ERR_PTR(-EOPNOTSUPP); + /* The hardware supported by fm10k only filters on the destination MAC * address. In order to avoid issues we only support offloading modes * where the hardware can actually provide the functionality. diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 861e59a350bd..812ad241a049 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -7629,6 +7629,9 @@ static void *i40e_fwd_add(struct net_device *netdev, struct net_device *vdev) struct i40e_fwd_adapter *fwd; int avail_macvlan, ret; + if (!netif_is_macvlan(vdev)) + return ERR_PTR(-EOPNOTSUPP); + if ((pf->flags & I40E_FLAG_DCB_ENABLED)) { netdev_info(netdev, "Macvlans are not supported when DCB is enabled\n"); return ERR_PTR(-EINVAL); diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index ffff69efd78a..1ecdb7dc9534 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -9938,6 +9938,9 @@ static void *ixgbe_fwd_add(struct net_device *pdev, struct net_device *vdev) int tcs = adapter->hw_tcs ? : 1; int pool, err; + if (!netif_is_macvlan(vdev)) + return ERR_PTR(-EOPNOTSUPP); + if (adapter->xdp_prog) { e_warn(probe, "L2FW offload is not supported with XDP\n"); return ERR_PTR(-EINVAL); From patchwork Sat Jul 3 11:56:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 469982 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, 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 2710BC07E98 for ; Sat, 3 Jul 2021 11:58:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 06CB6617ED for ; Sat, 3 Jul 2021 11:58:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230289AbhGCMBP (ORCPT ); Sat, 3 Jul 2021 08:01:15 -0400 Received: from mail-eopbgr20063.outbound.protection.outlook.com ([40.107.2.63]:47491 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230232AbhGCMBG (ORCPT ); Sat, 3 Jul 2021 08:01:06 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZKKHAdX5qSR+Cfti61G8iaUXb9bG5kSmtMYwK7Q4zhJpW36fSA6dyQH+nql/QC8Y6GU4Do+wIzxb/GNWuM+DL7jOkV+enmNiYvPtA4mg3cVLsv5bHdJG1+pO1HD7+DX5m1me3Dp9l+acGTKKoaDojAbpsgreD/YOlktkBjRoKXfmX+3b9ieNbzNyklhN6+P49ehcJgOLR9fS+nuMnGbqa1+1zNHNE/MITSjpZaUxdfMMKIqhqRrI+e4URC2hdXYLHcfiraIApqhilT3CsOi9twxPHDq5JSqaDA5d4NZTnzyhTJiqt6DXwKbeOqvBNFMMB42krsVs22BEE0dplbxb4A== 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=23nRG5Gwg8ZyF9G2b15V4G3AQDjXOyi4pS+pH4O6H6E=; b=dlhcrAkOo4UfH3PnT5NJTGcKFjOO3ig+j7rjvy4f6qdjKx8NSqgcG9lTGRfYabRcAOEB/la8Mj8g7keR6qksR3mn9twk6eQSCTgcfDgx5fSNSek452fERlDfHodWsGVKwYO+mZOW+l4AKHG4OGLOU7dW7mqYrtRRq7ODcb/uJBN3qJUeI67/KYhoGY6JmAKByMmcqvC8P4N2pYNesGpKiw836wIPSLCfvhQUV82SrmVCyeImmY4hQN2py42iepvSY37ZwsQHIAMrKA7nsLucjq1pha88GM0C2cb/D62G5TuisobhlasBY80+J9/WP18UaOryBAMiLESQxlai6fnVaw== 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=23nRG5Gwg8ZyF9G2b15V4G3AQDjXOyi4pS+pH4O6H6E=; b=DmYtY+M7ZwocFWW/DUxJ2SBfX5CcqwBERzUvGUlAuYSqbR3lSjyAJVyb26bJ3r8a0eYTBC2ktsuDIfoikBzD2bGxWhF1FUeOCVmfOclwqHhmZGGN9TLDzvz2JdVwQMCa6QDVYWiQSTSQx1O0PVa8jNlPtLwO6oniYhfqcWKzElA= 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 VI1PR0401MB2509.eurprd04.prod.outlook.com (2603:10a6:800:56::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Sat, 3 Jul 2021 11:58:30 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab%7]) with mapi id 15.20.4287.031; Sat, 3 Jul 2021 11:58:30 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Jiri Pirko , Ido Schimmel , Tobias Waldekranz , Roopa Prabhu , Nikolay Aleksandrov , Stephen Hemminger , bridge@lists.linux-foundation.org, Alexander Duyck Subject: [RFC PATCH v2 net-next 03/10] net: bridge: switchdev: recycle unused hwdoms Date: Sat, 3 Jul 2021 14:56:58 +0300 Message-Id: <20210703115705.1034112-4-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210703115705.1034112-1-vladimir.oltean@nxp.com> References: <20210703115705.1034112-1-vladimir.oltean@nxp.com> X-Originating-IP: [188.26.224.68] X-ClientProxiedBy: PR3P189CA0081.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::26) 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.26.224.68) by PR3P189CA0081.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.23 via Frontend Transport; Sat, 3 Jul 2021 11:58:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 790bd6b0-0a43-4201-e9d4-08d93e19e01b X-MS-TrafficTypeDiagnostic: VI1PR0401MB2509: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n08rB0HripkAh3Kf5EzN344txaHa85WmLevWHsMkX0AHskZOJNssOJuup0bqYUpvnLm8Q7P6JfV5H/wbBOIHmwDAQSpOA7zi2hYQZSEQLbUWcYnJ9OSH8Opp03Cj10be89VU/32px6SeRH63NU7Y12KGrhuJVkor2YUtJwOLJig4398VK+hQJP/0rUxx+ujWSNc1PXGIaBLJk/RtozUawOqSdSSdxylFNA4yX8Y9Jr0f9WfJfUX5MQntNWLqjDUCL9oEOTjhatta9DlkDtEyTT5ft8bXyrET2B8dGHKeMzyM2byyldbTDR4BjeGwMgKu1vOdWHH5n8KuwUHjnvJfvfAuA8AqtGD5pBSN2xy01fzBYb3gl2lGJsvbf4OFx1gmVQhhaw4c9OuIJckmorlwdcY4KNcw+31LBBusFmP/9WuPSvePJq073TfM2lFOCW6ru9w+EeuT7wwYEVLHl7E82lUlMcNAPPyAF8+Crpbkfib04sL0knpgFeX6PIJO1JP4l6ZwqcsmkmSgATP/7qp3uu89pjdHIC3pBJoKvTEW9Jnhx/3zIb4IOixHB4gfW2GNaCluFRbtdTFtu9qkLiHrH1A3GkrEQcYF6Au1mS7oroWt5G4ZIC71wckOUSulDNOG/wzEMWd3imZIvwcDe85Pno8B4/b9TPvi39WM7xDOIEyc5gW7qGO2brOUmZtENyx0wKg5mMr7MXZ8DYtaRNVUTV+nZoP1Q10SJSPhyS9KoNna3pGFXXtdPCLWDRhxX6ZC 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)(396003)(376002)(366004)(346002)(136003)(39850400004)(6506007)(2906002)(4326008)(36756003)(2616005)(44832011)(956004)(6666004)(478600001)(7416002)(5660300002)(110136005)(66946007)(26005)(52116002)(1076003)(8676002)(8936002)(316002)(54906003)(66476007)(66556008)(6486002)(38100700002)(16526019)(38350700002)(186003)(83380400001)(86362001)(6512007)(69590400013); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g8scRTQ32Y7plqkznipE2H+PzmYNtMc/8BFW1E7GAgWUoFB2C2Nzl3gYWaZ0/2rTYkG5KC/FC5UUvj30pQENkpv92yuPnSmDO0gxfU2/U07r5Z5igBP8YmiTXB5UPjWq4iBP7ZzX+afzYN3ZTfr9eb6Xrad876t1O2Km3gBlsBkP0RQvCZdluGTMdqfW8l15GNc+kz8/Z36gxHpPPKrEnfOxqCcVogIIr7734JCm6O7z2BwxLDRj61tTxIPjCflwmRxHm6Q4ssjLHucRqArDEfmWZ2/Qe1+4Ww/OUkR56cUwU5zSVqwGvu5dkZxFEQaUPLpcfPVyIFYSbDMQYzdmJ/2qJX5d44AfUDyt2GndOuV5ttNaZ8zrthDMstBPRXtlApuPYxArb6/TU7soHw1EjVt25lElxNyDFh3PXvWqSdXL/aACPsW3vCBTiu6LyW93qplftO470kBg6WQKPVWEilvF4oseGaMgRrHv/Z2ClxrLNW3A7TEaGmCyNv8z3ZgaLFW0F5FR0allV0ybzzJc5tTSSwkYArcfidkbRTcfd8JvzbYLHaUZ+gRzSbCWu9awKQBDNUVmzrw+mmTfZOAbbz0vjvo1ZAi9XV3MKIhrPIdVDS6moS7GM3M5h6Tzy9SRoK9C4D6v0UStKqn2z3dlnQ/QartoVEJC57zwu4GRYJ7p3u1p/UezSss+MWf3lme5RHFzLC+4dQJqp24rqDxZmS3ZW7AFwWf75pLwC7Dv7fahEsY2QqNSm0/80fyVNRnKvPQGN7fXkQRv9Pdb/ha6EL5jGPW8fDTdi0s8KLAFIY1QehXROWZyeQa+bupc33ABGe2hrZ+B4pbQSNa9Aoj6ExP6PgWHgQQUi89X48k21/Q+db992wNXQm4U9P/VAPcAvBHXZnQHd51h/oTb/egfjrcUlN2+7BpawyuOXv2uETwL+tXcyMbtmsxMoGElQw8vlhvf0lMFuaDXQCo+LppuBTI/pLfXexzhQF/rRgyju7YL4g8ACSFUGJB+l0TBg+kf+wvplWXIc8wntvy5EF/pVlco9y5SBU6dbQzMBPmvLJvz+UDK7FORzLvtUIzcBSDLwbd8bVMmWBu9mcacxmLJMKP5h9bqU4kPkHCGO8YVNnimV4L783hDpFM0+UtGhaaCrUcyowv05LYSaJkr8aI0qivIUINtAMhjgggyF8/5WTrs9/ASJ35lhMqauOSYFMEP3wr79CO+3GAzsdy+/Mq8n1vt1uAOwzjrlADFEz9BiSLXiiy/Ir9sbk7hCVgDrySqV6Xa7Oovs1nm4MG8OdCObe/nlpvkco8Otyo0J8wocLmCsMRmuV7ecH2Juz5eKpqH X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 790bd6b0-0a43-4201-e9d4-08d93e19e01b X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2021 11:58:30.6614 (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: 8z3ZtuOH5SfhweurBe7ZcSdETxDILZe3EtJTFoPiZrQL4almii6OYeIJddwU44P3QqZpTRhpN/sCTBGLpW7sZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2509 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tobias Waldekranz Since hwdoms have only been used thus far for equality comparisons, the bridge has used the simplest possible assignment policy; using a counter to keep track of the last value handed out. With the upcoming transmit offloading, we need to perform set operations efficiently based on hwdoms, e.g. we want to answer questions like "has this skb been forwarded to any port within this hwdom?" Move to a bitmap-based allocation scheme that recycles hwdoms once all members leaves the bridge. This means that we can use a single unsigned long to keep track of the hwdoms that have received an skb. v1->v2: convert the typedef DECLARE_BITMAP(br_hwdom_map_t, BR_HWDOM_MAX) into a plain unsigned long. Signed-off-by: Tobias Waldekranz Signed-off-by: Vladimir Oltean --- net/bridge/br_if.c | 4 +- net/bridge/br_private.h | 27 ++++++++--- net/bridge/br_switchdev.c | 94 ++++++++++++++++++++++++++------------- 3 files changed, 85 insertions(+), 40 deletions(-) diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 73fa703f8df5..adaf78e45c23 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -349,6 +349,7 @@ static void del_nbp(struct net_bridge_port *p) nbp_backup_clear(p); nbp_update_port_count(br); + nbp_switchdev_del(p); netdev_upper_dev_unlink(dev, br->dev); @@ -643,7 +644,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, if (err) goto err5; - err = nbp_switchdev_hwdom_set(p); + err = nbp_switchdev_add(p); if (err) goto err6; @@ -704,6 +705,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, list_del_rcu(&p->list); br_fdb_delete_by_port(br, p, 0, 1); nbp_update_port_count(br); + nbp_switchdev_del(p); err6: netdev_upper_dev_unlink(dev, br->dev); err5: diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index e16879caaaf3..9ff09a32e3f8 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -29,6 +29,8 @@ #define BR_MULTICAST_DEFAULT_HASH_MAX 4096 +#define BR_HWDOM_MAX BITS_PER_LONG + #define BR_VERSION "2.3" /* Control of forwarding link local multicast */ @@ -476,7 +478,7 @@ struct net_bridge { u32 auto_cnt; #ifdef CONFIG_NET_SWITCHDEV - int last_hwdom; + unsigned long busy_hwdoms; #endif struct hlist_head fdb_list; @@ -1645,7 +1647,6 @@ static inline void br_sysfs_delbr(struct net_device *dev) { return; } /* br_switchdev.c */ #ifdef CONFIG_NET_SWITCHDEV -int nbp_switchdev_hwdom_set(struct net_bridge_port *p); void nbp_switchdev_frame_mark(const struct net_bridge_port *p, struct sk_buff *skb); bool nbp_switchdev_allowed_egress(const struct net_bridge_port *p, @@ -1659,17 +1660,15 @@ void br_switchdev_fdb_notify(struct net_bridge *br, int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags, struct netlink_ext_ack *extack); int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid); +int nbp_switchdev_add(struct net_bridge_port *p); +void nbp_switchdev_del(struct net_bridge_port *p); +void br_switchdev_init(struct net_bridge *br); static inline void br_switchdev_frame_unmark(struct sk_buff *skb) { skb->offload_fwd_mark = 0; } #else -static inline int nbp_switchdev_hwdom_set(struct net_bridge_port *p) -{ - return 0; -} - static inline void nbp_switchdev_frame_mark(const struct net_bridge_port *p, struct sk_buff *skb) { @@ -1710,6 +1709,20 @@ br_switchdev_fdb_notify(struct net_bridge *br, static inline void br_switchdev_frame_unmark(struct sk_buff *skb) { } + +static inline int nbp_switchdev_add(struct net_bridge_port *p) +{ + return 0; +} + +static inline void nbp_switchdev_del(struct net_bridge_port *p) +{ +} + +static inline void br_switchdev_init(struct net_bridge *br) +{ +} + #endif /* CONFIG_NET_SWITCHDEV */ /* br_arp_nd_proxy.c */ diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c index 833fd30482c2..f3120f13c293 100644 --- a/net/bridge/br_switchdev.c +++ b/net/bridge/br_switchdev.c @@ -8,38 +8,6 @@ #include "br_private.h" -static int br_switchdev_hwdom_get(struct net_bridge *br, struct net_device *dev) -{ - struct net_bridge_port *p; - - /* dev is yet to be added to the port list. */ - list_for_each_entry(p, &br->port_list, list) { - if (netdev_port_same_parent_id(dev, p->dev)) - return p->hwdom; - } - - return ++br->last_hwdom; -} - -int nbp_switchdev_hwdom_set(struct net_bridge_port *p) -{ - struct netdev_phys_item_id ppid = { }; - int err; - - ASSERT_RTNL(); - - err = dev_get_port_parent_id(p->dev, &ppid, true); - if (err) { - if (err == -EOPNOTSUPP) - return 0; - return err; - } - - p->hwdom = br_switchdev_hwdom_get(p->br, p->dev); - - return 0; -} - void nbp_switchdev_frame_mark(const struct net_bridge_port *p, struct sk_buff *skb) { @@ -156,3 +124,65 @@ int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid) return switchdev_port_obj_del(dev, &v.obj); } + +static int nbp_switchdev_hwdom_set(struct net_bridge_port *joining) +{ + struct net_bridge *br = joining->br; + struct net_bridge_port *p; + int hwdom; + + /* joining is yet to be added to the port list. */ + list_for_each_entry(p, &br->port_list, list) { + if (netdev_port_same_parent_id(joining->dev, p->dev)) { + joining->hwdom = p->hwdom; + return 0; + } + } + + hwdom = find_next_zero_bit(&br->busy_hwdoms, BR_HWDOM_MAX, 1); + if (hwdom >= BR_HWDOM_MAX) + return -EBUSY; + + set_bit(hwdom, &br->busy_hwdoms); + joining->hwdom = hwdom; + return 0; +} + +static void nbp_switchdev_hwdom_put(struct net_bridge_port *leaving) +{ + struct net_bridge *br = leaving->br; + struct net_bridge_port *p; + + /* leaving is no longer in the port list. */ + list_for_each_entry(p, &br->port_list, list) { + if (p->hwdom == leaving->hwdom) + return; + } + + clear_bit(leaving->hwdom, &br->busy_hwdoms); +} + +int nbp_switchdev_add(struct net_bridge_port *p) +{ + struct netdev_phys_item_id ppid = { }; + int err; + + ASSERT_RTNL(); + + err = dev_get_port_parent_id(p->dev, &ppid, true); + if (err) { + if (err == -EOPNOTSUPP) + return 0; + return err; + } + + return nbp_switchdev_hwdom_set(p); +} + +void nbp_switchdev_del(struct net_bridge_port *p) +{ + ASSERT_RTNL(); + + if (p->hwdom) + nbp_switchdev_hwdom_put(p); +} From patchwork Sat Jul 3 11:57:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 469981 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, 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 42B7AC07E97 for ; Sat, 3 Jul 2021 11:58:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25B4561922 for ; Sat, 3 Jul 2021 11:58:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230265AbhGCMBS (ORCPT ); Sat, 3 Jul 2021 08:01:18 -0400 Received: from mail-eopbgr20063.outbound.protection.outlook.com ([40.107.2.63]:47491 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230257AbhGCMBK (ORCPT ); Sat, 3 Jul 2021 08:01:10 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pjj69hrcgj87/Mh5yJsgomjKQho/d26HOtv/jav43H1H7nNZsculf9tpreVs9A21UyoHyuPWxidFGiU/T277z3uhTu+HWvUrNV1SRTT/rRrehmzXXdtB3nFA6nBZAQ+/K5TxsYzspt4Kcb5FUl2zmJkFOJivHQdQucArekizCIlSgw+wO2XwgjGcFtOkoRtdubnjbOemDRqZ8nmC0E96WerUb8cgxuEe3EqY8+PouiCq7ZK/HNvxe4PnUJeLJhpO7jDkOQ9AOnc+gbP21/tOh+wzyrwfpZfOUni0JNcFlyhezYciYC+vi17yQVJNZcvDLXrIupg5IiWjE/PQo3QfMA== 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=tdrmZRU0Q37EP78FtXBrjURVRoxh9R2XUtsYeAyE8XM=; b=JkHiXBI173Dsp1+sDWXDLr2rXVvljYc7YWqCyG/Zi3appSTClhxpIgm2V/x4IDuTNNtH0cc6FT92GLEqf4+A6ytSZX9YQM5/BBXxVGR/TU3dC0PyDBC7r6JpHnfJBmmteRUyCvXYO5bpXQJgC4ZCdQQt3pfniJIkjp5eqY2SWwONHrdpz9fVWdJCaBBEtMNkEsEcjI1UeFquP9hv2HdgeNST7wXltDIPYJUmZyd0aKaONthGvPTx8B+9veq8v9Zp0lSPFcYPBfFzzp8UFA+26T/Lt2JpuU/m98gfbpo775ZkSOTHOfLMjVDq3MYKRLfBDmVdF/6PIQvgMFUgwfK+uQ== 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=tdrmZRU0Q37EP78FtXBrjURVRoxh9R2XUtsYeAyE8XM=; b=UGHdQghISd2IvCvLLHDKUWCf3tq/Op8H+TK3twnw+TjCwHBEYlwa+Y835DSieZFT2m9dWJ5Cqdqhq5yY00/MXJ+ntU5dx5KJbEyfyxLJ0AjCGIOGmQeBOWK3WJfjb9GM034hBS8y3SUhCQkBjnw1S8jfpZ5Qt7spnTM137Dc6rk= 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 VI1PR0401MB2509.eurprd04.prod.outlook.com (2603:10a6:800:56::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Sat, 3 Jul 2021 11:58:33 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab%7]) with mapi id 15.20.4287.031; Sat, 3 Jul 2021 11:58:33 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Jiri Pirko , Ido Schimmel , Tobias Waldekranz , Roopa Prabhu , Nikolay Aleksandrov , Stephen Hemminger , bridge@lists.linux-foundation.org, Alexander Duyck Subject: [RFC PATCH v2 net-next 05/10] net: extract helpers for binding a subordinate device to TX queues Date: Sat, 3 Jul 2021 14:57:00 +0300 Message-Id: <20210703115705.1034112-6-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210703115705.1034112-1-vladimir.oltean@nxp.com> References: <20210703115705.1034112-1-vladimir.oltean@nxp.com> X-Originating-IP: [188.26.224.68] X-ClientProxiedBy: PR3P189CA0081.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::26) 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.26.224.68) by PR3P189CA0081.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.23 via Frontend Transport; Sat, 3 Jul 2021 11:58:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 68f8265a-71c0-4113-ed45-08d93e19e1d6 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2509: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wh44hv8aDm2gMTn5HpRk7BwmbhudMOsUrH9Yhx6Q/tq9Vs4h7TNaklRkjJdWs3JMHUaSUor2WuNS6p+MiE7GrGeuj+H0V3MRCOXgb6+cZD5Q/m0Xu5seexKVfr/6JFgOVAhpxO8WnrviqUSu4ccmS13vcyJyHZ84PfvY56v2BtGd8B1eHYKycU7p3y0deEWg79KnYbFtXEpUZTq9mdOorUA+mgFzTARaO3WZruuK6wamvLyuimoo9GKOPN5ypSOSoKdNtYrzATyHxxr5j4sspmmenFbBYN7fqlkOPzZ5kyIwOnAb36YzfMdFm2vUhv7XYEJkwOuqao9niGFoM1MD6sm5XxO7FSAgER+rFIbqkhizQgN+HnUgXqJri6O78ubr3FiUmG8kPxc5/l/MPCNlbNQoPgnJ4SfqWk78J28Hh8trdvkiWAY8w3EQc4hYRibiuZqHY6TkpRPQHk6nsvHdr176jwBDaDscVjEzZYVWZrNkfsmt9XpvjqQFjboZiyoR8i3W+ZUxlbKT/0q12Fe4hRkH56Jyq1u/gctuPTZqCr9dKKlmSxz9iTlEhg7Zw5Fzre6NZyoaCdzO6Qraz2UKktwogrs7stSrlGXvtZkYjBIh4auJhCbWksIrT3tWV+lnpv0r5L8AcU5cHa/qKvC1QivbpWttnR0HH1bhMsLXuWXWbgo8KZEZiedBNxrT5Ejiq+Go2QKCev/BypobXtV4DZq5D4Ux3iyyH5MokYaKaow6hdhYZpC2M/WgXHoJ9FWG 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)(396003)(376002)(366004)(346002)(136003)(39850400004)(6506007)(2906002)(4326008)(36756003)(2616005)(44832011)(956004)(6666004)(478600001)(7416002)(5660300002)(110136005)(66946007)(26005)(52116002)(1076003)(8676002)(8936002)(316002)(54906003)(66476007)(66556008)(6486002)(38100700002)(16526019)(38350700002)(186003)(83380400001)(86362001)(6512007)(69590400013); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 38GSF9kvT0iL88mkp0qzoWe7slaIGte2RLozogRF8EFBaf4+54FdIzOWoUNegGN+N/+rupuguRTC/yqFFvA4frr1JVGse78+iHrP9kVrEVroJy3hJNeozMh6LatAYD9QoZUAiCmdNbBh8wmIGpmgnfy96DncmhU43MfxKP9z+EA6wh6x5LTcV2y7ZbX1qjeeaBXLj98+NBdgsn0Pke5XMClAXeIRdMkov90dUzxBdhJSMWd2MRP1Xe27zgtdVVBYOwnCQ0pUxFEDOFmY0rmaADi7FPDwvccmdoQ/cKJxh9cURcw08cL0kpRDyGcisV2y4WCfdSKySATYX2m+iDRVMcCMQPRHe9BSed/EKzcTmpQrM0Ta2pq+uLwGWfIukIiCpLJIxEXq9W96/eJ5//96Xt1E6ePGwgD1JU27KUE8LgQB1/F8oV464BmwhQu76Cv5K8g1vP6cl1zOwXjT2Vu8zA3aV4HORtDh7uzhJ59rkunZEX994jCbi3pKytPuqrRY9WE/7FW8RSf5Ao1ysByoqN4rP7eO7INiOcmPfpxULaALUdScEBDtDBkvOJfKVcECSgPPKL5T+yWcr+gORuudRvJRjdxR+4bZ2EzzxkiYMP+NtkVX5bL8XD9L4tx8rPtDLHuMEQXxIe3scV66Lx5yrHZ8/tW17ye1xPH79nP6DUzMsPO6+jx2laGYQGJdt6hcT4vdcSsQLa/eIuOSw8TKez0suVCPpSFkAihqFcj3OWh/u9rt7tiTXfrhcQpcE4mo3L7TjQOjPP3xPvKUI9doH1kXeDgE9Iztj7CR1bizqbIfX1K/NGHsU7AMG7zXZOEJVWtU3djjgTA8KeUIjIU421G9vipyX/pjsBYMTv2xdn1LNOTHQGeJBn4Ya/hO724T4incLUUXMPdHo+G/NuJsYvg0D9JAxGi1e0aaLgi0VIqJ+o05vWSJBTKxUjIjYUbAp9QXWJeK7xdmScEWU1yjUM5rD1hHqY3imjo/3AQXdLU7cnsYd2b80nErTd+PpB3R5fVxtoyxiKcpaHtqpH6IWj4jhN9IT2eIlnNcrKIOTfpP4MuCaVIJ9XkYugMP6o01CJbqSKSdMD964Gtzj2y/900WhsBzrDTA3slAzWVDpty6ksBw+34+5zX5NGdhMYCk67yHwoC6t+B77r5y4C9s3KlxnA6ZAFXQUSf9CDgE8iDGC5RuJ1PRTptbMiqMEbXLj7JGLaChl1HKJev7VXTCFPplfmyEKD3sPyGWkPRrQlfoBMC03k4tD7M1dj+jd1M37kUcl5TevjmEmbjWyWTFic9RZKmpdP61DgRqezKtlqDQXoTK/nf4VZJsSCVy5J76 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68f8265a-71c0-4113-ed45-08d93e19e1d6 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2021 11:58:33.5438 (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: IYvNMaogPc+CwWUm2VD6OqhyheNUw2cFuJPHKfWy+JXT6wFQje5werwFelDc9ukgWtL0Xw1LZ18HEH0wurWeXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2509 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently, the acceleration scheme for offloading the data plane of upper devices to hardware is geared towards a single topology: that of macvlan interfaces, where there is a lower interface with many uppers. We would like to use the same acceleration framework for the bridge data plane, but there we have a single upper interface with many lowers. This matters because commit ffcfe25bb50f ("net: Add support for subordinate device traffic classes") has pulled some logic out of ixgbe_select_queue() and moved it into net/core/dev.c as if it was generic enough to do so. In particular, it created a scheme where: - ixgbe calls netdev_set_sb_channel() on the macvlan interface, which changes the macvlan's dev->num_tc to a negative value (-channel). The value itself is not used anywhere in any relevant manner, it only matters that it's negative, because: - when ixgbe calls netdev_bind_sb_channel_queue(), the macvlan is checked for being configured as a subordinate channel (its num_tc must be smaller than zero) and its tc_to_txq guts are being scavenged to hold what ixgbe puts in it (for each traffic class, a mapping is recorded towards an ixgbe TX ring dedicated to that macvlan). This is safe because "we can pretty much guarantee that the tc_to_txq mappings and XPS maps for the upper device are unused". - when a packet is to be transmitted on the ixgbe interface on behalf of a macvlan upper and a TX queue is to be selected, netdev_pick_tx() -> skb_tx_hash() looks at the tc_to_txq array of the macvlan sb_dev, which was populated by ixgbe. The packet reaches the dedicated TX ring. Fun, but netdev hierarchies with one upper and many lowers cannot do this, because if multiple lowers tried to lay their eggs into the same tc_to_txq array of the same upper, they would have to coordinate somehow. So it doesn't quite work. But nonetheless, to make sure of the subordinate device concept, we need access to the sb_dev in the ndo_start_xmit() method, and the only place we can retrieve it from is: netdev_get_tx_queue(dev, skb_get_queue_mapping(skb))->sb_dev So we need that pointer populated and not much else. Refactor the code which assigns the subordinate device pointer per lower interface TX queue into a dedicated set of helpers and export it. Signed-off-by: Vladimir Oltean --- include/linux/netdevice.h | 7 +++++++ net/core/dev.c | 31 +++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index eaf5bb008aa9..16c88e416693 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2301,6 +2301,13 @@ static inline void net_prefetchw(void *p) #endif } +void netdev_bind_tx_queues_to_sb_dev(struct net_device *dev, + struct net_device *sb_dev, + u16 count, u16 offset); + +void netdev_unbind_tx_queues_from_sb_dev(struct net_device *dev, + struct net_device *sb_dev); + void netdev_unbind_sb_channel(struct net_device *dev, struct net_device *sb_dev); int netdev_bind_sb_channel_queue(struct net_device *dev, diff --git a/net/core/dev.c b/net/core/dev.c index c253c2aafe97..02e3a6941381 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2957,21 +2957,37 @@ int netdev_set_num_tc(struct net_device *dev, u8 num_tc) } EXPORT_SYMBOL(netdev_set_num_tc); -void netdev_unbind_sb_channel(struct net_device *dev, - struct net_device *sb_dev) +void netdev_bind_tx_queues_to_sb_dev(struct net_device *dev, + struct net_device *sb_dev, + u16 count, u16 offset) +{ + while (count--) + netdev_get_tx_queue(dev, count + offset)->sb_dev = sb_dev; +} +EXPORT_SYMBOL_GPL(netdev_bind_tx_queues_to_sb_dev); + +void netdev_unbind_tx_queues_from_sb_dev(struct net_device *dev, + struct net_device *sb_dev) { struct netdev_queue *txq = &dev->_tx[dev->num_tx_queues]; + while (txq-- != &dev->_tx[0]) { + if (txq->sb_dev == sb_dev) + txq->sb_dev = NULL; + } +} +EXPORT_SYMBOL_GPL(netdev_unbind_tx_queues_from_sb_dev); + +void netdev_unbind_sb_channel(struct net_device *dev, + struct net_device *sb_dev) +{ #ifdef CONFIG_XPS netif_reset_xps_queues_gt(sb_dev, 0); #endif memset(sb_dev->tc_to_txq, 0, sizeof(sb_dev->tc_to_txq)); memset(sb_dev->prio_tc_map, 0, sizeof(sb_dev->prio_tc_map)); - while (txq-- != &dev->_tx[0]) { - if (txq->sb_dev == sb_dev) - txq->sb_dev = NULL; - } + netdev_unbind_tx_queues_from_sb_dev(dev, sb_dev); } EXPORT_SYMBOL(netdev_unbind_sb_channel); @@ -2994,8 +3010,7 @@ int netdev_bind_sb_channel_queue(struct net_device *dev, /* Provide a way for Tx queue to find the tc_to_txq map or * XPS map for itself. */ - while (count--) - netdev_get_tx_queue(dev, count + offset)->sb_dev = sb_dev; + netdev_bind_tx_queues_to_sb_dev(dev, sb_dev, count, offset); return 0; } From patchwork Sat Jul 3 11:57:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 469980 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, 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 91DB0C07E98 for ; Sat, 3 Jul 2021 11:58:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7CA1F61922 for ; Sat, 3 Jul 2021 11:58:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230344AbhGCMBU (ORCPT ); Sat, 3 Jul 2021 08:01:20 -0400 Received: from mail-eopbgr20063.outbound.protection.outlook.com ([40.107.2.63]:47491 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230266AbhGCMBM (ORCPT ); Sat, 3 Jul 2021 08:01:12 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PkpQZpCZR0z+ipHKxL60nv5krq25SMuT/S+kh0RV0RayH9D2Qf3l2mPj2O6q7WPdwM70F5b+pwaRTsoKd+m79ATTg+7QAdvFcS3+v3UJguW/3rXLhDR/HUvFz2HYde9p4yTy28pTfShb3aFyBGe8eKIKnoYOhMdIVJcaZcryx15fHSM9rRejt++85uE91Eag60plUhSA9sp1fToPdW8bB70N3JC+SjCo/bd6MVlVoCd1LugHBTatwXplE7irI2EraivjVgx3jMD6P/2LEl3j1kzw/u7zCEe27G+FMpruzuGpP15zdDok7u+BVCizddVa0kne16JO2B/OUE6ZOh3CIw== 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=YcXpR57JCcAMQ9q/jdIeT5Ev/nTHUqZD/rJq1Q8j8q4=; b=azy0ccum6fhBGBPV1ammHjcuP5FFDs6bK7CN+eoHv+TLdKgJDNNVndbHxnbnLyOt85HR95BAtbKf3+/95Ay4UCgO2+IAlbs5xio5N0nxT27tFPeD1wWTOcApGNRhd1Ik4jeFwXTFLNM46H1lz5AnL/DDAh+EoBTHCmFnuwUdbrrlNs86J0JEJ02kmL7QDxdAJcm+0Wfiqu2PrI+HKvc7MjyfT3FhkfGNrTVJ3ub8cLACwEOJdZEnmLOJ5dJpyGwKWyVqJrtwpOLEqSbAF6kL9F2P9vFkb+qQeveDgMmkiw6EKsjQH2/njSohBPwCExUv/2VhsS4yLV6M88weyAZI0Q== 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=YcXpR57JCcAMQ9q/jdIeT5Ev/nTHUqZD/rJq1Q8j8q4=; b=XCRHziJTV6C4CGUooEYbkpDGkLegU80mRJYA0pwF8df78TIh/UkpjaVzTbJYeM9rP6F2MODRmMvpl+2N5wnLT1fQsqBc+kbl//P4eu36f8VE7GsYdl4WIDL53lTaALHG81cSJnb2QM+OGNrh8kr1KXsdUKUb1UUG8UHmYVsz0j0= 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 VI1PR0401MB2509.eurprd04.prod.outlook.com (2603:10a6:800:56::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Sat, 3 Jul 2021 11:58:36 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab%7]) with mapi id 15.20.4287.031; Sat, 3 Jul 2021 11:58:36 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Jiri Pirko , Ido Schimmel , Tobias Waldekranz , Roopa Prabhu , Nikolay Aleksandrov , Stephen Hemminger , bridge@lists.linux-foundation.org, Alexander Duyck Subject: [RFC PATCH v2 net-next 07/10] net: dsa: track the number of switches in a tree Date: Sat, 3 Jul 2021 14:57:02 +0300 Message-Id: <20210703115705.1034112-8-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210703115705.1034112-1-vladimir.oltean@nxp.com> References: <20210703115705.1034112-1-vladimir.oltean@nxp.com> X-Originating-IP: [188.26.224.68] X-ClientProxiedBy: PR3P189CA0081.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::26) 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.26.224.68) by PR3P189CA0081.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.23 via Frontend Transport; Sat, 3 Jul 2021 11:58:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f897eaae-f91c-4fe3-fd81-08d93e19e394 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2509: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TDqJ8j0J44HJZUgWvPaiVNCG/prgbniCzl78r5sUovlQgfVwolp5pwGnDSHPbVkGpdm3pMLDETl9oEC1j52pZI7n0qjKw8rFJkKZK4Lwbf729QYBri/s6QpIHPxGIjaKahXhX3hdmaE9FwjmFhNHuBzv76onJ4nF3Wm3dwtjSjGH11cYxZfg9xnxsZQVJmLiL2UAovrthvpvFuDoK3FwMCR0Xw2qkLxS/IencfRtEQanULh6CR6sm+eGjQb1qc/vhAJZTgw9Z2DNs2vtAWVit/DOjbnbPI39zjHi4hXkdXFRehJrdvKP8GmNHymF0PsVHRFYRQjyW/OgMfdjLHxFRrnReHSSxhpfIc2MKv4lhRHFdMhyb2ftgQcxnUFcJ6ScAScF6bDDIYO1K8Nk4K9avthI3DNxOXH0hPXrrk46cWSKx2wuLkSpeypoEKqGItBJ21d1a1q3wcf2xE/EskT+q2pw9NVtLDcijUx9Vi0rf2f99Tsgd+y4ZvR76dhbAlIWDBpHr73+Dcn9EA3Jr4nmu49gFV0zpisj5GaCkKudGP46+PnyW4OP16nVu1rqGmmrjK/Qi6AzcCmQLYC1MBo0hBmSGbzPVAbqsJrX5jWFkMKaXgWMbBlR4iW3ntIquGORIPuHFBSae8d4PRn6SHWzCa7/z1X6gqeCjAFFSUNyaz5XvgWJFo04Hs3LaCskhzOfCjtjme9/ugSVC72Laal7UvOmKS0Vd+fht92W8bGwqf9dsPtuBFGk4Y+iDLXFeD32 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)(396003)(376002)(366004)(346002)(136003)(39850400004)(6506007)(2906002)(4326008)(36756003)(2616005)(44832011)(956004)(6666004)(478600001)(7416002)(5660300002)(110136005)(66946007)(26005)(52116002)(1076003)(8676002)(8936002)(316002)(54906003)(66476007)(66556008)(6486002)(38100700002)(16526019)(38350700002)(186003)(86362001)(6512007)(69590400013); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8DZtsF5x8gTQ6dQd6F3pokVcNI11ln//0hpzIW7NMfVD4Rsa/FSKAGGtfdu1ECpu1v1f0iS3mKrE2V2qcfSzNn02HEQzQW2VwThU4tbfFi9UzuR4smkug17sLNFY8+ffcdDHuTAZD5B6Ri2DyE5JMUnvvgJAaEDhNc3kYIOk6ftNzCpqYQ9Dl7boWzmfdRhqWvTuvy6KuVSfgLmDLY4NMnuGuBtpBSvtXryO4GuXg0oA5YQTg9/S5lenx3ItBGXRSjqiFnSzdoWHwutJeorM9WFit6GkcLpBX4180KM7hBsNz+FzvXK29atr6ajXFpd3VbUtN2WH8Zr4Di7BFsTh5HZhAXeLN13RZ5PWQdkenXh9QOq2MNzKa94VyjESOY3N+IPpcuXN2SYmcTmMXfo5799GQI9NvL4ViuqhC/FG5ZOqIfdTooFSODQqrDWNDd4XHwwQVfva5VLPSPYLiFQqhlFM7v4NgOKyCbw/YikOCZlH4Zy7B1X68MBvf2hAkW9nKxaCGAdbEFPb/dARSCFHXVVSkbSA7MMISBa9DB2iHD9AMM8Nu6aawfk6HRPpck+PYH0AYNEZZsL3wEWdqsYme+/5yPI/KuM6Yapsfmarr7yxuiQ7CLG/q8cK6+hfooeDi9xndB6MBhodN0AQHi0qKrr/m1HxU0+ycHDZMuSGU1bOjflnsvljXIR1vgcFIhQaSeVHGTQPHIeMHahr2HXPwzUkfTTZgTxTYeXoIaYUIuFmsjwOGgxWOVOz9uyMXYm0v1RiKj65EsN4+FFagSD1Mo1cNLNRRVwky0yDHzSXirg92pDxQ04rMnzHL97OhhoH+VFZcXEookePC/3Ve1bs96Xe/k7KgWpnTFqePR+9UL4H2ETdZMPOtyAdR5WxyveerSczVJYPbKgMeBvLtx0ISkmoS5XOMWPQpV7Jdt8KoxPJEklKxV82fHfb8HoSdAjNptqFyF6aZsApyxM54B5OLtjzu5k6xTFXFZv9SfXLwaDqqSydQWeAVolbXCeSIXi/Ywas7195SeKckgpMxqKTvsiWi7uPP6BpBMNrAScw6T3kCVVj/K6fADhJhTD9LTLH7qUs4a3sQ6DCeQtALUgHEqOhehzcqcCSCGBvDiWy0Uogy3R0pGYRopBgyyooExwsxBy2j2jafJBpDg4Cc80AN5+vWfVRLSCRVUiLVO6nRCedg2XyQZaLYpZ0EsLIWYrq/QajcL5kdenwLHLWxx4NhWMAWiM2/INCqnN+TyKZ7ONU3U3AqoKZl0ovYH+RVOPGYxG5MIqc4NWxyk72YgLLEZb55Qr4emaFqw0S6SDEBeBTY46OUpm5dG0dwNM3JvI3 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f897eaae-f91c-4fe3-fd81-08d93e19e394 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2021 11:58:36.4671 (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: qK6WUS2u1q10xnmoq8MffBGP8E/nrm6NdqK1E5beCMbFFSDITTVojIsnGrxo75wQUKHHTchKfFZpHUorT8lbJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2509 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In preparation of supporting data plane forwarding on behalf of a software bridge, some drivers might need to view bridges as virtual switches behind the CPU port in a cross-chip topology. Give them some help and let them know how many physical switches there are in the tree, so that they can count the virtual switches starting from that number on. Note that the first dsa_switch_ops method where this information is reliably available is .setup(). This is because of how DSA works: in a tree with 3 switches, each calling dsa_register_switch(), the first 2 will advance until dsa_tree_setup() -> dsa_tree_setup_routing_table() and exit with error code 0 because the topology is not complete. Since probing is parallel at this point, one switch does not know about the existence of the other. Then the third switch comes, and for it, dsa_tree_setup_routing_table() returns complete = true. This switch goes ahead and calls dsa_tree_setup_switches() for everybody else, calling their .setup() methods too. This acts as the synchronization point. Signed-off-by: Vladimir Oltean --- include/net/dsa.h | 3 +++ net/dsa/dsa2.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/net/dsa.h b/include/net/dsa.h index 33f40c1ec379..89626eab92b9 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -159,6 +159,9 @@ struct dsa_switch_tree { */ struct net_device **lags; unsigned int lags_len; + + /* Track the largest switch index within a tree */ + unsigned int last_switch; }; #define dsa_lags_foreach_id(_id, _dst) \ diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 185629f27f80..de5e93ba2a9d 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -1265,6 +1265,9 @@ static int dsa_switch_parse_member_of(struct dsa_switch *ds, return -EEXIST; } + if (ds->dst->last_switch < ds->index) + ds->dst->last_switch = ds->index; + return 0; } From patchwork Sat Jul 3 11:57:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 469979 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, 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 6C6A3C07E97 for ; Sat, 3 Jul 2021 11:58:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5661861922 for ; Sat, 3 Jul 2021 11:58:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230375AbhGCMBX (ORCPT ); Sat, 3 Jul 2021 08:01:23 -0400 Received: from mail-eopbgr20063.outbound.protection.outlook.com ([40.107.2.63]:47491 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230282AbhGCMBO (ORCPT ); Sat, 3 Jul 2021 08:01:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MRTAQzcgqv0r9LmKhAdiXyRsC1Sjbf3BFjVPnkvLtIuYM57qWAz2jz/ryANOyNCaPR8tMrzkARSyh5pofriio0DQuGjZXuzJedW8+Jmy5/PpxZavP20TWh5czbMoTc/3S/1hfKt9kTc06oEgTIUJ4/Qdih//Zo/URo9+uYJW04fA3WRPJf/uBxFSp95c2yvNylxOgV8NLwD3EMpVN/ZNLO01VA4FOunE0YUrT0QFZMWYSjI0RTdtV0k9g+8tkouPe7t1iOT7oChjhDLRYHqmLgluozocN2mAhmXfvSxsEJpi0M4gziGSOhgT7ppxbYu3awkIMOrU/0maf0+OZOnVfg== 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=Eu1sAgg7D4fTGIJBx5Bv/Zf9lqtWFAqVWzacPFz9uYA=; b=nAmhLdMhBWoOUULxXIaGhBgsaL+K8x+gRIHXghftAh8dgwRtn4iPlGCXnDQ7rBfcLus29QfSdMThOyJ7U39eVjN19p0FVbu+dmkC8Xx0vebl+FRzVVxbBEYyK9/3n+EACNIVpdh/5k77akJs2xYqYczpZLKUbkoUx8JQC3i55QT3+zhgkMIK1yfm3nBNGKSTWSRQP+cCKAUUYBm+ixEOOgsY6dLMxFHjg/84w2FMF/O8QGcAeZ1cjHhzsNbuVLFhH6v7dHKvuUDISOB9b0T6wmS/OZ/BA1Ok+y5LzPa4IGFGmOBmnirVbmnCkFZzZZR5eHPDZ0Rt/kFZ+YFe72k8rg== 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=Eu1sAgg7D4fTGIJBx5Bv/Zf9lqtWFAqVWzacPFz9uYA=; b=aHY2jehM9D4WnS4ZsbTT9gVwbKrz+TX5aQCqyZsdKPLnEc3yp2JvEpE0fPDKxdQfdgn1cXFsYoP59ISuKhqf0vfshRDa5ygGaWJBUEi128oLZk4T+NHb2TmIpnkNZTVPznKrPhSqdJczDirAj70kh+xNyCa8Q7VRWJuhO8VUaZ8= 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 VI1PR0401MB2509.eurprd04.prod.outlook.com (2603:10a6:800:56::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Sat, 3 Jul 2021 11:58:39 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::b1a0:d654:a578:53ab%7]) with mapi id 15.20.4287.031; Sat, 3 Jul 2021 11:58:39 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Jiri Pirko , Ido Schimmel , Tobias Waldekranz , Roopa Prabhu , Nikolay Aleksandrov , Stephen Hemminger , bridge@lists.linux-foundation.org, Alexander Duyck Subject: [RFC PATCH v2 net-next 09/10] net: dsa: mv88e6xxx: map virtual bridges with forwarding offload in the PVT Date: Sat, 3 Jul 2021 14:57:04 +0300 Message-Id: <20210703115705.1034112-10-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210703115705.1034112-1-vladimir.oltean@nxp.com> References: <20210703115705.1034112-1-vladimir.oltean@nxp.com> X-Originating-IP: [188.26.224.68] X-ClientProxiedBy: PR3P189CA0081.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::26) 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.26.224.68) by PR3P189CA0081.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.23 via Frontend Transport; Sat, 3 Jul 2021 11:58:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: df13e2e0-937d-41fd-655d-08d93e19e546 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2509: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CdrUMt056Rkb/gr2HAo9z9pm8NJMZp+8pnGi5ijEYlNkDUdNk+g6l5oSA/JAE2v66EPzK2h6A6K3V4zHnkwuehXE0Gnex4x4/fBcS9H890x0AGWMdkdeKhjR5l6K9U+bWuALmSWMbj5KhfPs5fGpYm0gXiObC12wm3odmWknM0DXdrzmxCbh8+MKVkbZtTBVlLqIsEy7wsYLIazHGctumOoVoDofCb2LObVsK9h8sNR5CjcuwylSmydL9ePB7c/8qneJXdOJG2a+n0+/xJrEm1KRY4c+vGshEE0LA5+6jOmBarexniWW+5vlzu8w4jk+3CQXqhydM5lv35du8qJ1yre0XZUwNJp9JwTXn7n8+0RvB9HePa7oa+JgQlyqOJQub9dge/507nI0i+z49fKtNkr/1JnVUS1+yFr63Y+wsFQcSPjVh16xeW8YHQCAXFKYVWpDaEXaCspiqk024icTG4/AqJ9FdZpABQZJo5gZE4LTsmOHRlMTlbLQDsAkwaZD17jNeE9+Ywgf1Y258qDKbrBVx3L1e0HucGKQQMaRsPit/zkb3yfvkx+6r82Ij6i+LlOHsij98lFP88kVsyLTdgfuBHXxx1NBEx3xdqGKSWJ+OhvBTKi1us5b2Y2f7+mOyxIMlqjlYg7AY1fKdcb1KE3K0TCzRPDRkZWW7jCS2bKa8ZNX1BqIaKomQO2xDwWE+/9EXe4iMLnckstfIQi3OfChew7U1dpCEMYjL6mYE7U= 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)(396003)(376002)(366004)(346002)(136003)(39850400004)(6506007)(2906002)(4326008)(36756003)(2616005)(44832011)(956004)(6666004)(478600001)(7416002)(5660300002)(110136005)(66946007)(26005)(52116002)(1076003)(8676002)(8936002)(316002)(54906003)(66476007)(66556008)(6486002)(38100700002)(16526019)(38350700002)(186003)(83380400001)(86362001)(6512007)(69590400013); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1yjdB7kTRnvl6GjynrOxDXVonsbkdRXSg+nJe4CThXtf30tNDeMm8f1gcJccSobD2oAe9FJKGPs/WhS8z2F2FodNfH794tV1NiUd6tm/zhPuqCb8W9LRYaE6JGvuLS3/UbuBbXGMEF9YVmeEEr9Zh/7rBiZHHI42P+jt/6lznUP5LcDE1vzZwzwuS/kQh4VLr6Vi9gnXwWxLRIy2MctxG761dVAjTB/jK2oDLMzJrppdL+P269ha+v2ZiwJVTdCfo2N+bvRAfd0KDhXUTwufYL6AYpVoOU65cPB9/PcmTWEZU3Dt3iaQU9zZ6caGGlFfsEsGUL2wz5SZfnqpFekDCVVyxYmBwyxmTaQ50w+jc3vQHfv098iqPinWUsPfNkkeWSJP5vFaSwLuvIJnoI5VaMDh1Em2SQEkDT0GQKd6sIRFiDGmrucxyg+BCrQQAWa12hU4zj3HklS04EMFcc23N2pYbD0NiJw531TnEqQxqBkAcCf4YlkBYWzpvBd/UXBZZ55mj3TOPY1lM2SblIC/7Ut8KlV2CycSDzbv5Bc+WaJ5Hk1pSr/u5oxREkKn94khAGpGb0MyytOqXsKwmGIOF4reXjsoNoHlRbHvqY3iQbI4hDwXDgiDNTaz/Ra+7f1uQs6EaRBHIMhcGIUGxc9+ApKrOcWrDa89tHcv0v5dQshLkG03UsrNEWBSpUs1hKvI5aimwqRhJryvHtGeSPIIeD/FKz0VNkXICZtfiwRIVu7ri87mGO/WTp2l4xexqOUeBVESwfGXRhBpL2NnbEuXFkG58exm1VqxxuP9RRJ0MACDH2ZeP3Gfd09OmVxdLR38CAc1H942hf5T6RZaf7tPxY0flHFGmbna2+1Ymn3RyIAKSNAyx8WvPLVuTWRbmobg7PXf8Ar/NkcbCkU7CRGktlhApviLyK1mBXnWuhU9Nr+mlIdrze/uvVDsexLLc16DQf/qEmrC1tQnUI9MOtqQ4ip3hjokMeEAMQa1GFQyDNT7rm1mBdsEoo93JtgBukNhS+0U/tgqTquflwoDRalTQCVbORHO8wRI6uUIQzvQ0sZYLBa+scf9dG84PcCJUA94N3WkqGJ6+LzgwSBcZSuVy7CcV+vQi9kxhJNwH+e9kNQcPyzDRfXwniPRW/1ZqyDQf0S1yJvDPmnHeFlpNdnrYoBnHCXl1Gi0eeFkEg71f616uts+/KMS2kHfhd1Zj7kGMjvkBWqfULUCeSlCDLpCY7HYn+2ZoD2fq3Ixs1l0LP4eEpRvTR+XjkHl7joJeE1GiYsNMOmI6/u1Jp/WlEUzh+amlMxs7qp2k32mPntyypKzNc0DmNdlSg5Isu1GEbSu X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: df13e2e0-937d-41fd-655d-08d93e19e546 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2021 11:58:39.3355 (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: JWdhviW9iqyxeijEDgornZjVyS+wae6MuStNbJfRxBSC3V36MFWc24ZoOrZy3+WvbSFxKZPJzWegDtYTg7foNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2509 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The mv88e6xxx switches have the ability to receive FORWARD (data plane) frames from the CPU port and route them according to the FDB. We can use this to offload the forwarding process of packets sent by the software bridge. Because DSA supports bridge domain isolation between user ports, just sending FORWARD frames is not enough, as they might leak the intended broadcast domain of the bridge on behalf of which the packets are sent. It should be noted that FORWARD frames are also (and typically) used to forward data plane packets on DSA links in cross-chip topologies. The FORWARD frame header contains the source port and switch ID, and switches receiving this frame header forward the packet according to their cross-chip port-based VLAN table (PVT). To address the bridging domain isolation in the context of offloading the forwarding on TX, the idea is that we can reuse the parts of the PVT that don't have any physical switch mapped to them, one entry for each software bridge. The switches will therefore think that behind their upstream port lie many switches, all in fact backed up by software bridges through tag_dsa.c, which constructs FORWARD packets with the right switch ID corresponding to each bridge. The mapping we use is absolutely trivial: DSA gives us a unique bridge number, and we add the number of the physical switches in the DSA switch tree to that, to obtain a unique virtual bridge device number to use in the PVT. Co-developed-by: Tobias Waldekranz Signed-off-by: Tobias Waldekranz Signed-off-by: Vladimir Oltean --- drivers/net/dsa/mv88e6xxx/chip.c | 106 +++++++++++++++++++++++++++++-- 1 file changed, 102 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index beb41572d04e..6b9c1a77d874 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -1221,14 +1221,38 @@ static u16 mv88e6xxx_port_vlan(struct mv88e6xxx_chip *chip, int dev, int port) bool found = false; u16 pvlan; - list_for_each_entry(dp, &dst->ports, list) { - if (dp->ds->index == dev && dp->index == port) { + /* dev is a physical switch */ + if (dev <= dst->last_switch) { + list_for_each_entry(dp, &dst->ports, list) { + if (dp->ds->index == dev && dp->index == port) { + /* dp might be a DSA link or a user port, so it + * might or might not have a bridge_dev + * pointer. Use the "found" variable for both + * cases. + */ + br = dp->bridge_dev; + found = true; + break; + } + } + /* dev is a virtual bridge */ + } else { + list_for_each_entry(dp, &dst->ports, list) { + struct dsa_bridge_fwd_accel_priv *accel_priv = dp->accel_priv; + + if (!accel_priv) + continue; + + if (accel_priv->bridge_num + 1 + dst->last_switch != dev) + continue; + + br = accel_priv->sb_dev; found = true; break; } } - /* Prevent frames from unknown switch or port */ + /* Prevent frames from unknown switch or virtual bridge */ if (!found) return 0; @@ -1236,7 +1260,6 @@ static u16 mv88e6xxx_port_vlan(struct mv88e6xxx_chip *chip, int dev, int port) if (dp->type == DSA_PORT_TYPE_CPU || dp->type == DSA_PORT_TYPE_DSA) return mv88e6xxx_port_mask(chip); - br = dp->bridge_dev; pvlan = 0; /* Frames from user ports can egress any local DSA links and CPU ports, @@ -2422,6 +2445,68 @@ static void mv88e6xxx_crosschip_bridge_leave(struct dsa_switch *ds, mv88e6xxx_reg_unlock(chip); } +/* Treat the software bridge as a virtual single-port switch behind the + * CPU and map in the PVT. First dst->last_switch elements are taken by + * physical switches, so start from beyond that range. + */ +static int mv88e6xxx_map_virtual_bridge_to_pvt(struct dsa_switch *ds, + int bridge_num) +{ + u8 dev = bridge_num + ds->dst->last_switch + 1; + struct mv88e6xxx_chip *chip = ds->priv; + int err; + + mv88e6xxx_reg_lock(chip); + err = mv88e6xxx_pvt_map(chip, dev, 0); + mv88e6xxx_reg_unlock(chip); + + return err; +} + +static int mv88e6xxx_bridge_fwd_offload_add(struct dsa_switch *ds, int port, + struct net_device *br, + int bridge_num) +{ + return mv88e6xxx_map_virtual_bridge_to_pvt(ds, bridge_num); +} + +static void mv88e6xxx_bridge_fwd_offload_del(struct dsa_switch *ds, int port, + struct net_device *br, + int bridge_num) +{ + int err; + + err = mv88e6xxx_map_virtual_bridge_to_pvt(ds, bridge_num); + if (err) { + dev_err(ds->dev, "failed to remap cross-chip Port VLAN: %pe\n", + ERR_PTR(err)); + } +} + +static int +mv88e6xxx_crosschip_bridge_fwd_offload_add(struct dsa_switch *ds, + int tree_index, int sw_index, + int port, struct net_device *br, + int bridge_num) +{ + return mv88e6xxx_map_virtual_bridge_to_pvt(ds, bridge_num); +} + +static void +mv88e6xxx_crosschip_bridge_fwd_offload_del(struct dsa_switch *ds, + int tree_index, int sw_index, + int port, struct net_device *br, + int bridge_num) +{ + int err; + + err = mv88e6xxx_map_virtual_bridge_to_pvt(ds, bridge_num); + if (err) { + dev_err(ds->dev, "failed to remap cross-chip Port VLAN: %pe\n", + ERR_PTR(err)); + } +} + static int mv88e6xxx_software_reset(struct mv88e6xxx_chip *chip) { if (chip->info->ops->reset) @@ -3025,6 +3110,15 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) chip->ds = ds; ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip); + /* Since virtual bridges are mapped in the PVT, the number we support + * depends on the physical switch topology. We need to let DSA figure + * that out and therefore we cannot set this at dsa_register_switch() + * time. + */ + if (mv88e6xxx_has_pvt(chip)) + ds->num_fwd_offloading_bridges = MV88E6XXX_MAX_PVT_SWITCHES - + ds->dst->last_switch - 1; + mv88e6xxx_reg_lock(chip); if (chip->info->ops->setup_errata) { @@ -6128,6 +6222,10 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .crosschip_lag_change = mv88e6xxx_crosschip_lag_change, .crosschip_lag_join = mv88e6xxx_crosschip_lag_join, .crosschip_lag_leave = mv88e6xxx_crosschip_lag_leave, + .port_bridge_fwd_offload_add = mv88e6xxx_bridge_fwd_offload_add, + .port_bridge_fwd_offload_del = mv88e6xxx_bridge_fwd_offload_del, + .crosschip_bridge_fwd_offload_add = mv88e6xxx_crosschip_bridge_fwd_offload_add, + .crosschip_bridge_fwd_offload_del = mv88e6xxx_crosschip_bridge_fwd_offload_del, }; static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)