From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08856ECAAD4 for ; Mon, 29 Aug 2022 12:40:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229769AbiH2MkN (ORCPT ); Mon, 29 Aug 2022 08:40:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230080AbiH2Mjm (ORCPT ); Mon, 29 Aug 2022 08:39:42 -0400 Received: from mailout-taastrup.gigahost.dk (mailout-taastrup.gigahost.dk [46.183.139.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD9882ED65; Mon, 29 Aug 2022 05:23:38 -0700 (PDT) Received: from mailout.gigahost.dk (mailout.gigahost.dk [89.186.169.112]) by mailout-taastrup.gigahost.dk (Postfix) with ESMTP id 38ADC18839D6; Mon, 29 Aug 2022 11:09:13 +0000 (UTC) Received: from smtp.gigahost.dk (smtp.gigahost.dk [89.186.169.109]) by mailout.gigahost.dk (Postfix) with ESMTP id 137FC25032B8; Mon, 29 Aug 2022 11:09:13 +0000 (UTC) Received: by smtp.gigahost.dk (Postfix, from userid 1000) id E69209EC0002; Mon, 29 Aug 2022 11:09:12 +0000 (UTC) X-Screener-Id: 413d8c6ce5bf6eab4824d0abaab02863e8e3f662 MIME-Version: 1.0 Date: Mon, 29 Aug 2022 13:09:12 +0200 From: netdev@kapio-technology.com To: Nikolay Aleksandrov Cc: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org, Florian Fainelli , Andrew Lunn , Vivien Didelot , Vladimir Oltean , Eric Dumazet , Paolo Abeni , Kurt Kanzenbach , Hauke Mehrtens , Woojung Huh , UNGLinuxDriver@microchip.com, Sean Wang , Landen Chao , DENG Qingfang , Matthias Brugger , Claudiu Manoil , Alexandre Belloni , Jiri Pirko , Ivan Vecera , Roopa Prabhu , Shuah Khan , Christian Marangi , Daniel Borkmann , Yuwei Wang , Ido Schimmel , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, bridge@lists.linux-foundation.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH v5 net-next 1/6] net: bridge: add locked entry fdb flag to extend locked port feature In-Reply-To: References: <20220826114538.705433-1-netdev@kapio-technology.com> <20220826114538.705433-2-netdev@kapio-technology.com> User-Agent: Gigahost Webmail Message-ID: X-Sender: netdev@kapio-technology.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org > On 2022-08-27 13:30, Nikolay Aleksandrov wrote: >> @@ -879,6 +888,10 @@ void br_fdb_update(struct net_bridge *br, struct >> net_bridge_port *source, >> &fdb->flags))) >> clear_bit(BR_FDB_ADDED_BY_EXT_LEARN, >> &fdb->flags); >> + if (source->flags & BR_PORT_MAB) >> + set_bit(BR_FDB_ENTRY_LOCKED, &fdb->flags); >> + else >> + clear_bit(BR_FDB_ENTRY_LOCKED, &fdb->flags); > Please add a test for that bit and only then change it. > Something like this? @@ -749,6 +756,12 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, &fdb->flags))) clear_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags); + if (unlikely(test_bit(BR_FDB_ENTRY_LOCKED, &fdb->flags))) { + if (!(source->flags & BR_PORT_MAB)) + clear_bit(BR_FDB_ENTRY_LOCKED, &fdb->flags); + } else + if (source->flags & BR_PORT_MAB) + set_bit(BR_FDB_ENTRY_LOCKED, &fdb->flags); } if (unlikely(test_bit(BR_FDB_ADDED_BY_USER, &flags)))