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 633E2C7EE30 for ; Wed, 2 Jul 2025 10:49:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E4A3D8E0009; Wed, 2 Jul 2025 06:49:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DF54A8E0001; Wed, 2 Jul 2025 06:49:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF8F08E0009; Wed, 2 Jul 2025 06:49:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id AD5488E0001 for ; Wed, 2 Jul 2025 06:49:45 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2210C103E3C for ; Wed, 2 Jul 2025 10:49:45 +0000 (UTC) X-FDA: 83619003930.10.FAD3FDF 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 E064240002 for ; Wed, 2 Jul 2025 10:49:42 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=jJ6TwEzO; spf=pass (imf12.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.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=1751453382; 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=3oAnJSM0KYfarg3+XnNxR/2W/7E08lIWfFxeFG4I6C8=; b=atrmPFtnYO9n9YyT2AbRI6t80Q8Z4uspAlSMUtmSAlTvejqj54mRYMvwAGsFIO80eSLKUu fl957f/WbiMy57cr4f93iV6bTmfkBIqTKilTxY1V+RWivXvNWPJmZlM4N9fAIZiF7Mi7sz lsK37NFU/AogOxERJcGKImh9XWOzy6c= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=jJ6TwEzO; spf=pass (imf12.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.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=1751453382; a=rsa-sha256; cv=none; b=TmZgXY1nPI0i9dxtc8HqEFt5wzfZoakgZGWHoLfM0M316sbyRVfNzkyIIWvTZzC8QjsHWe X3E9N36yKtcetjNY5xfA225gXkOlznWgkUV8AuWGH+LI4hGIlnYOj42ZVh414TQOU8iBSy FoR3DfY06UJDA1qJ/33DaB8DuPDvq3U= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751453382; 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=3oAnJSM0KYfarg3+XnNxR/2W/7E08lIWfFxeFG4I6C8=; b=jJ6TwEzOPB4VAfaLFq7QwC18jU7gWQGjEo2oKZVQpp0iWoXRBU3cCDtlhGFY5U4x0lG+sq Zwtyubu1GzCo+WHDsKvBdz9/asrq0i/fcA3iNx6Ll2I5OXYt+H2WC5JSj83Cl7LjYMqCu3 eYVP2to58QA9HdCHaTBCHjA+HfaXqno= 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-582-0nTEe6s-N2CDR12uU5zvqg-1; Wed, 02 Jul 2025 06:49:39 -0400 X-MC-Unique: 0nTEe6s-N2CDR12uU5zvqg-1 X-Mimecast-MFC-AGG-ID: 0nTEe6s-N2CDR12uU5zvqg_1751453378 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a578958000so1707803f8f.3 for ; Wed, 02 Jul 2025 03:49:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751453378; x=1752058178; 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=3oAnJSM0KYfarg3+XnNxR/2W/7E08lIWfFxeFG4I6C8=; b=Lr6oR5VsXLg2wzWe0XX+eQA3OsnCVS7C190kv5CiMn2nqBl6dWzmXJoZ0D9FbqdoLr awddJrIczQgkAvRy3zslKxwBCI8hoKhdgRc0HwSG2nB4Q5iLOhkUKZrUv5yFzcI6N6+G JWP0EwE93IZVSiL6MqzHqWOBXEttTLqP16fVU56TY2TE1Va/p0lKn7L60YoBEYGfqtJB jLDkkjKDyp/Ms/lAlSGhKr3gcBoQ+1TM/sNgVKolOn26PEYuRu8P5Yc9L8DEUxjN6tBe JyQbgbVUUoy/+RKBHusT55NiP9YM6ndRUYBG50fpNwZF+DAGQy5ciGvBeYRUqPAor4am fjjQ== X-Gm-Message-State: AOJu0Yy7DVet7mDDetrvdfMvOI277uhoif29sNRYIwP9WeXbYKXaBtFk aZ0Br7WVCYwHojvxnKtXuaI7lVxisqg6nEJcre783yyB5GFrFXnrpCJVEOEAHKQjEAuJ0sxK4gP b8i5oB1ntgsKFsKSmU8sY+MGCCUHiipWSt2ZB4xow78/kGO96JCSrXhr2dThpevQ= X-Gm-Gg: ASbGnctkbkR5KRPVYvw1Bk7RhQGQt6O9oYXtYttH7La/yFkrcU2x/VhItB/JY/2OtXi SDNPmuuTkOzr8c2+2zF3tt4Rj2jK45DH9plc2ylMtxI3boTOg13d1sgOPQUhD4nULJgvjXkIfdd 18OI/PgwPw7EfTVfM4VEZiQN0lmcc2WpxRu5ZqgKK37E8VLypVb8BHaAffGs5goDH7KTez7MG/M PjutzAtDpi23C/FFAimqADuntsZYx3uDESLPO8NioU8W0JB2unQzv3HU6THsLpqKEk6amayjari sVkpJjj5rF1CeYd0 X-Received: by 2002:a5d:5f4e:0:b0:3a4:fbaf:749e with SMTP id ffacd0b85a97d-3b20234d94cmr1583863f8f.49.1751453377626; Wed, 02 Jul 2025 03:49:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGqpc4JaEHI4XLQrd/hrL7HETc6C5MvZ9hTJGeziQf4Dkb9UiYdEYneULGVBMvUpSbvMTd7UQ== X-Received: by 2002:a5d:5f4e:0:b0:3a4:fbaf:749e with SMTP id ffacd0b85a97d-3b20234d94cmr1583828f8f.49.1751453377074; Wed, 02 Jul 2025 03:49:37 -0700 (PDT) Received: from localhost ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a88c8013fesm15956078f8f.38.2025.07.02.03.49.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Jul 2025 03:49:36 -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 4/4] mm: remove boolean output parameters from folio_pte_batch_ext() Date: Wed, 2 Jul 2025 12:49:26 +0200 Message-ID: <20250702104926.212243-5-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: 57ZOhpb3SmEK2AX0G2otlZ9lKTa1TeYa38ICPuBBdTU_1751453378 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: ftyu5i9ferpjrkrjoh1ixsiwa9sxn1o4 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: E064240002 X-Rspam-User: X-HE-Tag: 1751453382-413192 X-HE-Meta: U2FsdGVkX1+1K+3nYbbOtHDkz44MplI5FDthGSHjDbUZsBN5LI1eLsqTQv0FZvv/6NXpfQ2CLFAQ7mNNuwNlEYgct0WaqiAqbYmYObFNPh4IQRGvTud0/9ER0tgCrMELdgOJMxPD5TEnS+2u0JtCv5afMUzkdxnHXvL2Fm77QJp6ruQftmDv0xNQSdt1mM46gMHFHlkN5Pig9MqM7nt/WO42vywcR54IOfJkPHYdb0JAXnwT8aKd49xKx9+ElK6nMvZnS+nwP+A6J0OlQ+aTHy3BC9Yd1iQ9ve5IR5o8Gwvar3LCU6jqiW9SoxC0x7zwOAEACHXrndTcSOs3q05SBeBCBT8AhRaIZTU8ZcWyn/F76aoVIIJ5KbGR5uHHGIrBg2jrnxh/mV7sIZhaDWwtPDG9ouVoEe2S7fqXP7YVoz50+HpZDIvderFQMz+8qJag1n3UflFCYQXuQnnvd+TpvaBemiomShksE8FWvHZnSt08NeWx44y/xmYtwc3PccHMOWwUDAx4hss3BEVYWspq3hfM5SdUZYfjo475XjoQoUNlO87e3Z2H2owJ1G4s9tN8VM4CEeFe2n0/A3yJTZudA/vlkDzajyj5Kq3lL1kXB36ofHbB4zUOmYtRCU+iV1BlsDroXbdYkwwCLh+/Td7gFS3pYuu76puzfSCbL7RhpprlwgnScUoYhdZOONII+B/oIuVMfQJlkebFAeSQ+udtLnFu6ry2d6mJnzh8+k1u5APAx+kHyATTnME551/BSlKjpWXNJ3VbrF7OylCAvif8dYq+LCBU60pzGgNK8Erf8R3xTlDpVnV+n3H4oJ5LcLcCKvbp9Yi9M5XKTxm3aqjemE+UAEpf5hbK7WezKx7q91w1ZgGSTXVnLJtAVJUaTLQzIocXjHXFz+iOq8NSL0ijkm1Nq06TkRQT5WL/nlSz8e0pKeQbkRxiye8mYUCQJdI7ha/JngPKmLvhlJz3Yxx Vwkpjcif X0sn+qSeKenjM2UyiL8gsQfKPtZxN7EtOcgaBYGly/QUbtut8hbSiMpxnXHhJ18eSzmNu6YNmdnJ1xnqJDtxYEKzSDFcaWJHReILXAHwM1jVLKNCBio8i094MYrQ5nB5eYrkZWe/AuXSsZ8e/7FyLSMUAfhKFi+jrzygYvD1gP2vEzPAIVtVadEhKVPDwGCpLJne8HfZ6Am68pjvWNlp4Z0AI83G9VNPvALD9nILe+g1e50LRPf8K+2OpmWDfbzX9GdJkGfYiC0AMxxYgiXGXhg5ZYanRdEy/jzl5oXF3nC8lrzb08ms3j//Vud5zDX9udjJpJyHm51TTNEcPLXaaPlosYSsK6WHAHQi7dKSiB1NgoTyi2/06hUErt6c/T/ZWQzYeEK5POOMvS9X6cnP6lIo2t8xj9HTF+yVsmq4l88Smk041P1x5y4FnGZzrs8wMvAUhnU0cH/TzVlTBHj4iME0sCGan8eCqHN+i7MnuE9W7Z8lW9JUrdAOvwMxMGqlQMH8oBeUbww3gTk0SZ3LUfsZhAGW7d8ml2Bj9+J5YZxPBBg6zAIG+m56q8FfxESaeflXR6Vu3qSC321BacWu1nRVVSUxN6Io3a84ykT0lQckmoKZ5CetAQsrT9fRqRsSMyWv5F4d34X6fs4ir7emDo9TJmFLd3r4if34J 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 | 65 +++++++++++++++++++++++++++++++++------------------ mm/madvise.c | 26 ++++----------------- mm/memory.c | 8 ++----- mm/util.c | 2 +- 4 files changed, 50 insertions(+), 51 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 6c92956ac4fd9..b7131bd3d1ad1 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -208,6 +208,18 @@ typedef int __bitwise fpb_t; /* Compare PTEs respecting the soft-dirty bit. */ #define FPB_RESPECT_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_RESPECT_DIRTY)) @@ -220,16 +232,12 @@ static inline pte_t __pte_batch_clear_ignored(pte_t pte, fpb_t flags) /** * folio_pte_batch_flags - 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 to a COPY of the first page table entry whose flags this + * function updates based on @flags if appropriate. * @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 +250,32 @@ 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 updated: it's crucial that a pointer to a COPY of the first + * page table entry, obtained through ptep_get(), is provided as @ptentp. + * * 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_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) + 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); + /* + * Ensure this is a pointer to a copy not a pointer into a page table. + * If this is a stack value, it won't be a valid virtual address, but + * that's fine because it also cannot be pointing into the page table. + */ + 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 +291,12 @@ static inline unsigned int folio_pte_batch_flags(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 +304,13 @@ static inline unsigned int folio_pte_batch_flags(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 fe363a14daab3..9de9b7c797c63 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_flags(folio, ptep, pte, max_nr, 0, NULL, - any_young, any_dirty); + return folio_pte_batch_flags(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 26a82b82863b0..0269edb520987 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_RESPECT_SOFT_DIRTY; - nr = folio_pte_batch_flags(folio, src_pte, pte, max_nr, flags, - &any_writable, NULL, NULL); + nr = folio_pte_batch_flags(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 cf41edceec7d2..ce826ca82a11d 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_flags(folio, ptep, pte, max_nr, 0, NULL, NULL, NULL); + return folio_pte_batch_flags(folio, NULL, ptep, &pte, max_nr, 0); } #endif /* CONFIG_MMU */ -- 2.49.0