From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Mon, 4 Nov 2002 21:31:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Mon, 4 Nov 2002 21:31:58 -0500 Received: from inet-mail4.oracle.com ([148.87.2.204]:42195 "EHLO inet-mail4.oracle.com") by vger.kernel.org with ESMTP id ; Mon, 4 Nov 2002 21:31:43 -0500 Message-ID: <8121326.1036463658571.JavaMail.nobody@web55.us.oracle.com> Date: Mon, 4 Nov 2002 18:34:18 -0800 (PST) From: Bert Barbe To: marcelo@oracle.com, tosatti@oracle.com, marcelo@conectiva.com.br Subject: [PATCH 2.4.20-rc1} multiple arp_ip_targets in bonding module Cc: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Priority: 3 X-Mailer: Oracle Webmail Client Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Hi, I posted this patch some time ago for discussion but didnt see any response, so now I'd like to submit it for inclusion in the 2.4 kernel. As mentioned in the subject this patch has been based on 2.4.20-rc1 This is a simple patch for the bonding module that allows multiple arp_ip_targets . Having just one arp_ip_target would leave room for confusion when the reference node goes down leaving other nodes to think their interface is malfunctioning. You can also find this patch and the same for different kernel versions at http://www.enterprise.be TIA - regards, Bert -----------------------begin-cut-here---------------------- --- drivers/net/bonding.c-orig 2002-10-25 23:38:55.000000000 +0200 +++ drivers/net/bonding.c 2002-10-26 00:06:12.000000000 +0200 @@ -191,6 +191,9 @@ * - Fixed up bond_check_dev_link() (and callers): removed some magic * numbers, banished local MII_ defines, wrapped ioctl calls to * prevent EFAULT errors + * + * 2002/10/22 - Bert Barbe + * - Add support for multiple arp_ip_target */ #include @@ -238,9 +241,10 @@ #define BOND_LINK_ARP_INTERV 0 #endif +#define MAX_ARP_IP_TARGETS 16 static int arp_interval = BOND_LINK_ARP_INTERV; -static char *arp_ip_target = NULL; -static unsigned long arp_target = 0; +static char *arp_ip_target[MAX_ARP_IP_TARGETS] = { NULL, }; +static unsigned long arp_target[MAX_ARP_IP_TARGETS] = { 0, } ; static u32 my_ip = 0; char *arp_target_hw_addr = NULL; @@ -262,8 +266,8 @@ MODULE_PARM(mode, "i"); MODULE_PARM(arp_interval, "i"); MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds"); -MODULE_PARM(arp_ip_target, "s"); -MODULE_PARM_DESC(arp_ip_target, "arp target in n.n.n.n form"); +MODULE_PARM(arp_ip_target, "1-" __MODULE_STRING(MAX_ARP_IP_TARGETS) "s"); +MODULE_PARM_DESC(arp_ip_target, "arp target(s) in n.n.n.n form"); MODULE_PARM_DESC(mode, "Mode of operation : 0 for round robin, 1 for active-backup, 2 for xor"); MODULE_PARM(updelay, "i"); MODULE_PARM_DESC(updelay, "Delay before considering link up, in milliseconds"); @@ -1489,11 +1493,17 @@ } else { if ((jiffies - slave->dev->last_rx) <= the_delta_in_ticks) { - arp_send(ARPOP_REQUEST, ETH_P_ARP, - arp_target, slave->dev, - my_ip, arp_target_hw_addr, - slave->dev->dev_addr, - arp_target_hw_addr); + int i; + for ( i=0; + (idev, + my_ip, arp_target_hw_addr, + slave->dev->dev_addr, + arp_target_hw_addr); + } + } } } else @@ -1545,11 +1555,17 @@ the_delta_in_ticks) || ((jiffies - slave->dev->last_rx) >= the_delta_in_ticks) ) { - arp_send(ARPOP_REQUEST, ETH_P_ARP, - arp_target, slave->dev, - my_ip, arp_target_hw_addr, - slave->dev->dev_addr, - arp_target_hw_addr); + int i; + for ( i=0; + (idev, + my_ip, arp_target_hw_addr, + slave->dev->dev_addr, + arp_target_hw_addr); + } + } } @@ -1564,9 +1580,15 @@ read_unlock(&bond->ptrlock); slave = (slave_t *)bond; while ((slave = slave->prev) != (slave_t *)bond) { - arp_send(ARPOP_REQUEST, ETH_P_ARP, arp_target, - slave->dev, my_ip, arp_target_hw_addr, - slave->dev->dev_addr, arp_target_hw_addr); + int i; + for ( i=0; + (idev, my_ip, arp_target_hw_addr, + slave->dev->dev_addr, arp_target_hw_addr); + } + } } else { @@ -1980,6 +2002,7 @@ memcpy(&my_ip, the_ip, 4); } +#if 0 /* no hw adresses should be cached permanently ! */ /* if we are sending arp packets and don't know the target hw address, save it so we don't need to use a broadcast address */ @@ -1990,6 +2013,7 @@ arp_target_hw_addr = kmalloc(ETH_ALEN, GFP_KERNEL); memcpy(arp_target_hw_addr, eth_hdr->h_dest, ETH_ALEN); } +#endif read_lock_irqsave(&bond->lock, flags); @@ -2328,6 +2352,7 @@ { int no; int err; + int i; /* Find a name for this unit */ static struct net_device *dev_bond = NULL; @@ -2370,12 +2395,17 @@ arp_interval = BOND_LINK_ARP_INTERV; } - if (arp_ip_target) { + for (i=0 ; (i < MAX_ARP_IP_TARGETS) && arp_ip_target[i] ; i++ ) { /* TODO: check and log bad ip address */ - if (my_inet_aton(arp_ip_target, &arp_target) == 0) { + if (my_inet_aton(arp_ip_target[i], &arp_target[i]) == 0) arp_interval = 0; - } - } + else { + printk (KERN_INFO + "bonding: arp_ip_target[%d]=%s.\n", + i,arp_ip_target[i]); + } + } + for (no = 0; no < max_bonds; no++) { dev_bond->init = bond_init; -----------------------end---cut-here----------------------