From patchwork Mon Mar 11 16:12:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 13588994 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 AA05EC5475B for ; Mon, 11 Mar 2024 16:12:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1EB6A6B00BC; Mon, 11 Mar 2024 12:12:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 19C116B00BE; Mon, 11 Mar 2024 12:12:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D83B46B00BC; Mon, 11 Mar 2024 12:12:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B76D56B00BE for ; Mon, 11 Mar 2024 12:12:25 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8752E1A0194 for ; Mon, 11 Mar 2024 16:12:25 +0000 (UTC) X-FDA: 81885250650.15.77DFFC7 Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by imf14.hostedemail.com (Postfix) with ESMTP id B485410001D for ; Mon, 11 Mar 2024 16:12:23 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=C3VF8snI; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf14.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.160.173 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710173543; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5Tw6Rxk9uZE/KG6yDJZXgFMWxZfv7cDqR1jIP/xjev4=; b=mnbS0iOQEksOTbKStk/dAb6UTFT9NH/GgEdV1MicfvpLBziNieH5XYlcVBfXWQp7SGUpTk aZ2x9xlJm93EN7g5GsPbZEBZdXjg306/2JaCMF53UF/X3MObmf+bIcjUyRkZxgB7dNGggz r8q8pUr03J/7/q1Ui9HppKiQN75Co6Q= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=C3VF8snI; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf14.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.160.173 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710173543; a=rsa-sha256; cv=none; b=yeigGaZdPzHtHBazAxjJapc0bDYck0bOKBP0a1WZRt7cmV7eQRlhDQkBISIxCfHuxgTD4S 200tRhA2ySevzep+7TqmvnyZXeIJXBbHWqQF59Xqzy1uyK62TftSp3VRyLQxUskh6ZR0EA mijOt+9hKBgGXRQGG8i6a6so/EgeEr4= Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-42ef1822b07so20132591cf.0 for ; Mon, 11 Mar 2024 09:12:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1710173542; x=1710778342; darn=kvack.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=5Tw6Rxk9uZE/KG6yDJZXgFMWxZfv7cDqR1jIP/xjev4=; b=C3VF8snILule/XIB01qHWhLxelOY8pZNIpmWykeelJZkrI2svo9zVhoGb2skDlDWTb 6O9wqwLRniSi0xoIWQvMwqXC8+9FKUoMD5i3eLdZpu29YwSz8VaKRuENpTOlQ9Pzjho4 RD83NkRYdQ1afvkjsfHUopOWC/g4h9fGkSTxEQ+brZlFIVeaZ34kIVvHIIuHcveX3K7l 4st60Q4jXO8wS5nQ45i01tBq54UNhkerZujByYRLT//DTaGWY5ovZDifPdMZMXB5x4OQ 3a6xqmhTHnmjmYQ38q6K0sSCX2gl48EYyH8xUJNQUBz7d90t3Ygpz1kyUzQ2xzf8VIDk X1ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710173542; x=1710778342; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5Tw6Rxk9uZE/KG6yDJZXgFMWxZfv7cDqR1jIP/xjev4=; b=JaDuLDRgxr7S/yNnfaO+mT4T909I5gHhc2ffiUOFcB77bw/BYOVVcYb3E8fqeibVSo +KlycXfrayAun1wdgB8UjY+r149vVQ9rln5HhlkVL8Zhy//kXWOQ8utbNAldc0oSVGQI aJ/PQCPjeoVZL6dJWsjSh5JLLXYsqy19RCwPFQW0vcu+QCtYFGuDTqrH1oS1Igx1gtBC PpJLfQ+dH10EK67qnnm0S9Ms3/G7Cbfqpf+yF/JfM29TcbfCar/1QsInsaBbSi/Rfv+j yXtWT3e4D4/hskGjfi9dlZEBhrj3tuNjvH1fEP+qJ6YgdQLY1sitiGbboYvjxp4DMlKN WVXQ== X-Forwarded-Encrypted: i=1; AJvYcCUPwHsJSY6Tq2zrxJus04BNLObvlSCH4DOZDKW57nZsVbIeAq6lW1zV816BSJ2V3Ht2eq8w7EIW46TeMRXr0mcBmSg= X-Gm-Message-State: AOJu0Yw4edS40LPwl+i+ikuYheAzqU1a/DcFlAtpUJraD7n+GhUWIoh0 UTWjxLH8+V4+JPUYUANPMVtyCjk7k1O8VSJzOd31oRJB4rJEXxAbfz5BvLHm4Ss= X-Google-Smtp-Source: AGHT+IGlq1xhGzojJ3qUchJop6FyehdDDMXdXQh+GuKAfRx5DKp0dyumWzTYON2PFURV+VnQeVQ6Ag== X-Received: by 2002:a05:622a:50e:b0:42e:f6dc:bc7d with SMTP id l14-20020a05622a050e00b0042ef6dcbc7dmr10259718qtx.65.1710173542735; Mon, 11 Mar 2024 09:12:22 -0700 (PDT) Received: from localhost (2603-7000-0c01-2716-da5e-d3ff-fee7-26e7.res6.spectrum.com. [2603:7000:c01:2716:da5e:d3ff:fee7:26e7]) by smtp.gmail.com with ESMTPSA id jr18-20020a05622a801200b0042f01e612bbsm2839309qtb.37.2024.03.11.09.12.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 09:12:22 -0700 (PDT) From: Johannes Weiner To: Andrew Morton Cc: Yosry Ahmed , Nhat Pham , Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] mm: zpool: return pool size in pages Date: Mon, 11 Mar 2024 12:12:14 -0400 Message-ID: <20240311161214.1145168-2-hannes@cmpxchg.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240311161214.1145168-1-hannes@cmpxchg.org> References: <20240311161214.1145168-1-hannes@cmpxchg.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: B485410001D X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: oj93gfps9pegwarqkyncgkoinbg6i4fe X-HE-Tag: 1710173543-281204 X-HE-Meta: U2FsdGVkX19IcKCMQdCIJMQLBqB+lcVaC0+dq6O2k44UEPW9es7yuVxWo4aLXgzJh2Lg60mtqz+2Io/SsXijDxZxtN24HMcf4gorp+/zwdJqkan0ceTlN7Y2a0MrM19MYrC2mDUK4hHnD5YYkCphDXIseVUzZNAUkx++tEAWiNxqL/zAW+jr27CQVhHYdDj9yBkr0qqmcGcuD1bX9pWthR3p3XXrG/V4KwcjxCbhxMcol6YfrRZTl4EOHarc+RBxq72k/HJMg7+1CTv4NXP+R0pG6HkohE2TGgv6tPJPQ7YJ2XsWI27R6I6uwqCMWoILWNirA6avsbbXnzLCjG6suLqCJgmnjg9AKd4Kho4Lnxqrp8Boh5WhyHjIfoowhS5OK265MsCiSgncRv9gK5Zq+SheNYFhS7Ctuzw2V/mulkxsBSfTRflAbowHHYV/l6LOm1RQE8yvmeJflnaDCPC60GaC916sqCKXl8Gpl0Br5woKfi0qbncLWuMvGsZBJMUeolduXMe3Yy0DLaeQs2sP8Y3v309Sk+4eCgIAr96QW61GCNOpIYCOpNmHYLD9xbxmFRMS4frYuopUOjo/Kq9dZ9Lpp6umfwf7Ss2ThtTShjJA7JzHqrVWtHn1lQlAuCmNweMRDVe7nMVcHhxQS5IrvhRaH/PuCv5Uox8ZJT0B3WnKcL6DloVi7S3UvHmaEV/8Ih1wFokcjsB0GK8U5GyGP9x+cduUKTYFBB11bPJRiZuDO8Vh6Y7m3F5RK0+S4sp3Rv2saumah1MS26yRk4YONjxhYy7sYUE9ma4wN4TBKkvzYSZq5AozF0BZn4kWrPWFPhbXIz+Cn9HrCB0rLu2OYpUcoDAh75yCuJtMs6N53wP9RrtN8yIGD1LwEIQYZA3FJF/m4wgRkZ+ak2j3CRbdYU2HOJ0BNdx5Cz65Lhr6/Bt7wpSqv2SFWt6YeFH3un06b24/cEniqZOOu81TGYv tQqqejAW fLL3amOE0JV1oOEShH/5chbwShfPmZa/o03ZCUhG1FqOX6Rc8mw0lipND5xq0y+twWiPXaNqJyD/xbXr+h8bhz/sjmFu/GuNIudMQX/Wnct6tCD9yJdHaVRwlFvrDWmfk6w7tbQS/+53wrwc69g6plHOJFQcvbzxrIJe4f8V7F8EKUKk= 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: 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 Acked-by: Yosry Ahmed Reviewed-by: Chengming Zhou Reviewed-by: Nhat Pham --- 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; } /*********************************