From patchwork Mon Feb 10 19:37:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13968590 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 1BB78C0219E for ; Mon, 10 Feb 2025 19:38:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9804B28000C; Mon, 10 Feb 2025 14:38:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 930BF28000B; Mon, 10 Feb 2025 14:38:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B64128000C; Mon, 10 Feb 2025 14:38:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 5996028000B for ; Mon, 10 Feb 2025 14:38:48 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 150521404A6 for ; Mon, 10 Feb 2025 19:38:48 +0000 (UTC) X-FDA: 83105047536.28.4E2919E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id D580BA0004 for ; Mon, 10 Feb 2025 19:38:45 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S7+Hv9qA; spf=pass (imf15.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739216325; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LvU1uLGkpTPZRA0QaV3EggyJAUMnys9Fj6An1hzKeYY=; b=3toT9jSBq1Mddxc8F3/SYdshN83wgPCBcXUxeYV4///fUXqrCLId5uBpf9TDpfnMXqugPr 52EgKFg26eajZKgSB1Thw071Q8wMHZa3EdBLfl8rzmGna6vdWqA4QSEFotVUVzBJw5vG+y EchtkYYYbeVxR1uAFU6ENKL/hZfmZOU= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S7+Hv9qA; spf=pass (imf15.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739216325; a=rsa-sha256; cv=none; b=LrVFQ583xtJRbJiWvfQz+SvJtoNi+2wAzJS9SklyzMV9+8wl/y9AtBvjf0FzelpLQq1ljS iukHrfffButFBx11idRXQd5nuuEVPFwJnKweL/xBp4TfvmsQi9tIqRDk7O2ddfQLkml6ci YjuO7eLVejdyVqEglmc5oWFgjAX5TjU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739216325; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LvU1uLGkpTPZRA0QaV3EggyJAUMnys9Fj6An1hzKeYY=; b=S7+Hv9qATbgD7eU6BGWJHQtjFg/XvWB5bxFfUvSqvsOhtRdcEE4IeNgiClOMF31rNHIsEG P3IclXPcm/3yAy8TpJcR7uPWWc8jYMJuSkC+S2LCDxm01ykS8d4CFcyeFxTJ9lDHvH/Ymv F1F/6HsUs6VtGKyFIiYYc8ITAqq2JEU= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612-qAW7PO1uNM6XNHE_OFeuRA-1; Mon, 10 Feb 2025 14:38:44 -0500 X-MC-Unique: qAW7PO1uNM6XNHE_OFeuRA-1 X-Mimecast-MFC-AGG-ID: qAW7PO1uNM6XNHE_OFeuRA Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43933b8d9b1so12562095e9.3 for ; Mon, 10 Feb 2025 11:38:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739216322; x=1739821122; 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=LvU1uLGkpTPZRA0QaV3EggyJAUMnys9Fj6An1hzKeYY=; b=gfVgyHmp2DlBsVLGf/2Nh6rv+MeVKtJcO1I42eH5teWObh+MsnlrX6ZAIol0Ilh2MZ LxInqSHuULtOwpUMtKF/021eqvaMIZENF24A2GajCnIXtV1ARtQZ8iO00zSCJtAA8rKS Bv9ea1to0ee9vQsp9h8HbCSGvUGLkO9mtXbVaV2orN9mMixUG1y26bjDlZb1B9inqWPl a4J/PQ8HMHeHmKQj49LbhAmpvJJh0uMaqO3f8bGpy2JIA21l2IXE7KRpaEkMxREocEEH jPYWp1PruvAEEuFDYAOoMQk/q8Vc0Czh63K21dRBXxb/7npOEnx6cT6IrTMipWVxX2r4 Z/SA== X-Forwarded-Encrypted: i=1; AJvYcCUrWSyYWr5KXtDzSPcYYVAezoEWqlMUIf5nZQWqJhe7rUqhTim+Jq4vCin61OCrvVOqSXCQqItcng==@kvack.org X-Gm-Message-State: AOJu0YyNBrNtPbi0SlPRYd+aCZtySOO5WUsgmtJTIvbWWUI9QjNkYRlR FeN/qe9UZ6MJYF7Wxqtv99wdZZzDJQLjzDW6FR5U9Yu2F+2UH2dmOW3oKxvh1/frzOA/6JuSaMH ZiB3dtUpypRFCeiiATsTtewAdyO9RukdhyWl8XXxPbcTPj7FK X-Gm-Gg: ASbGncsgtZ9TbjNYZNJvgFaW0MnqvUaLMquxAAOuD6FqBfx1a+AY7Qbl8/HgYTE+qxt iWRuPFx0urCPByuCOze62CFS1ffWmW7g9a1CCVRtyGafx30gDSTke7mt12Zdm8fZo1pRWpnuQj2 OgS3WhPT15fueEAQE6y813OovqtFHNuOtp16s7oiBbyFkY9cS9TMM4QTsEw0Rj+zsbiKvLXCsEr z1+cF5T0kI4evI1auy9u2vsDyCdZ/DwhBGxjZKpyDrxilXKb93fnYvSsXNhVHFqs5FMEYGAinMx IPNP2WYdXl16qRINUKnYm3EKw2EcldcPYSdqntrPU8FAbBSxddWaEQx4Id/sGj9YYg== X-Received: by 2002:a05:600c:1e0e:b0:431:5e3c:2ff0 with SMTP id 5b1f17b1804b1-439249889a8mr117196245e9.8.1739216322490; Mon, 10 Feb 2025 11:38:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjSKW3zWL6vzVGiNBIPirrt7XpGCC7ElTlo8fIz4HKSkBODD3ovt81FL+SvLTQ6DCkqg1UrQ== X-Received: by 2002:a05:600c:1e0e:b0:431:5e3c:2ff0 with SMTP id 5b1f17b1804b1-439249889a8mr117195855e9.8.1739216321998; Mon, 10 Feb 2025 11:38:41 -0800 (PST) Received: from localhost (p200300cbc734b80012c465cd348aaee6.dip0.t-ipconnect.de. [2003:cb:c734:b800:12c4:65cd:348a:aee6]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38ddaf333c5sm5084761f8f.36.2025.02.10.11.38.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Feb 2025 11:38:40 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, nouveau@lists.freedesktop.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, damon@lists.linux.dev, David Hildenbrand , Andrew Morton , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Jonathan Corbet , Alex Shi , Yanteng Si , Karol Herbst , Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Masami Hiramatsu , Oleg Nesterov , Peter Zijlstra , SeongJae Park , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , Pasha Tatashin , Peter Xu , Alistair Popple , Jason Gunthorpe Subject: [PATCH v2 10/17] mm/rmap: handle device-exclusive entries correctly in try_to_unmap_one() Date: Mon, 10 Feb 2025 20:37:52 +0100 Message-ID: <20250210193801.781278-11-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210193801.781278-1-david@redhat.com> References: <20250210193801.781278-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Lodyc2mD8XroVASU4GZSuYfmWqxyL7D0oFviF0EL9U8_1739216322 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Queue-Id: D580BA0004 X-Stat-Signature: bpp3tk8o3zqw4wm7zye1bh3ymi44ja5m X-Rspamd-Server: rspam03 X-HE-Tag: 1739216325-495659 X-HE-Meta: U2FsdGVkX19NdOxPYqoduvdEtNlphgmZb1+AQJyUi0FI/tpa8jhHjkg9TITF220k0H3nivqFoTDzl3d0yxfEmByg2n+bN547geUZ4Ay9t8eeC8ICMYdmoilhdr4rYSCFbYMNFLw64uByuyDZ2yC6xNeyZ/3pj7o4+mUCA+GODJHBoKNprp6mYJx2ppvHnvE6yOqMQXCTUO8Zh4USUjqgAhTu1wOk0nn4vCOQk1C27IfVxgS78ZJyNVUM2ma5OIuQ9O1WGLKoO3f2FkEHudW8sx0o7uKA5D4l04pZ/DFpTY1TUPgS85gufCOMf0UtqS07HGm+u0dvzAKNxTf8jNZXsCXIjEA8UwhRqRZAwetTAkzYpNUSpTJkSdkB0n/CanR7vYbHBSsXHrJxpNL3XOltVWYI2VYIQ89Z7CC5MHmbLSj29JTH7nkTZkHST00z1f5Fus/rwKQW8ydxmVxolx7+197S0Cn1WhxUuHeb2Pewgvh6N9OJX/B23gK1pNNTkwe/HWN3sy78eSkflPj+nIQoY+4RVGjWdA+aQJO3xHr9DRxrD52QZwpMKa9oToUtoJbUa/stU/xLg0TfUP0YiIkM4yeBFs8MNjPwJXR8Zymrgd65G5L0e/eYFTLdUHnCAt4+uYbELTbeiPR1sZkm6Tq/iKnS6/57zyPc9Ixvr6b1NbcXlgCk5So24tX1wZ03FPkxOfOSU0gTKOS4m9M9pa25zX0yLYrFmZXrkSDeTi3mwCF3D8UQsDYExxpyuH6lC8lqz8vDGTqTEurMeg2QOJYKFB+39U8VPuTHk37rXaN6+SSzM+NHxvsQgKlLfsA5ksqFOPOG4BUW2w1PDnE4rEtG8i3sy+xtjWN4Jbib/AjQWjCooPEqqMEk2iagJpo5LG4c7T6ZGPkP9CXQi9jRQBEvc+KIFvbwpx2BXTdVoB6mySP5Xv7c9t77mTsSLJ18djQ6S1g3SEU03+bS3vVhidm 5+E2YnEx +wKHoemkHGTViSy5mYVdoOKuhKlmkue+eMhq1OlbQKC1ozeQdLzspAIReP2UmbD46j35VKeOTPHblm2Pb0CuyxQmizpWCTXaFsU7K+21AyqMKNZisEWODIEDeEWxSpwRDENp7vAj12kKi79eS4rgR7/p1HNe7MMmw0IHQhM7KorT9HK9oIA8sIbgbAS/18C3cNLuOqILpdccZAt3Eakb34HvqzR6ko0LwdSb3ppFebhUMlQN9p+LU5KVLQxM5xbgXPzHy1ItRAUu5OrVlAi0jKwegOkY/mDnc2288UFtqhH6+utPh5Hg8tYYn5N80Q9NZur/TakoByCTBi2u97Ghs+7LwJjqyMaInLIImE4v7tpYzWhwdfn3YjZxAYjKDwuksSmzUE633bVmZmHMWDgJFG9uIGXjmVzf3ZSHCCAfY55m5WNhbL0R2s626LMc3KwRha4a9/F0gc6JhRB7+pKUV0ce75uaQwa47RsGTnWkg6PcT5h61ojaulVccTgxwAiz51S6snfHjiAndcQswJbF2+XbkAg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000011, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Ever since commit b756a3b5e7ea ("mm: device exclusive memory access") we can return with a device-exclusive entry from page_vma_mapped_walk(). try_to_unmap_one() is not prepared for that, so teach it about these PFN swap PTEs. Note that device-private entries are so far not applicable on that path, as we expect ZONE_DEVICE pages so far only in migration code when it comes to the RMAP. Note that we could currently only run into this case with device-exclusive entries on THPs. We still adjust the mapcount on conversion to device-exclusive; this makes the rmap walk abort early for small folios, because we'll always have !folio_mapped() with a single device-exclusive entry. We'll adjust the mapcount logic once all page_vma_mapped_walk() users can properly handle device-exclusive entries. Further note that try_to_unmap() calls MMU notifiers and holds the folio lock, so any device-exclusive users should be properly prepared for a device-exclusive PTE to "vanish". Fixes: b756a3b5e7ea ("mm: device exclusive memory access") Signed-off-by: David Hildenbrand --- mm/rmap.c | 52 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 1129ed132af94..47142a656ae51 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1648,9 +1648,9 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, { struct mm_struct *mm = vma->vm_mm; DEFINE_FOLIO_VMA_WALK(pvmw, folio, vma, address, 0); + bool anon_exclusive, ret = true; pte_t pteval; struct page *subpage; - bool anon_exclusive, ret = true; struct mmu_notifier_range range; enum ttu_flags flags = (enum ttu_flags)(long)arg; unsigned long pfn; @@ -1722,7 +1722,18 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, /* Unexpected PMD-mapped THP? */ VM_BUG_ON_FOLIO(!pvmw.pte, folio); - pfn = pte_pfn(ptep_get(pvmw.pte)); + /* + * Handle PFN swap PTEs, such as device-exclusive ones, that + * actually map pages. + */ + pteval = ptep_get(pvmw.pte); + if (likely(pte_present(pteval))) { + pfn = pte_pfn(pteval); + } else { + pfn = swp_offset_pfn(pte_to_swp_entry(pteval)); + VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); + } + subpage = folio_page(folio, pfn - folio_pfn(folio)); address = pvmw.address; anon_exclusive = folio_test_anon(folio) && @@ -1778,7 +1789,9 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, hugetlb_vma_unlock_write(vma); } pteval = huge_ptep_clear_flush(vma, address, pvmw.pte); - } else { + if (pte_dirty(pteval)) + folio_mark_dirty(folio); + } else if (likely(pte_present(pteval))) { flush_cache_page(vma, address, pfn); /* Nuke the page table entry. */ if (should_defer_flush(mm, flags)) { @@ -1796,6 +1809,10 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, } else { pteval = ptep_clear_flush(vma, address, pvmw.pte); } + if (pte_dirty(pteval)) + folio_mark_dirty(folio); + } else { + pte_clear(mm, address, pvmw.pte); } /* @@ -1805,10 +1822,6 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, */ pte_install_uffd_wp_if_needed(vma, address, pvmw.pte, pteval); - /* Set the dirty flag on the folio now the pte is gone. */ - if (pte_dirty(pteval)) - folio_mark_dirty(folio); - /* Update high watermark before we lower rss */ update_hiwater_rss(mm); @@ -1822,8 +1835,8 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, dec_mm_counter(mm, mm_counter(folio)); set_pte_at(mm, address, pvmw.pte, pteval); } - - } else if (pte_unused(pteval) && !userfaultfd_armed(vma)) { + } else if (likely(pte_present(pteval)) && pte_unused(pteval) && + !userfaultfd_armed(vma)) { /* * The guest indicated that the page content is of no * interest anymore. Simply discard the pte, vmscan @@ -1902,6 +1915,12 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, set_pte_at(mm, address, pvmw.pte, pteval); goto walk_abort; } + + /* + * arch_unmap_one() is expected to be a NOP on + * architectures where we could have PFN swap PTEs, + * so we'll not check/care. + */ if (arch_unmap_one(mm, vma, address, pteval) < 0) { swap_free(entry); set_pte_at(mm, address, pvmw.pte, pteval); @@ -1926,10 +1945,17 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, swp_pte = swp_entry_to_pte(entry); if (anon_exclusive) swp_pte = pte_swp_mkexclusive(swp_pte); - if (pte_soft_dirty(pteval)) - swp_pte = pte_swp_mksoft_dirty(swp_pte); - if (pte_uffd_wp(pteval)) - swp_pte = pte_swp_mkuffd_wp(swp_pte); + if (likely(pte_present(pteval))) { + if (pte_soft_dirty(pteval)) + swp_pte = pte_swp_mksoft_dirty(swp_pte); + if (pte_uffd_wp(pteval)) + swp_pte = pte_swp_mkuffd_wp(swp_pte); + } else { + if (pte_swp_soft_dirty(pteval)) + swp_pte = pte_swp_mksoft_dirty(swp_pte); + if (pte_swp_uffd_wp(pteval)) + swp_pte = pte_swp_mkuffd_wp(swp_pte); + } set_pte_at(mm, address, pvmw.pte, swp_pte); } else { /*