From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 4DF5A3DA7E6 for ; Tue, 14 Jul 2026 09:32:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784021539; cv=none; b=PmDZSh2qcHwswQuSnJeH4oalrmqnqteCbmpxxECmKLHXC4Fotcj7PGVT2US9lq7+Km9hopLnYDahggBgevq74HP0rvbnEvx3hHmj7AOrJ//tiRGgocVnPUS1BG/AFpaUCrkhf8oPqVJzUX2mH9dQlwjb7DJBmsg70supgNjU2K0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784021539; c=relaxed/simple; bh=5kDU+AtDAkZe7HSNixy2MNjgMwy8vziw98claMS+DXA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=f1aGyqxXwn2V7kidKniQT7wWXEevEkrpl7FIFzuvWlO3WIPQXIG2eN3szxLAmSH6sW8aH+WdvVYsYNmhaUs/fWsxbWjbUWexZAaCTHwt1FfWTPlPJtaVueCnJ06NxXp4A/AheFqZnR9dySQxUToZ1MBKo3gN8k2wpULICBQdFZM= 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=rhFxfJV/; arc=none smtp.client-ip=209.85.221.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="rhFxfJV/" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-473f4a48e9aso2667764f8f.2 for ; Tue, 14 Jul 2026 02:32:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784021535; x=1784626335; 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=LTwXaMbWixpG13O8sS4fpRBsh80OpAwJDb/b9qaatlE=; b=rhFxfJV/toTUkSgexK9LrMXIIEMvzN6yrZ+ZuisFQzcwVo4+CS/kZcOG+IZsBipBXp n/Hwu2R9sO1C3FhqcCjKzHUvAbxzR4GkuNAoA/iIChR12kiAGa74WhqFc692bWY7kEcl yG3u/itUw77pbTtRkjARtmYZ/Pr0a4GrYuFajpBZIHvPgjilqKmPy3XNqS4AQjRAce45 mpF96+ZJJojytqzFxAnHluQjTHtZ2CmsPWn/OV5xQpzDgJCAPJBGzaGJ4xjS/RZ+e5Lq M434C2Hrv0HvRccNATByzZzBo/waojG3876pKVSZqbT0um/N2qx2CVt1aQxyRwFkbpzD h5fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784021535; x=1784626335; 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=LTwXaMbWixpG13O8sS4fpRBsh80OpAwJDb/b9qaatlE=; b=IOsql1xTPnZU5Dh1Aiu/nOa0LpFNYSf3dWOqIaUxC6f/4Zff/4gUsIee9Co7ZuFicU bCSYaF48x+xg6rSAC0lU/CDgJYbJLrGw9rs9zRfjV9jDTfmRHHL77ZbumD1U4WOZLhX/ YnoekpcB/JYt2pOVn2aarWkspsd8sazgZR5d1wZ6p+myNsSbQ9deaqQ/8a21JHsjcQwZ nAjlkG4H3QuMH/6+YOc1l7xNl0eiu3teIZ/3Irew1ynPdSpAIpLoxEbYM2nxe7TJNfog j4GABblbL/B+gKXHdYiBtobOyvfGOWpy38J816Ku1k8FrH9aiFMb481fM1IHxm01gYXT xIOA== X-Forwarded-Encrypted: i=1; AHgh+Rp9i3KmjoK9SXHK5O+rZFfVKp6gv8vLSXP4doD3u2gKk8hJtXOoxz/iJIMsFOyc9xE3TKBm06VYDxl3GEk=@vger.kernel.org X-Gm-Message-State: AOJu0YywJTpvb/CHgofY5WcCKUzSCU72fz04bZp2CIRAnz/3TfCCLjEp RcHUGAIwUEaoca+jWtjnN+4uBI3rASpZbL2Lkah5cPN47BqCM37Vp+RvdKu5/xK1TgiN8bPAio3 v5ta0fUgYK2lang== X-Received: from wrte4.prod.google.com ([2002:a5d:5004:0:b0:45e:6a78:7fad]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5f87:0:b0:475:f0c2:5b00 with SMTP id ffacd0b85a97d-47f488dea53mr1863182f8f.54.1784021534601; Tue, 14 Jul 2026 02:32:14 -0700 (PDT) Date: Tue, 14 Jul 2026 09:31:59 +0000 In-Reply-To: <20260714-spin-trylock-followup-v2-0-3c20ed032b14@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260714-spin-trylock-followup-v2-0-3c20ed032b14@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260714-spin-trylock-followup-v2-1-3c20ed032b14@google.com> Subject: [PATCH v2 1/4] mm/page_alloc: rename FPI_TRYLOCK -> FPI_NOLOCK From: Brendan Jackman To: Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , Sebastian Andrzej Siewior , Clark Williams , Steven Rostedt , Waiman Long , Ridong Chen , Tejun Heo , "=?utf-8?q?Michal_Koutn=C3=BD?=" Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Content-Type: text/plain; charset="utf-8" As discussed in the linked patch, the there is some inconsistency between "trylock" and "nolock" nomenclature, let's align it. Since "nolock" is used in the public API it seems to have more mindshare so do that. The linked patch did this for the ALLOC_ flag but forgot about FPI_. Link: https://lore.kernel.org/all/20260703-alloc-trylock-v5-1-c87b714e19d3@google.com/ Signed-off-by: Brendan Jackman --- mm/page_alloc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9c97a86da2b9f..f3f08d0313cfc 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -90,7 +90,7 @@ typedef int __bitwise fpi_t; #define FPI_TO_TAIL ((__force fpi_t)BIT(1)) /* Free the page without taking locks. Rely on trylock only. */ -#define FPI_TRYLOCK ((__force fpi_t)BIT(2)) +#define FPI_NOLOCK ((__force fpi_t)BIT(2)) /* free_pages_prepare() has already been called for page(s) being freed. */ #define FPI_PREPARED ((__force fpi_t)BIT(3)) @@ -1419,7 +1419,7 @@ static __always_inline bool __free_pages_prepare(struct page *page, page_table_check_free(page, order); pgalloc_tag_sub(page, 1 << order); - if (!PageHighMem(page) && !(fpi_flags & FPI_TRYLOCK)) { + if (!PageHighMem(page) && !(fpi_flags & FPI_NOLOCK)) { debug_check_no_locks_freed(page_address(page), PAGE_SIZE << order); debug_check_no_obj_freed(page_address(page), @@ -1558,7 +1558,7 @@ static void free_one_page(struct zone *zone, struct page *page, struct llist_head *llhead; unsigned long flags; - if (unlikely(fpi_flags & FPI_TRYLOCK)) { + if (unlikely(fpi_flags & FPI_NOLOCK)) { if (!spin_trylock_irqsave(&zone->lock, flags)) { add_page_to_zone_llist(zone, page, order); return; @@ -1569,7 +1569,7 @@ static void free_one_page(struct zone *zone, struct page *page, /* The lock succeeded. Process deferred pages. */ llhead = &zone->trylock_free_pages; - if (unlikely(!llist_empty(llhead) && !(fpi_flags & FPI_TRYLOCK))) { + if (unlikely(!llist_empty(llhead) && !(fpi_flags & FPI_NOLOCK))) { struct llist_node *llnode; struct page *p, *tmp; @@ -2882,7 +2882,7 @@ static bool free_frozen_page_commit(struct zone *zone, if (pcp->free_count < (batch << CONFIG_PCP_BATCH_SCALE_MAX)) pcp->free_count += (1 << order); - if (unlikely(fpi_flags & FPI_TRYLOCK)) { + if (unlikely(fpi_flags & FPI_NOLOCK)) { /* * Do not attempt to take a zone lock. Let pcp->count get * over high mark temporarily. @@ -2979,7 +2979,7 @@ static void __free_frozen_pages(struct page *page, unsigned int order, migratetype = MIGRATE_MOVABLE; } - if (unlikely((fpi_flags & FPI_TRYLOCK) && IS_ENABLED(CONFIG_PREEMPT_RT) + if (unlikely((fpi_flags & FPI_NOLOCK) && IS_ENABLED(CONFIG_PREEMPT_RT) && (in_nmi() || in_hardirq()))) { add_page_to_zone_llist(zone, page, order); return; @@ -3002,7 +3002,7 @@ void free_frozen_pages(struct page *page, unsigned int order) void free_frozen_pages_nolock(struct page *page, unsigned int order) { - __free_frozen_pages(page, order, FPI_TRYLOCK); + __free_frozen_pages(page, order, FPI_NOLOCK); } /* @@ -5410,7 +5410,7 @@ struct page *__alloc_frozen_pages_noprof(gfp_t gfp, unsigned int order, if (memcg_kmem_online() && (gfp & __GFP_ACCOUNT) && page && unlikely(__memcg_kmem_charge_page(page, gfp, order) != 0)) { __free_frozen_pages(page, order, - alloc_flags & ALLOC_NOLOCK ? FPI_TRYLOCK : 0); + alloc_flags & ALLOC_NOLOCK ? FPI_NOLOCK : 0); page = NULL; } @@ -5533,7 +5533,7 @@ EXPORT_SYMBOL(__free_pages); */ void free_pages_nolock(struct page *page, unsigned int order) { - ___free_pages(page, order, FPI_TRYLOCK); + ___free_pages(page, order, FPI_NOLOCK); } /** -- 2.54.0