From: Stephen Hemminger <shemminger@vyatta•com>
To: David Miller <davem@davemloft•net>, Jay Vosburgh <fubar@us•ibm.com>
Cc: netdev@vger•kernel.org, bonding-devel@lists•sourceforge.net
Subject: [RFC 3/4] bond: support more Layer 4 protocols
Date: Thu, 04 Feb 2010 09:11:21 -0800 [thread overview]
Message-ID: <20100204171241.393163298@vyatta.com> (raw)
In-Reply-To: 20100204171118.917737392@vyatta.com
[-- Attachment #1: bond-more-proto.patch --]
[-- Type: text/plain, Size: 1752 bytes --]
There are several protocols similar to TCP and UDP which share common L4
header format. Since proto is only one byte, use a map rather than big
conditonal.
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
--- a/drivers/net/bonding/bond_main.c 2010-02-04 09:08:00.447069200 -0800
+++ b/drivers/net/bonding/bond_main.c 2010-02-04 09:08:42.545818691 -0800
@@ -3621,6 +3621,16 @@ static u16 bond_xmit_hash_policy_l23(con
}
}
+/* Map of protocols with standard ports available to include in hash */
+static const bool has_layer4[256] = {
+ [IPPROTO_TCP] = 1,
+ [IPPROTO_UDP] = 1,
+ [IPPROTO_UDPLITE] = 1,
+ [IPPROTO_SCTP] = 1,
+ [IPPROTO_DCCP] = 1,
+ [IPPROTO_ESP] = 1,
+};
+
/*
* Hash for the output device based upon layer 3 and layer 4 data. If
* the packet is a frag or not TCP or UDP, just use layer 3 data. If it is
@@ -3634,11 +3644,10 @@ static u16 bond_xmit_hash_policy_l34(con
const struct iphdr *iph = ip_hdr(skb);
const __be16 *layer4hdr
= ((const void *)iph + iph->ihl);
- u32 layer4_xor = 0;
+ u16 layer4_xor = 0;
if (!(iph->frag_off & htons(IP_MF|IP_OFFSET)) &&
- (iph->protocol == IPPROTO_TCP ||
- iph->protocol == IPPROTO_UDP))
+ has_layer4[iph->protocol])
layer4_xor = ntohs((*layer4hdr ^ *(layer4hdr + 1)));
return layer4_xor ^ ntohl(iph->saddr ^ iph->daddr);
@@ -3647,10 +3656,9 @@ static u16 bond_xmit_hash_policy_l34(con
{
const struct ipv6hdr *iph = ipv6_hdr(skb);
const __be16 *layer4hdr = (const __be16 *) (iph + 1);
- u32 layer4_xor = 0;
+ u16 layer4_xor = 0;
- if (iph->nexthdr == IPPROTO_TCP ||
- iph->nexthdr == IPPROTO_UDP)
+ if (has_layer4[iph->nexthdr])
layer4_xor = ntohs((*layer4hdr ^ *(layer4hdr + 1)));
return layer4_xor ^
--
next prev parent reply other threads:[~2010-02-04 17:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-04 17:11 [RFC 0/4] bond hashing revised Stephen Hemminger
2010-02-04 17:11 ` [RFC 1/4] bond: cleanup transmit hash policy interface Stephen Hemminger
2010-02-04 17:11 ` [RFC 2/4] bond: add IPV6 layer3 hash policy support Stephen Hemminger
2010-02-04 17:11 ` Stephen Hemminger [this message]
2010-02-05 10:38 ` [RFC 3/4] bond: support more Layer 4 protocols Patrick McHardy
2010-02-05 16:42 ` Stephen Hemminger
2010-02-08 13:11 ` Patrick McHardy
2010-02-04 17:11 ` [RFC 4/4] bond: add new multiqueue hash policy Stephen Hemminger
2010-02-05 9:40 ` [RFC 0/4] bond hashing revised Jasper Spaans
2010-02-05 21:04 ` Stephen Hemminger
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=20100204171241.393163298@vyatta.com \
--to=shemminger@vyatta$(echo .)com \
--cc=bonding-devel@lists$(echo .)sourceforge.net \
--cc=davem@davemloft$(echo .)net \
--cc=fubar@us$(echo .)ibm.com \
--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