From patchwork Wed Dec 20 22:44:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13500631 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 43B15C3DA6E for ; Wed, 20 Dec 2023 22:46:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDCDA8D0014; Wed, 20 Dec 2023 17:46:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C84BC8D000D; Wed, 20 Dec 2023 17:46:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AFF678D0014; Wed, 20 Dec 2023 17:46:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9A81A8D000D for ; Wed, 20 Dec 2023 17:46:05 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7868F1C0BF1 for ; Wed, 20 Dec 2023 22:46:05 +0000 (UTC) X-FDA: 81588681090.16.BB05A7B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf12.hostedemail.com (Postfix) with ESMTP id BA9754000D for ; Wed, 20 Dec 2023 22:46:03 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SB34udq1; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1703112363; 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=9Tzzmpk6zqHgghmJ+i7focJ8fdDU2jQOAW0uh5TyPi4=; b=feZpcJQfUMQo6xy5tN9XSRFfjLTHfTOrGZIxtCLX2Hc5zZfKkr5Ofzbh3Mtu0AxzHUYOtK 6UzyCiPCk+zRQKOmIrAwUTKDiopnP44Y+LJQsUI++5d4aqJG28A+z/kpWzCaII0GmfpUC+ vTfEKNUxYhb5lvrj0rn78XZTWBXwZAc= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SB34udq1; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf12.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703112363; a=rsa-sha256; cv=none; b=5QdBdBogL30LJwzQTp2L4wUfnOxhzr+HnU4xuw4dl/DqtIDL7qpVQkEc1cK5yNkSuhMTUU JCHYv0q7qscD3Y5SHPnlVv9hncZPxKH7TBM/dIMC25QHPD5bc2EtGjcYwKoa0r3miqNFxE tZlifzSdxZnbEs8FwABc0SQYcSpOYqg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112363; 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=9Tzzmpk6zqHgghmJ+i7focJ8fdDU2jQOAW0uh5TyPi4=; b=SB34udq1VaUYdz2so8nwFIU2I2bhmBDQ5Y/83KIPnAlCF+No+Cszw3ToLKqJ82PgGj1aZk s7p77Apxo9Pp+P0MK+cBsetEnfOseERASUluSEVKDJQGAyeNR4QTKi9xcHXPKVRRhAmI6X dxC4rPQypYIGe3m+dxBbCREwTzGkSBQ= 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-492-LliV0quuP_Oqxcmuv5B2DA-1; Wed, 20 Dec 2023 17:46:00 -0500 X-MC-Unique: LliV0quuP_Oqxcmuv5B2DA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 E106486EB20; Wed, 20 Dec 2023 22:45:59 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD18440C6EB9; Wed, 20 Dec 2023 22:45:57 +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 v2 20/40] mm/memory: page_add_anon_rmap() -> folio_add_anon_rmap_pte() Date: Wed, 20 Dec 2023 23:44:44 +0100 Message-ID: <20231220224504.646757-21-david@redhat.com> In-Reply-To: <20231220224504.646757-1-david@redhat.com> References: <20231220224504.646757-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Rspamd-Queue-Id: BA9754000D X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 566ogxw45eoz5fyh1mpftwy8nbtftmuj X-HE-Tag: 1703112363-347162 X-HE-Meta: U2FsdGVkX1+OohyGUTezXDBHhyzaWLHB0ZUfW2JSWvxF9F+Mu1x0ZA+vbR9ewEPxZyVXw9V2QaHv6SKiiw6R5TxNVDkSUnY+qIRH7shaG2dEkDhLfmoHiEVVMcOrVxdXMDQhe86qI3lnJG+3HUEdetyeirz63y0TktzIhC+G7PExkXvXjcrHRdEe41SYyFTwASnYz1saafBzaHG3DBNWxTbLLsFaU7kuDDmoVNLj4nxqhoOq6UBE7qmN+iLbYkDBXFI4R0sImqj09ixcrpt5Awnz1RA8SHv/1UxhgA+SHD0lOKi4ZZDomrUmYCrPlsfdd7mUS8RNxO40RkN5KR1lt0cIZ9FJ2YOEZXzdgcQJOuKAQRSQBO9QlO+Q1yrE0ZbFrxhMddC2uf0YhoH7Wi47305paROc+vkbY2Q/FYGQ5QKjviDajrAwmIk4W7Kne8qxFgOEI7qSH2NarPTJ9CBd2/PJMFXDRqKtZ9SOxR8Rj0nYc+rqwagymlyVhme5JIn2u31OPDPZzw1osrukA2mm/cibGg3naE/j7E2JZ0Ss8rptky4lX8TP9g6bl2gboKNjQGYYHqp9GMEnX/5EscZjVYO/qfIi2jNrwM7T2qFSFUC8B7ITiQqTLivv68tUPtN9SVe0awjhUYb4UVpRwliUG2Mn8RMjjmpps3R3vWDgFYZq2bPmZwLEzl6D50NBxfcz1c9M1GJ4bD9nzH4nE9ZHJLkvFR128AZj5RbvNn9Iei7zcm9qBkD307fvXcWwhhMEi+j5P3f9fb5HmhJwQChKwvRHuTVDjG/c9hM852hOW4ChrgGKX3flfmoe7RDviTNYxILsCH7IfH5sP8FmUG9KbMdXm85ONYc4k24X1vkLIt9j23xKBW32f4YS//vaFoJ6n809HSesJRAqg4reM//T3dmJswmUjT63TdCtln4NcZ+Fe2HNPmgqY+498QxaUF2f1ns7BmPEyTzYZvk9n0x gSMgKooX GKFlMNlLn29ce+gojEVpGDKuF91p4w7m3hEDNFoQqZ3zNWrFu5MpsZA0+Xfm5wEslXxEd19t7Xz7/e4/8AWwgikFImHKiW0XInQTLlGi+V0VoC+WafRYIqevmKbOW3njBos2tP1vR0dobDm3kkl3rxMpp/ecbXp5xZ5y2c7MOU8sxMJPYP59Ja6sya4CFiSwNZ8h/z04qNGf7ZTaGnatnw15UXw== 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 restore_exclusive_pte() and do_swap_page(). While at it, perform some folio conversion in restore_exclusive_pte(). Signed-off-by: David Hildenbrand --- mm/memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index c77d3952d261f..6552ea27b0bfa 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -710,6 +710,7 @@ static void restore_exclusive_pte(struct vm_area_struct *vma, struct page *page, unsigned long address, pte_t *ptep) { + struct folio *folio = page_folio(page); pte_t orig_pte; pte_t pte; swp_entry_t entry; @@ -725,14 +726,15 @@ static void restore_exclusive_pte(struct vm_area_struct *vma, else if (is_writable_device_exclusive_entry(entry)) pte = maybe_mkwrite(pte_mkdirty(pte), vma); - VM_BUG_ON(pte_write(pte) && !(PageAnon(page) && PageAnonExclusive(page))); + VM_BUG_ON_FOLIO(pte_write(pte) && (!folio_test_anon(folio) && + PageAnonExclusive(page)), folio); /* * No need to take a page reference as one was already * created when the swap entry was made. */ - if (PageAnon(page)) - page_add_anon_rmap(page, vma, address, RMAP_NONE); + if (folio_test_anon(folio)) + folio_add_anon_rmap_pte(folio, page, vma, address, RMAP_NONE); else /* * Currently device exclusive access only supports anonymous @@ -4075,7 +4077,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) folio_add_new_anon_rmap(folio, vma, vmf->address); folio_add_lru_vma(folio, vma); } else { - page_add_anon_rmap(page, vma, vmf->address, rmap_flags); + folio_add_anon_rmap_pte(folio, page, vma, vmf->address, + rmap_flags); } VM_BUG_ON(!folio_test_anon(folio) ||