From patchwork Thu Aug 5 12:15:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 492699 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 53E2CC4338F for ; Thu, 5 Aug 2021 12:16:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13EDF604DB for ; Thu, 5 Aug 2021 12:16:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241209AbhHEMQY (ORCPT ); Thu, 5 Aug 2021 08:16:24 -0400 Received: from mail-eopbgr140070.outbound.protection.outlook.com ([40.107.14.70]:63492 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S239638AbhHEMQV (ORCPT ); Thu, 5 Aug 2021 08:16:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XhnIYP6dy3+TMu4g0JEvAellEIfyGMGuj3Q9YT/MOmL2CyeWu5iHJq0QC+2h6K5Wuwidnq1LXooIPdqhePJQ630YBBOoR8cs1MKdxOIibMvs71PisEj6I05iIpxvlLegLHuC2nMNryBR38j+3djkUHvEKo6I2T7Dc7X73vdW4wuhs9gznTSiz/Ncv8qr617k2z/ODKVG0VhdIOp4HT32Hw/MYMqcePpIfiGwwOJAwk82FFXrQq3Q5s6VJXCmikAtGZms+9Im6BvmhIM5Hx1Y0LGNAVWroWsvomc9as7JRV0bSb19fratl9ag5gBBF3jxRGR9iivGRmVPQThwEHBzSA== 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=dxJIEWDBNKUFrhzkYHQ76RgRFdMpKwrfQm0ZSBxrjy0=; b=nN1EWHlW8F1dekoTWy1VugS6XRcG9XYUaAYyqlB9kZ0XDTqWEamIaWtfqul5lsZtijwayYvslzlF9ioLH1f2ZTgeD1S5YpOG9IT+eOqKoF3XoPxLwdwWmCiTEqLS53CJouYIGo3LtRVfoiwdoqsUMxJOzbKUOo5VzOmDJNN+8RK7jVcJcx08hsEYrT7OkFI66Q7aOcbDaJIx4zQe9Dz7NbqWH1WS5ymwScLp+tiWBpOR2WMDiOwxQbgGGvyJwc4C05QLF4eNi1wR0+MyxetknlnKf6eagF0UwUiszfDOJn5f3qwMc6bGNOtm3K1okt3Sz8XAfZrSTD50GMKxWhDEPA== 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=dxJIEWDBNKUFrhzkYHQ76RgRFdMpKwrfQm0ZSBxrjy0=; b=iUApz/fkG1w774wocIHH5EBzLCrExYXH+WRDcnffyRzR24YASxhkZPSj+njfrVnLgAsrn7K7ziwH0PGBysFJtRbsWJvR8CrVjymnnQoF9YjXZ6Tnt7lNiNWXVaBvcUOWAxa/PB/khXV6yXjk+y4X+/uu6NCB9ZMFGrz/ygPD6T8= 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 VI1PR04MB6269.eurprd04.prod.outlook.com (2603:10a6:803:fa::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Thu, 5 Aug 2021 12:16:05 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0%2]) with mapi id 15.20.4394.017; Thu, 5 Aug 2021 12:16:05 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , DENG Qingfang Subject: [PATCH net 1/3] net: dsa: stop syncing the bridge mcast_router attribute at join time Date: Thu, 5 Aug 2021 15:15:49 +0300 Message-Id: <20210805121551.2194841-2-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210805121551.2194841-1-vladimir.oltean@nxp.com> References: <20210805121551.2194841-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM4PR0101CA0080.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::48) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.25.144.60) by AM4PR0101CA0080.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Thu, 5 Aug 2021 12:16:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6fbc665-4e11-4559-98ce-08d9580acc2b X-MS-TrafficTypeDiagnostic: VI1PR04MB6269: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bhsRgE2gsYhXsVPX9O2GwgZ9iMTctOiPBiFIOsXMVzQl5XVdaXSi+KhWrPZSDwx4JxsCD6i13qfz1S60i2/6TyzpxS9oL+YOwXMZNF/jdVOKvOj6UsM17aN47h8y0VgQpIsU3kldrbivOkEVG7jSNgSqgXvRcYLd7Jc9ajvYD/Y4INHkhJsNBWW70PXe4GZlDd7VfvNbgRg/xCO9n3eaktkJywT0E//MUCeMw9gMMQORsIpJvAJCLYu9P0WnE8eKhIMhWS7XrryECcUHsiF7uA2yyJb5B7YeqFYoCsOMNEb7IC3SFppLfY8zkbKcaUcJmscnY+4//6sYIZJhNVdcKMtE8NSBz3V2rFFGtBFuzOI0b+YXC1smSwSSqdcmoaReuBJkhctsQIexzjOJq26q1gTTkYbSGj9uk9elPWYHiPpa+b4508sBk1vLONeOIf1w2QWtyD/xgjvm3YzaYXVj2D5PFV1O+IoSjkZzgTg53X16QcmWFvzHoVEJV2Izq8ZBjCiEL/tH/ueWTM96H+kkmvtlXqigjzejEHkzdJrwDLx/hY4vz7ViNiAk1yv/xeY4C3CFFUiZMkbfwW6779QWXb8lDVqYIh+GO5kCme4MDzHUlO9Bw7fN2VLDpDlklNeShWGJ5dQoj/cTEzdy1UJzFxZotaiNEriDu6dH3wbFEBbIORBXLpQgASjpFzwH1W0LJkSKr3nEydUspDohT8Rm+w== 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)(366004)(376002)(346002)(136003)(39850400004)(396003)(2616005)(110136005)(6506007)(956004)(44832011)(66556008)(66476007)(478600001)(36756003)(54906003)(5660300002)(316002)(52116002)(6512007)(83380400001)(38350700002)(86362001)(2906002)(38100700002)(66946007)(6666004)(66574015)(186003)(6486002)(8936002)(1076003)(4326008)(8676002)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hfXE/+lyXMBuknPE7GkqjFbWtTCy4rw97Yc0klidd46CAOAqZt2elnwN/igQwylIpCwQQJTxlNHkIo8ONDXEjVc1qXOuq0kF6pIKGvK722o/PHxACF3ybKxqJGh+Wqn7pRbq94feFc+bF8q0b0L2CrC76rkLJvY/JAUn4lX5NOcRV+P5eSkyPCCQgMkRlaXpaPf9wc7BmNx/dR10rvyDC69jVK5uHZRKgjyqmmK5VhvSV6oVO2S+/H54hx3y1sXxAAwujgqjvPrYSCnlkK7cImszIco7p7RMbaKUYqaS9BMYZsOVf0ULX1ZMPJVADXk+Gy9MHpFz1GzgJ8EABkGlvhp2o2VNgUDJJg+XbRLm9Z68m5BlB9YxsF70FC5fJecdwBPW10FDDjcp9vGWLovaccrtZKdfxMrtyIMkLHkpseTcsM27wfWOAX0FVsaMmB3wequPYkMgk6fGjse/DBc/ia5usonBO/ZnyREfU/7rNsD3beZvILn1Y0P0TzIjXKHQ563noGEd0Ch7VmeHH5l8f3ZTH/NarWkCt2xpgurMpzv7UrrW5ReU4hSj1reJIYhJOowPZoFRNi+ereH/VCHqgJYyzNTpAplANK+iLNmh4K3oJEiXOEQvy8mViYEPl65ZO+RxT3z17ciiGOgdwV/ItJivmf9pLkpHM/9YhnURO+afmlgsU5itK/LdLS0GywBkNNIjs5QXsJyuhg1MH9xHwNso9c9jeuab0TDwYTQGB0j9Ml4LBJE/du2rli068+9NSytX/43tL/UaeR29SFz6Wl32quys0jLf02YaNn0RAQhuIhM4tDDYrfygh1cr2Gxsq2jDi33f1ummd5NhgNnla/ISAim5+ACjh0tH9BCR3iZufmhppM0yQANSfyuZzETx3v0IpfUQXY9VNnQMDtAjv66yO1aG2oEX7cukfG8t1QVB4+SanEVa34tqgpr9U/v24zcR9e7LGBeXIyJp19TJ+Dp7fZJdzEUvnaWZ4H74xOYWDJs0lqzAjS6UH1h8LOnoR2HUBpBhg46FvPJPa+iMfmz7ibg+9Doebn92+9+nxMesknCihh18fcCFqvUgbByYG48GKniwkySeVDqJ8n6g2jfMzTA1/4j4nywkxpk7E8ZfLWTXdgGXRCK6YbeSvPwEELyuyzeLOQ8FIyNb8hpCCxN46o+HTdy0SsYRChi/8xHEgzVQ8cel6+ubMhBUQMJSMLEyHsPzCKW4rmXwQ3Mb8orD6NjPx2TEyjkIb2Ty+OBmcMv2gZcYgSmIHesgKCIFAelJ355uFmfAuXa50ird3UyYUxdcwK2QGjDh7Bozi+j4qqcO6Xh1R3E1a+2sFdTr X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6fbc665-4e11-4559-98ce-08d9580acc2b X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2021 12:16:04.9631 (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: /eYXCOtGDEPm4q2mAPoY4zkimB9qRoV1Zm4VjNhQbmO3pxLJLiIa7HjocMd3ZblywGjvf8UI6UuCO4hjfXuzUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6269 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Qingfang points out that when a bridge with the default settings is created and a port joins it: ip link add br0 type bridge ip link set swp0 master br0 DSA calls br_multicast_router() on the bridge to see if the br0 device is a multicast router port, and if it is, it enables multicast flooding to the CPU port, otherwise it disables it. If we look through the multicast_router_show() sysfs or at the IFLA_BR_MCAST_ROUTER netlink attribute, we see that the default mrouter attribute for the bridge device is "1" (MDB_RTR_TYPE_TEMP_QUERY). However, br_multicast_router() will return "0" (MDB_RTR_TYPE_DISABLED), because an mrouter port in the MDB_RTR_TYPE_TEMP_QUERY state may not be actually _active_ until it receives an actual IGMP query. So, the br_multicast_router() function should really have been called br_multicast_router_active() perhaps. When/if an IGMP query is received, the bridge device will transition via br_multicast_mark_router() into the active state until the ip4_mc_router_timer expires after an multicast_querier_interval. Of course, this does not happen if the bridge is created with an mcast_router attribute of "2" (MDB_RTR_TYPE_PERM). The point is that in lack of any IGMP query messages, and in the default bridge configuration, unregistered multicast packets will not be able to reach the CPU port through flooding, and this breaks many use cases (most obviously, IPv6 ND, with its ICMP6 neighbor solicitation multicast messages). Leave the multicast flooding setting towards the CPU port down to a driver level decision. Fixes: 010e269f91be ("net: dsa: sync up switchdev objects and port attributes when joining the bridge") Reported-by: DENG Qingfang Signed-off-by: Vladimir Oltean --- net/dsa/port.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/net/dsa/port.c b/net/dsa/port.c index 28b45b7e66df..d9ef2c2fbf88 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -186,10 +186,6 @@ static int dsa_port_switchdev_sync(struct dsa_port *dp, if (err && err != -EOPNOTSUPP) return err; - err = dsa_port_mrouter(dp->cpu_dp, br_multicast_router(br), extack); - if (err && err != -EOPNOTSUPP) - return err; - err = dsa_port_ageing_time(dp, br_get_ageing_time(br)); if (err && err != -EOPNOTSUPP) return err; @@ -272,12 +268,6 @@ static void dsa_port_switchdev_unsync_attrs(struct dsa_port *dp) /* VLAN filtering is handled by dsa_switch_bridge_leave */ - /* Some drivers treat the notification for having a local multicast - * router by allowing multicast to be flooded to the CPU, so we should - * allow this in standalone mode too. - */ - dsa_port_mrouter(dp->cpu_dp, true, NULL); - /* Ageing time may be global to the switch chip, so don't change it * here because we have no good reason (or value) to change it to. */ From patchwork Thu Aug 5 12:15:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 493265 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.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D0A6C4320E for ; Thu, 5 Aug 2021 12:16:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 005CC6105A for ; Thu, 5 Aug 2021 12:16:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241216AbhHEMQ3 (ORCPT ); Thu, 5 Aug 2021 08:16:29 -0400 Received: from mail-eopbgr140070.outbound.protection.outlook.com ([40.107.14.70]:63492 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S241166AbhHEMQW (ORCPT ); Thu, 5 Aug 2021 08:16:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hVQlZik6Jqoiz81fxmIz9dRO0elUsz7xSJ7T6GJnRvdM2fTJzm5IEiFujrIPhxhkPrJdlGIJa4djODiKIaPJLYcHuUJ3gD4dXQYKcDSOu6DXGfYNVHOiT8sEn/GeSXwQDMo2ZZMERbFcR4OsnetCCYrXJQEClpNWWnTZGkUu1BBPPf5Yon4VOG7jSzYYBxeTDLRqKg2dqeamkBRqeNlT53xWE+ywwrvVsrx5hRFjnsCcvFUI3ITTMnjlJ7x8b4N5lejP5O9wTVQA41i2UIWoKlSDLJuZtSNyz5vp5OPy8InKIy2kLwQZrOE8UNcY0Af/0qME48AeDM2zohHp7ZWskA== 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=YxkQqjzSzB5QOr5a4q5pTQPF62SSAHlGLkdSSXovWFs=; b=lJrjZH49nAxQa3RQxPcvMbMklGsRG1cnl28B/rK+kRrOUGlZLaaiMbX6H5/KPQ5H5Ip0uRz6KbOTTS25b8++Kef8pArN0zPthkaEn/FdutY8Zx4bYTphBg5O/dOd2yPBZ1nWgSHMHaA48jgRZBE9eAAJeT9tFo/QIH204XKU5E5UIcCPnrCoguTPuQeiFM02+qW/TDG+2TfxYKoEM4EQz5IPJSkEzqnY4qnljbybgerNkavUpq7uAQahef7wGhDCuOPT55rvUT4XBpN5M3z6Jx+93zy3H3nzD/NDSobhan6+6eWsOP5X/696gTpvXNdet+9kbJYFW7nrYWr+0zzWeA== 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=YxkQqjzSzB5QOr5a4q5pTQPF62SSAHlGLkdSSXovWFs=; b=SoX3ID0Fllp7Af4dcsGKXHnj3cuB88gYSzU4XnjkIyVaSw++e2fgkb13JOEl3jZNTITWvqIAq6xs02xUkoDJ85WWlzM/p3Q6vxblyN031NtZejGI54Db/WLzOq8fSk39Ks6AOZaahzlCNBtE51zoBOOOUQgCQUMWCIr9VkamI30= 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 VI1PR04MB6269.eurprd04.prod.outlook.com (2603:10a6:803:fa::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Thu, 5 Aug 2021 12:16:06 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0%2]) with mapi id 15.20.4394.017; Thu, 5 Aug 2021 12:16:06 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , DENG Qingfang Subject: [PATCH net 2/3] net: dsa: mt7530: remove the .port_set_mrouter implementation Date: Thu, 5 Aug 2021 15:15:50 +0300 Message-Id: <20210805121551.2194841-3-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210805121551.2194841-1-vladimir.oltean@nxp.com> References: <20210805121551.2194841-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM4PR0101CA0080.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::48) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.25.144.60) by AM4PR0101CA0080.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Thu, 5 Aug 2021 12:16:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c5e81f5-3bd0-4cbc-971b-08d9580accc0 X-MS-TrafficTypeDiagnostic: VI1PR04MB6269: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:949; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kkfbnVOrVavgqTXcgn8+RK26fqfLAa80ZFI3deS2oF1s6wE+e6ts39sdpgm3d25cdsBn29vZufl7ASoE29XFHdUrxTRK2qyV+yZmYas2GyU5gLbnkTE5L+KqkxdEpJHKxS4rXMqy/7qDp7cHnzqnWcay7RLFa7cKiR/jFvZ1ecqqE/uKPMGbyV6YKrkegVw5q5VGxplUtmcfEwVw3wMKd4FqOdSWAR1ZwhbG8RLSVjgFYugotcBu1y83pFZeMaPevl/PhWFLUKAb+2eJkvV+jKjpfhNqdTVXmDpB/e26eoxAxUwMqxq1OWLhWqeejdCQ7uG5SgY4Ze3I8U+nfp6a2zYf07Hb0Ikm4NjwkfpMzoufo3Jai+J3vi5KTDJIk0tZqxLgOdkoRnh1y33LbLSYUuc0iJxbe39CW30byaY5wTnv/XU5goFkpHbS+3ZFiyAWmaPrK2bT76I8k6dHciIRJLfqabhXWckq2mshmqikLmKTyUxdbG8gqb+gs5l2nShkzX+uN86pBWnfHAEbEdB3Fow9VyEButTuXrEwz0t7srRMxeNq/U3qUurBe9d8U5TUBm90COUda+adlRYdwMooyuv5TyKd9zgWyQfNJUws9J8YnbH0msnTNqCcFgdJTk5TFjenEdgehkVsTkp0ca6Vc4QPLgM1zt22OM2MPXN7bBDGFTBBuXaZnDfef1/5qwuhXIOiwj/gqdONvXiIQPcEhmVXMA7mvwmpvnPUjs2wopI= 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)(366004)(376002)(346002)(136003)(39850400004)(396003)(2616005)(110136005)(6506007)(956004)(44832011)(66556008)(66476007)(478600001)(36756003)(54906003)(5660300002)(316002)(52116002)(6512007)(83380400001)(38350700002)(86362001)(2906002)(38100700002)(66946007)(6666004)(186003)(6486002)(8936002)(1076003)(4326008)(8676002)(26005)(142923001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mQvw4KInQd41Pok9RT97qc/9LKIVseUz5KNt+HtXnnQZ+a/gFsthQCnjwp5UflA5hQecX/CYUWxfQTceS97Ms8o/jiCPzfzO2E3qBmMX4e00uJ7elKAUYRH9kJWm4C4aFQ1SXn4aEDXr03ZrSYSGpCqqu2pPA4GUmHvhNndOmtx095rxuNFUSPdCGol1B5h+09NDJthEigyK3q2F1fx4GHfHxGn6tKCYu3KkHYTfq9o+fEZVRoKEXN4fuetXlqukL8XhCZWF3VE99VQaSmYlbo+wxY5LgyCTnrMApe+jTfL1385DArVRtAXj8uW2CNyzvLdUbSO1IheyJ96aV8FmxWJ8+a3oN5n8/BCjeT7Oh2uwD3snaSaTykB/8hxNxZIfZAriOBm+GiyuBbmm7fomej/L9Z8AhnJIj7nrcDonM96bCKxlkV1B9BG8LvlIL575f/4ZXqUmdxVbF0O3c0TDC+1VdtKdFJmZvL5aTd7LHcIx4+mfZWAQWr4h7Fpt5I+zS344GCY2wPqWFEZEcQogvkbcg4oMV75jXEQxVmFHkP4gfK0Z4ag5TrjQ+T+agivgc8LU74Pe4aYan3b09hk7qHZUsjDaWTONVffFim8K6w93+LZwBQ/ZbF15Fw4KnxAxfMQhpwPpxjDFNL3hi4WBgaSMdGiugogfa6vZ/k135p39dhrtVO91S+IIZxSVbkPGMjC7GTMwxduZp7VCIhNq7gVBNTnPGviWgdGcZhVpfpt/OZLPcErkoOBVNtbBauIyVCWWHWMqvIO+ERIhqsnm2DEeevC2rEyN6zmllEEEVmV+7wV5fjQjRju6BgalfRoJ8nvW62f6irhEdAEN8GLMNj0V4Wg+Jj4wH8L9L7h3XbMzMk8EsPXCr2xCEw6IbA6d/y7zTNe7xR7LB9JwYKFqpTXNs2h62UrnFWQUwK1b2koCImtpMe1dHYTS8u78sqP1qrrId5Z04MttMemoILAnfq9Mb7LNNNMIq5y2rKjyNwF3xJWVCcNZLs72mLN/8TrzQn7OhvuAioeU6p8Z55i5l2ACZAZssRbp2cJaiKuDaTf3JzkFg+J55eJmWFoOqU1PVWY1L8mSn3ZVt3kKezdqnQrM+QKKzJ5LO0nEli+Vh2o3eRoO6o+iS9nk56JAjVyat4iwYaXmafkOjdY2Z8xuxdzYgci1Z9+l7iySX/1Daf0rtZ9VIR1Gy9qRtkjkVdd890IMMpochHRDDCdXbhTUwlh4wzd/H1E7b+AfEzuUKMuJcZs63G+WhU+3+X4yB0qzNj2c2l/7wP4lEJhBUClFIW9v3gSpQ+kZnKZ1ssRU20xqSZbmRu2pfXyzxPSY2KM8 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c5e81f5-3bd0-4cbc-971b-08d9580accc0 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2021 12:16:05.9295 (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: +o4xjcwMGG7MeBvJRDCKsgc+YW80H4oCs1MeeAqWJXmYoOctkDCnUdsT8Yybe19Owegg/o1q01Akg/JThlM9ug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6269 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org DSA's idea of optimizing out multicast flooding to the CPU port leaves quite a few holes open, so it should be reverted. The mt7530 driver is the only new driver which added a .port_set_mrouter implementation after the reorg from commit a8b659e7ff75 ("net: dsa: act as passthrough for bridge port flags"), so it needs to be reverted separately so that the other revert commit can go a bit further down the git history. Fixes: 5a30833b9a16 ("net: dsa: mt7530: support MDB and bridge flag operations") Signed-off-by: Vladimir Oltean --- drivers/net/dsa/mt7530.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 69f21b71614c..1f9a6b12bc7c 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -1184,18 +1184,6 @@ mt7530_port_bridge_flags(struct dsa_switch *ds, int port, return 0; } -static int -mt7530_port_set_mrouter(struct dsa_switch *ds, int port, bool mrouter, - struct netlink_ext_ack *extack) -{ - struct mt7530_priv *priv = ds->priv; - - mt7530_rmw(priv, MT7530_MFC, UNM_FFP(BIT(port)), - mrouter ? UNM_FFP(BIT(port)) : 0); - - return 0; -} - static int mt7530_port_bridge_join(struct dsa_switch *ds, int port, struct net_device *bridge) @@ -3060,7 +3048,6 @@ static const struct dsa_switch_ops mt7530_switch_ops = { .port_stp_state_set = mt7530_stp_state_set, .port_pre_bridge_flags = mt7530_port_pre_bridge_flags, .port_bridge_flags = mt7530_port_bridge_flags, - .port_set_mrouter = mt7530_port_set_mrouter, .port_bridge_join = mt7530_port_bridge_join, .port_bridge_leave = mt7530_port_bridge_leave, .port_fdb_add = mt7530_port_fdb_add, From patchwork Thu Aug 5 12:15:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 492698 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.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 028A1C4338F for ; Thu, 5 Aug 2021 12:16:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C6BF9610A2 for ; Thu, 5 Aug 2021 12:16:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241226AbhHEMQb (ORCPT ); Thu, 5 Aug 2021 08:16:31 -0400 Received: from mail-eopbgr140070.outbound.protection.outlook.com ([40.107.14.70]:63492 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S241233AbhHEMQ3 (ORCPT ); Thu, 5 Aug 2021 08:16:29 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GGP+0648sFI2ZUfizOCmpXHyNWVpKpbCVm+ZoaU16NUfjOoc2hdCtoGdW4cZKYJPiOCjtFRmupuzgArfUC8574QNegiCitksd5amRw4EYAxabL7Ub2Stt/WJ9U6qg117uUbBpTZ+qjaBj2ro+1zqzXOVwuCuxlA4qzli0A1asVjnUUrPgS+4Srn7sqWgq9U/cNBXgQ1jlEsR3LqXZqpnlxRsyBODla8D4yOuM5kUzwf/FkNKdGDaOW49dSTqcSjINqQRh6k0JDwixhJU5Yqvem7t3xOFlYSBiUEIwFIN85h3GC6X2oRGG8PwC4ffnmlguk3hhciV5UffNUKCzCDoXQ== 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=xS4mKNK4AMOdcFneVyesu93XBAwjnQ9OWT4Nfr1x55o=; b=TxgrIKIvj73QjT6fIEkuPknUfijLizy3RMxGFHWaNlaaFneY8e6jTVgfdSUPMKcxTyOXsdBhf1tdpsc7dRwIc8wXEfeT1x61HbbU4uBr0RlgoW8qPFKvX6jn9MSXW5G/0dcylY07J+8q6EQSctCzEkpvenFmIM9XVp7VdSa1VLLJyuX+vH1FTwaUDlHmuIx3nYp9nbe9VHGy0fqorpu4D3z0Yn7mGYn24jpYy4WfgLGUM74vNaiRTW1vs+xDGvu51vARSU6PED0lrqNXz9cV6h1sAmTk+3CIZgjGTmZde5mLhpi6+lpndbfxn4NxVOfe8rflOOHrsPx4vZ+j29GtmA== 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=xS4mKNK4AMOdcFneVyesu93XBAwjnQ9OWT4Nfr1x55o=; b=IfD+nZLd6Go93mB19loU7FkJAEvDPG34pK8kd3sI4s5oPiGfGNMlemH2g5DyfMmLd5tpzoywcNSYqD3K5nd5c6OpM6CGQJs09TyjJhFKWFac5ujAmgwQh0DPwy6I2WVQA+XJVZN4YNsfsCLIEUW5/+PzqAp8jOpCmz/swr9y8MM= 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 VI1PR04MB6269.eurprd04.prod.outlook.com (2603:10a6:803:fa::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Thu, 5 Aug 2021 12:16:07 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0%2]) with mapi id 15.20.4394.017; Thu, 5 Aug 2021 12:16:07 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , DENG Qingfang Subject: [PATCH net 3/3] net: dsa: don't disable multicast flooding to the CPU even without an IGMP querier Date: Thu, 5 Aug 2021 15:15:51 +0300 Message-Id: <20210805121551.2194841-4-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210805121551.2194841-1-vladimir.oltean@nxp.com> References: <20210805121551.2194841-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM4PR0101CA0080.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::48) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.25.144.60) by AM4PR0101CA0080.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Thu, 5 Aug 2021 12:16:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cec8ed24-b825-47cc-c0e9-08d9580acd53 X-MS-TrafficTypeDiagnostic: VI1PR04MB6269: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M73dpaRYpYrUCrS1PaIGzKrynUd+rkpql3fqMIh4Wcj6qvGZdU2We1dG53UG/+ppvlrHWzc7OvTMc50GKFejS7Krljvtdv9hO+bVgHEKRXUFYj+9MRy/1x65JdOfEWtp/LmWjzzipm28u1EdIWIW1Sp9MDZOvhZtXJA9zx2UpBkzG8E8M9ixGMeYbBnfZp7I7gAOmXqPNC/q4Ee5NtHlxafVbt0qn2k8SrDBXq5EeygYrfPjpIZje1J0bpDcU+jn5OWDdny9z71rjwJBfSpLgijOu942sTgyhXoW6eUpWXfOsx3fqXuKHflN+Bkl0xoEv6aAEpK9UxFFlkOH00c1XabYVvV/NeBh72wstftYRAcbDQg1dBuJIWBAaVF3YrYflgk3BntuLSu7E7RyhFZ8849Wm+D4VgmOX4i7Kn6jircDucA5xRhcvamS41qM5t6LKqgtc33lxiOjrZoINtQ7XFYZSEYbJt1U6WncgxLrSmRnqosV2FsQbQVKst8Y0u6dx9uLmpPPppjDA8bD8n1PnI0tFVRwsno4UJgzj/MDIPfWqSDKNZxB3wdiCvjHlZYtvUDiTmBpjxJu3Oj2HmbofUtxifD4rFOzNNvw+86A6bGTx1zOtp3g2mvWgUCqPI06wUhPqYxjjIyk2IEc1KnEfOX8bI08iGm+rAuMmsKbYAYaEqp+isNDQBXPTIkdJBWcBSSmhG64h7xUl3/l3OlZ2A== 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)(366004)(376002)(346002)(136003)(39850400004)(396003)(2616005)(110136005)(6506007)(956004)(44832011)(66556008)(66476007)(478600001)(36756003)(54906003)(5660300002)(316002)(52116002)(6512007)(83380400001)(38350700002)(86362001)(2906002)(38100700002)(66946007)(6666004)(66574015)(186003)(6486002)(8936002)(1076003)(4326008)(8676002)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rVXduIAj6DkmAfHduyPIXUb+18iwXsnNDTnNgjXJsQU0lqELVkvCXQ4bc8SDJ9gdGJ/H8w5vj0xg5eCNv1Eq9QzTuEfVAX6Uds3tIUmulRTtxTxnjAw0moZOCX45+75wJhQ8JLDtPmGHFinLw0LYLTPdlVqaJcGWtORs9F5GhdhCJJroxopz3K0h6omN66kFv4JuWexEH2CbE6GNlFkLCVDTaYkCNil9rzFE6SBOMlJH92YZme4SjPgbpQXBD8VPDBPmKg8a8Mp4UAeIwxHmEtWtdoaWaoCBgZi/wOFMhshGJNvijcoR9thOzQuZB9D8KiAEBjqgRISKRw0AKQ0PiAJPaQ1EpMu28PdSEOwvXYLLTvkxZPfvcpX2nHprpZpKOtjXmkenFKpbSpWlGPFU53AAmHrIgFDopwjGSTJ9Uois9AwHMNwPyX1jcmZtwbiG6cCp+H97JU7EPmVhbLS7bLDXmSF9J0fmrW4vaw+hW/eA1WmZccSPcnWrX5RB/OK0/IYH6NDNh8RlWpHAi05VC+n4Oenn5XYWijo3RPYJFibW2aV/qGMM401UF+B7EMhC910J7lIKbUInA8Ctu6JY9Bx7VX6gI0UagEFq+Lwp1Pv6/MQaqoN9TGxKYhe6tuOFGEJcthpRGmJ2rxphc3WmVQGv88qt/EGechOOT2Crraqloky8W/So6ez9Ly2JAyMh3K+2UbK85jFSL8reiLRgKg2iYSF8ntH0+CkNaIogQ84nT4Vej+YWyeOeOE5oI/TkzRDs/pfg7Dzi4BacbvkCGpxl468U99MXs74v+iUvdfNEnpKCv14fstCQiUm6nh97upufkL5ci7zlZlPBPNWDfq5t6Nd64bKxY7qiz5FeL+SDFzKMeVkOVM3Gy0BSWG/YhZKCuJgG7xS0goSrYZOOXM+A+vdi4/b0wgIBeusB5EbLE1xTIhF9ydQN+BUrwXRxCqf7B+wMkpUE+dWi4VJQq/4OalaWD2qb2Y4bhqeb9ybXQWvq+js0IrkMy4KpYtAONTcoC/D9s/RJme54U1hQZvj0dVKJp+K4XxemklTx4qzXKEM1HWpDD9Yryu7UcJ0aSkqbgLF26i04Lpmu09xqQFQ61pNZegI+GI2jEwA6TzlI13JmuRCvg5ap4Dg2b3zxAoVi4b6HXMVmz1WaeTPyAt0s0N8iR/0BdtY8CoGxOk76zI/Befj3dwnO89oxS0KVU014JuFQsqtNmWQ+vu6opTKgzqM5GYjuOYya158mExMQgzPYIBGELB1Hk4uDzlMRYwLyxYXmzf1Fqxj+Zt/ZVaVISQa+J3N0xWm5etalmvDVDNvSLuw4p0JVk774tJ3h X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cec8ed24-b825-47cc-c0e9-08d9580acd53 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2021 12:16:06.9180 (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: PBLhL8C3Wn01pUTNXJwbMVTaoPQaVPPjs1vDHDItM2j5lrljdbX94IPsGHEtCU7D2KezIMTzlFjMuGp+WtVA4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6269 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 08cc83cc7fd8 ("net: dsa: add support for BRIDGE_MROUTER attribute") added an option for users to turn off multicast flooding towards the CPU if they turn off the IGMP querier on a bridge which already has enslaved ports (echo 0 > /sys/class/net/br0/bridge/multicast_router). And commit a8b659e7ff75 ("net: dsa: act as passthrough for bridge port flags") simply papered over that issue, because it moved the decision to flood the CPU with multicast (or not) from the DSA core down to individual drivers, instead of taking a more radical position then. The truth is that disabling multicast flooding to the CPU is simply something we are not prepared to do now, if at all. Some reasons: - ICMP6 neighbor solicitation messages are unregistered multicast packets as far as the bridge is concerned. So if we stop flooding multicast, the outside world cannot ping the bridge device's IPv6 link-local address. - There might be foreign interfaces bridged with our DSA switch ports (sending a packet towards the host does not necessarily equal termination, but maybe software forwarding). So if there is no one interested in that multicast traffic in the local network stack, that doesn't mean nobody is. - PTP over L4 (IPv4, IPv6) is multicast, but is unregistered as far as the bridge is concerned. This should reach the CPU port. - The switch driver might not do FDB partitioning. And since we don't even bother to do more fine-grained flood disabling (such as "disable flooding _from_port_N_ towards the CPU port" as opposed to "disable flooding _from_any_port_ towards the CPU port"), this breaks standalone ports, or even multiple bridges where one has an IGMP querier and one doesn't. Reverting the logic makes all of the above work. Fixes: a8b659e7ff75 ("net: dsa: act as passthrough for bridge port flags") Fixes: 08cc83cc7fd8 ("net: dsa: add support for BRIDGE_MROUTER attribute") Signed-off-by: Vladimir Oltean --- drivers/net/dsa/b53/b53_common.c | 10 ---------- drivers/net/dsa/bcm_sf2.c | 1 - drivers/net/dsa/mv88e6xxx/chip.c | 18 ------------------ include/net/dsa.h | 2 -- net/dsa/dsa_priv.h | 2 -- net/dsa/port.c | 11 ----------- net/dsa/slave.c | 6 ------ 7 files changed, 50 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index b23e3488695b..bd1417a66cbf 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -2016,15 +2016,6 @@ int b53_br_flags(struct dsa_switch *ds, int port, } EXPORT_SYMBOL(b53_br_flags); -int b53_set_mrouter(struct dsa_switch *ds, int port, bool mrouter, - struct netlink_ext_ack *extack) -{ - b53_port_set_mcast_flood(ds->priv, port, mrouter); - - return 0; -} -EXPORT_SYMBOL(b53_set_mrouter); - static bool b53_possible_cpu_port(struct dsa_switch *ds, int port) { /* Broadcom switches will accept enabling Broadcom tags on the @@ -2268,7 +2259,6 @@ static const struct dsa_switch_ops b53_switch_ops = { .port_bridge_leave = b53_br_leave, .port_pre_bridge_flags = b53_br_flags_pre, .port_bridge_flags = b53_br_flags, - .port_set_mrouter = b53_set_mrouter, .port_stp_state_set = b53_br_set_stp_state, .port_fast_age = b53_br_fast_age, .port_vlan_filtering = b53_vlan_filtering, diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 3b018fcf4412..6ce9ec1283e0 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -1199,7 +1199,6 @@ static const struct dsa_switch_ops bcm_sf2_ops = { .port_pre_bridge_flags = b53_br_flags_pre, .port_bridge_flags = b53_br_flags, .port_stp_state_set = b53_br_set_stp_state, - .port_set_mrouter = b53_set_mrouter, .port_fast_age = b53_br_fast_age, .port_vlan_filtering = b53_vlan_filtering, .port_vlan_add = b53_vlan_add, diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 272b0535d946..111a6d5985da 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5781,23 +5781,6 @@ static int mv88e6xxx_port_bridge_flags(struct dsa_switch *ds, int port, return err; } -static int mv88e6xxx_port_set_mrouter(struct dsa_switch *ds, int port, - bool mrouter, - struct netlink_ext_ack *extack) -{ - struct mv88e6xxx_chip *chip = ds->priv; - int err; - - if (!chip->info->ops->port_set_mcast_flood) - return -EOPNOTSUPP; - - mv88e6xxx_reg_lock(chip); - err = chip->info->ops->port_set_mcast_flood(chip, port, mrouter); - mv88e6xxx_reg_unlock(chip); - - return err; -} - static bool mv88e6xxx_lag_can_offload(struct dsa_switch *ds, struct net_device *lag, struct netdev_lag_upper_info *info) @@ -6099,7 +6082,6 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .port_bridge_leave = mv88e6xxx_port_bridge_leave, .port_pre_bridge_flags = mv88e6xxx_port_pre_bridge_flags, .port_bridge_flags = mv88e6xxx_port_bridge_flags, - .port_set_mrouter = mv88e6xxx_port_set_mrouter, .port_stp_state_set = mv88e6xxx_port_stp_state_set, .port_fast_age = mv88e6xxx_port_fast_age, .port_vlan_filtering = mv88e6xxx_port_vlan_filtering, diff --git a/include/net/dsa.h b/include/net/dsa.h index 33f40c1ec379..048d297623c9 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -699,8 +699,6 @@ struct dsa_switch_ops { int (*port_bridge_flags)(struct dsa_switch *ds, int port, struct switchdev_brport_flags flags, struct netlink_ext_ack *extack); - int (*port_set_mrouter)(struct dsa_switch *ds, int port, bool mrouter, - struct netlink_ext_ack *extack); /* * VLAN support diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index f201c33980bf..cddf7cb0f398 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -234,8 +234,6 @@ int dsa_port_pre_bridge_flags(const struct dsa_port *dp, int dsa_port_bridge_flags(const struct dsa_port *dp, struct switchdev_brport_flags flags, struct netlink_ext_ack *extack); -int dsa_port_mrouter(struct dsa_port *dp, bool mrouter, - struct netlink_ext_ack *extack); int dsa_port_vlan_add(struct dsa_port *dp, const struct switchdev_obj_port_vlan *vlan, struct netlink_ext_ack *extack); diff --git a/net/dsa/port.c b/net/dsa/port.c index d9ef2c2fbf88..23e30198a90e 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -597,17 +597,6 @@ int dsa_port_bridge_flags(const struct dsa_port *dp, return ds->ops->port_bridge_flags(ds, dp->index, flags, extack); } -int dsa_port_mrouter(struct dsa_port *dp, bool mrouter, - struct netlink_ext_ack *extack) -{ - struct dsa_switch *ds = dp->ds; - - if (!ds->ops->port_set_mrouter) - return -EOPNOTSUPP; - - return ds->ops->port_set_mrouter(ds, dp->index, mrouter, extack); -} - int dsa_port_mtu_change(struct dsa_port *dp, int new_mtu, bool targeted_match) { diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 532085da8d8f..0356ceb89a37 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -314,12 +314,6 @@ static int dsa_slave_port_attr_set(struct net_device *dev, const void *ctx, ret = dsa_port_bridge_flags(dp, attr->u.brport_flags, extack); break; - case SWITCHDEV_ATTR_ID_BRIDGE_MROUTER: - if (!dsa_port_offloads_bridge(dp, attr->orig_dev)) - return -EOPNOTSUPP; - - ret = dsa_port_mrouter(dp->cpu_dp, attr->u.mrouter, extack); - break; default: ret = -EOPNOTSUPP; break;