Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp4064911rdb; Mon, 11 Dec 2023 07:58:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IG3XKu+P7vO3ppHf/HgUlGpWfqVkltOURXwKpIJxN7Ogw9HJRyzD0x6wt14Da6rkgK+4I00 X-Received: by 2002:a17:90a:578b:b0:286:c37f:d1b1 with SMTP id g11-20020a17090a578b00b00286c37fd1b1mr3425554pji.41.1702310308289; Mon, 11 Dec 2023 07:58:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702310308; cv=none; d=google.com; s=arc-20160816; b=ERaMSuRlztz5PlzxmI6QIdm8N8D9C5OIVDZEQa1ulCyRLUc3Qjyb4rqq5isrBddRqQ n3de7+j74dHclpiU0B4DV2ObufwDkFWz3gI9bb5/04bSy6F6Dlw9IQQ2gTxLkyAni1oo +LCvbCKYbufVyXZjqXDbz7gKaGt5V1x+hnWlENJ7ocdPVzskqx2z+fFXciYORDqjpmPT dCknCLNgljvK8+M9BPf9Jnm/GOwDIdyXRchbxt0i9ftPY+EmlgHjQvOX6BGjhYg1PPPU rke2PH5WdQH3sJfWKCm87I/Z+zjmI8kNfO40IdROx+QTQ7mvEjyvM7GiOW3cOjhUNJwD lklQ== 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=UzjxFSmJorC6pNmLrufiiZpWu6JbL+HXYJ1oUv8JfJw=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=MdSUg74184mgg67qrON4wZOPrY1gka4k9Kp34aX5wyyNRX0aLZoCDXW6SQCFhZ0vA+ QPm7nAOo/C/M2ewnjgRnLPFuO7l2dtoHYybrF6jO1/J5Ibm6tgCAfbhzStSK/lbgXuk+ 6RHPVW4MQ18NfDowZugWCJ0Sgz0szp5EQirtPpNpRR13HcaiHWIbOjcUfRLe6jc8hd7r 6IPVHqjjuDAXyKaVpfIs5soEQkfVlwf8QkX+vasnSpgyi9MEFnWlsBYOfYQnniXjI3cN t3+PmaeGzw8ZwbmEFSsObctXKhvY03VuW8dqCL0gQsq/t3Tkxgs5q7f+fUKIzTrs7Okn 2g7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZSv0bp5t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id mg15-20020a17090b370f00b0028869a825adsi7605931pjb.56.2023.12.11.07.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 07:58:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZSv0bp5t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 0C07F805ADD4; Mon, 11 Dec 2023 07:58:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344537AbjLKP6G (ORCPT + 99 others); Mon, 11 Dec 2023 10:58:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344565AbjLKP5j (ORCPT ); Mon, 11 Dec 2023 10:57:39 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68297119 for ; Mon, 11 Dec 2023 07:57:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310260; 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=ZSv0bp5tpJK7KzwWeRRRi7MU0gLY0KSzNdnJvJxSNC4j6yNpBCw9M2VUZ99ubhtdt+umoS C1shLfUkgRKXYD1NpX+GZrDgEa3hYlfsef9bnOuOq3lxiyI4InQDmdYjaBiGSrIBlPQwLM DV4GEkvbXLSND6P0qDY7k+3waZX7TGI= 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 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 agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 11 Dec 2023 07:58:23 -0800 (PST) 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); } -- 2.43.0