net/fq_impl: use skb_get_hash instead of skb_get_hash_perturb
Subsystems (2)
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(-)
include/net/fq.h +0 -1
@@ -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;
include/net/fq_impl.h +1 -2
@@ -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 */
Signature · 1 line
2.24.0
PATCH 2/2 mac80211: calculcate skb hash early when using itxq
This avoids flow separation issues when using software encryption
Signed-off-by Felix Fietkau <[email protected]>
--- net/mac80211/tx.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/tx.c +1 -0
@@ -3951,6 +3951,7 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb,if (local->ops->wake_tx_queue) {u16 queue =__ieee80211_select_queue (sdata, sta, skb);skb_set_queue_mapping (skb, queue); +skb_get_hash (skb); }if (sta) {
Signature · 1 line
2.24.0
Re: [PATCH 2/2] mac80211: calculcate skb hash early when using itxq
Quoted 1 line · Felix Fietkau
This avoids flow separation issues when using software encryption
Quoted 1 line · Felix Fietkau
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! :)