Lubancat2/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 71e67c3bd127cfe7863f54e4b087eba1cc8f9a7a ]

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: 557fc4a098 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Toke Høiland-Jørgensen
2019-11-05 16:57:50 +01:00
committed by Greg Kroah-Hartman
parent a8a61f82cc
commit b707e0da27
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/fq_impl.h
View File

@ -312,7 +312,7 @@ static int fq_init(struct fq *fq, int flows_cnt)
fq->limit = 8192; fq->limit = 8192;
fq->memory_limit = 16 << 20; /* 16 MBytes */ 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) if (!fq->flows)
return -ENOMEM; return -ENOMEM;
@ -330,7 +330,7 @@ static void fq_reset(struct fq *fq,
for (i = 0; i < fq->flows_cnt; i++) for (i = 0; i < fq->flows_cnt; i++)
fq_flow_reset(fq, &fq->flows[i], free_func); fq_flow_reset(fq, &fq->flows[i], free_func);
kfree(fq->flows); kvfree(fq->flows);
fq->flows = NULL; fq->flows = NULL;
} }