From nobody Tue Feb 10 05:17:45 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47CAA1DDC2E for ; Mon, 27 Jan 2025 23:22:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738020152; cv=none; b=DGaI7OGrQiCLFfxrTpqY78CZJSbdYEmx/NlamRYcu7zSZ082hQyNek5zB2XfVRG9RHfcssYKXTwYJOlKIyMJ6lDfJ42c4FRIIyfHyE36uQdRy5rNW48YNoUxll0s7QiaTh0VkzgWtxGn8XYyCnBfgTAukK3rtdlbKkVxmYdLsIQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738020152; c=relaxed/simple; bh=RxdJDx0yWovfbWny+cC3MrhTM9qpiT9Dj+NSquwpzC4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Z0Gs/3C42wzgC1Xqto2+HTUGYLGR8kjEwiPz4vJFi0Ci2x22bppcVFUt8P7apSNI/XJzthO5dpdkUD1xZ7PnQEKy6pyeFpOIn04oO2g/C01VcTlBzPLazmEsX5l1O6Yn1s+16Ym+FBCAm/eSOj65oaXjW3IvhHPD/V/jIaa9jQQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--fvdl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=FrmkXW8O; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--fvdl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="FrmkXW8O" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-21650d4612eso134752275ad.2 for ; Mon, 27 Jan 2025 15:22:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738020150; x=1738624950; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nbfh28HcFIXQ9mLhqkAthugup7PcB5AKxUJWZSh0wXU=; b=FrmkXW8OGCDA6etemwKQ9zZ17VMoWgRnhJSlAAFIjfHj4UE01JJWLREZDUN8jlnp0V A4H3pAKzGhVFWflryAb7eicXEmcp7vpXiDYUih2vJ9Wha2VwU+psm37tSLn4nHkS2842 p9EO20lej7nX1S/pe29Q12xNMLP/F/t4J9Y5dghhJuZYAMBTv7b6QEujDYFZ/cApRqpe 94qDqpO4RoR0DyHpGHoQEBI7zt0p9RiK3sHRnwSV3iPAu5tXz996HSVlDWiyJvR/CNkv 5GRkeW1agWpECSJ6NdQe5ZrQjyl9smFHHQRDHEgVPzadIOXECiW/5sheDE/dEbQz11n9 oWJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738020150; x=1738624950; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nbfh28HcFIXQ9mLhqkAthugup7PcB5AKxUJWZSh0wXU=; b=XuS/3bvBbYTaVbR06ZCwqdaNlNIWxyPPNl/NX8fmZ9iYO8pMNkjXnSy4JuXliyP9Qr cb6mzgDuta71GkkPDmRTJoBhPXFGBaKSjHJUUe3drk3rVnpXwJjwgM3lhhiryTM64Tqv 7OcK5FzbLZUvTF6YwKCc24YBy+K21n0Ar6/Rk5LsbHth0nnE9YEAiOq+xILm5eIxyYkA 7J4RaIWDycPSN82Y6yfb1sELsKgmEWDtotHRd4TSyRJefUegZVf63kXSVCaiy15ipenk DSw5TVi/L/ewIaKYiKVd6H+ZOx0C5aPv/87wNdf8bWAUQ5vy6DYLzNCzyZBIcrQeyNf1 TRBg== X-Forwarded-Encrypted: i=1; AJvYcCWFfPi+U2M9G2yk1dnK/kNeOQgLlYPq2rypJ0CpENX8QaNn/COjXxEA00CBAVle/0HcC6n5qS1pIbFr4dY=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9V6/TdD3rOd4idnEJ6Nw9h6ovQfr7rbwoD2kUyVwDAQRVs4bG /XuV5By3nc5uVpXJ5JR0g19/3KGtHhcYhRcBon/C61yJLezZkLCsc5gxOcMkJAP94YG2hw== X-Google-Smtp-Source: AGHT+IH+wafy7y4Yrx3/vKft4ZwmgZZYhHwu65H+dX5PMxOWLMh1lXIrwPEg8dgPsWbnMC2GdrQhOOq7 X-Received: from pfbdc11.prod.google.com ([2002:a05:6a00:35cb:b0:728:e3af:6bb0]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:430d:b0:1e1:aef4:9ce7 with SMTP id adf61e73a8af0-1eb214a08b6mr61157310637.17.1738020150464; Mon, 27 Jan 2025 15:22:30 -0800 (PST) Date: Mon, 27 Jan 2025 23:21:44 +0000 In-Reply-To: <20250127232207.3888640-1-fvdl@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250127232207.3888640-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog Message-ID: <20250127232207.3888640-5-fvdl@google.com> Subject: [PATCH 04/27] mm, hugetlb: use cma_declare_contiguous_multi From: Frank van der Linden To: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: yuzhao@google.com, usama.arif@bytedance.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" hugetlb_cma is fine with using multiple CMA ranges, as long as it can get its gigantic pages allocated from them. So, use cma_declare_contiguous_multi to allow for multiple ranges, increasing the chances of getting what we want on systems with gaps in physical memory. Signed-off-by: Frank van der Linden --- mm/hugetlb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 87761b042ed0..b187843e38fe 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -7738,9 +7738,8 @@ void __init hugetlb_cma_reserve(int order) * may be returned to CMA allocator in the case of * huge page demotion. */ - res =3D cma_declare_contiguous_nid(0, size, 0, - PAGE_SIZE << order, - HUGETLB_PAGE_ORDER, false, name, + res =3D cma_declare_contiguous_multi(size, PAGE_SIZE << order, + HUGETLB_PAGE_ORDER, name, &hugetlb_cma[nid], nid); if (res) { pr_warn("hugetlb_cma: reservation failed: err %d, node %d", --=20 2.48.1.262.g85cc9f2d1e-goog