From patchwork Wed Sep 26 14:01:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 975145 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="gjcSMI9o"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42L03d6CDkz9s4s for ; Thu, 27 Sep 2018 00:01:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727570AbeIZUOh (ORCPT ); Wed, 26 Sep 2018 16:14:37 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:40874 "EHLO mail-wm1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727484AbeIZUOg (ORCPT ); Wed, 26 Sep 2018 16:14:36 -0400 Received: by mail-wm1-f54.google.com with SMTP id o2-v6so2462948wmh.5 for ; Wed, 26 Sep 2018 07:01:28 -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=264JYdCxBOloVGEFMCTTrVh7QU/1mydZxM+myMH92wQ=; b=gjcSMI9op4qc/00JOoh/5LHljaZJ+W8PG1nEBdgabOiCeHbaUOhEWmeixPQEnWkSJe S1vlHwTuyNKkwNq0VMJim+RwRmBZvOE7t9gsPsv7w5e91idi4QrAZeSFHZ3Vi6DXFCCB AHQShNroNOPBVwvgrksXA0n2IFMvTLIPOssGY= 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=264JYdCxBOloVGEFMCTTrVh7QU/1mydZxM+myMH92wQ=; b=bptn14cLK0fxe/uNGBPnYYgPF6wjWCXEwzRa8luBk8HB2PpCf3XmDCzuSZzLCnZwOe 4VYu+quGlRp28Ef4PfTQ50w9wjd0Fp9+ebYRZOeGdwvfUaujonjRgEXOQLeItTMmj+Iu hKzIessh2T7Kh62BAtq3Gyhf8t0zVKtRvA509/B2iNaieCYSt5gieXuHqqhNeoRA2Zfw uyYRo87LxAad6rZh0uDZ62K80DfqRtxBNJI8+JiI6MWg/4eRW80Knn+LElCpcDVf5gLs 4JCHrvOpTSOpJoeFSMy51070KDudofPYAokBjzWD05Yb00s6gSRj9g9qwKnvhY6wLGW6 m1fw== X-Gm-Message-State: ABuFfogWzsobF2eJBp6Q/cg/9t+gGlcYphtPkaLbZBiBsr3T6vninwVd 6qzXDqF5T6NtSnbaeavh/Mekw15K2W7W/g== X-Google-Smtp-Source: ACcGV62pR6w8d71sM+El/pi0/8lOuRIjlZDJVjLlZnnUZuvIqZGDblE+7FhemPxxds0kdqeqB4VsPw== X-Received: by 2002:a1c:8291:: with SMTP id e139-v6mr4776897wmd.39.1537970487655; Wed, 26 Sep 2018 07:01:27 -0700 (PDT) Received: from kofa.mediahub-bg.com ([93.152.141.58]) by smtp.gmail.com with ESMTPSA id i125-v6sm7544076wmd.23.2018.09.26.07.01.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Sep 2018 07:01:26 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, davem@davemloft.net, stephen@networkplumber.org, bridge@lists.linux-foundation.org, idosch@idosch.org, Nikolay Aleksandrov Subject: [PATCH net-next v2 7/9] net: bridge: convert neigh_suppress_enabled option to a bit Date: Wed, 26 Sep 2018 17:01:05 +0300 Message-Id: <20180926140107.10218-8-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180926140107.10218-1-nikolay@cumulusnetworks.com> References: <20180926140107.10218-1-nikolay@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Convert the neigh_suppress_enabled option to a bit. Signed-off-by: Nikolay Aleksandrov Reviewed-by: Stephen Hemminger --- net/bridge/br_arp_nd_proxy.c | 13 ++++++++----- net/bridge/br_device.c | 4 ++-- net/bridge/br_input.c | 2 +- net/bridge/br_private.h | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/net/bridge/br_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c index d42e3904b498..6b78e6351719 100644 --- a/net/bridge/br_arp_nd_proxy.c +++ b/net/bridge/br_arp_nd_proxy.c @@ -39,7 +39,7 @@ void br_recalculate_neigh_suppress_enabled(struct net_bridge *br) } } - br->neigh_suppress_enabled = neigh_suppress; + br_opt_toggle(br, BROPT_NEIGH_SUPPRESS_ENABLED, neigh_suppress); } #if IS_ENABLED(CONFIG_INET) @@ -155,7 +155,7 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br, ipv4_is_multicast(tip)) return; - if (br->neigh_suppress_enabled) { + if (br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED)) { if (p && (p->flags & BR_NEIGH_SUPPRESS)) return; if (ipv4_is_zeronet(sip) || sip == tip) { @@ -175,7 +175,8 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br, return; } - if (br->neigh_suppress_enabled && br_is_local_ip(vlandev, tip)) { + if (br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) && + br_is_local_ip(vlandev, tip)) { /* its our local ip, so don't proxy reply * and don't forward to neigh suppress ports */ @@ -213,7 +214,8 @@ void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br, /* If we have replied or as long as we know the * mac, indicate to arp replied */ - if (replied || br->neigh_suppress_enabled) + if (replied || + br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED)) BR_INPUT_SKB_CB(skb)->proxyarp_replied = true; } @@ -460,7 +462,8 @@ void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br, * mac, indicate to NEIGH_SUPPRESS ports that we * have replied */ - if (replied || br->neigh_suppress_enabled) + if (replied || + br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED)) BR_INPUT_SKB_CB(skb)->proxyarp_replied = true; } neigh_release(n); diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index e682a668ce57..a0afdca73d8f 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -67,11 +67,11 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) if (IS_ENABLED(CONFIG_INET) && (eth->h_proto == htons(ETH_P_ARP) || eth->h_proto == htons(ETH_P_RARP)) && - br->neigh_suppress_enabled) { + br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED)) { br_do_proxy_suppress_arp(skb, br, vid, NULL); } else if (IS_ENABLED(CONFIG_IPV6) && skb->protocol == htons(ETH_P_IPV6) && - br->neigh_suppress_enabled && + br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) && pskb_may_pull(skb, sizeof(struct ipv6hdr) + sizeof(struct nd_msg)) && ipv6_hdr(skb)->nexthdr == IPPROTO_ICMPV6) { diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 72074276c088..3ddca11f44c2 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -122,7 +122,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb br_do_proxy_suppress_arp(skb, br, vid, p); } else if (IS_ENABLED(CONFIG_IPV6) && skb->protocol == htons(ETH_P_IPV6) && - br->neigh_suppress_enabled && + br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) && pskb_may_pull(skb, sizeof(struct ipv6hdr) + sizeof(struct nd_msg)) && ipv6_hdr(skb)->nexthdr == IPPROTO_ICMPV6) { diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index e6bdb107fe04..6bdcc701bc71 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -318,6 +318,7 @@ enum net_bridge_opts { BROPT_MULTICAST_QUERY_USE_IFADDR, BROPT_MULTICAST_STATS_ENABLED, BROPT_HAS_IPV6_ADDR, + BROPT_NEIGH_SUPPRESS_ENABLED, }; struct net_bridge { @@ -414,7 +415,6 @@ struct net_bridge { #ifdef CONFIG_NET_SWITCHDEV int offload_fwd_mark; #endif - bool neigh_suppress_enabled; bool mtu_set_by_user; struct hlist_head fdb_list; };