slab: make usercopy region 32-bit

If kmem case sizes are 32-bit, then usecopy region should be too.

Link: http://lkml.kernel.org/r/20180305200730.15812-21-adobriyan@gmail.com
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: David Miller <davem@davemloft.net>
Cc: 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>

diff --git a/include/linux/slab.h b/include/linux/slab.h
index d36e8f03730e18e809526884b0975063bc76c079..04402c6371714c42d30e1928e02347bcae6459f7 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -143,7 +143,7 @@ struct kmem_cache *kmem_cache_create(const char *name, unsigned int size,
 struct kmem_cache *kmem_cache_create_usercopy(const char *name,
                        unsigned int size, unsigned int align,
                        slab_flags_t flags,
-                       size_t useroffset, size_t usersize,
+                       unsigned int useroffset, unsigned int usersize,
                        void (*ctor)(void *));
 void kmem_cache_destroy(struct kmem_cache *);
 int kmem_cache_shrink(struct kmem_cache *);

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index 7385547c04b11433389c61c6ba0cc35ce028f85b..d9228e4d0320569f51f7f581722931a2982c1416 100644 (file)
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -85,8 +85,8 @@ struct kmem_cache {
        unsigned int *random_seq;
 #endif
 
-       size_t useroffset;              /* Usercopy region offset */
-       size_t usersize;                /* Usercopy region size */
+       unsigned int useroffset;        /* Usercopy region offset */
+       unsigned int usersize;          /* Usercopy region size */
 
        struct kmem_cache_node *node[MAX_NUMNODES];
 };

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index bc02fd3a8ccfcab0d14b09d625f331c6ca3d436e..623d6ba92036f68d5cc2f2349c42feca6d4a357f 100644 (file)
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -137,8 +137,8 @@ struct kmem_cache {
        struct kasan_cache kasan_info;
 #endif
 
-       size_t useroffset;              /* Usercopy region offset */
-       size_t usersize;                /* Usercopy region size */
+       unsigned int useroffset;        /* Usercopy region offset */
+       unsigned int usersize;          /* Usercopy region size */
 
        struct kmem_cache_node *node[MAX_NUMNODES];
 };

diff --git a/include/net/sock.h b/include/net/sock.h
index 49bd2c1796b0c85740d4695e8ffdcfbdc7003934..74d725fdbe0f836be4544aebb1efe8a5ef24b5ce 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1114,8 +1114,8 @@ struct proto {
        struct kmem_cache       *slab;
        unsigned int            obj_size;
        slab_flags_t            slab_flags;
-       size_t                  useroffset;     /* Usercopy region offset */
-       size_t                  usersize;       /* Usercopy region size */
+       unsigned int            useroffset;     /* Usercopy region offset */
+       unsigned int            usersize;       /* Usercopy region size */
 
        struct percpu_counter   *orphan_count;
 

diff --git a/mm/slab.h b/mm/slab.h
index 8f1072f49285277031756629fe13cdf3605ce563..e8981e811c4572aefa6587ba2df4afba07cabc55 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -22,8 +22,8 @@ struct kmem_cache {
        unsigned int size;      /* The aligned/padded/added on size  */
        unsigned int align;     /* Alignment as calculated */
        slab_flags_t flags;     /* Active flags on the slab */
-       size_t useroffset;      /* Usercopy region offset */
-       size_t usersize;        /* Usercopy region size */
+       unsigned int useroffset;/* Usercopy region offset */
+       unsigned int usersize;  /* Usercopy region size */
        const char *name;       /* Slab name for sysfs */
        int refcount;           /* Use counter */
        void (*ctor)(void *);   /* Called on object slot creation */

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 3e07b1fb22bd4618afa58e97c570a49f7386ebca..01224cb900808010f1301086bbec9fe5b9736f89 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -380,8 +380,8 @@ struct kmem_cache *find_mergeable(unsigned int size, unsigned int align,
 
 static struct kmem_cache *create_cache(const char *name,
                unsigned int object_size, unsigned int size, unsigned int align,
-               slab_flags_t flags, size_t useroffset,
-               size_t usersize, void (*ctor)(void *),
+               slab_flags_t flags, unsigned int useroffset,
+               unsigned int usersize, void (*ctor)(void *),
                struct mem_cgroup *memcg, struct kmem_cache *root_cache)
 {
        struct kmem_cache *s;
@@ -454,7 +454,8 @@ out_free_cache:
 struct kmem_cache *
 kmem_cache_create_usercopy(const char *name,
                  unsigned int size, unsigned int align,
-                 slab_flags_t flags, size_t useroffset, size_t usersize,
+                 slab_flags_t flags,
+                 unsigned int useroffset, unsigned int usersize,
                  void (*ctor)(void *))
 {
        struct kmem_cache *s = NULL;

diff --git a/mm/slub.c b/mm/slub.c
index dfead847961cf7899e1a61de491277984b202ec8..a10cf661cdae44a616e478ee1f420d3a24e203ab 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -5081,7 +5081,7 @@ SLAB_ATTR_RO(cache_dma);
 
 static ssize_t usersize_show(struct kmem_cache *s, char *buf)
 {
-       return sprintf(buf, "%zu\n", s->usersize);
+       return sprintf(buf, "%u\n", s->usersize);
 }
 SLAB_ATTR_RO(usersize);