renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 02:04:05 +08:00
Code

sched: Call skb_get_hash_perturb in sch_sfb

Browse Source 
Call skb_get_hash_perturb instead of doing skb_flow_dissect and then
jhash by hand.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tom Herbert 2015-05-01 11:30:15 -07:00 committed by David S. Miller
parent f969777ac3
commit 63c0ad4d41
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
net/sched/sch_sfb.c
View File

@ -26,7 +26,6 @@
#include <net/ip.h> #include <net/ip.h>
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
#include <net/inet_ecn.h> #include <net/inet_ecn.h>
#include <net/flow_keys.h>
/* /*
* SFB uses two B[l][n] : L x N arrays of bins (L levels, N bins per level) * SFB uses two B[l][n] : L x N arrays of bins (L levels, N bins per level)
@ -285,9 +284,9 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
int i; int i;
u32 p_min = ~0; u32 p_min = ~0;
u32 minqlen = ~0; u32 minqlen = ~0;
u32 r, slot, salt, sfbhash; u32 r, sfbhash;
u32 slot = q->slot;
int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
struct flow_keys keys;
if (unlikely(sch->q.qlen >= q->limit)) { if (unlikely(sch->q.qlen >= q->limit)) {
qdisc_qstats_overlimit(sch); qdisc_qstats_overlimit(sch);
@ -309,22 +308,17 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
fl = rcu_dereference_bh(q->filter_list); fl = rcu_dereference_bh(q->filter_list);
if (fl) { if (fl) {
u32 salt;
/* If using external classifiers, get result and record it. */ /* If using external classifiers, get result and record it. */
if (!sfb_classify(skb, fl, &ret, &salt)) if (!sfb_classify(skb, fl, &ret, &salt))
goto other_drop; goto other_drop;
keys.src = salt; sfbhash = jhash_1word(salt, q->bins[slot].perturbation);
keys.dst = 0;
keys.ports = 0;
} else { } else {
skb_flow_dissect(skb, &keys); sfbhash = skb_get_hash_perturb(skb, q->bins[slot].perturbation);
} }
slot = q->slot;
sfbhash = jhash_3words((__force u32)keys.dst,
(__force u32)keys.src,
(__force u32)keys.ports,
q->bins[slot].perturbation);
if (!sfbhash) if (!sfbhash)
sfbhash = 1; sfbhash = 1;
sfb_skb_cb(skb)->hashes[slot] = sfbhash; sfb_skb_cb(skb)->hashes[slot] = sfbhash;
@ -356,10 +350,8 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
if (unlikely(p_min >= SFB_MAX_PROB)) { if (unlikely(p_min >= SFB_MAX_PROB)) {
/* Inelastic flow */ /* Inelastic flow */
if (q->double_buffering) { if (q->double_buffering) {
sfbhash = jhash_3words((__force u32)keys.dst, sfbhash = skb_get_hash_perturb(skb,
(__force u32)keys.src, q->bins[slot].perturbation);
(__force u32)keys.ports,
q->bins[slot].perturbation);
if (!sfbhash) if (!sfbhash)
sfbhash = 1; sfbhash = 1;
sfb_skb_cb(skb)->hashes[slot] = sfbhash; sfb_skb_cb(skb)->hashes[slot] = sfbhash;