shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

mm: slub: Add SLUB_SYSFS

Browse Source 
Make slub sysfs interface selectable.
Save about 4.8ms of boot time on RK1808 EVB if unselected.

Change-Id: I2587cc259c3c31a209604d99640d8e84a4ba78f4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang
2019-09-17 18:20:52 +08:00
parent 40094f11cb
commit d2014f8b68
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/slub_def.h
View File

@@ -104,7 +104,7 @@ struct kmem_cache {
unsigned int red_left_pad; /* Left redzone padding size */ unsigned int red_left_pad; /* Left redzone padding size */
const char *name; /* Name (only for display!) */ const char *name; /* Name (only for display!) */
struct list_head list; /* List of slab caches */ struct list_head list; /* List of slab caches */
#ifdef CONFIG_SYSFS #ifdef CONFIG_SLUB_SYSFS
struct kobject kobj; /* For sysfs */ struct kobject kobj; /* For sysfs */
struct work_struct kobj_remove_work; struct work_struct kobj_remove_work;
#endif #endif
@@ -112,7 +112,7 @@ struct kmem_cache {
struct memcg_cache_params memcg_params; struct memcg_cache_params memcg_params;
/* for propagation, maximum size of a stored attr */ /* for propagation, maximum size of a stored attr */
unsigned int max_attr_size; unsigned int max_attr_size;
#ifdef CONFIG_SYSFS #ifdef CONFIG_SLUB_SYSFS
struct kset *memcg_kset; struct kset *memcg_kset;
#endif #endif
#endif #endif
@@ -153,7 +153,7 @@ struct kmem_cache {
#define slub_set_cpu_partial(s, n) #define slub_set_cpu_partial(s, n)
#endif // CONFIG_SLUB_CPU_PARTIAL #endif // CONFIG_SLUB_CPU_PARTIAL
#ifdef CONFIG_SYSFS #ifdef CONFIG_SLUB_SYSFS
#define SLAB_SUPPORTS_SYSFS #define SLAB_SUPPORTS_SYSFS
void sysfs_slab_unlink(struct kmem_cache *); void sysfs_slab_unlink(struct kmem_cache *);
void sysfs_slab_release(struct kmem_cache *); void sysfs_slab_release(struct kmem_cache *);

5
init/Kconfig
View File

@@ -1667,6 +1667,11 @@ config VM_EVENT_COUNTERS
on EXPERT systems. /proc/vmstat will only show page counts on EXPERT systems. /proc/vmstat will only show page counts
if VM event counters are disabled. if VM event counters are disabled.
config SLUB_SYSFS
bool "Enable SLUB sysfs interface"
depends on SLUB && SYSFS
default y
config SLUB_DEBUG config SLUB_DEBUG
default y default y
bool "Enable SLUB debugging support" if EXPERT bool "Enable SLUB debugging support" if EXPERT

14
mm/slub.c
View File

@@ -212,7 +212,7 @@ struct track {
enum track_item { TRACK_ALLOC, TRACK_FREE }; enum track_item { TRACK_ALLOC, TRACK_FREE };
#ifdef CONFIG_SYSFS #ifdef CONFIG_SLUB_SYSFS
static int sysfs_slab_add(struct kmem_cache *); static int sysfs_slab_add(struct kmem_cache *);
static int sysfs_slab_alias(struct kmem_cache *, const char *); static int sysfs_slab_alias(struct kmem_cache *, const char *);
static void memcg_propagate_slab_attrs(struct kmem_cache *s); static void memcg_propagate_slab_attrs(struct kmem_cache *s);
@@ -2347,7 +2347,7 @@ static inline unsigned long node_nr_objs(struct kmem_cache_node *n)
} }
#endif /* CONFIG_SLUB_DEBUG */ #endif /* CONFIG_SLUB_DEBUG */
#if defined(CONFIG_SLUB_DEBUG) || defined(CONFIG_SYSFS) #if defined(CONFIG_SLUB_DEBUG) || defined(CONFIG_SLUB_SYSFS)
static unsigned long count_partial(struct kmem_cache_node *n, static unsigned long count_partial(struct kmem_cache_node *n,
int (*get_count)(struct page *)) int (*get_count)(struct page *))
{ {
@@ -2361,7 +2361,7 @@ static unsigned long count_partial(struct kmem_cache_node *n,
spin_unlock_irqrestore(&n->list_lock, flags); spin_unlock_irqrestore(&n->list_lock, flags);
return x; return x;
} }
#endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */ #endif /* CONFIG_SLUB_DEBUG || CONFIG_SLUB_SYSFS */
static noinline void static noinline void
slab_out_of_memory(struct kmem_cache *s, gfp_t gfpflags, int nid) slab_out_of_memory(struct kmem_cache *s, gfp_t gfpflags, int nid)
@@ -4329,7 +4329,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
} }
#endif #endif
#ifdef CONFIG_SYSFS #ifdef CONFIG_SLUB_SYSFS
static int count_inuse(struct page *page) static int count_inuse(struct page *page)
{ {
return page->inuse; return page->inuse;
@@ -4710,12 +4710,12 @@ static void __init resiliency_test(void)
validate_slab_cache(kmalloc_caches[9]); validate_slab_cache(kmalloc_caches[9]);
} }
#else #else
#ifdef CONFIG_SYSFS #ifdef CONFIG_SLUB_SYSFS
static void resiliency_test(void) {}; static void resiliency_test(void) {};
#endif #endif
#endif #endif
#ifdef CONFIG_SYSFS #ifdef CONFIG_SLUB_SYSFS
enum slab_stat_type { enum slab_stat_type {
SL_ALL, /* All slabs */ SL_ALL, /* All slabs */
SL_PARTIAL, /* Only partially allocated slabs */ SL_PARTIAL, /* Only partially allocated slabs */
@@ -5841,7 +5841,7 @@ static int __init slab_sysfs_init(void)
} }
__initcall(slab_sysfs_init); __initcall(slab_sysfs_init);
#endif /* CONFIG_SYSFS */ #endif /* CONFIG_SLUB_SYSFS */
/* /*
* The /proc/slabinfo ABI * The /proc/slabinfo ABI