From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from canpmsgout05.his.huawei.com (canpmsgout05.his.huawei.com [113.46.200.220]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 456EB3FF88A; Tue, 26 May 2026 14:56:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.220 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779807386; cv=none; b=mkqkqHYctpQPveaHkQNJOKAo7dqmw6uAk8rW+odBWIacck6n7kqPYurvMgrfX+jKsNknfzE6QY6ta1nSyuwqNcAXWjPefRUJcOBkH8p2+XFc0wYFFp0tYraJBidq1SnsYikyuZ65f8xKwTeL8TXY9M5rBM85HPYQc9XqoDxCx14= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779807386; c=relaxed/simple; bh=tIs6LDXW3XYysdHKFfsyuDh05S2fSpj5hhM/ht4Gqls=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Yt9xm1tQHf9Z6uGMNs9gGrAHNH9gZejSyQFfUMYfJIT0OE/c34ZsfAhLVZ1YKobB6bRMrn/5qGUoXHh9zJzaHVaURuDFuaEdPw32SpU61JuVlK707InY3VmU4xDNrzvOQ+SGNi06aqkJTQ2mYaslXXhXXbXHJWeyVaD9hwkYbE8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=aaxZKJZg; arc=none smtp.client-ip=113.46.200.220 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="aaxZKJZg" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=YAntgOTYzemzPb0EO7sTFQO6BvGc9iJeZEmRTSuIcHs=; b=aaxZKJZgaMiO97CRNKgdXbF9a+WdupCXAZJH6aCLKDE/QcIFvdDpw7trUN2xXzftoS/ljUZIs WbPF/+qBEysJMYcTplm5KjDlnSJ7bmDUsBo/PycdedUouph+stsmJVQaALSHyW+Vmh24Jj8Wp+M kjD6iiq6tNQulyrkLP5yR98= Received: from mail.maildlp.com (unknown [172.19.163.0]) by canpmsgout05.his.huawei.com (SkyGuard) with ESMTPS id 4gPwbk08Bnz12LdK; Tue, 26 May 2026 22:48:18 +0800 (CST) Received: from kwepemr500001.china.huawei.com (unknown [7.202.194.229]) by mail.maildlp.com (Postfix) with ESMTPS id 2CE5140561; Tue, 26 May 2026 22:56:18 +0800 (CST) Received: from huawei.com (10.50.87.63) by kwepemr500001.china.huawei.com (7.202.194.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 26 May 2026 22:56:16 +0800 From: Yin Tirui To: Andrew Morton , Matthew Wilcox , David Hildenbrand , Lorenzo Stoakes , Juergen Gross , Jonathan Cameron , Will Deacon CC: Catalin Marinas , Peter Xu , Luiz Capitulino , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Liam R . Howlett" , Zi Yan , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Anshuman Khandual , Rohan McLure , Kevin Brodsky , Alistair Popple , Andrew Donnellan , Pasha Tatashin , Baoquan He , Thomas Huth , Coiby Xu , Dan Williams , Yu-cheng Yu , Lu Baolu , Conor Dooley , Rik van Riel , , , , , , , , , Subject: [PATCH mm-unstable RFC v4 6/7] mm/huge_memory: make move_huge_pmd() use has_deposited_pgtable() Date: Tue, 26 May 2026 22:50:02 +0800 Message-ID: <20260526145003.88445-7-yintirui@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526145003.88445-1-yintirui@huawei.com> References: <20260526145003.88445-1-yintirui@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: kwepems100001.china.huawei.com (7.221.188.238) To kwepemr500001.china.huawei.com (7.202.194.229) Use has_deposited_pgtable() in move_huge_pmd() to decide whether pmd_move_must_withdraw() should move a deposited pgtable instead of using the VMA type. PowerPC radix follows the generic rule. PowerPC hash keeps returning true. Signed-off-by: Yin Tirui --- arch/powerpc/include/asm/book3s/64/pgtable.h | 5 ++--- arch/powerpc/mm/book3s64/pgtable.c | 11 +++++------ mm/huge_memory.c | 20 ++++++++++++-------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index b6629c041e75..a0042cacac8d 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -1424,9 +1424,8 @@ extern pud_t pudp_invalidate(struct vm_area_struct *vma, unsigned long address, #define pmd_move_must_withdraw pmd_move_must_withdraw struct spinlock; -extern int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl, - struct spinlock *old_pmd_ptl, - struct vm_area_struct *vma); +extern bool pmd_move_must_withdraw(struct spinlock *new_pmd_ptl, + struct spinlock *old_pmd_ptl, bool has_deposit); /* * Hash translation mode use the deposited table to store hash pte * slot information. diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c index 85ab6723c8f2..4c45b5762d57 100644 --- a/arch/powerpc/mm/book3s64/pgtable.c +++ b/arch/powerpc/mm/book3s64/pgtable.c @@ -548,15 +548,14 @@ void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, * pmd page. Hence if we have different pmd page we need to withdraw during pmd * move. * - * With hash we use deposited table always irrespective of anon or not. - * With radix we use deposited table only for anonymous mapping. + * With hash we use deposited table always irrespective of has_deposit or not. + * With radix we use the same rule as the generic implementation. */ -int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl, - struct spinlock *old_pmd_ptl, - struct vm_area_struct *vma) +bool pmd_move_must_withdraw(struct spinlock *new_pmd_ptl, + struct spinlock *old_pmd_ptl, bool has_deposit) { if (radix_enabled()) - return (new_pmd_ptl != old_pmd_ptl) && vma_is_anonymous(vma); + return (new_pmd_ptl != old_pmd_ptl) && has_deposit; return true; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8cd77389d52f..be9b637c813b 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2552,17 +2552,14 @@ bool zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, } #ifndef pmd_move_must_withdraw -static inline int pmd_move_must_withdraw(spinlock_t *new_pmd_ptl, - spinlock_t *old_pmd_ptl, - struct vm_area_struct *vma) +static inline bool pmd_move_must_withdraw(spinlock_t *new_pmd_ptl, + spinlock_t *old_pmd_ptl, bool has_deposit) { /* * With split pmd lock we also need to move preallocated * PTE page table if new_pmd is on different PMD page table. - * - * We also don't deposit and withdraw tables for file pages. */ - return (new_pmd_ptl != old_pmd_ptl) && vma_is_anonymous(vma); + return (new_pmd_ptl != old_pmd_ptl) && has_deposit; } #endif @@ -2595,8 +2592,11 @@ bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr, { spinlock_t *old_ptl, *new_ptl; pmd_t pmd; + struct folio *folio = NULL; struct mm_struct *mm = vma->vm_mm; bool force_flush = false; + bool has_deposit; + bool is_present; /* * The destination pmd shouldn't be established, free_pgtables() @@ -2618,11 +2618,15 @@ bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr, if (new_ptl != old_ptl) spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING); pmd = pmdp_huge_get_and_clear(mm, old_addr, old_pmd); - if (pmd_present(pmd)) + is_present = pmd_present(pmd); + if (is_present) force_flush = true; VM_BUG_ON(!pmd_none(*new_pmd)); - if (pmd_move_must_withdraw(new_ptl, old_ptl, vma)) { + folio = normal_or_softleaf_folio_pmd(vma, old_addr, pmd, is_present); + has_deposit = has_deposited_pgtable(vma, pmd, folio); + + if (pmd_move_must_withdraw(new_ptl, old_ptl, has_deposit)) { pgtable_t pgtable; pgtable = pgtable_trans_huge_withdraw(mm, old_pmd); pgtable_trans_huge_deposit(mm, new_pmd, pgtable); -- 2.43.0