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: 199129 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1161731dyd; Fri, 9 Feb 2024 14:17:02 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWB0tnFn1DZIIx0zhy6T1YrLfylJ1qLsN47eGeEUO07/Qhoc1JbT+JaTeZiXE9v3He9VuygCDciCGHRsYlfrakl0wefRw== X-Google-Smtp-Source: AGHT+IEiIeaqBMWXH6Q+5jtwqogUUKVETOVSvOF7+gDRgdmjzL0D0wRRSOVdlvZkcJCkN7t7K4EK X-Received: by 2002:a92:c60c:0:b0:363:d7c0:43f7 with SMTP id p12-20020a92c60c000000b00363d7c043f7mr722061ilm.5.1707517021914; Fri, 09 Feb 2024 14:17:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707517021; cv=pass; d=google.com; s=arc-20160816; b=dgCFZaVqCva4CA6vcqzZvFtwSWBp6LxRekzn6y5Mhe/ixEDPKimVGC6z4xe3X1tY9i 3/0O5IlHTbToYD1p6phIV9LSwHlH5LWx+fNuayiKX46/KHz+K/KYgbJZvNX36eBgzuoe Sv6oAQwtNp4tJymOAGbvXzgUSg2ack5IEbrBw6WbxCyFzoaBR2xQoOfn89ZCUtHcfLXJ /v2MJhZhnovJ6Ek35JsGnPW1UMKaqNgF2OZ9klAhSu3ymN0tyhqPinsIXmbsMLwajRuL uaVMEyPdkYuThbE1EBlVvypFC3kh8Kk3PpjKh4P4cX0Bo30jk1X6ViVUTh+el6amzSm0 ptBA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=M/Ux9HRgPwmdR3zuVPtEfBlFP5wVpYCc/8Whwmc2o7c=; fh=PqKNvp2m5wSZOdtokSwj6j13ywxn00TYevIpug0r6W0=; b=sVcqLL4ruwkqdcBPrt+qogo6jDjLLOXF3IKoob5+6+/YpqVvySvyAaCeUbZL0dgTb5 wZ36Q2/5qklmgb42mlpFom+7iChyJm5mIOao2Sli81AVTB34hQSLeW2uJS2QpWikMS8B P3Si1P+cH+13+Tkkw+Apxg+eL7vaUItLcZsca/gO/1ntBJ+zkIaiIKarMHgbeBCz7gHx hIRFrmMTy28rMkEErQy3fF3J/iOrIIy4CASoUXsQ305rnkSr3OVJsdHQD13avYRbDcxw oi0H5Z5WRjO/RTRuc96ndEUGhOylI4NMNOLqJyW7Fh9wXVD5t4r+L1uqDrHXj2MrMhgB ZjyA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OqWnVdxW; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-60075-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60075-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=2; AJvYcCV0jQn9ls6RHIGUGRS3+RHLV03kutpXIWsvPGXBgkIpTPT2RwSQ3M027I/fIMOSKhnocnM1U9vsJ8Pe+mw3ZhK+S8ii+g== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id r201-20020a632bd2000000b005dc0d6a780bsi2372435pgr.402.2024.02.09.14.17.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 14:17:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60075-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OqWnVdxW; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-60075-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60075-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 315DC28564A for ; Fri, 9 Feb 2024 22:16:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9AE372E63C; Fri, 9 Feb 2024 22:15:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OqWnVdxW" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 548EF381CF for ; Fri, 9 Feb 2024 22:15:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707516939; cv=none; b=avXIo2tQoDZgaDrE8Coss+K+zxoCg+d9FONBId+YAHvTeysvEM/TA/iJLZ9uZBtVI8X3gFrR/W8bW6Y6GPz9BLL9BWSD8zcTPAukfN952ZQ4efx/qhHsswErRgoIhP4FiNzqw57kjlvQGTi3C4owAxbD4pug8PZxKVOU+dQzhxI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707516939; c=relaxed/simple; bh=gJjdcDN9SIZ57EMSsnxvz4s6wGh9ngGev4G0JhDn5Lw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UiEODUYFR5E2Yh+27ZswlcVMZazAn97r6iWwB2nPhhGwxgHr1dN+jdk1yf0IzKZXexQ73TPSYkeleP7ATQzkpL9GDNEMLGhAb4xg9KRhdMDgVkBsSWJIfHF3Eje3firyUYVmww8rmNR7n2xxgH4C8b0V7uN0SXvC8QJv3BqKYm8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=OqWnVdxW; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707516937; 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=OqWnVdxWb+fU4UNVKI13tV0Q3mtH+bxe6CsHFZlepgkzWo5oph2o3FZb3lx17JXwoL0qTZ DNctaMHmzjd4k2ig/ncnSfsyK0/4f/cAIp3xXnCekLSua/v9wSarciEa7ChOE7mVUrY0Y9 +pU7vKPuD4OCFZFnhtwfOe34XPXApRA= 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790461368812943825 X-GMAIL-MSGID: 1790461368812943825 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))