From patchwork Wed Dec 20 22:44:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13500642 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 F3EB2C3DA6E for ; Wed, 20 Dec 2023 22:46:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 428638D001F; Wed, 20 Dec 2023 17:46:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3AB3A8D000D; Wed, 20 Dec 2023 17:46:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 24D738D001F; Wed, 20 Dec 2023 17:46:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0B0968D000D for ; Wed, 20 Dec 2023 17:46:31 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E20A41A0512 for ; Wed, 20 Dec 2023 22:46:30 +0000 (UTC) X-FDA: 81588682140.15.DCCF695 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf07.hostedemail.com (Postfix) with ESMTP id 37B3C4001F for ; Wed, 20 Dec 2023 22:46:28 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Cf9xRjjY; spf=pass (imf07.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=1703112388; 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=aKdh92e0zNAps0SI5GoWH5U4FWHuHogZgqgLcAEKNJQ=; b=UqT/EH3KeUErAAHsRVaRwdK9ZxDxF4vOSqZO6DatpDdRXz9Ka7fyCyGjJfuElfYsC3b3mk 8MpqY0t1oCqpfHduC40bH/2nbdI9uJwEjyq/sRKxSJs7L82FbHDTenDnAAKlxYbcnZxfXV TTsvzRf59cKRGIjSeNs880TMeItYHFc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703112388; a=rsa-sha256; cv=none; b=7JDTbiZVD9TUhVTmnPyegtsP6GNerol3tdrkupwR3lg0/fjwxMny3ASFdX4ZmJamfNQC9G MwUzfpxeTS+wKICjdjg4wqcfGWdX/hpEFwqa/tt3kZ6EvT0CP1BzBRd6Wbc+IDCu2XbFvt CYqGj/DaRm8aSvu8+OXyOJUZMNWVpRM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Cf9xRjjY; spf=pass (imf07.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=1703112387; 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=aKdh92e0zNAps0SI5GoWH5U4FWHuHogZgqgLcAEKNJQ=; b=Cf9xRjjYEMNjI0sFRnIotGl4J76yyzvKIqi9aHX/iFIylhKH9rjRsB7QBwkjZx7oPB1EUE s0W0Kh681HxYCRN7qCBiUDhtYQTOzWp6mrwiHReLw9HBHdPvyWy9AmNo356uO5SAMs+/PJ xR5tb5lDZV+RpRGDIf5iQn9krjk2t6g= 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-513-nZxpfJamMleZQ6ECjJXe1Q-1; Wed, 20 Dec 2023 17:46:23 -0500 X-MC-Unique: nZxpfJamMleZQ6ECjJXe1Q-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 87B8A86EB22; Wed, 20 Dec 2023 22:46:22 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0D2E40C6EB9; Wed, 20 Dec 2023 22:46:19 +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 29/40] mm/migrate_device: page_remove_rmap() -> folio_remove_rmap_pte() Date: Wed, 20 Dec 2023 23:44:53 +0100 Message-ID: <20231220224504.646757-30-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-Stat-Signature: p4md87n4uoj6n9jknuexcobf7fqqoy58 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 37B3C4001F X-Rspam-User: X-HE-Tag: 1703112388-614220 X-HE-Meta: U2FsdGVkX1/BZCyFNhdSO4+ANg9vW7wDrLD8Vm4jwFsqNSX7WO9VLhisPlD14y9azi1ava9VQvxyzHFy0O3qcgqygkZ5XrTWDBcqbkCRl9v5IaObrloYtp/z+MFUniXcnFWEqAP3muZryFaOMgLi7NAs3jyXfrg8C8qwYe7fmC/cBxWKXYuRmaUn8goY5M/8/smcmxnKgj/WhQEbLOquLjX9Zf9Gpbncl3fe9igW92KKS9Tvgwwtr2XVbRybC4qjRtmguyA7zJneDtTuQquGHSIsQ5UyCeHDSec+99UmuvEoJlID6Zc8cmFRjELAzr2WournnVCmDZ4nZ/+T0ha8WVDBqVAP4TTmKRtQq+cV0Tq1NhPI4359Wu7y8juc+ORy9OZq3axFEXhD+nr+A7jwFBAU6ZwcnX15lRztM2eA3J8ML/9YUWbnJdDQani43NMrQCqjVNtn4y8PWMSFzTeWzDkRBzP+fdct9FQjErp+0MPEm+PpfoeEM9Q59+rpgCxjoNsxQjemq3hWc4HPz/s6JFldeOduipp7Ed5CRSWIgx+YxPQsrvOaBU0JTPqlwPgop7HRDQHYrri/j2jvJXQJpHM9YtcIarGj/mFyRbZZaQ5Ix9YfuuY6Rm1jTPvZI7nzYCLaN8hvB1X/M6J6d7lFBWhgsVw0xqA/VHgHMJdY9TvQv7J8+1eKxfhSyGwIj9AOqsMirGl6hIktCjyvTtiZN6I+9KTbY3cdIm8OBs/xFDQlV78DsikOJGDpSafo7G+657dNCBbh1/gIwDzmziMbMV6TUEvs1EhTqLgLurwG6mMUcfSYv4AhkmcAvMoBm8z3utjrH6x1U58WeBr7wHEQX/2oShBecyygE1GIfUFkSM9QrQxSFAUUE9WIQ9DHPwdPmd1/NNlb5/wHqTCAMQvdD+YJY/KdK7y+TwSjaW7q8m3w7s5Kd274v0sefQBG1WMIr5DOdL5KTG7prq4hQ61 91buIqTe nOJIxk14RWfxKKlyGwnUeCR+lCMJVBg7X9UZexO3IMuc4AhsLgQlzokuldgzxn97MqqgMNqezHl5yJ9hiLViR8cJFj4zeoyl/qox9lM8S0rqvZl++uclzB8R1W6eghPp+5IGEiO1ybfYZG7jcnnNJoyyrPrF4ybJwSm2aBoNYh2qeWlXZr2RZ3qyV+WMes96ipncJiBEkVXYvWvOG/ahfWhPY7Q== 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 migrate_vma_collect_pmd(). While at it, perform more folio conversion. Signed-off-by: David Hildenbrand --- mm/migrate_device.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 81193363f8cd5..39b7754480c67 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -107,6 +107,7 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, for (; addr < end; addr += PAGE_SIZE, ptep++) { unsigned long mpfn = 0, pfn; + struct folio *folio; struct page *page; swp_entry_t entry; pte_t pte; @@ -168,41 +169,43 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, } /* - * By getting a reference on the page we pin it and that blocks + * By getting a reference on the folio we pin it and that blocks * any kind of migration. Side effect is that it "freezes" the * pte. * - * We drop this reference after isolating the page from the lru - * for non device page (device page are not on the lru and thus + * We drop this reference after isolating the folio from the lru + * for non device folio (device folio are not on the lru and thus * can't be dropped from it). */ - get_page(page); + folio = page_folio(page); + folio_get(folio); /* - * We rely on trylock_page() to avoid deadlock between + * We rely on folio_trylock() to avoid deadlock between * concurrent migrations where each is waiting on the others - * page lock. If we can't immediately lock the page we fail this + * folio lock. If we can't immediately lock the folio we fail this * migration as it is only best effort anyway. * - * If we can lock the page it's safe to set up a migration entry - * now. In the common case where the page is mapped once in a + * If we can lock the folio it's safe to set up a migration entry + * now. In the common case where the folio is mapped once in a * single process setting up the migration entry now is an * optimisation to avoid walking the rmap later with * try_to_migrate(). */ - if (trylock_page(page)) { + if (folio_trylock(folio)) { bool anon_exclusive; pte_t swp_pte; flush_cache_page(vma, addr, pte_pfn(pte)); - anon_exclusive = PageAnon(page) && PageAnonExclusive(page); + anon_exclusive = folio_test_anon(folio) && + PageAnonExclusive(page); if (anon_exclusive) { pte = ptep_clear_flush(vma, addr, ptep); if (page_try_share_anon_rmap(page)) { set_pte_at(mm, addr, ptep, pte); - unlock_page(page); - put_page(page); + folio_unlock(folio); + folio_put(folio); mpfn = 0; goto next; } @@ -214,7 +217,7 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, /* Set the dirty flag on the folio now the pte is gone. */ if (pte_dirty(pte)) - folio_mark_dirty(page_folio(page)); + folio_mark_dirty(folio); /* Setup special migration page table entry */ if (mpfn & MIGRATE_PFN_WRITE) @@ -248,16 +251,16 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, /* * This is like regular unmap: we remove the rmap and - * drop page refcount. Page won't be freed, as we took - * a reference just above. + * drop the folio refcount. The folio won't be freed, as + * we took a reference just above. */ - page_remove_rmap(page, vma, false); - put_page(page); + folio_remove_rmap_pte(folio, page, vma); + folio_put(folio); if (pte_present(pte)) unmapped++; } else { - put_page(page); + folio_put(folio); mpfn = 0; }