From patchwork Mon Dec 11 15:56:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487468 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 E0226C4167B for ; Mon, 11 Dec 2023 15:58:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4A9A6B012E; Mon, 11 Dec 2023 10:58:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BF8C36B0130; Mon, 11 Dec 2023 10:58:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A70FF6B0131; Mon, 11 Dec 2023 10:58:17 -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 914936B012E for ; Mon, 11 Dec 2023 10:58:17 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5FEF7A1B33 for ; Mon, 11 Dec 2023 15:58:17 +0000 (UTC) X-FDA: 81554994234.08.2694EA8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 82DE8C0013 for ; Mon, 11 Dec 2023 15:58:15 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=d4Vb+z6d; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702310295; 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=e8cPKSG16Q/IRVzSDalc66DZf+rAdIx9s1sCKVbyMk0=; b=1znz12cWNtVxg1S4kkNuQ2PNxFbEkVIdMtj6b+7/oh5jl3YzF4dkhpFslXSb2Kl3QmBRA6 SyVEprxwzuNh6Od836qTEIX3o4BpPY3G8lgoCRGva2Cg1WyJi5bfTaY7VwwtLSqVYcQJL5 ivbXmnXY3DZQ7Dy049f2cIR7GRlCMOQ= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=d4Vb+z6d; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702310295; a=rsa-sha256; cv=none; b=tVvZ//RTGL+O/r0mnNy1X/7ZnnffEmXJW2FvdWKoIJ53OohU4nxFFaID5PLz4+YfSpjKyv 3EvetnwKLK+p70ApT5FeQSkhm2HuBNjE4h3+P4MoEgbpItCDz95B5/g6GzRdGAnlWnmlux rdAA54MDokNGLHA6+sV5zkygCrJ7u6E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310294; 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=e8cPKSG16Q/IRVzSDalc66DZf+rAdIx9s1sCKVbyMk0=; b=d4Vb+z6dCUNtA/g/7M5q2miDz98eu+Emq3F8PMSDAlJKspnDiT29+eWR2G72b5YrAE2enE Y4A82L/PXYD3Ev2HeUhtsVqSiw/v14yijxn4VgOcncey4diVa21WYLD1hFDywX8kA5UcKd cfdTlDof24zUGGyyXRwS4qgGxjNGqDE= 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-611-Qc9Fji3rOuid9DMrJtMfFQ-1; Mon, 11 Dec 2023 10:58:08 -0500 X-MC-Unique: Qc9Fji3rOuid9DMrJtMfFQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 CA5991C08BA2; Mon, 11 Dec 2023 15:58:07 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCEA41121306; Mon, 11 Dec 2023 15:58:05 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Ryan Roberts , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu Subject: [PATCH v1 28/39] mm/memory: page_remove_rmap() -> folio_remove_rmap_pte() Date: Mon, 11 Dec 2023 16:56:41 +0100 Message-ID: <20231211155652.131054-29-david@redhat.com> In-Reply-To: <20231211155652.131054-1-david@redhat.com> References: <20231211155652.131054-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspamd-Queue-Id: 82DE8C0013 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: ttak5y9wicoihsyg3zx1e5bqcikmp5wn X-HE-Tag: 1702310295-818055 X-HE-Meta: U2FsdGVkX1+wJY6jGX7lIGCmWqH/7l72LKbrirHLrxZVY2TFejLQRF+f20yvHkpBrOahP0SL9Uq/Kr6O/NmL0UsUeit9YgZ9e87mHhFlo7QGah6xMjngQ91YfXCj9wV0LcFJC8LMBvz4rrD+v2JdeVfXAIIkQDOxVyu1iamnctuzVxAKWGkJDkl3xF9LDEWiJwmyi++2CI9igb7+4jSD0xqjwbB6tu32yHu0d4rJuQKTukmqbLbHKQHbPWJVyW+lcOgKudZLqtwai3+Q4ZqtUzTm3d6CehSTpjMGAVVczqNnCfFa09+DkSUz7i+N+vvDNRE03LgojUUV/6Wegf2jMtI091M9LGemnafg4/5ZXeK4PrNT1yh4fxt6roSgAOctcabxr/1KSJj1B4LijgOySfOojYOcZVgYJCQhkLRGADdwQqOfY/P2T99fpOAwCiHo5FLtYzzpRlKVtLfvudeLKevz41c+sObZjxbea+HAULv3SPJMEWHUqSvze7R3nZ+E4t1i2i5knjpk6FCmEsw1EX18/7jEillzXjUaaCEfyOCmELlEfr1S5UmsKl64C6lmTIS25bPTzogFm3JFR5WHZ3HRKtbRyNoNUH6h4A7SVJEMJK3Qvab3heCKK8aVeGozJNgqnQsHZCB7VlyNZRFJRaT2D2nEA08A9BXWDSY4/czbYvtnNPGSnzS8SKMsfWLYpHb49/pntT4Uku9wv+FQi/zQYKnlJpTEj3ca4bk2jpDTh+iMe8TxTJIr++vA9wO1gH+PfRBQ4rx9rPx/hSOQH8j8mM01to/sYc3ZGdx6D1aEtW9ILNScScxBw6ASKf9mI/uq6ug2N6nEEWq7+Sndlw3P+3hoDe4gol4kxMsLnvUsQjly8m39fnzd5MKHNzXWtQzjZXvMx+nDQqsvMDiei3nO2gWCdNzPMS+e19FLvT4PEkq1bJp6eVMpBEUEZS3iIL5k8R9sZS6ybkyXy8b w6+6iYNF R5moRGxJkSNfNYioNgwGc7YOGXMv9Y7Hvawwis9uxOiduenx2bPLvjekGYL1ouRx3Yu5krp8dsaOl9eAvkDOWHqbmNN1A2WwfkOQuTfE0soM6H71XZR3VMQcDYkrxKI8Azk4Ffs8EHbBZfEyAOgdIN1fTh+vHxm4zORpheImP4BIOTMtBnNlQ0ehg47Tm/OZEDlkBSgEQIMS3rlQqHfGiuW1+5Q== 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 convert zap_pte_range() and closely-related tlb_flush_rmap_batch(). While at it, perform some more folio conversion in zap_pte_range(). Signed-off-by: David Hildenbrand --- mm/memory.c | 23 +++++++++++++---------- mm/mmu_gather.c | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 97e064883992..9a5724cf895f 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1434,6 +1434,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, arch_enter_lazy_mmu_mode(); do { pte_t ptent = ptep_get(pte); + struct folio *folio; struct page *page; if (pte_none(ptent)) @@ -1459,21 +1460,22 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, continue; } + folio = page_folio(page); delay_rmap = 0; - if (!PageAnon(page)) { + if (!folio_test_anon(folio)) { if (pte_dirty(ptent)) { - set_page_dirty(page); + folio_set_dirty(folio); if (tlb_delay_rmap(tlb)) { delay_rmap = 1; force_flush = 1; } } if (pte_young(ptent) && likely(vma_has_recency(vma))) - mark_page_accessed(page); + folio_mark_accessed(folio); } rss[mm_counter(page)]--; if (!delay_rmap) { - page_remove_rmap(page, vma, false); + folio_remove_rmap_pte(folio, page, vma); if (unlikely(page_mapcount(page) < 0)) print_bad_pte(vma, addr, ptent, page); } @@ -1489,6 +1491,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, if (is_device_private_entry(entry) || is_device_exclusive_entry(entry)) { page = pfn_swap_entry_to_page(entry); + folio = page_folio(page); if (unlikely(!should_zap_page(details, page))) continue; /* @@ -1500,8 +1503,8 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, WARN_ON_ONCE(!vma_is_anonymous(vma)); rss[mm_counter(page)]--; if (is_device_private_entry(entry)) - page_remove_rmap(page, vma, false); - put_page(page); + folio_remove_rmap_pte(folio, page, vma); + folio_put(folio); } else if (!non_swap_entry(entry)) { /* Genuine swap entry, hence a private anon page */ if (!should_zap_cows(details)) @@ -3220,10 +3223,10 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) * threads. * * The critical issue is to order this - * page_remove_rmap with the ptp_clear_flush above. - * Those stores are ordered by (if nothing else,) + * folio_remove_rmap_pte() with the ptp_clear_flush + * above. Those stores are ordered by (if nothing else,) * the barrier present in the atomic_add_negative - * in page_remove_rmap. + * in folio_remove_rmap_pte(); * * Then the TLB flush in ptep_clear_flush ensures that * no process can access the old page before the @@ -3232,7 +3235,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) * mapcount is visible. So transitively, TLBs to * old page will be flushed before it can be reused. */ - page_remove_rmap(vmf->page, vma, false); + folio_remove_rmap_pte(old_folio, vmf->page, vma); } /* Free the old page.. */ diff --git a/mm/mmu_gather.c b/mm/mmu_gather.c index 4f559f4ddd21..604ddf08affe 100644 --- a/mm/mmu_gather.c +++ b/mm/mmu_gather.c @@ -55,7 +55,7 @@ static void tlb_flush_rmap_batch(struct mmu_gather_batch *batch, struct vm_area_ if (encoded_page_flags(enc)) { struct page *page = encoded_page_ptr(enc); - page_remove_rmap(page, vma, false); + folio_remove_rmap_pte(page_folio(page), page, vma); } } }