From patchwork Fri Feb 9 22:15:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 199127 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1161673dyd; Fri, 9 Feb 2024 14:16:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IEt9z7oyzyTKApWY9SBx+MdvgGsfW0AdyJ/fZolbDkdaMN8YYvKJPLuyUDCSqUNb6MdEZqg X-Received: by 2002:a05:6a20:3554:b0:19e:b95f:123c with SMTP id f20-20020a056a20355400b0019eb95f123cmr402011pze.49.1707517013235; Fri, 09 Feb 2024 14:16:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707517013; cv=pass; d=google.com; s=arc-20160816; b=UnJPxcoyOuNTZXs+paQLOyZwFlB/8Z7vsACAhqRtP+QhrNhRzAo/Y9hely8rJh1smX o0ykDNntAZ3x+qNDrXiIhCBzDqKGXLjfjlr2CUcO80KeCLYkVZXmZXfK+b4wQuOtOoHj s7Y8SKyCTvOSyPVanmP6fR3g0cz8Xey+STMSqFzoshZem2tSqw4CAA0JvgXyX+AteC4P md9iKdn9TLzvvPJZeQZz8lCX2G0QPiFS3kd2LhukJTDWSCeTNKTPjblCP/ra+xUI14mB B6s3110Mnv/92i3OBN8tpf03yneZjeXyL9zXspOH0dbOP27PjRymRw3Ws5tOGUaht/mg X+EA== 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=fqQsnr9EFuS72Lg9egurC5IFPM5MYMM8dNEJpcWm/gk=; fh=YS+ziU04MLyM+43Oq135+BLTx/Ri8LQlGHYEXskxsX4=; b=O4QhLI/yBWe7PRL1u52YFbyrSJFCY++qT+4WfIEniAR239+AdstY6vplsgHj16tXqp HDBsg7NE1lxMCNvdhbcb1t5A5ItX/jABbb5RaMe1ispA0JIVVY/HwZbROh1hfH4/oJUX zeBhT4IXPsyJL0FgWg6wt5y3iRyAzJGU7kPO/MdSp7skP6UmSIdWDfM+w+yZ9oteNUdZ wQZWqvK04oWcpqyjGYs4MpmRCd2qIyo9wbvSZYrdHdWIDOMpbvp9ERgmUWDF3Qidmqen c3UcQ0M6a8nTEQLNeeZ11dVUampJ1yuO0qN+22y7EZbm8qYByc5GUp4Kk+uYxHDcCTFe IeEg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZZFnRkDF; 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-60074-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60074-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=2; AJvYcCWD+IT6+Cpxbo3PkqqDNqallotIwuVmGlgYVLypGANQaTRHwEkwKyDbBnly6tfTrSOg9jdMuOrfVA+rVqNif8g3OCrO8g== 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.16.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 14:16:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60074-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=ZZFnRkDF; 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-60074-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60074-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 A483928962C for ; Fri, 9 Feb 2024 22:16:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2832B21353; Fri, 9 Feb 2024 22:15:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZZFnRkDF" 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 0197E18053 for ; Fri, 9 Feb 2024 22:15:32 +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=1707516936; cv=none; b=YZY+fvGh04Q/yf0dBlXMYBmvuq3ijbPvsnnG0eFafYrJcmXn03wOEoVZt9S2OJXZzISKFM3U6Ue2YKGzj7Yrxa0LTF7R70zIlC4WEkfIZhc7+h1UUcWjutyyNIHpyeRGFW3I3vPr8BXI2tTHjfoq2IKH3zfK7XDdS91wsYZtPFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707516936; c=relaxed/simple; bh=iKdLPd0l+BlZy4NkWR4PBv4pdjA5DJYrKJe9pxJlmq0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EkqSKKUTX2f+0DjRQcd9nCetGOO90QHZZ7Nh6AG/MeVKT4+27L5MzSH2iZT5m7Q2055+fQBhzUqabtnRQh9+325Za0hs8TycLiSOMUoy1JFkGY1w8eHSx8M+4YwQF43CZ67TwHtP++hMeBRmpJMKJmGzRmSRp4AksDT6AdfKdyU= 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=ZZFnRkDF; 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=1707516931; 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=fqQsnr9EFuS72Lg9egurC5IFPM5MYMM8dNEJpcWm/gk=; b=ZZFnRkDFls4A5W0/ouqSf2KaDCggt3g0BpyfEFkFhAGJCr3yQlPzbHQg6zjJzZepueJ1vc WEbK55uP+TzbH8mTXKBTVi/yMVu7Vb7GjHxlva8fkLotitLPAvMwgsRKANqnqD8FHODuu/ lssuvjtWqLIjMY3mC5DCJhmgzDZ71II= 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-659-vWqlBEopN_iaGbQkhty9OQ-1; Fri, 09 Feb 2024 17:15:28 -0500 X-MC-Unique: vWqlBEopN_iaGbQkhty9OQ-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 E6404811E81; Fri, 9 Feb 2024 22:15:26 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.194.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id F06291C14B04; Fri, 9 Feb 2024 22:15:20 +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 02/10] mm/memory: handle !page case in zap_present_pte() separately Date: Fri, 9 Feb 2024 23:15:01 +0100 Message-ID: <20240209221509.585251-3-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: 1790461359545648567 X-GMAIL-MSGID: 1790461359545648567 We don't need uptodate accessed/dirty bits, so in theory we could replace ptep_get_and_clear_full() by an optimized ptep_clear_full() function. Let's rely on the provided pte. Further, there is no scenario where we would have to insert uffd-wp markers when zapping something that is not a normal page (i.e., zeropage). Add a sanity check to make sure this remains true. should_zap_folio() no longer has to handle NULL pointers. This change replaces 2/3 "!page/!folio" checks by a single "!page" one. Note that arch_check_zapped_pte() on x86-64 checks the HW-dirty bit to detect shadow stack entries. But for shadow stack entries, the HW dirty bit (in combination with non-writable PTEs) is set by software. So for the arch_check_zapped_pte() check, we don't have to sync against HW setting the HW dirty bit concurrently, it is always set. Reviewed-by: Ryan Roberts Signed-off-by: David Hildenbrand --- mm/memory.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 5b0dc33133a6..4da6923709b2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1497,10 +1497,6 @@ static inline bool should_zap_folio(struct zap_details *details, if (should_zap_cows(details)) return true; - /* E.g. the caller passes NULL for the case of a zero folio */ - if (!folio) - return true; - /* Otherwise we should only zap non-anon folios */ return !folio_test_anon(folio); } @@ -1538,24 +1534,28 @@ static inline void zap_present_pte(struct mmu_gather *tlb, int *rss, bool *force_flush, bool *force_break) { struct mm_struct *mm = tlb->mm; - struct folio *folio = NULL; bool delay_rmap = false; + struct folio *folio; struct page *page; page = vm_normal_page(vma, addr, ptent); - if (page) - folio = page_folio(page); + if (!page) { + /* We don't need up-to-date accessed/dirty bits. */ + ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); + arch_check_zapped_pte(vma, ptent); + tlb_remove_tlb_entry(tlb, pte, addr); + VM_WARN_ON_ONCE(userfaultfd_wp(vma)); + ksm_might_unmap_zero_page(mm, ptent); + return; + } + 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 (unlikely(!page)) { - ksm_might_unmap_zero_page(mm, ptent); - return; - } if (!folio_test_anon(folio)) { if (pte_dirty(ptent)) {