lkml.org 
[lkml]   [2014]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 002/163] percpu: fix pcpu_alloc_pages() failure path
    Date
    3.13.11.9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Tejun Heo <tj@kernel.org>

    commit f0d279654dea22b7a6ad34b9334aee80cda62cde upstream.

    When pcpu_alloc_pages() fails midway, pcpu_free_pages() is invoked to
    free what has already been allocated. The invocation is across the
    whole requested range and pcpu_free_pages() will try to free all
    non-NULL pages; unfortunately, this is incorrect as
    pcpu_get_pages_and_bitmap(), unlike what its comment suggests, doesn't
    clear the pages array and thus the array may have entries from the
    previous invocations making the partial failure path free incorrect
    pages.

    Fix it by open-coding the partial freeing of the already allocated
    pages.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    mm/percpu-vm.c | 21 +++++++++++++++------
    1 file changed, 15 insertions(+), 6 deletions(-)

    diff --git a/mm/percpu-vm.c b/mm/percpu-vm.c
    index 3707c71..8d9bb2c 100644
    --- a/mm/percpu-vm.c
    +++ b/mm/percpu-vm.c
    @@ -108,7 +108,7 @@ static int pcpu_alloc_pages(struct pcpu_chunk *chunk,
    int page_start, int page_end)
    {
    const gfp_t gfp = GFP_KERNEL | __GFP_HIGHMEM | __GFP_COLD;
    - unsigned int cpu;
    + unsigned int cpu, tcpu;
    int i;

    for_each_possible_cpu(cpu) {
    @@ -116,14 +116,23 @@ static int pcpu_alloc_pages(struct pcpu_chunk *chunk,
    struct page **pagep = &pages[pcpu_page_idx(cpu, i)];

    *pagep = alloc_pages_node(cpu_to_node(cpu), gfp, 0);
    - if (!*pagep) {
    - pcpu_free_pages(chunk, pages, populated,
    - page_start, page_end);
    - return -ENOMEM;
    - }
    + if (!*pagep)
    + goto err;
    }
    }
    return 0;
    +
    +err:
    + while (--i >= page_start)
    + __free_page(pages[pcpu_page_idx(cpu, i)]);
    +
    + for_each_possible_cpu(tcpu) {
    + if (tcpu == cpu)
    + break;
    + for (i = page_start; i < page_end; i++)
    + __free_page(pages[pcpu_page_idx(tcpu, i)]);
    + }
    + return -ENOMEM;
    }

    /**
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-10 00:21    [W:4.141 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site