From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.74]) (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 E28384C6F10 for ; Thu, 2 Jul 2026 09:49:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782985790; cv=none; b=nQxpXRdgpv0NQSm90QmXvTHUSoDvZpaxo5QeaS7eThTzDOlm8xQOnd4dRH0oXMYldqm/3c1l/oYEnFCdUPISA/7hXpjgWINuzijxBTC88PlRxNGWjFhiPX6RM8KvIjpv/2t0ocFVuRlUUr2nhxKFgxvHAu6yA4tu5PCDnvmXpQA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782985790; c=relaxed/simple; bh=XSMEx7/rnQ/A8Pwk/KpzBBynrXnVI6BQCpv6JO2sLSQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZX9XH2HiazhMowZQEwGOd35FYopPU3at9F9vWLTWhEd73k45v0GJAJ130nYBU2k04zanjoKbQgkxrJegaJUTofcMxyYUC4HAESCoonef7EgL9apaVJvkJF4arPcwTi4PySj1dw4KFGunW/VKv4qPBHSFyOGONJEgjA2O2vzFLY8= 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=awz7zYPn; arc=none smtp.client-ip=209.85.218.74 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="awz7zYPn" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-c07d22d503fso158525266b.2 for ; Thu, 02 Jul 2026 02:49:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782985787; x=1783590587; 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=QxpluEDl6Bvs+YrJCKdo0lCaCsO0ieanT5jt0bN1dTA=; b=awz7zYPn7yQsaNVauT+A+hIElCxkPJxgMX9UVYQi9qtJVeHOR0Acw9dan6ehRTv8ee 9WpVxXbZxEn7TGNy6XETUhYHOpnhgl5irYdslSgE4PczZdJK03O1u7rLrFIa9O6zIEGw Wf2K9wy4LrhiRJfzXSLDJdKvmygDVBC+YVzwJh3akz9hdREfUtgm+ScFH5DPGnJt5Sf4 OHon45UiUl876hhrITMXn0p3UP91uJC+3KNgIsXxrf/TNRCckdLg62uBkmos1buJrjHd /VrtIXfHp8s7VOzYnZO92OVaKcz7Xk+XvDpIzFQZQlAq07Cg3HB9uwK0XQkJ9J14Gz+7 lcGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782985787; x=1783590587; 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=QxpluEDl6Bvs+YrJCKdo0lCaCsO0ieanT5jt0bN1dTA=; b=jguf9RZ5jKLUwE1YL2sTn5xp/6lO2T7mJ+OqGM1twQzgduVtnce1ThhgU2LyKAz3p2 Yw9LlIf26qPKzXMRgKTFyHW3E6BDE3eu8MSDJsd5oR0wkXe8kRZsxpCo20kElxo8jj7C rg7QYfp97P4Uf8mPx0H9kp9E2E9ajS/y7Cj6LQ0ANsRhEDGO60gegfOds057uiFaIiQB d8s2xK3AMsTsHPNQ4OgIIPAbNRteB+GmFAOSC8B/Vn57n4vHpjVtht2GmX+vNxJKOQEb 8bOBL6U2Y/Ou0jcZNmidIZClAnzp1JsGEZN179WSgNX9s2znqUgym0BoCdQRmG1/v6qY bDSg== X-Forwarded-Encrypted: i=1; AHgh+Rpaa48hWWnBJ7PewiEcB3fC09HJ+E0S4Ev/xWcNS2XCl8kl4Bi2I/canM0d+pk8GxJWoR4kax8dAeQ7j+o=@vger.kernel.org X-Gm-Message-State: AOJu0Ywp97GPkteWCvd7lLjLxFQR+EUTKF3X05Rfdh/N1/xEMd8utGJc AD6/9T1WjNm9lq3WWitXxBMwZtridB9/VxWlEMQWbH6+FEVYTIjJ0vPaVjI2OsFPjvN62S/4HED Q2Nb/KptsiZbjZw== X-Received: from ejjd17.prod.google.com ([2002:a17:906:3ed1:b0:c12:6c1e:ea29]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:6a01:b0:c12:b226:27 with SMTP id a640c23a62f3a-c12b2260182mr177229266b.11.1782985786777; Thu, 02 Jul 2026 02:49:46 -0700 (PDT) Date: Thu, 02 Jul 2026 09:49:32 +0000 In-Reply-To: <20260702-alloc-trylock-v4-0-0af8ff387e80@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260702-alloc-trylock-v4-0-0af8ff387e80@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260702-alloc-trylock-v4-1-0af8ff387e80@google.com> Subject: [PATCH v4 01/18] mm/page_alloc: rename ALLOC_TRYLOCK -> ALLOC_NOLOCK 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" It's confusing that the function is called "nolock" but the flag is called "trylock", align them. The function's terminology is more visible and has more mindshare so use that. Suggested-by: "Vlastimil Babka (SUSE)" Link: https://lore.kernel.org/linux-mm/2399b3ad-4eac-4a14-94c3-27e9f07972a1@kernel.org/ Reviewed-by: Suren Baghdasaryan Reviewed-by: Harry Yoo (Oracle) Reviewed-by: Vlastimil Babka (SUSE) Signed-off-by: Brendan Jackman --- mm/internal.h | 2 +- mm/page_alloc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index fa4fb69444ecd..a2b09a13735bf 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1480,7 +1480,7 @@ unsigned int reclaim_clean_pages_from_list(struct zone *zone, #define ALLOC_NOFRAGMENT 0x0 #endif #define ALLOC_HIGHATOMIC 0x200 /* Allows access to MIGRATE_HIGHATOMIC */ -#define ALLOC_TRYLOCK 0x400 /* Only use spin_trylock in allocation path */ +#define ALLOC_NOLOCK 0x400 /* Only use spin_trylock in allocation path */ #define ALLOC_KSWAPD 0x800 /* allow waking of kswapd, __GFP_KSWAPD_RECLAIM set */ /* Flags that allow allocations below the min watermark. */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 762d9b6bc792f..6004fe6583d47 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2530,7 +2530,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, unsigned long flags; int i; - if (unlikely(alloc_flags & ALLOC_TRYLOCK)) { + if (unlikely(alloc_flags & ALLOC_NOLOCK)) { if (!spin_trylock_irqsave(&zone->lock, flags)) return 0; } else { @@ -3218,7 +3218,7 @@ struct page *rmqueue_buddy(struct zone *preferred_zone, struct zone *zone, do { page = NULL; - if (unlikely(alloc_flags & ALLOC_TRYLOCK)) { + if (unlikely(alloc_flags & ALLOC_NOLOCK)) { if (!spin_trylock_irqsave(&zone->lock, flags)) return NULL; } else { @@ -5059,7 +5059,7 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order, * Don't invoke should_fail logic, since it may call * get_random_u32() and printk() which need to spin_lock. */ - if (!(*alloc_flags & ALLOC_TRYLOCK) && + if (!(*alloc_flags & ALLOC_NOLOCK) && should_fail_alloc_page(gfp_mask, order)) return false; @@ -7804,7 +7804,7 @@ static bool cond_accept_memory(struct zone *zone, unsigned int order, return false; /* Bailout, since try_to_accept_memory_one() needs to take a lock */ - if (alloc_flags & ALLOC_TRYLOCK) + if (alloc_flags & ALLOC_NOLOCK) return false; wmark = promo_wmark_pages(zone); @@ -7896,7 +7896,7 @@ struct page *alloc_frozen_pages_nolock_noprof(gfp_t gfp_flags, int nid, unsigned */ gfp_t alloc_gfp = __GFP_NOWARN | __GFP_ZERO | __GFP_NOMEMALLOC | __GFP_COMP | gfp_flags; - unsigned int alloc_flags = ALLOC_TRYLOCK; + unsigned int alloc_flags = ALLOC_NOLOCK; struct alloc_context ac = { }; struct page *page; -- 2.54.0