From patchwork Wed Dec 20 22:44:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13500629 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 9363DC3DA6E for ; Wed, 20 Dec 2023 22:45:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 278C38D0012; Wed, 20 Dec 2023 17:45:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 18D6F8D000D; Wed, 20 Dec 2023 17:45:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ECF8C8D0012; Wed, 20 Dec 2023 17:45:58 -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 DA10D8D000D for ; Wed, 20 Dec 2023 17:45:58 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B8D8EA05D7 for ; Wed, 20 Dec 2023 22:45:58 +0000 (UTC) X-FDA: 81588680796.08.522AEC5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 213BB140021 for ; Wed, 20 Dec 2023 22:45:56 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KMyI3CYm; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1703112357; 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=zqDId8uyvnGLvlQWpKrOuAVvsXstgtUNoP8HJVv8bTA=; b=K52YKJYlwaBaT90d8x9cN/WV6CNfS/ikEtkR5pAKjhL9cww+vPO0DhWxAJv3t8/pq4nBg/ kghsUzKJbYjB4x6t0IfJN2cCUCRxUSwYUUF0RJeWWNBG3owQWxNvmrvvnPXK8LO85tus0H U4365gMM9mu+yNo5t6xNb6NEU3lT7S4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703112357; a=rsa-sha256; cv=none; b=6no0uBjBBgq53sPMWa2MZU0haOJmnbYNK421y5r3WQixmNZsVGngTT6EQyBmpcmS3tXyw/ U9mw90KZrxUcmsuahh8/DQfBDnC7e//vCUlhn0QSYc7KFQOuGLPPJSx41IZupC/NPSUbi/ yUJh7kUx4U/QMosRDm3q2gvPNmXXBU8= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KMyI3CYm; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1703112356; 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=zqDId8uyvnGLvlQWpKrOuAVvsXstgtUNoP8HJVv8bTA=; b=KMyI3CYmhqsOxPcwg7v1uVmTsd6P1d/1rQvtlm+psZ0FUQ+pakAy4XOrxytgmHhET9a0xI dTcxKCEOSj8T0h1vRRCd8Ksa+Kw7ULC+UONlfJpMg0Slk2YWdtTbmiuOEstwfg5iO3ZPNE LJoNtLhFouN3C1k0yGcUsJAmBZDqd7o= 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-483-X02swWYoMrmIknXW0v73xQ-1; Wed, 20 Dec 2023 17:45:50 -0500 X-MC-Unique: X02swWYoMrmIknXW0v73xQ-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 19FE538425AD; Wed, 20 Dec 2023 22:45:50 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8187140C6EB9; Wed, 20 Dec 2023 22:45:47 +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 16/40] mm/huge_memory: page_add_anon_rmap() -> folio_add_anon_rmap_pmd() Date: Wed, 20 Dec 2023 23:44:40 +0100 Message-ID: <20231220224504.646757-17-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-Rspamd-Queue-Id: 213BB140021 X-Rspam-User: X-Stat-Signature: ffyqpp3mmqbaps7jx11zt3yartwcmqri X-Rspamd-Server: rspam03 X-HE-Tag: 1703112356-157321 X-HE-Meta: U2FsdGVkX18ISk5cKd7nXgoGzukNEpzEBeXIvvtvg89VmQG8MegCUE4Ilgo00fcdro8ZjlG2EIL+r1HP9hMEXVI4kn18TnrCCR3SM1SBvCH2hvqBSLTt5Ge5Uimg2t2xe63tffq44sjsC41MtDLkElL5PJQqy+061W22ZsKjwgNbjG8hh/sOWjSQ3DwwEn/LflPQ43PBvRYaHgJHmpvGfJNLei26sh9Zfu6o0jklJNxUZEM4LT/xVsMBK6YiuqATx1BkNu47iOzFMUZMQ1KsSRSaGgOyfy9wYxR/c5VcSXdwBYYu0fQxosA3DQqFVMTT8el3t0pREroRzldmUDfIARc1E9AxWv59cTPV+fZfxx0VpQPezeKaTUsTUeywhDQaCeb0gbcSKWJ8wjz03ejdR1oNH9QFBUkfWBHvnjNccy052jM57X3tnKmQnEthJCklXCKfUxg7vBbbHSqffKy7ofZlZJs4AzArin7r59/V4xDGXTSkd5biZZmVrBLa+1Lur+Nj3U36i6VfIq5bKm04Dzfdqi3J5lbAdI9rrPej5Fj/IrO6ZBzs6DFSSYGnpjQDphV7IeB/0vpsOpBvij/hGwURJpaC2efXAJVg68/oi9r8nt/VH1xBcmi/iofdJ547ct7PO5/CG58pwzGuYjy+OvvuSYqLoCJrac6F6k3Jk5/xJQ0TLiHY60M3z1Zz3nGjs2r4IkmGBDKwBSzbn/oCw8hXHIN92ij5TFEqw50uFJLgusPI7aB/QhBWMCRKqK8R7JrFNjYUqViTEm94tVL/MYX1EwYhuMoVtq90FSEO230gMSvfVXpSKxC3UKDg7h9//sfflo7iRhITSW6no6JsAHa6y7c3sOIsBsKiXsbRwcYe3ltbS0m/L4yVR3/9YIF6g8X8SVRM6CWqh51ZqGsZEQtPSYclAWBatuWdnOSygehjPOaFYneX0HYBgfOsdNVs2cMQCQQAbSX54Qf8k6n hceqaKOy DQOmQDmJIJSi0yz9xsV3mKywLficqDhwQjTR/nrMEMD0HeyqFeXG8suM4yTcoiJXBTxZqQfivufG5AK7QUHj0x7G3IlSgK0gO0Zz5f15BzHNuf0F008yzsniZWyGtF+yhQ6fuRG3BqIFa6//AkI7hyA0+Bio+ZbvYMwwOgB1v2cgddLDHlIszKW7qA0K03Ixl4ZDbSP9WmhFLRv0sCDSzDcrIOA== 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 d4c5d22d16117..1f438326b69bc 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); }