Commit 71e67c3b authored Nov 05, 2019 by Toke Høiland-Jørgensen Committed by Johannes Berg Nov 08, 2019

net/fq_impl: Switch to kvmalloc() for memory allocation



The FQ implementation used by mac80211 allocates memory using kmalloc(),
which can fail; and Johannes reported that this actually happens in
practice.

To avoid this, switch the allocation to kvmalloc() instead; this also
brings fq_impl in line with all the FQ qdiscs.

Fixes: 557fc4a0 ("fq: add fair queuing framework")
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/r/20191105155750.547379-1-toke@redhat.com


Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 6dd47d97

include/net/fq_impl.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -313,7 +313,7 @@ static int fq_init(struct fq *fq, int flows_cnt)
		fq->limit = 8192;
		fq->memory_limit = 16 << 20; /* 16 MBytes */

		fq->flows = kcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL);
		fq->flows = kvcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL);
		if (!fq->flows)
		return -ENOMEM;

		@@ -331,7 +331,7 @@ static void fq_reset(struct fq *fq,
		for (i = 0; i < fq->flows_cnt; i++)
		fq_flow_reset(fq, &fq->flows[i], free_func);

		kfree(fq->flows);
		kvfree(fq->flows);
		fq->flows = NULL;
		}

Admin message