From patchwork Tue Nov 28 14:52:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13471281 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 78576C10DAA for ; Tue, 28 Nov 2023 14:52:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A61C6B0308; Tue, 28 Nov 2023 09:52:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 03EF26B0316; Tue, 28 Nov 2023 09:52:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC1FE6B0308; Tue, 28 Nov 2023 09:52:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8CA666B030D for ; Tue, 28 Nov 2023 09:52:21 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 68830A022A for ; Tue, 28 Nov 2023 14:52:21 +0000 (UTC) X-FDA: 81507653682.28.CA31D47 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 890C02001D for ; Tue, 28 Nov 2023 14:52:19 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FRqSDapY; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf03.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1701183139; 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=PsWlt7VFXdpW+l7o+7c53krc3omwX16daxLcjKx1KOM=; b=uL/GP0KBZJe7A5CUlrSgiWm0ToB26IQo/bSS45wdhcwg3Y5uz+L6DXP8xReyJB3fHzh9W0 WoYGvuvgnk+hoBDkdB8pbUvmaUxmnrCfS0p8z7rtQ8xywOxjiUJvgKTOCSqFGtO0H/kplo fIgvzAv8cRqiD4F+EGC3jhtH9o5Iym4= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FRqSDapY; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf03.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701183139; a=rsa-sha256; cv=none; b=XMXLsdu//1mMiMrCOdNuLE5YRqYXlAUsr+PSfi4/4YYL3UjWeOQEf3TYruZoFlzCJJpyTn tW2sbaQX0Pz1rq4BZjgyvUy1GzJgxOehuWzLdBZoDrFLvnSjynwRV5EYBouuBtELxkiIGp SuTkjTZFWGH4sH04qCqh6KsVOwwflvE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701183138; 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=PsWlt7VFXdpW+l7o+7c53krc3omwX16daxLcjKx1KOM=; b=FRqSDapYzfhrI0qEbxk8QirMz6Rjvo6PzfuSquooTdH5lkMF5eLT7/BPWNv+srIcaNjR4O 7YlmiVlEWNc9S7yRXSVeqIBXugXuaftbvNBWKF+QA02LqpdntApUo4lffWBqp1JVwl7YEo o+SFJfB6h2ewAfY7lysZ8Nju+s4HEtw= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-OEY_3b4gMlmzc9twX3txxQ-1; Tue, 28 Nov 2023 09:52:15 -0500 X-MC-Unique: OEY_3b4gMlmzc9twX3txxQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 A088B3812597; Tue, 28 Nov 2023 14:52:10 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.193.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E85F503A; Tue, 28 Nov 2023 14:52:09 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Mike Kravetz , Muchun Song Subject: [PATCH v1 3/5] mm/rmap: introduce and use hugetlb_add_file_rmap() Date: Tue, 28 Nov 2023 15:52:03 +0100 Message-ID: <20231128145205.215026-4-david@redhat.com> In-Reply-To: <20231128145205.215026-1-david@redhat.com> References: <20231128145205.215026-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Rspamd-Queue-Id: 890C02001D X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: nna7pkf68idud4ptshqtakz76snzdr86 X-HE-Tag: 1701183139-567978 X-HE-Meta: U2FsdGVkX18U6rrbIzrBf2xmFZeqo1w4iGtM79wqip8sCXozA9vFl0x6KA3UltV7Nsoj2QWpPZNASccEHEBxA/2aDGVvyTs0KJ+UaiCwJdj/tyNje8vgt3txts3nuNxIkVV0tFZ7jYNKQpzhMwhzJ2c4PNpDEuEKW+d8wzJNKMEqgOsOzOPeSnY5YVlb1Hz1CKPp9mzk/5bPYYWM6JMRylWHfav5KsAvMo9Pc76HtzfYmULbF21rSBaJLValQCwuDloV/CdtYtyF43usoak+/+XTG2N9OHiGpXP+NFT6gk7Jj6mpa1Qa8+yDPNrzt+JTsXfEMQKYNloKf7VGZq77AZ0jg3vJdA8u9vxa+BXpZ1D2p9H9AeUNZVDna8phnVaxT3uG195E6NMNCxZLONwKD3PVlCFq8ruB6+5f3PPO5tW+kt6vJvD1N/Ea4shUWMjRIiqMzu07LS8Fb4kMXPd8bCSLPNZT14KTATfRawRE122+c9QdBzICFS3C3w7nhGlogA0Dm3MrBWfkXbsWQJaHBqShyZBfno/8MYKfJw3kgYGwWIlQ6Zdg6WbtPqQmakwroomt/d0P0Y2ww4WyunYCdo2dO38eXB3/SnBytssCqhisV4NoAQjfn7F5MGdTO24ELcbOeMQrh4VBzvr55edOFKvkIwfa2AoIOiTHOWPX1sAWBrDALCAeQusWDQ3/LFqRSgFApHPMO14dzG6r146vAtGUfoUpcrr/DnjeOJiwsR2ola7tvr+f0iZYJtm0Nv94j9zIdh9YVpFVqx5lDBjclHYBcXGoqu7QZQbd1Eo7XgYtyB1hPTa+AtAws66T/+eIjhXmn19ihN4H/RC0YlwJQuNbJzNQ6QFlh3hISC2SAfxfTglsoecTpZjduaUAZpeLb8ZQvYLC8zQrucns+CJJR6Ohdd4rtJ6lpq+tlTPry9/LMFdeh7ISwTIXjzT7hBPKV89GnJ69rPpijjTomef Ab1IVsSu I6e9XgW7P9SjciPsNVJU+suu1QLSSc7yEjYYU6vM79Chyztd/zRv2WnoraLM8vDbJZNSmin/jwV+X5i1kM5ifHRpHjzaPyvV7Gc4epi9bAL6LIbS6N8rBi0PS7hh61PELbkKDwtYoEVedUnlSzOnRjWU1zTo+RieSrcQEX/U4hBGLIMar4WfeMGauYCrm9gtms5NTh0grsHhV2mJGNcdoTTsmtQ== 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: hugetlb rmap handling differs quite a lot from "ordinary" rmap code, and we already have dedicated functions for adding anon hugetlb folios and removing hugetlb folios. Right now we're using page_dup_file_rmap() in some cases where "ordinary" rmap code would have used page_add_file_rmap(). So let's introduce and use hugetlb_add_file_rmap() instead. We won't be adding a "hugetlb_dup_file_rmap()" functon for the fork() case, as it would be doing the same: "dup" is just an optimization for "add". While this is a cleanup, this will also make it easier to change rmap handling for partially-mappable folios. What remains is a single page_dup_file_rmap() call in fork() code. Signed-off-by: David Hildenbrand --- include/linux/rmap.h | 7 +++++++ mm/hugetlb.c | 6 +++--- mm/migrate.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index e8d1dc1d5361..0a81e8420a96 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -208,6 +208,13 @@ void hugetlb_add_anon_rmap(struct folio *, struct vm_area_struct *, void hugetlb_add_new_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address); +static inline void hugetlb_add_file_rmap(struct folio *folio) +{ + VM_WARN_ON_FOLIO(folio_test_anon(folio), folio); + + atomic_inc(&folio->_entire_mapcount); +} + static inline void hugetlb_remove_rmap(struct folio *folio) { atomic_dec(&folio->_entire_mapcount); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index d17bb53b19ff..541a8f38cfdc 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5401,7 +5401,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, * sleep during the process. */ if (!folio_test_anon(pte_folio)) { - page_dup_file_rmap(&pte_folio->page, true); + hugetlb_add_file_rmap(pte_folio); } else if (page_try_dup_anon_rmap(&pte_folio->page, true, src_vma)) { pte_t src_pte_old = entry; @@ -6272,7 +6272,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, if (anon_rmap) hugetlb_add_new_anon_rmap(folio, vma, haddr); else - page_dup_file_rmap(&folio->page, true); + hugetlb_add_file_rmap(folio); new_pte = make_huge_pte(vma, &folio->page, ((vma->vm_flags & VM_WRITE) && (vma->vm_flags & VM_SHARED))); /* @@ -6723,7 +6723,7 @@ int hugetlb_mfill_atomic_pte(pte_t *dst_pte, goto out_release_unlock; if (folio_in_pagecache) - page_dup_file_rmap(&folio->page, true); + hugetlb_add_file_rmap(folio); else hugetlb_add_new_anon_rmap(folio, dst_vma, dst_addr); diff --git a/mm/migrate.c b/mm/migrate.c index 4cb849fa0dd2..de9d94b99ab7 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -252,7 +252,7 @@ static bool remove_migration_pte(struct folio *folio, hugetlb_add_anon_rmap(folio, vma, pvmw.address, rmap_flags); else - page_dup_file_rmap(new, true); + hugetlb_add_file_rmap(folio); set_huge_pte_at(vma->vm_mm, pvmw.address, pvmw.pte, pte, psize); } else