From patchwork Mon Jan 22 19:41:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13526140 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 072D1C47DAF for ; Mon, 22 Jan 2024 19:43:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8AA148D000B; Mon, 22 Jan 2024 14:42:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 85B078D0001; Mon, 22 Jan 2024 14:42:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D4FD8D000B; Mon, 22 Jan 2024 14:42:59 -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 5A92D8D0001 for ; Mon, 22 Jan 2024 14:42:59 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 38C43160A74 for ; Mon, 22 Jan 2024 19:42:59 +0000 (UTC) X-FDA: 81707970078.24.AED35AC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 8BCC540007 for ; Mon, 22 Jan 2024 19:42:57 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XgXhB8ub; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.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=1705952577; 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=uF2bxfDUAnNambtI6tdyCXd/UbNqDVLKUcWAFsWTSNU=; b=dmivyvnZw76CgR8EdhibFddaanFtG8ouWWYXaw8hhdWOHLhWCg0vcDaPoijDSP1y6sLwqn uN6PadiAKZkd4I5YAHarEfhCc7C4Ii3bX3GoobtrsmALnoQ9ZdGWl3Asg7xU7a9m9qqmE3 TTvQTniBkHEyvPVUdIiUC1iI3OMumPY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XgXhB8ub; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.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=1705952577; a=rsa-sha256; cv=none; b=oTT6aAWYxcYHCAB/VOUrebcw/ERKvLZp08vWvcbEy3U6zXqtlvo1BldmgemDvWL0dTSszC j0RXl9nfKeUR1iXw19GctG6J8MbZWxAe7FMVqqVnLYd3+syP+LKfR31aHrCHVulsEu8yBy l6Jsw+VE1w+oGHGg+Rb0kh5/EPAvprk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705952576; 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=uF2bxfDUAnNambtI6tdyCXd/UbNqDVLKUcWAFsWTSNU=; b=XgXhB8ubseusFXcQsSveJa6ROP1ah1KI3wc9TlwMgae+3DLknbPQDB5YY0qGnD+oj+EoDq p1fjdrv6o2Si1sUeBFXy/XDwj+TvJTS9whqASSm/1h7/UxMSiczq1MkFFnyoK2Y1R9ir6R jmE3OnxsMDLglDu69/N879JdWaAodw8= 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-668-81vkS9EYMCG6II-n3hayug-1; Mon, 22 Jan 2024 14:42:53 -0500 X-MC-Unique: 81vkS9EYMCG6II-n3hayug-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 055AF106D1A6; Mon, 22 Jan 2024 19:42:52 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D396488; Mon, 22 Jan 2024 19:42:47 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Matthew Wilcox , Ryan Roberts , Russell King , Catalin Marinas , Will Deacon , Dinh Nguyen , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Aneesh Kumar K.V" , "Naveen N. Rao" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , "David S. Miller" , linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH v1 08/11] mm/memory: pass PTE to copy_present_pte() Date: Mon, 22 Jan 2024 20:41:57 +0100 Message-ID: <20240122194200.381241-9-david@redhat.com> In-Reply-To: <20240122194200.381241-1-david@redhat.com> References: <20240122194200.381241-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 8BCC540007 X-Stat-Signature: u3nmesot5ngp6uscoy56gaftsgiibdp3 X-HE-Tag: 1705952577-140170 X-HE-Meta: U2FsdGVkX1+/nL6F8TYv1aGfIXOIFrJootFp1aZRPrmTkltN9vNkKrjtGshs7jUQRgBEMlyknaRfKqO5Vh0lzFt0vdrb+Ltk/f7V/r+BiQy1rPrkBK9UoXpVYeXts5RbaWtk9g4da8wIfBvtxeZ+bjk2H+rPDqo0pf7+R5ZDJWBXPFiiHiZeGBN4V2OXfrAZN80l9aYYSSyQSBnyv4OVDMz/D07OlOzHKsMo+677eL7qSUYH01c5mJXpE7TkNEYUVvKcBPtdetTHibKvMezqK8Q+ktVLG74HTqge3zEyn5pI0oBXGizmHheri4dpm3TYdHg5vUwYzpmTcX0tYWxr9I71xjyhcNrPscZR8naQWNcHSl2KyTcSXLpsJicPlgvcRMGrsFf9J27pCnIfMvLSnQLh+De75w2tSAzrCyeXasdlckx0Uqv7LgykovmNUdAvPiznOug4s4BAiovPwZK/zZmuI8bLiw339QfFTCX81aTk2QsMr1AYRv2k5JVOGr5j7JiRTRuqhv8y8dpoEQBO5YXmzj/eV03zgYE/DMU2nPuglwIwAYXmZy4+z+ovaQfae2O7U2EoxlYNaDx96F43doxSaXR6fdaOQt8BNl+Lll4aqji/0K8UJ1U5YnCCf0VgrdGu0yzA8x4BTYanUcIwaqDRbYJhTb4hxGJdMUPbna9s2C4eww2iGjxcfqWfw06LgMaF2z5EPz1RdItJ6/IaJBrJ8tcl4IrcyS1chUcdN7/8H7JX0uiQfvMlBhu+jhlaxZvGTSL8f0DosEhjM4EPYuhkojVW26tqd2OZqVBD2HcEsyRi6EwzhZe0+ucyn+QRY/OzARyHele4d6va7qW9DmvdIh8cYAUeBZzD4lkoFbJaJVWFoiPQBBTejybDfs7keUbETVAMFtxQyoOXJ09iTJ2m5KcI3T8XkFlOjSk84FKFcp4jRZ0xDB7XgAIE5ybWOeVVjyap6iUrYksk2QY 4/qESGNq fn9Xh3+KbbM4WXjqGFsRh22YGB0AGYtXCdwncJODHFFmgFbt06VJp54rQIXXMB2JLEIsYGLoA6WNIzTGY0WURAaeD6anHLv9SiIsib+C9ryGQdLrK4t7k+zEvMdWf3QXCQkgXeEywSDsWGcK85spdUiDqZ8V1LrFfaMdbx/cF6MFZWPTZbx8hviqLrRjqdouI4RE072dKsbbpEcvpzn4ZDz2YTyAab3sREIuv 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: We already read it, let's just forward it. This patch is based on work by Ryan Roberts. Signed-off-by: David Hildenbrand Reviewed-by: Ryan Roberts --- mm/memory.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 2aa2051ee51d3..185b4aff13d62 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -959,10 +959,9 @@ static inline void __copy_present_pte(struct vm_area_struct *dst_vma, */ static inline int copy_present_pte(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, - pte_t *dst_pte, pte_t *src_pte, unsigned long addr, int *rss, - struct folio **prealloc) + pte_t *dst_pte, pte_t *src_pte, pte_t pte, unsigned long addr, + int *rss, struct folio **prealloc) { - pte_t pte = ptep_get(src_pte); struct page *page; struct folio *folio; @@ -1104,7 +1103,7 @@ copy_pte_range(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, } /* copy_present_pte() will clear `*prealloc' if consumed */ ret = copy_present_pte(dst_vma, src_vma, dst_pte, src_pte, - addr, rss, &prealloc); + ptent, addr, rss, &prealloc); /* * If we need a pre-allocated page for this pte, drop the * locks, allocate, and try again.