From mboxrd@z Thu Jan 1 00:00:00 1970 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 CF2A5C7EE32 for ; Fri, 27 Jun 2025 11:55:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C839D6B00C6; Fri, 27 Jun 2025 07:55:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C33746B00C8; Fri, 27 Jun 2025 07:55:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AFAF66B00C9; Fri, 27 Jun 2025 07:55:26 -0400 (EDT) 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 9257D6B00C6 for ; Fri, 27 Jun 2025 07:55:26 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 42F1B5A48A for ; Fri, 27 Jun 2025 11:55:26 +0000 (UTC) X-FDA: 83601025452.03.34185BD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 1DB92C0006 for ; Fri, 27 Jun 2025 11:55:23 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dzdLS2Uv; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751025324; a=rsa-sha256; cv=none; b=PQVPQJmFoPDMgeK0UN1/7ObKpXBQbkrHuk4MWh5KiLtkjAVqu5KJQIhGrmy7OpPghTPG4N JM8toXlIfJVfe3h4e4Ms35veW8SvgcJSs707XYCMzNtyR2rHe2YRmoQPgpVZ1lCMhNgAhy yUlL5ca3Pc/vgnJYAKZ7aO/3PDe1KPg= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dzdLS2Uv; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751025324; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZhWbC449/E85Qp2hCEAAjgYYQkjVjspJG+Io0Fb7Zmc=; b=XqVgpAmg//twuIq5gvCDVSFv9aEs4t7z27V1c7ujltxuNwVrd+aLHc0odlQUYfDEGWBp1y MR2wZ0k+MVF6skhB+QJM+OlkkC93eJ0uXY2O7l45wxwIzyKySKjpZddrXCUvc+4Njgl12T fi50QyLxN3+sL6ryh7O5Q+ip9zqOE+8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751025323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZhWbC449/E85Qp2hCEAAjgYYQkjVjspJG+Io0Fb7Zmc=; b=dzdLS2UvLLGNbgSADceR1QVvwJEQ8SBEDqM+krtJnoyWk2Dc/gJZkY3Eup+LTMH7VHAeq9 rS7mfjwJ1CC/0lJOUVz9o/WAiupWoS09oGBv9wGO6sUic8jFoFtaTHKqMI5QcBCCCLKSCz 2ShmT0V6nIbKm9HTD0KvFGUx3+gwpec= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-161-xOELK1hrNBivbyAOW5S-9w-1; Fri, 27 Jun 2025 07:55:22 -0400 X-MC-Unique: xOELK1hrNBivbyAOW5S-9w-1 X-Mimecast-MFC-AGG-ID: xOELK1hrNBivbyAOW5S-9w_1751025321 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a5281ba3a4so922929f8f.0 for ; Fri, 27 Jun 2025 04:55:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751025321; x=1751630121; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZhWbC449/E85Qp2hCEAAjgYYQkjVjspJG+Io0Fb7Zmc=; b=QRYGoeoB8PbxM67Z1hmTiEI73Ja5JWN6dFkRb4mV2oLQ5ttGv+87WKQsSUlsIaLzZG gwvBOSON7D1fasgzzKrRLnQuiusjdzUhCOEmVgFT7xvsQ2UVrNFcwGfKKMNVhKyIf3Cn qzMR5V80dlQwIiwarcEk57SpxRGulXqCY4xy0ipN4kBd8tOtFGIrHtQEB/Gwax59CQW5 yBiYgCLK6SkkxYCfBweNKwICPMyavK6QI44qP4e/3XTHGvG2FM0BYwyjs1pDLQyCHnLC TyLWH84X7Rt5pS0Fh9DjAU92ciOZEZ4aPqzB/ysKNl2Z5RNN9QZbjWoxejNW6sFoEp6M 2D0g== X-Gm-Message-State: AOJu0YykGhYquBP0nIsVUDY8M112EqUGLdBYgTt4GIZp71baHHDp6ymB +hoBugvxolX6yvc/2vBzU4XW6U2wjkxwgQ2KPgPWU8x0hCdA44QCDBydcx75jbeBSG3V5koPQdv GGWaJZnjCM4iJUSee5ImVizgXiHUpAHQoyk3x/EHXAT/rUrWuyMKq X-Gm-Gg: ASbGnctkQdomaEA6F1Az6QHMDRqz6rmMfJ5JwbsrIOyWlVACX652LiLtkcHJAc2hfrt NviAAy23gRnAKdd3MvobsLRF0c/A97ecCTfkvTjJ957BO/HqEV2kGdq/CKgY0La9tjgE9qDtwvr NNWQ45+ybspSQdrv++b97slyDUfYPHejJjj6dl2d9EfmNXJJ48yX+7C8tKIyd8crAK8z1O5Vt+0 hvmnW3smVnLScb6SkvLkJJ+8/9OR5RkKJ4XGz+SpsDch81LX90VfC8hyW1FJQJTuIfT0Dj4mq1X yMX4p8bWx/6pQgnFq3H74VPNV3M9WaOXpCVkMBTT1E2Q+3FUmjjNRdHkAbWJ2mhPNxcxSVxJ8B7 qA3FmPpY= X-Received: by 2002:a05:6000:2a87:b0:391:3aaf:1d5f with SMTP id ffacd0b85a97d-3a9008552e3mr2658195f8f.52.1751025320840; Fri, 27 Jun 2025 04:55:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHDzWYzFV7FIhOpxS4HJCkd6UekDTy08Rd1STdD7Tfk9DLCZIZKNyDvYVpLpxawpg4A1Yk2Vg== X-Received: by 2002:a05:6000:2a87:b0:391:3aaf:1d5f with SMTP id ffacd0b85a97d-3a9008552e3mr2658153f8f.52.1751025320297; Fri, 27 Jun 2025 04:55:20 -0700 (PDT) Received: from localhost (p200300d82f2d5d00f1a32f3065759425.dip0.t-ipconnect.de. [2003:d8:2f2d:5d00:f1a3:2f30:6575:9425]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a892e52c99sm2473415f8f.49.2025.06.27.04.55.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Jun 2025 04:55:19 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Zi Yan , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Pedro Falcato , Rik van Riel , Harry Yoo Subject: [PATCH v1 4/4] mm: remove boolean output parameters from folio_pte_batch_ext() Date: Fri, 27 Jun 2025 13:55:10 +0200 Message-ID: <20250627115510.3273675-5-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250627115510.3273675-1-david@redhat.com> References: <20250627115510.3273675-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: BEWIHBbAyHOqzKFWhixuGo9HIHmhbavMfZoGIK2QZxQ_1751025321 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Queue-Id: 1DB92C0006 X-Rspamd-Server: rspam10 X-Stat-Signature: cei7pqkjbc54i1woffs89hm5jrk7ugge X-HE-Tag: 1751025323-450573 X-HE-Meta: U2FsdGVkX1+blVX+Tn8w3r+ytpTVPPSqHIQSCkghszLQod0zCRAiEFPFGt1uT6P0dTUST5yxqa3P2Ws/CQWesfkYeJmOBdkDVQcjwJYyppsnwbnowuHNPrEK68FPv6B25+A1FzPv6XKTmvpctdvbLAXltzSxhsZ1CSMYCgcHJJRDMc2CJuPtip3TM6RMv5XgGWd9O/QOHkenFYFeMEJZMonMrxByuhu0QrThcpW8mYdvlJa82GOotcGs23xLoyXUFRwch8/3nYDqMxG/9nm9Mq5d0IrzAO6MwsgPoKKsWFz160G5YgnN7pUVUudiyhPW+En16PzGeIeIq1SXUwnmyiBr13RwN8TU7Tyumm6Oow5puR4LReram+qaAIO5BKzxzPjT6l//AEKSl99j4PjBtki5QWAnqlraKdtKnrFyV8Zb3vitgfgKM9V6mXv+9tSCmulTTtTcHGUVRIJH2AiP3nG/YpEiO+Eil6pHmghlmfPHOpJYCXdX+7VLL7gWwNQB5FlJRE4U6ty0jSMfgK6TvlmPexRTS6vPU/tQj2g2grVSCJEI67YekXsx+TZ3w1+Lt9qf5BgK2gDNzNFLajZnFew6pk0cy0wem0zRLssGd78tjtiTqrQSSbmudtveoXpr7bLTKvKDl3mjl4NToCXNyh05KLUkkr7FyxiSI1d0T2QjSzTwLTMVDbivalSPVU+2Dk+WtJM19przo0qkLmNjgyWEV+6kK4IsaYp16TiI6k2G8q2t7FGTtyWtYL6xptpuvRDA6TzZBTEnKYSbKZqw0SKBgwGQC6ThiPEvBPT7hCQj6ewcs45X4ed5m2Mv7WwqPxuo1V6ZtzuWQIh5NKsSHQTUpbelHv17LbwJlFk1ImXVGfFYbXmcAlB7xEokJ+lap4LtNctMsxRZdHIZJugZlP/EyRPB3/a6czP3Ltb9zJtVeEskIIA60JXpUToSV3H6yNSXM1y7e6apPM6rRPi WXTYNHUx JVWTwU42b1+KWwGeMx/IMvHY/U0B8wcGgSwnbBnB044Kq/GgP9ao5hgrlIfCJZGoNoL8Pl44nr8gM+gCfRB7mLSq2OjG71sEPLFiJ0kju7nMvwW4Tym6fEmiomgE3oner1Elf6bkt5+ix1grk695E6Bn2+nUc/HEmumBxIYqrBcwKk8MTIY4FmzC/qPHsZ0phrcYj+Ifw2bMII/lQIsCsFzsrOvv6PRQwFfZsHR8vAXQPk+sPfL+DU6UHWMeCMOZBznuihsfhn+JGd/RcQ5hT8c2ETP3K/Y5qnpL+ 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: Instead, let's just allow for specifying through flags whether we want to have bits merged into the original PTE. For the madvise() case, simplify by having only a single parameter for merging young+dirty. For madvise_cold_or_pageout_pte_range() merging the dirty bit is not required, but also not harmful. This code is not that performance critical after all to really force all micro-optimizations. As we now have two pte_t * parameters, use PageTable() to make sure we are actually given a pointer at a copy of the PTE, not a pointer into an actual page table. Signed-off-by: David Hildenbrand --- mm/internal.h | 58 +++++++++++++++++++++++++++++++-------------------- mm/madvise.c | 26 +++++------------------ mm/memory.c | 8 ++----- mm/util.c | 2 +- 4 files changed, 43 insertions(+), 51 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 6000b683f68ee..fe69e21b34a24 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -208,6 +208,18 @@ typedef int __bitwise fpb_t; /* Compare PTEs honoring the soft-dirty bit. */ #define FPB_HONOR_SOFT_DIRTY ((__force fpb_t)BIT(1)) +/* + * Merge PTE write bits: if any PTE in the batch is writable, modify the + * PTE at @ptentp to be writable. + */ +#define FPB_MERGE_WRITE ((__force fpb_t)BIT(2)) + +/* + * Merge PTE young and dirty bits: if any PTE in the batch is young or dirty, + * modify the PTE at @ptentp to be young or dirty, respectively. + */ +#define FPB_MERGE_YOUNG_DIRTY ((__force fpb_t)BIT(3)) + static inline pte_t __pte_batch_clear_ignored(pte_t pte, fpb_t flags) { if (!(flags & FPB_HONOR_DIRTY)) @@ -220,16 +232,11 @@ static inline pte_t __pte_batch_clear_ignored(pte_t pte, fpb_t flags) /** * folio_pte_batch_ext - detect a PTE batch for a large folio * @folio: The large folio to detect a PTE batch for. + * @vma: The VMA. Only relevant with FPB_MERGE_WRITE, otherwise can be NULL. * @ptep: Page table pointer for the first entry. - * @pte: Page table entry for the first page. + * @ptentp: Pointer at a copy of the first page table entry. * @max_nr: The maximum number of table entries to consider. * @flags: Flags to modify the PTE batch semantics. - * @any_writable: Optional pointer to indicate whether any entry except the - * first one is writable. - * @any_young: Optional pointer to indicate whether any entry except the - * first one is young. - * @any_dirty: Optional pointer to indicate whether any entry except the - * first one is dirty. * * Detect a PTE batch: consecutive (present) PTEs that map consecutive * pages of the same large folio in a single VMA and a single page table. @@ -242,28 +249,26 @@ static inline pte_t __pte_batch_clear_ignored(pte_t pte, fpb_t flags) * must be limited by the caller so scanning cannot exceed a single VMA and * a single page table. * + * Depending on the FPB_MERGE_* flags, the pte stored at @ptentp will + * be modified. + * * This function will be inlined to optimize based on the input parameters; * consider using folio_pte_batch() instead if applicable. * * Return: the number of table entries in the batch. */ static inline unsigned int folio_pte_batch_ext(struct folio *folio, - pte_t *ptep, pte_t pte, unsigned int max_nr, fpb_t flags, - bool *any_writable, bool *any_young, bool *any_dirty) + struct vm_area_struct *vma, pte_t *ptep, pte_t *ptentp, + unsigned int max_nr, fpb_t flags) { + bool any_writable = false, any_young = false, any_dirty = false; + pte_t expected_pte, pte = *ptentp; unsigned int nr, cur_nr; - pte_t expected_pte; - - if (any_writable) - *any_writable = false; - if (any_young) - *any_young = false; - if (any_dirty) - *any_dirty = false; VM_WARN_ON_FOLIO(!pte_present(pte), folio); VM_WARN_ON_FOLIO(!folio_test_large(folio) || max_nr < 1, folio); VM_WARN_ON_FOLIO(page_folio(pfn_to_page(pte_pfn(pte))) != folio, folio); + VM_WARN_ON(virt_addr_valid(ptentp) && PageTable(virt_to_page(ptentp))); /* Limit max_nr to the actual remaining PFNs in the folio we could batch. */ max_nr = min_t(unsigned long, max_nr, @@ -279,12 +284,12 @@ static inline unsigned int folio_pte_batch_ext(struct folio *folio, if (!pte_same(__pte_batch_clear_ignored(pte, flags), expected_pte)) break; - if (any_writable) - *any_writable |= pte_write(pte); - if (any_young) - *any_young |= pte_young(pte); - if (any_dirty) - *any_dirty |= pte_dirty(pte); + if (flags & FPB_MERGE_WRITE) + any_writable |= pte_write(pte); + if (flags & FPB_MERGE_YOUNG_DIRTY) { + any_young |= pte_young(pte); + any_dirty |= pte_dirty(pte); + } cur_nr = pte_batch_hint(ptep, pte); expected_pte = pte_advance_pfn(expected_pte, cur_nr); @@ -292,6 +297,13 @@ static inline unsigned int folio_pte_batch_ext(struct folio *folio, nr += cur_nr; } + if (any_writable) + *ptentp = pte_mkwrite(*ptentp, vma); + if (any_young) + *ptentp = pte_mkyoung(*ptentp); + if (any_dirty) + *ptentp = pte_mkdirty(*ptentp); + return min(nr, max_nr); } diff --git a/mm/madvise.c b/mm/madvise.c index 9b9c35a398ed0..dce8f5e8555cb 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -344,13 +344,12 @@ static inline bool can_do_file_pageout(struct vm_area_struct *vma) static inline int madvise_folio_pte_batch(unsigned long addr, unsigned long end, struct folio *folio, pte_t *ptep, - pte_t pte, bool *any_young, - bool *any_dirty) + pte_t *ptentp) { int max_nr = (end - addr) / PAGE_SIZE; - return folio_pte_batch_ext(folio, ptep, pte, max_nr, 0, NULL, - any_young, any_dirty); + return folio_pte_batch_ext(folio, NULL, ptep, ptentp, max_nr, + FPB_MERGE_YOUNG_DIRTY); } static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, @@ -488,13 +487,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, * next pte in the range. */ if (folio_test_large(folio)) { - bool any_young; - - nr = madvise_folio_pte_batch(addr, end, folio, pte, - ptent, &any_young, NULL); - if (any_young) - ptent = pte_mkyoung(ptent); - + nr = madvise_folio_pte_batch(addr, end, folio, pte, &ptent); if (nr < folio_nr_pages(folio)) { int err; @@ -724,11 +717,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, * next pte in the range. */ if (folio_test_large(folio)) { - bool any_young, any_dirty; - - nr = madvise_folio_pte_batch(addr, end, folio, pte, - ptent, &any_young, &any_dirty); - + nr = madvise_folio_pte_batch(addr, end, folio, pte, &ptent); if (nr < folio_nr_pages(folio)) { int err; @@ -753,11 +742,6 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, nr = 0; continue; } - - if (any_young) - ptent = pte_mkyoung(ptent); - if (any_dirty) - ptent = pte_mkdirty(ptent); } if (folio_test_swapcache(folio) || folio_test_dirty(folio)) { diff --git a/mm/memory.c b/mm/memory.c index 43d35d6675f2e..985d09bee44fd 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -972,10 +972,9 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma pte_t *dst_pte, pte_t *src_pte, pte_t pte, unsigned long addr, int max_nr, int *rss, struct folio **prealloc) { + fpb_t flags = FPB_MERGE_WRITE; struct page *page; struct folio *folio; - bool any_writable; - fpb_t flags = 0; int err, nr; page = vm_normal_page(src_vma, addr, pte); @@ -995,8 +994,7 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma if (vma_soft_dirty_enabled(src_vma)) flags |= FPB_HONOR_SOFT_DIRTY; - nr = folio_pte_batch_ext(folio, src_pte, pte, max_nr, flags, - &any_writable, NULL, NULL); + nr = folio_pte_batch_ext(folio, src_vma, src_pte, &pte, max_nr, flags); folio_ref_add(folio, nr); if (folio_test_anon(folio)) { if (unlikely(folio_try_dup_anon_rmap_ptes(folio, page, @@ -1010,8 +1008,6 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma folio_dup_file_rmap_ptes(folio, page, nr, dst_vma); rss[mm_counter_file(folio)] += nr; } - if (any_writable) - pte = pte_mkwrite(pte, src_vma); __copy_present_ptes(dst_vma, src_vma, dst_pte, src_pte, pte, addr, nr); return nr; diff --git a/mm/util.c b/mm/util.c index d29dcc135ad28..19d1a5814fac7 100644 --- a/mm/util.c +++ b/mm/util.c @@ -1197,6 +1197,6 @@ EXPORT_SYMBOL(compat_vma_mmap_prepare); unsigned int folio_pte_batch(struct folio *folio, pte_t *ptep, pte_t pte, unsigned int max_nr) { - return folio_pte_batch_ext(folio, ptep, pte, max_nr, 0, NULL, NULL, NULL); + return folio_pte_batch_ext(folio, NULL, ptep, &pte, max_nr, 0); } #endif /* CONFIG_MMU */ -- 2.49.0