The patch titled
Subject: mm: switch s_mem and slab_cache in struct page
has been removed from the -mm tree. Its filename was
mm-switch-s_mem-and-slab_cache-in-struct-page.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx>
Subject: mm: switch s_mem and slab_cache in struct page
This will allow us to store slub's counters in the same bits as slab's
s_mem. slub now needs to set page->mapping to NULL as it frees the page,
just like slab does.
Link: http://lkml.kernel.org/r/20180518194519.3820-5-willy@xxxxxxxxxxxxx
Signed-off-by: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx>
Acked-by: Christoph Lameter <cl@xxxxxxxxx>
Acked-by: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Jérôme Glisse <jglisse@xxxxxxxxxx>
Cc: "Kirill A . Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Lai Jiangshan <jiangshanlai@xxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mm_types.h | 4 ++--
mm/slub.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff -puN include/linux/mm_types.h~mm-switch-s_mem-and-slab_cache-in-struct-page include/linux/mm_types.h
--- a/include/linux/mm_types.h~mm-switch-s_mem-and-slab_cache-in-struct-page
+++ a/include/linux/mm_types.h
@@ -83,7 +83,7 @@ struct page {
/* See page-flags.h for the definition of PAGE_MAPPING_FLAGS */
struct address_space *mapping;
- void *s_mem; /* slab first object */
+ struct kmem_cache *slab_cache; /* SL[AU]B: Pointer to slab */
atomic_t compound_mapcount; /* first tail page */
/* page_deferred_list().next -- second tail page */
};
@@ -194,7 +194,7 @@ struct page {
spinlock_t ptl;
#endif
#endif
- struct kmem_cache *slab_cache; /* SL[AU]B: Pointer to slab */
+ void *s_mem; /* slab first object */
};
#ifdef CONFIG_MEMCG
diff -puN mm/slub.c~mm-switch-s_mem-and-slab_cache-in-struct-page mm/slub.c
--- a/mm/slub.c~mm-switch-s_mem-and-slab_cache-in-struct-page
+++ a/mm/slub.c
@@ -1695,6 +1695,7 @@ static void __free_slab(struct kmem_cach
__ClearPageSlab(page);
page_mapcount_reset(page);
+ page->mapping = NULL;
if (current->reclaim_state)
current->reclaim_state->reclaimed_slab += pages;
memcg_uncharge_slab(page, order, s);
_
Patches currently in -mm which might be from mawilcox@xxxxxxxxxxxxx are
--
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
