git://git.onelab.eu / linux-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 84a5492)
Split bonding hashes patch.
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Mon, 22 Jun 2009 23:18:38 +0000 (23:18 +0000)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Mon, 22 Jun 2009 23:18:38 +0000 (23:18 +0000)
kernel-2.6.spec patch | blob | history
linux-2.6-720-bonding-layer23.patch [moved from linux-2.6-720-bonding-hashes.patch with 52% similarity] patch | blob | history
linux-2.6-721-bonding-layer3.patch [new file with mode: 0644] patch | blob
linux-2.6-722-bonding-rr.patch [new file with mode: 0644] patch | blob

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 64f04b1..86d09f1 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -191,7 +191,10 @@ Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
 Patch700: linux-2.6-700-fperm.patch
 Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
-Patch720: linux-2.6-720-bonding-hashes.patch
+# This one is a backport from usptream.
+Patch720: linux-2.6-720-bonding-layer23.patch
+Patch721: linux-2.6-721-bonding-layer3.patch
+Patch722: linux-2.6-722-bonding-rr.patch
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
diff --git a/linux-2.6-720-bonding-hashes.patch b/linux-2.6-720-bonding-layer23.patch
similarity index 52%
rename from linux-2.6-720-bonding-hashes.patch
rename to linux-2.6-720-bonding-layer23.patch
index 77bf8aa..bf1b015 100644 (file)
--- a/linux-2.6-720-bonding-hashes.patch
+++ b/linux-2.6-720-bonding-layer23.patch
@@ -1,47 +1,29 @@
-diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.22.19-vs2.3.0.34.bonding/drivers/net/bonding/bond_main.c
+diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.22.19-vs2.3.0.34.bond1/drivers/net/bonding/bond_main.c
 --- linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c 2007-09-05 07:07:59.000000000 +0200
-+++ linux-2.6.22.19-vs2.3.0.34.bonding/drivers/net/bonding/bond_main.c 2009-06-15 21:52:30.000000000 +0200
++++ linux-2.6.22.19-vs2.3.0.34.bond1/drivers/net/bonding/bond_main.c   2009-06-23 00:51:24.000000000 +0200
 @@ -123,7 +123,7 @@ MODULE_PARM_DESC(lacp_rate, "LACPDU tx r
                            "(slow/fast)");
  module_param(xmit_hash_policy, charp, 0);
  MODULE_PARM_DESC(xmit_hash_policy, "XOR hashing method: 0 for layer 2 (default)"
 -                                 ", 1 for layer 3+4");
-+                                 ", 1 for layer 3+4, 2 for layer2+3, 3 for layer3");
++                                 ", 1 for layer 3+4, 2 for layer2+3");
  module_param(arp_interval, int, 0);
  MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds");
  module_param_array(arp_ip_target, charp, NULL, 0);
