From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB8CF199CD for ; Thu, 21 Sep 2023 16:58:21 +0000 (UTC) Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76E98E5D for ; Thu, 21 Sep 2023 09:57:44 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-53136a13cd4so1408545a12.1 for ; Thu, 21 Sep 2023 09:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=blackwall-org.20230601.gappssmtp.com; s=20230601; t=1695315450; x=1695920250; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Fv18euYIHxUyDyU2umf2N7sAa5N8tvwc+B+kdZWr598=; b=3Nl6GlOtfLKxIR/zfZDMHmNxOaVCtaYqLlRV8uCoZXM5e+x1hR8r760kZ8A1BaSeSQ 88oSwwIBWe4Dy142EZnS0COj6b0CbBXwYFlt62vg2mj4Bp5nbPnPTixgHU7NZc8Mp/6s 0PRFNvQoB1X+Byx+IZD6G6/l20PaU+40PKoNlQHZG1P9yYiusTA+G2p0qM/70DLPgPxp TADcF/QZQLcOYNEl8GgbqUo14Pfg1cPs0Iu0YVpZEnyBl4fqb/xd/sbkun+dGK/1AeTD vn30VyvDwV4HKwBATDzu1vMK8GzXB+uuy9OmPAOgzGCk2gUALucdTaCi+YlcxWufDKF6 Mi6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695315450; x=1695920250; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Fv18euYIHxUyDyU2umf2N7sAa5N8tvwc+B+kdZWr598=; b=NASmsHF3pT+xKNHQqo6OvsI7jmMYe5WkL/Mc4pmyXHOEKqFLhbq6Z+gfimUiXl31F9 D/UHIAT5QN5/aYFXKphHN4/vA0iMcPXOOhGSmxnaSkIBNnvPUv/pjk/7uoUPEx+0wEkz rxycVsRo/7EhMGGlNSTNz+5nlrZRqKLOiKQ3Kwi4xytNRr/RboPJkBpsZo6PCyrOiuSk Ov2R76/ptiVkGmEpb2ChgFyJVKOUNeeZLBGjElgzSwyHYe6bLq9ZvxoCq7+pXAX0jPAA rNBkh6ZnOdKoBkuIi+6c1zeJx0P5Sy/3wrDDsXUg6bu7GZtJvQKB7VaE1Ur0/gzrV97v QI7g== X-Gm-Message-State: AOJu0Yz2iMne8ftMwxOtCH064Z/bnl5sKyOSDt1RDg8yZ/FU5YTTouwf e83tdu41pD4WFKCtz82Gat+SDcHjUGrE11vGZ5Fogrgj X-Google-Smtp-Source: AGHT+IF7yqREQn2rdmQ5jUsI6c21sqgqAn9leaUuvmmsTe+epR2XbZ0CTk+dmINmAhslhc7LZaZeeg== X-Received: by 2002:a17:906:9b94:b0:9a1:debe:6b9b with SMTP id dd20-20020a1709069b9400b009a1debe6b9bmr6177440ejc.35.1695300113099; Thu, 21 Sep 2023 05:41:53 -0700 (PDT) Received: from [192.168.0.105] (haunt.prize.volia.net. [93.72.109.136]) by smtp.gmail.com with ESMTPSA id i22-20020a17090671d600b0099bcdfff7cbsm991440ejk.160.2023.09.21.05.41.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Sep 2023 05:41:52 -0700 (PDT) Message-ID: <0ae67e4d-0d51-5290-1255-1fe1b699ca14@blackwall.org> Date: Thu, 21 Sep 2023 15:41:50 +0300 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH net-next v4 4/6] net: bridge: Add netlink knobs for number / max learned FDB entries Content-Language: en-US To: Johannes Nixdorf , "David S. Miller" , Andrew Lunn , David Ahern , Eric Dumazet , Florian Fainelli , Ido Schimmel , Jakub Kicinski , Oleksij Rempel , Paolo Abeni , Roopa Prabhu , Shuah Khan , Vladimir Oltean Cc: bridge@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org References: <20230919-fdb_limit-v4-0-39f0293807b8@avm.de> <20230919-fdb_limit-v4-4-39f0293807b8@avm.de> From: Nikolay Aleksandrov In-Reply-To: <20230919-fdb_limit-v4-4-39f0293807b8@avm.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NICE_REPLY_A,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net On 9/19/23 11:12, Johannes Nixdorf wrote: > The previous patch added accounting and a limit for the number of > dynamically learned FDB entries per bridge. However it did not provide > means to actually configure those bounds or read back the count. This > patch does that. > > Two new netlink attributes are added for the accounting and limit of > dynamically learned FDB entries: > - IFLA_BR_FDB_N_LEARNED (RO) for the number of entries accounted for > a single bridge. > - IFLA_BR_FDB_MAX_LEARNED (RW) for the configured limit of entries for > the bridge. > > The new attributes are used like this: > > # ip link add name br up type bridge fdb_max_learned 256 > # ip link add name v1 up master br type veth peer v2 > # ip link set up dev v2 > # mausezahn -a rand -c 1024 v2 > 0.01 seconds (90877 packets per second > # bridge fdb | grep -v permanent | wc -l > 256 > # ip -d link show dev br > 13: br: mtu 1500 [...] > [...] fdb_n_learned 256 fdb_max_learned 256 > > Signed-off-by: Johannes Nixdorf > --- > include/uapi/linux/if_link.h | 2 ++ > net/bridge/br_netlink.c | 15 ++++++++++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h > index ce3117df9cec..0486f314c176 100644 > --- a/include/uapi/linux/if_link.h > +++ b/include/uapi/linux/if_link.h > @@ -510,6 +510,8 @@ enum { > IFLA_BR_VLAN_STATS_PER_PORT, > IFLA_BR_MULTI_BOOLOPT, > IFLA_BR_MCAST_QUERIER_STATE, > + IFLA_BR_FDB_N_LEARNED, > + IFLA_BR_FDB_MAX_LEARNED, > __IFLA_BR_MAX, > }; > > diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c > index 505683ef9a26..f5d49a05e61b 100644 > --- a/net/bridge/br_netlink.c > +++ b/net/bridge/br_netlink.c > @@ -1267,6 +1267,8 @@ static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = { > [IFLA_BR_VLAN_STATS_PER_PORT] = { .type = NLA_U8 }, > [IFLA_BR_MULTI_BOOLOPT] = > NLA_POLICY_EXACT_LEN(sizeof(struct br_boolopt_multi)), > + [IFLA_BR_FDB_N_LEARNED] = { .type = NLA_U32 }, > + [IFLA_BR_FDB_MAX_LEARNED] = { .type = NLA_U32 }, > }; > > static int br_changelink(struct net_device *brdev, struct nlattr *tb[], > @@ -1541,6 +1543,12 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], > return err; > } > > + if (data[IFLA_BR_FDB_MAX_LEARNED]) { > + u32 val = nla_get_u32(data[IFLA_BR_FDB_MAX_LEARNED]); > + > + WRITE_ONCE(br->fdb_max_learned, val); > + } > + > return 0; > } > > @@ -1595,6 +1603,8 @@ static size_t br_get_size(const struct net_device *brdev) > nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_TOPOLOGY_CHANGE_TIMER */ > nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_GC_TIMER */ > nla_total_size(ETH_ALEN) + /* IFLA_BR_GROUP_ADDR */ > + nla_total_size(sizeof(u32)) + /* IFLA_BR_FDB_N_LEARNED */ > + nla_total_size(sizeof(u32)) + /* IFLA_BR_FDB_MAX_LEARNED */ > #ifdef CONFIG_BRIDGE_IGMP_SNOOPING > nla_total_size(sizeof(u8)) + /* IFLA_BR_MCAST_ROUTER */ > nla_total_size(sizeof(u8)) + /* IFLA_BR_MCAST_SNOOPING */ > @@ -1670,7 +1680,10 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev) > nla_put_u8(skb, IFLA_BR_TOPOLOGY_CHANGE_DETECTED, > br->topology_change_detected) || > nla_put(skb, IFLA_BR_GROUP_ADDR, ETH_ALEN, br->group_addr) || > - nla_put(skb, IFLA_BR_MULTI_BOOLOPT, sizeof(bm), &bm)) > + nla_put(skb, IFLA_BR_MULTI_BOOLOPT, sizeof(bm), &bm) || > + nla_put_u32(skb, IFLA_BR_FDB_N_LEARNED, > + atomic_read(&br->fdb_n_learned)) || > + nla_put_u32(skb, IFLA_BR_FDB_MAX_LEARNED, br->fdb_max_learned)) > return -EMSGSIZE; > > #ifdef CONFIG_BRIDGE_VLAN_FILTERING > Actually you're using atomic for counting, but using a u32 for the limit, you should cap it because the count can overflow. Or you should use atomic64 for the counting.