mm/slob: Remove unnecessary page_mapcount_reset() function call

After commit 401fb12c68c2 ("mm/sl*b: Differentiate struct slab fields by
sl*b implementations"), we can reorder fields of struct slab depending
on slab allocator.

For now, page_mapcount_reset() is called because page->_mapcount and
slab->units have same offset. But this is not necessary for struct slab.
Use unused field for units instead.

Signed-off-by: Hyeonggon Yoo <[email protected]>
Signed-off-by: Vlastimil Babka <[email protected]>
Link: https://lore.kernel.org/r/20211212065241.GA886691@odroid

diff --git a/mm/slab.h b/mm/slab.h
index f14e723b9e3cd5666c9210ae2e6201adf4b06905..95b9a74a2d515fd83091253b786886be9cc08476 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -50,8 +50,8 @@ struct slab {
        struct list_head slab_list;
        void *__unused_1;
        void *freelist;         /* first free block */
        struct list_head slab_list;
        void *__unused_1;
        void *freelist;         /* first free block */

-       void *__unused_2;
-       int units;
+       long units;
+       unsigned int __unused_2;

 
 #else
 #error "Unexpected slab allocator configured"
 
 #else
 #error "Unexpected slab allocator configured"

diff --git a/mm/slob.c b/mm/slob.c
index 3c6cadbbc2386500cc76bc685f5f55e22ae18219..60c5842215f1b1773519a69155b0e657e2d2dd90 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -404,7 +404,6 @@ static void slob_free(void *block, int size)
                        clear_slob_page_free(sp);
                spin_unlock_irqrestore(&slob_lock, flags);
                __folio_clear_slab(slab_folio(sp));
                        clear_slob_page_free(sp);
                spin_unlock_irqrestore(&slob_lock, flags);
                __folio_clear_slab(slab_folio(sp));

-               page_mapcount_reset(slab_page(sp));

                slob_free_pages(b, 0);
                return;
        }
                slob_free_pages(b, 0);
                return;
        }