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: 181814 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp54980dyi; Wed, 20 Dec 2023 14:49:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IFUKXw4XEgzyn4HKTCF+mn72Szg9SJXP4a89MysyhNpw1pKsRuzUslkld9KWhs8sBhL2wEs X-Received: by 2002:a05:6e02:15c5:b0:35d:59a2:bd2 with SMTP id q5-20020a056e0215c500b0035d59a20bd2mr21936994ilu.104.1703112572714; Wed, 20 Dec 2023 14:49:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703112572; cv=none; d=google.com; s=arc-20160816; b=P+LpDtiaZivIm/OVU9q2J4qXH+4e6pCa4TBKdkTVelhBJF64Zs8ZM090iw0K0poU0q vU/E9NI8MUsJBnLwysbzqKP0A6MiK0w1CItWDq8B/7IIvQpG5EkPL1VKsnRDY1ADYtwB AYAZGhIvlZOYP3is6pMguS1Mv0Q/Yl7FIWuiBG1Ibp/KYg+DfwRjxRXgpa35pfyA374Q 42XZf83jRdKiJJGVm/9xnhTAvoapIvLUUh5LCo7hxyjNwJHeE+AUCGmOeSNsyRulhzoA hxVOd6sHrsAgVofaapBlvi6INPR0FCiyqQVBX/THWnEu9q6NuYBrvBr/g1OBK5lj0Bka cBQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=zqDId8uyvnGLvlQWpKrOuAVvsXstgtUNoP8HJVv8bTA=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=zuKcrJ/Cr2Ghs0TVhw6x5MworgFneUA8oGcm4FIAS/a1vmAA0yRfOjzr7XIJDrtGO4 bU3dHcdPhOb/fPDsu66iKxNPb72MZ+56+joNexonEkKPztXd7uUK5A5+M0pfFXwx8eUb iPtzxo7vBO4xWCZk+ipIepG4A3t9E+r/vsLupNtS9zXruwauChc1I1q2W9OEQqxyEgqu Va8vQzhkiJWri3bzQRlAuHysBCn4GPkK+pP7e36XBmD/M09D5/1rm0Cno1jJvPo39MIc OZe5cqRyPQRThJHHNliIcDx9rFy5xvnOf2QnUaF4zBs5X55Wc5L4qj0kcfQPjv2P4VtM yiEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KMyI3CYm; spf=pass (google.com: domain of linux-kernel+bounces-7541-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7541-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id s23-20020a632c17000000b005bd3c9a9528si450482pgs.263.2023.12.20.14.49.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 14:49:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7541-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KMyI3CYm; spf=pass (google.com: domain of linux-kernel+bounces-7541-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7541-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id EBD282852DC for ; Wed, 20 Dec 2023 22:49:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1D3C34E605; Wed, 20 Dec 2023 22:46:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KMyI3CYm" X-Original-To: linux-kernel@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DBDD4E1D9 for ; Wed, 20 Dec 2023 22:45:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785842969051282213 X-GMAIL-MSGID: 1785842969051282213 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); }