The patch titled
Subject: slab: make usercopy region 32-bit
has been removed from the -mm tree. Its filename was
slab-make-usercopy-region-32-bit.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Subject: 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@xxxxxxxxx
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: David Miller <davem@xxxxxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/slab.h | 2 +-
include/linux/slab_def.h | 4 ++--
include/linux/slub_def.h | 4 ++--
include/net/sock.h | 4 ++--
mm/slab.h | 4 ++--
mm/slab_common.c | 7 ++++---
mm/slub.c | 2 +-
7 files changed, 14 insertions(+), 13 deletions(-)
diff -puN include/linux/slab_def.h~slab-make-usercopy-region-32-bit include/linux/slab_def.h
--- a/include/linux/slab_def.h~slab-make-usercopy-region-32-bit
+++ a/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 -puN include/linux/slab.h~slab-make-usercopy-region-32-bit include/linux/slab.h
--- a/include/linux/slab.h~slab-make-usercopy-region-32-bit
+++ a/include/linux/slab.h
@@ -143,7 +143,7 @@ struct kmem_cache *kmem_cache_create(con
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 -puN include/linux/slub_def.h~slab-make-usercopy-region-32-bit include/linux/slub_def.h
--- a/include/linux/slub_def.h~slab-make-usercopy-region-32-bit
+++ a/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 -puN include/net/sock.h~slab-make-usercopy-region-32-bit include/net/sock.h
--- a/include/net/sock.h~slab-make-usercopy-region-32-bit
+++ a/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 -puN mm/slab_common.c~slab-make-usercopy-region-32-bit mm/slab_common.c
--- a/mm/slab_common.c~slab-make-usercopy-region-32-bit
+++ a/mm/slab_common.c
@@ -380,8 +380,8 @@ struct kmem_cache *find_mergeable(unsign
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 -puN mm/slab.h~slab-make-usercopy-region-32-bit mm/slab.h
--- a/mm/slab.h~slab-make-usercopy-region-32-bit
+++ a/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 -puN mm/slub.c~slab-make-usercopy-region-32-bit mm/slub.c
--- a/mm/slub.c~slab-make-usercopy-region-32-bit
+++ a/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);
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
proc-do-less-stuff-under-pde_unload_lock.patch
proc-move-proc-sysvipc-creation-to-where-it-belongs.patch
proc-faster-open-close-of-files-without-release-hook.patch
proc-randomize-struct-pde_opener.patch
proc-move-struct-pde_opener-to-kmem-cache.patch
proc-account-struct-pde_opener.patch
proc-check-permissions-earlier-for-proc-wchan.patch
proc-use-set_puts-at-proc-wchan.patch
proc-test-proc-self-wchan.patch
proc-test-proc-self-syscall.patch
proc-move-struct-proc_dir_entry-into-kmem-cache.patch
proc-fix-proc-map_files-lookup-some-more.patch
proc-register-filesystem-last.patch
proc-faster-proc-cmdline.patch
proc-do-mmput-asap-for-proc-map_files.patch
proc-revalidate-misc-dentries.patch
proc-test-last-field-of-proc-loadavg.patch
proc-reject-and-as-filenames.patch
proc-switch-struct-proc_dir_entry-count-to-refcount.patch
proc-shotgun-test-read-readdir-readlink-a-little-write.patch
proc-shotgun-test-read-readdir-readlink-a-little-write-fix.patch
proc-shotgun-test-read-readdir-readlink-a-little-write-fix-2.patch
proc-use-slower-rb_first.patch
proc-test-proc-uptime.patch
uts-create-struct-uts_namespace-from-kmem_cache.patch
seq_file-allocate-seq_file-from-kmem_cache.patch
seq_file-account-everything.patch
seq_file-delete-small-value-optimization.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
