Unverified Commit 59201c77 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12120 sched: sch_cake: fix bulk flow accounting logic for host fairness 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BQB4XOL47ODNQOWUBYQEHPNQLBRAVT25/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAU9XX 
 
Link:https://gitee.com/openeuler/kernel/pulls/12120

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 90d4cf50 0efc1f7d

net/sched/sch_cake.c

+7 −4
Original line number Diff line number Diff line
@@ -785,12 +785,15 @@ static u32 cake_hash(struct cake_tin_data *q, const struct sk_buff *skb, 
		 * queue, accept the collision, update the host tags.

		 */

		q->way_collisions++;

		allocate_src = cake_dsrc(flow_mode);

		allocate_dst = cake_ddst(flow_mode);



		if (q->flows[outer_hash + k].set == CAKE_SET_BULK) {

			if (allocate_src)

				q->hosts[q->flows[reduced_hash].srchost].srchost_bulk_flow_count--;

			if (allocate_dst)

				q->hosts[q->flows[reduced_hash].dsthost].dsthost_bulk_flow_count--;

		}

		allocate_src = cake_dsrc(flow_mode);

		allocate_dst = cake_ddst(flow_mode);

found:

		/* reserve queue for future packets in same flow */

		reduced_hash = outer_hash + k;