From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5C34640BFB DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9EA1640BE8 MIME-Version: 1.0 Date: Mon, 29 Aug 2022 13:09:12 +0200 From: netdev@kapio-technology.com In-Reply-To: References: <20220826114538.705433-1-netdev@kapio-technology.com> <20220826114538.705433-2-netdev@kapio-technology.com> Message-ID: Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Bridge] [PATCH v5 net-next 1/6] net: bridge: add locked entry fdb flag to extend locked port feature List-Id: Linux Ethernet Bridging List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Nikolay Aleksandrov Cc: Andrew Lunn , Alexandre Belloni , Kurt Kanzenbach , Eric Dumazet , linux-kselftest@vger.kernel.org, Shuah Khan , Ivan Vecera , Florian Fainelli , Daniel Borkmann , Ido Schimmel , bridge@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, Roopa Prabhu , kuba@kernel.org, Paolo Abeni , Vivien Didelot , Woojung Huh , Landen Chao , Jiri Pirko , Christian Marangi , Hauke Mehrtens , Sean Wang , DENG Qingfang , Claudiu Manoil , linux-mediatek@lists.infradead.org, Matthias Brugger , Yuwei Wang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, UNGLinuxDriver@microchip.com, Vladimir Oltean , davem@davemloft.net > 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)))