lkml.org 
[lkml]   [2014]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 108/146] percpu: make pcpu_alloc_chunk() use pcpu_mem_free() instead of kfree()
    Date
    From: Jianyu Zhan <nasa4836@gmail.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 5a838c3b60e3a36ade764cf7751b8f17d7c9c2da upstream.

    pcpu_chunk_struct_size = sizeof(struct pcpu_chunk) +
    BITS_TO_LONGS(pcpu_unit_pages) * sizeof(unsigned long)

    It hardly could be ever bigger than PAGE_SIZE even for large-scale machine,
    but for consistency with its couterpart pcpu_mem_zalloc(),
    use pcpu_mem_free() instead.

    Commit b4916cb17c26 ("percpu: make pcpu_free_chunk() use
    pcpu_mem_free() instead of kfree()") addressed this problem, but
    missed this one.

    tj: commit message updated

    Signed-off-by: Jianyu Zhan <nasa4836@gmail.com>
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Fixes: 099a19d91ca4 ("percpu: allow limited allocation before slab is online)
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    mm/percpu.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/mm/percpu.c b/mm/percpu.c
    index 8c8e08f3a692..25e2ea52db82 100644
    --- a/mm/percpu.c
    +++ b/mm/percpu.c
    @@ -612,7 +612,7 @@ static struct pcpu_chunk *pcpu_alloc_chunk(void)
    chunk->map = pcpu_mem_zalloc(PCPU_DFL_MAP_ALLOC *
    sizeof(chunk->map[0]));
    if (!chunk->map) {
    - kfree(chunk);
    + pcpu_mem_free(chunk, pcpu_chunk_struct_size);
    return NULL;
    }

    --
    1.9.3


    \
     
     \ /
      Last update: 2014-06-09 11:41    [W:4.079 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site