From: Andy Gospodarek <andy@greyhouse•net>
To: Eric Dumazet <eric.dumazet@gmail•com>
Cc: Tom Herbert <therbert@google•com>,
David Miller <davem@davemloft•net>,
Linux Netdev List <netdev@vger•kernel.org>,
Jay Vosburgh <fubar@us•ibm.com>,
Andy Gospodarek <andy@greyhouse•net>
Subject: [PATCH net-next-2.6] fix bonding: allow arp_ip_targets on separate vlans to use arp validation
Date: Wed, 6 Jan 2010 17:56:37 -0500 [thread overview]
Message-ID: <20100106225637.GC6490@gospo.rdu.redhat.com> (raw)
In-Reply-To: <4B44FC2B.4090505@gmail.com>
On Wed, Jan 06, 2010 at 10:10:03PM +0100, Eric Dumazet wrote:
> Le 06/01/2010 19:38, Eric Dumazet a écrit :
> >
> > (net-next-2.6 doesnt work well on my bond/vlan setup, I suspect I need a bisection)
>
> David, I had to revert 1f3c8804acba841b5573b953f5560d2683d2db0d
> (bonding: allow arp_ip_targets on separate vlans to use arp validation)
>
> Or else, my vlan devices dont work (unfortunatly I dont have much time
> these days to debug the thing)
>
> My config :
>
> +---------+
> vlan.103 -----+ bond0 +--- eth1 (bnx2)
> | +
> vlan.825 -----+ +--- eth2 (tg3)
> +---------+
>
> $ cat /proc/net/bonding/bond0
> Ethernet Channel Bonding Driver: v3.6.0 (September 26, 2009)
>
> Bonding Mode: fault-tolerance (active-backup)
> Primary Slave: None
> Currently Active Slave: eth2
> MII Status: up
> MII Polling Interval (ms): 100
> Up Delay (ms): 0
> Down Delay (ms): 0
>
> Slave Interface: eth1 (bnx2)
> MII Status: down
> Link Failure Count: 1
> Permanent HW addr: 00:1e:0b:ec:d3:d2
>
> Slave Interface: eth2 (tg3)
> MII Status: up
> Link Failure Count: 0
> Permanent HW addr: 00:1e:0b:92:78:50
>
This patch fixes up a problem with found with commit
1f3c8804acba841b5573b953f5560d2683d2db0d. The original change
overloaded null_or_orig, but doing that prevented any packet handlers
that were not tied to a specific device (i.e. ptype->dev == NULL) from
ever receiving any frames.
The null_or_orig variable cannot be overloaded, and must be kept as NULL
to prevent the frame from being ignored by packet handlers designed to
accept frames on any interface.
Signed-off-by: Andy Gospodarek <andy@greyhouse•net>
---
dev.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index f9aa699..d9ab9be 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2430,6 +2430,7 @@ int netif_receive_skb(struct sk_buff *skb)
struct packet_type *ptype, *pt_prev;
struct net_device *orig_dev;
struct net_device *null_or_orig;
+ struct net_device *null_or_bond;
int ret = NET_RX_DROP;
__be16 type;
@@ -2500,21 +2501,19 @@ ncls:
* bonding interfaces still make their way to any base bonding
* device that may have registered for a specific ptype. The
* handler may have to adjust skb->dev and orig_dev.
- *
- * null_or_orig can be overloaded since it will not be set when
- * using VLANs on top of bonding. Putting it here prevents
- * disturbing the ptype_all handlers above.
*/
+ null_or_bond = NULL;
if ((skb->dev->priv_flags & IFF_802_1Q_VLAN) &&
(vlan_dev_real_dev(skb->dev)->priv_flags & IFF_BONDING)) {
- null_or_orig = vlan_dev_real_dev(skb->dev);
+ null_or_bond = vlan_dev_real_dev(skb->dev);
}
type = skb->protocol;
list_for_each_entry_rcu(ptype,
&ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {
if (ptype->type == type && (ptype->dev == null_or_orig ||
- ptype->dev == skb->dev || ptype->dev == orig_dev)) {
+ ptype->dev == skb->dev || ptype->dev == orig_dev ||
+ ptype->dev == null_or_bond)) {
if (pt_prev)
ret = deliver_skb(skb, pt_prev, orig_dev);
pt_prev = ptype;
next prev parent reply other threads:[~2010-01-06 22:56 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-20 23:28 [PATCH v4 1/1] rps: core implementation Tom Herbert
2009-11-20 23:39 ` David Miller
2009-11-20 23:50 ` Tom Herbert
2009-11-21 0:05 ` David Miller
2009-11-21 0:12 ` Tom Herbert
2009-11-21 0:40 ` Jarek Poplawski
2009-11-20 23:40 ` Stephen Hemminger
2009-11-20 23:53 ` Tom Herbert
2009-11-20 23:56 ` David Miller
2009-12-17 21:04 ` Tom Herbert
2010-01-06 1:32 ` Tom Herbert
2010-01-06 5:54 ` Eric Dumazet
2010-01-06 7:56 ` Tom Herbert
2010-01-06 18:38 ` Eric Dumazet
2010-01-06 21:10 ` [BUG net-next-2.6] Had to revert bonding: allow arp_ip_targets on separate vlans to use arp validation Eric Dumazet
2010-01-06 21:28 ` Jay Vosburgh
2010-01-06 21:34 ` Eric Dumazet
2010-01-06 21:38 ` David Miller
2010-01-06 21:45 ` Andy Gospodarek
2010-01-06 22:56 ` Andy Gospodarek [this message]
2010-01-06 23:53 ` [PATCH net-next-2.6] fix " Jay Vosburgh
2010-01-07 8:37 ` Eric Dumazet
2010-01-07 8:41 ` David Miller
2010-01-06 22:54 ` [PATCH v4 1/1] rps: core implementation Tom Herbert
2010-01-07 9:15 ` Eric Dumazet
2010-01-07 17:42 ` rps: some comments Eric Dumazet
2010-01-08 0:07 ` Tom Herbert
2010-01-08 6:27 ` Eric Dumazet
2010-01-11 6:25 ` [PATCH v4 1/1] rps: core implementation Tom Herbert
2010-01-11 9:00 ` Eric Dumazet
2010-01-14 4:40 ` David Miller
2009-11-20 23:42 ` Stephen Hemminger
2009-11-21 0:04 ` Tom Herbert
2009-11-21 8:07 ` Eric Dumazet
2009-11-21 9:03 ` Tom Herbert
2009-11-21 9:31 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100106225637.GC6490@gospo.rdu.redhat.com \
--to=andy@greyhouse$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=fubar@us$(echo .)ibm.com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=therbert@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox