From patchwork Tue Oct 4 15:20:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Schultz X-Patchwork-Id: 12998513 X-Patchwork-Delegate: dsahern@gmail.com 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 88C0CC433F5 for ; Tue, 4 Oct 2022 15:21:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229758AbiJDPVA (ORCPT ); Tue, 4 Oct 2022 11:21:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229710AbiJDPUz (ORCPT ); Tue, 4 Oct 2022 11:20:55 -0400 Received: from mailout-taastrup.gigahost.dk (mailout-taastrup.gigahost.dk [46.183.139.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61B575FAD0; Tue, 4 Oct 2022 08:20:54 -0700 (PDT) Received: from mailout.gigahost.dk (mailout.gigahost.dk [89.186.169.112]) by mailout-taastrup.gigahost.dk (Postfix) with ESMTP id C91BD1884BAC; Tue, 4 Oct 2022 15:20:52 +0000 (UTC) Received: from smtp.gigahost.dk (smtp.gigahost.dk [89.186.169.109]) by mailout.gigahost.dk (Postfix) with ESMTP id AC91125001FA; Tue, 4 Oct 2022 15:20:52 +0000 (UTC) Received: by smtp.gigahost.dk (Postfix, from userid 1000) id 8B1649EC000E; Tue, 4 Oct 2022 15:20:52 +0000 (UTC) X-Screener-Id: 413d8c6ce5bf6eab4824d0abaab02863e8e3f662 Received: from fujitsu.vestervang (2-104-116-184-cable.dk.customer.tdc.net [2.104.116.184]) by smtp.gigahost.dk (Postfix) with ESMTPSA id B5CFB9EC000A; Tue, 4 Oct 2022 15:20:51 +0000 (UTC) From: Hans Schultz To: davem@davemloft.net, kuba@kernel.org Cc: netdev@vger.kernel.org, Hans Schultz , 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 , Nikolay Aleksandrov , Shuah Khan , Russell King , Christian Marangi , Daniel Borkmann , Yuwei Wang , Petr Machata , Ido Schimmel , Florent Fourcot , Hans Schultz , Joachim Wiberg , Amit Cohen , 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: [PATCH v2 iproute2-next 4/4] bridge: fdb: enable FDB blackhole feature Date: Tue, 4 Oct 2022 17:20:36 +0200 Message-Id: <20221004152036.7848-4-netdev@kapio-technology.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221004152036.7848-1-netdev@kapio-technology.com> References: <20221004152036.7848-1-netdev@kapio-technology.com> MIME-Version: 1.0 Organization: Westermo Network Technologies AB Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com Block traffic to a specific host with the command: bridge fdb add vlan dev br0 blackhole Blackhole FDB entries can be added, deleted and replaced with ordinary FDB entries. Example with output: $ bridge fdb add 10:10:10:10:10:10 dev br0 blackhole $ bridge -d fdb show dev br0 10:10:10:10:10:10 vlan 1 blackhole master br0 permanent 10:10:10:10:10:10 blackhole master br0 permanent $ bridge -d -j -p fdb show dev br0 [ { "mac": "10:10:10:10:10:10", "vlan": 1, "flags": [ "blackhole" ], "master": "br0", "state": "permanent" },{ "mac": "10:10:10:10:10:10", "flags": [ "blackhole" ], "master": "br0", "state": "permanent" } ] Signed-off-by: Hans Schultz --- bridge/fdb.c | 13 ++++++++++++- man/man8/bridge.8 | 12 ++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/bridge/fdb.c b/bridge/fdb.c index f1f0a5bb..1c8c50a8 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -38,7 +38,7 @@ static void usage(void) fprintf(stderr, "Usage: bridge fdb { add | append | del | replace } ADDR dev DEV\n" " [ self ] [ master ] [ use ] [ router ] [ extern_learn ]\n" - " [ sticky ] [ local | static | dynamic ] [ vlan VID ]\n" + " [ sticky ] [ local | static | dynamic ] [ blackhole ] [ vlan VID ]\n" " { [ dst IPADDR ] [ port PORT] [ vni VNI ] | [ nhid NHID ] }\n" " [ via DEV ] [ src_vni VNI ]\n" " bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ]\n" @@ -116,6 +116,9 @@ static void fdb_print_flags(FILE *fp, unsigned int flags, __u8 ext_flags) if (flags & NTF_STICKY) print_string(PRINT_ANY, NULL, "%s ", "sticky"); + if (ext_flags & NTF_EXT_BLACKHOLE) + print_string(PRINT_ANY, NULL, "%s ", "blackhole"); + if (ext_flags & NTF_EXT_LOCKED) print_string(PRINT_ANY, NULL, "%s ", "locked"); @@ -421,6 +424,7 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv) char *endptr; short vid = -1; __u32 nhid = 0; + __u32 ext_flags = 0; while (argc > 0) { if (strcmp(*argv, "dev") == 0) { @@ -492,6 +496,8 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv) req.ndm.ndm_flags |= NTF_EXT_LEARNED; } else if (matches(*argv, "sticky") == 0) { req.ndm.ndm_flags |= NTF_STICKY; + } else if (matches(*argv, "blackhole") == 0) { + ext_flags |= NTF_EXT_BLACKHOLE; } else { if (strcmp(*argv, "to") == 0) NEXT_ARG(); @@ -534,6 +540,11 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv) if (dst_ok) addattr_l(&req.n, sizeof(req), NDA_DST, &dst.data, dst.bytelen); + if (ext_flags && + addattr_l(&req.n, sizeof(req), NDA_FLAGS_EXT, &ext_flags, + sizeof(ext_flags)) < 0) + return -1; + if (vid >= 0) addattr16(&req.n, sizeof(req), NDA_VLAN, vid); if (nhid > 0) diff --git a/man/man8/bridge.8 b/man/man8/bridge.8 index f4f1d807..0119a2a9 100644 --- a/man/man8/bridge.8 +++ b/man/man8/bridge.8 @@ -85,6 +85,13 @@ bridge \- show / manipulate bridge addresses and devices .B nhid .IR NHID " } " +.ti -8 +.BR "bridge fdb" " { " add " | " del " } " +.I LLADR +.B dev +.IR BRDEV " [ " +.BR self " ] [ " local " ] [ " blackhole " ] " + .ti -8 .BR "bridge fdb" " [ [ " show " ] [ " .B br @@ -701,6 +708,11 @@ controller learnt dynamic entry. Kernel will not age such an entry. - this entry will not change its port due to learning. .sp +.B blackhole +- this entry will silently discard all matching packets. The entry must +be added as a local permanent entry. +.sp + .in -8 The next command line parameters apply only when the specified device