On Sun, 28 May 2023, Hugh Dickins wrote: > Add s390-specific pte_free_defer(), to call pte_free() 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 version is more complicated than others: because page_table_free() > needs to know which fragment is being freed, and which mm to link it to. > > page_table_free()'s fragment handling is clever, but I could too easily > break it: what's done here in pte_free_defer() and pte_free_now() might > be better integrated with page_table_free()'s cleverness, but not by me! > > By the time that page_table_free() gets called via RCU, it's conceivable > that mm would already have been freed: so mmgrab() in pte_free_defer() > and mmdrop() in pte_free_now(). No, that is not a good context to call > mmdrop() from, so make mmdrop_async() public and use that. But Matthew Wilcox quickly pointed out that sharing one page->rcu_head between multiple page tables is tricky: something I knew but had lost sight of. So the powerpc and s390 patches were broken: powerpc fairly easily fixed, but s390 more painful. In https://lore.kernel.org/linux-s390/20230601155751.7c949ca4@thinkpad-T15/ On Thu, 1 Jun 2023 15:57:51 +0200 Gerald Schaefer <gerald.schaefer@xxxxxxxxxxxxx> wrote: > > Yes, we have 2 pagetables in one 4K page, which could result in same > rcu_head reuse. It might be possible to use the cleverness from our > page_table_free() function, e.g. to only do the call_rcu() once, for > the case where both 2K pagetable fragments become unused, similar to > how we decide when to actually call __free_page(). > > However, it might be much worse, and page->rcu_head from a pagetable > page cannot be used at all for s390, because we also use page->lru > to keep our list of free 2K pagetable fragments. I always get confused > by struct page unions, so not completely sure, but it seems to me that > page->rcu_head would overlay with page->lru, right? Sigh, yes, page->rcu_head overlays page->lru. But (please correct me if I'm wrong) I think that s390 could use exactly the same technique for its list of free 2K pagetable fragments as it uses for its list of THP "deposited" pagetable fragments, over in arch/s390/mm/pgtable.c: use the first two longs of the page table itself for threading the list. And while it could use third and fourth longs instead, I don't see any need for that: a deposited pagetable has been allocated, so would not be on the list of free fragments. Below is one of the grossest patches I've ever posted: gross because it's a rushed attempt to see whether that is viable, while it would take me longer to understand all the s390 cleverness there (even though the PP AA commentary above page_table_alloc() is excellent). I'm hoping the use of page->lru in arch/s390/mm/gmap.c is disjoint. And cmma_init_nodat()? Ah, that's __init so I guess disjoint. Gerald, s390 folk: would it be possible for you to give this a try, suggest corrections and improvements, and then I can make it a separate patch of the series; and work on avoiding concurrent use of the rcu_head by pagetable fragment buddies (ideally fit in with the scheme already there, maybe DD bits to go along with the PP AA). Why am I even asking you to move away from page->lru: why don't I thread s390's pte_free_defer() pagetables like THP's deposit does? I cannot, because the deferred pagetables have to remain accessible as valid pagetables, until the RCU grace period has elapsed - unless all the list pointers would appear as pte_none(), which I doubt. (That may limit our possibilities with the deposited pagetables in future: I can imagine them too wanting to remain accessible as valid pagetables. But that's not needed by this series, and s390 only uses deposit/withdraw for anon THP; and some are hoping that we might be able to move away from deposit/withdraw altogther - though powerpc's special use will make that more difficult.) Thanks! Hugh --- 6.4-rc5/arch/s390/mm/pgalloc.c +++ linux/arch/s390/mm/pgalloc.c @@ -232,6 +232,7 @@ void page_table_free_pgste(struct page * */ unsigned long *page_table_alloc(struct mm_struct *mm) { + struct list_head *listed; unsigned long *table; struct page *page; unsigned int mask, bit; @@ -241,8 +242,8 @@ unsigned long *page_table_alloc(struct m table = NULL; spin_lock_bh(&mm->context.lock); if (!list_empty(&mm->context.pgtable_list)) { - page = list_first_entry(&mm->context.pgtable_list, - struct page, lru); + listed = mm->context.pgtable_list.next; + page = virt_to_page(listed); mask = atomic_read(&page->_refcount) >> 24; /* * The pending removal bits must also be checked. @@ -259,9 +260,12 @@ unsigned long *page_table_alloc(struct m bit = mask & 1; /* =1 -> second 2K */ if (bit) table += PTRS_PER_PTE; + BUG_ON(table != (unsigned long *)listed); atomic_xor_bits(&page->_refcount, 0x01U << (bit + 24)); - list_del(&page->lru); + list_del(listed); + set_pte((pte_t *)&table[0], __pte(_PAGE_INVALID)); + set_pte((pte_t *)&table[1], __pte(_PAGE_INVALID)); } } spin_unlock_bh(&mm->context.lock); @@ -288,8 +292,9 @@ unsigned long *page_table_alloc(struct m /* Return the first 2K fragment of the page */ atomic_xor_bits(&page->_refcount, 0x01U << 24); memset64((u64 *)table, _PAGE_INVALID, 2 * PTRS_PER_PTE); + listed = (struct list head *)(table + PTRS_PER_PTE); spin_lock_bh(&mm->context.lock); - list_add(&page->lru, &mm->context.pgtable_list); + list_add(listed, &mm->context.pgtable_list); spin_unlock_bh(&mm->context.lock); } return table; @@ -310,6 +315,7 @@ static void page_table_release_check(str void page_table_free(struct mm_struct *mm, unsigned long *table) { + struct list_head *listed; unsigned int mask, bit, half; struct page *page; @@ -325,10 +331,24 @@ void page_table_free(struct mm_struct *m */ mask = atomic_xor_bits(&page->_refcount, 0x11U << (bit + 24)); mask >>= 24; - if (mask & 0x03U) - list_add(&page->lru, &mm->context.pgtable_list); - else - list_del(&page->lru); + if (mask & 0x03U) { + listed = (struct list_head *)table; + list_add(listed, &mm->context.pgtable_list); + } else { + /* + * Get address of the other page table sharing the page. + * There are sure to be MUCH better ways to do all this! + * But I'm rushing, while trying to keep to the obvious. + */ + listed = (struct list_head *)(table + PTRS_PER_PTE); + if (virt_to_page(listed) != page) { + /* sizeof(*listed) is twice sizeof(*table) */ + listed -= PTRS_PER_PTE; + } + list_del(listed); + set_pte((pte_t *)&listed->next, __pte(_PAGE_INVALID)); + set_pte((pte_t *)&listed->prev, __pte(_PAGE_INVALID)); + } spin_unlock_bh(&mm->context.lock); mask = atomic_xor_bits(&page->_refcount, 0x10U << (bit + 24)); mask >>= 24; @@ -349,6 +369,7 @@ void page_table_free(struct mm_struct *m void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table, unsigned long vmaddr) { + struct list_head *listed; struct mm_struct *mm; struct page *page; unsigned int bit, mask; @@ -370,10 +391,24 @@ void page_table_free_rcu(struct mmu_gath */ mask = atomic_xor_bits(&page->_refcount, 0x11U << (bit + 24)); mask >>= 24; - if (mask & 0x03U) - list_add_tail(&page->lru, &mm->context.pgtable_list); - else - list_del(&page->lru); + if (mask & 0x03U) { + listed = (struct list_head *)table; + list_add_tail(listed, &mm->context.pgtable_list); + } else { + /* + * Get address of the other page table sharing the page. + * There are sure to be MUCH better ways to do all this! + * But I'm rushing, and trying to keep to the obvious. + */ + listed = (struct list_head *)(table + PTRS_PER_PTE); + if (virt_to_page(listed) != page) { + /* sizeof(*listed) is twice sizeof(*table) */ + listed -= PTRS_PER_PTE; + } + list_del(listed); + set_pte((pte_t *)&listed->next, __pte(_PAGE_INVALID)); + set_pte((pte_t *)&listed->prev, __pte(_PAGE_INVALID)); + } spin_unlock_bh(&mm->context.lock); table = (unsigned long *) ((unsigned long) table | (0x01U << bit)); tlb_remove_table(tlb, table);
