lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "mm: create a separate slab for page->ptl allocation"

Browse Source 
This reverts commit ea1e7ed337.

Al points out that while the commit *does* actually create a separate
slab for the page->ptl allocation, that slab is never actually used, and
the code continues to use kmalloc/kfree.

Damien Wyart points out that the original patch did have the conversion
to use kmem_cache_alloc/free, so it got lost somewhere on its way to me.

Revert the half-arsed attempt that didn't do anything.  If we really do
want the special slab (remember: this is all relevant just for debug
builds, so it's not necessarily all that critical) we might as well redo
the patch fully.

Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Kirill A Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds
2013-11-20 14:41:47 -08:00
parent b5898cd057
commit 8b2e9b712f
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/mm.h
View File

@@ -1318,7 +1318,6 @@ static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long a
#if USE_SPLIT_PTE_PTLOCKS #if USE_SPLIT_PTE_PTLOCKS
#if BLOATED_SPINLOCKS #if BLOATED_SPINLOCKS
void __init ptlock_cache_init(void);
extern bool ptlock_alloc(struct page *page); extern bool ptlock_alloc(struct page *page);
extern void ptlock_free(struct page *page); extern void ptlock_free(struct page *page);
@@ -1327,7 +1326,6 @@ static inline spinlock_t *ptlock_ptr(struct page *page)
return page->ptl; return page->ptl;
} }
#else /* BLOATED_SPINLOCKS */ #else /* BLOATED_SPINLOCKS */
static inline void ptlock_cache_init(void) {}
static inline bool ptlock_alloc(struct page *page) static inline bool ptlock_alloc(struct page *page)
{ {
return true; return true;
@@ -1380,17 +1378,10 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
{ {
return &mm->page_table_lock; return &mm->page_table_lock;
} }
static inline void ptlock_cache_init(void) {}
static inline bool ptlock_init(struct page *page) { return true; } static inline bool ptlock_init(struct page *page) { return true; }
static inline void pte_lock_deinit(struct page *page) {} static inline void pte_lock_deinit(struct page *page) {}
#endif /* USE_SPLIT_PTE_PTLOCKS */ #endif /* USE_SPLIT_PTE_PTLOCKS */
static inline void pgtable_init(void)
{
ptlock_cache_init();
pgtable_cache_init();
}
static inline bool pgtable_page_ctor(struct page *page) static inline bool pgtable_page_ctor(struct page *page)
{ {
inc_zone_page_state(page, NR_PAGETABLE); inc_zone_page_state(page, NR_PAGETABLE);

2
init/main.c
View File

@@ -476,7 +476,7 @@ static void __init mm_init(void)
mem_init(); mem_init();
kmem_cache_init(); kmem_cache_init();
percpu_init_late(); percpu_init_late();
pgtable_init(); pgtable_cache_init();
vmalloc_init(); vmalloc_init();
} }

7
mm/memory.c
View File

@@ -4272,13 +4272,6 @@ void copy_user_huge_page(struct page *dst, struct page *src,
#endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */ #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
#if USE_SPLIT_PTE_PTLOCKS && BLOATED_SPINLOCKS #if USE_SPLIT_PTE_PTLOCKS && BLOATED_SPINLOCKS
static struct kmem_cache *page_ptl_cachep;
void __init ptlock_cache_init(void)
{
page_ptl_cachep = kmem_cache_create("page->ptl", sizeof(spinlock_t), 0,
SLAB_PANIC, NULL);
}
bool ptlock_alloc(struct page *page) bool ptlock_alloc(struct page *page)
{ {
spinlock_t *ptl; spinlock_t *ptl;