From patchwork Wed May 14 15:09:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Yasevich X-Patchwork-Id: 348853 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8CEA614008B for ; Thu, 15 May 2014 01:09:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755717AbaENPJt (ORCPT ); Wed, 14 May 2014 11:09:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39894 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755638AbaENPJr (ORCPT ); Wed, 14 May 2014 11:09:47 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4EF9jm8000474 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 May 2014 11:09:45 -0400 Received: from vyasevic.redhat.com (vpn-49-116.rdu2.redhat.com [10.10.49.116]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s4EF9Uio029177; Wed, 14 May 2014 11:09:43 -0400 From: Vlad Yasevich To: netdev@vger.kernel.org Cc: bridge@lists.linux-foundation.org, shemminger@vyatta.com, mst@redhat.com, john.r.fastabend@intel.com, jhs@mojatatu.com, Vlad Yasevich Subject: [PATCH net-next 8/8] bridge: Automatically manage promisc mode when vlan filtering is on. Date: Wed, 14 May 2014 11:09:28 -0400 Message-Id: <1400080168-16625-9-git-send-email-vyasevic@redhat.com> In-Reply-To: <1400080168-16625-1-git-send-email-vyasevic@redhat.com> References: <1400080168-16625-1-git-send-email-vyasevic@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If the user doesn't enable vlan filtering, we have to place all bridge ports in promsic mode so that we retain the capability of of receiving tagged frames. When vlan filtering is enabled, the each port will be provided with necessary vlan configuration and would be able to receive tagged traffic without promiscuous mode set, thus allowing us to automatically turn promiscuity on or off depending on the configuration. Signed-off-by: Vlad Yasevich --- net/bridge/br_if.c | 12 ++++++++---- net/bridge/br_private.h | 9 +++++++++ net/bridge/br_vlan.c | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 7759144..a9bf8cc 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -131,12 +131,16 @@ static void br_port_clear_promisc(struct net_bridge_port *p) void br_manage_promisc(struct net_bridge *br) { struct net_bridge_port *p; + int set_all = false; + + /* If vlan filtering is disabled or bridge interface is placed + * into promiscuous mode, place all ports in promiscuous mode. + */ + if ((br->dev->flags & IFF_PROMISC) || !br_vlan_enabled(br)) + set_all = true; list_for_each_entry(p, &br->port_list, list) { - if (br->dev->flags & IFF_PROMISC) { - /* PROMISC flag has been turned on for the bridge - * itself. Turn on promisc on all ports. - */ + if (set_all) { br_port_set_promisc(p); } else { /* If the number of auto-ports is <= 1, then all other diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 9c1fda0..bda08e4 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -643,6 +643,10 @@ static inline u16 br_get_pvid(const struct net_port_vlans *v) return v->pvid ?: VLAN_N_VID; } +static inline int br_vlan_enabled(struct net_bridge *br) +{ + return br->vlan_enabled; +} #else static inline bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v, @@ -723,6 +727,11 @@ static inline u16 br_get_pvid(const struct net_port_vlans *v) { return VLAN_N_VID; /* Returns invalid vid */ } + +static inline int br_vlan_enabled(struct net_bridge *br); +{ + return 0; +} #endif /* br_netfilter.c */ diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 4a37161..24c5cc5 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -332,6 +332,7 @@ int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val) goto unlock; br->vlan_enabled = val; + br_manage_promisc(br); unlock: rtnl_unlock();