From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) (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 334073BE15F for ; Wed, 27 May 2026 20:48:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779914905; cv=none; b=JU3ma/n9AhDoEtxZJ2LhVlzYx/Q/36lE9bMAzSK1VUOO6XsSl0x/zU+wlrJJdwKIlaPmlUGmN8Sd5OBUdJFMVCZYBTX6nUCL2kJnecsBjevKUiNo8qxG5WtZj2f/E2ktBq0rVXjc+lAnGrB0pKTY2pyGJmiGo0rtzOrQ053BjZQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779914905; c=relaxed/simple; bh=YRW4qnSpMUAMG+rquHRhuw/mFIuPIMQywrOsR9YkwJc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T6IMeyB+W5qxYlaElFs1wppnGTUQS23NCvwCunxkcXyNsIZ/GHkaCJ3IBoA7uZdnx6NcGheH3D93gg4oJmGxYJ+X+jExa1BvUMcIyvKm3Ap6SdcIyFFfSSS9BHZekbCjOBbtblAj1PO3jb98TexgYfQ/u5rdIFoCvi1mU+sC0Yw= 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=LRcSNc2z; arc=none smtp.client-ip=209.85.160.170 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="LRcSNc2z" Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-51306c36c3eso132087871cf.0 for ; Wed, 27 May 2026 13:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg.org; s=google; t=1779914895; x=1780519695; 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=dlbqhKiDqWS+kHnDvkCX36mrjE33rRvlYf46I/uZLtE=; b=LRcSNc2zN/RbyK+BTAF7DboHL7NVV+Gg8fzmn8QP/ENFZawV4Ccm8bNEeuW3VzIxj2 4JPn7ohKScy4ce9bO5mveyRaf8Gg0NGiaZTjDw6rNc6g87Dh6uIunaqxKgQN6WB5jWV2 LORJhRstTTPtBBL16zLkjwPn3jyijOJ824nHnXNkQ3+6iqCxRUSfZe1Hod/vmjF8soQY sKz5Tv9O1uTchYJxrlpKmXrI8BH214XbSRREzbDdp710wmEF+8dU5/K2O9knbynzvdeL gr4R9FDPLVEK4it7WCFOa3tHjQ4CoBS4DJ17/DG+b65ur+2n/8LOrcs55k6fkWMDCIR/ 48CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779914895; x=1780519695; 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=dlbqhKiDqWS+kHnDvkCX36mrjE33rRvlYf46I/uZLtE=; b=Vn94m5Qeejak1MLiCx5fYCB8Ca4GSUcM4xJKH9lVfsIbpo6m7Dos3b4L/9uBQ731y0 3IZlyr3lGh3TQYkw7/W0kt3U1m4gKqkG6xOa11PGzNJc0ct4zueG2VE5dURSDtOuE2q4 SUMpnU5xD6JVpu7G7deKO3QRhJMFKJ02D7ZzNxvYXthXCncCvgv6ovkCrQbkO0KGsu84 aCTfkusBE0nvWiVzFTs91KpjhrENmncvXneymvXd3iIExijpEwYk6golYGSZ2hpuLjq4 s4MaFP3CIfRi9Lck8rS1RkVsD9ghlBfiQFKh+Gk2IWh7tGfsX26TFdxW4hY/RGZde+Mx fQjw== X-Forwarded-Encrypted: i=1; AFNElJ/oen8+oPEkVMEOLtkynoE6MyJmUk8E5++0QBGeHQMRv/xKJ8FrQriUmHav7C5LV/ZlHoa4G4cL4MCj17g=@vger.kernel.org X-Gm-Message-State: AOJu0YyzGTq7jJfJtHvKJfSYY7Y4fH9udkOWxGFTbqU2Mk1dfsVGOGXi NQCHeUsj9uB3kQEbQ5+7Qyg5Y+3+3dFrU6mSwOpKPL0t2B7W1ixyD3QORlgwm2RPLCw= X-Gm-Gg: Acq92OHyTPO8A2EEHp3nZDDhBn1qZ1BrBfkcPorIvZVcRILIqE7aJ/y1nqJxhEjnJkY oNErNtmwzrwSQ9PrFFTw+xjd+QPJQpI4CKtT/JsYkjwxu+T52dRrGaVzOJmnECucKQOMyyji6Xz JxpKUrA9bZuFXr1nTvL6qB1N504PcOz+ZeXDfaxWjN4Y0KmOCc+whyj5c8SXOM1v2v6E6xjJukz Q7th2zhcd8zVsxK81I/uNbbBIvJdCUAScvpi7zogEeBpVHbV9fQOuDzdrTlxFjanac6mVd2cp79 VPg2LlI4DI5j7CzXKtJHPV/mRIdQX9CxkR6n9b0o7fmkFE8Mg9fomj4FMONR5XB1AbU7bq7A/G5 72cvf+uAWUXNaviHPIHyCDnnToJ94PJdIdslEpHZnguGUhmwV/3MU8USawJ6qJQD+EQV+0yHYMU ooKg1cumZI2XEXEY4TjvyvVghv0pV3IMR2 X-Received: by 2002:a05:622a:134d:b0:50f:c5d3:a191 with SMTP id d75a77b69052e-516d429f541mr332100001cf.13.1779914895147; Wed, 27 May 2026 13:48:15 -0700 (PDT) Received: from localhost ([2603:7001:f100:500:365a:60ff:fe62:ff29]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-51706af4fd2sm52466431cf.25.2026.05.27.13.48.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 13:48:14 -0700 (PDT) From: Johannes Weiner To: Andrew Morton Cc: David Hildenbrand , Lorenzo Stoakes , Shakeel Butt , Michal Hocko , Dave Chinner , Roman Gushchin , Muchun Song , Qi Zheng , Yosry Ahmed , Zi Yan , "Liam R . Howlett" , Usama Arif , Kiryl Shutsemau , Vlastimil Babka , Kairui Song , Mikhail Zaslonko , Vasily Gorbik , Baolin Wang , Barry Song , Dev Jain , Lance Yang , Nico Pache , Ryan Roberts , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 5/9] mm: list_lru: deduplicate lock_list_lru() Date: Wed, 27 May 2026 16:45:12 -0400 Message-ID: <20260527204757.2544958-6-hannes@cmpxchg.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260527204757.2544958-1-hannes@cmpxchg.org> References: <20260527204757.2544958-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: 8bit The MEMCG and !MEMCG paths have the same pattern. Share the code. Reviewed-by: David Hildenbrand (Arm) Acked-by: Shakeel Butt Reviewed-by: Lorenzo Stoakes (Oracle) Signed-off-by: Johannes Weiner Reviewed-by: Liam R. Howlett (Oracle) --- mm/list_lru.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/mm/list_lru.c b/mm/list_lru.c index 7d0523e44010..fdb3fe2ea64f 100644 --- a/mm/list_lru.c +++ b/mm/list_lru.c @@ -15,6 +15,14 @@ #include "slab.h" #include "internal.h" +static inline void lock_list_lru(struct list_lru_one *l, bool irq) +{ + if (irq) + spin_lock_irq(&l->lock); + else + spin_lock(&l->lock); +} + static inline void unlock_list_lru(struct list_lru_one *l, bool irq_off) { if (irq_off) @@ -68,14 +76,6 @@ list_lru_from_memcg_idx(struct list_lru *lru, int nid, int idx) return &lru->node[nid].lru; } -static inline void lock_list_lru(struct list_lru_one *l, bool irq) -{ - if (irq) - spin_lock_irq(&l->lock); - else - spin_lock(&l->lock); -} - static inline struct list_lru_one * lock_list_lru_of_memcg(struct list_lru *lru, int nid, struct mem_cgroup **memcg, bool irq, bool skip_empty) @@ -136,10 +136,7 @@ lock_list_lru_of_memcg(struct list_lru *lru, int nid, { struct list_lru_one *l = &lru->node[nid].lru; - if (irq) - spin_lock_irq(&l->lock); - else - spin_lock(&l->lock); + lock_list_lru(l, irq); return l; } -- 2.54.0