percpu: fix pcpu_alloc_pages() failure path
Subsystems (2)
Tejun Heo
maintainerPATCH 1/2 percpu: fix pcpu_alloc_pages() failure path
Fix for a sneaky bug which has been there for many years. Applied to percpu/for-3.17-fixes.
Thanks.
------ 8< ------
Quoted 1 line
From
f0d279654dea22b7a6ad34b9334aee80cda62cdeMon Sep 17 00:00:00 2001
From: Tejun Heo <[email protected]>
Date: Fri, 15 Aug 2014 16:06:06 -0400
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.
--- mm/percpu-vm.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
mm/percpu-vm.c +15 -6
@@ -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 ; }/**
Signature · 1 line
1.9.3
Tejun Heo
maintainerPATCH 2/2 percpu: perform tlb flush after pcpu_map_pages() failure
This one is most likely harmless but best to be safe. Applied to percpu/for-3.17-fixes.
Thanks.
------ 8< ------
Quoted 1 line
From
849f5169097e1ba35b90ac9df76b5bb6f9c0aabdMon Sep 17 00:00:00 2001
From: Tejun Heo <[email protected]>
Date: Fri, 15 Aug 2014 16:06:10 -0400
If pcpu_map_pages() fails midway, it unmaps the already mapped pages. Currently, it doesn't flush tlb after the partial unmapping. This may be okay in most cases as the established mapping hasn't been used at that point but it can go wrong and when it goes wrong it'd be extremely difficult to track down.
Flush tlb after the partial unmapping.
--- mm/percpu-vm.c | 1 + 1 file changed, 1 insertion(+)
mm/percpu-vm.c +1 -0
@@ -272,6 +272,7 @@ err:__pcpu_unmap_pages (pcpu_chunk_addr (chunk, tcpu, page_start), page_end - page_start); } +pcpu_post_unmap_tlb_flush (chunk, page_start, page_end);return err; }
Signature · 1 line
1.9.3