Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: add pte_free_defer() for pgtables sharing page

Add powerpc-specific pte_free_defer(), to free table page via call_rcu().
pte_free_defer() will be called inside khugepaged's retract_page_tables()
loop, where allocating extra memory cannot be relied upon. This precedes
the generic version to avoid build breakage from incompatible pgtable_t.

This is awkward because the struct page contains only one rcu_head, but
that page may be shared between PTE_FRAG_NR pagetables, each wanting to
use the rcu_head at the same time. But powerpc never reuses a fragment
once it has been freed: so mark the page Active in pte_free_defer(),
before calling pte_fragment_free() directly; and there call_rcu() to
pte_free_now() when last fragment is freed and the page is PageActive.

Link: https://lkml.kernel.org/r/6e3ca5f1-334d-4b14-b92d-fc8e99914fcb@google.com
Suggested-by: Jason Gunthorpe <jgg@ziepe.ca>
Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Claudio Imbrenda <imbrenda@linux.ibm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jann Horn <jannh@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Naoya Horiguchi <naoya.horiguchi@nec.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: SeongJae Park <sj@kernel.org>
Cc: Song Liu <song@kernel.org>
Cc: Steven Price <steven.price@arm.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Yu Zhao <yuzhao@google.com>
Cc: Zack Rusin <zackr@vmware.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Hugh Dickins and committed by
Andrew Morton
32cc0b7c 3d140215

+30 -3
+4
arch/powerpc/include/asm/pgalloc.h
··· 45 45 pte_fragment_free((unsigned long *)ptepage, 0); 46 46 } 47 47 48 + /* arch use pte_free_defer() implementation in arch/powerpc/mm/pgtable-frag.c */ 49 + #define pte_free_defer pte_free_defer 50 + void pte_free_defer(struct mm_struct *mm, pgtable_t pgtable); 51 + 48 52 /* 49 53 * Functions that deal with pagetables that could be at any level of 50 54 * the table need to be passed an "index_size" so they know how to
+26 -3
arch/powerpc/mm/pgtable-frag.c
··· 106 106 return __alloc_for_ptecache(mm, kernel); 107 107 } 108 108 109 + static void pte_free_now(struct rcu_head *head) 110 + { 111 + struct page *page; 112 + 113 + page = container_of(head, struct page, rcu_head); 114 + pgtable_pte_page_dtor(page); 115 + __free_page(page); 116 + } 117 + 109 118 void pte_fragment_free(unsigned long *table, int kernel) 110 119 { 111 120 struct page *page = virt_to_page(table); ··· 124 115 125 116 BUG_ON(atomic_read(&page->pt_frag_refcount) <= 0); 126 117 if (atomic_dec_and_test(&page->pt_frag_refcount)) { 127 - if (!kernel) 128 - pgtable_pte_page_dtor(page); 129 - __free_page(page); 118 + if (kernel) 119 + __free_page(page); 120 + else if (TestClearPageActive(page)) 121 + call_rcu(&page->rcu_head, pte_free_now); 122 + else 123 + pte_free_now(&page->rcu_head); 130 124 } 131 125 } 126 + 127 + #ifdef CONFIG_TRANSPARENT_HUGEPAGE 128 + void pte_free_defer(struct mm_struct *mm, pgtable_t pgtable) 129 + { 130 + struct page *page; 131 + 132 + page = virt_to_page(pgtable); 133 + SetPageActive(page); 134 + pte_fragment_free((unsigned long *)pgtable, 0); 135 + } 136 + #endif /* CONFIG_TRANSPARENT_HUGEPAGE */