From patchwork Mon Dec 11 15:56:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487480 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 76BA8C4167B for ; Mon, 11 Dec 2023 15:58:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A3946B0146; Mon, 11 Dec 2023 10:58:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 58EA16B0148; Mon, 11 Dec 2023 10:58:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 40B7A6B0149; Mon, 11 Dec 2023 10:58:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2AAD76B0146 for ; Mon, 11 Dec 2023 10:58:51 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id EE290807E3 for ; Mon, 11 Dec 2023 15:58:50 +0000 (UTC) X-FDA: 81554995620.10.6C2CC0A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 4981740002 for ; Mon, 11 Dec 2023 15:58:44 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eaAA5Ctz; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.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=1702310329; a=rsa-sha256; cv=none; b=y2jNxQVYE2Wwcv7Mktu7jqBG+UfPFUGWhTZgtIaxITjl+rdqc+PW/KnzdfUiD/rGNCCxcF Nj1OdbF6wqq6D4v2EGPeRMF+5AnrpQ9JKfUgfkIhR4vNSsPwjcEAU3lMlhe7P7YJIxJ5e7 bdFSsNxV/Jiw3Jbu4UX3gRkAAdMVQhQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eaAA5Ctz; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.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=1702310329; 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=XZDdgML9rdzFWWmlqwVPDDDqGkwGAqFc+AWaxqMx8Tw=; b=nqvWCkghFfzpHu0FKHOB+gzhNl7CL2Yzlk7isyno+d4wNCqze/k1YmhPZ6vqHUiaxCJO4T f+11IAG/2W7Sy0FxthOF6xg2q3YgUhJ6GFZ9BcIUh0QPmKmDcqrZjZrCYg6NkV0vZEE0Hq k3iU3QD1T4sa2zhEKLCmsnG5D8hsrh8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310320; 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=XZDdgML9rdzFWWmlqwVPDDDqGkwGAqFc+AWaxqMx8Tw=; b=eaAA5CtzNPb3B1D+YZMIi4YeSdp9ykX2KQ+bN1NYOf1uh0ezm6UfvTOSI+fYGL76BoLyE+ 3DZluI6P00uXAAT1wgd7D68x69TMEQbnhux5B3GACKwha4d4zEgkoFOXS39hfAUseMTlvQ YKwYo5aZXd/RO/37qPLPYOVaD4EO5dQ= 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-657-X45q_OfKOJOoxzulSDa8Qg-1; Mon, 11 Dec 2023 10:58:05 -0500 X-MC-Unique: X45q_OfKOJOoxzulSDa8Qg-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 57BC9101A555; Mon, 11 Dec 2023 15:57:22 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18B491121306; Mon, 11 Dec 2023 15:57:19 +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 10/39] mm/migrate: page_add_file_rmap() -> folio_add_file_rmap_pte() Date: Mon, 11 Dec 2023 16:56:23 +0100 Message-ID: <20231211155652.131054-11-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-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 4981740002 X-Stat-Signature: eddru1yheus3t3ndect3mc168e4ej54s X-HE-Tag: 1702310324-518883 X-HE-Meta: U2FsdGVkX19VarXTP8KDQlKMGWrqCc0QZH1ghW3c7/FJycuaoIV0d08l/yJk6x9d0B4ZX5PrUfUDOD51pxlQISUScvzIQ83RePbrYerQ5e916S5t/q69e+kX2Ox/VFuAaWodwTetXU8BID/x0OHWF2w69DdMKJpWVLL9dtw9reAKGdZk+WIWiv3NGGT9TWlRk1T7vzpyfwbMuUzyTCPbjos4MybFgQgYyT6ZTG5LopiNqPTEwkg6vZ0TSrRMWk3RmulFRvJ9zInuhaDoroliriIJndgx8qJHZ0uEdf39U7iJDLN3DsB3atUzIeb4O1XgRUn2PEBX3guRgfM/wddlR9f/m7dF9UmXy+fCxUfBCtLYCjFfnQo1bsPJAiWxQMyKfqY+SbDqJevznP7DbwTLmpg8GkokjWQv0OXF9ALclyuMtxINpmlT7Z8BK1s/F6IFzPQdDrRbzZGZhnv3Lqhhrp/FjCgVASy4SWNlHM70b9yyNGp+ib5bdnmA6JPIIrBjG6E0un0fQSILlMIx1IidJWS0rv6JsU6sykLsEjZNydiKObwWGLl1Z5tFU+JIeL/30M0SCtvw5YPgchFRBPkBLIbgOmE2iiq6RchyCOonoH5b8JhYU0FbqMlxEUUaS0ZJbRQR5lp9wH3xbrtgAVREVE7jfqnGMbQEqwr/Ox5GiS6BvRD8OnskonlsP6h8B1hSEK/KrBBBCwMfqqjtQ/dXaX8X71f2A8R5WCaNIW+xiUlpRJ6ONc409JzpxV0uQZ5VcfxPcv3E2y7b923GhgAoWKUqa+BlO5zrSZWLudbqtA77ScmMJ/qHGPFJClxfuQdsQZNx3PmpBwNtq9lKD5i8btajJgHvoH4k9wZ9v2vFrVdhw9p6UQglf2pdgFDyUkYPI2wwOCcy7SgQuf4oiSvsSE0h/FXBPq7pSg1cbNCDTB9yvs7y8FDIYt1cen7kJqL8hGA7prxfkzBzT/vVGOa 5Nb9xv/8 Q4VGN33M3cWDpA4+2RF4ByAFIl+eo+Umc0qI0IDCiEqlWHW8OL+1XcneN6/MGM9mTpSDb0zG8f6ztJ+gi2p+a2RDJgdogaFLSgn2iD2xDlwQC7rCTPhVZvBNXQrXZzX8vNLcq9AVIqxT9cGexT42u/ExrwI6UVUnuKA2gVuQlnr4/+NK9HnROi0T/04JuTGEwx4Y3mfMQ007jGOnq+Vm7kU+wuiGUb2yRa0bdaQnMNzn/Jnob3b557arQ7+YPAW82jYw/lijInuX8FeA= 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 remove_migration_pte(). Reviewed-by: Yin Fengwei Signed-off-by: David Hildenbrand Reviewed-by: Ryan Roberts --- mm/migrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/migrate.c b/mm/migrate.c index de9d94b99ab7..efc19f53b05e 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -262,7 +262,7 @@ static bool remove_migration_pte(struct folio *folio, page_add_anon_rmap(new, vma, pvmw.address, rmap_flags); else - page_add_file_rmap(new, vma, false); + folio_add_file_rmap_pte(folio, new, vma); set_pte_at(vma->vm_mm, pvmw.address, pvmw.pte, pte); } if (vma->vm_flags & VM_LOCKED)