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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A8E83CA0EFF for ; Thu, 21 Aug 2025 20:07:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FA2710E9DF; Thu, 21 Aug 2025 20:07:34 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="WBzI0YNC"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 91B3F10E9D2 for ; Thu, 21 Aug 2025 20:07:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755806849; 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=saIpwl0G6zoDDZA6kqzaAKGDHCkLp/ivw/dNNi90asQ=; b=WBzI0YNCIiTCl+36JsjOrKdLoygc4GKOaosUr1YFRT3qBRosbIJWq03WtSbq2dStai36e7 pXOedwcplKdMrF13BNEb8/V9rtk77oLKA1MOy2gjcaihXgYeAtnDfx4wSdRujVEcgWtAx4 Hqjx47MBT3tv04AFAY8Hl71FT2xSO58= 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-668-aHx0BDrSP1yel9U5Cgwr5Q-1; Thu, 21 Aug 2025 16:07:25 -0400 X-MC-Unique: aHx0BDrSP1yel9U5Cgwr5Q-1 X-Mimecast-MFC-AGG-ID: aHx0BDrSP1yel9U5Cgwr5Q_1755806845 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-45a1b0ccb6cso6971495e9.3 for ; Thu, 21 Aug 2025 13:07:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755806844; x=1756411644; 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=saIpwl0G6zoDDZA6kqzaAKGDHCkLp/ivw/dNNi90asQ=; b=rQdZXIP2z26E9JcTQJEP8x3qYNxSVuN+L+3HDvSAoOR76P3iG7YIjNMGvwIa1VqZGm lWiIUzNYR2wmme5tz4AklL5J9obFZQG/guI8kMVBWlV4b2+OCliFuZY/NSEV1I/0tTYw 3kggmV93XOkbsi5L4B2hTS/khQ8Di0N2uRW3bC02KtY/2U2lTfcAF2iHMVgrm+LrqheK anHqT8JPUrne5ZkoLpdLKtTyMeR9YBrX1EJNsQMfnbWgF7Ir88AYK4VTfk6oPe6E8JgD ose/qDthnoGecVGF7q1VSL5rt4YmPrtpEBDguYUzKXujUNGeZmY9kffe6wy7vKOmglDs VQbg== X-Forwarded-Encrypted: i=1; AJvYcCWTuBnTE7sbDnxizoFT5uX0zaYKTWXBXMm9Vms1fVSBxOzj8SKqTu+An9Y7ZBdhK4Pbt/0F1h1RyiM=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxIsWS8O2qP37Sp5ktpEXzQ+F64+h6FlWuAZILuFMrhE7IXJPdo IZ8iTMpDC/OAvSFiTYBFD41G7S3bJpXixHxCejSbyfgQi21bk+28a9W5Wox2qfb1OLBFvfg8Kn7 f2s6XZds3tihfDnHYZupJeyrjwSSQZvGSEkzX+3rajzfX2i83jk7K77JJo42KZ06DLaPRCQ== X-Gm-Gg: ASbGnct3AvkpaROaw4D/SbZWlH9Q7kRR3t43BOC+kCgJmm2e7Im8TWaoMbkL74k7A2J HXfAhHpYGs9ye/TU/v/qyo0NxQWswCA7sJxjmDv0voJCGx5DUk7vb7TUL5k/4v9f+sxrdploSNZ MoifQp0RRzvXJBRu6PdqvYT0nNVLi3JfPHalh1o1CyXTb18RNOJoUHu4+YQq2eWsBIak5anWUgt b+7WwDJfrrRnheByzzXtxdJM3PDSbf/XgX/+cVg+LDSndLXaeiPLydkDN8xdlzkJLw6R26/uuV2 X2vnsVV1C+JxZW5nFrga5A0js25szlixHx17KYcjEnaWbidL7MZlF8NEzP4tCIzKTDXbqvPvOJp +sbN7Xh4B6hTLD+PdcqhroA== X-Received: by 2002:a05:600c:35c3:b0:456:285b:db3c with SMTP id 5b1f17b1804b1-45b5178e768mr3049975e9.3.1755806844530; Thu, 21 Aug 2025 13:07:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwjTyvRglWWHHllkR7aRLdEFYS2lmKXV2DYH9bn4L7+YG6UNdB0HbBuiJbZZ1vy18QyYWFNg== X-Received: by 2002:a05:600c:35c3:b0:456:285b:db3c with SMTP id 5b1f17b1804b1-45b5178e768mr3049835e9.3.1755806844048; Thu, 21 Aug 2025 13:07:24 -0700 (PDT) Received: from localhost (p200300d82f26ba0008036ec5991806fd.dip0.t-ipconnect.de. [2003:d8:2f26:ba00:803:6ec5:9918:6fd]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3c074e38d65sm12980909f8f.27.2025.08.21.13.07.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Aug 2025 13:07:23 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: David Hildenbrand , Alexander Potapenko , Andrew Morton , Brendan Jackman , Christoph Lameter , Dennis Zhou , Dmitry Vyukov , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, iommu@lists.linux.dev, io-uring@vger.kernel.org, Jason Gunthorpe , Jens Axboe , Johannes Weiner , John Hubbard , kasan-dev@googlegroups.com, kvm@vger.kernel.org, "Liam R. Howlett" , Linus Torvalds , linux-arm-kernel@axis.com, linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-ide@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mips@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, Lorenzo Stoakes , Marco Elver , Marek Szyprowski , Michal Hocko , Mike Rapoport , Muchun Song , netdev@vger.kernel.org, Oscar Salvador , Peter Xu , Robin Murphy , Suren Baghdasaryan , Tejun Heo , virtualization@lists.linux.dev, Vlastimil Babka , wireguard@lists.zx2c4.com, x86@kernel.org, Zi Yan Subject: [PATCH RFC 06/35] mm/page_alloc: reject unreasonable folio/compound page sizes in alloc_contig_range_noprof() Date: Thu, 21 Aug 2025 22:06:32 +0200 Message-ID: <20250821200701.1329277-7-david@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250821200701.1329277-1-david@redhat.com> References: <20250821200701.1329277-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: VWLFXHm9L6NY_2K7QCkFYXT2ub40vu1Y7IsCtsYJ0HU_1755806845 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Let's reject them early, which in turn makes folio_alloc_gigantic() reject them properly. To avoid converting from order to nr_pages, let's just add MAX_FOLIO_ORDER and calculate MAX_FOLIO_NR_PAGES based on that. Signed-off-by: David Hildenbrand --- include/linux/mm.h | 6 ++++-- mm/page_alloc.c | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 00c8a54127d37..77737cbf2216a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2055,11 +2055,13 @@ static inline long folio_nr_pages(const struct folio *folio) /* Only hugetlbfs can allocate folios larger than MAX_ORDER */ #ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE -#define MAX_FOLIO_NR_PAGES (1UL << PUD_ORDER) +#define MAX_FOLIO_ORDER PUD_ORDER #else -#define MAX_FOLIO_NR_PAGES MAX_ORDER_NR_PAGES +#define MAX_FOLIO_ORDER MAX_PAGE_ORDER #endif +#define MAX_FOLIO_NR_PAGES (1UL << MAX_FOLIO_ORDER) + /* * compound_nr() returns the number of pages in this potentially compound * page. compound_nr() can be called on a tail page, and is defined to diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ca9e6b9633f79..1e6ae4c395b30 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6833,6 +6833,7 @@ static int __alloc_contig_verify_gfp_mask(gfp_t gfp_mask, gfp_t *gfp_cc_mask) int alloc_contig_range_noprof(unsigned long start, unsigned long end, acr_flags_t alloc_flags, gfp_t gfp_mask) { + const unsigned int order = ilog2(end - start); unsigned long outer_start, outer_end; int ret = 0; @@ -6850,6 +6851,9 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end, PB_ISOLATE_MODE_CMA_ALLOC : PB_ISOLATE_MODE_OTHER; + if (WARN_ON_ONCE((gfp_mask & __GFP_COMP) && order > MAX_FOLIO_ORDER)) + return -EINVAL; + gfp_mask = current_gfp_context(gfp_mask); if (__alloc_contig_verify_gfp_mask(gfp_mask, (gfp_t *)&cc.gfp_mask)) return -EINVAL; @@ -6947,7 +6951,6 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end, free_contig_range(end, outer_end - end); } else if (start == outer_start && end == outer_end && is_power_of_2(end - start)) { struct page *head = pfn_to_page(start); - int order = ilog2(end - start); check_new_pages(head, order); prep_new_page(head, order, gfp_mask, 0); -- 2.50.1