From patchwork Mon Sep 30 22:12:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kanchana P Sridhar X-Patchwork-Id: 13817147 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 9681DCEB2C9 for ; Mon, 30 Sep 2024 22:12:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F666280035; Mon, 30 Sep 2024 18:12:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A83928002D; Mon, 30 Sep 2024 18:12:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1482280035; Mon, 30 Sep 2024 18:12:30 -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 C19D128002D for ; Mon, 30 Sep 2024 18:12:30 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 701781204CF for ; Mon, 30 Sep 2024 22:12:30 +0000 (UTC) X-FDA: 82622804460.12.B94345E Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by imf03.hostedemail.com (Postfix) with ESMTP id 52CDD20005 for ; Mon, 30 Sep 2024 22:12:28 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=LvfGn5v+; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf03.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.9 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727734245; a=rsa-sha256; cv=none; b=CCAOC+2ceUdmg6RwqSjtLri4mIyVNCMbI1CVi9mDpLBvca8Uwr3R3YaiudgOckVsChMMAr Vb07iWCWG+pl1EC3YrNDR/M5yvKXVU5PNYIicoumFLvztAD/sSu6lfb7mTmQGOAAenCexg rBvacJylM1TCRkwOqsSQBDeLuogyIdQ= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=LvfGn5v+; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf03.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.9 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1727734245; 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=n3lpT5wzGF+b1pa3hoTUzlSMa9Vzwo4wZdujvqkC3ms=; b=ulxs+UzwYpPGynM55binXNlr5BdX0ukH/NBURg8U/ljq9ZOezNa+Zg86fmLcqAEzJeBVHC TCGp9VOOP7gW/XzVvo5/k6wBcExDc/sD6kq7B+Jx01eFMwqw2YSIpYLq2ZpnryFEkqnRLz eGteBhQTH83SfB2x+UIbDSAmYzcWFSI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727734349; x=1759270349; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fh13koWj73Qksnj2l+56lXO4bpj9lkhBiLj2Y16CgXI=; b=LvfGn5v+eu0POTua5fGZb8EsIiR4WyNRtrUHtaXvXhcHxDN/OojTZk2d 1Nqzu+GQ3J/N4Ht0MLkHU6a4iFAlpvQSaFtGlt5Q1N9Ws0lDZ6neSRXUk 5aDqM5491tO/Ax7xh42ULFKz0AzEAypQNKJ+J6Sp8IlZxeVBsXMvLg7Cz kpjugdR23SFE/C2QAr6Yzn6DFg/tRGpQYAKR+3+QU5/oUrRPWFbtLDTTg qHaLyyUcNHNBMsW6hejvpRgVONfrLiQmznnFTbsqWn6FrOZ57X+R8eKUB FDY3+tS/JyNPVfSRw6L8ttPytgSIDzFV+KZ1k13hVu8s2PHQTTPYMLuIb A==; X-CSE-ConnectionGUID: 6Lwptl01Sl2Gz4X3hg1LgQ== X-CSE-MsgGUID: HvB9vmV1QQSWcq11Z0+zBw== X-IronPort-AV: E=McAfee;i="6700,10204,11211"; a="49368437" X-IronPort-AV: E=Sophos;i="6.11,166,1725346800"; d="scan'208";a="49368437" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 15:12:25 -0700 X-CSE-ConnectionGUID: vRKOb2DBRnOhm6ekko/j6Q== X-CSE-MsgGUID: QaKdL+cPSRu5NCz+D5QRRQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,166,1725346800"; d="scan'208";a="77985589" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by fmviesa004.fm.intel.com with ESMTP; 30 Sep 2024 15:12:24 -0700 From: Kanchana P Sridhar To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, hannes@cmpxchg.org, yosryahmed@google.com, nphamcs@gmail.com, chengming.zhou@linux.dev, usamaarif642@gmail.com, shakeel.butt@linux.dev, ryan.roberts@arm.com, ying.huang@intel.com, 21cnbao@gmail.com, akpm@linux-foundation.org, willy@infradead.org Cc: nanhai.zou@intel.com, wajdi.k.feghali@intel.com, vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com Subject: [PATCH v9 5/7] mm: zswap: Modify zswap_stored_pages to be atomic_long_t. Date: Mon, 30 Sep 2024 15:12:19 -0700 Message-Id: <20240930221221.6981-6-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240930221221.6981-1-kanchana.p.sridhar@intel.com> References: <20240930221221.6981-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 52CDD20005 X-Stat-Signature: qr3gy89qhb5gszx6c6rwnk8y4bsodu5r X-Rspam-User: X-HE-Tag: 1727734348-367602 X-HE-Meta: U2FsdGVkX19Wz54EfBEwixeMdicB18jY3Wn9FdZTkkMlbFMABL+TIywuVgetKGO4kHhu7fDDWmz0xjVLDkVnO9gwdyCupixmcKsn+5GStggPJsgoy1rTys6gg5olB9yFwp3z6E0L/QZSLIZ6w8T+ErCJfPjWFT515lKnsJcC88oJRQfV6Ee6EJJ20w1nMz2P49zMMyWC+aWIljMPTI+HsSQ4d5e/lCyqS9z9AWeHec78LDpctdL0AZ9mGAu3AzuJvW7vVe54TGEc4H7PHZMPqDk08Beex/9gUYepu575f1Yt3z6OZwN80ZPIWryVw+/13WNNUdqaxPHD7G+L8eiTUKr1xsmRekBgHxwxolQvrbYLt06w89FfAXNWDc8XtMGuDVIm3wtZ7nHk+qn1bjmRuXLFXJH9fKWWsSFhX8R1ggu7HDdJOe/nU9YCqZsnyIgWDTpqSSzgqAl6gh/cdnPUiQ0m9xYNbvkvpn+ZBeUwEqcDNCOqgCX3T0LTG0jXtGnOX/PvYZ9rKfMS8AulnPKCTHdD+DB9niD+gHXSJ39Qg8FAbjuX3b0XAsSDPLEWnulF5WVDE4fioCSj59x9zsQhT54HKHeL/ts+a72GO3u38UrArH8bvYQQqQ99WSXcwM/ztEdd7T8KXxTfsx4RE7Lj31QGOvQPDlKqDIwDDCEjcHPfKWFxpyLqM7guYrt83IiRf7Aust/FzPheLJ1fJh9rFSmr8dnqR70hMa2DqZ9gDsgfLUmYAROfWQuJDT3NElWyT1NgIH19vMWKPFxdQivYtdiKr0zcfXmzxjhzaoqA9zIH6Bs7dPPc9OPJ2vI8plqgxNgX7M/ycWXI3V33VTpp11CmyeWULkzoQBjED4MTFdhgUrcQCGDvUXDKlNoD+rgbD88mI/MxHsY6mowPhbMalLQwQP42NzsU1D/h7RRgTQEh1La2CYF8TR0yWhxvW7FN461n3TPlNM780TGS/k7 Q0UXErMN 9MlbzSS/CzjK+Nn0uOeK42WOKGrzldLSGd8CfkpqKoUwR0/yo+S9VOimidertWmwRbFgA5ZDUP4frGG0yfhLuE298I33oR9S77lgH5MPWGaflLO48+0vp4uWicpKxIfM9+fUB1HJFxZQ06knPbbHccusRR2T4mIUWIZbwGTbDI0vnhK3BB3g3wXkbGPCWoM3Lb5+RE12ODBpt4Osy1yv5Wyi3ARDZumjudSya/KouZ+tehZvR2uMZ9S5HhqYQ9b+sk3/MsOKbdTXN17k+bDFtzsbrnHCU55YbNZ53oVRsluTvSbvFKLzoGIWm83Ov8l7UeDJ1FAlOwldGd9A= 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: For zswap_store() to support large folios, we need to be able to do a batch update of zswap_stored_pages upon successful store of all pages in the folio. For this, we need to add folio_nr_pages(), which returns a long, to zswap_stored_pages. Signed-off-by: Kanchana P Sridhar Acked-by: Yosry Ahmed Acked-by: Johannes Weiner Reviewed-by: Nhat Pham --- fs/proc/meminfo.c | 2 +- include/linux/zswap.h | 2 +- mm/zswap.c | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 245171d9164b..8ba9b1472390 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -91,7 +91,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) #ifdef CONFIG_ZSWAP show_val_kb(m, "Zswap: ", zswap_total_pages()); seq_printf(m, "Zswapped: %8lu kB\n", - (unsigned long)atomic_read(&zswap_stored_pages) << + (unsigned long)atomic_long_read(&zswap_stored_pages) << (PAGE_SHIFT - 10)); #endif show_val_kb(m, "Dirty: ", diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 9cd1beef0654..d961ead91bf1 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -7,7 +7,7 @@ struct lruvec; -extern atomic_t zswap_stored_pages; +extern atomic_long_t zswap_stored_pages; #ifdef CONFIG_ZSWAP diff --git a/mm/zswap.c b/mm/zswap.c index 69b9c025fd47..2b8da50f6322 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -43,7 +43,7 @@ * statistics **********************************/ /* The number of compressed pages currently stored in zswap */ -atomic_t zswap_stored_pages = ATOMIC_INIT(0); +atomic_long_t zswap_stored_pages = ATOMIC_INIT(0); /* * The statistics below are not protected from concurrent access for @@ -802,7 +802,7 @@ static void zswap_entry_free(struct zswap_entry *entry) obj_cgroup_put(entry->objcg); } zswap_entry_cache_free(entry); - atomic_dec(&zswap_stored_pages); + atomic_long_dec(&zswap_stored_pages); } /********************************* @@ -1232,7 +1232,7 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, nr_stored = memcg_page_state(memcg, MEMCG_ZSWAPPED); } else { nr_backing = zswap_total_pages(); - nr_stored = atomic_read(&zswap_stored_pages); + nr_stored = atomic_long_read(&zswap_stored_pages); } if (!nr_stored) @@ -1501,7 +1501,7 @@ bool zswap_store(struct folio *folio) } /* update stats */ - atomic_inc(&zswap_stored_pages); + atomic_long_inc(&zswap_stored_pages); count_vm_event(ZSWPOUT); return true; @@ -1650,6 +1650,13 @@ static int debugfs_get_total_size(void *data, u64 *val) } DEFINE_DEBUGFS_ATTRIBUTE(total_size_fops, debugfs_get_total_size, NULL, "%llu\n"); +static int debugfs_get_stored_pages(void *data, u64 *val) +{ + *val = atomic_long_read(&zswap_stored_pages); + return 0; +} +DEFINE_DEBUGFS_ATTRIBUTE(stored_pages_fops, debugfs_get_stored_pages, NULL, "%llu\n"); + static int zswap_debugfs_init(void) { if (!debugfs_initialized()) @@ -1673,8 +1680,8 @@ static int zswap_debugfs_init(void) zswap_debugfs_root, &zswap_written_back_pages); debugfs_create_file("pool_total_size", 0444, zswap_debugfs_root, NULL, &total_size_fops); - debugfs_create_atomic_t("stored_pages", 0444, - zswap_debugfs_root, &zswap_stored_pages); + debugfs_create_file("stored_pages", 0444, + zswap_debugfs_root, NULL, &stored_pages_fops); return 0; }