From: Chris J Arges <chris.j.arges@canonical•com>
To: Chris J Arges <chris.j.arges@canonical•com>
Cc: Jay Vosburgh <fubar@us•ibm.com>,
Andy Gospodarek <andy@greyhouse•net>,
netdev@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: [PATCH v2] bonding: extend bond_arp_send_all to bridge devices
Date: Mon, 05 Nov 2012 15:28:15 -0600 [thread overview]
Message-ID: <50982F6F.2050600@canonical.com> (raw)
In-Reply-To: <1352146448-8921-1-git-send-email-chris.j.arges@canonical.com>
[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]
On 11/05/2012 02:14 PM, Chris J Arges wrote:
> ARP monitoring does not work when we have a network in the
> following configuration:
>
> eth0----+ +----bond0.100----br0-100---{+virtual machines
> | |
> +----bond0----+----br0---(fixed IP)->--{LAN arp_ip_target}
> | |
> eth1----+ +----bond0.200----br0-200---{+virtual machines
>
> This patch extends bond_arp_send_all to also check if a device
> is also in a bridge.
>
> This is related to the following issues:
> http://launchpad.net/bugs/736226
> http://bugzilla.kernel.org/show_bug.cgi?id=31822
>
> Thanks to help from Andy Gospodarek.
>
> Signed-off-by: Chris J Arges <chris.j.arges@canonical•com>
> ---
> drivers/net/bonding/bond_main.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 6c284d1..f11a2e1 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -2670,6 +2670,19 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
> continue;
> }
>
> + /*
> + * Check if the target is part of a bridge.
> + */
> + if (rt->dst.dev->priv_flags & IFF_EBRIDGE) {
> + printk("bondbridge: %s->priv_flags has IFF_EBRIDGE\n", rt->dst.dev->name);
> +
> + /* Send ARP request */
> + bond_arp_send(slave->dev, ARPOP_REQUEST, targets[i], bond->master_ip, 0);
> + printk("bondbridge: bond_arp_send %d\n", 0);
> +
> + continue;
> + }
> +
> if (net_ratelimit()) {
> pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",
> bond->dev->name, &targets[i],
>
[-- Attachment #2: 0001-bonding-extend-bond_arp_send_all-to-bridge-devices.patch --]
[-- Type: text/x-patch, Size: 1703 bytes --]
>From 859cbc745670491f716663f6309df7674b38bb33 Mon Sep 17 00:00:00 2001
From: Chris J Arges <chris.j.arges@canonical•com>
Date: Thu, 6 Sep 2012 14:17:40 -0500
Subject: [PATCH v2] bonding: extend bond_arp_send_all to bridge devices
ARP monitoring does not work when we have a network in the
following configuration:
eth0----+ +----bond0.100----br0-100---{+virtual machines
| |
+----bond0----+----br0---(fixed IP)->--{LAN arp_ip_target}
| |
eth1----+ +----bond0.200----br0-200---{+virtual machines
This patch extends bond_arp_send_all to also check if a device
is also in a bridge.
This is related to the following issues:
http://launchpad.net/bugs/736226
http://bugzilla.kernel.org/show_bug.cgi?id=31822
Thanks to help from Andy Gospodarek.
Signed-off-by: Chris J Arges <chris.j.arges@canonical•com>
---
drivers/net/bonding/bond_main.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b2530b0..cb791f6 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2708,6 +2708,18 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
continue;
}
+ /*
+ * Check if the target is part of a bridge.
+ */
+ if (rt->dst.dev->priv_flags & IFF_EBRIDGE) {
+ /* Confirm addr is part of the bridge */
+ addr = bond_confirm_addr(rt->dst.dev, targets[i], 0);
+
+ /* Send ARP request */
+ bond_arp_send(slave->dev, ARPOP_REQUEST, targets[i], addr, 0);
+ continue;
+ }
+
if (net_ratelimit()) {
pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",
bond->dev->name, &targets[i],
--
1.7.9.5
prev parent reply other threads:[~2012-11-05 21:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-05 20:14 [PATCH] bonding: extend bond_arp_send_all to bridge devices Chris J Arges
2012-11-05 21:28 ` Chris J Arges [this message]
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=50982F6F.2050600@canonical.com \
--to=chris.j.arges@canonical$(echo .)com \
--cc=andy@greyhouse$(echo .)net \
--cc=fubar@us$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/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