From patchwork Thu Aug 29 21:27:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sridhar, Kanchana P" X-Patchwork-Id: 13783907 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 3C875CA0EC0 for ; Thu, 29 Aug 2024 21:27:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A7D966B0089; Thu, 29 Aug 2024 17:27:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A08526B0092; Thu, 29 Aug 2024 17:27:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 833566B008C; Thu, 29 Aug 2024 17:27:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 0E8706B0089 for ; Thu, 29 Aug 2024 17:27:14 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C01974095A for ; Thu, 29 Aug 2024 21:27:13 +0000 (UTC) X-FDA: 82506568746.28.97CC936 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by imf19.hostedemail.com (Postfix) with ESMTP id A7EF11A0007 for ; Thu, 29 Aug 2024 21:27:11 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=OuMRmqgI; spf=pass (imf19.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.19 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724966787; 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=RTs+0Yqd8sZSHUC6ky5gE4k/LE5LQXAWkMtzsx0yAMU=; b=sTImh7z9FFxBUXk4X3aXyRm1QTVAb1bY+8mLSBanxlcM6dYfva3gZlzdUiLBD+tus0tzlg 70p5mLiMLnr4tYJb89w5gGgP4NFQw+7/Xd2NJuzt9J0GX3mF//ko1tQgkp1xM/AOxaOSKR gxOUeorDHNMJqL9BtCXi8ySk60/lO4M= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=OuMRmqgI; spf=pass (imf19.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.19 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724966787; a=rsa-sha256; cv=none; b=X/hNjxduPwgSE7AMtO38sviSg6kWy4P+3hE2JDLcKQHGz6EFTjeTnu50vXPdKVWD6gzuFo 36Wiq63AxpkJzZBBs+A9NtoZO9KMfjJvbP3d3phcRwIgRGQwk7J0zsXkRGRq5ZSweVvYBL U8Z2rt6WDjduvdqiidzCjlyxrXKqJAY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724966831; x=1756502831; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=j6MRHvvdb4Y/ecSm2gb8TOi+Txe+Ci0dZeAdkAYjrOU=; b=OuMRmqgI/YOxW/k4xA205EJGFaHzqc8ZYt/zTJzY0kLKCTdYbvRRe+OC ZIH7RnmBsFyBGEmFUm6axrLXuQMAR1owUT+rnTK9OkSvWwHnAWeedBcr4 Aoztih4FNU5PMVniCe9E25/39NHg6xu8dRhR/Ah8ZmJgN6rW27HJSVRdS 1fo8xU5AvBSCGj34ec1/9IBMOgfhwvgsVueyn3Qr7fbcXjL1JY0Uj5nAQ xZoLyYC4wsd1wn4g+eMIbe72a6d5dgtP0oY9c5j4WYpF7HHfJhiF7LvSM 0T2fIA/limKmJiX8TgEoj90DiPzbm/wlLs1JoYyJ+HUfENGl18u4qgm72 g==; X-CSE-ConnectionGUID: mQz6G680TKWZlaijJ08Xkg== X-CSE-MsgGUID: DbN2NuTHSL+xPMsOZzHt6A== X-IronPort-AV: E=McAfee;i="6700,10204,11179"; a="23455197" X-IronPort-AV: E=Sophos;i="6.10,186,1719903600"; d="scan'208";a="23455197" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2024 14:27:06 -0700 X-CSE-ConnectionGUID: 4beK6VF2R0i5a3dChDlt9Q== X-CSE-MsgGUID: hxyTs7R9S0yeZGOx0Drw4Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,186,1719903600"; d="scan'208";a="68365406" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by fmviesa004.fm.intel.com with ESMTP; 29 Aug 2024 14:27:07 -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, ryan.roberts@arm.com, ying.huang@intel.com, 21cnbao@gmail.com, akpm@linux-foundation.org Cc: nanhai.zou@intel.com, wajdi.k.feghali@intel.com, vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com Subject: [PATCH v6 1/3] mm: Define obj_cgroup_get() if CONFIG_MEMCG is not defined. Date: Thu, 29 Aug 2024 14:27:03 -0700 Message-Id: <20240829212705.6714-2-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240829212705.6714-1-kanchana.p.sridhar@intel.com> References: <20240829212705.6714-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: A7EF11A0007 X-Stat-Signature: udadi185qmoozaeistchkcxw3ecmaqkm X-HE-Tag: 1724966831-24401 X-HE-Meta: U2FsdGVkX1/Thk8UyKtwkfD6ZMmai4HvfsySGlq9ebYOH/bNdxl5uvOlFjmVqwKJf9odtGCHuVG8R7wCxZj84/riE/KdxeaE7Nf/Is2zz/3F3aI4VEsTXRcs8lSfWsyHpS07HbFdk9s2+q+Jlm4GnxEQOpT/IEOlmpXJf99BvtVsa6I1OT4f6ZVT8w8pv303hUlvyRfZwBEU3JUV9i2cB2KxgVRDp2XAW3AXipH5DWz4ZjY5gj6R00HfdMz5QQAv4J4G3Y7r07P24AmRyFGHnGXXdp+ziEOLtMfqhcQmkG1lwP8VS4xDFbiqgnMvNFDgAFYTn3SjJRCssS7919rUNueCfUYWXhF9LSgMsTgF8DzTJUHOa8C6XvF4su/eHDtPnCE6tN4BZqi/6Y9WELLNb2e2bxWei96qx444bui1Lb5OrNpzbdcHVRLXMbBHXMcmypQdjh/glj29aKpcpKC/AH2emBK/p/DIx6xRYb7s+NRlZ459wcK35cvhoadG+UYDX8gx8WTje3DoNq6f83b1pmO5f9ld9YD9zPFMDKAVhmI3Akf2h2fRaAnqGLivMLj4EOqBKrbNhmTEzQkz2JnpOxSaKKAwnP+T9okgD17nsXn+CaD8ooW+hRGXhhYRBbykWK65RZidOZ9UiH+l2HlgkMO5z9W8MAuvtrG7ptpZKxIKC2A02mIoF0/PM1RBvIwSp+niAs0LnM2AuIieTRR3uW1+INdQiSbbM5VV6qzX6r+bgugFDDd+NppckZAI1odIva1McDExAwFtrOEnk7IApnwUZMTJKVI40zOgl7c7rw1ei4QJYoMVtScsDUgj8dfJC1/Tz5re7cUv9blOkPNcVdKnkxBHsEdRWdRH7zuS0+DHtE8BqzawkayW7L6KRp/6D9sfl8l00zE6SMYqHm+p6jSuk1ugDjHbPwp0FxGFzXiFhVc90njTWJRbdZrGqC0JSOxUouYY5caeFE+2pcg 8Cuo9mz9 6ERoJFDO9ZtqDlHs4ccaCMDDHV6GWF9obOpity3tyze4LtOcieGFyXt4Y9PvvqHkFU6AcHRXAppM0DTCUEixJOdkSkvXnC/JOCTFtjVjH3MzLSOxDxmkXavSc0vfr0IOClsmjmDkSw7xBe8pikMJfR2MbQ683Ut/Cqa+3vuptVmrEhHiP/qUYXKDXXuhEYGpGzwkDACdldCrSR3FqOb7jtVRiCYOiyHHI6VWn 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: This resolves an issue with obj_cgroup_get() not being defined if CONFIG_MEMCG is not defined. Before this patch, we would see build errors if obj_cgroup_get() is called from code that is agnostic of CONFIG_MEMCG. The zswap_store() changes for mTHP in subsequent commits will require the use of obj_cgroup_get() in zswap code that falls into this category. Signed-off-by: Kanchana P Sridhar --- include/linux/memcontrol.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 34d2da05f2f1..15c2716f9aa3 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1282,6 +1282,10 @@ struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css) return NULL; } +static inline void obj_cgroup_get(struct obj_cgroup *objcg) +{ +} + static inline void obj_cgroup_put(struct obj_cgroup *objcg) { } From patchwork Thu Aug 29 21:27:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sridhar, Kanchana P" X-Patchwork-Id: 13783906 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 65D40CA0EC3 for ; Thu, 29 Aug 2024 21:27:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CED656B0085; Thu, 29 Aug 2024 17:27:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C4EF36B0089; Thu, 29 Aug 2024 17:27:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2C1F6B008A; Thu, 29 Aug 2024 17:27:13 -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 7F9246B0085 for ; Thu, 29 Aug 2024 17:27:13 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 36A7D4095A for ; Thu, 29 Aug 2024 21:27:13 +0000 (UTC) X-FDA: 82506568746.07.4231E8C Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by imf05.hostedemail.com (Postfix) with ESMTP id F348E10000A for ; Thu, 29 Aug 2024 21:27:10 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=USWB241l; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf05.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.19 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724966758; a=rsa-sha256; cv=none; b=2Dz7ediAD+TADD9lmux9XNcIzkYUaQo2oEQqaqbH/azsBUOzLtvVNvo0hz82TJBBQZ+BMM DapR6Uv20NR1EOxTjVylwk3NXQLrTTjSWsM1X6xqgZH+HBF38zGNtK6c4M8M+UOalCt1v7 8+mTWKFZc0mD3JO1RE9HuBcPLRx57/Y= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=USWB241l; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf05.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.19 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=1724966758; 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=UDyE1KjDku/Ybp/8F8dLEQ5xCfVspMZTl9BatQi7hS0=; b=NG5HI+WZpJI6gau8oUXWC/yFKxUeUohAyJLZb29QUzWBhNWJ5GKQy5gpK0jfrdfLTN07Z/ JeFlZD6WZOhC2wPhnUz/AzWdpYsmpWarKxZj3aqOnCnA7twuZOJJQGfLKH32JKLACfGzMY 6aVBX6EAjyMcx40VuugSEolN4SPFWWU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724966831; x=1756502831; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6EhVswtz+uG6/dXjn2+38nfc2htFmusqJ6NkmakNhhw=; b=USWB241lTIsqB6JbJcdUMa9ZzU754xJm9pXh/LKWsgS8a1NpNqn+TNpo dQWn+wdFpIZQORWaCW+jNuouLhwrdaqjmea6FgwClGGPMqi2K2yWWEFAv vubolqB0fCpOqC5IxTSteBrgTr+S6NWADMRzngAzcUX8KzaV4cGcVWLzZ gdTOuJ1kv3fx9GgwuOGBMdYxa7XZga4tbWyatfF9df3X59Z3RTQB2x7Si bpkHzfepaPx9l5n5awGL0p9P5diW1zsTfwQrG+JToNVMZ9vYP5EfgcmWF mGMNU0Ls86+kdLhzwCTTcFEezIu4oRbNXjqDDaI2pNW1l8imsLWZKIr1H A==; X-CSE-ConnectionGUID: e2BPz3cQSNOONJHFTC6PWg== X-CSE-MsgGUID: xz02o6H/ST+MjxzVRiK6kA== X-IronPort-AV: E=McAfee;i="6700,10204,11179"; a="23455203" X-IronPort-AV: E=Sophos;i="6.10,186,1719903600"; d="scan'208";a="23455203" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2024 14:27:06 -0700 X-CSE-ConnectionGUID: sKnEnZBoRmSnmD+FyQpgfA== X-CSE-MsgGUID: +YscVSNcSHqF9BTCZUwZkQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,186,1719903600"; d="scan'208";a="68365412" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by fmviesa004.fm.intel.com with ESMTP; 29 Aug 2024 14:27:07 -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, ryan.roberts@arm.com, ying.huang@intel.com, 21cnbao@gmail.com, akpm@linux-foundation.org Cc: nanhai.zou@intel.com, wajdi.k.feghali@intel.com, vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com Subject: [PATCH v6 2/3] mm: zswap: zswap_store() extended to handle mTHP folios. Date: Thu, 29 Aug 2024 14:27:04 -0700 Message-Id: <20240829212705.6714-3-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240829212705.6714-1-kanchana.p.sridhar@intel.com> References: <20240829212705.6714-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: F348E10000A X-Stat-Signature: p6wdp4bterq9t4ubi747b3af5u6wbsmq X-Rspam-User: X-HE-Tag: 1724966830-413516 X-HE-Meta: U2FsdGVkX1/ssAvh7IR94emIec+vxck5AJ8Hv49dpRNBZ5dmyz/LZDqfJqZtLBR5gjuGdTVwCoFkBCnqbSMrQMQqjTbmquq2565tNn6ZXzTrmr8FMFIiQTg43r5demofzQ8NaqYxRaYFmaZbU7E8r6j2TBci5kwTbVA1OkZfYsHgNDbXDx+QJeaacxsuCLDPjYN1FLFLJRduP7QDshiuXEFqw3tIxfRDhuLDXaF9uplDJYSdb8VaSWE7ilHAhDrcvy5lypbREIaR0XcSzP/DiqO94PTMI3VwsUtRl97gXf/m8Rvif+//pgMHd0MOrFWdLg2+L9M9g2LqiBMmRsOkDRhNH6UT3VhuHKDri/4qEKqDStfKxCX6H6Z+Ixns3VnEH7K1+3b/9hcx2SWEkq9+rIThDu07qmvLg9OVq3JqjEFdX3ChY7anL7FpGlg2XBSyxZ7g5mjJc6uKA+ZqpXQfkSnAbgE7Vgh2dzkN/yQMszcXu/NhA1Kjdv4D/rQc1xLB/n2JKHSbEHxAQZrSEEijFeAEwrkPiBUe+SQFQmq4QNmiOFatRHzCF5/ToSFdabPBTYb2E+BhrQhNJMT9T34INV99Ghsa6+gnEfelIRXikQURdDuqSIcmVI3SSasoVbbvxPzT2PeFW8b3nAXWfhHz6OjZ117AoJWBvAvXW4cV3dsDxZ0uQgsiAN2m5+0RRPXAX8/TSWJcEqBP5fWYxM39bPqmN27ZFwB7P+G/9fN+n4ygxN78SW5WhnefPwe7Fl1ci8Esf6NiywGo2vrjy63aG+BmdVbbO4m9o6iG95TmV6TliuNjCVZdKl8nV9mdq2ueZJuFceB2K8vfYPT1uarX6Lwl7CQZ1ZkKgu4H67QNbrN9w59LsM1wgidcd70L+uBhHvPC5pA3sY/IgqPjZlbTDgoyXT9OYwQdlqvx6tF30IkyuJtvWwTQK+uSoi45ohxjL+xkvWHq39SxOgn/Ndv gjm8LScd Ic9mq8GoAtz4DV4ceV9A3n+gWEK0SvSvQ9Smud1W7i3a0gM4rzqnAnVWlq+qRB+yGQQatXiUE4CH0Otw0wMNDbVK/m+o2VgAFosXMAjR3arJ0iehvm11psRGyOCJ6/XcZC/pe9htKPpAU8cIqNGZSTijLQovLOJzQwT//lH7NYg+Wc4Tc3Y681eXz3zuxoBQ9pT8KFeimXBXCliH6c1nPPp+MbowNUkEAnQxUEKtMma2+8VtyTEORfyAgN/NrsrWGtZLhWk087nn9HClHh+wxQmc7xKIoqytnfSlWfrmrUTDF1yQhyBaYAuudHQ== 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: zswap_store() will now process and store mTHP and PMD-size THP folios. A new config variable CONFIG_ZSWAP_STORE_THP_DEFAULT_ON (off by default) will enable/disable zswap storing of (m)THP. This change reuses and adapts the functionality in Ryan Roberts' RFC patch [1]: "[RFC,v1] mm: zswap: Store large folios without splitting" [1] https://lore.kernel.org/linux-mm/20231019110543.3284654-1-ryan.roberts@arm.com/T/#u This patch provides a sequential implementation of storing an mTHP in zswap_store() by iterating through each page in the folio to compress and store it in the zswap zpool. Towards this goal, zswap_compress() is modified to take a page instead of a folio as input. Each page's swap offset is stored as a separate zswap entry. If an error is encountered during the store of any page in the mTHP, all previous pages/entries stored will be invalidated. Thus, an mTHP is either entirely stored in ZSWAP, or entirely not stored in ZSWAP. This forms the basis for building batching of pages during zswap store of large folios, by compressing batches of up to say, 8 pages in an mTHP in parallel in hardware, with the Intel In-Memory Analytics Accelerator (Intel IAA). Also, addressed some of the RFC comments from the discussion in [1]. Made a minor edit in the comments for "struct zswap_entry" to delete the comments related to "value" since same-filled page handling has been removed from zswap. Co-developed-by: Ryan Roberts Signed-off-by: Signed-off-by: Kanchana P Sridhar --- mm/Kconfig | 8 ++ mm/zswap.c | 243 +++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 190 insertions(+), 61 deletions(-) diff --git a/mm/Kconfig b/mm/Kconfig index b23913d4e47e..68c7b01120bd 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -59,6 +59,14 @@ config ZSWAP_SHRINKER_DEFAULT_ON reducing the chance that cold pages will reside in the zswap pool and consume memory indefinitely. +config ZSWAP_STORE_THP_DEFAULT_ON + bool "Store mTHP and THP folios in zswap" + depends on ZSWAP + default n + help + If selected, zswap will process mTHP and THP folios by + compressing and storing each 4K page in the large folio. + choice prompt "Default compressor" depends on ZSWAP diff --git a/mm/zswap.c b/mm/zswap.c index 449914ea9919..3abf9810f0b7 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -127,6 +127,14 @@ static bool zswap_shrinker_enabled = IS_ENABLED( CONFIG_ZSWAP_SHRINKER_DEFAULT_ON); module_param_named(shrinker_enabled, zswap_shrinker_enabled, bool, 0644); +/* + * Enable/disable zswap processing of mTHP folios. + * For now, only zswap_store will process mTHP folios. + */ +static bool zswap_mthp_enabled = IS_ENABLED( + CONFIG_ZSWAP_STORE_THP_DEFAULT_ON); +module_param_named(mthp_enabled, zswap_mthp_enabled, bool, 0644); + bool zswap_is_enabled(void) { return zswap_enabled; @@ -190,7 +198,6 @@ static struct shrinker *zswap_shrinker; * section for context. * pool - the zswap_pool the entry's data is in * handle - zpool allocation handle that stores the compressed page data - * value - value of the same-value filled pages which have same content * objcg - the obj_cgroup that the compressed memory is charged to * lru - handle to the pool's lru used to evict pages. */ @@ -876,7 +883,7 @@ static int zswap_cpu_comp_dead(unsigned int cpu, struct hlist_node *node) return 0; } -static bool zswap_compress(struct folio *folio, struct zswap_entry *entry) +static bool zswap_compress(struct page *page, struct zswap_entry *entry) { struct crypto_acomp_ctx *acomp_ctx; struct scatterlist input, output; @@ -894,7 +901,7 @@ static bool zswap_compress(struct folio *folio, struct zswap_entry *entry) dst = acomp_ctx->buffer; sg_init_table(&input, 1); - sg_set_folio(&input, folio, PAGE_SIZE, 0); + sg_set_page(&input, page, PAGE_SIZE, 0); /* * We need PAGE_SIZE * 2 here since there maybe over-compression case, @@ -1404,35 +1411,82 @@ static void shrink_worker(struct work_struct *w) /********************************* * main API **********************************/ -bool zswap_store(struct folio *folio) + +/* + * Returns true if the entry was successfully + * stored in the xarray, and false otherwise. + */ +static bool zswap_store_entry(struct xarray *tree, + struct zswap_entry *entry) { - swp_entry_t swp = folio->swap; - pgoff_t offset = swp_offset(swp); - struct xarray *tree = swap_zswap_tree(swp); - struct zswap_entry *entry, *old; - struct obj_cgroup *objcg = NULL; - struct mem_cgroup *memcg = NULL; + struct zswap_entry *old; + pgoff_t offset = swp_offset(entry->swpentry); - VM_WARN_ON_ONCE(!folio_test_locked(folio)); - VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); + old = xa_store(tree, offset, entry, GFP_KERNEL); - /* Large folios aren't supported */ - if (folio_test_large(folio)) + if (xa_is_err(old)) { + int err = xa_err(old); + + WARN_ONCE(err != -ENOMEM, "unexpected xarray error: %d\n", err); + zswap_reject_alloc_fail++; return false; + } - if (!zswap_enabled) - goto check_old; + /* + * We may have had an existing entry that became stale when + * the folio was redirtied and now the new version is being + * swapped out. Get rid of the old. + */ + if (old) + zswap_entry_free(old); - /* Check cgroup limits */ - objcg = get_obj_cgroup_from_folio(folio); - if (objcg && !obj_cgroup_may_zswap(objcg)) { - memcg = get_mem_cgroup_from_objcg(objcg); - if (shrink_memcg(memcg)) { - mem_cgroup_put(memcg); - goto reject; - } - mem_cgroup_put(memcg); + return true; +} + +/* + * If the zswap store fails or zswap is disabled, we must invalidate the + * possibly stale entries which were previously stored at the offsets + * corresponding to each page of the folio. Otherwise, writeback could + * overwrite the new data in the swapfile. + * + * This is called after the store of the i-th offset in a large folio has + * failed. All zswap entries in the folio must be deleted. This helps make + * sure that a swapped-out mTHP is either entirely stored in zswap, or + * entirely not stored in zswap. + * + * This is also called if zswap_store() is invoked, but zswap is not enabled. + * All offsets for the folio are deleted from zswap in this case. + */ +static void zswap_delete_stored_offsets(struct xarray *tree, + pgoff_t offset, + long nr_pages) +{ + struct zswap_entry *entry; + long i; + + for (i = 0; i < nr_pages; ++i) { + entry = xa_erase(tree, offset + i); + if (entry) + zswap_entry_free(entry); } +} + +/* + * Stores the page at specified "index" in a folio. + */ +static bool zswap_store_page(struct folio *folio, long index, + struct obj_cgroup *objcg, + struct zswap_pool *pool) +{ + swp_entry_t swp = folio->swap; + int type = swp_type(swp); + pgoff_t offset = swp_offset(swp) + index; + struct page *page = folio_page(folio, index); + struct xarray *tree = swap_zswap_tree(swp); + struct zswap_entry *entry; + + if (objcg) + obj_cgroup_get(objcg); if (zswap_check_limits()) goto reject; @@ -1445,42 +1499,20 @@ bool zswap_store(struct folio *folio) } /* if entry is successfully added, it keeps the reference */ - entry->pool = zswap_pool_current_get(); - if (!entry->pool) + if (!zswap_pool_get(pool)) goto freepage; - if (objcg) { - memcg = get_mem_cgroup_from_objcg(objcg); - if (memcg_list_lru_alloc(memcg, &zswap_list_lru, GFP_KERNEL)) { - mem_cgroup_put(memcg); - goto put_pool; - } - mem_cgroup_put(memcg); - } + entry->pool = pool; - if (!zswap_compress(folio, entry)) + if (!zswap_compress(page, entry)) goto put_pool; - entry->swpentry = swp; + entry->swpentry = swp_entry(type, offset); entry->objcg = objcg; entry->referenced = true; - old = xa_store(tree, offset, entry, GFP_KERNEL); - if (xa_is_err(old)) { - int err = xa_err(old); - - WARN_ONCE(err != -ENOMEM, "unexpected xarray error: %d\n", err); - zswap_reject_alloc_fail++; + if (!zswap_store_entry(tree, entry)) goto store_failed; - } - - /* - * We may have had an existing entry that became stale when - * the folio was redirtied and now the new version is being - * swapped out. Get rid of the old. - */ - if (old) - zswap_entry_free(old); if (objcg) { obj_cgroup_charge_zswap(objcg, entry->length); @@ -1511,23 +1543,112 @@ bool zswap_store(struct folio *folio) store_failed: zpool_free(entry->pool->zpool, entry->handle); put_pool: - zswap_pool_put(entry->pool); + zswap_pool_put(pool); freepage: zswap_entry_cache_free(entry); reject: obj_cgroup_put(objcg); if (zswap_pool_reached_full) queue_work(shrink_wq, &zswap_shrink_work); -check_old: + + return false; +} + +/* + * Modified to store mTHP folios. Each page in the mTHP will be compressed + * and stored sequentially. + */ +bool zswap_store(struct folio *folio) +{ + long nr_pages = folio_nr_pages(folio); + swp_entry_t swp = folio->swap; + pgoff_t offset = swp_offset(swp); + struct xarray *tree = swap_zswap_tree(swp); + struct obj_cgroup *objcg = NULL; + struct mem_cgroup *memcg = NULL; + struct zswap_pool *pool; + bool ret = false; + long index; + + VM_WARN_ON_ONCE(!folio_test_locked(folio)); + VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); + + /* Storing large folios isn't enabled */ + if (!zswap_mthp_enabled && folio_test_large(folio)) + return false; + + if (!zswap_enabled) + goto reject; + /* - * If the zswap store fails or zswap is disabled, we must invalidate the - * possibly stale entry which was previously stored at this offset. - * Otherwise, writeback could overwrite the new data in the swapfile. + * Check cgroup limits: + * + * The cgroup zswap limit check is done once at the beginning of an + * mTHP store, and not within zswap_store_page() for each page + * in the mTHP. We do however check the zswap pool limits at the + * start of zswap_store_page(). What this means is, the cgroup + * could go over the limits by at most (HPAGE_PMD_NR - 1) pages. + * However, the per-store-page zswap pool limits check should + * hopefully trigger the cgroup aware and zswap LRU aware global + * reclaim implemented in the shrinker. If this assumption holds, + * the cgroup exceeding the zswap limits could potentially be + * resolved before the next zswap_store, and if it is not, the next + * zswap_store would fail the cgroup zswap limit check at the start. */ - entry = xa_erase(tree, offset); - if (entry) - zswap_entry_free(entry); - return false; + objcg = get_obj_cgroup_from_folio(folio); + if (objcg && !obj_cgroup_may_zswap(objcg)) { + memcg = get_mem_cgroup_from_objcg(objcg); + if (shrink_memcg(memcg)) { + mem_cgroup_put(memcg); + goto put_objcg; + } + mem_cgroup_put(memcg); + } + + if (zswap_check_limits()) + goto put_objcg; + + pool = zswap_pool_current_get(); + if (!pool) + goto put_objcg; + + if (objcg) { + memcg = get_mem_cgroup_from_objcg(objcg); + if (memcg_list_lru_alloc(memcg, &zswap_list_lru, GFP_KERNEL)) { + mem_cgroup_put(memcg); + goto put_pool; + } + mem_cgroup_put(memcg); + } + + /* + * Store each page of the folio as a separate entry. If we fail to store + * a page, unwind by removing all the previous pages we stored. + */ + for (index = 0; index < nr_pages; ++index) { + if (!zswap_store_page(folio, index, objcg, pool)) + goto put_pool; + } + + ret = true; + +put_pool: + zswap_pool_put(pool); +put_objcg: + obj_cgroup_put(objcg); + if (zswap_pool_reached_full) + queue_work(shrink_wq, &zswap_shrink_work); +reject: + /* + * If the zswap store fails or zswap is disabled, we must invalidate + * the possibly stale entries which were previously stored at the + * offsets corresponding to each page of the folio. Otherwise, + * writeback could overwrite the new data in the swapfile. + */ + if (!ret) + zswap_delete_stored_offsets(tree, offset, nr_pages); + + return ret; } bool zswap_load(struct folio *folio) From patchwork Thu Aug 29 21:27:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sridhar, Kanchana P" X-Patchwork-Id: 13783908 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 E1F57CA0EC3 for ; Thu, 29 Aug 2024 21:27:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17C566B008C; Thu, 29 Aug 2024 17:27:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1061F6B0092; Thu, 29 Aug 2024 17:27:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DFDF96B0093; Thu, 29 Aug 2024 17:27:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id AF2C26B008C for ; Thu, 29 Aug 2024 17:27:15 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6C090C08ED for ; Thu, 29 Aug 2024 21:27:15 +0000 (UTC) X-FDA: 82506568830.11.9298DAC Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by imf05.hostedemail.com (Postfix) with ESMTP id 55DC7100002 for ; Thu, 29 Aug 2024 21:27:13 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=fWa4YkxV; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf05.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.19 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724966760; a=rsa-sha256; cv=none; b=HwrapetmHjzOe9DzcpZloTMrSTsJ89/Tu+D39dxSoVVv0fMLg+wfkEvDuTOnfz8tNuf1fO rjNMNB8LLix/CLa5LxrhP2LaNiz6qkgNCkELRfjAgJNGbbwuazsLSFOPyUx1DkU2ZJR+pl dAc3CEHpENirofoFceM6/BSZNbK/9m0= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=fWa4YkxV; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf05.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.19 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=1724966760; 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=YHJDZPJGQ3yjt5nx/9DOnI7WGhrGbTA0Swg/OJGz+RI=; b=LIGpix1qYe6WndbrzholAhcOZcdcDyyzvTsWa64oe9xjkzSm3zBjxYOjx0a/B5JmrSRyUj TdGZrthQLhxXGNIpt94PysWD6tyDZ3QSc+FjXWbwYITToNyrc9a7Sk0CRPVZAz+CqGMTW7 Q5a6/scdM8/0RC/6AS0K6/qBcs5HNWU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724966833; x=1756502833; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Or6JtsX4DElqSgWxB+UTsMM5LcYpKMfhZpaMRcyI7+E=; b=fWa4YkxVEZ5LO9VWAyNU+hRlkGccR1YzCxAINtx7BMOW3MsroXmDi9oE JdPoMuF6T4ItBko29KKJpgVGB+yZQhpcVQDrbVUwxWE3j1uKCwGjcgmLj Guwp6L/cg7vdC1aKFXr5Al5j0ifMlExRlxlpPh8hGnjqMB3DuZcAhIBJY btPen9q2/ehbKDFm7nvHla3dNIiMeDGgkU1oPz/me0mF138y7sr1oNhKi K83I30pYdTs1+/xo46Y4YjpjU4wanZ9IKcBJ/BuhC1WJimCBur6yWIk+l rmPA9cFMZtwod1kknODX5UFaL1mOK/c/QibtghlUDJlD06I9TqmkTyWtB g==; X-CSE-ConnectionGUID: wFt9VzEKS4+PbDb50xEhBA== X-CSE-MsgGUID: o15IqTITTDOtqKNR8ap+8A== X-IronPort-AV: E=McAfee;i="6700,10204,11179"; a="23455211" X-IronPort-AV: E=Sophos;i="6.10,186,1719903600"; d="scan'208";a="23455211" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2024 14:27:07 -0700 X-CSE-ConnectionGUID: fjEjsifpSK+141+sdK48gQ== X-CSE-MsgGUID: RCg+/KznR7G9xMttevfeqg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,186,1719903600"; d="scan'208";a="68365422" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.6]) by fmviesa004.fm.intel.com with ESMTP; 29 Aug 2024 14:27:08 -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, ryan.roberts@arm.com, ying.huang@intel.com, 21cnbao@gmail.com, akpm@linux-foundation.org Cc: nanhai.zou@intel.com, wajdi.k.feghali@intel.com, vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com Subject: [PATCH v6 3/3] mm: swap: Count successful mTHP ZSWAP stores in sysfs mTHP zswpout stats. Date: Thu, 29 Aug 2024 14:27:05 -0700 Message-Id: <20240829212705.6714-4-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240829212705.6714-1-kanchana.p.sridhar@intel.com> References: <20240829212705.6714-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 55DC7100002 X-Stat-Signature: rpr37k7iqjbjzze6kt9rc97bd8ukjzen X-Rspam-User: X-HE-Tag: 1724966833-857055 X-HE-Meta: U2FsdGVkX18oMq1m7e5fJRVw2uYn5lPYv7fY1P9n5vLxFDxk+3+Vqk2Y2l+4Iw/DmwL7/0iuZf4sjO2Up+Ez+PQLgRsn7157B7DROsPBKpQOhyhs0cdU6je1zGmhCLkjGFE6b8AOUZSLdpWwjl1+bnQBmaiwWx4pUemQ0w8v9oLo5Tp7GRDinsB037WDJt0NQeZwh6XwpbKAnAAyd0emEL7+tIUefMr3QTqPgQCla1qjSDEJkuAwMX4u4UMA0Kg55H5ZqtCUYEs8IKR6Iqxqn7Wzc7LTxqjk82mwRLzDXk8DRB6WKJClSFugNuNyJLA6oC6w60pHxmSScBSO1OY1eGB0YqXPdYL7SbOMzcs6XnOPSsNbOShY6hf5rSARU1pvec5O4paXUpPhT/mgna1yVQEtpi9MmnTiL+Qk1KOKthqKP0ivcbjj3gDIk6HjCzrrVbsQ99BnQjB9F3SuUUmVvftpjPmd0QF6f168MYtFjE3FDP+SDZQlOK+vT9uLTsagAnl8qfNtble0L2Dq/JmzGYwdTHdo6hqfC/OJRtJcssE7CICzCf5Bxtcj2g5zY7exVHdfMEEAilHnEJIeyyJzunOS70PvPbmQT2yYW8BddiaTWYk8nDGG7Hh5QlRk04B7V4892hOUbMQcSRBbd7AIJqW3L3oI0lP6kHG/FMCqHBctcx8WPGBsXijc1JaJnXuOiEN6DsNJPnzgsGAaxLjFq83NM/xUdNV5rzAdylGJafW10gHnpjM4lqDyme7r38XC2qQIVBxDUTg2EEcwBt3WPHkOo8UO+yay+EtSD+uDbrE+393Ou8U2I71T5pzCDXL8ow8zPvcuFJYPF7jsQyhIN8RJ5nO2mg2QxoLyoKd3Qko7mvjIcgDU30HhhNw6j6xTyT4nSAe1J+4Kee4kfapvZcwyuRElHJfLJA7r2ezppKl4UAo97QUy1wxM30au1EuCKh2FAorX/U9qcklQYan wOoLKHkB tT1ii8Am8XbNalGULRTo3xcF1wlgw7/Ex0TuVtzt8m/lhRLW1vqFrQwpvhe0ODgriVhWTB9R8cf5yJ3onRZFJJHLcQFlvimnNl0R/BWIAbxNmPTC6AB62qrhEgITDcGfbeKfHjmE7QS/7FodvD5n/KxXeMH5DpJED7kuV8NUa02Oak1qJjj58VEz1pA== 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: Add a new MTHP_STAT_ZSWPOUT entry to the sysfs mTHP stats so that per-order mTHP folio ZSWAP stores can be accounted. If zswap_store() successfully swaps out an mTHP, it will be counted under the per-order sysfs "zswpout" stats: /sys/kernel/mm/transparent_hugepage/hugepages-*kB/stats/zswpout Other block dev/fs mTHP swap-out events will be counted under the existing sysfs "swpout" stats: /sys/kernel/mm/transparent_hugepage/hugepages-*kB/stats/swpout Based on changes made in commit 61e751c01466ffef5dc72cb64349454a691c6bfe ("mm: cleanup count_mthp_stat() definition"), this patch also moves the call to count_mthp_stat() in count_swpout_vm_event() to be outside the "ifdef CONFIG_TRANSPARENT_HUGEPAGE". Signed-off-by: Kanchana P Sridhar --- include/linux/huge_mm.h | 1 + mm/huge_memory.c | 3 +++ mm/page_io.c | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 4da102b74a8c..8b690328e78b 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -118,6 +118,7 @@ enum mthp_stat_item { MTHP_STAT_ANON_FAULT_ALLOC, MTHP_STAT_ANON_FAULT_FALLBACK, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, + MTHP_STAT_ZSWPOUT, MTHP_STAT_SWPOUT, MTHP_STAT_SWPOUT_FALLBACK, MTHP_STAT_SHMEM_ALLOC, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 15418ffdd377..ad921c4b2ad8 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -587,6 +587,7 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name) DEFINE_MTHP_STAT_ATTR(anon_fault_alloc, MTHP_STAT_ANON_FAULT_ALLOC); DEFINE_MTHP_STAT_ATTR(anon_fault_fallback, MTHP_STAT_ANON_FAULT_FALLBACK); DEFINE_MTHP_STAT_ATTR(anon_fault_fallback_charge, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE); +DEFINE_MTHP_STAT_ATTR(zswpout, MTHP_STAT_ZSWPOUT); DEFINE_MTHP_STAT_ATTR(swpout, MTHP_STAT_SWPOUT); DEFINE_MTHP_STAT_ATTR(swpout_fallback, MTHP_STAT_SWPOUT_FALLBACK); #ifdef CONFIG_SHMEM @@ -605,6 +606,7 @@ static struct attribute *anon_stats_attrs[] = { &anon_fault_fallback_attr.attr, &anon_fault_fallback_charge_attr.attr, #ifndef CONFIG_SHMEM + &zswpout_attr.attr, &swpout_attr.attr, &swpout_fallback_attr.attr, #endif @@ -637,6 +639,7 @@ static struct attribute_group file_stats_attr_grp = { static struct attribute *any_stats_attrs[] = { #ifdef CONFIG_SHMEM + &zswpout_attr.attr, &swpout_attr.attr, &swpout_fallback_attr.attr, #endif diff --git a/mm/page_io.c b/mm/page_io.c index b6f1519d63b0..26106e745d73 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -289,6 +289,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc) swap_zeromap_folio_clear(folio); } if (zswap_store(folio)) { + count_mthp_stat(folio_order(folio), MTHP_STAT_ZSWPOUT); folio_unlock(folio); return 0; } @@ -308,8 +309,8 @@ static inline void count_swpout_vm_event(struct folio *folio) count_memcg_folio_events(folio, THP_SWPOUT, 1); count_vm_event(THP_SWPOUT); } - count_mthp_stat(folio_order(folio), MTHP_STAT_SWPOUT); #endif + count_mthp_stat(folio_order(folio), MTHP_STAT_SWPOUT); count_vm_events(PSWPOUT, folio_nr_pages(folio)); }