Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Vladimir Oltean <olteanv@gmail.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com,
        Colin Foster <colin.foster@in-advantage.com>,
        Roopa Prabhu <roopa@nvidia.com>,
        Nikolay Aleksandrov <razor@blackwall.org>,
        Tobias Waldekranz <tobias@waldekranz.com>,
        =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>,
        Ansuel Smith <ansuelsmth@gmail.com>,
        DENG Qingfang <dqfext@gmail.com>,
        =?UTF-8?q?Alvin=20=C5=A0ipraga?= <alsi@bang-olufsen.dk>,
        Linus Walleij <linus.walleij@linaro.org>,
        Luiz Angelo Daros de Luca <luizluca@gmail.com>,
        Felix Fietkau <nbd@nbd.name>, John Crispin <john@phrozen.org>,
        Sean Wang <sean.wang@mediatek.com>,
        David Ahern <dsahern@kernel.org>,
        Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH v2 net-next 04/10] net: dsa: don't keep track of admin/oper state on LAG DSA masters
Date:   Sun, 11 Sep 2022 04:07:00 +0300
Message-Id: <20220911010706.2137967-5-vladimir.oltean@nxp.com>
In-Reply-To: <20220911010706.2137967-1-vladimir.oltean@nxp.com>
References: <20220911010706.2137967-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CmUMlPjnFos/TChckEk2jgb9iGaip0aqYKdJ2AjLLACpL5n6DM2oHcV66Qti?=
 =?us-ascii?Q?jeupFyz223EMTnJY9i/3VAyOdkSr0nzeQLuCXOf24gM6K06v/h3bbEeYdSCm?=
 =?us-ascii?Q?/FhoftTWl6OrrnFuHOTW8SgzZHJCshmRH3bGE7MeHrvhro1aCeJxxHJbvbIb?=
 =?us-ascii?Q?+zsmjSlSojEbGDcn9/V8PCC6rfkb+mQMDt5rEifT1Z3cKxInlRKwba2Ws78T?=
 =?us-ascii?Q?rcYmxYtzZfv3jSWVzTQ64DrkH876z+64GhJ3+lWq5biUmxeKaAy3Z6fr8RLu?=
 =?us-ascii?Q?qH5bSxeuAY11yMhhklEPYkCxYZyenVK2UJoUgsmh1Qup7DD78ZgLOISKp+QL?=
 =?us-ascii?Q?UTBjQk6CzV70ZpTgllcuaFNEkQvwyaKEI9xY76UY+hDGBrvLXgjOrA0KJQ5n?=
 =?us-ascii?Q?6biN0dDOkH/WeEYPxULzKJSw3PnCyAkOP5s6KCqjedWObP2OTCQC1FREJd/E?=
 =?us-ascii?Q?YnmexLskbzePZ/AFpkjfY4NR40EJxxu/vlhez5FKelpE65M65FwBxRL5ZUJH?=
 =?us-ascii?Q?Nx7dw6w0nVV/Au/rPKhGW9LikYw8IJpbpINH9d7UDr5RPpVEmt+jp/eIuff8?=
 =?us-ascii?Q?5S+fgvPZVj2Me2/WjQB9LLV0RTE4Eo2quAmIdQscFN1CxiAEHPxyViiYLEz5?=
 =?us-ascii?Q?qxxE8Jo9U7BkcCI8t+XOiwSaVWt9Zj8aMqCfT5yIewRE4ZBJ2Ms+vm3NfhKZ?=
 =?us-ascii?Q?M/JEGneAN7DeAqq71ahp/QFP/t8nrcZmiDo7hwC+dQLCanbRNcq8NsTTgSyg?=
 =?us-ascii?Q?BdgQpuKba+0AZpEZ8J6llGGrddTgd5YlYY6jqP2az6G/xYbxucFpolfZ8Q4p?=
 =?us-ascii?Q?nCPtc+Mp5PH6GRAnAPYqZ+uW9plmZoWAwzWcoSYGsym1i1QRPY2znHxZcZB6?=
 =?us-ascii?Q?L4JoB/4L5u6+QRTxDlkDG7i32gOGefSVKnwn97BgZe+q2xcL9uK691jRUxT4?=
 =?us-ascii?Q?DfZGDNFo4i/EOULc5//3raeS6ihIbbYxrqgouj0aIQM3vM1KW/8o/FfViur5?=
 =?us-ascii?Q?RNUwzRFO1sQGsDj+GqnQG0XiJoUHeYZjwrLVQrouMP/fhCOcABLeCDP3CuvZ?=
 =?us-ascii?Q?v38VbVu5jG63XyQU2jSDcbPfEB/62/Zv9tZ8UzEDqqwAfGeoslDfQxnPfosC?=
 =?us-ascii?Q?HlJWrhnQKw51pt2SxqEbereWg1hW5KQG5q+QWNzXRjfR/V/eAtf0Gm/n/rQM?=
 =?us-ascii?Q?//6DzL/ONXMfGIoflgZBLGIh0Zypte/iydAUqqmHWChDFC7eK18zXfKeGAmm?=
 =?us-ascii?Q?wuwForMk00KsRnrLr5LnFtFxUxrVb9OPuY+Ea/Sa7bSPwcV/dWafKHBM3CaQ?=
 =?us-ascii?Q?G2p/Rffd3eXBDot8fWHuwsqG5h2JM15jHGwV1iTY6sHwI43MHSkhgacjm+xe?=
 =?us-ascii?Q?8okBL/w9Hs/Tb9Gx6bz1pmJeBbSlQFzNyLBa5O37ZosY9bmXcRNzIazlLf7K?=
 =?us-ascii?Q?y71kb3pwPpUW/iXuqeUdM/yWzkW7WKccye+8yvTq7Q9kRNFzV2HaKUJB0zqc?=
 =?us-ascii?Q?I1rCqhYaRA6vk/gBpVFJIVB+Hn9DJ5ChlLdSdcKrW1bEV6/nWimJRDFPUh7c?=
 =?us-ascii?Q?A9w1fbBE5KAtnYormNB0xX+Xev4SOySjM4MUezkx8mEm32n4KGZlYOBxY2ad?=
 =?us-ascii?Q?TA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0019a628-da68-4b85-fa32-08da93920e38
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5121.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2022 01:07:54.0719
 (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: Wi9dqOHu6IK3xgUvSLvhgG50WENW8zqnZwpQwP63vqwUtoOU+gL/cBZ3TM+adXFm1jhd4EIfByhSUYBowr6JhA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7739
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

We store information about the DSA master's state in
cpu_dp->master_admin_up and cpu_dp->master_oper_up, and this assumes a
bijective association between a CPU port and a DSA master.

However, when we have CPU ports in a LAG (and DSA masters in a LAG too),
the way in which we set up things is that the physical DSA masters still
have dev->dsa_ptr pointing to our cpu_dp, but the bonding/team device
itself also has its dev->dsa_ptr pointing towards one of the CPU port
structures (the first one).

So logically speaking, that first cpu_dp can't keep track of both the
physical master's admin/oper state, and of the bonding master's state.

This isn't even needed; the reason why we keep track of the DSA master's
state is to know when it is available for Ethernet-based register access.
For that use case, we don't even need LAG; we just need to decide upon
one of the physical DSA masters (if there is more than 1 available) and
use that.

This change suppresses dsa_tree_master_{admin,oper}_state_change() calls
on LAG DSA masters (which will be supported in a future change), to
allow the tracking of just physical DSA masters.

Link: https://lore.kernel.org/netdev/628cc94d.1c69fb81.15b0d.422d@mx.google.com/
Suggested-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v1->v2: none

 net/dsa/dsa2.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 44207d848722..2b324db8ea88 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -1336,6 +1336,12 @@ void dsa_tree_master_admin_state_change(struct dsa_switch_tree *dst,
 	struct dsa_port *cpu_dp = master->dsa_ptr;
 	bool notify = false;
 
+	/* Don't keep track of admin state on LAG DSA masters,
+	 * but rather just of physical DSA masters
+	 */
+	if (netif_is_lag_master(master))
+		return;
+
 	if ((dsa_port_master_is_operational(cpu_dp)) !=
 	    (up && cpu_dp->master_oper_up))
 		notify = true;
@@ -1353,6 +1359,12 @@ void dsa_tree_master_oper_state_change(struct dsa_switch_tree *dst,
 	struct dsa_port *cpu_dp = master->dsa_ptr;
 	bool notify = false;
 
+	/* Don't keep track of oper state on LAG DSA masters,
+	 * but rather just of physical DSA masters
+	 */
+	if (netif_is_lag_master(master))
+		return;
+
 	if ((dsa_port_master_is_operational(cpu_dp)) !=
 	    (cpu_dp->master_admin_up && up))
 		notify = true;
-- 
2.34.1