From patchwork Mon Jan 29 14:32:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13535739 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 BC146C47DB3 for ; Mon, 29 Jan 2024 14:32:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 347C06B0088; Mon, 29 Jan 2024 09:32:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F7336B0089; Mon, 29 Jan 2024 09:32:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 198266B008A; Mon, 29 Jan 2024 09:32:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 060B56B0088 for ; Mon, 29 Jan 2024 09:32:50 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C485C80A7B for ; Mon, 29 Jan 2024 14:32:49 +0000 (UTC) X-FDA: 81732590058.11.95CDFC7 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 D07ACA0007 for ; Mon, 29 Jan 2024 14:32:47 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OJh2Shmx; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@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=1706538767; 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=OkSqLVnz5/2y8MLWUf6UFgTHMoYCjTvN5uvEMNfOCyQ=; b=0XV210mhR8nrlALjiXCyvcASnCftWfiE9/tb9A0dyZeailVCCGT/DeP8Loii2yTLU7CDhe cwR2j/4yT4mR3xqPmeDbXs1opo+Ax8NLSZmiMJ46PmvW89HRQvSKxxsxJQIhNbBW3ZJMdL nDz1rkhVUxexQZoUXfbIiT+4j8znPHU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706538767; a=rsa-sha256; cv=none; b=7efoRmMLO1D2FpLyhRRXiZJFYjlHjV21qoyPK50HaV68e7UdU/dOdUSU2/MxHQmP6594gd uXHHFcCkZjO/5crbv7qieTb4wusuyVn7i/ETJjgvcwXLKNMP/gP7bFajAYJXOL0BpFSwc4 opiB1iA/ct63e+mdaj/IY2Nsn+yNE6Q= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OJh2Shmx; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706538767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OkSqLVnz5/2y8MLWUf6UFgTHMoYCjTvN5uvEMNfOCyQ=; b=OJh2Shmx2U8Ejx2Oqr5Eihdzs/VG8dln4YzNP7+gzND90vUObDov0FJzfZ9A2AhE+l3UJ7 WHG+g4xow3Zmw3txXhCXrvkH5KamXCyjjjbnQhdY9p4WXM5CtI4HSzMaIqGE4boYu7pl9b HfSQ/DahZCiPklyWTH9v9vtMi9h5qZM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-332-tQCqrTzqPz-8PYoPDfxKqg-1; Mon, 29 Jan 2024 09:32:44 -0500 X-MC-Unique: tQCqrTzqPz-8PYoPDfxKqg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8BAC885A599; Mon, 29 Jan 2024 14:32:42 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.194.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCEB7AD1; Mon, 29 Jan 2024 14:32:37 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Matthew Wilcox , Ryan Roberts , Catalin Marinas , Will Deacon , "Aneesh Kumar K.V" , Nick Piggin , Peter Zijlstra , Michael Ellerman , Christophe Leroy , "Naveen N. Rao" , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Arnd Bergmann , linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org Subject: [PATCH v1 3/9] mm/memory: further separate anon and pagecache folio handling in zap_present_pte() Date: Mon, 29 Jan 2024 15:32:15 +0100 Message-ID: <20240129143221.263763-4-david@redhat.com> In-Reply-To: <20240129143221.263763-1-david@redhat.com> References: <20240129143221.263763-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Rspamd-Queue-Id: D07ACA0007 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: kanmfge65unoihmaig7f6rpy8zfyykya X-HE-Tag: 1706538767-301588 X-HE-Meta: U2FsdGVkX187WE5eD77MuKWt0Rg6LDjpM2GijJSJE8t9nYWylUSuYPaZcB7CyMFZDeX7gJV8vhxUVwPY+tcE71INYc8/k/v/silSr/X0aEXKq4yFallwgxeDhhnW1LXZIYAKJwD4Qwt5QPVVEIqUqSNFeofxtmlFNqD03JI8NxW/A55RaI+XkEXMPXq/RdOf0aoTGKUT/8Pq55SEzH3QM/t5/y6ScOT6TbRIfKRfOJ1IYyNdCtyB/cem8VW6AA6XHt4PCZ1P5qei4YYXbWhrp4xqGxejdexe+ED3nPS4h9aF32KXisVibrAA+Luj7gX6CxWNdw50FbfATqFjReZJPpZeq2kui1fnl30tFpSMN1JEHDQVoKQ4Oqe4eLGnL0wjpFa3/HeuvWX7C1+nFYsWq70oiVUosWAxY7e5EPXCQTlGxHtWveV9gK1wkkq3lK5z6dA61np6CpX2cENNY0TrvACniMvjJfY7X/3BH+JMcLvJ69eu/ulq8eXIqCUzkpVMui8BdTI1kgvHdPdwaP4enJAC37s1U01azan4HnqKIYhtT3myvo/lqc9a+WIB99fn/34OC8sPo6NTHinodXsOsajmNCpLIMmXXAkpPj9wMAPlmsYpLV1PwdnwpqOfcbKJkkKzxDXwPOPI97J9fBHwA1JLxk/9h10C3zUVp/hKDr6pO9DI2rxJefJtBw34iiw84xQOdIgM9O9321dOMZHPfBQ9Z4CwNEq8W76Si5aGtk848zGhtgz2KHrouWSNtFcLbf4syfmO7ZOyvEQH/B1gPO5kFt1iw6nkH30GnpYp1blEIas/Rc18c8ph/AQRb+bGgi3yCK8H7uDr1AXqROgzPbUd38zXunkDnNF30vqQ+gU4C7B4s/ljp8JvAsOjfGQke79Ql1Qif/MdYu2wVElu0nyVOo3xJDYNJ8411HXiU8oyLPMUjniFgE8Z8zzF9DshEaZpHiyQW2KrDW4FL5i PHJPCyrv MPpE7dgIMTM6MZ5xxOaHRfyjUG93Dr/nk9w99aTK/UyRMHMikIXgc9e63p27r6lt4kuzq55zbelp0mftyS96h7r/6rpKdNrXUclTc4o6DjH6IbQRFNV61/tvCUP05fVMsrlSBEkjARoH2g7Vr+gvYS4Q8NG8aoOkmxCb3Q/oeTCXrG6SHSfBvRYg+kAWANghpCAEYi9tT7u4vWqetw7xgtq/brhbYW0Zyejq5 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: We don't need up-to-date accessed-dirty information for anon folios and can simply work with the ptent we already have. Also, we know the RSS counter we want to update. We can safely move arch_check_zapped_pte() + tlb_remove_tlb_entry() + zap_install_uffd_wp_if_needed() after updating the folio and RSS. While at it, only call zap_install_uffd_wp_if_needed() if there is even any chance that pte_install_uffd_wp_if_needed() would do *something*. That is, just don't bother if uffd-wp does not apply. Signed-off-by: David Hildenbrand Reviewed-by: Ryan Roberts --- mm/memory.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 69502cdc0a7d..20bc13ab8db2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1552,12 +1552,9 @@ static inline void zap_present_pte(struct mmu_gather *tlb, folio = page_folio(page); if (unlikely(!should_zap_folio(details, folio))) return; - ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); - arch_check_zapped_pte(vma, ptent); - tlb_remove_tlb_entry(tlb, pte, addr); - zap_install_uffd_wp_if_needed(vma, addr, pte, details, ptent); if (!folio_test_anon(folio)) { + ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); if (pte_dirty(ptent)) { folio_mark_dirty(folio); if (tlb_delay_rmap(tlb)) { @@ -1567,8 +1564,17 @@ static inline void zap_present_pte(struct mmu_gather *tlb, } if (pte_young(ptent) && likely(vma_has_recency(vma))) folio_mark_accessed(folio); + rss[mm_counter(folio)]--; + } else { + /* We don't need up-to-date accessed/dirty bits. */ + ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); + rss[MM_ANONPAGES]--; } - rss[mm_counter(folio)]--; + arch_check_zapped_pte(vma, ptent); + tlb_remove_tlb_entry(tlb, pte, addr); + if (unlikely(userfaultfd_pte_wp(vma, ptent))) + zap_install_uffd_wp_if_needed(vma, addr, pte, details, ptent); + if (!delay_rmap) { folio_remove_rmap_pte(folio, page, vma); if (unlikely(page_mapcount(page) < 0))