bridge: fdb: support match on destination VNI in flush command

Extend "fdb flush" command to match fdb entries with a specific destination
VNI.

Example:
$ bridge fdb flush dev vx10 vni 1000
This will flush all fdb entries pointing to vx10 with destination VNI 1000.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/bridge/fdb.c b/bridge/fdb.c
index 22a869222f099a0bcd0093f72c225af61aabb2ef..16cd7660f25c6e82750c9eccf8147375a22ea882 100644 (file)
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -46,7 +46,7 @@ static void usage(void)
                "       bridge fdb get [ to ] LLADDR [ br BRDEV ] { brport | dev } DEV\n"
                "              [ vlan VID ] [ vni VNI ] [ self ] [ master ] [ dynamic ]\n"
                "       bridge fdb flush dev DEV [ brport DEV ] [ vlan VID ] [ src_vni VNI ]\n"
-               "              [ nhid NHID ] [ self ] [ master ]\n"
+               "              [ nhid NHID ] [ vni VNI ] [ self ] [ master ]\n"
                "              [ [no]permanent | [no]static | [no]dynamic ]\n"
                "              [ [no]added_by_user ] [ [no]extern_learn ] [ [no]sticky ]\n"
                "              [ [no]offloaded ]\n");
@@ -702,6 +702,7 @@ static int fdb_flush(int argc, char **argv)
        unsigned short ndm_flags = 0;
        unsigned short ndm_state = 0;
        unsigned long src_vni = ~0;
+       unsigned long vni = ~0;
        __u32 nhid = 0;
        char *endptr;
 
@@ -775,6 +776,12 @@ static int fdb_flush(int argc, char **argv)
                        NEXT_ARG();
                        if (get_u32(&nhid, *argv, 0))
                                invarg("\"nid\" value is invalid\n", *argv);
+               } else if (strcmp(*argv, "vni") == 0) {
+                       NEXT_ARG();
+                       vni = strtoul(*argv, &endptr, 0);
+                       if ((endptr && *endptr) ||
+                           (vni >> 24) || vni == ULONG_MAX)
+                               invarg("invalid VNI\n", *argv);
                } else if (strcmp(*argv, "help") == 0) {
                        NEXT_ARG();
                } else {
@@ -825,6 +832,8 @@ static int fdb_flush(int argc, char **argv)
                addattr32(&req.n, sizeof(req), NDA_SRC_VNI, src_vni);
        if (nhid > 0)
                addattr32(&req.n, sizeof(req), NDA_NH_ID, nhid);
+       if (vni != ~0)
+               addattr32(&req.n, sizeof(req), NDA_VNI, vni);
        if (ndm_flags_mask)
                addattr8(&req.n, sizeof(req), NDA_NDM_FLAGS_MASK,
                         ndm_flags_mask);

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index 254b2fe91cb9cd426b8dbf556278ba06b0afe831..9341c77b3544d7ce219cd3bfdbc2c332daba6b7d 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -132,6 +132,8 @@ bridge \- show / manipulate bridge addresses and devices
 .IR VNI " ] [ "
 .B nhid
 .IR NHID " ] ["
+.B vni
+.IR VNI " ] [ "
 .BR self " ] [ " master " ] [ "
 .BR [no]permanent " | " [no]static " | " [no]dynamic " ] [ "
 .BR [no]added_by_user " ] [ " [no]extern_learn " ] [ "
@@ -907,6 +909,12 @@ device is a VXLAN type device.
 the ECMP nexthop group for the operation. Match forwarding table entries only
 with the specified NHID. Valid if the referenced device is a VXLAN type device.
 
+.TP
+.BI vni " VNI"
+the VXLAN VNI Network Identifier (or VXLAN Segment ID) for the operation. Match
+forwarding table entries only with the specified VNI. Valid if the referenced
+device is a VXLAN type device.
+
 .TP
 .B self
 the operation is fulfilled directly by the driver for the specified network