diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-13 12:34:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-13 12:34:47 -0800 |
| commit | e6efef7260ac2bb170059980a78440499f2cc0db (patch) | |
| tree | 9d2917ba865190d9be0b5204a7254ca2aea49cc1 | |
| parent | b78b499a67c3f77aeb6cd0b54724bc38b141255d (diff) | |
| parent | 3ca45a46f8af8c4a92dd8a08eac57787242d5021 (diff) | |
| download | linux-e6efef7260ac2bb170059980a78440499f2cc0db.tar.gz linux-e6efef7260ac2bb170059980a78440499f2cc0db.tar.xz | |
Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull percpu update from Tejun Heo:
"This includes just one patch to reject non-power-of-2 alignments and
trigger warning. Interestingly, this actually caught a bug in XEN
ARM64"
* 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: ensure the requested alignment is power of two
| -rw-r--r-- | include/linux/kernel.h | 1 | ||||
| -rw-r--r-- | mm/percpu.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 01b6b460c34d..d234cd31e75a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -45,6 +45,7 @@ #define REPEAT_BYTE(x) ((~0ul / 0xff) * (x)) +/* @a is a power of 2 value */ #define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) #define __ALIGN_MASK(x, mask) __ALIGN_KERNEL_MASK((x), (mask)) #define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) diff --git a/mm/percpu.c b/mm/percpu.c index f696385bcc44..0686f566d347 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -886,7 +886,8 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved, size = ALIGN(size, 2); - if (unlikely(!size || size > PCPU_MIN_UNIT_SIZE || align > PAGE_SIZE)) { + if (unlikely(!size || size > PCPU_MIN_UNIT_SIZE || align > PAGE_SIZE || + !is_power_of_2(align))) { WARN(true, "illegal size (%zu) or align (%zu) for percpu allocation\n", size, align); return NULL; |