From nobody Sun Feb 8 01:52:03 2026 Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) (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 3D4C217F4F2 for ; Fri, 10 Jan 2025 20:33:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736541186; cv=none; b=mgK1bXiyndj8xt153CjQWEP1/lmSFxG/BthF6oiUiX2UYWBw3GzYhOpvw0NsTn5hdeR1zB96l/fVgRz4W18jfcWnnfp2SWhN4s0FNv4o55w67HhMFjzE2JERfDqFJb7lVT1daSPv+lbkFskS/70Xh27gnllSHN8FYfMUbW1RPe8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736541186; c=relaxed/simple; bh=Um8FXTdUjvXgGHzIk7Yo52UMTCcxCE7Bt/qZ92l2gSo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=leb5W3tKyyIYFjQjiyiJl2TNb/wskHpgDc/RkEh6vLNjR4qWAg5nRF7uXc7PUiWCa3si2pj6uvBB71XuPOD7SPrl7kQoYHlZmUyLg0jM0uK3QbmgzjOQ0WAUzEhB3itxT5tAPqrB6FAKlvVB6vEomMCkxP7pywkp3nC1I8mG+3Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Rqn6T2WJ; arc=none smtp.client-ip=209.85.219.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Rqn6T2WJ" Received: by mail-yb1-f174.google.com with SMTP id 3f1490d57ef6-e398484b60bso3874487276.1 for ; Fri, 10 Jan 2025 12:33:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736541184; x=1737145984; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=R3OHJ55YjZuO0+2TEYbtIvFFyGO1wuck5p4Zg10LFD8=; b=Rqn6T2WJPGc0YH4YkY5JQbLj78JGRPAKxv2AqBqmPiFnSX3MQpq5ZOxlDi2s2WBhLi +6gW1eShGLDNGPgryK7xNm5CuFn8uSnrfGbts7oYiCsn9EVMFxo2vMrD0VBw2enXDhdt w3WSJEos57YyWXo5q0LJnUuHrZhQGbrso8Kf+137Ffj/ofRUCwDCLQxzlph/rQquBf9Q OtvFilRYkT2Vhx9miKoAw/1Yv/LqcxtifoIWYohzlckDd04DzF9n7GEa+pX4kJMR9uzV DHYLGNcr9nVpBr4itxNvldbcsiYdWcKIENEI6WVQfnj4VC5uRqj6iwUymL5dL38+woTE e07g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736541184; x=1737145984; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=R3OHJ55YjZuO0+2TEYbtIvFFyGO1wuck5p4Zg10LFD8=; b=eMGH4EBVL1kEbyu0NV0yhEJiV+1c0Eub1HNTqBtkV5rhFXwfsa5F/8ma8vQA4mPQXP hO3v/nPNkv+qV5y+NH+ww4JrA41HUdhytNcUO9dxQTo2Rq0YkpjhTy3FPveQAg67x6Bv iGxgIF7Cj4bfG8X1dzTInQCY+bUtT2ECQE8p9AeveNn5rQ8mBPBzoQjdzJpHdm29Ciyr t0a7kJ9pBuofA7oCaXnUKamOp3BmVcW42yvW90IGF1nhfZUpTt+GdvVTm+OPyHgB4Yzn P+Y3btL5UQO5WtI0EbOsbEru0vODLc9eDIXmt20YqrS7E3VmSSv52mBfg6uW/zGKKSSs RJnQ== X-Forwarded-Encrypted: i=1; AJvYcCWmWS+1g3GFEliWaRCXJ6jEmIfKtI5mfDnfTRGw2blzhvpnpBTNyy+Vn+RfFDxWXZrqbfJuqhspAKnqoaI=@vger.kernel.org X-Gm-Message-State: AOJu0YwFjXzMkzKD7Zxk57WEFM7nXUqiR+3f6NF/kJbZDUWQQnum4rp4 m7xBSrbEVFzVmVq2ggqpvBrUTPnxHXsNkMrjeIJcs0NYzbuwIjwH X-Gm-Gg: ASbGncuMXXzyvkvr867jo7wzD8r4sG4JQpO3wW8IJQHKRltcHKW1LKde6cwIKSQelpI Ugi6BTR9rhKnL3yu3a9Lu2ECPXCFTkHaK2u8lgpYWR75SlPY1lS2swD0FvPbFIngj/dLttAJDOd xlSQ6UIfVAw4qXJeryzf2FVefmTOZPSoAcVfIh+ZsU2KJ9sPtufSV8tu+0XufWgLm1275cszIOv T7klwImdsxkAyyvJUQDDJf2GbuevvWiYl6O85Kyv5wSswDfJdVJ5J5W X-Google-Smtp-Source: AGHT+IHCmp+eAzAGnQjwwdQGn5KAwPmGCrDSSiwluombVvZ/VJNdnpcLNkz5cpzbV5HcxeaM9CPBow== X-Received: by 2002:a05:6902:228c:b0:e4b:3d71:346a with SMTP id 3f1490d57ef6-e54edf4189bmr9823939276.11.1736541184242; Fri, 10 Jan 2025 12:33:04 -0800 (PST) Received: from localhost ([2a03:2880:25ff:71::]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e55a593f26csm471885276.6.2025.01.10.12.33.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 12:33:03 -0800 (PST) From: Joshua Hahn To: Johannes Weiner , Chengming Zhou Cc: Andrew Morton , Nhat Pham , Yosry Ahmed , linux-kernel@vger.kernel.org, linux-mm@kvack.org, kernel-team@meta.com Subject: [PATCH] mm/zswap: Remove zswap_pools_counter Date: Fri, 10 Jan 2025 12:33:02 -0800 Message-ID: <20250110203303.3658816-1-joshua.hahnjy@gmail.com> X-Mailer: git-send-email 2.43.5 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" Commit 8edc9c4 [1] reduced the number of pools used by zswap from 32 to 1. As such, we no longer need to have unique names for zpool (zsmalloc). Remove the atomic counter that keeps track of the number of allocated pools, and replace the "zswap" string formatting with "zswap". Signed-off-by: Joshua Hahn [1] https://lore.kernel.org/all/20240617-zsmalloc-lock-mm-everything-v1-2-5= e5081ea11b3@linux.dev/T/#u --- mm/zswap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 5a27af8d86ea..bc43e807de29 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -210,8 +210,6 @@ static unsigned int nr_zswap_trees[MAX_SWAPFILES]; static LIST_HEAD(zswap_pools); /* protects zswap_pools list modification */ static DEFINE_SPINLOCK(zswap_pools_lock); -/* pool counter to provide unique names to zpool */ -static atomic_t zswap_pools_count =3D ATOMIC_INIT(0); =20 enum zswap_init_type { ZSWAP_UNINIT, @@ -249,7 +247,6 @@ static void __zswap_pool_empty(struct percpu_ref *ref); static struct zswap_pool *zswap_pool_create(char *type, char *compressor) { struct zswap_pool *pool; - char name[38]; /* 'zswap' + 32 char (max) num + \0 */ gfp_t gfp =3D __GFP_NORETRY | __GFP_NOWARN | __GFP_KSWAPD_RECLAIM; int ret; =20 @@ -268,9 +265,7 @@ static struct zswap_pool *zswap_pool_create(char *type,= char *compressor) if (!pool) return NULL; =20 - /* unique name for each pool specifically required by zsmalloc */ - snprintf(name, 38, "zswap%x", atomic_inc_return(&zswap_pools_count)); - pool->zpool =3D zpool_create_pool(type, name, gfp); + pool->zpool =3D zpool_create_pool(type, "zswap", gfp); if (!pool->zpool) { pr_err("%s zpool not available\n", type); goto error; --=20 2.43.5