From nobody Mon Apr 6 18:38:42 2026 Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (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 3FA643F7ABF for ; Wed, 18 Mar 2026 20:04:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773864247; cv=none; b=dj5bTePh5sorn1ZEJ5gPcgPlSetKi6GHykeK5O9sswAEsH5kpYDsBJ0zxg85h24E0ICp3GlQJ5vnM6YRZ3EZJxv/2TpXQx/FkU2aPnOUFmnOaEFWRCWun/Vk2gynJ6MJHHW0w8qjolrNHnac72D7YnxoJW0gU+ntXVaJ/9Weg54= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773864247; c=relaxed/simple; bh=3S94Q5uUUuy4oy2Bbu7HOiTJjkO17/SNvqAeYpwKxUY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RX+avxJdV4zDIK7kiwg0V6OM5hzrf5MQjsURENPCa0YmzX66A2alCP2wEf3cU/wdM+JU1tKEzz0s4DLjPyqu3PBUN3N211WLN+leNkqjL2bpF2XTFbMp4KnIv2HkGtmwMofJZHCUYB9YwuN7qR8KPjRbUtdzoJ9Eo5EaMgAU0nU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org; spf=pass smtp.mailfrom=cmpxchg.org; dkim=pass (2048-bit key) header.d=cmpxchg.org header.i=@cmpxchg.org header.b=WsW+Uv3S; arc=none smtp.client-ip=209.85.160.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg.org header.i=@cmpxchg.org header.b="WsW+Uv3S" Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-50917417efbso2015461cf.0 for ; Wed, 18 Mar 2026 13:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg.org; s=google; t=1773864244; x=1774469044; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lbnp+kFbFYjM1YsuaYPPjCjMikwKyOcf6X0AkdLiyeI=; b=WsW+Uv3SZYtSPlMZ2ae2WIVDOYkkCFehk7S8dRDY7CDZxIjDtEiueT+P9B08xeYbAF LU/lDOo1Gz1j6fdmtSiV7nkD7c3UhV/GsQPerIBJm8U1/WJV8Q0bEsvWyf/F6+M97xtJ zoPgs2BQdj7Vt4rWxYte0gr9eDZcUP4OV/+43ya8OeqIOrtF5EvLPmngsZ9arYYPuKAC Ii0k2NqBnLYoI25F71e4MMqrA4t0fp3O2oXFLX1SdBBrMMXEw/Qy/3k3zm/oDvwmAj7I ihhrTyKPAc4MMsIZ9Ge1YX0Be9z9IPrBuRuI/KnFAxCqtBP665DHDclOsQWXadiH7MC8 f4OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773864244; x=1774469044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Lbnp+kFbFYjM1YsuaYPPjCjMikwKyOcf6X0AkdLiyeI=; b=P5J9NXAI7E6jEgfDaRAh4IWqvAqIRO/8rYqMQRVB61uSXqHCSsiC3BizAuCKGNb5ME CnvZEy30utMbkOJjz5NcoOd+DMlKeN7XuDpKeypMjfKc4ZroCeg2PhJiTx5FB+/bKDbt OWAXzQF0okzc40ILcQ6rgEYICAEHF01+VuWq+xJ/3wL7/q2z4xruPUg4jNgnXO1hkpZE X9m02m7fxr8r92y2oPuLjQtbUAcuoiKLKuY1gvEAl0JZ/Sm9LLNzRY46ZN7tiqEth3R0 wD7tsIJG2XZe0CrY5K/zuQeKPIMCrlj7TyByOLAi5TUOr/5qlmmncgdksMhZ7Tfj/V8r 3X8A== X-Forwarded-Encrypted: i=1; AJvYcCXVlQc0cCJJFFMg+TIc8ndd60OJjK8yica6mjKOOQkojd8BSrHRo94A+MA8LdAJ7CelUjQn4thTVbCXi+s=@vger.kernel.org X-Gm-Message-State: AOJu0YyRhTRHSN1mY2t1LUXCEgukdMEZbKL2Z7wjgClItROeST2StcJU D4UiLGYkowLe4cbjGqLHqRnzNn43bDC9lzDm8IdX8Uwsb6kB1/nWgvOlbM4JfMwKZUE= X-Gm-Gg: ATEYQzw7kH/ZazzI88unhTCSjXaLp0YqnSzpRV025swGNKLpL4KA28UiGYfV4C6oONG j5TTtF/q40mKM5CPGrMKhPlFJUEVKiV40OWRyRlFX0SH4ADDToPu23H7Q0QUKQBbZoxB+smruSt 2noohVhwTFSio6HjtNzHmgvdHJlUYQZMaq2G+52gRrAU0oEftBwvEeYl3iu3KjGYdv4IvzJUS7X QUacmpBK5qDYoZPSDx39aSwl0UDHwSq4N9S33WTGjp4ldGdMKpcSjycB3o5evgDTZMZueQ/CtMx CKLZIBfDRZxK5C9ax+yB09F/XKUAhlWQg/fRo5sX0NL4HWmvkRotSKmjEz5H41wEDPLY6bbxbyZ 9kgolMXglPL9sMhCTnsJvY4TVCAUyAMoKp8W/uqKQY11e5HcwHoQuXRCzIpjYJX6uu35iyiMjLW LdWuW4CWoLFcXTCabFig7GnA== X-Received: by 2002:ac8:5914:0:b0:4ff:b32b:cdf9 with SMTP id d75a77b69052e-50b24655c9bmr14048141cf.14.1773864244121; Wed, 18 Mar 2026 13:04:04 -0700 (PDT) Received: from localhost ([2603:7000:c00:3a00:365a:60ff:fe62:ff29]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50b134ad438sm28515181cf.10.2026.03.18.13.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 13:04:03 -0700 (PDT) From: Johannes Weiner To: Andrew Morton Cc: David Hildenbrand , Shakeel Butt , Yosry Ahmed , Zi Yan , "Liam R. Howlett" , Usama Arif , Kiryl Shutsemau , Dave Chinner , Roman Gushchin , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/7] mm: list_lru: deduplicate unlock_list_lru() Date: Wed, 18 Mar 2026 15:53:20 -0400 Message-ID: <20260318200352.1039011-3-hannes@cmpxchg.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260318200352.1039011-1-hannes@cmpxchg.org> References: <20260318200352.1039011-1-hannes@cmpxchg.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The MEMCG and !MEMCG variants are the same. lock_list_lru() has the same pattern when bailing. Consolidate into a common implementation. Reviewed-by: David Hildenbrand (Arm) Acked-by: Shakeel Butt Signed-off-by: Johannes Weiner Reviewed-by: Lorenzo Stoakes (Oracle) --- mm/list_lru.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/mm/list_lru.c b/mm/list_lru.c index d96fd50fc9af..e873bc26a7ef 100644 --- a/mm/list_lru.c +++ b/mm/list_lru.c @@ -15,6 +15,14 @@ #include "slab.h" #include "internal.h" =20 +static inline void unlock_list_lru(struct list_lru_one *l, bool irq_off) +{ + if (irq_off) + spin_unlock_irq(&l->lock); + else + spin_unlock(&l->lock); +} + #ifdef CONFIG_MEMCG static LIST_HEAD(memcg_list_lrus); static DEFINE_MUTEX(list_lrus_mutex); @@ -67,10 +75,7 @@ static inline bool lock_list_lru(struct list_lru_one *l,= bool irq) else spin_lock(&l->lock); if (unlikely(READ_ONCE(l->nr_items) =3D=3D LONG_MIN)) { - if (irq) - spin_unlock_irq(&l->lock); - else - spin_unlock(&l->lock); + unlock_list_lru(l, irq); return false; } return true; @@ -101,14 +106,6 @@ lock_list_lru_of_memcg(struct list_lru *lru, int nid, = struct mem_cgroup *memcg, memcg =3D parent_mem_cgroup(memcg); goto again; } - -static inline void unlock_list_lru(struct list_lru_one *l, bool irq_off) -{ - if (irq_off) - spin_unlock_irq(&l->lock); - else - spin_unlock(&l->lock); -} #else static void list_lru_register(struct list_lru *lru) { @@ -147,14 +144,6 @@ lock_list_lru_of_memcg(struct list_lru *lru, int nid, = struct mem_cgroup *memcg, =20 return l; } - -static inline void unlock_list_lru(struct list_lru_one *l, bool irq_off) -{ - if (irq_off) - spin_unlock_irq(&l->lock); - else - spin_unlock(&l->lock); -} #endif /* CONFIG_MEMCG */ =20 /* The caller must ensure the memcg lifetime. */ --=20 2.53.0