From patchwork Sat Feb 18 00:28:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Houghton X-Patchwork-Id: 13145393 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 23F2FC636D6 for ; Sat, 18 Feb 2023 00:29:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0196280017; Fri, 17 Feb 2023 19:29:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B179280002; Fri, 17 Feb 2023 19:29:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 801DD280017; Fri, 17 Feb 2023 19:29:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6A372280002 for ; Fri, 17 Feb 2023 19:29:13 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4BC92A0881 for ; Sat, 18 Feb 2023 00:29:13 +0000 (UTC) X-FDA: 80478528186.12.404B00D Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf13.hostedemail.com (Postfix) with ESMTP id 833622000C for ; Sat, 18 Feb 2023 00:29:11 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=URp4YrNR; spf=pass (imf13.hostedemail.com: domain of 31hvwYwoKCPMeocjpbcojibjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--jthoughton.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=31hvwYwoKCPMeocjpbcojibjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676680151; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=C4SpvvUSe/+H51r29czUV8oyanUNWvkyfpCFhzIRnLk=; b=br2vmX31MbFjMs2SqVl02zP/SBG51B/2cju2vn3tgKR6kxN3Io6ec4Q1Aa2cDTuIrTYRK5 JWHs6neMta0kLUQV9XgjVyQVDFgMI4Y+Aoytg1nXRJZChAd/dXKG6QhGeIfoHB7SGDN4O9 7BJymvqeA9STBPFNYkB4jxhL9lfu1+0= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=URp4YrNR; spf=pass (imf13.hostedemail.com: domain of 31hvwYwoKCPMeocjpbcojibjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--jthoughton.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=31hvwYwoKCPMeocjpbcojibjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676680151; a=rsa-sha256; cv=none; b=tcamOlECvbyGILcQLfMIIS9niG4fYQiOwzd6hl3PVQiJFA7R3kdqhSfUrogjNfR1EPeDfj QrDyaT2Ia2gjRAwqklo+KZiM76FIOz8cdua6U2WoPDgRkVCLJNDSt/RUCKEDjLiLwyveAX 1/pmQ71f4ExkWXe4zHSZ9O31KN0vWnM= Received: by mail-yb1-f201.google.com with SMTP id q10-20020a056902150a00b0091b90b20cd9so1737439ybu.6 for ; Fri, 17 Feb 2023 16:29:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=C4SpvvUSe/+H51r29czUV8oyanUNWvkyfpCFhzIRnLk=; b=URp4YrNRsXrEMcz5vF68rwrPTWL0r/1PsOn0iwRwzUv8fGWjA2Zj3WsCDtOHnnEOXI 9xQcdgSYjiC0L8FMkrysuWd8Z4rTcFfESiyb98ZDWB3Rpv8/7b3sLIWRQtcVzhoZSCmY 1q2oSqG9SQQKP9k9222Pkp5CKnK0J5shuyy4KwIs9snSVsRw3F9uu39yYj2MkyXE/1KV b/75TnZWsolWJ9o2Dg5OQzts7dH32JqEhtpz0u50LcpTAXPOuZwDBizDHafxqGuZbm79 w0zdlsUS9tlTAwK9A8se/3bTurakeHRO+WC3ta4JwV799mBHwIfC4VY+Lrp2ra7exXyR sdeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=C4SpvvUSe/+H51r29czUV8oyanUNWvkyfpCFhzIRnLk=; b=WDk0nglqXiqVHRyg6AupfmhhdS7DTeehJqLJto0jnzMYbkhNM2+hEWTd5sMNkkYvBp U2UO3KxFJg98kDx/3U+nIcr6Nu9aNwB/JRtPuodU3PW5i+hC81bnModC68tnSMOcYzLn zfI7TGQyRse++8QkKAgT/8KZ4/HURnocOSq5+G45EQNSWj3n1YruqzPZ4vbQLWKODXeQ iAEZquVy2DxYmG3LUh5bFCm8Ei0FUBEpJxlg/rNoaTTrv6TnQm1hHcJH7xiRIMw+/ajj UXdQ3YgBjdd4OQ3X+5niBaaZLzpOipE4ZyEYDF+G0D7/1dQTDEIiWWHrm6RFhjhqqBsi v+8g== X-Gm-Message-State: AO0yUKUyu4OfpMd+02GnYi+M90mu9bIXrWrXOgksheDyQlxwMx1TXBr2 Z2fjc5RRNhtSkubiKTzXx9C7GaJAOzMzvAVI X-Google-Smtp-Source: AK7set/928+LwO6Lgp5pRPZtsNiWTzN/B8EG4aLn4PvCGnxGZvLIKoC9wr4DtxldmQEi9jOl1xJbJJDcIzKsLS/r X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a81:ac66:0:b0:52e:ed7f:6e82 with SMTP id z38-20020a81ac66000000b0052eed7f6e82mr257319ywj.9.1676680150801; Fri, 17 Feb 2023 16:29:10 -0800 (PST) Date: Sat, 18 Feb 2023 00:28:00 +0000 In-Reply-To: <20230218002819.1486479-1-jthoughton@google.com> Mime-Version: 1.0 References: <20230218002819.1486479-1-jthoughton@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Message-ID: <20230218002819.1486479-28-jthoughton@google.com> Subject: [PATCH v2 27/46] mm: rmap: update try_to_{migrate,unmap} to handle mapcount for HGM From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu , Andrew Morton Cc: David Hildenbrand , David Rientjes , Axel Rasmussen , Mina Almasry , "Zach O'Keefe" , Manish Mishra , Naoya Horiguchi , "Dr . David Alan Gilbert" , "Matthew Wilcox (Oracle)" , Vlastimil Babka , Baolin Wang , Miaohe Lin , Yang Shi , Frank van der Linden , Jiaqi Yan , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton X-Rspamd-Queue-Id: 833622000C X-Stat-Signature: bhq3j3szq8j48366zdzhc4bsrnynhpdn X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1676680151-665841 X-HE-Meta: U2FsdGVkX1/HZDFnF0dYV690ESXbfa6mlegKu6vTvyH8Faa7zwl5qAMQ237LHcmEPpjF7vGMn4nnC/IviWN0G6/8vNm+pLEkCFQ89cPB1CzcUWF13ffRo9LndIKGvAzxUNfH1ewFeQbiDVUS7vUPFS3hsJzCfXHY6rPqluKvTH4Nxjm0kSZYHK8GLTPbbqgzp2GcrUn5g4mJkPM6jxAuW7DvGJx15P1i/B0ACCeMaizWRYD0BfEBNPBzFhhuR39kl3tKpU32/vzSYVs+vzoqtIEH4Yh6e5yUjjCKDZZQEDjcQfs4l94XZPlITOE1ut78Jp/DLBEkh9I+8CHQwYU9n4Pvj4CF/CQWYpCqDLTRz2mELkW3i/mbTNcOINIcS5e6llQK+XCKW2d8okgWNMpYRofPmsZiUIdIxm127dQY/GYMnz3SYw064ByKCFBFZwMwiBnxgf+LNhAr/JmPgll4Rog+MY+G9JvwrVcJsAM6hOvikcQ6ESnp+fCrFK81jQWWtUl0aC3KU6GmmCq68M+FiwRwDnEhiQyV7x08OvOzn3hB57GrumcxasUiOCKUIcmS4UyJTTZlREZOH3QuHahBGyIDl+oJEXUDzn4hTJexHw+hPrFU6IcjlGKnAdib1jY+uXdvhJq0uMjH0Yhj9fRgZSpLVep7qUxzm6Ab6/EQ7DaH/6OP04l5yD9Bmm95uVT9C4JQR1rVaANeiGyscdEbVMgxGeAY0t7oD2SmZQEL+CI1keTzOybiD+j6fsaiybR8v+G0EpSI04YK6QyhE5MJ+sE8uBkVAqUpb39NrLDaDenS+UGqB0UOyJKKEE7Ea0PoDSnQPoV0qmJ+duIJLV0ABFxmfc+nDpMfk0VXLLpJErx4qvKKrJRLtHl4O3HiDfjMXBfIk6hVjch8MCLMzZOpCBMeu7nKJnpRRe/IhuNQ2qcs0ZGsArgkvnnGhAInWiI7g7kIjyXZuI/Bl+K7GXJ il44uYCD eTTcARiwoxx25hTIxzU5bA9LxyiLk5cT8ZYykhaDw4VLKxmsmee6ZT9o9jI7P39SIol3UveNwdKEumR5HaEI5bl5kPbJZr5Yp6ssh2YuET8Al1wWPucR8Z08t2J/pym1bjW1EP6ohEDL9ZMRDcuZBYeaWyrBf9kIibvbA1tMRtLYr117xPBSHHak3lODsxd2gi2AVjN1iprjDIbyOeZU32M2B4Ot9UYKOO+3orUn27XtXYwxDt8/VpxcIVDqCKgSn4LhYZpX9beWv2RgIjAajQM9ThmbRIr5Ifuy3MHi57tyiYJdsa8LKDNnMtDEXxYqCOotubhJu7X4VAgi2bj2gEiBdyMbpg8UMD2qIGSNGp/WFGFIJd9Rmw7xNOTn1+bOHaQA3/GMJqyO8YRXX2MEF+TvHOW8ig3vzgKM9+mv1JuhE+vN/uGOqpbtt/sBcLojEQMDTODF5wAQht3cWjGLXQy2XWmMdFZo/dgfaiZord1ZdWyhlcvUEg4gsn1eyg39F4PWCJ+NCY9hbAQ+x/lg3ccPcqpve0eCippn/7zJsfj76w5OW/agd2RvejIuziQeYssVLTmw5INV1EHfu1V6bXQwCsL87LK2Cd4C4XeAauT76hFw= 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: Make use of the new pvmw->pte_order field to determine the size of the PTE we're unmapping/migrating. Signed-off-by: James Houghton diff --git a/mm/migrate.c b/mm/migrate.c index 9b4a7e75f6e6..616afcc40fdc 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -247,7 +247,7 @@ static bool remove_migration_pte(struct folio *folio, #ifdef CONFIG_HUGETLB_PAGE if (folio_test_hugetlb(folio)) { - unsigned int shift = huge_page_shift(hstate_vma(vma)); + unsigned int shift = pvmw.pte_order + PAGE_SHIFT; pte = arch_make_huge_pte(pte, shift, vma->vm_flags); if (folio_test_anon(folio)) diff --git a/mm/rmap.c b/mm/rmap.c index c010d0af3a82..0a019ae32f04 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1609,7 +1609,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, if (PageHWPoison(subpage) && !(flags & TTU_IGNORE_HWPOISON)) { pteval = swp_entry_to_pte(make_hwpoison_entry(subpage)); if (folio_test_hugetlb(folio)) { - hugetlb_count_sub(folio_nr_pages(folio), mm); + hugetlb_count_sub(1UL << pvmw.pte_order, mm); set_huge_pte_at(mm, address, pvmw.pte, pteval); } else { dec_mm_counter(mm, mm_counter(&folio->page)); @@ -1757,7 +1757,13 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, * * See Documentation/mm/mmu_notifier.rst */ - page_remove_rmap(subpage, vma, folio_test_hugetlb(folio)); + if (folio_test_hugetlb(folio)) + hugetlb_remove_rmap(subpage, + pvmw.pte_order + PAGE_SHIFT, + hstate_vma(vma), vma); + else + page_remove_rmap(subpage, vma, false); + if (vma->vm_flags & VM_LOCKED) mlock_drain_local(); folio_put(folio); @@ -2020,7 +2026,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, } else if (PageHWPoison(subpage)) { pteval = swp_entry_to_pte(make_hwpoison_entry(subpage)); if (folio_test_hugetlb(folio)) { - hugetlb_count_sub(folio_nr_pages(folio), mm); + hugetlb_count_sub(1L << pvmw.pte_order, mm); set_huge_pte_at(mm, address, pvmw.pte, pteval); } else { dec_mm_counter(mm, mm_counter(&folio->page)); @@ -2112,7 +2118,12 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, * * See Documentation/mm/mmu_notifier.rst */ - page_remove_rmap(subpage, vma, folio_test_hugetlb(folio)); + if (folio_test_hugetlb(folio)) + hugetlb_remove_rmap(subpage, + pvmw.pte_order + PAGE_SHIFT, + hstate_vma(vma), vma); + else + page_remove_rmap(subpage, vma, false); if (vma->vm_flags & VM_LOCKED) mlock_drain_local(); folio_put(folio); @@ -2196,6 +2207,8 @@ static bool page_make_device_exclusive_one(struct folio *folio, args->owner); mmu_notifier_invalidate_range_start(&range); + VM_BUG_ON_FOLIO(folio_test_hugetlb(folio), folio); + while (page_vma_mapped_walk(&pvmw)) { /* Unexpected PMD-mapped THP? */ VM_BUG_ON_FOLIO(!pvmw.pte, folio);