From nobody Sun Feb 8 04:31:08 2026 Received: from out-179.mta1.migadu.com (out-179.mta1.migadu.com [95.215.58.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4757666B2D for ; Tue, 20 Feb 2024 11:44:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708429484; cv=none; b=ocCK3g2olok1pkz+qX9dSsQ2RSoqaTO+t8urZ8AJ5giV0L/tE+aBpA6E09RLSk8NBTvOScsobOPDFnyZ05p0oeO+QKqAHO9MI7b5KNUNv9afQMeLtsHEx/X1xL31SezTm2wk4wgjuBt9Q/CXA0qh9KftA2z8r062yF5mrKyxmfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708429484; c=relaxed/simple; bh=kdgQ+vIp+GUEXt8gpLV2Nl0qbyy7LFlK6JMx7o2Phgw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pq0uNpqgemdJGgJ+8HHRIIb1inbUYMy6sZtUH3/2yUZ/PgW+Cx4bchEeBQ1OpNoAJ8vQceJQlpbppTav1LFDY3Y3sepxCva1OU6SGLPXzMC64uWFFdFYcr5VeRMTxCtRqQt4+GEMHEA9my7O67yY9ODqpawVGWOwEpOoTH0kngY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=cwrTmA0s; arc=none smtp.client-ip=95.215.58.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="cwrTmA0s" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708429480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VdP64AtdS178q4SDQJio0KmQ+nTJNdPzbvzklfYy4hs=; b=cwrTmA0sPvnMUtwA1woeElKaxcGZpRmNkxQyoQlraw0/zO68U4jf0+tF/GGDIFjo092brD MbMMc1y0eiy8oqd6A3oW0hX1mpmoCKUB5Ic238upKw/66Sq9v557RCnf7Zuci8Fb/6+ktp Mi3mbziPE2AVdaVY3GIzj8PWB9dDJpQ= From: Chengming Zhou Date: Tue, 20 Feb 2024 11:44:29 +0000 Subject: [PATCH RESEND 1/3] mm/zsmalloc: remove set_zspage_mapping() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240220-b4-zsmalloc-cleanup-v1-1-b7e9cbab9541@linux.dev> References: <20240220-b4-zsmalloc-cleanup-v1-0-b7e9cbab9541@linux.dev> In-Reply-To: <20240220-b4-zsmalloc-cleanup-v1-0-b7e9cbab9541@linux.dev> To: hannes@cmpxchg.org, Andrew Morton , Sergey Senozhatsky , nphamcs@gmail.com, yosryahmed@google.com, Minchan Kim Cc: linux-mm@kvack.org, Chengming Zhou , linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708429476; l=2317; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=cqkPrPVAWUs+Ao8dP81X35doam5/5XwHmrqtbfkzja8=; b=fJGX+bZSZ9DmHcZLQStOZiyYVufKsK8+b2cCFX9z5c6zB+JgATrPXCCxaEuuk1J57ChPoEPcs Y8dHZRV9xLBDyR4EYl5pMCg/yarVPtVH/ac7GQz0+x5knNUdq0ZOH7g X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT From: Chengming Zhou We only need to update zspage->fullness when insert_zspage(), since zspage->class is never changed after allocated. Signed-off-by: Chengming Zhou Reviewed-by: Sergey Senozhatsky --- mm/zsmalloc.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index a48f4651d143..a6653915bf17 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -486,14 +486,6 @@ static struct size_class *zspage_class(struct zs_pool = *pool, return pool->size_class[zspage->class]; } =20 -static void set_zspage_mapping(struct zspage *zspage, - unsigned int class_idx, - int fullness) -{ - zspage->class =3D class_idx; - zspage->fullness =3D fullness; -} - /* * zsmalloc divides the pool into various size classes where each * class maintains a list of zspages where each zspage is divided @@ -688,6 +680,7 @@ static void insert_zspage(struct size_class *class, { class_stat_inc(class, fullness, 1); list_add(&zspage->list, &class->fullness_list[fullness]); + zspage->fullness =3D fullness; } =20 /* @@ -725,7 +718,6 @@ static int fix_fullness_group(struct size_class *class,= struct zspage *zspage) =20 remove_zspage(class, zspage, currfg); insert_zspage(class, zspage, newfg); - set_zspage_mapping(zspage, class_idx, newfg); out: return newfg; } @@ -1005,6 +997,7 @@ static struct zspage *alloc_zspage(struct zs_pool *poo= l, create_page_chain(class, zspage, pages); init_zspage(class, zspage); zspage->pool =3D pool; + zspage->class =3D class->index; =20 return zspage; } @@ -1397,7 +1390,6 @@ unsigned long zs_malloc(struct zs_pool *pool, size_t = size, gfp_t gfp) obj =3D obj_malloc(pool, zspage, handle); newfg =3D get_fullness_group(class, zspage); insert_zspage(class, zspage, newfg); - set_zspage_mapping(zspage, class->index, newfg); record_obj(handle, obj); atomic_long_add(class->pages_per_zspage, &pool->pages_allocated); class_stat_inc(class, ZS_OBJS_ALLOCATED, class->objs_per_zspage); @@ -1655,7 +1647,6 @@ static int putback_zspage(struct size_class *class, s= truct zspage *zspage) =20 fullness =3D get_fullness_group(class, zspage); insert_zspage(class, zspage, fullness); - set_zspage_mapping(zspage, class->index, fullness); =20 return fullness; } --=20 b4 0.10.1 From nobody Sun Feb 8 04:31:08 2026 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E2FB67A17 for ; Tue, 20 Feb 2024 11:44:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708429486; cv=none; b=VurmfXDYNqtW2V41oi9gokSJPKzf8Vj/wuXjKW0aaep3ucnCK6vBaoYzMtvzWxMRIamDyr0dr4HVeI5SQ/W/eE8nQ9bNpH6uR1zed4YYWvYVEmTw6QQupQ0pzz80oaP5up5yPNxHwQac1ebDqdWpQO8baE7hgi1ORj+/2TC5Eyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708429486; c=relaxed/simple; bh=BFuh+CfNDOzD1S00lsGqAqSSiu2o1MPg0aixlXGfmos=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V8nLM7uMa30viyjX1cqaCIWpunU2mX+KDLcm05XJAZ5FuAnhQtGkvX/mocAaSp0uqSq5/SemC+t4TBfwnc2eyN6PUOfHHnLfr4C259BaCgJDO1ktBfu6S+/GEUPzR9G1zooI1tgAkb+lkz3oVeCIig2QDl8vxjpFl10VZ6a0C2E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=g0nQyEhc; arc=none smtp.client-ip=95.215.58.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="g0nQyEhc" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708429482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=frGjyVgHupGD7XyoLjuBNXl6egeagHTj4tQawTxfLDk=; b=g0nQyEhc0uv+uyH42ziPQ1j9bhr8hQRZCCD1pT3uRaE0h01LgIKi7xFEjBfKNbh47w5tba emvlznq1s+LOnT3Lw9TXWIogMbzkBgFeeOLy8fgJ2ioyd72Q8p+oL3w56Dqvf7WbgzC07F xS30vIqd5dGOK4fSMvu6DsMCjzJH//c= From: Chengming Zhou Date: Tue, 20 Feb 2024 11:44:30 +0000 Subject: [PATCH RESEND 2/3] mm/zsmalloc: remove_zspage() don't need fullness parameter Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240220-b4-zsmalloc-cleanup-v1-2-b7e9cbab9541@linux.dev> References: <20240220-b4-zsmalloc-cleanup-v1-0-b7e9cbab9541@linux.dev> In-Reply-To: <20240220-b4-zsmalloc-cleanup-v1-0-b7e9cbab9541@linux.dev> To: hannes@cmpxchg.org, Andrew Morton , Sergey Senozhatsky , nphamcs@gmail.com, yosryahmed@google.com, Minchan Kim Cc: linux-mm@kvack.org, Chengming Zhou , linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708429476; l=2152; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=GQWspwGCFRIlLWu+jB/4L2Vh7hNigRDA/nhdzUelvTs=; b=HfKohdQBHsp+yH25vS97QDG5EljLYcLDRXNqctQwnwKj01ORLuWu4tU2UdBSKwG84P3sebhh0 +EDf/e7QoXHDzKOZQ3ztPMFYVZxHPOhdOxb/wSKcAv5ObGPWQggBTCa X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT From: Chengming Zhou We must remove_zspage() from its current fullness list, then use insert_zspage() to update its fullness and insert to new fullness list. Obviously, remove_zspage() doesn't need the fullness parameter. Signed-off-by: Chengming Zhou Reviewed-by: Sergey Senozhatsky --- mm/zsmalloc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index a6653915bf17..c39fac9361d7 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -687,10 +687,10 @@ static void insert_zspage(struct size_class *class, * This function removes the given zspage from the freelist identified * by . */ -static void remove_zspage(struct size_class *class, - struct zspage *zspage, - int fullness) +static void remove_zspage(struct size_class *class, struct zspage *zspage) { + int fullness =3D zspage->fullness; + VM_BUG_ON(list_empty(&class->fullness_list[fullness])); =20 list_del_init(&zspage->list); @@ -716,7 +716,7 @@ static int fix_fullness_group(struct size_class *class,= struct zspage *zspage) if (newfg =3D=3D currfg) goto out; =20 - remove_zspage(class, zspage, currfg); + remove_zspage(class, zspage); insert_zspage(class, zspage, newfg); out: return newfg; @@ -878,7 +878,7 @@ static void free_zspage(struct zs_pool *pool, struct si= ze_class *class, return; } =20 - remove_zspage(class, zspage, ZS_INUSE_RATIO_0); + remove_zspage(class, zspage); __free_zspage(pool, class, zspage); } =20 @@ -1609,7 +1609,7 @@ static struct zspage *isolate_src_zspage(struct size_= class *class) zspage =3D list_first_entry_or_null(&class->fullness_list[fg], struct zspage, list); if (zspage) { - remove_zspage(class, zspage, fg); + remove_zspage(class, zspage); return zspage; } } @@ -1626,7 +1626,7 @@ static struct zspage *isolate_dst_zspage(struct size_= class *class) zspage =3D list_first_entry_or_null(&class->fullness_list[fg], struct zspage, list); if (zspage) { - remove_zspage(class, zspage, fg); + remove_zspage(class, zspage); return zspage; } } --=20 b4 0.10.1 From nobody Sun Feb 8 04:31:08 2026 Received: from out-180.mta1.migadu.com (out-180.mta1.migadu.com [95.215.58.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D3C767C5B for ; Tue, 20 Feb 2024 11:44:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708429488; cv=none; b=hBQFwQa+TS7ZEH3HLkmO9i+mmYLllJH5YQ/5vkM9va8zPaPScyKeUiWpcM6jlOCwtFNLEelxKTUXDYzZlBUu0kMz0qOK5d9yapwGZxTPQ+7Uw/UuONRaj7xx3cf+X60R+Fl6jM7u6mU5UPxT8n+/iYNJ5EuQ9az+pkaqZei1Htw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708429488; c=relaxed/simple; bh=+hNOOnD6KYFH5W5qAnGzZngb3DqQxS5eWXbyLmHNF0g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CnBkASlfXkJz8mz1eUjPcKVur1/ZXT2FjB+lnWIgu0lS3V4grLim7uCAUAaxV/NmXC5jGWEVyNxHtB/BEmk2oXifNfryWM2BfeauqKz5bYXjGvv4W8ZeHpOPzBtH5/XhQUsBUeS8wLKi+DNqejtIzkAeAZ5ULZM8fYy4A6m9ljo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=sFquOSfJ; arc=none smtp.client-ip=95.215.58.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="sFquOSfJ" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708429485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ci79DiUWa7UnDzkerNUYQl6snYV1NrEQXPg7SGeMzMg=; b=sFquOSfJAfNaMCcn09Pz5sjO2zdozOZHHOKnWpE+LDSMzXP7F23EP9QanRL77oXcAT277F FC0SYpH2l+d3i9aCwXkf2Azx5DhAJIYgQhIpB19q7jstT7MPGibYDvOKlG4K6U8vBu87Ju bRtPc7aXmlSDbI5CnxSzfSZECVV6PY8= From: Chengming Zhou Date: Tue, 20 Feb 2024 11:44:31 +0000 Subject: [PATCH RESEND 3/3] mm/zsmalloc: remove get_zspage_mapping() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240220-b4-zsmalloc-cleanup-v1-3-b7e9cbab9541@linux.dev> References: <20240220-b4-zsmalloc-cleanup-v1-0-b7e9cbab9541@linux.dev> In-Reply-To: <20240220-b4-zsmalloc-cleanup-v1-0-b7e9cbab9541@linux.dev> To: hannes@cmpxchg.org, Andrew Morton , Sergey Senozhatsky , nphamcs@gmail.com, yosryahmed@google.com, Minchan Kim Cc: linux-mm@kvack.org, Chengming Zhou , linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708429476; l=2848; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=Xgdlm55CLoh7bhkT80TmmQFtvDTRQ4HP1+zxTxJBYgU=; b=6L4Rze0bnsKiqR9+QLqh2qD7BDtQUhtZu8ueGs9RPgzByahXpM+6pkTSsBD1omm7SA3abUFN5 ZTBlKgut6b+DoJxWVUkh0tjpPfx/6AV6Utfx4wSudSlGuNzInKTxDcM X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT From: Chengming Zhou Actually we seldom use the class_idx returned from get_zspage_mapping(), only the zspage->fullness is useful, just use zspage->fullness to remove this helper. Note zspage->fullness is not stable outside pool->lock, remove redundant "VM_BUG_ON(fullness !=3D ZS_INUSE_RATIO_0)" in async_free_zspage() since we already have the same VM_BUG_ON() in __free_zspage(), which is safe to access zspage->fullness with pool->lock held. Signed-off-by: Chengming Zhou Reviewed-by: Sergey Senozhatsky --- mm/zsmalloc.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index c39fac9361d7..63ec385cd670 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -470,16 +470,6 @@ static inline void set_freeobj(struct zspage *zspage, = unsigned int obj) zspage->freeobj =3D obj; } =20 -static void get_zspage_mapping(struct zspage *zspage, - unsigned int *class_idx, - int *fullness) -{ - BUG_ON(zspage->magic !=3D ZSPAGE_MAGIC); - - *fullness =3D zspage->fullness; - *class_idx =3D zspage->class; -} - static struct size_class *zspage_class(struct zs_pool *pool, struct zspage *zspage) { @@ -708,12 +698,10 @@ static void remove_zspage(struct size_class *class, s= truct zspage *zspage) */ static int fix_fullness_group(struct size_class *class, struct zspage *zsp= age) { - int class_idx; - int currfg, newfg; + int newfg; =20 - get_zspage_mapping(zspage, &class_idx, &currfg); newfg =3D get_fullness_group(class, zspage); - if (newfg =3D=3D currfg) + if (newfg =3D=3D zspage->fullness) goto out; =20 remove_zspage(class, zspage); @@ -835,15 +823,11 @@ static void __free_zspage(struct zs_pool *pool, struc= t size_class *class, struct zspage *zspage) { struct page *page, *next; - int fg; - unsigned int class_idx; - - get_zspage_mapping(zspage, &class_idx, &fg); =20 assert_spin_locked(&pool->lock); =20 VM_BUG_ON(get_zspage_inuse(zspage)); - VM_BUG_ON(fg !=3D ZS_INUSE_RATIO_0); + VM_BUG_ON(zspage->fullness !=3D ZS_INUSE_RATIO_0); =20 next =3D page =3D get_first_page(zspage); do { @@ -1857,8 +1841,6 @@ static void async_free_zspage(struct work_struct *wor= k) { int i; struct size_class *class; - unsigned int class_idx; - int fullness; struct zspage *zspage, *tmp; LIST_HEAD(free_pages); struct zs_pool *pool =3D container_of(work, struct zs_pool, @@ -1879,10 +1861,8 @@ static void async_free_zspage(struct work_struct *wo= rk) list_del(&zspage->list); lock_zspage(zspage); =20 - get_zspage_mapping(zspage, &class_idx, &fullness); - VM_BUG_ON(fullness !=3D ZS_INUSE_RATIO_0); - class =3D pool->size_class[class_idx]; spin_lock(&pool->lock); + class =3D zspage_class(pool, zspage); __free_zspage(pool, class, zspage); spin_unlock(&pool->lock); } --=20 b4 0.10.1