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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE248C388F3 for ; Tue, 1 Oct 2019 04:53:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A8BF62168B for ; Tue, 1 Oct 2019 04:53:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="Na0CG0oD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727946AbfJAEwa (ORCPT ); Tue, 1 Oct 2019 00:52:30 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38621 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725535AbfJAEw3 (ORCPT ); Tue, 1 Oct 2019 00:52:29 -0400 Received: by mail-pg1-f195.google.com with SMTP id x10so8755014pgi.5 for ; Mon, 30 Sep 2019 21:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cpwKP390DskPD2udm9AW5vVx4Jswx+be0mvwOdA78G8=; b=Na0CG0oDIT9TJD+8U31qo25euxTnocA025xZELKMYljlKHeE+inNnuHeOZcq4NHX4U tgzwUZFJ8ENzNnF+Hj5YbKr9Q3wNDJzSeE9tulw7HoPQDnxnX86EMgOpCigZQGt6K3+Z A7ZLxbJzee+B4AoCsqIG5tYAXb3HVhoGwAEO8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cpwKP390DskPD2udm9AW5vVx4Jswx+be0mvwOdA78G8=; b=fHKhbTL39yQVQxL72tiMfTbnYaNol6612JNI14CcZ/EyjfqJZc6vK9zLfULU+ii6HJ lzwmUOjNa0PszsuQpSIoGmmUvjI22PLirwUDAbh3zHK7RHP/x/bANHnM04LcWvx06lE4 JmFSfEgPQpIgMfr2U2CcX8URICdLB1SJ9hDllGmhGGDT2s0vTNhrvNKD/5rpON1fh9Ge +aCT4izhbRlLGaAxpJp0MpJnzYIDdLKmc1eiiI7Eb6F+zemHlbP0VzwTBtZvzjQ7+tHA t7CMr+F+dwFg4tIKs974NrXpwjPGwxCJjIuJqnAQBiQ7tH11GeTxYmzz66p0FopMfy4X HhOQ== X-Gm-Message-State: APjAAAUC3rympVZNZv77ez/9giFdHFgb6OBzLeL4JQZXDxub++tuRap7 usZ34XSQBy9ziN1apqGFgULDTw== X-Google-Smtp-Source: APXvYqycxZQZuYdD97ZLCGrHggCs3hAfXQAPU+r7uvPXzIhvdci5IEfiaL6jCM52jFEcnZDfL4+LVQ== X-Received: by 2002:a65:6799:: with SMTP id e25mr29316022pgr.271.1569905548988; Mon, 30 Sep 2019 21:52:28 -0700 (PDT) Received: from monster-08.mvlab.cumulusnetworks.com. (fw.cumulusnetworks.com. [216.129.126.126]) by smtp.googlemail.com with ESMTPSA id h66sm1896638pjb.0.2019.09.30.21.52.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Sep 2019 21:52:28 -0700 (PDT) From: Roopa Prabhu X-Google-Original-From: Roopa Prabhu To: dsahern@gmail.com Cc: netdev@vger.kernel.org, ivecera@redhat.com, nikolay@cumulusnetworks.com, stephen@networkplumber.org Subject: [PATCH iproute2 net-next v3 1/2] bridge: fdb get support Date: Mon, 30 Sep 2019 21:52:22 -0700 Message-Id: <1569905543-33478-2-git-send-email-roopa@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1569905543-33478-1-git-send-email-roopa@cumulusnetworks.com> References: <1569905543-33478-1-git-send-email-roopa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roopa Prabhu This patch adds support to lookup a bridge fdb entry using recently added support in the kernel using RTM_GETNEIGH (and AF_BRIDGE family). example: $bridge fdb get 02:02:00:00:00:03 dev test-dummy0 vlan 1002 02:02:00:00:00:03 dev test-dummy0 vlan 1002 master bridge Signed-off-by: Roopa Prabhu Tested-by: Ivan Vecera --- bridge/fdb.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++- man/man8/bridge.8 | 40 +++++++++++++++++++ 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/bridge/fdb.c b/bridge/fdb.c index 941ce2d..710dfc9 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -40,7 +40,9 @@ static void usage(void) " [ sticky ] [ local | static | dynamic ] [ dst IPADDR ]\n" " [ vlan VID ] [ port PORT] [ vni VNI ] [ via DEV ]\n" " [ src_vni VNI ]\n" - " bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ] [ state STATE ] ]\n"); + " bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ] [ state STATE ] ]\n" + " bridge fdb get ADDR [ br BRDEV ] { brport |dev } DEV [ vlan VID ]\n" + " [ vni VNI ]\n"); exit(-1); } @@ -518,6 +520,113 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv) return 0; } +static int fdb_get(int argc, char **argv) +{ + struct { + struct nlmsghdr n; + struct ndmsg ndm; + char buf[1024]; + } req = { + .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)), + .n.nlmsg_flags = NLM_F_REQUEST, + .n.nlmsg_type = RTM_GETNEIGH, + .ndm.ndm_family = AF_BRIDGE, + }; + char *d = NULL, *br = NULL; + struct nlmsghdr *answer; + unsigned long vni = ~0; + char abuf[ETH_ALEN]; + int br_ifindex = 0; + char *addr = NULL; + short vlan = -1; + char *endptr; + + while (argc > 0) { + if ((strcmp(*argv, "brport") == 0) || strcmp(*argv, "dev") == 0) { + NEXT_ARG(); + d = *argv; + } else if (strcmp(*argv, "br") == 0) { + NEXT_ARG(); + br = *argv; + } else if (strcmp(*argv, "dev") == 0) { + NEXT_ARG(); + d = *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, "self") == 0) { + req.ndm.ndm_flags |= NTF_SELF; + } else if (matches(*argv, "master") == 0) { + req.ndm.ndm_flags |= NTF_MASTER; + } else if (matches(*argv, "vlan") == 0) { + if (vlan >= 0) + duparg2("vlan", *argv); + NEXT_ARG(); + vlan = atoi(*argv); + } else { + if (strcmp(*argv, "to") == 0) + NEXT_ARG(); + + if (matches(*argv, "help") == 0) + usage(); + if (addr) + duparg2("to", *argv); + addr = *argv; + } + argc--; argv++; + } + + if ((d == NULL && br == NULL) || addr == NULL) { + fprintf(stderr, "Device or master and address are required arguments.\n"); + return -1; + } + + if (sscanf(addr, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", + abuf, abuf+1, abuf+2, + abuf+3, abuf+4, abuf+5) != 6) { + fprintf(stderr, "Invalid mac address %s\n", addr); + return -1; + } + + addattr_l(&req.n, sizeof(req), NDA_LLADDR, abuf, ETH_ALEN); + + if (vlan >= 0) + addattr16(&req.n, sizeof(req), NDA_VLAN, vlan); + + if (vni != ~0) + addattr32(&req.n, sizeof(req), NDA_VNI, vni); + + if (d) { + req.ndm.ndm_ifindex = ll_name_to_index(d); + if (!req.ndm.ndm_ifindex) { + fprintf(stderr, "Cannot find device \"%s\"\n", d); + return -1; + } + } + + if (br) { + br_ifindex = ll_name_to_index(br); + if (!br_ifindex) { + fprintf(stderr, "Cannot find bridge device \"%s\"\n", br); + return -1; + } + addattr32(&req.n, sizeof(req), NDA_MASTER, br_ifindex); + } + + if (rtnl_talk(&rth, &req.n, &answer) < 0) + return -2; + + if (print_fdb(answer, stdout) < 0) { + fprintf(stderr, "An error :-)\n"); + return -1; + } + + return 0; +} + int do_fdb(int argc, char **argv) { ll_init_map(&rth); @@ -531,6 +640,8 @@ int do_fdb(int argc, char **argv) return fdb_modify(RTM_NEWNEIGH, NLM_F_CREATE|NLM_F_REPLACE, argc-1, argv+1); if (matches(*argv, "delete") == 0) return fdb_modify(RTM_DELNEIGH, 0, argc-1, argv+1); + if (matches(*argv, "get") == 0) + return fdb_get(argc-1, argv+1); if (matches(*argv, "show") == 0 || matches(*argv, "lst") == 0 || matches(*argv, "list") == 0) diff --git a/man/man8/bridge.8 b/man/man8/bridge.8 index bb4fb52..10f6cf0 100644 --- a/man/man8/bridge.8 +++ b/man/man8/bridge.8 @@ -93,6 +93,17 @@ bridge \- show / manipulate bridge addresses and devices .IR STATE " ]" .ti -8 +.B bridge fdb get +.I LLADDR " [ " +.B dev +.IR DEV " ] [ " +.B br +.IR BRDEV " ] [ " +.B vlan +.IR VID " ] [" +.BR self " ] [ " master " ]" + +.ti -8 .BR "bridge mdb" " { " add " | " del " } " .B dev .IR DEV @@ -550,6 +561,35 @@ With the option, the command becomes verbose. It prints out the last updated and last used time for each entry. +.SS bridge fdb get - get bridge forwarding entry. + +lookup a bridge forwarding table entry. + +.TP +.BI "LLADDR" +the Ethernet MAC address. + +.TP +.BI dev " DEV" +the interface to which this address is associated. + +.TP +.BI brport " DEV" +the bridge port to which this address is associated. same as dev above. + +.TP +.BI br " DEV" +the bridge to which this address is associated. + +.TP +.B self +- the address is associated with the port drivers fdb. Usually hardware. + +.TP +.B master +- the address is associated with master devices fdb. Usually software (default). +.sp + .SH bridge mdb - multicast group database management .B mdb -- 2.1.4