slub: Fix signedness warnings
Subsystems (2)
PATCH 1/3 slub: Fix signedness warnings
The bit-ops routines require its arg to be a pointer to unsigned long. This leads sparse to complain about different signedness as follows:
mm/slub.c:2425:49: warning: incorrect type in argument 2 (different signedness)
mm/slub.c:2425:49: expected unsigned long volatile *addr
mm/slub.c:2425:49: got long *map
--- mm/slub.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
mm/slub.c +3 -4
@@ -2414,9 +2414,8 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,#ifdef CONFIG_SLUB_DEBUG void *addr =page_address (page);void *p; -long *map =kzalloc (BITS_TO_LONGS (page->objects) *sizeof (long ), -GFP_ATOMIC ); - +unsigned long *map =kzalloc (BITS_TO_LONGS (page->objects) * +sizeof (long ),GFP_ATOMIC );if (!map)return ;slab_err (s, page,"%s" , text);
@@ -3635,7 +3634,7 @@ static int add_location(struct loc_track *t, struct kmem_cache *s,static void process_slab (struct loc_track *t,struct kmem_cache *s,struct page *page,enum track_item alloc, -long *map) +unsigned long *map) {void *addr =page_address (page);void *p;
Signature · 7 lines
1.7.2.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 2/3 slub: Add lock release annotation
The unfreeze_slab() releases page's PG_locked bit but was missing proper annotation. The deactivate_slab() needs to be marked also since it calls unfreeze_slab() without grabbing the lock.
--- mm/slub.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
mm/slub.c +2 -0
@@ -1405,6 +1405,7 @@ static struct page *get_partial(struct kmem_cache *s, gfp_t flags, int node)* On exit the slab lock will have been dropped. */ static void unfreeze_slab (struct kmem_cache *s,struct page *page,int tail) +__releases (bitlock) {struct kmem_cache_node *n =get_node (s,page_to_nid (page));
@@ -1447,6 +1448,7 @@ static void unfreeze_slab(struct kmem_cache *s, struct page *page, int tail)* Remove the cpu slab */ static void deactivate_slab (struct kmem_cache *s,struct kmem_cache_cpu *c) +__releases (bitlock) {struct page *page = c->page;int tail =1 ;
Signature · 7 lines
1.7.2.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Re: [PATCH 2/3] slub: Add lock release annotation
Quoted 3 lines · Namhyung Kim
The
unfreeze_slab()releases page'sPG_lockedbit but was missing proper annotation. Thedeactivate_slab()needs to be marked also since it callsunfreeze_slab()without grabbing the lock.
unfreeze_slab() needs it because it calls deactivate_slab() unconditionally, rather.
Quoted 1 line
Signed-off-by Namhyung Kim <[email protected]>
PATCH 3/3 slub: Move NUMA-related functions under CONFIG_NUMA
In reply to Namhyung KimMake kmalloc_cache_alloc_node_notrace(), kmalloc_large_node() and __kmalloc_node_track_caller() to be compiled only when CONFIG_NUMA is selected.
--- mm/slub.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
mm/slub.c +4 -2
@@ -1756,7 +1756,6 @@ void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node)return ret; }EXPORT_SYMBOL (kmem_cache_alloc_node); -#endif #ifdef CONFIG_TRACING void *kmem_cache_alloc_node_notrace(struct kmem_cache *s,
@@ -1767,6 +1766,7 @@ void *kmem_cache_alloc_node_notrace(struct kmem_cache *s, }EXPORT_SYMBOL (kmem_cache_alloc_node_notrace);#endif +#endif /* * Slow patch handling. This may still be called frequently since objects
@@ -2736,6 +2736,7 @@ void *__kmalloc(size_t size, gfp_t flags) }EXPORT_SYMBOL (__kmalloc); +#ifdef CONFIG_NUMA static void *kmalloc_large_node (size_t size,gfp_t flags,int node) {struct page *page;
@@ -2750,7 +2751,6 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)return ptr; } -#ifdef CONFIG_NUMA void *__kmalloc_node (size_t size,gfp_t flags,int node) {struct kmem_cache *s;
@@ -3319,6 +3319,7 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfpflags, unsigned long caller)return ret; } +#ifdef CONFIG_NUMA void *__kmalloc_node_track_caller (size_t size,gfp_t gfpflags,int node,unsigned long caller) {
@@ -3347,6 +3348,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, return ret; } +#endif #ifdef CONFIG_SLUB_DEBUG static int count_inuse (struct page *page)
Signature · 7 lines
1.7.2.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Re: [PATCH 3/3] slub: Move NUMA-related functions under CONFIG_NUMA
Quoted 5 lines · Namhyung Kim
Make
kmalloc_cache_alloc_node_notrace(),kmalloc_large_node()and__kmalloc_node_track_caller()to be compiled only whenCONFIG_NUMAis selected.Signed-off-by Namhyung Kim <[email protected]>
Quoted 2 lines · Namhyung Kim
The bit-ops routines require its arg to be a pointer to unsigned long. This leads sparse to complain about different signedness as follows:
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 8 lines · Namhyung Kim
The bit-ops routines require its arg to be a pointer to unsigned long. This leads sparse to complain about different signedness as follows:
mm/slub.c:2425:49: warning: incorrect type in argument 2 (different signedness)
mm/slub.c:2425:49: expected unsigned long volatile *addr
mm/slub.c:2425:49: got long *mapSigned-off-by Namhyung Kim <[email protected]>
Quoted 8 lines · Namhyung Kim
The bit-ops routines require its arg to be a pointer to unsigned long. This leads sparse to complain about different signedness as follows:
mm/slub.c:2425:49: warning: incorrect type in argument 2 (different signedness)
mm/slub.c:2425:49: expected unsigned long volatile *addr
mm/slub.c:2425:49: got long *mapSigned-off-by Namhyung Kim<[email protected]>
The series has been applied. Thanks!
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>