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: 13487442 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 18660C4167B for ; Mon, 11 Dec 2023 15:57:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 087616B0108; Mon, 11 Dec 2023 10:57:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 00FCD6B010A; Mon, 11 Dec 2023 10:57:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF3776B010B; Mon, 11 Dec 2023 10:57:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id CA5916B0108 for ; Mon, 11 Dec 2023 10:57:24 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A8DE2A1B9C for ; Mon, 11 Dec 2023 15:57:24 +0000 (UTC) X-FDA: 81554992008.26.53990BD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id F24B64001F for ; Mon, 11 Dec 2023 15:57:22 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HZMGQLXA; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.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=1702310243; 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=IFC4IqKosk2274JfAmIWQYXkgsQjdSCIu6Bum/spFuM=; b=AOdilNjTpzppbI8efkm91CM/WSOujhWh2yRsp6wBjL02f1xzL2kYt7kNtcpcq3qq8tILHk 3Wa0G7fFScUQLs8rWcJTMEYPRbDR4MzkUfpigK6c7jRw6Ua/HMpogSh6rQsu/vYrS6F5FA YftYKQjLb99QVs3tmHoIwP3k4OoUQfI= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HZMGQLXA; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.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=1702310243; a=rsa-sha256; cv=none; b=ZGAM6Iq8zWvvofZsm+nwQUbJ6phw2j6rm2mzrspBSPFpnRWK2qqKX2X1RPbL6dIINTWG+x 9ezCcpXkF7OscqrKFR5JrXKcPjJckFrW/JUYkeuFvSq+kIm1X3LMJbiDwIOm38Giw2odoV QLcHcI3ZG4aaHFkqrqYMM1F6pPpaqrc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310242; 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=HZMGQLXArDAJiKhMdCOVUgQj+Jqx9joqcE/6ry0leLGWn636y8gbvblOoOXHJga75u+OyZ /CyCVb/uTbYCGRPwdmeGpUdlrTMbkGYqRUbzzK15UdJiebCxRIdXKy8x7Lx00JRCthAfEG dsJjow90LsEL4gjsxwzrjJNfbQ7xqAo= 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-Rspamd-Queue-Id: F24B64001F X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: oo6tq9fp15yro9xub167hypnfmh68snq X-HE-Tag: 1702310242-96546 X-HE-Meta: U2FsdGVkX19qdbXKAh+WKLtreXnJOsharoTAMWRFYFkgoljjh2W/eUwPdqdre0hLStffzuO1Sm1N4NjcSNv91qLlrDul4byrY7znNTuZH2o+vU0OvAY/Yym0IlkO1Mj++VLoZgNoLUZifFJvcUsn0h3zhjEKwZT3gCwXiVXb0G19aLhtayqTAUplZ1eumZrbdJO2JYgtmZeCfL03Kcm8x1lnF/7N43Lbfqv8vK+4V85KMxCKKDOmoa/JaP19MLv69946H09JcQSb0DGtB2iVHrRAbvIyMxYDroNvNBzR+BCsLuC+0NXJaqniGtHwrqDdi1YaTSz59cM4kHhIl980ru5kSQ0kJB5neQPE4JH9f+joihYcpCMWtIV3funKl9D9z/k28VMo9H1bQOkcMc52vzIr5BJ3NXO5X6r1zcq6eDPvoW9M5xF85Hao/HsfCJCZ1SKsQSLYGThvTZNu2NXanITQcKgrUl/AHPkIyJbRoorIDtZa2VX57mQzlFS75RuBFvTdCpqy1EwZhektD6MPZ5DA6RiYfJnIEYr0qGcoriAiICCWN/QgE+5cLXahr+bIRgkxTWPow5JiB3Y4bLeHDaszaimnQBpFrltIcacEfQ4lrTakmn3aQpX9VhTcaqLO27Vwaz+Ll7Lh3Fr2gqRaRpxvS7MouyIENNLKqJjJa8FjZD1o1TOw+vnnVj1/9WmB2aLsyAMQCIKisK4d4CIHn+ybRFzAsGt0Lz6npuJNYUBvfp1G/F8vxZlJEnuCAqucPk8eII8rexQH8zqRfKKYwbHFGYsbowRHBnXMKKU4+fmAip9I/iNBLYW5SQiMUFRGfB1fd6Nk5TbLq0suxrvE4jhDuZ4DBvF0zcWZktK9r4ww9K2/Yb0JKQlX9bsnHkJ/hvD5ergIYze9tAF+6bRO6xGfO79TZEBwoq6F94wHA6+K0jl1S1dWDrc6Hgf4NfwIo+JNIlpMMpWWF4Q3Gco uPdjWSkQ 2xeZPfWsBcEx1eXWPZ8enuv2nSLGAbCEvxCsvqy98c4TVfzsZnZsidftc+k/tPgODoOqosr6M4s/fjNFo33NjUevAROFTB1LqyysPBKVDhQEs7h4W0p+uef+d61uK5pIZuhoYTmoDdfFBrOEUrNdr4LvLk3nMCA/uqOG8dgPnssfO42oeG1q9wjflz6IzmB3bx3is03OMu51XdTr5uTN408DSS/59FpyBrdCEAaZ7ZSjaUoSuskyjRhwtTQ== 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() 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 */