From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (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 08DD23D8127 for ; Fri, 3 Jul 2026 12:32:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783081967; cv=none; b=hxvKHh2bNdsDWgxBXmpgMf3wpeWIfVGq7atOVPp7QtX8cUcDvGRv2PaKlX+8CF+NGTmb57hx0IEO73qbB3bKLi9ylSBMFtfPZRiZtQwwUN6em/Cq1dCHUBlZ27GvquUM1SIISRgujqGPj1VfyK+4O+5Kx3VfPvvYUBXG6YncjPA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783081967; c=relaxed/simple; bh=/Q2AlTOSzVbcxT32hKCZVSIdoKxcQYXgEjJH4UkdlV8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GxZx40zAW2I2F+dQg8CMN9vo6Tj0BKo1oV68U7plocMskvDFcvZRl1BhEMHi11HJUmYB9ba3PfiAVmzutEu89WQymo2jnvu43a22/N/s+7G7eVeb4uMZgfmVhfFFheIYKBZ7MSLiuqPgls/8VzN05HhpbjSxsQUQk7MToCh4HDo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Sdh17/rH; arc=none smtp.client-ip=209.85.218.73 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--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Sdh17/rH" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-c1271887c33so51111866b.3 for ; Fri, 03 Jul 2026 05:32:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1783081961; x=1783686761; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=bD9d5R/Qa5BcsyyPmIa4YCQAd3/CPOGQg2JVFAI3c00=; b=Sdh17/rHmiH3aGUUv2KM3fz4i5dokYjFHsqD3jmxJLTA1BSm18TGZ2ezpeK//d/kKb YmuN4LYbVRuuo1kcQh6IEjh4EuIlIERLkHva++r9s9P3MFiXe+ilkhxv7QCS+9Wy2sdX TCQ/7I4X1mVqzcnBLZCsNsTY6pzqx0+HFE5VDHJriLHeKNnI+ZeR7DtgiqFhbarWtUHN EAJ9n+Tv4l/p2bf5aLC2/oqJnikX9M/yCR6ML131Ydfb6wU/hxH7sEyHepEie0+578mG erZLNhl/XFGchDQB/BYGVkoVh/drSgITKlmyfMsC/Udfu8hg9tZbEgmM1D11vSRO8Qfa 882Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783081961; x=1783686761; h=content-type: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:content-type; bh=bD9d5R/Qa5BcsyyPmIa4YCQAd3/CPOGQg2JVFAI3c00=; b=Ftx4pDYtCPP08qQqAkRe9YcPh+dRGr8kaxGlGUNFaaYUr1w2BQdFHDU2vPjXFX1Dd5 dlVo2zp1R1Gm7m7Ylcsnapj5xdYqlGqxuGp3Qct0csRd4W0cPB3zJFvAON6VSzb/5gtX g0bCLqA0zDqjFexXmVbxCARc5+R7mkkuzBwOHUK7l5xXzmqafZzuuJ67ewGtj8Mml4k0 QPakxGZYcgAWod9G33atEp+NJJ32xqN2zT+n3kTp/NZ2YbXsTqZnoLsLYnRYwOCjQuSu zSDV96elMvmgCrGBb6dbrr/1bfMvXINwEiMecQjYUeLqaOZ/03KPR4PA00Jxai0XhxBc 8QLQ== X-Forwarded-Encrypted: i=1; AHgh+RqqHvtpmbSno+eKs60uRx8sV/uq1pFYdAp3cPAftHglz1Dc56Y6r5eq7eE2Yhp7vKPc71w9Cerc3WNHjNA=@vger.kernel.org X-Gm-Message-State: AOJu0YyFqgJ3HdORRTXhKpr1yNUQ+ptLGHshlExISsuxB/rjTzsY7NMB FqxaNXOI/wOmhwQD5yimn28Yu2vS7S3qA2s5TayNvZjGkdB4OXcBVf5e9CE1cGBWE1R1qPd3BB/ oeHJCb+YLYuu2vw== X-Received: from ejblz6.prod.google.com ([2002:a17:906:fb06:b0:c12:58f8:f86]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:fd0b:b0:c12:9692:791b with SMTP id a640c23a62f3a-c12ae79a0eemr441027266b.37.1783081961027; Fri, 03 Jul 2026 05:32:41 -0700 (PDT) Date: Fri, 03 Jul 2026 12:31:57 +0000 In-Reply-To: <20260703-alloc-trylock-v5-0-c87b714e19d3@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260703-alloc-trylock-v5-0-c87b714e19d3@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260703-alloc-trylock-v5-17-c87b714e19d3@google.com> Subject: [PATCH v5 17/18] mm/page_alloc: drop alloc_flags arg from alloc_flags_cma() From: Brendan Jackman To: Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Johannes Weiner , Zi Yan , Muchun Song , Oscar Salvador , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Mike Rapoport , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Ying Huang , Alistair Popple , Hao Li , Christoph Lameter , David Rientjes , Roman Gushchin , Sebastian Andrzej Siewior , Clark Williams , Steven Rostedt Cc: "Harry Yoo (Oracle)" , Gregory Price , Johannes Weiner , Alexei Starovoitov , Matthew Wilcox , Hao Ge , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, derkling@google.com, reijiw@google.com, Brendan Jackman , Yosry Ahmed Content-Type: text/plain; charset="utf-8" To align the style with other alloc_flags_*() functions, drop this additive argument and just have the callers do that themselves. Note you can't always freely or alloc_flags like these callers do (because of the WMARK bits that encode an enum) but this is fine for ALLOC_CMA, just like it's fine for e.g. ALLOC_NON_BLOCK returned by alloc_flags_nonblocking() and or'd by its caller. Suggested-by: Vlastimil Babka (SUSE) Link: https://lore.kernel.org/all/5dcdd1ef-21ad-4ed0-9e8a-0e5cf96b4392@kernel.org/ Reviewed-by: Vlastimil Babka (SUSE) Signed-off-by: Brendan Jackman --- mm/page_alloc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index cfaf16244f56d..c3b246e67ed14 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3775,14 +3775,13 @@ alloc_flags_nofragment(struct zone *zone, gfp_t gfp_mask) } /* Must be called after current_gfp_context() which can change gfp_mask */ -static inline unsigned int alloc_flags_cma(gfp_t gfp_mask, - unsigned int alloc_flags) +static inline unsigned int alloc_flags_cma(gfp_t gfp_mask) { #ifdef CONFIG_CMA if (gfp_migratetype(gfp_mask) == MIGRATE_MOVABLE) - alloc_flags |= ALLOC_CMA; + return ALLOC_CMA; #endif - return alloc_flags; + return ALLOC_DEFAULT; } /* @@ -4526,7 +4525,7 @@ alloc_flags_slowpath(gfp_t gfp_mask, unsigned int order) } else if (unlikely(rt_or_dl_task(current)) && in_task()) alloc_flags |= ALLOC_MIN_RESERVE; - alloc_flags = alloc_flags_cma(gfp_mask, alloc_flags); + alloc_flags |= alloc_flags_cma(gfp_mask); if (defrag_mode) alloc_flags |= ALLOC_NOFRAGMENT; @@ -4837,7 +4836,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, reserve_flags = __gfp_pfmemalloc_flags(gfp_mask); if (reserve_flags) - alloc_flags = alloc_flags_cma(gfp_mask, reserve_flags) | + alloc_flags = alloc_flags_cma(gfp_mask) | reserve_flags | ac->alloc_flags | (alloc_flags & ALLOC_KSWAPD); /* @@ -5070,7 +5069,7 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order, should_fail_alloc_page(gfp_mask, order)) return false; - *alloc_flags = alloc_flags_cma(gfp_mask, *alloc_flags); + *alloc_flags |= alloc_flags_cma(gfp_mask); /* Dirty zone balancing only done in the fast path */ ac->spread_dirty_pages = (gfp_mask & __GFP_WRITE); -- 2.54.0