From patchwork Mon Dec 11 15:56:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487475 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 8E626C4167B for ; Mon, 11 Dec 2023 15:58:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC2D56B013D; Mon, 11 Dec 2023 10:58:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A708B6B013E; Mon, 11 Dec 2023 10:58:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C4B26B013F; Mon, 11 Dec 2023 10:58:33 -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 784C26B013D for ; Mon, 11 Dec 2023 10:58:33 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4FC3240727 for ; Mon, 11 Dec 2023 15:58:33 +0000 (UTC) X-FDA: 81554994906.28.1ADBA0C 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 9053C40022 for ; Mon, 11 Dec 2023 15:58:31 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ikcVbtBe; 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=1702310311; 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=XplrMRug9dV6L5N0sR7KY1Q40igMgZePuFWGdErJCwc=; b=WT6itKPtqtZ9vy1z6X1SJoFHn0BB5KFN9394T/MTQ+UV4wqO6t1ZDNX4zpl2Ft5WnSuI/c sVdgZB5g8+xcGLJ9KhC+MVCibAIn48HgslLGy542dF2fz8Pal+gRPhY3sBn2ZcDIohdoK0 ZASSAXhodScqsKI75Ykqbh5I7KjDKkg= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ikcVbtBe; 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=1702310311; a=rsa-sha256; cv=none; b=qx889YrZVF5cuYi/uXn7mPgXyCYPZttra2knXS2pm8fUbxC2Mddp+QTzx1rBcugbpbrjVR GLM/rHDjcz9mOvl0dApSQGpCgPJmuDbFU7/yeKt2QQZjm9VuUKSa6orLE6SRT2fBWdYbfn QAWTOG9mZRtL4zLRm8DVUxF+bCY8MA4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310310; 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=XplrMRug9dV6L5N0sR7KY1Q40igMgZePuFWGdErJCwc=; b=ikcVbtBeT2o9jvmwKB4OOtngV2lM77eI0VRCJwtH2GA1PUSA+KXsP4FFttNtDg1yCSP32D NFb1MPnGWWmTF0SCLP2or81upBv890UMTh4f57wtCZ5xwReDJTS0+Hg0ZYW7Urb36vqUof unNrsljuYqSehmj60EJEf8Pj9sGnc4Y= 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-94-z8fIYRY_PHalWsMPzvXDSw-1; Mon, 11 Dec 2023 10:58:28 -0500 X-MC-Unique: z8fIYRY_PHalWsMPzvXDSw-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 3551C185A793; Mon, 11 Dec 2023 15:58:28 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BFAB1121312; Mon, 11 Dec 2023 15:58:25 +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 36/39] mm/memory: page_try_dup_anon_rmap() -> folio_try_dup_anon_rmap_pte() Date: Mon, 11 Dec 2023 16:56:49 +0100 Message-ID: <20231211155652.131054-37-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: 9053C40022 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: cmnnqbg9x63xq49bpz3mz4mspaz1p75h X-HE-Tag: 1702310311-644520 X-HE-Meta: U2FsdGVkX1/BvoiRfLx1hndEKOQivDEEmcpXwbfKAl+inqWQVYkptLLkRtRvqXQga2HnHljDSnQ9WhykaKzILyraHD7GXU/fP2hOXwYtz+UlVQY+CNE27N/GTeub3qLC8BevdDlEBSTb0N9OIGuDu3SdQHf1GC0wCa+2qNeTL47+lN9kK+psm6FvfmcdVTJlelMdu66i17EWdXCN3TpdkONdSq6vrpjcFVa/IPfLyxCn+/JG6JXj+ceQLltpvNnlruvzB+BeKl3BCfBgAxquP1odmV+nvQXdmq/VEh+uRlUkOv5gz9ZECHO2tpzIEXdI6A4ds0ffyJbBJqqB1yTe9fgbvLyLkP60W6fL6SWSI2qjC0MTrC4ZLjo7IUeI+XHvsSz6XuZhEzQ56r75d51OYHiX+BTJI7yOmFzRjH7fqEFIQz5/R8pIhS6q+d5KAHbUF/hzgGez9HE3lv9Xx0jw7MeMhAttXgvcIoL3bJxNXhwdm4mQ51f+LZsf8n2SADb3xFLbCeAoaND4zD7JZYmNxDmz4eR5Fz9nLLKwqk5OT2oRuPo/Xeuw7msL8j365z3TJ9L1Hx4QeZ3CIO2yTtHJGeQ4gCrYsbcap9eWkzyy9KEPh8PlfD1gJmHcytC7EOSVM8Qa0X3iNsNJECdEyzXEFHPId3cArFpp6UONnsu/0JKvE2XNBUbeOhAFfJq4fKQ4i3v5qAA8qKa0QTBUvet+ZZ7e6ByMkNr3OI1lX6cXsF2V2Zpx6cELRD924k6lxfCXQMG8dMFAYMBJXwxBbCZu6zaR/Fnxe+Cd72dtqhHZhDYig00Xnf/2yapF8hx4yderqv8a2feizkvZZiOIIfVuP4HX9cMFjPqMXWOhxNm44VPXfO3AZZZYgHL3tR2akJfwJ7cXPTBmUNyHi9ylrhpJJBcdZpJTW0lh0BT/85qnfQD53D5DJMzh3OVayOC2SPJBhgC2IxfCp8yeM+RElZV 6mXNnhqX 5q34Tf8mrdUapvmd0prGyRC1BW3pl/DjCI1jCJjHoysFgsB/Fs98KUnQccb86dVtt1ukYKYsjgrZ0plGknK/c1QnxVQhTQ7/PY69eKUe6zWwCtmSqcdFlVl9nYqaTQ7rPrvXY1y7wSd3hg1KItr+iDucZ10LTPkT8Oe3cNnMYIDCSpiRCL4ZpZ67rp6NI0WGi61RibG+bwQDPEMyUCt+r7hz0/w== 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 copy_nonpresent_pte(). While at it, perform some more folio conversion. Signed-off-by: David Hildenbrand --- mm/memory.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 42a0b7b41b86..caaf4add6fa2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -785,6 +785,7 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, unsigned long vm_flags = dst_vma->vm_flags; pte_t orig_pte = ptep_get(src_pte); pte_t pte = orig_pte; + struct folio *folio; struct page *page; swp_entry_t entry = pte_to_swp_entry(orig_pte); @@ -829,6 +830,7 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, } } else if (is_device_private_entry(entry)) { page = pfn_swap_entry_to_page(entry); + folio = page_folio(page); /* * Update rss count even for unaddressable pages, as @@ -839,10 +841,10 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, * for unaddressable pages, at some point. But for now * keep things as they are. */ - get_page(page); + folio_get(folio); rss[mm_counter(page)]++; /* Cannot fail as these pages cannot get pinned. */ - BUG_ON(page_try_dup_anon_rmap(page, false, src_vma)); + folio_try_dup_anon_rmap_pte(folio, page, src_vma); /* * We do not preserve soft-dirty information, because so @@ -956,7 +958,7 @@ copy_present_pte(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, * future. */ folio_get(folio); - if (unlikely(page_try_dup_anon_rmap(page, false, src_vma))) { + if (unlikely(folio_try_dup_anon_rmap_pte(folio, page, src_vma))) { /* Page may be pinned, we have to copy. */ folio_put(folio); return copy_present_page(dst_vma, src_vma, dst_pte, src_pte,