From patchwork Wed Dec 20 22:44:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13500623 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 2D224C3DA6E for ; Wed, 20 Dec 2023 22:45:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 73AEE8D000C; Wed, 20 Dec 2023 17:45:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6BB258D0002; Wed, 20 Dec 2023 17:45:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50C348D000C; Wed, 20 Dec 2023 17:45:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3BAB78D0002 for ; Wed, 20 Dec 2023 17:45:40 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1C39C80783 for ; Wed, 20 Dec 2023 22:45:40 +0000 (UTC) X-FDA: 81588680040.11.D6BBF83 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 6E35A4000F for ; Wed, 20 Dec 2023 22:45:38 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZY38VdMe; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703112338; 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=XIS0gsmH7QK9fc1k9Ch7Ppycbt3c49uXYdCQJR3Zfvw=; b=Rx+ttLOaryzAhUK8hjfeCkPPS9gtKHy8asajI+q28C/CAnJxiJJD/kiu1URFu5vqqjoa3m uYotrR2Ya0Aufz0Q0UcSk0XHcdBR/clecQ8GMol35ApE2MRemzMH9q59E5B6Vyg4ekCBKF MPVnHjdUwALuIRfdOD7KPtWdDC7AdIA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703112338; a=rsa-sha256; cv=none; b=DAc99UDsYEaly37jAMnVo++dvxyRDvjNcFtcCLN545tqRIPLwfFKKfJ2Hx4yHii9qvHXcR XGOpgOZLeO2kl3vcLdmi0u6F/1mSO590SDmEai/5qhfZ13ZEdoUTpR6ApKrfGlZiUD1M3W jdYpVdyTDcQUufflvrx46IRI/dCZIDM= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZY38VdMe; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112337; 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=XIS0gsmH7QK9fc1k9Ch7Ppycbt3c49uXYdCQJR3Zfvw=; b=ZY38VdMe4CXZh+jR+TVGUG53SnRTC6PimuGtrTk5BCu/olYe1hds4IDAwxzq+Dk5ElEtFG s5p/2nBjh/S64o0BhRB7+PADsYcZKslAn4DT1KJuQzwaW84Fx9fkFwsxAV7pbmy9f34jHj utd7xcnREAlfIpKvVzTxXxruo7U0gIA= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-kA5itlGvPZq2AHOyuzUQEg-1; Wed, 20 Dec 2023 17:45:33 -0500 X-MC-Unique: kA5itlGvPZq2AHOyuzUQEg-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 6099A1C41B26; Wed, 20 Dec 2023 22:45:33 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0707240C6EB9; Wed, 20 Dec 2023 22:45:30 +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 10/40] mm/migrate: page_add_file_rmap() -> folio_add_file_rmap_pte() Date: Wed, 20 Dec 2023 23:44:34 +0100 Message-ID: <20231220224504.646757-11-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-Stat-Signature: cpjcuyfod8ff86sfy54rpbyzcqhbx39k X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 6E35A4000F X-Rspam-User: X-HE-Tag: 1703112338-868482 X-HE-Meta: U2FsdGVkX19kGCn3iTYbpmyj98JgtdOpSpJGi8FvHJMIQ/CUW2JK9WqgdvuEeJyvBg1PeGIHkfHndxPK2KdsJBeWoH2arix4QdZH0hbzeRaSVXo62/ke8BlMbBqFcO+i+Q+dOAIVAeHMdYGH2+Nq12GydeipcUl+kZOF2e3HNVEzjnhy1LmOopK3ORzZnfU4qQKzX9HSpRJW4q5OQUR8i4PlEmR/ejW91TvrSGlp7Lt/67Sb6tcnXuIcmrKqIwuZ4vV1tZCkUc6htAWMEMUY175VqmZV1Pr4BYxeqE9emhuRjR1Wty5B4F4wqG6NV3gO3BUQACQO2pV+ufFo5h2T38XKazVptwfEfLzOaz2UPtROXGp/yh/gkdoo7IdRBfiiq0ZJMPEZTWmqkVpfLidPQhEveSptLhBM7gNIDGrSOHc5n8sDL/AyanA7aAT+FB2YHeG1/LRl27FWWU/pNxuBwR5kWouSKPvTUrrXN3N1+sStfMJQHdc9mORDZSC/8rdpkKk2Z5QiGiw0Uxw79fm6LTwhiyuv717GCiRbIO/jctvkeOMkfdsM2vPzdaq8ytNBNhBiB/uxBoW47xzPDfXuHxCdPL9BkLUmpiUYdAmnFqswTmKkxpISGBKN+7Rk9oPlwWeXF9XF5zPOzqepE42zEO6/ns/6CoExYw5e46PBWeNCO1PE99mzzCi8KAKmSDHRbcUPTRQR+eaV0UTu5oMLxgCiN9Mk/IJ1hbvq/Uz9SHJt206l4+Ay2L/DVVu6fR7r9gTtYgCd6sXkJWwGxGp20KZExubEcdrZL5cKIJ0bDtN4aQNyJqJP89eC38dNznMTokR1POLigko+H/F+woXi0v3uHX6g2V3he8zbchYx5qA/w+K1lPE9wFBPaYTvwh2awlSyod4BNjDWSgBX+rRuOOA0L/B2MasyJZ8q328JATq3Ll0p+AiXGcPm2pN/imOl075I6v03/ztTnZcEtoK SbUtIs8q wPBQGAnHIZuOsfcTdW86q5IXN7oOl/7MjhuKBKIVxcaYSo7VlNDjzrLBjfyAkWZyQ52H1xidDoK+J4KkN/8kgIfzwcBLxOZsSGgOSKpVJWB/8CBazSqu54T/uJDNpXZXjTW1+ty3IT3v4dPZd6EzmEF31aAKXOT103cEILNArZ+c13LDn+GPmlT2UUHz7Y9A0wwNe+0UufKXwFsT4iJGFWJdR5wb4F+wNKYaF9DD/YrRpXNGYYyrke6rZrz+/SGqmsAbj9rDV0M39hVwmnp4gNnadF6Nq3kIOyiF59KXPnXyD4uw= 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 Reviewed-by: Ryan Roberts 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 0e912443a18c3..65d64a119cabb 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)