From patchwork Mon Apr 29 13:23:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13646956 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF3E2C4345F for ; Mon, 29 Apr 2024 13:28:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 843876B008C; Mon, 29 Apr 2024 09:28:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CCA76B0092; Mon, 29 Apr 2024 09:28:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6453F6B0093; Mon, 29 Apr 2024 09:28:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 430526B008C for ; Mon, 29 Apr 2024 09:28:34 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CC490160312 for ; Mon, 29 Apr 2024 13:28:33 +0000 (UTC) X-FDA: 82062648906.09.0F00406 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf01.hostedemail.com (Postfix) with ESMTP id DDFAE40010 for ; Mon, 29 Apr 2024 13:28:31 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=iMR3Ipca; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=ioworker0@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714397311; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=n0uX1PNQF5MmTPU2a0E5f9o7BDyWnY3Y+gAjJZ1Yc8M=; b=eZ7mlT0+Cp0HS8fdF3KVX8mge5rTSdFh+Jt78w6or50kqsXIsCo+gVEQWl3Q6ykq8r/iz/ ZeHVzxtSJBePVirC2pLgp19goNYwJ2dbOFqVsvDbCuu1AtkNUcdBweGsAhJvBQ+9rZCAEt zeQT8Iqku0fwS411ILcy+TWRAOuMelE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714397311; a=rsa-sha256; cv=none; b=fReczOZkZm4qzTknTYV2z2WuZfbm15/rtYFxnHhZ8mzYm7QoTyLf+5RHfCdO66mCsJT9Mz 5GqZMtV9X6ZCvKcrZbfjaOAnUFgyzP4VqBOchGh6BFKv2grXF2OaYdo55t9UZifOg9Houh qIGiXGu/qZABpa4OJOI/i6S92GKfCPI= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=iMR3Ipca; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=ioworker0@gmail.com Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2a7e19c440dso3270220a91.3 for ; Mon, 29 Apr 2024 06:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714397011; x=1715001811; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n0uX1PNQF5MmTPU2a0E5f9o7BDyWnY3Y+gAjJZ1Yc8M=; b=iMR3IpcaLfArtrEb6TkM9Cc9kIau5Ez6ZjR+QuAPBzSnHR5la8JlLOP0WwMOpvi4mZ CPeZXcUcTz+Hk0F+G5mUy8okqOpzr1eabKmFjFZT6fG/ueZaX3QayPMjNmPmclsk8aiH pYToMeVX/G+I5gtgF4YwavpYVcoxu6nwZY+mhof+WjWvWHm2ApyoEEIk8qtGxRZJVoHO gKWdmbNOioJ2lQrZpH7u85qDfiF092/YfTDI7vathivm620kduxGsxuah92qaAlj90bx +GM4HS4LqPUuC7ez31aKOX8jCTGWLLceJume9j/qXSTD2oYjwS762tEWvRHEEGL3Plrz REgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714397011; x=1715001811; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n0uX1PNQF5MmTPU2a0E5f9o7BDyWnY3Y+gAjJZ1Yc8M=; b=kWUPRcpH+IW/pf2CmoKmT9/LXKtc+L4421iSaNWluaSgFiA87IQPyid1iQph8jgUoU +J9f+hHSAqScYIjL8fDZpIzd/twrgPZvv+0OSGYTA4QXnnFLKY7hW0pdJsVs9Dlzj3Ca oSTiD0o+0ORe9wn8EGnQe7DaTDKiaZImmni0UvapdCDVhp/syODcXED66xy6wF/LNnY2 yk8jgSpyNW4y5mkRBfvjohJ4bA1mEuHziViC56kL0CgFqLEco4bHRDVrdyOFyvN6qz7t 9byGJTjtPKriNn+ma8SrFl9VPJW7qjv1SWUDGmw96arGGKfmR9MdqKJfeZ3PKXWF1HH7 CgvQ== X-Forwarded-Encrypted: i=1; AJvYcCUzZt04PcpL9Gn4+RHyTYbBv1XxZwG9xmjhVFxW8hanXo4TCQJZLDRNvvce0Kza0lNNdorDbcbmMRruhhVzUEKkMcY= X-Gm-Message-State: AOJu0Yz0153aPYhqXf0B3WlR0YuYbMWy5SmpDxbwVn3EecpnBEJ4VyKK icIO6ypNuvYS5fwvT/Uaq4MEx2gktZ/cIlD+4GmKrT5m471KWfIN X-Google-Smtp-Source: AGHT+IH00XT4RfnkbDwUikAke+mh2nPnvqKZSzC4cJaeYd/fumPPlELDwUFfWyS2bd6+sld6pIyFMg== X-Received: by 2002:a17:90b:4387:b0:2af:e1f8:11a4 with SMTP id in7-20020a17090b438700b002afe1f811a4mr8642414pjb.19.1714397010666; Mon, 29 Apr 2024 06:23:30 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.242]) by smtp.gmail.com with ESMTPSA id pa5-20020a17090b264500b002b113ad5f10sm3562203pjb.12.2024.04.29.06.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 06:23:30 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: willy@infradead.org, maskray@google.com, ziy@nvidia.com, ryan.roberts@arm.com, david@redhat.com, 21cnbao@gmail.com, mhocko@suse.com, fengwei.yin@intel.com, zokeefe@google.com, shy828301@gmail.com, xiehuan09@gmail.com, libang.li@antgroup.com, wangkefeng.wang@huawei.com, songmuchun@bytedance.com, peterx@redhat.com, minchan@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lance Yang Subject: [PATCH v3 2/3] mm/rmap: integrate PMD-mapped folio splitting into pagewalk loop Date: Mon, 29 Apr 2024 21:23:07 +0800 Message-Id: <20240429132308.38794-3-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240429132308.38794-1-ioworker0@gmail.com> References: <20240429132308.38794-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: DDFAE40010 X-Stat-Signature: 9b1m5jg1bfjfe51bky5gsfhcsu7qwyrt X-Rspam-User: X-HE-Tag: 1714397311-93011 X-HE-Meta: U2FsdGVkX1++l3NoqzfzV2stIrn/dTGWd+VLCgarpmQJcobnkaKbBz+fGKQDrUBK/gh158cJm912Ue3G1rZ+eo+0jQqKOicIY2jIgkqQqP4lYzTqze17dvL4hJsqJjx0qMlcToN0Rr1jYTaFetb7qEoUEmidGscsKaHQpeYfWq3uSUwIw9ytKy67cPF2QSpffbzjdQxrMNJfqdiUUHN6cX0rIERgXlY8daj5gTTW54Az0KkI/g7uim04ks0+9xpk1EOYG2Jp39R39sshonxhUBviHREe6moFm3acoWNRyvXqEg9OJyA9qkMpheaHXP/L9uTiHi8jOJaBa8TZPruzBkRAFgsQu3OX/stnx8XDmzrt+CENRJrNKC6dGNXu/8rgAE7UoH8egQ61TtZsU1SmCFKuxiBLcQVfNnGZDm0fOQBMr1dzsioe8mQWrivO0t+TGMOtx7htjulLXpw0lrhZcXYEwlYDzD/XxC2uLo6eVhGkurGtQzlpWh4cLhILtbkntTRqb90qk4mrdrJm4/rSfnzlR38txYN9xraW2wa/XfiTljFXPV36RHVcRh2Uc8PxnxwPi8qf5YjwPD6YCg5ZpmLJOe2gpczCMkyvMLdsQK0NBZL7saV3WP1++GKNP1wOf20RN4EckAw3fWzWpo/EUZRTiJGzYC6sulKBvk/jPr3JywUYl/oQInXCFQ0wcecPkgR371w+vjhHEkM6aZx/WijHFDmRlNvnWQpYWMJSP20RT3E6tTTiNUxSnF6UuN11159XprlZIKhvynQwwU9AinNqL9Obu7NWIgWwEPeW8+QUVh59Z/uSG6wbeq2iwQZnLSAXl4wSuAPo3KgxXM96Xfi4f7OK6rWxj0UOV6HdUVEpr6++OpwPO+8zIRQ4zhibMsqq60QC6xnDCBT+dGP4Ej6a8xhq7540QzjteB+n6GFi2uG8TxcaMLsbkPC333CXG+G5ZMzA8CSAvra82ev 6gq2As2j x4GgtxD5j3tJwHWupJTWvHLpgQ5S5Ldiax6/086wQENN3P8/DGYPtoR07rwDiIFmeE1jv4ilsiT1x06mBqTvn7UPOccu20z0MwX4HLIDdXHNwnqscxJEu5vWYkLefa78sCdvpdufMu2QdYmh5+6cMU0K/AAu2LYLpzeXenx6F3V0cgsi7MAAHVs2ZokhUVStP40eg62FM6s0XC7+Y3ToufAlVklmZQm+RfCGR292hMHCj1SUQTTnQeSpX6kOiAmaVm3mesbnpbtiLehAUWuLKqR4w7G1PQ8/AM7Rjo8HqPeRpjUCvpfASesPXfmyinhf6ZYBkovmReR8CXGY9kA5tCj//Wed7gqQrSk4sCOep8mZVOXD8qOKJH/cuw6K1WXtwDhPM9gwKwd+qQbWPejvLFwXKY73y5Ku12RSb3aqGJxc++gEaeDOgW/yfzemn/dKMn/uRQsffs0vSg+pPDPySyXW+8g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In preparation for supporting try_to_unmap_one() to unmap PMD-mapped folios, start the pagewalk first, then call split_huge_pmd_address() to split the folio. Suggested-by: David Hildenbrand Signed-off-by: Lance Yang --- include/linux/huge_mm.h | 2 ++ mm/huge_memory.c | 42 +++++++++++++++++++++-------------------- mm/rmap.c | 26 +++++++++++++++++++------ 3 files changed, 44 insertions(+), 26 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index c8d3ec116e29..2daadfcc6776 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -36,6 +36,8 @@ bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr, int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, pmd_t *pmd, unsigned long addr, pgprot_t newprot, unsigned long cp_flags); +void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, + pmd_t *pmd, bool freeze, struct folio *folio); vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write); vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write); diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8261b5669397..145505a1dd05 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2584,6 +2584,27 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, pmd_populate(mm, pmd, pgtable); } +void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, + pmd_t *pmd, bool freeze, struct folio *folio) +{ + VM_WARN_ON_ONCE(folio && !folio_test_pmd_mappable(folio)); + VM_WARN_ON_ONCE(!IS_ALIGNED(address, HPAGE_PMD_SIZE)); + VM_WARN_ON_ONCE(folio && !folio_test_locked(folio)); + VM_BUG_ON(freeze && !folio); + + /* + * When the caller requests to set up a migration entry, we + * require a folio to check the PMD against. Otherwise, there + * is a risk of replacing the wrong folio. + */ + if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) || + is_pmd_migration_entry(*pmd)) { + if (folio && folio != pmd_folio(*pmd)) + return; + __split_huge_pmd_locked(vma, pmd, address, freeze); + } +} + void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, unsigned long address, bool freeze, struct folio *folio) { @@ -2595,26 +2616,7 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, (address & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE); mmu_notifier_invalidate_range_start(&range); ptl = pmd_lock(vma->vm_mm, pmd); - - /* - * If caller asks to setup a migration entry, we need a folio to check - * pmd against. Otherwise we can end up replacing wrong folio. - */ - VM_BUG_ON(freeze && !folio); - VM_WARN_ON_ONCE(folio && !folio_test_locked(folio)); - - if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) || - is_pmd_migration_entry(*pmd)) { - /* - * It's safe to call pmd_page when folio is set because it's - * guaranteed that pmd is present. - */ - if (folio && folio != pmd_folio(*pmd)) - goto out; - __split_huge_pmd_locked(vma, pmd, range.start, freeze); - } - -out: + split_huge_pmd_locked(vma, range.start, pmd, freeze, folio); spin_unlock(ptl); mmu_notifier_invalidate_range_end(&range); } diff --git a/mm/rmap.c b/mm/rmap.c index 7e2575d669a9..e42f436c7ff3 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1636,9 +1636,6 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, if (flags & TTU_SYNC) pvmw.flags = PVMW_SYNC; - if (flags & TTU_SPLIT_HUGE_PMD) - split_huge_pmd_address(vma, address, false, folio); - /* * For THP, we have to assume the worse case ie pmd for invalidation. * For hugetlb, it could be much worse if we need to do pud @@ -1650,6 +1647,10 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, range.end = vma_address_end(&pvmw); mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma->vm_mm, address, range.end); + if (flags & TTU_SPLIT_HUGE_PMD) { + range.start = address & HPAGE_PMD_MASK; + range.end = (address & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE; + } if (folio_test_hugetlb(folio)) { /* * If sharing is possible, start and end will be adjusted @@ -1664,9 +1665,6 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, mmu_notifier_invalidate_range_start(&range); while (page_vma_mapped_walk(&pvmw)) { - /* Unexpected PMD-mapped THP? */ - VM_BUG_ON_FOLIO(!pvmw.pte, folio); - /* * If the folio is in an mlock()d vma, we must not swap it out. */ @@ -1678,6 +1676,22 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, goto walk_done_err; } + if (!pvmw.pte && (flags & TTU_SPLIT_HUGE_PMD)) { + /* + * We temporarily have to drop the PTL and start once + * again from that now-PTE-mapped page table. + */ + split_huge_pmd_locked(vma, range.start, pvmw.pmd, false, + folio); + pvmw.pmd = NULL; + spin_unlock(pvmw.ptl); + flags &= ~TTU_SPLIT_HUGE_PMD; + continue; + } + + /* Unexpected PMD-mapped THP? */ + VM_BUG_ON_FOLIO(!pvmw.pte, folio); + pfn = pte_pfn(ptep_get(pvmw.pte)); subpage = folio_page(folio, pfn - folio_pfn(folio)); address = pvmw.address;