Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 097b065b authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Johannes Berg
Browse files

fq.h: Port memory limit mechanism from fq_codel 



The reusable fairness queueing implementation (fq.h) lacks the memory
usage limit that the fq_codel qdisc has. This means that small
devices (e.g. WiFi routers) can run out of memory when flooded with a
large number of packets. This ports the memory limit feature from
fq_codel to fq.h.

Signed-off-by: default avatarToke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 92bc43bc

include/net/fq.h

+3 −0
Original line number Diff line number Diff line
@@ -72,9 +72,12 @@ struct fq { 
	u32 flows_cnt;

	u32 perturbation;

	u32 limit;

	u32 memory_limit;

	u32 memory_usage;

	u32 quantum;

	u32 backlog;

	u32 overlimit;

	u32 overmemory;

	u32 collisions;

};

include/net/fq_impl.h

+6 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ static struct sk_buff *fq_flow_dequeue(struct fq *fq, 
	tin->backlog_packets--;

	flow->backlog -= skb->len;

	fq->backlog--;

	fq->memory_usage -= skb->truesize;



	if (flow->backlog == 0) {

		list_del_init(&flow->backlogchain);
@@ -154,6 +155,7 @@ static void fq_tin_enqueue(struct fq *fq, 
	flow->backlog += skb->len;

	tin->backlog_bytes += skb->len;

	tin->backlog_packets++;

	fq->memory_usage += skb->truesize;

	fq->backlog++;



	fq_recalc_backlog(fq, tin, flow);
@@ -166,7 +168,7 @@ static void fq_tin_enqueue(struct fq *fq, 


	__skb_queue_tail(&flow->queue, skb);



	if (fq->backlog > fq->limit) {

	if (fq->backlog > fq->limit || fq->memory_usage > fq->memory_limit) {

		flow = list_first_entry_or_null(&fq->backlogs,

						struct fq_flow,

						backlogchain);
@@ -181,6 +183,8 @@ static void fq_tin_enqueue(struct fq *fq, 


		flow->tin->overlimit++;

		fq->overlimit++;

		if (fq->memory_usage > fq->memory_limit)

			fq->overmemory++;

	}

}
@@ -251,6 +255,7 @@ static int fq_init(struct fq *fq, int flows_cnt) 
	fq->perturbation = prandom_u32();

	fq->quantum = 300;

	fq->limit = 8192;

	fq->memory_limit = 16 << 20; /* 16 MBytes */



	fq->flows = kcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL);

	if (!fq->flows)