From patchwork Mon Dec 11 15:56:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 176757 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7152189vqy; Mon, 11 Dec 2023 07:57:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IETstN9lGK+PqbIIcOUzzH+hdCpD0XBVN+N6GG+Hl5q4KJOz7ydbhujh6ggw8R/58NsV/IX X-Received: by 2002:a17:902:ab0d:b0:1d0:ce26:7ec2 with SMTP id ik13-20020a170902ab0d00b001d0ce267ec2mr4451290plb.6.1702310273516; Mon, 11 Dec 2023 07:57:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702310273; cv=none; d=google.com; s=arc-20160816; b=Wwbn1uQUICGxyRl4DvCGDB6jGNi7FQftwPdfxu0a50cfsS+d9Pv0GIRQiI9pYwCHqN e1ZskjX1DfP+2GuPePjqz2X9RAwMTY8PRBYOJimgU77kQ9b7qpX4domWGYXQ4jfYrGS8 FRMWdKJxZoHFR3P8m/MruJibhq7pB3yY2kUiOS5LOnzu5IXz4mLFAF+eYmGK3vb9ZcgP IUtLDYpzfE2kEhWNtuehTjVcplfY5LvxQ1OgXwWXIUILCAhWunyoDY38CZch0dkoerit jwjeCigyZy+rEB3tl2BUlbtMT1bCKKXY2527Dp7MO3ZlJ5PvFIRjriWyNGvBjBPSlydJ QvPg== 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=IFC4IqKosk2274JfAmIWQYXkgsQjdSCIu6Bum/spFuM=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=ScuVYoSDkA2RxTM1ZTNrcIn72pcPLSa0dpEzib/h0Ice33RFio+gxEtYG8wPElOb9q ElJcY6ISnDnClLRXTNuxVTIybvIqX0+TkEi8m0OPAHbdDR+xeDZhY6dZQxfQ5cxWuqfi eTvRioqynSrfqREuojx2e11mdy5j5d3mdaVH6zvqThQEIkix/A7T8+Gwh+3sEbern+0u V3l7QRsTBwquK61TpLbVw68knrcQdJd7YTeM9o2PiNUQpJ1h81iZrPJgMYcK01V/9rqv JgCbfD//miJ8uJfLJcLVZPQho0f5vMPFPJVBbOycX3xQcl+G47k5/KqNU600OZi2M0DH JrNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BSFDW9HY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id j15-20020a170903024f00b001d1db5e39absi6358281plh.320.2023.12.11.07.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 07:57:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BSFDW9HY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 24CD1805ADCA; Mon, 11 Dec 2023 07:57:49 -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 S1344547AbjLKP5g (ORCPT + 99 others); Mon, 11 Dec 2023 10:57:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344491AbjLKP5S (ORCPT ); Mon, 11 Dec 2023 10:57:18 -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 A9FA4FF for ; Mon, 11 Dec 2023 07:57:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310243; 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=IFC4IqKosk2274JfAmIWQYXkgsQjdSCIu6Bum/spFuM=; b=BSFDW9HYPtLkYPg1P1jLd5BlFFZpPfadHrUDRrkiG1E3v1gpvFa4Ub12PpgnBeV74lEA2p r2SDtCSea7j84RuTnjX11onFxgYYyJk5jJDYY+Iy3bvmkl4LOO7WNOZLIruPwl8FZLrUQd 3hBEh8fW0+9PxVgI1CmN0uDCwhJ2nm0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-HfiNUATqMv-A-RIgHEr9kQ-1; Mon, 11 Dec 2023 10:57:20 -0500 X-MC-Unique: HfiNUATqMv-A-RIgHEr9kQ-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 B132B870830; Mon, 11 Dec 2023 15:57:19 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B9311121306; Mon, 11 Dec 2023 15:57:17 +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 09/39] mm/huge_memory: page_add_file_rmap() -> folio_add_file_rmap_pmd() Date: Mon, 11 Dec 2023 16:56:22 +0100 Message-ID: <20231211155652.131054-10-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-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:57:49 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785001696933023617 X-GMAIL-MSGID: 1785001696933023617 Let's convert remove_migration_pmd() and while at it, perform some folio conversion. Reviewed-by: Yin Fengwei Signed-off-by: David Hildenbrand Reviewed-by: Ryan Roberts --- mm/huge_memory.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 3a387c6f18b6..1f5634b2f374 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3577,6 +3577,7 @@ int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new) { + struct folio *folio = page_folio(new); struct vm_area_struct *vma = pvmw->vma; struct mm_struct *mm = vma->vm_mm; unsigned long address = pvmw->address; @@ -3588,7 +3589,7 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new) return; entry = pmd_to_swp_entry(*pvmw->pmd); - get_page(new); + folio_get(folio); pmde = mk_huge_pmd(new, READ_ONCE(vma->vm_page_prot)); if (pmd_swp_soft_dirty(*pvmw->pmd)) pmde = pmd_mksoft_dirty(pmde); @@ -3599,10 +3600,10 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new) if (!is_migration_entry_young(entry)) pmde = pmd_mkold(pmde); /* NOTE: this may contain setting soft-dirty on some archs */ - if (PageDirty(new) && is_migration_entry_dirty(entry)) + if (folio_test_dirty(folio) && is_migration_entry_dirty(entry)) pmde = pmd_mkdirty(pmde); - if (PageAnon(new)) { + if (folio_test_anon(folio)) { rmap_t rmap_flags = RMAP_COMPOUND; if (!is_readable_migration_entry(entry)) @@ -3610,9 +3611,9 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new) page_add_anon_rmap(new, vma, haddr, rmap_flags); } else { - page_add_file_rmap(new, vma, true); + folio_add_file_rmap_pmd(folio, new, vma); } - VM_BUG_ON(pmd_write(pmde) && PageAnon(new) && !PageAnonExclusive(new)); + VM_BUG_ON(pmd_write(pmde) && folio_test_anon(folio) && !PageAnonExclusive(new)); set_pmd_at(mm, haddr, pvmw->pmd, pmde); /* No need to invalidate - it was non-present before */