From patchwork Wed Dec 20 22:44:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13500643 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 B7A11C3DA6E for ; Wed, 20 Dec 2023 22:46:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 276F98D0020; Wed, 20 Dec 2023 17:46:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FE7A8D000D; Wed, 20 Dec 2023 17:46:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 006A18D0020; Wed, 20 Dec 2023 17:46:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id DB5F78D000D for ; Wed, 20 Dec 2023 17:46:33 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B80901C09CA for ; Wed, 20 Dec 2023 22:46:33 +0000 (UTC) X-FDA: 81588682266.21.334DF57 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 147D014001D for ; Wed, 20 Dec 2023 22:46:31 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fpddgJce; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.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=1703112392; 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=HrqmxJFgmC1fiGIelPJz980NZ2Q1oauxy+LU1liPb0o=; b=uNsUbXJPvEPu3qgTsi0n9SvO2JdwIuIx51U9JZ6lfdtmXZNvFteLbDuC1AQ2XTw9c58F3m SYgV3uJclu9wmAEAhL5bJynCV+uTM1zq0uaGeUXP4fIBvuYGgmxHbUOu+mvZQ+MpDfVz4M ewfYKK3AvU+cWMplJOeaQBa6awM0iAE= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fpddgJce; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf23.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=1703112392; a=rsa-sha256; cv=none; b=38xW+0u9QITy1iWpB0YX5RPbkVtdGc25FCucS7HUWCe45Sj7Xs/6iu83+7pwUHh5t8oI7+ VMLxKRwrCqh0Z5HEzM4XCHsoOiA6YzeZVJJnjWvxcwCfSBY3h4M2iZtt822arslKgvR+Cl S6JFGNH/FW9w+L3ZrxoBy3B8liKEgUg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112391; 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=HrqmxJFgmC1fiGIelPJz980NZ2Q1oauxy+LU1liPb0o=; b=fpddgJce8hSScfgzx/WUOKqW1RrCaLovKV2kXl5SiOCvxWrsFjmzEAPHv0VMydXqO4NV6G l6RfemE24fWgRtQn8OTSidhtA4UVV+2B0O+MU1AVEABDIwdJb0RRx71JxnXK6lEhPFivUw xWiPMk6DKcQTIJOHUZJtRPsakvc8JEw= 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-388-IzS3I1BaNGycfEoIX0J4Hw-1; Wed, 20 Dec 2023 17:46:26 -0500 X-MC-Unique: IzS3I1BaNGycfEoIX0J4Hw-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 99362863B83; Wed, 20 Dec 2023 22:46:25 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDC2940C6EB9; Wed, 20 Dec 2023 22:46:22 +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 30/40] mm/rmap: page_remove_rmap() -> folio_remove_rmap_pte() Date: Wed, 20 Dec 2023 23:44:54 +0100 Message-ID: <20231220224504.646757-31-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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 147D014001D X-Stat-Signature: 661yfdbbggqku5oujbbpxp3sw647nnqc X-HE-Tag: 1703112391-582046 X-HE-Meta: U2FsdGVkX1/s5xq3HzQdHblw8CAVdZo5xE+r6Xh2o2+3MP7Wx6APGVMcnesEqGKGi7iNkndrll2HXY0iuFnflzn5pxxY1HrhIgRdyCV3JnmCukftc27NQiND+lIVzXhYJXH47jOseL0V6EXBMW9I8J+Cq7R9Vv6XQEBQufUV5UaLc2PPVEIweNLTKXT9HC+Gux3pVpZqKHr/ilQeWctfVTggYJ6wTAgq3olDmycB9jsnIsBBsFiSaCyg4XFk+eOX7+uJCis0msiN8OP1WmP3IttFntETv/GEoWQvbIvX8aABt8SmHC2j1Aon+Ojy9R08wt4lQ9lFNFPuz6K6n+uAD14N6MuOEyn2IVINZM57GUk4psjj2QsLo2FkEfITSz82EDDWH0FPsIEF2n90NIsxDYDnlcOzQWggPBAmKZW+rACNl8LsCxcwALLEutL8n7io//MQAC53Fs3dD1FcG4hcueGvsANfFs/8tLopScVnuYPKvge1ywmxFvlE+nPqWPdBRH6nszQRWUS/kJ1O7V/AOy3oWkafS1CdM0iIkVvqRIl7qoFai6tPcTTfVdSAa6eSrErWGvxSkCVntpTdFfxqEk0ivLFF4gxBbafc+DmPdZR6rz46F3ciyIjN50hIAO5N5wXXpBJZwCkg41jTxEz1Roff9KlQMUGNiZoovXQUoe2QSCk0e65N5QPuuYzEMYRriSHyqTHU2PHlNebQn2FqcqsHn66pEE3ApuEwo4H6vVwEHfKIeAzBmB0StuYi2O25bg+wTsGrHZzw1kXhbq8K/2uvgeR/LqpkvdgbuWaW2Dnd4+uJDc2rlRL8XJ5eG3udVgcbooS1dLMTqf92kp4wuIOfWXc2WPWOOXPG4RYQB37jXYZloTWmoQYfSCsMSWplutUwuV0uuhxgP5QOhgTMmN0O9Xr7You3jCrOiraYrb2vXK2epFsDPpM3U7umpe9LX2Eu/3TQ5dqx8NjCxo1 90s/M5Wd LmglrLIgQE+OrypPO+3g1xNarXXw3UkSeDpzkoRQoakKN3BF3s45Ec6zcONL0vszXKR+wQFlG+wtmpcwn2gkcA5/w8PpjjJN2D8CJKJfXP9/cN+9NQOgjbJwE0ouHNzBcwcKUciAmqJXb8vhGIZIgEffF5UBb/W7THqh3JYHQSpcx24UdVlMhq3Re7rKnEPBRpKUtsWFdLEWr0abCWc6GxXgenw== 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 try_to_unmap_one() and try_to_migrate_one(). Signed-off-by: David Hildenbrand --- mm/rmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 1273180753953..a3ec2be484cfc 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1647,7 +1647,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, /* * When racing against e.g. zap_pte_range() on another cpu, - * in between its ptep_get_and_clear_full() and page_remove_rmap(), + * in between its ptep_get_and_clear_full() and folio_remove_rmap_*(), * try_to_unmap() may return before page_mapped() has become false, * if page table locking is skipped: use TTU_SYNC to wait for that. */ @@ -1928,7 +1928,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, if (unlikely(folio_test_hugetlb(folio))) hugetlb_remove_rmap(folio); else - page_remove_rmap(subpage, vma, false); + folio_remove_rmap_pte(folio, subpage, vma); if (vma->vm_flags & VM_LOCKED) mlock_drain_local(); folio_put(folio); @@ -1996,7 +1996,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, /* * When racing against e.g. zap_pte_range() on another cpu, - * in between its ptep_get_and_clear_full() and page_remove_rmap(), + * in between its ptep_get_and_clear_full() and folio_remove_rmap_*(), * try_to_migrate() may return before page_mapped() has become false, * if page table locking is skipped: use TTU_SYNC to wait for that. */ @@ -2289,7 +2289,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, if (unlikely(folio_test_hugetlb(folio))) hugetlb_remove_rmap(folio); else - page_remove_rmap(subpage, vma, false); + folio_remove_rmap_pte(folio, subpage, vma); if (vma->vm_flags & VM_LOCKED) mlock_drain_local(); folio_put(folio); @@ -2428,7 +2428,7 @@ static bool page_make_device_exclusive_one(struct folio *folio, * There is a reference on the page for the swap entry which has * been removed, so shouldn't take another. */ - page_remove_rmap(subpage, vma, false); + folio_remove_rmap_pte(folio, subpage, vma); } mmu_notifier_invalidate_range_end(&range);