-@@ -170,6 +170,9 @@ struct bond_parm_tbl bond_mode_tbl[] = {
+@@ -170,6 +170,7 @@ struct bond_parm_tbl bond_mode_tbl[] = {
  struct bond_parm_tbl xmit_hashtype_tbl[] = {
  {     "layer2",               BOND_XMIT_POLICY_LAYER2},
  {     "layer3+4",             BOND_XMIT_POLICY_LAYER34},
 +{     "layer2+3",             BOND_XMIT_POLICY_LAYER23},
-+{     "layer3",               BOND_XMIT_POLICY_LAYER3},
-+{     "rr",                   BOND_XMIT_POLICY_RR},
  {     NULL,                   -1},
  };
  
-@@ -3447,6 +3450,40 @@ void bond_unregister_arp(struct bonding 
+@@ -3447,6 +3448,24 @@ void bond_unregister_arp(struct bonding 
  }
  
  /*---------------------------- Hashing Policies -----------------------------*/
 + 
 +/*
-+ * Hash for the output device based upon layer 3 data. If the packet
-+ * is not IP mimic bond_xmit_hash_policy_l2()
-+ */
-+static int bond_xmit_hash_policy_l3(struct sk_buff *skb,
-+                                  struct net_device *bond_dev, int count)
-+{
-+      struct ethhdr *data = (struct ethhdr *)skb->data;
-+      struct iphdr *iph = ip_hdr(skb);
-+
-+      if (skb->protocol == __constant_htons(ETH_P_IP))
-+              return (ntohl(iph->saddr ^ iph->daddr) & 0xffff) % count;
-+      else
-+              return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;
-+}
-+
-+/*
 + * Hash for the output device based upon layer 2 and layer 3 data. If
 + * the packet is not IP mimic bond_xmit_hash_policy_l2()
 + */
@@ -61,59 +43,32 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.
  
  /*
   * Hash for the output device based upon layer 3 and layer 4 data. If
-@@ -3486,6 +3523,16 @@ static int bond_xmit_hash_policy_l2(stru
-       return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;
- }
- 
-+/*
-+ * Round-robin "hashing" algorithm
-+ */
-+static int bond_xmit_hash_policy_rr(struct sk_buff *skb,
-+                                  struct net_device *bond_dev, int count)
-+{
-+      static atomic_t packets;
-+      return atomic_inc_return(&packets) % count;
-+}
-+
- /*-------------------------- Device entry points ----------------------------*/
- 
- static int bond_open(struct net_device *bond_dev)
-@@ -4183,6 +4230,12 @@ void bond_set_mode_ops(struct bonding *b
+@@ -4183,6 +4202,8 @@ void bond_set_mode_ops(struct bonding *b
                bond_dev->hard_start_xmit = bond_xmit_xor;
                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23)
 +                      bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
-+              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER3)
-+                      bond->xmit_hash_policy = bond_xmit_hash_policy_l3;
-+              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_RR)
-+                      bond->xmit_hash_policy = bond_xmit_hash_policy_rr;
                else
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
                break;
-@@ -4194,6 +4247,12 @@ void bond_set_mode_ops(struct bonding *b
+@@ -4194,6 +4215,8 @@ void bond_set_mode_ops(struct bonding *b
                bond_dev->hard_start_xmit = bond_3ad_xmit_xor;
                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23)
 +                      bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
-+              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER3)
-+                      bond->xmit_hash_policy = bond_xmit_hash_policy_l3;
-+              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_RR)
-+                      bond->xmit_hash_policy = bond_xmit_hash_policy_rr;
                else
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
                break;
-diff -Nurp linux-2.6.22.19-vs2.3.0.34/include/linux/if_bonding.h linux-2.6.22.19-vs2.3.0.34.bonding/include/linux/if_bonding.h
+diff -Nurp linux-2.6.22.19-vs2.3.0.34/include/linux/if_bonding.h linux-2.6.22.19-vs2.3.0.34.bond1/include/linux/if_bonding.h
 --- linux-2.6.22.19-vs2.3.0.34/include/linux/if_bonding.h      2006-06-18 03:49:35.000000000 +0200
-+++ linux-2.6.22.19-vs2.3.0.34.bonding/include/linux/if_bonding.h      2009-06-15 22:02:09.000000000 +0200
-@@ -86,6 +86,9 @@
++++ linux-2.6.22.19-vs2.3.0.34.bond1/include/linux/if_bonding.h        2009-06-23 00:49:47.000000000 +0200
+@@ -86,6 +86,7 @@
  /* hashing types */
  #define BOND_XMIT_POLICY_LAYER2               0 /* layer 2 (MAC only), default */
  #define BOND_XMIT_POLICY_LAYER34      1 /* layer 3+4 (IP ^ MAC) */
 +#define BOND_XMIT_POLICY_LAYER23      2 /* layer 2+3 (IP ^ MAC) */
-+#define BOND_XMIT_POLICY_LAYER3               3 /* layer3 (IP only) */
-+#define BOND_XMIT_POLICY_RR           255 /* round-robin */
  
  typedef struct ifbond {
        __s32 bond_mode;
diff --git a/linux-2.6-721-bonding-layer3.patch b/linux-2.6-721-bonding-layer3.patch
new file mode 100644 (file)
index 0000000..521b318
--- /dev/null
+++ b/linux-2.6-721-bonding-layer3.patch
@@ -0,0 +1,64 @@
+diff -Nurp linux-2.6.22.19-vs2.3.0.34.bond1/drivers/net/bonding/bond_main.c linux-2.6.22.19-vs2.3.0.34.bond2/drivers/net/bonding/bond_main.c
+--- linux-2.6.22.19-vs2.3.0.34.bond1/drivers/net/bonding/bond_main.c   2009-06-23 00:51:24.000000000 +0200
++++ linux-2.6.22.19-vs2.3.0.34.bond2/drivers/net/bonding/bond_main.c   2009-06-23 01:02:56.000000000 +0200
+@@ -171,6 +171,7 @@ struct bond_parm_tbl xmit_hashtype_tbl[]
+ {     "layer2",               BOND_XMIT_POLICY_LAYER2},
+ {     "layer3+4",             BOND_XMIT_POLICY_LAYER34},
+ {     "layer2+3",             BOND_XMIT_POLICY_LAYER23},
++{     "layer3",               BOND_XMIT_POLICY_LAYER3},
+ {     NULL,                   -1},
+ };
+ 
+@@ -3450,6 +3451,22 @@ void bond_unregister_arp(struct bonding 
+ /*---------------------------- Hashing Policies -----------------------------*/
+  
+ /*
++ * Hash for the output device based upon layer 3 data. If the packet
++ * is not IP mimic bond_xmit_hash_policy_l2()
++ */
++static int bond_xmit_hash_policy_l3(struct sk_buff *skb,
++                                  struct net_device *bond_dev, int count)
++{
++      struct ethhdr *data = (struct ethhdr *)skb->data;
++      struct iphdr *iph = ip_hdr(skb);
++
++      if (skb->protocol == __constant_htons(ETH_P_IP))
++              return (ntohl(iph->saddr ^ iph->daddr) & 0xffff) % count;
++      else
++              return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;
++}
++
++/*
+  * Hash for the output device based upon layer 2 and layer 3 data. If
+  * the packet is not IP mimic bond_xmit_hash_policy_l2()
+  */
+@@ -4204,7 +4221,9 @@ void bond_set_mode_ops(struct bonding *b
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
+               else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23)
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
++              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER3)
++                      bond->xmit_hash_policy = bond_xmit_hash_policy_l3;
+               else
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
+               break;
+@@ -4217,7 +4236,9 @@ void bond_set_mode_ops(struct bonding *b
+               if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
+               else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23)
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
++              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER3)
++                      bond->xmit_hash_policy = bond_xmit_hash_policy_l3;
+               else
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
+               break;
+diff -Nurp linux-2.6.22.19-vs2.3.0.34.bond1/include/linux/if_bonding.h linux-2.6.22.19-vs2.3.0.34.bond2/include/linux/if_bonding.h
+--- linux-2.6.22.19-vs2.3.0.34.bond1/include/linux/if_bonding.h        2009-06-23 00:49:47.000000000 +0200
++++ linux-2.6.22.19-vs2.3.0.34.bond2/include/linux/if_bonding.h        2009-06-23 01:02:07.000000000 +0200
+@@ -87,6 +87,7 @@
+ #define BOND_XMIT_POLICY_LAYER2               0 /* layer 2 (MAC only), default */
+ #define BOND_XMIT_POLICY_LAYER34      1 /* layer 3+4 (IP ^ MAC) */
+ #define BOND_XMIT_POLICY_LAYER23      2 /* layer 2+3 (IP ^ MAC) */
++#define BOND_XMIT_POLICY_LAYER3               3 /* layer3 (IP only) */
+ 
+ typedef struct ifbond {
+       __s32 bond_mode;
diff --git a/linux-2.6-722-bonding-rr.patch b/linux-2.6-722-bonding-rr.patch
new file mode 100644 (file)
index 0000000..8b363da
--- /dev/null
+++ b/linux-2.6-722-bonding-rr.patch
@@ -0,0 +1,57 @@
+diff -Nurp linux-2.6.22.19-vs2.3.0.34.bond2/drivers/net/bonding/bond_main.c linux-2.6.22.19-vs2.3.0.34.bonding/drivers/net/bonding/bond_main.c
+--- linux-2.6.22.19-vs2.3.0.34.bond2/drivers/net/bonding/bond_main.c   2009-06-23 01:02:56.000000000 +0200
++++ linux-2.6.22.19-vs2.3.0.34.bonding/drivers/net/bonding/bond_main.c 2009-06-15 21:52:30.000000000 +0200
+@@ -172,6 +172,7 @@ struct bond_parm_tbl xmit_hashtype_tbl[]
+ {     "layer3+4",             BOND_XMIT_POLICY_LAYER34},
+ {     "layer2+3",             BOND_XMIT_POLICY_LAYER23},
+ {     "layer3",               BOND_XMIT_POLICY_LAYER3},
++{     "rr",                   BOND_XMIT_POLICY_RR},
+ {     NULL,                   -1},
+ };
+ 
+@@ -3522,6 +3523,16 @@ static int bond_xmit_hash_policy_l2(stru
+       return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;
+ }
+ 
++/*
++ * Round-robin "hashing" algorithm
++ */
++static int bond_xmit_hash_policy_rr(struct sk_buff *skb,
++                                  struct net_device *bond_dev, int count)
++{
++      static atomic_t packets;
++      return atomic_inc_return(packets) % count;
++}
++
+ /*-------------------------- Device entry points ----------------------------*/
+ 
+ static int bond_open(struct net_device *bond_dev)
+@@ -4223,6 +4234,8 @@ void bond_set_mode_ops(struct bonding *b
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
+               else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER3)
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l3;
++              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_RR)
++                      bond->xmit_hash_policy = bond_xmit_hash_policy_rr;
+               else
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
+               break;
+@@ -4238,6 +4251,8 @@ void bond_set_mode_ops(struct bonding *b
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
+               else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER3)
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l3;
++              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_RR)
++                      bond->xmit_hash_policy = bond_xmit_hash_policy_rr;
+               else
+                       bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
+               break;
+diff -Nurp linux-2.6.22.19-vs2.3.0.34.bond2/include/linux/if_bonding.h linux-2.6.22.19-vs2.3.0.34.bonding/include/linux/if_bonding.h
+--- linux-2.6.22.19-vs2.3.0.34.bond2/include/linux/if_bonding.h        2009-06-23 01:02:07.000000000 +0200
++++ linux-2.6.22.19-vs2.3.0.34.bonding/include/linux/if_bonding.h      2009-06-15 22:02:09.000000000 +0200
+@@ -88,6 +88,7 @@
+ #define BOND_XMIT_POLICY_LAYER34      1 /* layer 3+4 (IP ^ MAC) */
+ #define BOND_XMIT_POLICY_LAYER23      2 /* layer 2+3 (IP ^ MAC) */
+ #define BOND_XMIT_POLICY_LAYER3               3 /* layer3 (IP only) */
++#define BOND_XMIT_POLICY_RR           255 /* round-robin */
+ 
+ typedef struct ifbond {
+       __s32 bond_mode;
linux-2.6