From patchwork Thu Aug 8 16:57:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veaceslav Falico X-Patchwork-Id: 265779 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 CA8BE2C00AC for ; Fri, 9 Aug 2013 02:58:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965406Ab3HHQ56 (ORCPT ); Thu, 8 Aug 2013 12:57:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34856 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965362Ab3HHQ54 (ORCPT ); Thu, 8 Aug 2013 12:57:56 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r78GvoOW018366 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2013 12:57:51 -0400 Received: from darkmag.usersys.redhat.com (dhcp-27-102.brq.redhat.com [10.34.27.102]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r78GveJG026737; Thu, 8 Aug 2013 12:57:49 -0400 From: Veaceslav Falico To: netdev@vger.kernel.org Cc: Veaceslav Falico , Jay Vosburgh , Andy Gospodarek Subject: [PATCH v2 net-next 5/6] bonding: convert bond_arp_send_all to use bond->dev->vlan_info Date: Thu, 8 Aug 2013 18:57:58 +0200 Message-Id: <1375981079-2936-6-git-send-email-vfalico@redhat.com> In-Reply-To: <1375981079-2936-1-git-send-email-vfalico@redhat.com> References: <1375981079-2936-1-git-send-email-vfalico@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org RFC -> v1: use the new __vlan_find_dev_next(), also release rcu_read_lock() only after we stop using the vlan_dev. v1 -> v2: no change. Instead of looping through bond->vlan_list, loop through bond->dev->vlan_info via __vlan_find_dev_next() under rcu_read_lock(). CC: Jay Vosburgh CC: Andy Gospodarek Signed-off-by: Veaceslav Falico --- drivers/net/bonding/bond_main.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index e52e2d5..f536d05 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2440,11 +2440,10 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, __be32 dest_ static void bond_arp_send_all(struct bonding *bond, struct slave *slave) { - int i, vlan_id; - __be32 *targets = bond->params.arp_targets; - struct vlan_entry *vlan; - struct net_device *vlan_dev = NULL; + struct net_device *vlan_dev; struct rtable *rt; + __be32 *targets = bond->params.arp_targets; + int i; for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) { __be32 addr; @@ -2486,28 +2485,26 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave) continue; } - vlan_id = 0; - list_for_each_entry(vlan, &bond->vlan_list, vlan_list) { - rcu_read_lock(); - vlan_dev = __vlan_find_dev_deep(bond->dev, - htons(ETH_P_8021Q), - vlan->vlan_id); - rcu_read_unlock(); + vlan_dev = NULL; + + rcu_read_lock(); + while ((vlan_dev = __vlan_find_dev_next(bond->dev, vlan_dev))) if (vlan_dev == rt->dst.dev) { - vlan_id = vlan->vlan_id; pr_debug("basa: vlan match on %s %d\n", - vlan_dev->name, vlan_id); + vlan_dev->name, + vlan_dev_vlan_id(vlan_dev)); break; } - } - if (vlan_id && vlan_dev) { + if (vlan_dev) { ip_rt_put(rt); addr = bond_confirm_addr(vlan_dev, targets[i], 0); bond_arp_send(slave->dev, ARPOP_REQUEST, targets[i], - addr, vlan_id); + addr, vlan_dev_vlan_id(vlan_dev)); + rcu_read_unlock(); continue; } + rcu_read_unlock(); if (net_ratelimit()) { pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",