From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 725383CB2FC for ; Tue, 12 May 2026 21:06:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778620014; cv=none; b=KC4cQ920Ya4h4EVehLW2vCiFEA1rmkXL65sTbaZyf86BnVJnNXdae4w0/tAdnKd/ag11brWToskjDt3OC9dJA6IGGJt1426SgceFqCC5sp9kjaFRhj2pvYTZXd8giFgDn+ND4PcFbQSDJk0RUJboFBc6hUJtEVkr/0SVJ38z/mE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778620014; c=relaxed/simple; bh=yxS5pGAT+aBz/tCSPnjyQeoSUdyPcongdUsCoZ0a1X4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=jspJXoBMtay7gms2c8sDKyayVx9BSkhv5ubXa5ZjsZqtFhO1rYeoJkCA1uVdjTW+3xIeGxNK4zFUjjY65cpF2XIc9Mi+c46Ef3gICLIa3LFE4FykX/nqdx/uEdjqhJ3QKXmrxtNt2CmfP919qTbAJlNB7A48HcJebh3dDBr1eKk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=b3tTjBPb; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=EsTEa7JM; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="b3tTjBPb"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="EsTEa7JM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778620011; 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: in-reply-to:in-reply-to:references:references; bh=vgzEDqlvhoYP0aAGYME8rWUPvmasj5/ucpL5w8urRD4=; b=b3tTjBPbVDQGNXjfJz7pLiU27TlvDJ03gqrMPTwCQjtvyZgNFk0NkTYgsKaaQ/zZyJ3oke sdp4y+bt5Aq/zMWQmk2ZyXmikF6ic50Krdy49zhGhK0c4Btcla+sBhgyDPwz6PfRqLrQPx xmH/WDNG9i47spf8eOuBT3VBJRb+j3E= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-589-n3MXBJdzNQCv4WhBIlGhCQ-1; Tue, 12 May 2026 17:06:50 -0400 X-MC-Unique: n3MXBJdzNQCv4WhBIlGhCQ-1 X-Mimecast-MFC-AGG-ID: n3MXBJdzNQCv4WhBIlGhCQ_1778620009 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-48a589c7879so53152045e9.1 for ; Tue, 12 May 2026 14:06:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778620009; x=1779224809; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=vgzEDqlvhoYP0aAGYME8rWUPvmasj5/ucpL5w8urRD4=; b=EsTEa7JM8lS1iWMESN/KSPb8X4EPD80fJhy9TZiUkoBv9Qhux2bL/+3crIjIXyxpQw RjyoS9ujCb6Aj4JFsgj3wI+a08aDwLbpDpoAtQfn+/ZcPkDxiRwqUvNXFhM0rQXtG7fj TxlkXH05KqTP5mUIs9Vvr1frfIUy8OH3PytSQDzqQCelGeLZpBHL8HTEnnQrgldRUSBr QMVaoVLl/Y4Q6Q4lC5n16ZQOQD8jP+SbWJEviQjLJIBCNxZ+ApEWtCuMRm+YGEYivr2j kXAsEbzJZ4rGT0k3+PofpCYs61DL4C7fcjVXTJRsFMSvgl+azRh8FQarwVg+2J4QzrEJ dIIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778620009; x=1779224809; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vgzEDqlvhoYP0aAGYME8rWUPvmasj5/ucpL5w8urRD4=; b=lOXVJK5T6PKEv4h1DJsgz65KSEWq2BMt4o9/aCagFIObv9ppTEZewWUkS00MaAUnhD MUkvRBnywH3bGi44rpLsSTKp6XKibnL8IAIzS9F1B86tAHnRqXAh4+1FGYzZVfxj9OlM p8eznK11ZMZACKdl/2g/CTi/bl9AxD3WLNKeDJ33dlHEZcAEBHt8nQNyB1c0F0K1CsVX XNYEuFiV1M0Vpi77LgZ3/v3oorUxEtFuz3MfKtBoi4X6HHfrpQz8E7YYlTYSJKI378t+ oOQj6PCm/EBHNEoNJG3APLqIL4D5SkidsY2co04UXiaKgh3Lg2GICR+Gjk+/FIc2nR/l v47Q== X-Gm-Message-State: AOJu0Yw7eb/WD8zT818k1If+CVQnGNGNrjv+kXtxIBfCDHJocsOUnfvB mHCyk/+1DYmkxpDJ0xuUpGLXheZmvR/UVzw+486mlbPb90JLCl25bUnbJcrWnOvw2G2cTO/0IIR 3VGkKrVD+Dj/wpgOrDtNN8wM7HYAaYq6T8QoJqsCC9mllf9Ngg4n/ZMPisIVjiBSysEG/byrAtm o6Kp1WZ8zHrYAw8S3pB19jGbHqy8WNn4ksiRAmqwSbqhU= X-Gm-Gg: Acq92OFmMMXMoJNdVOMenaOog6UJAWM/6sx4p6GVxMTc5zMIOFk1gneIH3quHIzCb+Z e8bT5vpMzgL/NPu1rKCvfAy0GBFaMY+EHMfvXg1AIL2LhN3nChhI3LgrXq1cHaMyiebBoOOn1kn ZdKmDOXs37EC4Tcz7T6JyCg/6ifV6/d81xGCpUvtfyFIADwmtGy626d1LBSL4KkvPp0/mjF9vH5 LF3BmoIj6SYSJpXUY6TZxV5mPWkgzhxMSTEauRStVvwh+u4dckG41268aerWBJXIs/JcSoSGaKh R/CCSX270IsuZG5V/BY10Wa2QeKqsjcZnoYp7sUNVOiyaRHL/Qdp+EKmCL/p+kNwJxpV1aof8Sn jOsOxAXw938OSH1qpmcdhRAcmRsNtpkygXyCGVKAc X-Received: by 2002:a05:600c:4ed1:b0:488:aa33:dc8f with SMTP id 5b1f17b1804b1-48fc95a5989mr7783835e9.0.1778620008969; Tue, 12 May 2026 14:06:48 -0700 (PDT) X-Received: by 2002:a05:600c:4ed1:b0:488:aa33:dc8f with SMTP id 5b1f17b1804b1-48fc95a5989mr7783135e9.0.1778620008280; Tue, 12 May 2026 14:06:48 -0700 (PDT) Received: from redhat.com (IGLD-80-230-48-7.inter.net.il. [80.230.48.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fce065732sm23005e9.6.2026.05.12.14.06.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 14:06:47 -0700 (PDT) Date: Tue, 12 May 2026 17:06:43 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: "David Hildenbrand (Arm)" , Jason Wang , Xuan Zhuo , Eugenio =?utf-8?B?UMOpcmV6?= , Muchun Song , Oscar Salvador , Andrew Morton , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Hugh Dickins , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Christoph Lameter , David Rientjes , Roman Gushchin , Harry Yoo , Axel Rasmussen , Yuanchu Xie , Wei Xu , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , virtualization@lists.linux.dev, linux-mm@kvack.org, Andrea Arcangeli Subject: [PATCH v7 18/31] mm: memfd: skip zeroing for zeroed hugetlb pool pages Message-ID: <0ec51a9091b5ed3f61a49935953dd537d6c87428.1778616612.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent gather_surplus_pages() pre-allocates hugetlb pages into the pool during mmap. Pass __GFP_ZERO so these pages are zeroed by the buddy allocator, and HPG_zeroed is set by alloc_surplus_hugetlb_folio. Add bool *zeroed output to alloc_hugetlb_folio_reserve() so callers can check whether the pool page is known-zero. memfd's memfd_alloc_folio() uses this to skip the explicit folio_zero_user() when the page is already zero. This avoids redundant zeroing for memfd hugetlb pages that were pre-allocated into the pool and never mapped to userspace. Signed-off-by: Michael S. Tsirkin Assisted-by: Claude:claude-opus-4-6 --- include/linux/hugetlb.h | 6 ++++-- mm/hugetlb.c | 11 +++++++++-- mm/memfd.c | 14 ++++++++------ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 49e5557d6cc0..3d23267014e6 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -714,7 +714,8 @@ struct folio *alloc_hugetlb_folio_nodemask(struct hstate *h, int preferred_nid, nodemask_t *nmask, gfp_t gfp_mask, bool allow_alloc_fallback); struct folio *alloc_hugetlb_folio_reserve(struct hstate *h, int preferred_nid, - nodemask_t *nmask, gfp_t gfp_mask); + nodemask_t *nmask, gfp_t gfp_mask, + bool *zeroed); int hugetlb_add_to_page_cache(struct folio *folio, struct address_space *mapping, pgoff_t idx); @@ -1134,7 +1135,8 @@ static inline void wait_for_freed_hugetlb_folios(void) static inline struct folio * alloc_hugetlb_folio_reserve(struct hstate *h, int preferred_nid, - nodemask_t *nmask, gfp_t gfp_mask) + nodemask_t *nmask, gfp_t gfp_mask, + bool *zeroed) { return NULL; } diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2ea078d4e5a8..0a19a078d860 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2205,7 +2205,7 @@ struct folio *alloc_buddy_hugetlb_folio_with_mpol(struct hstate *h, } struct folio *alloc_hugetlb_folio_reserve(struct hstate *h, int preferred_nid, - nodemask_t *nmask, gfp_t gfp_mask) + nodemask_t *nmask, gfp_t gfp_mask, bool *zeroed) { struct folio *folio; @@ -2221,6 +2221,12 @@ struct folio *alloc_hugetlb_folio_reserve(struct hstate *h, int preferred_nid, h->resv_huge_pages--; spin_unlock_irq(&hugetlb_lock); + + if (zeroed && folio) { + *zeroed = folio_test_hugetlb_zeroed(folio); + folio_clear_hugetlb_zeroed(folio); + } + return folio; } @@ -2305,7 +2311,8 @@ static int gather_surplus_pages(struct hstate *h, long delta) * It is okay to use NUMA_NO_NODE because we use numa_mem_id() * down the road to pick the current node if that is the case. */ - folio = alloc_surplus_hugetlb_folio(h, htlb_alloc_mask(h), + folio = alloc_surplus_hugetlb_folio(h, + htlb_alloc_mask(h) | __GFP_ZERO, NUMA_NO_NODE, &alloc_nodemask, USER_ADDR_NONE); if (!folio) { diff --git a/mm/memfd.c b/mm/memfd.c index fb425f4e315f..5518f7d2d91f 100644 --- a/mm/memfd.c +++ b/mm/memfd.c @@ -69,6 +69,7 @@ struct folio *memfd_alloc_folio(struct file *memfd, pgoff_t idx) #ifdef CONFIG_HUGETLB_PAGE struct folio *folio; gfp_t gfp_mask; + bool zeroed; if (is_file_hugepages(memfd)) { /* @@ -93,17 +94,18 @@ struct folio *memfd_alloc_folio(struct file *memfd, pgoff_t idx) folio = alloc_hugetlb_folio_reserve(h, numa_node_id(), NULL, - gfp_mask); + gfp_mask, + &zeroed); if (folio) { u32 hash; /* - * Zero the folio to prevent information leaks to userspace. - * Use folio_zero_user() which is optimized for huge/gigantic - * pages. Pass 0 as addr_hint since this is not a faulting path - * and we don't have a user virtual address yet. + * Zero the folio to prevent information leaks to + * userspace. Skip if the pool page is known-zero + * (HPG_zeroed set during pool pre-allocation). */ - folio_zero_user(folio, 0); + if (!zeroed) + folio_zero_user(folio, 0); /* * Mark the folio uptodate before adding to page cache, -- MST