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 D77EA3502B8 for ; Tue, 21 Apr 2026 22:01:46 +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=1776808908; cv=none; b=MHD1GS/+3puf72ISrtUAzpko53GB+9kE+MKFez40QHcnUM4lhZE0XpcZRHRcHYFfcZuaY0xGZkxG8FCgHj2wLMT8g0vHfGfAfo0v1sTFJbv6xXYXMQkSBfq9RW/kZSuJWrksX5uT6wE0RQ7cohyw8/NYZmqMUmIOEsFlp7yIB4Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776808908; c=relaxed/simple; bh=1ejL+Z1wL5a9wUXBRiBrtQNmVFq1XngLbhmkTIDh9l0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=famyBf9G4eowMAivYuSFJBn/a8M7s7M1WseolPZ2Y5gfUkFqy33FvZUD5CorDkCTVDWxOsFzpxxVINe/vpyaoKjAeFpaVhYxuimT3qeX0piZEP7mva/epx3OC2naDYU51lDO5bDQMr0BAweb81hqxU8UpJkkmHbzwQAq8qtZI7o= 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=LqIMIUTE; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=qeJZKX+l; 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="LqIMIUTE"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="qeJZKX+l" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776808906; 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=MQ6M8fMmd15EsU5jHzG0CofBcVEbXAB28EkZbWFSSyk=; b=LqIMIUTEKTtiMH+DskFf9mlc8sou+kceV1fVHpzIfMy1kt803DDNwE+wmutGGlIH5nsCWp 1rm/YKZeFI6YV9oSPq7TuUvVU7cEdsWy5QyiC9boEgyt9n4D9yEZ+T406ZnYRGYwoEx1IK r104U6B6kznGfMr1HfjL9gQQlGpnaAs= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-21-opVl3cUEOFu_i_yKTGPo_Q-1; Tue, 21 Apr 2026 18:01:44 -0400 X-MC-Unique: opVl3cUEOFu_i_yKTGPo_Q-1 X-Mimecast-MFC-AGG-ID: opVl3cUEOFu_i_yKTGPo_Q_1776808903 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-48a55ecc249so8064405e9.1 for ; Tue, 21 Apr 2026 15:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1776808903; x=1777413703; 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=MQ6M8fMmd15EsU5jHzG0CofBcVEbXAB28EkZbWFSSyk=; b=qeJZKX+ltdv8jQjv8mBZioAmNZ/IjVuEXxyBjDQdV0ck831aMsjUpQP5WWJaDJfwVB yToOsq1k7ThOpkradQiQ8f3cmRDxlyIPCviZtisdVU8g0EH5fLPjuORMYGPXw1g8dHwa K+qWNnRJaAuf7k/VSp/Vyq4P+XejrdwdpXA1rk1modwCiETKGDJvzjWztTD53MWWPxn3 G8rST9Mil+NzhiP6sOIr/KabqLbV2M3ihYsZcpOFtc51iulkds/Dj6ZP6DvPsGIEw/QO Yo699OzFE8CFCoDN8qRE06huSRAE38AFlHtNnRxkP51GhKUvf/zQ7PsdrfcoLMLzJH2C UvAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776808903; x=1777413703; 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=MQ6M8fMmd15EsU5jHzG0CofBcVEbXAB28EkZbWFSSyk=; b=jMVCjSZQ4q7vQbzJUEyyNFMNKpyqHF3rKQzsDVfz4cc+gXzXyZtt0H3tqxQLk8Hka3 d9Nq3VFoYklqzh4GS80p6cKSH8ZRSptyeXU95IDmWgcaKn1PJurtUtI4bWuPcODwaKZa wj6SMtDGD9YlgiwZW6t3KWIqf94DSBuglZlRoBwFYMSJIxvpAfQbsEF+lNkP7sRZFvun hnzzTHP4i2obhl9+Lt+Si8XjePMuEXyhUA5mN9ts+XYtk6pIVm2j4NZRJfA8byF/Sh8M J8y/lH3rm+MtmaSVXES0YNESbSPpUaG/WVWovPNC66dtq3GUtGeMA72iEw8XwnpseQF4 +aGQ== X-Gm-Message-State: AOJu0Yw2IWkga2BTS8HQecM1+JJoIGgVz2YoKNXkzvjA42C7PDIMjXxn D0xHfR5YsFWofB84R8r4OVyJDYUH0nInTDFQZWxtLxpale88OWA8j/jDu7Iv+ev7dTZ7DJ0rm6j a4BZDQ8vdpH+PLywWFuQOByJx2vfoWxjPuIeIhL0vysS0bIIvn5RuLHm+YLEqR+uQJa+vAgzbVZ X49YQD2ZqdQWP6Ou4YeZN/zl9nmXyJa15C8buB4eMjpc0= X-Gm-Gg: AeBDietKXSzbC0A5llVMLevb3SHr/vvnowbPzWCq65bS5GxBRj9wGLDPUsVbyvYsrzx CTRxZdIw2UUBrhdGvEPiRfOnOvEP5hQKePVsTffLeHf34yn1n/9HaRHgNyeUS1zusBSsByEBJaW FnO8QjW3Mo/5aqOpKQgmhy1Zsleoh+rru3CR/zOUNCeJUNHeHX3F92CqfMqXzhEnoFscvq4sPxP 3EVE4gkwcN++2d53OFmaP0WaLw47+ReYKVs2JAn9A1HMauxgv2Sk6NDUbAkCYN6lWAPG2IAE715 k3cOTaVQrciTExYUz4l6y/SAXTQE8UiMl9mGv/Y5nTAFGLrwmrbqXy7yRkLcsiTq6GbDF03gxRH odQjDw0ybgusDjJIkslQVCnlkSZABLH3PacNmCR08MsloSzONfIQsDg== X-Received: by 2002:a05:600c:5294:b0:48a:563c:c8d6 with SMTP id 5b1f17b1804b1-48a563cd0eemr57313405e9.7.1776808903036; Tue, 21 Apr 2026 15:01:43 -0700 (PDT) X-Received: by 2002:a05:600c:5294:b0:48a:563c:c8d6 with SMTP id 5b1f17b1804b1-48a563cd0eemr57312985e9.7.1776808902531; Tue, 21 Apr 2026 15:01:42 -0700 (PDT) Received: from redhat.com (IGLD-80-230-25-21.inter.net.il. [80.230.25.21]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4cb1365sm42637228f8f.7.2026.04.21.15.01.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2026 15:01:42 -0700 (PDT) Date: Tue, 21 Apr 2026 18:01:39 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Andrew Morton , David Hildenbrand , Vlastimil Babka , Brendan Jackman , Michal Hocko , Suren Baghdasaryan , Jason Wang , Andrea Arcangeli , Gregory Price , linux-mm@kvack.org, virtualization@lists.linux.dev, Muchun Song , Oscar Salvador , Hugh Dickins , Baolin Wang Subject: [PATCH RFC v3 09/19] mm: memfd: skip zeroing for zeroed hugetlb pool pages Message-ID: 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 | 17 +++++++++++------ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 094714c607f9..93bb06a33f57 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -713,7 +713,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); @@ -1128,7 +1129,8 @@ static inline struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, 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 4f0ed01f5b13..f02583b9faab 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2241,7 +2241,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; @@ -2257,6 +2257,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; } @@ -2341,7 +2347,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 919c2a53eb96..b9b44ed54db5 100644 --- a/mm/memfd.c +++ b/mm/memfd.c @@ -90,20 +90,24 @@ struct folio *memfd_alloc_folio(struct file *memfd, pgoff_t idx) if (nr_resv < 0) return ERR_PTR(nr_resv); + { + bool zeroed; + 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, @@ -139,6 +143,7 @@ struct folio *memfd_alloc_folio(struct file *memfd, pgoff_t idx) hugetlb_unreserve_pages(inode, idx, idx + 1, 0); return ERR_PTR(err); } + } #endif return shmem_read_folio(memfd->f_mapping, idx); } -- MST