From patchwork Mon Feb 6 17:50:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13130465 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43D39C05027 for ; Mon, 6 Feb 2023 17:51:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230044AbjBFRvA (ORCPT ); Mon, 6 Feb 2023 12:51:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229838AbjBFRu4 (ORCPT ); Mon, 6 Feb 2023 12:50:56 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 515832E0C0 for ; Mon, 6 Feb 2023 09:50:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dbv2UCjMM/8vqOlNNtYPBvkEQnNxHlkkB1jMywNrIi87kCWr5R8ts9hTfytXI6gSQE39AEOF21k/rPjek4KaSJH7BShDPSRmqsM0/VZ5IeO3YVUB1zBL7JsueKK5f1W4PW/JDSQPxN+Z/CV21A6p/gHM1DKyyH7yBeFAYc1MxGXpRPj6Xsw59cvdRuOkeg56+J3XQAl9wElSa+138Q74gjJGaSTqfTrEbnj55tiVNx1PU0iwa9snVwoojQUIirrT4s4VwlpgA0gqq9SDq2EJcnyi8rAkQEjb1sQCAYYPQf3yAwn98hKzLdROvBjxeXLRwOZdaLYEfcvrSuFjzoMgUQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sycdtrdtE6Jds7xxXHQuf5xuybQO8LXQsAcmWWcam80=; b=bFp6jikrA76zlabLgjxfIg1Hqfy/4rc+rL+7ppW2QcM5u3S7MJjtmU6LgK3r25w8DYktBAarw8S/JKjlmzW5TXjc8zft7wsAsT0NBn69tc0QUDOrkMDLU1aX4m3X2tiPH/6Bb94+D4jYC07u46f/gmj1ktzNBl4GizrAbvlRMzvTcZdSINGt6gz8eVElXyaeRade4gIe7L75eO2lVk944w2AawwSTZTicHjV+MDx8/sE5cba4TQd4Vn6SWb3olDZyVYhRIU5xDlTkc2j8cLdY/1JojuDp1lV9+4Kqwmi5Rs+egRiJMlE4whny/IUnvmE8ZrZKWNbOofQD1/svUDMnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sycdtrdtE6Jds7xxXHQuf5xuybQO8LXQsAcmWWcam80=; b=HglVHImg5KfGMvBimLTizp7d5HafY2JbCbrH3bNtHqpMsFCPWaB+NI5jctRKTq/Mkx+G0dEzPlzQL8ZGEiFcLzwp9SXbj7jlcGPWdQXDTXQxmhmpX0EtPvdAL9YsjVQCoBlauvzoK8S3Q4iCBD916+88Hiex9Ltt0OZgM3dl5w5mhQAqpxqgCG6WYfCzkHL3tMWH07BLrk5pZOu5WBxvNg+t7cwlj1Rr3wsTjrSzOo2vyR2VYShgNhY4Lwot0e1TqsoyPiOhc+2Psa7/J0rU+yfv82O7BNPngNHus1tvuAtlse3l+tB/KA1Gx5DJa4TUJ444XnGUO7m4dmO+Zqv7WA== Received: from BN0PR03CA0018.namprd03.prod.outlook.com (2603:10b6:408:e6::23) by PH8PR12MB7207.namprd12.prod.outlook.com (2603:10b6:510:225::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Mon, 6 Feb 2023 17:50:53 +0000 Received: from BN8NAM11FT075.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e6:cafe::55) by BN0PR03CA0018.outlook.office365.com (2603:10b6:408:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.35 via Frontend Transport; Mon, 6 Feb 2023 17:50:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT075.mail.protection.outlook.com (10.13.176.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.35 via Frontend Transport; Mon, 6 Feb 2023 17:50:53 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 6 Feb 2023 09:50:45 -0800 Received: from localhost.localdomain (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 6 Feb 2023 09:50:43 -0800 From: Petr Machata To: , , CC: Nikolay Aleksandrov , Ido Schimmel , Petr Machata Subject: [PATCH iproute2-next 1/3] uapi: Update if_bridge, if_link Date: Mon, 6 Feb 2023 18:50:25 +0100 Message-ID: <82b5a04f69bd4fd4b6cea9d8d418fc321d506913.1675705077.git.petrm@nvidia.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT075:EE_|PH8PR12MB7207:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ec67c39-b130-487d-37bf-08db086ab10c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NWQG6z4v5FpjJYE+kNX6vOGtN3OFWfdH+xH1+DO8vhfASgLO9YoJzqqWNZi+MpCpy2l5Y3ApAOS5Qn/PCCeDSdJGENn4sYHuuKiYwXNctPrnLAaftLsuL/Ti3E9CRcFepv5v/vFEEfG+KCU+CKZ7bctFrjqeN/NcwIZAT4sDtbpC/cjDG5VlNASh9svRkhPG85bj13QqYsZ38U0+oFOnKpxvUtN8FLs+pRfcJGJumzhjMUFA5woYRK9Jv+0M6FA44YG/ffmSNF1Jasv1KigOGzw27JlyVEcIU4ACz6/IFhCAFhJ6tLMRa4L1aLDK1qk+JAIDNXQbLDDBO43JtPHSpiGvHX93lA8c0RbjGFQlO6U6tm0kvf6dRl8gZL1RaEouU/8LdH6Tr7F0REZO89f82K3rbfRPbJYj67T1gNtC6w8qUsJlC61nWX/Q9eDW98gQ1MChaqdUnj/Sxs5cXfnpx7gqf9laxj6+oullDvaDohxqLjML46hILzvgny9HrcFE2bN/KbiRxIBQECNaQ/WJhLZ6QX5VVLmBhYJUZjdPNCP1u29Ltus+cBR5/QWxakAdz7nkpbsXyvIApQhmmOdxxsi52VxP4dXv4qk9cMwHFtdqWd7xA0JYL/tr48/ByztByRgSbA22LqXs4X7G/YKKOy5BUMSCdPYUY2XM+bjiAeeNPb7A9ejsqfBWd/Zn267YdVlEmKW116YeXD79axopew== X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(346002)(136003)(39860400002)(396003)(376002)(451199018)(46966006)(40470700004)(36840700001)(40480700001)(47076005)(70206006)(83380400001)(426003)(66574015)(82740400003)(7636003)(40460700003)(336012)(8936002)(41300700001)(36860700001)(70586007)(4326008)(8676002)(356005)(2906002)(186003)(26005)(6666004)(82310400005)(16526019)(2616005)(316002)(54906003)(110136005)(478600001)(36756003)(107886003)(86362001)(5660300002);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2023 17:50:53.0793 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ec67c39-b130-487d-37bf-08db086ab10c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT075.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7207 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com Signed-off-by: Petr Machata --- include/uapi/linux/if_bridge.h | 2 ++ include/uapi/linux/if_link.h | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h index 4a887cf43774..921b212d9cd0 100644 --- a/include/uapi/linux/if_bridge.h +++ b/include/uapi/linux/if_bridge.h @@ -523,6 +523,8 @@ enum { BRIDGE_VLANDB_ENTRY_TUNNEL_INFO, BRIDGE_VLANDB_ENTRY_STATS, BRIDGE_VLANDB_ENTRY_MCAST_ROUTER, + BRIDGE_VLANDB_ENTRY_MCAST_N_GROUPS, + BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS, __BRIDGE_VLANDB_ENTRY_MAX, }; #define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1) diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index 147ad0a39d3b..d61bd32deedb 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -374,6 +374,9 @@ enum { IFLA_DEVLINK_PORT, + IFLA_GSO_IPV4_MAX_SIZE, + IFLA_GRO_IPV4_MAX_SIZE, + __IFLA_MAX }; @@ -562,6 +565,8 @@ enum { IFLA_BRPORT_MCAST_EHT_HOSTS_CNT, IFLA_BRPORT_LOCKED, IFLA_BRPORT_MAB, + IFLA_BRPORT_MCAST_N_GROUPS, + IFLA_BRPORT_MCAST_MAX_GROUPS, __IFLA_BRPORT_MAX }; #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) From patchwork Mon Feb 6 17:50:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13130466 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74F94C05027 for ; Mon, 6 Feb 2023 17:51:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230064AbjBFRvE (ORCPT ); Mon, 6 Feb 2023 12:51:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbjBFRvB (ORCPT ); Mon, 6 Feb 2023 12:51:01 -0500 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2052.outbound.protection.outlook.com [40.107.244.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 472922E0E3 for ; Mon, 6 Feb 2023 09:50:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AOZ5+2nujUjlff0FL+N1shoWn6DOBnpYtIZHC8tL4VN7egrrxGSvbQFpEfaHML61pM3NXy23LOjq/iD33uIoIzM2i5BJtraLciMycuWzaavocx26QS5zksz5vVHVfraUd1v9lbXzd7thDzChiK9ub6sP44emdXtoGU7OPqjE13QhxLsXBOnY4IbeSFY9N4z8KBbnj46CQupDEF1kffHAE3EwqCv7bmylbffCxHdAuZ2zCsfM6aeEoqTlrokSsB9gjYIs+CfQhfO0rW5Ao41EhiVSyJH4PMPsx9t2NO6Ys9Ml18v6+DAtQC+TLimVCHBPwhbNAWhJgGurHeCXlsj/lg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dpT4kkm3NHM8vG68Vt592WTUNhScSUEjindiSmFTkx8=; b=Wzq0Jxs311k1FXg4l7joHD6AbPHgVGUaqGNG3bXjna6mWo240eDtYPCiyfjy6fA+y8H41dmF9DR/j/Htr26VN8BciDklewpFCtPW09wx/JhSQ3Wr9dWP1CqAKBUt5er5TH+2mUSzjfzlsSs1qqLVMv41a4M2M8+mjH49/qpWWoGIhvy+22iQqzL2YAGXQYVEz09Ig9VUlS0aL7BkHiSwV0u+K/83FegatPqy4ezlQlAkck6DXO1wslnOT8OwC6iw91S9AtLLkdSD4sR8Dgo7IRprrXmRPtDRkWn0EOii83nwUdwcRkRzyagpS3HumUIyNXVMkTISie8Uxzx2gENr/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dpT4kkm3NHM8vG68Vt592WTUNhScSUEjindiSmFTkx8=; b=WpbqO4TLTynBqs4a8Am8FKhzmrj3C8S2bNI+49GgjU5dtR7oT48D3MEx1FTmzPtqXfSO0J7CoJBmst67l039yXtLaVJa6y87iG5SESOvGh3mJNp72Ms8cxRWsCnJCeXU1u7laF5bIK7MZHLZ+N4mF+ZODlNWR69sAJ+BK8cuUiLegsgKky6Fd1VMHX0sLcbP9OWudKLZQyvG22b3i41+wJxvnXW0MhuOtg4GB2uHzW+moaO/y6yvtMk/LuBlkgsQ2iow0w4EsPlmgGVOEE8QEcf643xPUh850fqdjLr765a8pZSS/AB4ul8pHDOuamNMDFoCtxzcjNZgj7Jh3/zjQQ== Received: from CY5PR22CA0062.namprd22.prod.outlook.com (2603:10b6:930:80::7) by IA1PR12MB6162.namprd12.prod.outlook.com (2603:10b6:208:3ea::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.28; Mon, 6 Feb 2023 17:50:56 +0000 Received: from CY4PEPF0000C981.namprd02.prod.outlook.com (2603:10b6:930:80:cafe::2b) by CY5PR22CA0062.outlook.office365.com (2603:10b6:930:80::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34 via Frontend Transport; Mon, 6 Feb 2023 17:50:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000C981.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.17 via Frontend Transport; Mon, 6 Feb 2023 17:50:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 6 Feb 2023 09:50:47 -0800 Received: from localhost.localdomain (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 6 Feb 2023 09:50:45 -0800 From: Petr Machata To: , , CC: Nikolay Aleksandrov , Ido Schimmel , Petr Machata Subject: [PATCH iproute2-next 2/3] bridge: Add support for mcast_n_groups, mcast_max_groups Date: Mon, 6 Feb 2023 18:50:26 +0100 Message-ID: <82cb1211d85e02e6247cb9a141aad68027cbefac.1675705077.git.petrm@nvidia.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000C981:EE_|IA1PR12MB6162:EE_ X-MS-Office365-Filtering-Correlation-Id: 85855641-8ba2-4362-d90f-08db086ab25a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 99EoIHZA+oU/E/mswEpJNhajChmtDqn18QQ2lqRZnq/LR5UwvUOh3lJjghQ0g2+TBt3rVSM6bymPPQMS3wBirrTSEBMz0QumnUmlMAGZuoqMWPrLCqB9f0fkI9Bvl0xo34s3528Q2/djnUKg9R569qVZjiG2gDJkE3P8KQLVhUPJdyRSxakr+fQVidlFJhueyzUnbWGZhBXsQkul1e+6UDUlkQqfLLWD2VgMf1LXiQXlcJ5dJgXF9pboO8ENi5CU2/SzuThNMUluoK36pVUWIz2ZGvrMkWQe5jIlVKWFotKPFNUU+9EMXleRcXoAXoRzhvSTrMcykJ8VRSvovOa5uEQ9yn/ZWpiJmE+RTKgIFVxqsJAWR7nfPGVAouJU/eZlUSzwLRv+0mluA1UNdgJ4RIaPv/zlnWv18c//sdNlvbP5oiIx1yPelaQ2OdVF5yrCKT1Eo5duyKA8gjrtSJkTymkeDIDALwlDQw01h4D11dqpPpeW+xQOKJaOn7aXkIzY+mJhazbCnWJx96SkWuLcA9c8sq5UusYhK9p5D4xARwu9nRTVXoM8h1zlL2gGnIg8o3tN/MicrQVwbY26SeDzEI/5PNRBgfeiLWb2dXAi+a+jc76Y57qvMRK2OvA5mYPIFtYZynVtIIbsKd5Qa+ukYTwdj8qxpP0b6rQbsW3FD0SqM0uQl7y+N4+tvwdZFWKzziE83eZAMRt8DuXA9lMFlQ== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(136003)(376002)(346002)(39860400002)(396003)(451199018)(36840700001)(40470700004)(46966006)(26005)(70586007)(426003)(83380400001)(336012)(70206006)(40460700003)(36756003)(86362001)(356005)(82310400005)(186003)(40480700001)(36860700001)(47076005)(8936002)(54906003)(41300700001)(6666004)(110136005)(4326008)(66574015)(8676002)(2616005)(316002)(16526019)(7636003)(107886003)(2906002)(478600001)(82740400003)(5660300002);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2023 17:50:55.3817 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85855641-8ba2-4362-d90f-08db086ab25a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000C981.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6162 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com A total of four new bridge attributes are being added to the kernel: mcast_n_groups and mcast_max_groups, as link and vlan attributes. Add to the bridge tool the support code to enable setting and querying these attributes. Example usage: # ip link add name br up type bridge vlan_filtering 1 mcast_snooping 1 \ mcast_vlan_snooping 1 mcast_querier 1 # ip link set dev v1 master br # bridge vlan add dev v1 vid 2 # bridge vlan set dev v1 vid 1 mcast_max_groups 1 # bridge mdb add dev br port v1 grp 230.1.2.3 temp vid 1 # bridge mdb add dev br port v1 grp 230.1.2.4 temp vid 1 Error: bridge: Port-VLAN is already in 1 groups, and mcast_max_groups=1. # bridge link set dev v1 mcast_max_groups 1 # bridge mdb add dev br port v1 grp 230.1.2.3 temp vid 2 Error: bridge: Port is already in 1 groups, and mcast_max_groups=1. # bridge -d link show 5: v1@v2: mtu 1500 master br [...] [...] mcast_n_groups 1 mcast_max_groups 1 # bridge -d vlan show port vlan-id br 1 PVID Egress Untagged state forwarding mcast_router 1 v1 1 PVID Egress Untagged [...] mcast_n_groups 1 mcast_max_groups 1 2 [...] mcast_n_groups 0 mcast_max_groups 0 This is how the JSON dump looks like: # bridge -j -d link show dev v1 | jq [ { "ifindex": 4, "link": "v2", "ifname": "v1", "flags": [ "BROADCAST", "MULTICAST" ], "mtu": 1500, "master": "br", "state": "disabled", "priority": 32, "cost": 2, "hairpin": false, "guard": false, "root_block": false, "fastleave": false, "learning": true, "flood": true, "mcast_flood": true, "bcast_flood": true, "mcast_router": 1, "mcast_to_unicast": false, "neigh_suppress": false, "vlan_tunnel": false, "isolated": false, "locked": false, "mab": false, "mcast_n_groups": 0, "mcast_max_groups": 0 } ] # bridge -j -d vlan show dev v1 | jq [ { "ifname": "v1", "vlans": [ { "vlan": 1, "flags": [ "PVID", "Egress Untagged" ], "state": "forwarding", "mcast_router": 1, "mcast_n_groups": 0, "mcast_max_groups": 1 } ] } ] Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel --- bridge/link.c | 21 +++++++++++++++++++++ bridge/vlan.c | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/bridge/link.c b/bridge/link.c index 337731dff26b..9dd7475d6e4a 100644 --- a/bridge/link.c +++ b/bridge/link.c @@ -187,6 +187,18 @@ static void print_protinfo(FILE *fp, struct rtattr *attr) if (prtb[IFLA_BRPORT_MAB]) print_on_off(PRINT_ANY, "mab", "mab %s ", rta_getattr_u8(prtb[IFLA_BRPORT_MAB])); + if (prtb[IFLA_BRPORT_MCAST_N_GROUPS]) { + struct rtattr *at = prtb[IFLA_BRPORT_MCAST_N_GROUPS]; + + print_uint(PRINT_ANY, "mcast_n_groups", + "mcast_n_groups %u ", rta_getattr_u32(at)); + } + if (prtb[IFLA_BRPORT_MCAST_MAX_GROUPS]) { + struct rtattr *at = prtb[IFLA_BRPORT_MCAST_MAX_GROUPS]; + + print_uint(PRINT_ANY, "mcast_max_groups", + "mcast_max_groups %u ", rta_getattr_u32(at)); + } } else print_stp_state(rta_getattr_u8(attr)); } @@ -282,6 +294,7 @@ static void usage(void) " [ mcast_flood {on | off} ]\n" " [ bcast_flood {on | off} ]\n" " [ mcast_to_unicast {on | off} ]\n" + " [ mcast_max_groups MAX_GROUPS ]\n" " [ neigh_suppress {on | off} ]\n" " [ vlan_tunnel {on | off} ]\n" " [ isolated {on | off} ]\n" @@ -317,6 +330,7 @@ static int brlink_modify(int argc, char **argv) __s8 mcast_flood = -1; __s8 bcast_flood = -1; __s8 mcast_to_unicast = -1; + __s32 max_groups = -1; __s8 locked = -1; __s8 macauth = -1; __s8 isolated = -1; @@ -389,6 +403,10 @@ static int brlink_modify(int argc, char **argv) mcast_to_unicast = parse_on_off("mcast_to_unicast", *argv, &ret); if (ret) return ret; + } else if (strcmp(*argv, "mcast_max_groups") == 0) { + NEXT_ARG(); + if (get_s32(&max_groups, *argv, 0)) + invarg("invalid mcast_max_groups", *argv); } else if (strcmp(*argv, "cost") == 0) { NEXT_ARG(); cost = atoi(*argv); @@ -505,6 +523,9 @@ static int brlink_modify(int argc, char **argv) if (mcast_to_unicast >= 0) addattr8(&req.n, sizeof(req), IFLA_BRPORT_MCAST_TO_UCAST, mcast_to_unicast); + if (max_groups >= 0) + addattr32(&req.n, sizeof(req), IFLA_BRPORT_MCAST_MAX_GROUPS, + max_groups); if (learning >= 0) addattr8(&req.n, sizeof(req), IFLA_BRPORT_LEARNING, learning); if (learning_sync >= 0) diff --git a/bridge/vlan.c b/bridge/vlan.c index 13df1e845ea5..44e1ba39f01d 100644 --- a/bridge/vlan.c +++ b/bridge/vlan.c @@ -37,6 +37,7 @@ static void usage(void) " [ self ] [ master ]\n" " bridge vlan { set } vid VLAN_ID dev DEV [ state STP_STATE ]\n" " [ mcast_router MULTICAST_ROUTER ]\n" + " [ mcast_max_groups MAX_GROUPS ]\n" " bridge vlan { show } [ dev DEV ] [ vid VLAN_ID ]\n" " bridge vlan { tunnelshow } [ dev DEV ] [ vid VLAN_ID ]\n" " bridge vlan global { set } vid VLAN_ID dev DEV\n" @@ -344,6 +345,15 @@ static int vlan_option_set(int argc, char **argv) addattr8(&req.n, sizeof(req), BRIDGE_VLANDB_ENTRY_MCAST_ROUTER, mcast_router); + } else if (strcmp(*argv, "mcast_max_groups") == 0) { + __u32 max_groups; + + NEXT_ARG(); + if (get_u32(&max_groups, *argv, 0)) + invarg("invalid mcast_max_groups", *argv); + addattr32(&req.n, sizeof(req), + BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS, + max_groups); } else { if (matches(*argv, "help") == 0) NEXT_ARG(); @@ -1021,6 +1031,16 @@ static void print_vlan_opts(struct rtattr *a, int ifindex) print_uint(PRINT_ANY, "mcast_router", "mcast_router %u ", rta_getattr_u8(vattr)); } + if (vtb[BRIDGE_VLANDB_ENTRY_MCAST_N_GROUPS]) { + vattr = vtb[BRIDGE_VLANDB_ENTRY_MCAST_N_GROUPS]; + print_uint(PRINT_ANY, "mcast_n_groups", "mcast_n_groups %u ", + rta_getattr_u32(vattr)); + } + if (vtb[BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS]) { + vattr = vtb[BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS]; + print_uint(PRINT_ANY, "mcast_max_groups", "mcast_max_groups %u ", + rta_getattr_u32(vattr)); + } print_nl(); if (show_stats) __print_one_vlan_stats(&vstats); From patchwork Mon Feb 6 17:50:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13130467 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD6BDC05027 for ; Mon, 6 Feb 2023 17:51:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229576AbjBFRvL (ORCPT ); Mon, 6 Feb 2023 12:51:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229973AbjBFRvI (ORCPT ); Mon, 6 Feb 2023 12:51:08 -0500 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2067.outbound.protection.outlook.com [40.107.243.67]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C07482E0FC for ; Mon, 6 Feb 2023 09:51:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SshYReUsd3EnXF4TdUaC6RcLYOsW3+nn3s/+iL7aMoTupm9QgBW/pEUxMF8L1j63U7n6hgI+Qk9j0mtJCbPtOZzy+AQHP47lJyumRXTVuJt7guYNxMqcxJqvq3HQRtcU2E3HHQN7CLe+4KQEp1HMsOYTzzdBV3to5BPfTxO2UnGHCZJFAp1AnU91OIYy+nFNpCmd3h3W6uiBdstmHMKPVgRnxsSP0C34UahIojlvhhg/LRhXlrtYioGcHxb34M4avD+WQO8DUwgrdHSmzruw7PTelhbIsPtPKprQdsjnKJOudhZOzSlth63Ml0PPcWSkpLR5AxiD9Bg2L1HlNafjrw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vryAOzvIRcDP8TIvjX5MdJHMuh1HXfIn70sAZqhu2wo=; b=IN9Qxw2/2GFA0gKXsJSAsnxsV35vkEo3Fyjn4v7IC85K3hmIJtfEvKbZ84cc9q529UU3oQzNy+h07Lag6rP3kqyavwt96ICXYwa7qw3xjXEHb/8VMaWp1uT3uuKOZk/RnFZZn4JdJFvWtSIns7n1fOQDXOGd92j1R5UyfRAsXwHIY4gV5toFfrHuBczcARSyghNRqANdmGv3lFcgUeinc9MmQbDvK4Dyqm2nmIlrTESOp3YYQBuyTCmFPvIwfIbPrK0MGCqx9aiJ06+A761T7uZCZYFe+r4fU8zE8eFDYMCwz93FIkDPiz1w91hvK1VFfCxuUBqgqcx4gNnJn5ohoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vryAOzvIRcDP8TIvjX5MdJHMuh1HXfIn70sAZqhu2wo=; b=jtqkKSWnZ1wmO6hoiDDMjhMLhW0jAAwxNkTKNYQvCP0jyBgvzDdJWaIdN5Ex2Y7Y4ANLjuiKbRJTI6O+zNUyzRStYGwHnOUmjUB06aj20Oac2qCMwXvKASrOkHxLINvWwafg0Yn6YPg2r1V/vbI/bsGtZ1itepSYmvFH+Bx1jVTOD5dFnQKQu3iB4cC4YorGl+SyKV7GK5hLrWtxR2jmJsfJJl9rujeKpGsufx8Z2T32Hlj2XgNmJVHatHvBQTY8ktoQKZWkhV2qoByYeStcwSMlMxgDD4AkYLFDSo9O0pRhP+A4mDhqcGF3NQcUG03gTQdcEdAm6QIG0ASUEmUlpQ== Received: from BN7PR06CA0059.namprd06.prod.outlook.com (2603:10b6:408:34::36) by SJ0PR12MB5421.namprd12.prod.outlook.com (2603:10b6:a03:3bb::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Mon, 6 Feb 2023 17:51:00 +0000 Received: from BN8NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:408:34:cafe::51) by BN7PR06CA0059.outlook.office365.com (2603:10b6:408:34::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.35 via Frontend Transport; Mon, 6 Feb 2023 17:51:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT034.mail.protection.outlook.com (10.13.176.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.32 via Frontend Transport; Mon, 6 Feb 2023 17:51:00 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 6 Feb 2023 09:50:49 -0800 Received: from localhost.localdomain (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 6 Feb 2023 09:50:47 -0800 From: Petr Machata To: , , CC: Nikolay Aleksandrov , Ido Schimmel , Petr Machata Subject: [PATCH iproute2-next 3/3] man: man8: bridge: Describe mcast_max_groups Date: Mon, 6 Feb 2023 18:50:27 +0100 Message-ID: <924ecbb716124faa45ffb204b68b679634839293.1675705077.git.petrm@nvidia.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT034:EE_|SJ0PR12MB5421:EE_ X-MS-Office365-Filtering-Correlation-Id: 45238537-46f9-4ae7-8eac-08db086ab56f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ls4jrJT/w1fqoKAI7p/PB6PLIoD0oLM5r3RaHaVpk/pv5+wiIwe0eX1pxkXeQSCtU+ZPYwCxLvmytmU/t8qVNUuXIclgeyPFzQebI0cRB1+RNerrkNanHu0UtQExypRCQN0pj0/td+cwPOKi7ka1zI1LE3tIaI3NCZkyuM79leUws+OYJiIsAu/LpfzicWZ/Y4wn0Zl6Rb/T0uvZkpIg6L1MHYuurGIyIicj6BeS5wp6cVWUbkWo9QvOydm802olr9G0aYQbZqVoKhiqpi0l4MQOYXdVGc0/KENsysPPtkQ+q+xpFgEyJhhfOMORl5TGNN6WtRTQ4QsYnXV3wmWcN4Xzex9F0KWc+E2dymoc90p2/YXGfVQkfirHK0pgZkXWFdmB0ZcEZLkWJVzF6oWuI/XIsJnZcjPmwrfBR3w2raop4yXAl/bgTdnAHG+ZQKJMQ6zdsm5JEA7jus6/Wijro8pjRXyV8fWWAJnRMaiI70J0Q3T3DPxs85TxOQixQjAKaEg83QG7rnpiNnOHqK4Zj7ZnRzgMfuaM7bkYz/QepfthacpJwx+POi4Ad+LmauKQw/4tUKHjPke6ekSBbtaxEOtjiqiF9iSWOQKtSp8v5oCzBIOxoTYTah4n35vsipW1sihWcEHtsaMMQyXvT8mRreyIq5Co41+KkdeP65Z/pZO96ZEjqZBmylGJtqI6QNSlZSMKy6gGGaQR0XBKiQczLw== X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(396003)(136003)(346002)(376002)(451199018)(36840700001)(40470700004)(46966006)(40460700003)(36860700001)(82740400003)(7636003)(83380400001)(356005)(70206006)(70586007)(5660300002)(8936002)(4326008)(41300700001)(2906002)(8676002)(107886003)(478600001)(2616005)(16526019)(6666004)(186003)(54906003)(26005)(47076005)(82310400005)(316002)(110136005)(426003)(36756003)(66574015)(40480700001)(86362001)(336012);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2023 17:51:00.4568 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45238537-46f9-4ae7-8eac-08db086ab56f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5421 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com Add documentation for per-port and port-port-vlan option mcast_max_groups. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel --- man/man8/bridge.8 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/man/man8/bridge.8 b/man/man8/bridge.8 index f73e538a3536..7075eab283fa 100644 --- a/man/man8/bridge.8 +++ b/man/man8/bridge.8 @@ -47,6 +47,8 @@ bridge \- show / manipulate bridge addresses and devices .BR hwmode " { " vepa " | " veb " } ] [ " .BR bcast_flood " { " on " | " off " } ] [ " .BR mcast_flood " { " on " | " off " } ] [ " +.BR mcast_max_groups +.IR MAX_GROUPS " ] [" .BR mcast_router .IR MULTICAST_ROUTER " ] [" .BR mcast_to_unicast " { " on " | " off " } ] [ " @@ -169,6 +171,8 @@ bridge \- show / manipulate bridge addresses and devices .IR VID " [ " .B state .IR STP_STATE " ] [ " +.B mcast_max_groups +.IR MAX_GROUPS " ] [ " .B mcast_router .IR MULTICAST_ROUTER " ]" @@ -517,6 +521,15 @@ By default this flag is on. Controls whether multicast traffic for which there is no MDB entry will be flooded towards this given port. By default this flag is on. +.TP +.BI mcast_max_groups " MAX_GROUPS " +Sets the maximum number of MDB entries that can be registered for a given +port. Attempts to register more MDB entries at the port than this limit +allows will be rejected, whether they are done through netlink (e.g. the +\fBbridge\fR tool), or IGMP or MLD membership reports. Setting a limit to 0 +has the effect of disabling the limit. See also the \fBip link\fR option +\fBmcast_hash_max\fR. + .TP .BI mcast_router " MULTICAST_ROUTER " This flag is almost the same as the per-VLAN flag, see below, except its @@ -1107,6 +1120,15 @@ is used during the STP election process. In this state, the vlan will only proce STP BPDUs. .sp +.TP +.BI mcast_max_groups " MAX_GROUPS " +Sets the maximum number of MDB entries that can be registered for a given +VLAN on a given port. A VLAN-specific equivalent of the per-port option of +the same name, see above for details. + +Note that this option is only available when \fBip link\fR option +\fBmcast_vlan_snooping\fR is enabled. + .TP .BI mcast_router " MULTICAST_ROUTER " configure this vlan and interface's multicast router mode, note that only modes