From patchwork Fri Feb 9 22:15:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13551942 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 7BF4DC48297 for ; Fri, 9 Feb 2024 22:15:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0907E6B0088; Fri, 9 Feb 2024 17:15:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 03F386B0089; Fri, 9 Feb 2024 17:15:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DFBBC6B008A; Fri, 9 Feb 2024 17:15:41 -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 C47E86B0088 for ; Fri, 9 Feb 2024 17:15:41 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9DEDCA100C for ; Fri, 9 Feb 2024 22:15:41 +0000 (UTC) X-FDA: 81773673282.27.F5C4F39 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf03.hostedemail.com (Postfix) with ESMTP id E4B4520010 for ; Fri, 9 Feb 2024 22:15:39 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cXqT27lQ; spf=pass (imf03.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1707516940; 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=SFwaTS0mZH0oq6ScwzcgX5Q6gncipScSAdMn3Olrpoy9FvrXqoQN6Nqsa9bC6LbsOgg6Qc eEhVZNgx1feR5BowwUHVAxvAGXYxrNq9vz0JjjWrcW/lveKqVQr/tQvKLF+C+vMXhqmfM/ ZRrxplYw0Xh/V1PnBUb4iMNHuvK7xp4= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cXqT27lQ; spf=pass (imf03.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1707516940; a=rsa-sha256; cv=none; b=vSk4quuEza19ZeWICfJFYMxoJfWNCmpW4zD3+NU98rUmDOlP1U+a85he+EYq+yFNCnKsAH fATcWKL7s/3gfYSXtzGw6cFiv4DoZH2tEV5qzG0cHl2QEsv7X2GDYczoH4mkGWUYd/XOi1 Yv5w40iRFaAKHFJdDOTKvP0shbdY6Dw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707516939; 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=cXqT27lQiwlFZH8EN2rfKdCAxS6FWjosxKForX5hZ1kQqwloTwp9zkLz9vg25Wm2ylLXAl M7nHgr2j+JETbzi6dCKb3ClJfygHBUS35kCPXxIrde+0mqLZ4TTTZB9hyfC4m/mgJdamJY hmcH7ChDqs7KCvF3mS70+MNFXETmGCU= 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-639-ojxWH6gHP7CoaMSJUSv5fA-1; Fri, 09 Feb 2024 17:15:32 -0500 X-MC-Unique: ojxWH6gHP7CoaMSJUSv5fA-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 85BE9185A780; Fri, 9 Feb 2024 22:15:31 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.194.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 512C21C14B04; Fri, 9 Feb 2024 22:15:27 +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 v2 03/10] mm/memory: further separate anon and pagecache folio handling in zap_present_pte() Date: Fri, 9 Feb 2024 23:15:02 +0100 Message-ID: <20240209221509.585251-4-david@redhat.com> In-Reply-To: <20240209221509.585251-1-david@redhat.com> References: <20240209221509.585251-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Rspamd-Queue-Id: E4B4520010 X-Rspam-User: X-Stat-Signature: dtqiexhc38fgjyhiho394rmeoc8759ay X-Rspamd-Server: rspam01 X-HE-Tag: 1707516939-107529 X-HE-Meta: U2FsdGVkX199O6DMPFxEyDdmdosS+JxN2YgPy9VnLjON2YMNPOa38HtF0s4WM+KVgxGNMae7giEU2+ox4f9emEoo+RW4ngIto9i8qtupVTXuVZzm6A9CMsj6FSzJ+f/o8rQssV4j6be1tqmv4hat9Df/p7cOXBGobQ1pfsltRFFZ+/hUlZPhiYqeJsyNRzdHwgspZe4N9aJv5KEJlT+nbx2Dyk+k+pKhLIKHANw0ByFVzsGM9oHaJhrpJZWrwX9l6fxJmH1zMkaLbIbsrchBAxXqkhqhzYpLhU1CoJHqqZjbahWQaUujyV/uNrSbFcRCKonFZPc4FJphCUyo82qynL0pNtQPO7vhaxqoMythqsN20LTqdcQq9tFkiavgGR6fwsNKMaDKeC0Z8H4GOVPyY+xAaZ6WHypsSixBmLJD0mkPncgrT1VYSY7yMnnp7gj31KjAF3QYsKX31TJ/hxAJCC8vYc63tTEthRYX6KkihmvPmykaAjfzElOZMPKk/P+JrJ/PzrA055oiBKxpfxIpcfVstV8E/35K5kOqLd/+mYnNciPcFHxrhCbAuenQbPmP3IUb1UmJrojvWJmaft2x6KwGSn/nijy6P6ga+h0WfSmEhuL2wkKA1YtG8IAMig7KEbnxTpxIt0y7A/n9ayTH0jwwTouEym6dT3v8X+/kzMAvqp1lvQP7o3LQ4/mMe+1Hb5xRxlKPnXHQuJhfB0BaqRCekNS8WlCH0Say8QaRKjb5428m1MS6V/HlkWed0SdqpAyLzVkdp1wuUGH92LNeclkU73zvXet5VBSyfjjc6B1483EozwCXbPsmvZc9XeuZbNT1KefE+JHA6CCeHpDTgmVY/F1Fzv6PotnfpKBvZYdFH0SEVLZ81zBIwIfIFQscVUpMyzYv2ojq5/fokiL9X0oINRtwaN0qhAMltT57+XV7vjI3YjjURfwaSE9cEdsMK3RYoWmmOUL9t8AwpBZ ZwfVVKxF dV9uuQF04VYZTozj38moymr0hdeprhnAhrLrPGwcAE/8BABPUz1fugr1Pazxpf0oAh/6NIAtzU1/0TI9lMUsw2d6EcU53h7IKZgqrZO9z3yh2kYKfebmqHQMRy7jrFVdpZfdlNMbC9WGBf9xVef64TDspD7q+4Q9njBbuJHXUZ3/PjYvIKWeZ3aM1KDpFURGOfWk2qAXGtqTL78PRnzBB4LEv3tqPSmzJai6slNrLdamhBmym1OXy7xlVxP8fmNEtkM/RdSl9G6LeR90uiYE8hMxsSA== 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))