From patchwork Wed Feb 14 20:44:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13557006 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 41E7AC48BC1 for ; Wed, 14 Feb 2024 20:45:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A64E46B00A2; Wed, 14 Feb 2024 15:45:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A14928D0001; Wed, 14 Feb 2024 15:45:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B6256B00A6; Wed, 14 Feb 2024 15:45:03 -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 786F16B00A2 for ; Wed, 14 Feb 2024 15:45:03 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 57716807E1 for ; Wed, 14 Feb 2024 20:45:03 +0000 (UTC) X-FDA: 81791588886.21.1E54A30 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 9E70C40006 for ; Wed, 14 Feb 2024 20:45:01 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YU2k2Cjb; spf=pass (imf12.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707943501; a=rsa-sha256; cv=none; b=lua8udeesyPmalqUmPRoaVDUtQqwnnbEqHFgTYHgTMiNokqHv9YxNA4oWsG53EQmifiPdk lrjTQLjk6MGmOsToswvzSur2hcX8UzIC2i4v2Tt0S3sWQtGPGNflZbnx9NIECTZC0zn00o jANptihEiQCwi9TsqYh6SNZGnk/r94M= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YU2k2Cjb; spf=pass (imf12.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=1707943501; 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=M/Ux9HRgPwmdR3zuVPtEfBlFP5wVpYCc/8Whwmc2o7c=; b=L98AFiV3DCAFq+VdPjyQp+TaULmofq1F4o+1p53zvyPXDRdmF8TvcwQPihZbBS9sxkh2oJ Mn4JiExqFvNJPMGWjaKN9iOaeR9fCqfhHYGWA1cZ3xllreIYz29bRE0kyeWerDxIEBHD7+ e7mxEnHgjln/717L0d12DPnRTz0TWFo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707943500; 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=M/Ux9HRgPwmdR3zuVPtEfBlFP5wVpYCc/8Whwmc2o7c=; b=YU2k2CjbEZnT2M+1PB6NtmOSj01ami64kmIKGOZ8bxKCm+m7UlZ+4EEegNpWwCuq0+ALGL WRLzwDfWfE2mQufWsuniNswAbikaTcb+qllJ1ZBXXcXQIuer8/5iMRGcDxmJMrL715Mz5m GRLW4VuDHK8Dhm49gy0+VBUovl0j5L8= 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-460-Ud6bEsrlM92gS6OHI6pxZA-1; Wed, 14 Feb 2024 15:44:54 -0500 X-MC-Unique: Ud6bEsrlM92gS6OHI6pxZA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 DDD578630C4; Wed, 14 Feb 2024 20:44:52 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.194.174]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4741B1C060B1; Wed, 14 Feb 2024 20:44:49 +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 , Yin Fengwei , Michal Hocko , 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 v3 03/10] mm/memory: further separate anon and pagecache folio handling in zap_present_pte() Date: Wed, 14 Feb 2024 21:44:28 +0100 Message-ID: <20240214204435.167852-4-david@redhat.com> In-Reply-To: <20240214204435.167852-1-david@redhat.com> References: <20240214204435.167852-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 9E70C40006 X-Stat-Signature: qmfw7ukdkwhhab4c6hfxk3r8ottwqwcn X-Rspam-User: X-HE-Tag: 1707943501-95671 X-HE-Meta: U2FsdGVkX1/sAjMl1ZdEpvRic95X9LpCItTjmJiXG0rFPgC+Wmdf7wEGfOYO3Ba00iLfMkRvOMt289eRTstCz6nRFu3De+2T0m1zWab54GNIukxj4kJpObRcAAzjAgb4ZaLOYzpdYJjbBT6cuFi5wfRE7ndzRsp5kuqOFuS3W4VBXLbjrotfnm9IS7OXwfQqynVCBSjF3Y1mqARwYCSp08F2rXry0Q9o3EroiV3mb3uniG1eqw9gPs10BrxviOqF9iB+MBxInzNQ8CGvqThOIx35i8Jof/I9BZZImTmsffI0kw3OhND+qUCCJGf+rubdQLzuw9HmAjrL/cwP8AHlLKz/tby8mucTOxIHpVXJMF9kJ7WSiIdwQ5y6XO4wTjDoGEUAd2U9aGYU3Zpz449QuIs91GV6q+moXyclyklnnzB7vAapImOchN+W1wGt5nWgsjpWitvlOPzzu4BYIq8XL3C7mTHiupHYcRPQbadBiW80XCvyIUswwtu7xpyrwOrzsRQwKU8CL9P9zG86QTqgNR3Jekz1oFTPYgAtBWfGEA4L4PZ2f/yzeH339EMOxcwn4zXrIM2/GUp0ucOg3u6n95wz0DqsKdTg0a94cC2fwHxV8cizV98Xd5xRdbLZWt7lC4OJDzw8vIQYq3EnI/V1jfIGEBwo9TcqK39I0v8aMKXJ42rrBWqcGNLDnYwIdzBApzBjpSx1PUPQcKPyoEYCGI/wRxgIOEqd3wQlj65qTe8IpHBDMySWuLHlqF3jbzZSpWqnJecaJRFH/IvrKEbDNex7Q+PnVSCMWCahdiE+WT4ghDS+qVU4oVGOg9wBv0/ePHPi9vSXi97xwtn1eICl7wbMndCB6jWvs32lpc3liVRAeJNmQKK2WvEV4y0GOBb5pGgGq5AkBrsMikrBudOOchnn0w51lL66HPOHY4q05+LX05IIB+6G37MOz2yOg9RJG7bKTNOUGMXTDGw/Znv x+4kfsvS ye72/FUnTBPv6zC8MpPTH5DydlUga/gLfaxK4QmZv+n0i63wexrDQeAs9yIyFVpcjSPvXFmDwq2PC1cITn4951jImkgDNyg1IEqq9lkIpD+vFLUZ3auVqLDYqpcAdexTmyFdVFq2dsrX4D3nkcCBveutRmeoYJacdM2s15xJdtTOZpIGza9Xm2gegVqe34hFV2WHDIYJqoXEllDCyXEoCj7X61a4VPQVzUA7hU2cmCqz27DmC/zDbA8sa0oBUzCFXCFCVUuKq6XGJIToXdtgMIkX5bA== 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. Reviewed-by: Ryan Roberts Signed-off-by: David Hildenbrand --- mm/memory.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 4da6923709b2..7a3ebb6e5909 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))