Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp4067043rdb; Mon, 11 Dec 2023 08:01:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IHlC47f4wuDGeX0JhW0cfA+7XcaCNnTihCfVqgk1hNgffYjHXm++NXsbknu/iPSILnoFU6b X-Received: by 2002:a17:903:2351:b0:1d0:6ffd:cea1 with SMTP id c17-20020a170903235100b001d06ffdcea1mr2311035plh.90.1702310485742; Mon, 11 Dec 2023 08:01:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702310485; cv=none; d=google.com; s=arc-20160816; b=R1WTZJJCF3xQFEQ/vHf9Ve+aqzpH0H+9cwkKRFv9cEOqAxiZDeemS/9AijUPjObbkm e5ki3uIMRDIhQszcm1EbQ1gEo+beW0OSzb+rb6U/ljZXpD7/5/jn3YTFAhgGZpYovC5z lu0NpkMXX9sFIq9y3Wl1/Jia8VK+YAvmoVudJ5pq3TL94O6k2gMWCkCFUXAyDIKn4TYb NPkHoB0gIjL2wniuzR39Xv8fjyKpBBrnUCvpkUXWYIdYA2QL4SfaOk1U3gjVuRS/f8Ez IS7UD2sZ+ystlElIGxgHcPbL23leUCC/BBVyK2Fo3MFOV5JQuJQ18QKtDbaIbKsrNbZw 3l9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XZDdgML9rdzFWWmlqwVPDDDqGkwGAqFc+AWaxqMx8Tw=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=WobAtw8aX86LNAErrqbxeS2ynne/SqVT7+z7ILjbvF/kz6ZMSIpQxKxGU8HyfWv6Di TyfWD51BWWYLO4Zr7KHtKmsvrdz0rKTs8t/CuSqkSQsXeaHMFUkaWBhIB1lrWOTXHCPa FUIjKsVQQzdZQIxLYNOhZFt+QbqfHZ3Yl1S6vhw/+yfbzI9eRujTGnFjM3Q49zYptxkw 47Kd1qzsUYk3MU90hY9g7wuwXEMiDHlgRb41bkESzqZ7rbhq3YtyB4dd0nOFagflNgDH Qnj8+/qySpkP0zfEYbyM0uXkVN/HbUP5ASxou2cfvVcmcvfWFKagMIgk4WVLQLbKPcZp 0ZCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eaAA5Ctz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id h16-20020a170902ac9000b001d0b43fe4ebsi6255804plr.611.2023.12.11.08.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 08:01:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eaAA5Ctz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id D131780B823E; Mon, 11 Dec 2023 08:00:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344721AbjLKQAd (ORCPT + 99 others); Mon, 11 Dec 2023 11:00:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344731AbjLKQAH (ORCPT ); Mon, 11 Dec 2023 11:00:07 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1FD71BD7 for ; Mon, 11 Dec 2023 07:58:48 -0800 (PST) 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 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 11 Dec 2023 08:00:51 -0800 (PST) Let's convert remove_migration_pte(). Reviewed-by: Yin Fengwei Signed-off-by: David Hildenbrand --- 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) -- 2.43.0