From: Tom Herbert <therbert@google•com>
To: davem@davemloft•net, netdev@vger•kernel.org
Subject: [PATCH net-next 5/6] flow_dissector: Include GRE keyid in hash computation
Date: Fri, 27 Feb 2015 19:11:48 -0800 [thread overview]
Message-ID: <1425093109-1077-6-git-send-email-therbert@google.com> (raw)
In-Reply-To: <1425093109-1077-1-git-send-email-therbert@google.com>
If keyid is present include that in hash_extra in flow_keys when
dissecting. This will then be included in hash computation.
Signed-off-by: Tom Herbert <therbert@google•com>
---
net/core/flow_dissector.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index b11eec1..e04946f 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -219,8 +219,21 @@ ipv6:
nhoff += 4;
if (hdr->flags & GRE_CSUM)
nhoff += 4;
- if (hdr->flags & GRE_KEY)
+ if (hdr->flags & GRE_KEY) {
+ const __be32 *keyid;
+ __be32 _keyid;
+
+ keyid = __skb_header_pointer(skb, nhoff,
+ sizeof(_keyid),
+ data, hlen,
+ &_keyid);
+ if (!keyid)
+ return false;
+
+ flow->hash_extra ^= *keyid;
+
nhoff += 4;
+ }
if (hdr->flags & GRE_SEQ)
nhoff += 4;
if (proto == htons(ETH_P_TEB)) {
--
2.2.0.rc0.207.ga3a616c
next prev parent reply other threads:[~2015-02-28 3:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-28 3:11 [PATCH net-next 0/6] net: Strengthen TX and RX hashes Tom Herbert
2015-02-28 3:11 ` [PATCH net-next 1/6] net: initialize sk_txhash using random value Tom Herbert
2015-02-28 3:11 ` [PATCH net-next 2/6] flow_dissector: Include ip_proto in hash computation Tom Herbert
2015-02-28 3:11 ` [PATCH net-next 3/6] flow_dissector: Add hash_extra field to flow_keys struct Tom Herbert
2015-02-28 7:37 ` Eric Dumazet
2015-02-28 20:31 ` Florian Westphal
2015-02-28 20:46 ` Dave Taht
2015-03-01 18:16 ` Tom Herbert
2015-03-01 20:09 ` Dave Taht
2015-03-01 17:55 ` Tom Herbert
2015-03-01 18:24 ` Florian Westphal
2015-03-01 19:17 ` Tom Herbert
2015-03-01 19:43 ` Florian Westphal
2015-03-01 19:57 ` Dave Taht
2015-03-01 21:27 ` Eric Dumazet
2015-02-28 3:11 ` [PATCH net-next 4/6] flow_dissector: Include VLAN ID in hash computation Tom Herbert
2015-02-28 3:11 ` Tom Herbert [this message]
2015-02-28 3:11 ` [PATCH net-next 6/6] flow_dissector: Include MPLS entropy label " Tom Herbert
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=1425093109-1077-6-git-send-email-therbert@google.com \
--to=therbert@google$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--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