2020-07-26 13:17:00

by Felix Fietkau

Subject: [PATCH 1/2] net/fq_impl: use skb_get_hash instead of skb_get_hash_perturb

This avoids unnecessary regenerating of the skb flow hash

Signed-off-by: Felix Fietkau <[email protected]>
---
include/net/fq.h | 1 -
include/net/fq_impl.h | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/net/fq.h b/include/net/fq.h
index 2ad85e683041..e39f3f8d5f8a 100644
--- a/include/net/fq.h
+++ b/include/net/fq.h
@@ -69,7 +69,6 @@ struct fq {
struct list_head backlogs;
spinlock_t lock;
u32 flows_cnt;
- siphash_key_t perturbation;
u32 limit;
u32 memory_limit;
u32 memory_usage;
diff --git a/include/net/fq_impl.h b/include/net/fq_impl.h
index 38a9a3d1222b..e73d74d2fabf 100644
--- a/include/net/fq_impl.h
+++ b/include/net/fq_impl.h
@@ -108,7 +108,7 @@ static struct sk_buff *fq_tin_dequeue(struct fq *fq,

static u32 fq_flow_idx(struct fq *fq, struct sk_buff *skb)
{
- u32 hash = skb_get_hash_perturb(skb, &fq->perturbation);
+ u32 hash = skb_get_hash(skb);

return reciprocal_scale(hash, fq->flows_cnt);
}
@@ -308,7 +308,6 @@ static int fq_init(struct fq *fq, int flows_cnt)
INIT_LIST_HEAD(&fq->backlogs);
spin_lock_init(&fq->lock);
fq->flows_cnt = max_t(u32, flows_cnt, 1);
- get_random_bytes(&fq->perturbation, sizeof(fq->perturbation));
fq->quantum = 300;
fq->limit = 8192;
fq->memory_limit = 16 << 20; /* 16 MBytes */
--
2.24.0

2020-08-11 09:42:43

by Toke Høiland-Jørgensen

Subject: Re: [PATCH 1/2] net/fq_impl: use skb_get_hash instead of skb_get_hash_perturb

Felix Fietkau <[email protected]> writes:

> This avoids unnecessary regenerating of the skb flow hash

Ah, I had been meaning to look at this, but didn't get around to it
before I went on holiday; thanks for taking care of it! :)

Acked-by: Toke Høiland-Jørgensen <[email protected]>