lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 090/135] net/fq_impl: Switch to kvmalloc() for memory allocation
    Date
    From: Toke Høiland-Jørgensen <toke@redhat.com>

    [ 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: 557fc4a09803 ("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>
    ---
    include/net/fq_impl.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/include/net/fq_impl.h b/include/net/fq_impl.h
    index 107c0d700ed6f..38a9a3d1222b7 100644
    --- a/include/net/fq_impl.h
    +++ b/include/net/fq_impl.h
    @@ -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;
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-04 00:09    [W:4.080 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site