From patchwork Thu Nov 22 04:29:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1001533 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="Himydgvr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 430mgc2ldbz9sC7 for ; Thu, 22 Nov 2018 15:29:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389375AbeKVPHQ (ORCPT ); Thu, 22 Nov 2018 10:07:16 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39029 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389323AbeKVPHP (ORCPT ); Thu, 22 Nov 2018 10:07:15 -0500 Received: by mail-wr1-f66.google.com with SMTP id v8so656923wrq.6 for ; Wed, 21 Nov 2018 20:29:41 -0800 (PST) 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=BPXOkZ0JV/Q+w6Sg5kbtEDOtggJHQiPc7K2+eBclq6Q=; b=Himydgvr7zodOMgnbpmYXILCMTfdj5k7mPRx6feZRb3MTeSuIiV4kc5VqafXLDGeTJ aZfWj5Qm9PJCWt+Cec8l391i8F4puxvIxKzFeNTBjvyaVQYE5XywtWhtsxfrM/dCwWrT FMYw5v2SiGelJAqZ7TbMiu0V8Z2XG24x+cDiQ= 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=BPXOkZ0JV/Q+w6Sg5kbtEDOtggJHQiPc7K2+eBclq6Q=; b=tlDaN+LS7tXV166nte/0/IxKJe1MoIMyYggAJHhHG6q/+vM1DMZpzpWgAQiPMqAPC4 qy1g0VUdfHVzXMIE7XelbKBlNiGSsrfHXlI/vO1F007YQxbN2jEKXq4waKnf1LcGTFBe KqJ/XJhIDsm1ze2kYt3Nqc33azMu0HiNpm5XrCyHM69A6riLOdzM0JI41rmbtzNWadqc I1orQJKMUasjJ95B6bjoGNB3sNOXU5m61o/yE6Fc7/k6oToDQKo179+DzpGAkdZLUyAU PyS1qxeVN/QaID6KtwjO3C+jXoHZmirtvAtQmL6iU2bC2iWltmnZZKmAIGYCBHlUtSHI jc8w== X-Gm-Message-State: AA+aEWaCHhW05o+EtUug10FHVlygYYG1SQo3f0VyJ8cENgRPH2Mss0Xh zrJXJofAG81p2Q6K2xwkMEGonSWFhQA= X-Google-Smtp-Source: AFSGD/UU90Y0thW6dlPLYn9e0GmDO2d3U8m05iF0lV1E7u1R++qciwFysb+a8ph9Hi8DsLZUG8HoMw== X-Received: by 2002:adf:e383:: with SMTP id e3mr7983356wrm.31.1542860980101; Wed, 21 Nov 2018 20:29:40 -0800 (PST) Received: from localhost.localdomain (nikaleksandrov-1-pt.tunnel.tserv6.fra1.ipv6.he.net. [2001:470:1f0a:1832::2]) by smtp.gmail.com with ESMTPSA id v5sm8845368wrr.11.2018.11.21.20.29.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Nov 2018 20:29:39 -0800 (PST) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, andrew@lunn.ch, davem@davemloft.net, bridge@lists.linux-foundation.org, Nikolay Aleksandrov Subject: [PATCH net-next 2/2] net: bridge: add no_linklocal_learn bool option Date: Thu, 22 Nov 2018 06:29:25 +0200 Message-Id: <20181122042925.8878-3-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181122042925.8878-1-nikolay@cumulusnetworks.com> References: <20181122042925.8878-1-nikolay@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use the new boolopt API to add an option which disables learning from link-local packets. The default is kept as before and learning is enabled. This is a simple map from a boolopt bit to a bridge private flag that is tested before learning. Signed-off-by: Nikolay Aleksandrov --- include/uapi/linux/if_bridge.h | 3 +++ net/bridge/br.c | 10 +++++++--- net/bridge/br_input.c | 4 +++- net/bridge/br_private.h | 1 + net/bridge/br_sysfs_br.c | 22 ++++++++++++++++++++++ 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h index 6dc02c03bdf8..773e476a8e54 100644 --- a/include/uapi/linux/if_bridge.h +++ b/include/uapi/linux/if_bridge.h @@ -294,10 +294,13 @@ struct br_mcast_stats { }; /* bridge boolean options + * BR_BOOLOPT_NO_LL_LEARN - disable learning from link-local packets + * * IMPORTANT: if adding a new option do not forget to handle * it in br_boolopt_toggle/get and bridge sysfs */ enum br_boolopt_id { + BR_BOOLOPT_NO_LL_LEARN, BR_BOOLOPT_MAX }; diff --git a/net/bridge/br.c b/net/bridge/br.c index 290b0adbf6d6..5b78a6385bd6 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -189,6 +189,10 @@ int br_boolopt_toggle(struct net_bridge *br, enum br_boolopt_id opt, bool on) int err = -ENOENT; switch (opt) { + case BR_BOOLOPT_NO_LL_LEARN: + err = 0; + br_opt_toggle(br, BROPT_NO_LL_LEARN, on); + break; default: break; } @@ -198,14 +202,14 @@ int br_boolopt_toggle(struct net_bridge *br, enum br_boolopt_id opt, bool on) int br_boolopt_get(const struct net_bridge *br, enum br_boolopt_id opt) { - int optval = 0; - switch (opt) { + case BR_BOOLOPT_NO_LL_LEARN: + return br_opt_get(br, BROPT_NO_LL_LEARN); default: break; } - return optval; + return 0; } int br_boolopt_multi_toggle(struct net_bridge *br, diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 3ddca11f44c2..5ea7e56119c1 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -188,7 +188,9 @@ static void __br_handle_local_finish(struct sk_buff *skb) u16 vid = 0; /* check if vlan is allowed, to avoid spoofing */ - if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid)) + if ((p->flags & BR_LEARNING) && + !br_opt_get(p->br, BROPT_NO_LL_LEARN) && + br_should_learn(p, skb, &vid)) br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false); } diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 0f051730ed4f..390848acff08 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -328,6 +328,7 @@ enum net_bridge_opts { BROPT_NEIGH_SUPPRESS_ENABLED, BROPT_MTU_SET_BY_USER, BROPT_VLAN_STATS_PER_PORT, + BROPT_NO_LL_LEARN, }; struct net_bridge { diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index 60182bef6341..5a03033ccd27 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c @@ -328,6 +328,27 @@ static ssize_t flush_store(struct device *d, } static DEVICE_ATTR_WO(flush); +static ssize_t no_linklocal_learn_show(struct device *d, + struct device_attribute *attr, + char *buf) +{ + struct net_bridge *br = to_bridge(d); + return sprintf(buf, "%d\n", br_boolopt_get(br, BR_BOOLOPT_NO_LL_LEARN)); +} + +static int set_no_linklocal_learn(struct net_bridge *br, unsigned long val) +{ + return br_boolopt_toggle(br, BR_BOOLOPT_NO_LL_LEARN, !!val); +} + +static ssize_t no_linklocal_learn_store(struct device *d, + struct device_attribute *attr, + const char *buf, size_t len) +{ + return store_bridge_parm(d, buf, len, set_no_linklocal_learn); +} +static DEVICE_ATTR_RW(no_linklocal_learn); + #ifdef CONFIG_BRIDGE_IGMP_SNOOPING static ssize_t multicast_router_show(struct device *d, struct device_attribute *attr, char *buf) @@ -841,6 +862,7 @@ static struct attribute *bridge_attrs[] = { &dev_attr_gc_timer.attr, &dev_attr_group_addr.attr, &dev_attr_flush.attr, + &dev_attr_no_linklocal_learn.attr, #ifdef CONFIG_BRIDGE_IGMP_SNOOPING &dev_attr_multicast_router.attr, &dev_attr_multicast_snooping.attr,