From patchwork Sat Mar 29 05:29:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWFoZXNoIEJhbmRld2FyICjgpK7gpLngpYfgpLYg4KSs4KSC4KSh4KWH4KS14KS+4KSwKQ==?= X-Patchwork-Id: 334934 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 E295F1400AA for ; Sat, 29 Mar 2014 16:29:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751648AbaC2F3O (ORCPT ); Sat, 29 Mar 2014 01:29:14 -0400 Received: from mail-pb0-f74.google.com ([209.85.160.74]:41100 "EHLO mail-pb0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751591AbaC2F3K (ORCPT ); Sat, 29 Mar 2014 01:29:10 -0400 Received: by mail-pb0-f74.google.com with SMTP id md12so763659pbc.3 for ; Fri, 28 Mar 2014 22:29:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=H4yXo99JSTRi1jtBNFK/lj2BR5dft50AbPKK8VfIjtg=; b=e7Vk56X/dlBC2gSuj5Y94L6BzSrWaCn/9dqFNDSpQiabQYQR2s+ew4ckMgMP/apjoN JDxmwO0pFrlIIv5Dx3ciBTuDhkSVsHlC+l3GRrzS5ev9EeINYI1pEypAmZj4ymTu+A85 vThuZvyLEojHxumI3Lvg6DC5wkrB2Z+C7ROxH18GUU+vNvY7FJl8kX46uK2Kbmd6YMcl mWbUJDR9XhZ0RRkd/I1TXFVZ4jYTwNsF5DENSaeyivxoywMRfQPFqadUa39mNio0Uy2h iqqWEcdg8dp7bbXgofacn1kupWJQezA6yMkJxcip48DTOWRYbFpcoE3x9MxyiSIWelGE 14wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=H4yXo99JSTRi1jtBNFK/lj2BR5dft50AbPKK8VfIjtg=; b=KrnDX3Prx0XrEL0509Lv/mdoZRDsqrrfF9qARAHPQk5aoS9+/kBEQyVvM7pLJxxaqt 9itVduKTD/yLiuJF5vn7sPZhD9e1L8baenbrOHRbYqDoNtxSqYBEyTT0XA7kYVaWhDLB u3gXseDWTzbItGDK5V/lw0m0mt1KS9/Xq4AbF03jzj8Glw7LKDlqE9IvX65gKO1Zf+fN rKmHpztgYbXLiA2eHzHV4B/ntG0KNliSpGZk40ZmP9yrd4SZOXz6usRuIUiRN5vg9VU1 wV+vcMwRUX2id7kc/v8Zq9fApnRq6wefQCM2bR6ixTqqh03wGTNcBguTeMBSBCVj2jGJ CYyA== X-Gm-Message-State: ALoCoQks50+zA9PDfOItnwjdCYGC/iyqwh9RIpIGDhwCi/dCvRL2vpvZkWVwk+jDd15F5EmbqDm8ZvTDAxN220YxoH8ca9vuHpkVGvj7LaPceKPdQmYFwWRHQSa8i4Mi4KEcot3bQ4nVeRrRYfDW7cTQReCt6PTlJzcgioDFuOJ5/nybHH9iP0DMW8C5nAy3NuwvlcPDHMhHzCA+h7w2CLtz5tHfQLJQ4Q== X-Received: by 10.66.221.137 with SMTP id qe9mr4961775pac.4.1396070949785; Fri, 28 Mar 2014 22:29:09 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id i30si1434033yhc.0.2014.03.28.22.29.09 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Mar 2014 22:29:09 -0700 (PDT) Received: from coldfire.mtv.corp.google.com (coldfire.mtv.corp.google.com [172.17.131.114]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 6803A31C1F3; Fri, 28 Mar 2014 22:29:09 -0700 (PDT) Received: by coldfire.mtv.corp.google.com (Postfix, from userid 109155) id 29AF1140F1D; Fri, 28 Mar 2014 22:29:09 -0700 (PDT) From: Mahesh Bandewar To: Jay Vosburgh , Veaceslav Falico , Andy Gospodarek , David Miller Cc: netdev , Mahesh Bandewar , Eric Dumazet , Maciej Zenczykowski Subject: [PATCH 4/5] bonding: Added bond_tlb_xmit() for tlb mode. Date: Fri, 28 Mar 2014 22:29:07 -0700 Message-Id: <1396070947-17721-1-git-send-email-maheshb@google.com> X-Mailer: git-send-email 1.9.1.423.g4596e3a Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Re-organized the xmit function for the lb mode separating tlb xmit from the alb mode. This will enable use of the hashing policies like 802.3ad mode. Also extended use of xmit-hash-policy to tlb mode. Now the tlb-mode defaults to BOND_XMIT_POLICY_LAYER2 if the xmit policy module parameter is not set (just like 802.3ad, or Xor mode). Signed-off-by: Mahesh Bandewar --- drivers/net/bonding/bond_alb.c | 25 +++++++++++++++++++++++++ drivers/net/bonding/bond_alb.h | 1 + drivers/net/bonding/bond_main.c | 6 ++++-- drivers/net/bonding/bond_options.c | 2 +- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 5cd36016c393..8b7426ce6182 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -1381,6 +1381,31 @@ out: return NETDEV_TX_OK; } +int bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev) +{ + struct bonding *bond = netdev_priv(bond_dev); + struct ethhdr *eth_data; + struct slave *tx_slave = NULL; + u32 hash_index = 0; + + skb_reset_mac_header(skb); + eth_data = eth_hdr(skb); + + /* Do not TX balance any multicast or broadcast */ + if (!is_multicast_ether_addr(eth_data->h_dest)) { + switch (ntohs(skb->protocol)) { + case ETH_P_IP: + case ETH_P_IPX: /* In case of IPX, it will falback to L2 hash */ + case ETH_P_IPV6: + hash_index = bond_xmit_hash(bond, skb); + tx_slave = tlb_choose_channel(bond, hash_index & 0xFF, skb->len); + break; + } + } + + return bond_do_alb_xmit(skb, bond, tx_slave); +} + int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) { struct bonding *bond = netdev_priv(bond_dev); diff --git a/drivers/net/bonding/bond_alb.h b/drivers/net/bonding/bond_alb.h index e09dd4bfafff..5fc76c01636c 100644 --- a/drivers/net/bonding/bond_alb.h +++ b/drivers/net/bonding/bond_alb.h @@ -175,6 +175,7 @@ void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave); void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char link); void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave); int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev); +int bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev); void bond_alb_monitor(struct work_struct *); int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr); void bond_alb_clear_vlan(struct bonding *bond, unsigned short vlan_id); diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index e4f062ddc23e..23e4073ec798 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3776,8 +3776,9 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev case BOND_MODE_8023AD: return bond_3ad_xmit_xor(skb, dev); case BOND_MODE_ALB: - case BOND_MODE_TLB: return bond_alb_xmit(skb, dev); + case BOND_MODE_TLB: + return bond_tlb_xmit(skb, dev); default: /* Should never happen, mode already checked */ pr_err("%s: Error: Unknown bonding mode %d\n", @@ -3998,7 +3999,8 @@ static int bond_check_params(struct bond_params *params) if (xmit_hash_policy) { if ((bond_mode != BOND_MODE_XOR) && - (bond_mode != BOND_MODE_8023AD)) { + (bond_mode != BOND_MODE_8023AD) && + (bond_mode != BOND_MODE_TLB)) { pr_info("xmit_hash_policy param is irrelevant in mode %s\n", bond_mode_name(bond_mode)); } else { diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index 724e30fa20b9..dc3893841752 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -199,7 +199,7 @@ static const struct bond_option bond_opts[] = { [BOND_OPT_XMIT_HASH] = { .id = BOND_OPT_XMIT_HASH, .name = "xmit_hash_policy", - .desc = "balance-xor and 802.3ad hashing method", + .desc = "balance-xor, 802.3ad, and tlb hashing method", .values = bond_xmit_hashtype_tbl, .set = bond_option_xmit_hash_policy_set },