From patchwork Mon Jan 29 14:32:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13535738 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 15D55C47422 for ; Mon, 29 Jan 2024 14:32:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A002B6B0072; Mon, 29 Jan 2024 09:32:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9AF9B6B0085; Mon, 29 Jan 2024 09:32:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80BB26B0087; Mon, 29 Jan 2024 09:32:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6C6D06B0072 for ; Mon, 29 Jan 2024 09:32:41 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0F8DA160A21 for ; Mon, 29 Jan 2024 14:32:41 +0000 (UTC) X-FDA: 81732589722.16.DE6E82A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf25.hostedemail.com (Postfix) with ESMTP id EF36AA0007 for ; Mon, 29 Jan 2024 14:32:37 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MjHv3cwS; spf=pass (imf25.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=1706538758; 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=5k519pv5yC0dphpRGDmBdAjVLNwRA0D+0XMigEKB7uE=; b=ZVlGnhZmxEgf5r5IqE/e23LDbeOB5SNlyyCd+rZgIh04Zm7A8Yp5tdG0MBerbSE4lKOnR8 dT8yEaUgzAtSAk9fXy0wp6Ssie5KhedwWEd9BaL85JbU8cxjym4uTnx7r86/k/MhesxuKy 63NF26zWy0PnkF9oYWgh8DKUZiXjZlA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706538758; a=rsa-sha256; cv=none; b=lWBfEFDnJn7zXW+wQcdGNOchDwf59MUQlMQb2sL//teYvUamQ8EKZgOzVXWXYkivBkXq4e 4VYwgFNL8c5FW270R6kQXWJ2d6swA/Z7CTosPmO0+uOb4yDIePE9jSFlqxMbph/u1NShrj B89kT2OVIey6L/8WfZ9u3cYmXBTjNmk= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MjHv3cwS; spf=pass (imf25.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=1706538757; 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=5k519pv5yC0dphpRGDmBdAjVLNwRA0D+0XMigEKB7uE=; b=MjHv3cwSmKkN/sECJM1MXpDRLZhjHNrUnrFsIt1+qBX/2Svp+dw3Oqxrb63tbOuT56VkYR ns8C5RbWni8uMxAtXSr6g38J+55I/NCSqIBRZTllicTZ7ixb/aAwzA03wSzaYBZ/QbyaIz 91oWkeygLtg6khi5FUWbZ8gGgc7Kea0= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-502-hf9kkbPYM4OwjicnjD23xg-1; Mon, 29 Jan 2024 09:32:33 -0500 X-MC-Unique: hf9kkbPYM4OwjicnjD23xg-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 B4A5D1C05137; Mon, 29 Jan 2024 14:32:32 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.194.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02540AD1; Mon, 29 Jan 2024 14:32: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 , 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 1/9] mm/memory: factor out zapping of present pte into zap_present_pte() Date: Mon, 29 Jan 2024 15:32:13 +0100 Message-ID: <20240129143221.263763-2-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-Stat-Signature: uhrqn6p5grs7q19i76361f3ar5aifr7j X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: EF36AA0007 X-Rspam-User: X-HE-Tag: 1706538757-131194 X-HE-Meta: U2FsdGVkX1/yq63892YAWRdit7i56iqDhDDlab2aM0V8Vw2UNJ1gwXV0Ewrqc4xSvSP4LG7NccPFFt4feGHGk+xM9hhUMpmDt2xz5QQsaoeDBKN98ppCMSnEVkRqyPM46sJ7d5aEdHbUe8Q482xqbvem+/zdlSrEzCBBOSCrO7jIeiD+LsPwN4InaWgN6pL8HnIk04ifA34QOQYfKc+jqIUdI2GnuWn7c6LfJoDAUfO93wtH/HO3TflPc6NFiQpt+9PqfQb+e2I1AA+G4vZXEdjKDFEcTiR4dfk0E41l8lhytg+zkQzrpX/TsvdvmkGrrSp3WPN9Qby5jj6XQs8A0r4LynPKBvJNt9sPCJw9D3+4fdeKnVvHc54SSi9liMSZXOpGGaE2AAB/d+ItUghj0mSUtoSS0X59IIRFHzmNr7wt3uF9dmFGVe15tpJi3/I2zkB58m4xCW66o88sk4z6nJacGjWU2X47Zw2K8CEDwz6xPX8lh1je25fkR0bZbT0vA395g+CNo4AW/TKZAJ3OdPOO7v67RgL9ARzHPy9gpjsGbYE7YHPu86r0lh9y2aVvelEDPPeq6s/DRU7H/8B+Gv4rahiUK6hVeSjyqaeE1XKtky1Z0lBdhiFcpU/ccy54KmAwF4YhZSj2xDUOqqK+Vv6hMp6Wg29iUHWa+lTE8NFBrUAfvoaN9JZ+X6PiMpipahx2Pub9gstVgeUSfD29eTwBJB8eduGvX7bsUN+LefZsBoXpwb8EPmWvk90fP1ygkSZgntATEeF1oUTysjsgMHdSjfn0XPx8/HT4Nh4kXig/Xyf9FOOSp732Fmjrg/7NItCfbozBSZaw/zyZL9xSkJAI290inh4PNJnveP0KOS7DBvry2WUGGUvcSxqPHkxWVAeb7hZ+DhU2/Eb2AeDN0ZJoeKpRBreTgt/rKvYyKybTy9etMM4ijifJhoFS8/iwwFDlRwutza34/t+ZfcN ya6vBtKL giD+gVXLwr7+505UK4p4ZPbVxcGf3V39NJFGWtCiM4Iy3s/8vqCKoTUnwkRybRgKgg58Ot58Ny4LehIy6MnLnMmeBjRF6EYM0C4wI8qG4iACWAVbO0N5rkRzlUH7p4VwhdVsmZVgj76SYAzsicIBIO5y1rMx/YOKY6fClno/SH4mHOYKhR3D052FXI20pBxu7tyXbgbh/U8iW0eGL6U8FKLU5oVDV2DrTARus 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: Let's prepare for further changes by factoring out processing of present PTEs. Signed-off-by: David Hildenbrand --- mm/memory.c | 92 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 40 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index b05fd28dbce1..50a6c79c78fc 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1532,13 +1532,61 @@ zap_install_uffd_wp_if_needed(struct vm_area_struct *vma, pte_install_uffd_wp_if_needed(vma, addr, pte, pteval); } +static inline void zap_present_pte(struct mmu_gather *tlb, + struct vm_area_struct *vma, pte_t *pte, pte_t ptent, + unsigned long addr, struct zap_details *details, + int *rss, bool *force_flush, bool *force_break) +{ + struct mm_struct *mm = tlb->mm; + bool delay_rmap = false; + struct folio *folio; + struct page *page; + + page = vm_normal_page(vma, addr, ptent); + if (page) + 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)) { + folio_mark_dirty(folio); + if (tlb_delay_rmap(tlb)) { + delay_rmap = true; + *force_flush = true; + } + } + if (pte_young(ptent) && likely(vma_has_recency(vma))) + folio_mark_accessed(folio); + } + rss[mm_counter(folio)]--; + if (!delay_rmap) { + folio_remove_rmap_pte(folio, page, vma); + if (unlikely(page_mapcount(page) < 0)) + print_bad_pte(vma, addr, ptent, page); + } + if (unlikely(__tlb_remove_page(tlb, page, delay_rmap))) { + *force_flush = true; + *force_break = true; + } +} + static unsigned long zap_pte_range(struct mmu_gather *tlb, struct vm_area_struct *vma, pmd_t *pmd, unsigned long addr, unsigned long end, struct zap_details *details) { + bool force_flush = false, force_break = false; struct mm_struct *mm = tlb->mm; - int force_flush = 0; int rss[NR_MM_COUNTERS]; spinlock_t *ptl; pte_t *start_pte; @@ -1565,45 +1613,9 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, break; if (pte_present(ptent)) { - unsigned int delay_rmap; - - page = vm_normal_page(vma, addr, ptent); - if (page) - folio = page_folio(page); - - if (unlikely(!should_zap_folio(details, folio))) - continue; - 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); - continue; - } - - delay_rmap = 0; - if (!folio_test_anon(folio)) { - if (pte_dirty(ptent)) { - folio_mark_dirty(folio); - if (tlb_delay_rmap(tlb)) { - delay_rmap = 1; - force_flush = 1; - } - } - if (pte_young(ptent) && likely(vma_has_recency(vma))) - folio_mark_accessed(folio); - } - rss[mm_counter(folio)]--; - if (!delay_rmap) { - folio_remove_rmap_pte(folio, page, vma); - if (unlikely(page_mapcount(page) < 0)) - print_bad_pte(vma, addr, ptent, page); - } - if (unlikely(__tlb_remove_page(tlb, page, delay_rmap))) { - force_flush = 1; + zap_present_pte(tlb, vma, pte, ptent, addr, details, + rss, &force_flush, &force_break); + if (unlikely(force_break)) { addr += PAGE_SIZE; break; }