From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7C75C54E49 for ; Tue, 12 Mar 2024 04:56:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2CAC68D0014; Tue, 12 Mar 2024 00:56:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 27C258D000D; Tue, 12 Mar 2024 00:56:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 144438D0014; Tue, 12 Mar 2024 00:56:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F1AA58D000D for ; Tue, 12 Mar 2024 00:56:48 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C128240FE2 for ; Tue, 12 Mar 2024 04:56:48 +0000 (UTC) X-FDA: 81887176896.03.3B62C63 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) by imf03.hostedemail.com (Postfix) with ESMTP id E8EC82000C for ; Tue, 12 Mar 2024 04:56:45 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="wrx7O/+3"; spf=pass (imf03.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.170 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710219406; a=rsa-sha256; cv=none; b=4uLEuFZ+TIgzN/YrVh8lTIrYASh71qe2qqUPLSrQX65RBYEGsMcSqXCLKJNHNXHE3vYHxU YKkZzqGTq7+/UcNIgmElcrHJ4YUboHq3JpiZVSTeYzqy8UbhprQtdW3cVCtqG8SdpvtWbl fR+TyAxoC5ljzR035foIAngwQ/Q+coY= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="wrx7O/+3"; spf=pass (imf03.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.170 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710219406; h=from:from:sender: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:dkim-signature; bh=ZjdG0PtOxjtchDedrvDz9Mya7+ckepXI9cgYn3cZEtQ=; b=he92ENCi4Ly9nvMZto+0EfZ7EvMoirmToAXqsrU2CQp+KCTE/zxPS3HDhhtwngt0u2Rs0/ ABLEj5uhW2OIrkYOn4kZfYhqmaBZl6x4GnwoGi1WGkUMFNzPWjeSFaW1LrJRRWcTgr8RjR KrtPaF9lEDnwexbBAa4SaL92eVVFH08= Message-ID: <02886208-06df-4370-b0a1-6295b654bea2@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1710219403; 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=ZjdG0PtOxjtchDedrvDz9Mya7+ckepXI9cgYn3cZEtQ=; b=wrx7O/+3WGmpKxjSrJwL+tAIQeQh6DYEDgz6mr0ByLRlBUOlyx5q6AStc4k4GmkhLyHl78 QJoKuwN9FwpP4mPTaxP91IFqdYcTuBMT9T25nLm2RFIsO0Iu8bwAJGnvCFn7A5MMaK744X 0ykcakWwMcBNE4XbzmV84x5Z1rtlEHk= Date: Tue, 12 Mar 2024 12:56:35 +0800 MIME-Version: 1.0 Subject: Re: [PATCH 2/2] mm: zpool: return pool size in pages Content-Language: en-US To: Johannes Weiner , Andrew Morton Cc: Yosry Ahmed , Nhat Pham , Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240311161214.1145168-1-hannes@cmpxchg.org> <20240311161214.1145168-2-hannes@cmpxchg.org> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou In-Reply-To: <20240311161214.1145168-2-hannes@cmpxchg.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: E8EC82000C X-Stat-Signature: 4hsw4beyoxn4f1e99d5rxbnw94pg5cuy X-Rspam-User: X-HE-Tag: 1710219405-771558 X-HE-Meta: U2FsdGVkX1+H+705RwY36EsAMsuAcamWQRt/YCKHFRoTzmvOgq5CY9ZJHOeVJPsP1pM0lKXtxlnB/xegwA5zqrmX1+mKfB8QVYds9erKISgYdTMHlqNVmt+L5esv579mnn04EuBdcgoniFFO9O+qk43r/ICNqeHDoT3BCyTeznRq2d40nPMyeB/bQ4lch0/X4r4rwS2nNZCR80anszVRa0Qmdk2udwKN7lJx+qAYcthdozFulO9jidXAoH2V+rvAQMTngiclh8aq82Y78XyK1J3lBC+T/BP9alPgjCU1aHX54JMTsloF1QpMGedZYwiyQl82Plwa8o4cyKWxBowGBWuXSt7/YfqLVtIWxTuErzYEmFiutE3rF758yjJE09uLxcSqb6MTfnX7nxaR24Z/q5VTSRvK1lVOVCzdm/aLF1uqWGiZK0abJUqOEOZSsRkzTuXAPX2lvzzH1WH3o9lefKYy/ixod0hKjYrRZgba7/EGc0vZqlylKHxB+6gPHN866Q7Rcjzpj5VvPtVN6UWPbALo+3TaLP1p0K0PkmRajexbZA+okIymNm6bjNQSr5QiYGPWQ8aFaXYDCIBhmNGJOrsTOC5qIDwsvz1af/5O/EGFHETC2C5aUHZA0XE6whqFc3ojwF712JiBLRr4nPwwEbeLlNupX/bZ0eOjGJ5BW75Cv0DBLVOhTCY27NiIqRxFff8zTDaa1x1WXYU7+7e12u7N/f7tfSzEHR1i7qM8rCWc7dAv/emYtXML07P+7d1bk4RsFYPDd2R9Go/Ai4oeDadyy8JhsJTRJmZSJ89LPkg= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 2024/3/12 00:12, Johannes Weiner wrote: > All zswap backends track their pool sizes in pages. Currently they > multiply by PAGE_SIZE for zswap, only for zswap to divide again in > order to do limit math. Report pages directly. > > Signed-off-by: Johannes Weiner With the incremental diff, feel free to add: Reviewed-by: Chengming Zhou Thanks. > --- > mm/z3fold.c | 2 +- > mm/zbud.c | 2 +- > mm/zpool.c | 4 ++-- > mm/zsmalloc.c | 2 +- > mm/zswap.c | 4 ++-- > 5 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/mm/z3fold.c b/mm/z3fold.c > index 7ab05621052d..9bacacd4168c 100644 > --- a/mm/z3fold.c > +++ b/mm/z3fold.c > @@ -1404,7 +1404,7 @@ static void z3fold_zpool_unmap(void *pool, unsigned long handle) > > static u64 z3fold_zpool_total_size(void *pool) > { > - return z3fold_get_pool_size(pool) * PAGE_SIZE; > + return z3fold_get_pool_size(pool); > } > > static struct zpool_driver z3fold_zpool_driver = { > diff --git a/mm/zbud.c b/mm/zbud.c > index 2190cc1f37b3..b7d8a22bbf5f 100644 > --- a/mm/zbud.c > +++ b/mm/zbud.c > @@ -412,7 +412,7 @@ static void zbud_zpool_unmap(void *pool, unsigned long handle) > > static u64 zbud_zpool_total_size(void *pool) > { > - return zbud_get_pool_size(pool) * PAGE_SIZE; > + return zbud_get_pool_size(pool); > } > > static struct zpool_driver zbud_zpool_driver = { > diff --git a/mm/zpool.c b/mm/zpool.c > index 846410479c2f..410808aee7fe 100644 > --- a/mm/zpool.c > +++ b/mm/zpool.c > @@ -324,9 +324,9 @@ void zpool_unmap_handle(struct zpool *zpool, unsigned long handle) > * zpool_get_total_size() - The total size of the pool > * @zpool: The zpool to check > * > - * This returns the total size in bytes of the pool. > + * This returns the total size in pages of the pool. > * > - * Returns: Total size of the zpool in bytes. > + * Returns: Total size of the zpool in pages. > */ > u64 zpool_get_total_size(struct zpool *zpool) > { > diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c > index 7d7cb3eaabe0..398f3856817f 100644 > --- a/mm/zsmalloc.c > +++ b/mm/zsmalloc.c > @@ -401,7 +401,7 @@ static void zs_zpool_unmap(void *pool, unsigned long handle) > > static u64 zs_zpool_total_size(void *pool) > { > - return zs_get_total_pages(pool) << PAGE_SHIFT; > + return zs_get_total_pages(pool); > } > > static struct zpool_driver zs_zpool_driver = { > diff --git a/mm/zswap.c b/mm/zswap.c > index 7c39327a7cc2..fe4343e416e0 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -507,7 +507,7 @@ static unsigned long zswap_max_pages(void) > unsigned long zswap_total_pages(void) > { > struct zswap_pool *pool; > - u64 total = 0; > + unsigned long total = 0; > > rcu_read_lock(); > list_for_each_entry_rcu(pool, &zswap_pools, list) { > @@ -518,7 +518,7 @@ unsigned long zswap_total_pages(void) > } > rcu_read_unlock(); > > - return total >> PAGE_SHIFT; > + return total; > } > > /*********************************