From patchwork Mon Oct 2 14:29:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13406288 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 998B1E784B6 for ; Mon, 2 Oct 2023 14:30:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 84D6A8D0001; Mon, 2 Oct 2023 10:30:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D57B6B015C; Mon, 2 Oct 2023 10:30:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 601A98D0001; Mon, 2 Oct 2023 10:30:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 44F616B015B for ; Mon, 2 Oct 2023 10:30:06 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EFA23402EE for ; Mon, 2 Oct 2023 14:30:05 +0000 (UTC) X-FDA: 81300755970.14.17FB4D0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 0CBAF40020 for ; Mon, 2 Oct 2023 14:30:03 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SH4EzYcO; spf=pass (imf12.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1696257004; 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=iuOLWxV07WMAFicgIRp5L49gcu/vw0Qb9ZJxOn72iWI=; b=KalD5pBRCx6tVGnkasZh1AK0w42m7xeQHgRRfssX2NyrRII3QfE8GMz3G8q+TQv6NOgmz7 APS6/3NYrnBOTZ70bbdyln7mPlFUVxKz0pb94OL3QPdC0bf8sEJYmg8CTETXoLRjK5UDFx s+2jaQsb91knLAomz3aEzKs4bRBwuIA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696257004; a=rsa-sha256; cv=none; b=N+w6t4EHQYgCjIz6xUWBIRpf2kpy+KdShGEb4zq9kXif0UZa8txQ4es5D0QruNXeoJJqzy mSIieP12jS4s/Wvskg6fwuorea7UaPNjnvepdAiva2emvlUvJvu8OJLpMMghzEnxvvbmW6 j67AROP3vFDPj8Dl7yRm80rTtU9inMM= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SH4EzYcO; spf=pass (imf12.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1696257002; 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=iuOLWxV07WMAFicgIRp5L49gcu/vw0Qb9ZJxOn72iWI=; b=SH4EzYcOzBcGm+zVVvcPmPSVsILrgZUrkzhO1r+OZg1fkRDi50GHpFtbx+plBCV9/PmLE8 1Fyc/Ar92InS8IGosYydUXJb2mQSkTpuvI9Hcf0ZnhD9+mu7OyXIzVx7dXXytxJl5fCMk+ W9x2EUZ3vzbkd13HVZNXb2VgzjK1Bnk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-564-A63WA2viPemAtiRYluLjVw-1; Mon, 02 Oct 2023 10:29:54 -0400 X-MC-Unique: A63WA2viPemAtiRYluLjVw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 26B71802C1A; Mon, 2 Oct 2023 14:29:54 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.194.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09C2510EE6CE; Mon, 2 Oct 2023 14:29:52 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Mike Kravetz , Muchun Song , Suren Baghdasaryan Subject: [PATCH v1 2/3] mm/rmap: convert page_move_anon_rmap() to folio_move_anon_rmap() Date: Mon, 2 Oct 2023 16:29:48 +0200 Message-ID: <20231002142949.235104-3-david@redhat.com> In-Reply-To: <20231002142949.235104-1-david@redhat.com> References: <20231002142949.235104-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Rspamd-Queue-Id: 0CBAF40020 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 53s1hdhea64jminsfmkrb8dg1z1wgros X-HE-Tag: 1696257003-410225 X-HE-Meta: U2FsdGVkX18ni5bSyk7eia2+pOhSqLv1rRDEcYyznm90MOSzhwEtZ2VlGJiFb67mo4myvJzTTu3iXGKuTKixPsuzMej96Z1leTep+xc46kQBF122NiZXZ9qJacFJq71ccdhfsPhgKu3GvHt+sLLvWm4ulUX+TEwhi/081ZdPSfx2X5imtLuv3/fFpLUobqOOADncUtvpjyyPTFW8yTm+qMrU9YSrfZ7EQrnQTAQcxC4xeFYgtCwR+VQoGQciEHQrzXcSI8WhNGpeiA4/Uy7cCfEtd0di+sKOaZNjtjDm3JRHEJgG+7dqV1DQuluzRuyUF3I4i3vcQkv7+XMBgXMzMAigCV3oT7uW5gpMknjyTQ4n3x1YJKGng9+paSi3psu2hdCLGFquKkEvuLCxE50KCXG/tWi8ckJxL0kXD3u6Rd9cBgB+sQmLT+rkSSjaNVK0BPFR/d9IqVIG7OCML7xkfg3bKFediYqOSzZKgTEk/eZA7egnjwO4CqQU99iETi89te3TJJSUkxS1rzur3GbruP+10DzAC/hLUdyM1yDDmgbJgmPpprxrn12IB+46E+GVNcBHBm5HVP2VfKXdeX3/S2FMr/m5MEQBboJxEycP8tyibyaM2XBZ1HDuMJO3T9AOcEEEoA2I82x7qVaOYfPrrt3Q4gl+jgfeg8XUv3EeG7RA9dCLb5tMuycEqO1CBgrJE3jkQPMcf7Mt0j8JsK1nOJCgA9SfabRnVSlXhP08mGvHhgmZXANojA4yXDo7MuxCPbbJ7Ptq3TRt9N5Rz96dM3Rp4QYiqBEnXTVWjpQ5SD9fHIfqGC+I7+S6ZTKr41ZTV8mxhxMJ5cGPFP4oOUvR4wbDz3SrGPrOExC0BJwFO2oanbXNw7+qFX0WfFrHz3A/TydgF5E5/MaegQkgQGh87/SAGgm/NwJ3BqZ9GAgArnqG3zAldwH+A3ORh14/fxgs0Mi+WGNrEvAEanHpz1O cJgDBfqg LS9bUEdmIjzoabKKBcjv5K1+Ockfpu6Dh5G1UpRXuDLfWtaHnaHWneVAMzmPpaH7UDKXsR+pcf2V4TK15vdtnqepAyNGBWlzxD6PaPBEIxE7xMm7LtTLpaR288j+JJ5auM2kZBGABGk7kKdytBYGAAj+y0bg056fvardDTbZtL+0jY890TrZFaJsmsSHiMlyOfTkEMcEcurqiTqBaF4Hr6IdmXg== 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: Let's convert it to consume a folio. Signed-off-by: David Hildenbrand Reviewed-by: Suren Baghdasaryan Reviewed-by: Vishal Moola (Oracle) --- include/linux/rmap.h | 2 +- mm/huge_memory.c | 2 +- mm/hugetlb.c | 2 +- mm/memory.c | 2 +- mm/rmap.c | 16 +++++++--------- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 064b432a4033..8034eda972e5 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -194,7 +194,7 @@ typedef int __bitwise rmap_t; /* * rmap interfaces called when adding or removing pte of page */ -void page_move_anon_rmap(struct page *, struct vm_area_struct *); +void folio_move_anon_rmap(struct folio *, struct vm_area_struct *); void page_add_anon_rmap(struct page *, struct vm_area_struct *, unsigned long address, rmap_t flags); void page_add_new_anon_rmap(struct page *, struct vm_area_struct *, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 01d0d65ece13..08245226ccb8 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1505,7 +1505,7 @@ vm_fault_t do_huge_pmd_wp_page(struct vm_fault *vmf) if (folio_ref_count(folio) == 1) { pmd_t entry; - page_move_anon_rmap(page, vma); + folio_move_anon_rmap(folio, vma); SetPageAnonExclusive(page); folio_unlock(folio); reuse: diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 24591fc145ff..e52c6048e74f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5461,7 +5461,7 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma, */ if (folio_mapcount(old_folio) == 1 && folio_test_anon(old_folio)) { if (!PageAnonExclusive(&old_folio->page)) { - page_move_anon_rmap(&old_folio->page, vma); + folio_move_anon_rmap(old_folio, vma); SetPageAnonExclusive(&old_folio->page); } if (likely(!unshare)) diff --git a/mm/memory.c b/mm/memory.c index 9de231c92769..1f0e3317cbdd 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3483,7 +3483,7 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) * and the folio is locked, it's dark out, and we're wearing * sunglasses. Hit it. */ - page_move_anon_rmap(vmf->page, vma); + folio_move_anon_rmap(folio, vma); SetPageAnonExclusive(vmf->page); folio_unlock(folio); reuse: diff --git a/mm/rmap.c b/mm/rmap.c index 854ccbd66954..37f05f33559b 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1141,19 +1141,17 @@ int folio_total_mapcount(struct folio *folio) } /** - * page_move_anon_rmap - move a page to our anon_vma - * @page: the page to move to our anon_vma - * @vma: the vma the page belongs to + * folio_move_anon_rmap - move a folio to our anon_vma + * @page: The folio to move to our anon_vma + * @vma: The vma the folio belongs to * - * When a page belongs exclusively to one process after a COW event, - * that page can be moved into the anon_vma that belongs to just that - * process, so the rmap code will not search the parent or sibling - * processes. + * When a folio belongs exclusively to one process after a COW event, + * that folio can be moved into the anon_vma that belongs to just that + * process, so the rmap code will not search the parent or sibling processes. */ -void page_move_anon_rmap(struct page *page, struct vm_area_struct *vma) +void folio_move_anon_rmap(struct folio *folio, struct vm_area_struct *vma) { void *anon_vma = vma->anon_vma; - struct folio *folio = page_folio(page); VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_VMA(!anon_vma, vma);