From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.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 14B59446842 for ; Wed, 15 Jul 2026 11:03:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784113421; cv=none; b=C7cPvMieVlsKSqQcvvQPqA7ZuAPW9mXZWRGTde8SLoebHiLxacVx9s+13Z8Ukv7RXwg8gBo1UYYjPf1qHdYnrOnZI1+PGWJ/eSf/98BW/Sn6ji5tysG9NaOqiVrLBKdmL1R3xQ7KBhK/8xoGhaIjnu+pfazWbopQwFluxk6Qzsw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784113421; c=relaxed/simple; bh=CVr87p16kUYIkKSvdn3e7Q96lklgqj1Zs1PBoozN1Ps=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nvEHVVyN4AaGxNDlpfvDEV4/4OfFI9vJ5nBTld3CqST8wAe51otw57fiVX+nSy4kPZlkrmUDoGIe80fntlIaDWADaB/8VNJowcXSOWg99vZNtv0Ny4rsHniC/irehcXRko9/nbEa0GiBJZ5d9klQ2mX3deezg5kfGFSSINQXGKQ= 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=KTt+MHW7; arc=none smtp.client-ip=209.85.128.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="KTt+MHW7" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-493b21b1fe8so17633185e9.0 for ; Wed, 15 Jul 2026 04:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784113418; x=1784718218; 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=mf72NgjR/YGP7OyZOYwhsTao63XeRdktGGMG23Y8QgY=; b=KTt+MHW7kllZBDV2cjMSMHoequntxgF5qFjqAmn5Gc1ExjjneNHH6k3I/m3l15LYwn baOhs3YnJQiujt2NfmeKLbe3MOPmylrJ/meUygzClM0440SDwkbOVE5/xHwz9pwzb87S 35BQoezngDn6UwVYQ8LLU9yahQxJmQ74x79DKl508phghegn2ouDjAyXXPbcxELb6/LH jg2nqW+l98ncem5zveJoUME08e4Gs+s4c6s+RAZIhE6huWag7yfhRbCpJsAfNxYKYOe5 M23XcRP8rEIUKKYeKcykXynAdFZR+/Ar7IF6nPa9S0YYtGevuPVugOTnk2MLpfM+umEb PAbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784113418; x=1784718218; 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=mf72NgjR/YGP7OyZOYwhsTao63XeRdktGGMG23Y8QgY=; b=WU750E6u2RrQ2VEGBSpzBJLAzoHwnXAGGUSgK3UcFa3AZYLeeZIh4Ed94HOHtjbp2J C3riVr2GR/K2V2Zr5cNSPpwiQffOuzXClzaLpI+udybHJg18fKEVYWtJvwgAM2yfB6pz j8/dV49/05Sxw5SYqfEkVvRFD+/d09GSEd7Qo2AagakeB22V+RlbvuBMU9sYniejmIDa Xm5wsmqICF1Ikn4WzPsOuSaQQDJLh8OFFZdIMSe3DJfU/rX2DSvvSfQWiyo8WaJOM1x3 fGcQJ3mun9X3daB0d9+slC2fWuO3onG21bBSv8+BTSCqEPLhLJ8AnvY0ocpn17ADvbju pTOg== X-Forwarded-Encrypted: i=1; AHgh+RruOI31+dxzEXO0Cfmza+LPAiiw0isrTfaqSn0b0GpuRhcClPezP0og3563ra4YZq6Dxwv6P4pCkCsXMJM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywt+BwzVLC6olRNQ7fzkHQCZxqvdd70yGSz/ON1Jn2T5wqhEgzU 5/DcTZf9i2Sd24aRGcSO52vnrApq8nUHo4HnWVup783VfvPH/lOHMXd71ox/fYV0IO2iaiBaRfE 0Y4F/PjsorVUH/g== X-Received: from wmat13.prod.google.com ([2002:a05:600c:6d0d:b0:495:3c56:7eb1]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3223:b0:495:50c:259c with SMTP id 5b1f17b1804b1-495050c29d0mr54629235e9.7.1784113418268; Wed, 15 Jul 2026 04:03:38 -0700 (PDT) Date: Wed, 15 Jul 2026 11:03:18 +0000 In-Reply-To: <20260715-spin-trylock-followup-v3-0-fc4d246f705d@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260715-spin-trylock-followup-v3-0-fc4d246f705d@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260715-spin-trylock-followup-v3-1-fc4d246f705d@google.com> Subject: [PATCH v3 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?=" , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Mike Rapoport Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-rt-devel@lists.linux.dev 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/ Reviewed-by: Zi Yan 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 af63558391345..c2da85e69a0f8 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); } /* @@ -5399,7 +5399,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; } @@ -5522,7 +5522,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