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 E3A3EC83013 for ; Wed, 2 Jul 2025 10:49:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC11A8E0008; Wed, 2 Jul 2025 06:49:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A4B1D8E0001; Wed, 2 Jul 2025 06:49:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8EB368E0008; Wed, 2 Jul 2025 06:49:41 -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 7183A8E0001 for ; Wed, 2 Jul 2025 06:49:41 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 04D3E5634D for ; Wed, 2 Jul 2025 10:49:40 +0000 (UTC) X-FDA: 83619003762.24.2BBFC5F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id AF7CD40003 for ; Wed, 2 Jul 2025 10:49:38 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HEfP35YC; spf=pass (imf01.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751453378; 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=pdSzsUX0r6Sl18OoUi8XlsHVLZGeoeHXJaQLdIlqVew=; b=Zm7EyPC6HKGet69C9RfcDrIq67yBDW8wDVNv6u3I7fw64SZuhBbQvV582AScxhQdbCh0K4 xImyv+nWDynkUOkQaV+Hq81UOGEkDr7o78KSCzO0h/p4d9rJeoKwLPBolohXjdofNhbRci c5gzu9zs2divjTiuL9eXk5q8VuWEIZc= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HEfP35YC; spf=pass (imf01.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751453378; a=rsa-sha256; cv=none; b=j80tcSX+wkyq+NnyXv3ixT2Waz0ck9PVTkaBdVWiCGO59TsqS/fPFaXsc9ZWAJDqev9fjW 7EJ47Vasqt5dW64phyNu1CY3Ut4NpkpD41ulodDqwFlcnfWwu9BR6qzHBsOJapNK51/Dk6 +kZy8Wo4T3hWK1Xsg36V0ZWN10oT7QA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751453378; 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=pdSzsUX0r6Sl18OoUi8XlsHVLZGeoeHXJaQLdIlqVew=; b=HEfP35YCDJpqni8YCrBu68CQm9cibNAaKBXR6czKNNFKAGPlG7qChMZCHTKAq1Y9XJE8cx 1KQT9XnA4JVhj4iqJ39VFsnNRW6V7jk9CE/cEIWhIykT7CeeMnpimoQzdEFpEPV/C1/Xh5 LiUPnOyjj8w8glgAfb2IBYER/wf3WAU= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-49-xOfIQAOGPH2VbIHwzEAiHw-1; Wed, 02 Jul 2025 06:49:36 -0400 X-MC-Unique: xOfIQAOGPH2VbIHwzEAiHw-1 X-Mimecast-MFC-AGG-ID: xOfIQAOGPH2VbIHwzEAiHw_1751453376 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a6da94a532so2831622f8f.2 for ; Wed, 02 Jul 2025 03:49:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751453375; x=1752058175; 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=pdSzsUX0r6Sl18OoUi8XlsHVLZGeoeHXJaQLdIlqVew=; b=aNgKLkTpZV7PvdVKwXZPw7yz47pGxgdULr0z820tfcxp5P78Y2KC0t326/0h9Ucq0r VgnmgiYNRKoPHQ/uSh700JDvdI3oa8KqmZiuc26cglWDpQslLn9luo9pQOuHLGQHlpYt XWLknofiGB4OWKtBTQFWYhOLHp4XFtBEs6ycpHKswo1RrGmNpmfjbHS9/Op6/X1p5qk6 zmRaKB3ZYIRoD8l0IwHrUILAm+aEr1ZHU0etmO+ku9OhNV4W+blQB1ndo9oYxdCBC8Zz 7RpMSWpJfGbnlAnS4cbL1dBo1VtLjJMS+dWmYZAtOQH6S+Nl33PudMqegnVmCN2WDpeH t/IA== X-Gm-Message-State: AOJu0YyO7BLJktt/j4A+qQvPoEAnjK5RXrcUj7+tI+w4ExUiNWZh9BiP aOFKXIoO7B+Bq4jlCGMxaRaDQE7V+ZJV4ljZ6QYEDvP8z4lm2QHP91zJl5kE18Pev9jydrAItHX tRqmUjsrc6Fk4NPbal2zCGlkiGibTFW8yDyCJ3u/9KTEuyKTyXSza X-Gm-Gg: ASbGncsv4RKc5nqECySycxGtoJNhNHFzZtOdfOSqzej7f0KdnVJPOtj4/DoxNTkOze+ wWnnuXJcOsOCLvErZ/1cGG/ph+HGRF+wqnKlJjPCzjYzZdxcwwT8EG1eCaI3Lh4FggNtWeYTcen +YLjHZCdwuAiLdOZTBkr4iW5VxcVpqHb2f8M/w6inki8y59CyKQoiHGiA6j43Fkbew1eT5UHH/w 1F7nGBOsOju7JN20UywDFskxSAQwuNCQx7HQZuMYpsBZIztAsnztCGBnu9679BoH4jkfn2cPdez dhDtlZyzTbZNdPle X-Received: by 2002:a5d:64e8:0:b0:3a5:2ec5:35a9 with SMTP id ffacd0b85a97d-3b1fdf024d3mr1851791f8f.3.1751453375455; Wed, 02 Jul 2025 03:49:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjFtDc8oNq3Sjw8kwMyszC7GGt08Dk1rENRIs8iM2js5xYxb1Rg+m2Mck5dqr0G+VSIa7Ztw== X-Received: by 2002:a5d:64e8:0:b0:3a5:2ec5:35a9 with SMTP id ffacd0b85a97d-3b1fdf024d3mr1851758f8f.3.1751453374854; Wed, 02 Jul 2025 03:49:34 -0700 (PDT) Received: from localhost ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a892e5f918sm15668044f8f.100.2025.07.02.03.49.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Jul 2025 03:49:34 -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 , Lance Yang , Oscar Salvador Subject: [PATCH v2 3/4] mm: split folio_pte_batch() into folio_pte_batch() and folio_pte_batch_flags() Date: Wed, 2 Jul 2025 12:49:25 +0200 Message-ID: <20250702104926.212243-4-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250702104926.212243-1-david@redhat.com> References: <20250702104926.212243-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: a1212FgJ1s-joiMVsAWreyspqGYxIDDk_NajR1F0Ty0_1751453376 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: AF7CD40003 X-Stat-Signature: oggehry6zmgtcs6b6ayqc51ncs18c4r4 X-HE-Tag: 1751453378-543796 X-HE-Meta: U2FsdGVkX19QfJofd2tqkevLj/OSUxlSpAJJ5E/+hUqGzj87Mjm/uQAjOef7Q2JjT+ArSuhX5r0Dh02vXLmWrm+OEH3oW9Hxp9n9QpxwaKi/SUvatGufun18M5hyect+8JARqROTyIKH1/AwTOzxQUqOdfmK9SALcUdzhQ2xhYfBwQ2IfwWwTjYj5UleDcrwJhNumDdtllDQLsiOxxgbsHnrhBHH/On82gj8/++mePTDSXItcl71NLLf0fvCpMwVo5YUE9ETBjCz7LnVl6xCfQ4G0vx3g3XKJnazC9uYCMS1Kbd3VQl8iqS3oWPgWCYMhf7k7JEAYikR1LrxI5qzn4FKTkQH4abYtKGTjiAT0q+MG4l9Z+IQQ8DeSrBM4o7Pl/BOI/vYJbif5/o7wrOZt76JFeFE5aq/JYolntFfj8fye4Q764u8/TxYauHE9ej7AlENLoP0v9FKjsedEul4/FjDzRLys+axJj729gLn1/aVY78Wlo/pdYFXWQzfN/xQnrqEVvaaMQba/j9x00mmN5UelfUu/osLZkuxn+MQm1F8SLE4vjxBBWu9Z2D8CyGBr9YxSJqNSX5JU7N1u+iZ7kxobDobJIcFJ3yQc8WHyhDIDsBBAjK8jQ5TcwArxwA9HPjAoLlC2ZDYV9K+JFjMuZbY51KIYKQ4PlOPfmDxEL9aK5dfMMgRj7vkLZTnrECyUBa2pJuMBFaWPDdTnEuRNOLOAmh8Wa9k7Guc79bttTNOcUXN2cqAxqkIbS1XJEI0JKulpBI4OutrDK+0rWVsphs6k7V2bFs6nPzh5oRg+h6n42GKqVxRhiJhLMo2RsaY3r5BOEx2cwCS5Q8p5x2VdR5IBGmevQ0dgSemhqVvWG7t+vAnIaUIulfNZr66HUBLXdLSb8X3DpLW8I2b/hu8B+QRTRNbm0UlKXM833za11O2kggkDk6gMzVMFLGSyW3z+Klp50a7WJICsng8Bsc fh0sFQhp V1zycO33IkwWmOBbVhZrVAupP9a1YWj6iPGnaUCrPS1m5XnuBtfzrD/YOMo+shPbydVNwhyOfkyEE/wn84rsU/QdO3X+0V09jSxot85z6v/mbSsUh5IJKen7fM+HDZFFRXlpSUk5xpT8cc69Iy9BAaqdLE2VnFuwALCaJgSL8VpIhIFx1Vy4gBQ9GzMTf8tHpu8/0pB011+LsfrbfHy/9JPXLmuCbFkMfoIaW9qxiXy41IdvwjoRoROnTdOGYusfjHCN4dRIFFHiiSj3Rn8Gf21n15zMkrWFdTQ4gKlyj4vz1LLIkfhxR6H/LaN/ahNTeC3EvKaFSVTpcxyLf18qmVEEaOE8nHeMPqTMHvE54mOEY/8IqfDpkA/8lx2eKUGknOLbRRo0nggSzLv/Pph1I1YO9xnoM3WZM83nN3gZvMJSbJnLlhAkBhyo3qeCEeSpH2exZoCBVf//afZrc+bnD4T73fl/mI/Z+vHQEZhRPhgMDebkE6P+SYWsAPTxFSLN15ZvDWMVOVUaRVBHdkVGIQTEUFq/+6LAD6ggISykuaMLZKxZvVEHMnyrbNuzo5AIATe2llr53If9R3VrvMg5j8joDSM6yvU0TqVUaH2YG/HOt/ZjAPnVhbMlt7pUSwwTyeG4tB+Qef9hgFNnD+m3/SrLhdTvXaVXpz7MzgUmP6rNuAu0Rkx7c5kipzHtWhwM7tsLqfaPwXlxVVApwv+/gwSGVakGqb4lzEFdDhq5/Uz5DiZJFRY8dyIQUGQ== 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: Many users (including upcoming ones) don't really need the flags etc, and can live with the possible overhead of a function call. So let's provide a basic, non-inlined folio_pte_batch(), to avoid code bloat while still providing a variant that optimizes out all flag checks at runtime. folio_pte_batch_flags() will get inlined into folio_pte_batch(), optimizing out any conditionals that depend on input flags. folio_pte_batch() will behave like folio_pte_batch_flags() when no flags are specified. It's okay to add new users of folio_pte_batch_flags(), but using folio_pte_batch() if applicable is preferred. So, before this change, folio_pte_batch() was inlined into the C file optimized by propagating constants within the resulting object file. With this change, we now also have a folio_pte_batch() that is optimized by propagating all constants. But instead of having one instance per object file, we have a single shared one. In zap_present_ptes(), where we care about performance, the compiler already seem to generate a call to a common inlined folio_pte_batch() variant, shared with fork() code. So calling the new non-inlined variant should not make a difference. While at it, drop the "addr" parameter that is unused. Suggested-by: Andrew Morton Link: https://lore.kernel.org/linux-mm/20250503182858.5a02729fcffd6d4723afcfc2@linux-foundation.org/ Reviewed-by: Oscar Salvador Signed-off-by: David Hildenbrand --- mm/internal.h | 11 ++++++++--- mm/madvise.c | 4 ++-- mm/memory.c | 8 +++----- mm/mempolicy.c | 3 +-- mm/mlock.c | 3 +-- mm/mremap.c | 3 +-- mm/rmap.c | 3 +-- mm/util.c | 29 +++++++++++++++++++++++++++++ 8 files changed, 46 insertions(+), 18 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index dba1346ded972..6c92956ac4fd9 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -218,9 +218,8 @@ static inline pte_t __pte_batch_clear_ignored(pte_t pte, fpb_t flags) } /** - * folio_pte_batch - detect a PTE batch for a large folio + * folio_pte_batch_flags - detect a PTE batch for a large folio * @folio: The large folio to detect a PTE batch for. - * @addr: The user virtual address the first page is mapped at. * @ptep: Page table pointer for the first entry. * @pte: Page table entry for the first page. * @max_nr: The maximum number of table entries to consider. @@ -243,9 +242,12 @@ 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. * + * 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(struct folio *folio, unsigned long addr, +static inline unsigned int folio_pte_batch_flags(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) { @@ -293,6 +295,9 @@ static inline unsigned int folio_pte_batch(struct folio *folio, unsigned long ad return min(nr, max_nr); } +unsigned int folio_pte_batch(struct folio *folio, pte_t *ptep, pte_t pte, + unsigned int max_nr); + /** * pte_move_swp_offset - Move the swap entry offset field of a swap pte * forward or backward by delta diff --git a/mm/madvise.c b/mm/madvise.c index 661bb743d2216..fe363a14daab3 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -349,8 +349,8 @@ static inline int madvise_folio_pte_batch(unsigned long addr, unsigned long end, { int max_nr = (end - addr) / PAGE_SIZE; - return folio_pte_batch(folio, addr, ptep, pte, max_nr, 0, NULL, - any_young, any_dirty); + return folio_pte_batch_flags(folio, ptep, pte, max_nr, 0, NULL, + any_young, any_dirty); } static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, diff --git a/mm/memory.c b/mm/memory.c index 0a47583ca9937..26a82b82863b0 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -995,8 +995,8 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma if (vma_soft_dirty_enabled(src_vma)) flags |= FPB_RESPECT_SOFT_DIRTY; - nr = folio_pte_batch(folio, addr, src_pte, pte, max_nr, flags, - &any_writable, NULL, NULL); + nr = folio_pte_batch_flags(folio, src_pte, pte, max_nr, flags, + &any_writable, NULL, NULL); folio_ref_add(folio, nr); if (folio_test_anon(folio)) { if (unlikely(folio_try_dup_anon_rmap_ptes(folio, page, @@ -1564,9 +1564,7 @@ static inline int zap_present_ptes(struct mmu_gather *tlb, * by keeping the batching logic separate. */ if (unlikely(folio_test_large(folio) && max_nr != 1)) { - nr = folio_pte_batch(folio, addr, pte, ptent, max_nr, 0, - NULL, NULL, NULL); - + nr = folio_pte_batch(folio, pte, ptent, max_nr); zap_present_folio_ptes(tlb, vma, folio, page, pte, ptent, nr, addr, details, rss, force_flush, force_break, any_skipped); diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 2a25eedc3b1c0..eb83cff7db8c3 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -711,8 +711,7 @@ static int queue_folios_pte_range(pmd_t *pmd, unsigned long addr, if (!folio || folio_is_zone_device(folio)) continue; if (folio_test_large(folio) && max_nr != 1) - nr = folio_pte_batch(folio, addr, pte, ptent, - max_nr, 0, NULL, NULL, NULL); + nr = folio_pte_batch(folio, pte, ptent, max_nr); /* * vm_normal_folio() filters out zero pages, but there might * still be reserved folios to skip, perhaps in a VDSO. diff --git a/mm/mlock.c b/mm/mlock.c index 2238cdc5eb1c1..a1d93ad33c6db 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -313,8 +313,7 @@ static inline unsigned int folio_mlock_step(struct folio *folio, if (!folio_test_large(folio)) return 1; - return folio_pte_batch(folio, addr, pte, ptent, count, 0, NULL, - NULL, NULL); + return folio_pte_batch(folio, pte, ptent, count); } static inline bool allow_mlock_munlock(struct folio *folio, diff --git a/mm/mremap.c b/mm/mremap.c index d4d3ffc931502..1f5bebbb9c0cb 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -182,8 +182,7 @@ static int mremap_folio_pte_batch(struct vm_area_struct *vma, unsigned long addr if (!folio || !folio_test_large(folio)) return 1; - return folio_pte_batch(folio, addr, ptep, pte, max_nr, 0, NULL, - NULL, NULL); + return folio_pte_batch(folio, ptep, pte, max_nr); } static int move_ptes(struct pagetable_move_control *pmc, diff --git a/mm/rmap.c b/mm/rmap.c index 98ed3e49e8bbe..a15939453c41a 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1868,8 +1868,7 @@ static inline unsigned int folio_unmap_pte_batch(struct folio *folio, if (pte_unused(pte)) return 1; - return folio_pte_batch(folio, addr, pvmw->pte, pte, max_nr, 0, - NULL, NULL, NULL); + return folio_pte_batch(folio, pvmw->pte, pte, max_nr); } /* diff --git a/mm/util.c b/mm/util.c index 0b270c43d7d12..cf41edceec7d2 100644 --- a/mm/util.c +++ b/mm/util.c @@ -1171,3 +1171,32 @@ int compat_vma_mmap_prepare(struct file *file, struct vm_area_struct *vma) return 0; } EXPORT_SYMBOL(compat_vma_mmap_prepare); + +#ifdef CONFIG_MMU +/** + * folio_pte_batch - detect a PTE batch for a large folio + * @folio: The large folio to detect a PTE batch for. + * @ptep: Page table pointer for the first entry. + * @pte: Page table entry for the first page. + * @max_nr: The maximum number of table entries to consider. + * + * This is a simplified variant of folio_pte_batch_flags(). + * + * 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. + * + * All PTEs inside a PTE batch have the same PTE bits set, excluding the PFN, + * the accessed bit, writable bit, dirt-bit and soft-dirty bit. + * + * ptep must map any page of the folio. max_nr must be at least one and + * must be limited by the caller so scanning cannot exceed a single VMA and + * a single page table. + * + * Return: the number of table entries in the batch. + */ +unsigned int folio_pte_batch(struct folio *folio, pte_t *ptep, pte_t pte, + unsigned int max_nr) +{ + return folio_pte_batch_flags(folio, ptep, pte, max_nr, 0, NULL, NULL, NULL); +} +#endif /* CONFIG_MMU */ -- 2.49.0