diff options
| author | Alexey Dobriyan | 2018-04-06 01:20:48 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-04-06 06:36:23 +0200 |
| commit | eb7235eb842043ca302e992286ca6af63a8127fe (patch) | |
| tree | 44d3ff91546e6492dbaae7567cf3b8b73ffcf18c | |
| parent | slab: make size_index_elem() unsigned int (diff) | |
| download | kernel-qcow2-linux-eb7235eb842043ca302e992286ca6af63a8127fe.tar.gz kernel-qcow2-linux-eb7235eb842043ca302e992286ca6af63a8127fe.tar.xz kernel-qcow2-linux-eb7235eb842043ca302e992286ca6af63a8127fe.zip | |
slub: make ->remote_node_defrag_ratio unsigned int
->remote_node_defrag_ratio is in range 0..1000.
This also adds a check and modifies the behavior to return an error
code. Before this patch invalid values were ignored.
Link: http://lkml.kernel.org/r/20180305200730.15812-9-adobriyan@gmail.com
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/slub_def.h | 2 | ||||
| -rw-r--r-- | mm/slub.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 8ad99c47b19c..f6548083fe0f 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -124,7 +124,7 @@ struct kmem_cache { /* * Defragmentation by allocating from a remote node. */ - int remote_node_defrag_ratio; + unsigned int remote_node_defrag_ratio; #endif #ifdef CONFIG_SLAB_FREELIST_RANDOM diff --git a/mm/slub.c b/mm/slub.c index 495c785c8d7e..97dd2db30acb 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -5289,21 +5289,22 @@ SLAB_ATTR(shrink); #ifdef CONFIG_NUMA static ssize_t remote_node_defrag_ratio_show(struct kmem_cache *s, char *buf) { - return sprintf(buf, "%d\n", s->remote_node_defrag_ratio / 10); + return sprintf(buf, "%u\n", s->remote_node_defrag_ratio / 10); } static ssize_t remote_node_defrag_ratio_store(struct kmem_cache *s, const char *buf, size_t length) { - unsigned long ratio; + unsigned int ratio; int err; - err = kstrtoul(buf, 10, &ratio); + err = kstrtouint(buf, 10, &ratio); if (err) return err; + if (ratio > 100) + return -ERANGE; - if (ratio <= 100) - s->remote_node_defrag_ratio = ratio * 10; + s->remote_node_defrag_ratio = ratio * 10; return length; } |