From patchwork Mon Dec 11 15:56:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487449 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 9910EC4167B for ; Mon, 11 Dec 2023 15:57:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8ECCE6B0115; Mon, 11 Dec 2023 10:57:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 89B066B0116; Mon, 11 Dec 2023 10:57:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 717E96B0117; Mon, 11 Dec 2023 10:57:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5A0A56B0115 for ; Mon, 11 Dec 2023 10:57:45 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2FAB5807AA for ; Mon, 11 Dec 2023 15:57:45 +0000 (UTC) X-FDA: 81554992890.05.9122CEA 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 6A69240009 for ; Mon, 11 Dec 2023 15:57:43 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bZcFdd6B; 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=1702310263; 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=UzjxFSmJorC6pNmLrufiiZpWu6JbL+HXYJ1oUv8JfJw=; b=bM9s1iMct6EIWYDKYVYy08CmkKhYL+dvrJpbKKeF0YPDYnQ+XA9s72rNtESHLLFD9byLuJ xVMzFi9Qg2EYcXsh94gx7SafSX+rJ11+1Mxq82rzISRIO/8jKiljO5z/ut/0QHvpugOZsC Xt0eQRWSb8Yfkj0uCLI81/5rF+lDDF4= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bZcFdd6B; 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=1702310263; a=rsa-sha256; cv=none; b=UrdTwG+hPXxtQOSx3nEMkGu06wBM8CygeWpBXcQQPzkQaEJsduscIXEkIQ6lqQmq5QmfK7 WDD2x1lbh4LEexxRSrjpGebqWn2YZqyCGQAtD2702aPI+7VoA73vUjLP9NRFHdrcYnTX1o pkq558qroej2dxIDDwziIZ6z8kDMQlE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310262; 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=UzjxFSmJorC6pNmLrufiiZpWu6JbL+HXYJ1oUv8JfJw=; b=bZcFdd6BVUyaYYfcHuvhyr93xFNCZ3u6Bn1bLXofhTrOJbZ6Jc/OdBliYDA9AhBH+F4j/E RxeNsqIA2awpvEFMRmHze1OA/oO7J96juLMCGjej1phmIEz/8BunrBuuR5oIhZQa9PBUlp MLqvjd5Ossifz78SxnyuKtaWnxdldu0= 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-180-2Y4Cj1kpO9CR1D_HN3qvZQ-1; Mon, 11 Dec 2023 10:57:37 -0500 X-MC-Unique: 2Y4Cj1kpO9CR1D_HN3qvZQ-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 BB36238425B3; Mon, 11 Dec 2023 15:57:36 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id D12261121306; Mon, 11 Dec 2023 15:57:34 +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 16/39] mm/huge_memory: page_add_anon_rmap() -> folio_add_anon_rmap_pmd() Date: Mon, 11 Dec 2023 16:56:29 +0100 Message-ID: <20231211155652.131054-17-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: 6A69240009 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: ert3z16woa4jni6tks51s4eo9kuemu39 X-HE-Tag: 1702310263-639007 X-HE-Meta: U2FsdGVkX1/wKtlYPvjOjNGB0YEljPM+zGPqWwk/uchAqr/VK4Wj7VNyHpAxvos0QaXDRrCIHvAootIq1/iEvpIA1Jh/6K4BOTIyGMFRP/bQ+4kQtF61abZi0v9GdPlJzRBrjor3xO8TygGyaDR7NsqWfkiws61z/KAq5MY5l/pOGU/UGjH1hbSDmdnvBDRDiHUy2Zu5nL7TXQgUScrEK6WYoaOg0V7l7uF4LZaycAgpLcFnI0aiqWpUNh9pvFPoLRviSyHS1m7jX3muXR0+43KtSkYGO2kU9bGK8YtjkMc/c7nIcwUUuX8Bv2+Sbn72zL/oaG6iEKzu10+Vf0HXXa/eXDXI5bSKWRJDiab0FEP2ICDYSUCjVHPsQ3Eo0phUw7hOi7PmXlJ7gYfG6mr5SvfOwbns1Eu2y6X3g2Bt+aJsH9eWPHrAByiJGe89yXtTLWozKn5ePA8s+575keTaignk7Qhgs9A37YqkrvX0v0nA6OqvVyzC9YqXd16P7YN8w1285keWjbdS4qpesVoItZMejdi0Y7WwPbZk25TvuFlqOGas1QlCoY8L3vk22GygwIWrlOaf6ySvIi0KPMkvLt2XQ5XnhHauj3RNRFaS/MGqQTHxYe2fKdaMaH76M0NCT5HpvNQli3pt33lptQSjKgZd1ZiNz2mUXgyQIU2CjgLcV3KCOBNH8uytKQ1AREOPQcCWxt/1tmbUHWL58Enl2Vp78xoCu3gS9Ss+nwexuYKdaS+TEQdHNGnje+kGY6iGIqXqP6D+VzfUNzUBMrcNgFmOjZUCYk/0UkpxP1PKgYYG7K68acub9nh5LnRFt8nf9PAqTucfhsMe4bjrMa+u61u95JRfhvfZax64HqIz+4ZC2+Qu/QF0W5Gi5h5Lhmy9dLaM9H408E2VWMYK7nNCnaumrFut8+TiU2eJsmeNFSap5bT2iUBrV01YefKJRnaeyFkxLsMPACutqkSuUlf RfpRkSrc YVY8eozzVZWLhw3xfy1fJvIMp2P+//XBgI8sv1AUlXsqlcnZDBS2qcaDModM8E+Do/uU0YNFtH6XNvjGhJo927ShWgeo1OedTZ5A+1gvdqXm4BdXX2BNK6v7Ik425f9APYxbtdsKCN8fD7PAu69JuK9t7/xyXIfKx5attFL4nLtcs08y4DNbaLrfnsd9lAAcnp4Z+56FuTA9imHuc3cHsh7oZcQ== 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_pmd(). No need to set RMAP_COMPOUND, that we will remove soon. Signed-off-by: David Hildenbrand --- mm/huge_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 82ad68fe0d12..b03374d1bb94 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3611,12 +3611,12 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new) pmde = pmd_mkdirty(pmde); if (folio_test_anon(folio)) { - rmap_t rmap_flags = RMAP_COMPOUND; + rmap_t rmap_flags = RMAP_NONE; if (!is_readable_migration_entry(entry)) rmap_flags |= RMAP_EXCLUSIVE; - page_add_anon_rmap(new, vma, haddr, rmap_flags); + folio_add_anon_rmap_pmd(folio, new, vma, haddr, rmap_flags); } else { folio_add_file_rmap_pmd(folio, new, vma); }