From: Tom Herbert <tom@herbertland.com>
To: <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: <jiri@resnulli.us>
Subject: [PATCH net-next 2/7] sched: Eliminate use of flow_keys in sch_fq_codel
Date: Tue, 28 Apr 2015 21:27:36 -0700 [thread overview]
Message-ID: <1430281661-2271966-3-git-send-email-tom@herbertland.com> (raw)
In-Reply-To: <1430281661-2271966-1-git-send-email-tom@herbertland.com>
Call qdisc_skb_get_hash instead of doing skb_flow_dissect and then
jhash by hand.
Signed-off-by: Tom Herbert <tom@herbertland.com>
---
net/sched/sch_fq_codel.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
index 1e52dec..a6fc53d 100644
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
@@ -23,7 +23,6 @@
#include <linux/vmalloc.h>
#include <net/netlink.h>
#include <net/pkt_sched.h>
-#include <net/flow_keys.h>
#include <net/codel.h>
/* Fair Queue CoDel.
@@ -68,15 +67,9 @@ struct fq_codel_sched_data {
};
static unsigned int fq_codel_hash(const struct fq_codel_sched_data *q,
- const struct sk_buff *skb)
+ struct sk_buff *skb)
{
- struct flow_keys keys;
- unsigned int hash;
-
- skb_flow_dissect(skb, &keys);
- hash = jhash_3words((__force u32)keys.dst,
- (__force u32)keys.src ^ keys.ip_proto,
- (__force u32)keys.ports, q->perturbation);
+ u32 hash = skb_get_hash_perturb(skb, q->perturbation);
return reciprocal_scale(hash, q->flows_cnt);
}
--
1.8.1
next prev parent reply other threads:[~2015-04-29 4:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-29 4:27 [PATCH net-next 0/7] net: Eliminate calls to flow_dissector and introduce flow_keys_digest Tom Herbert
2015-04-29 4:27 ` [PATCH net-next 1/7] net: Add skb_get_hash_perturb Tom Herbert
2015-04-29 7:59 ` Florian Westphal
2015-04-29 11:19 ` Eric Dumazet
2015-04-29 19:51 ` Tom Herbert
2015-04-29 4:27 ` Tom Herbert [this message]
2015-04-29 4:27 ` [PATCH net-next 3/7] sched: Eliminate use of flow_keys in sch_hhf Tom Herbert
2015-04-29 4:27 ` [PATCH net-next 4/7] sched: Eliminate use of flow_keys in sch_sfb Tom Herbert
2015-04-29 4:27 ` [PATCH net-next 5/7] sched: Eliminate use of flow_keys in sch_sfq Tom Herbert
2015-04-29 4:27 ` [PATCH net-next 6/7] net: Add flow_keys digest Tom Herbert
2015-04-29 5:15 ` Eric Dumazet
2015-04-29 4:27 ` [PATCH net-next 7/7] sch_choke: Use flow_keys_digest 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=1430281661-2271966-3-git-send-email-tom@herbertland.com \
--to=tom@herbertland.com \
--cc=davem@davemloft.net \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).