[3.11.y.z extended stable] Patch "percpu: make pcpu_alloc_chunk() use pcpu_mem_free() instead of kfree()" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Fri May 30 09:28:11 UTC 2014


This is a note to let you know that I have just added a patch titled

    percpu: make pcpu_alloc_chunk() use pcpu_mem_free() instead of kfree()

to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From f6c68a0d72b530cfb8e6478fe39f6c68329c2778 Mon Sep 17 00:00:00 2001
From: Jianyu Zhan <nasa4836 at gmail.com>
Date: Mon, 14 Apr 2014 13:47:40 +0800
Subject: percpu: make pcpu_alloc_chunk() use pcpu_mem_free() instead of
 kfree()

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 at gmail.com>
Signed-off-by: Tejun Heo <tj at kernel.org>
Fixes: 099a19d91ca4 ("percpu: allow limited allocation before slab is online)
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 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.1





More information about the kernel-team mailing list