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 347BDC4167B for ; Mon, 27 Nov 2023 23:46:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E1066B025F; Mon, 27 Nov 2023 18:46:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 366816B029C; Mon, 27 Nov 2023 18:46:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 193066B02E5; Mon, 27 Nov 2023 18:46:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 052C26B025F for ; Mon, 27 Nov 2023 18:46:09 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D2BB3A0111 for ; Mon, 27 Nov 2023 23:46:08 +0000 (UTC) X-FDA: 81505370016.24.C1A15D3 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf18.hostedemail.com (Postfix) with ESMTP id 56FD61C04BD for ; Mon, 27 Nov 2023 23:46:06 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=UaPF9q5G; spf=pass (imf18.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.43 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701128766; 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=+QqTttvrK+ydHCThErTWQGU78pwuFOyKaqUvf3Lt6j8=; b=zZGmPkEVAxZne7YaxH789ig/ovm7lguCTFOs60xN90Uqadu2fU/x47uHmoqQ33AUd2+NFB KO3d8NggcyYeZbflze5e4mWCJbxSc9nCxec9hyZL5oX7lNP6sdJkN+JsM2rrbvyG2SzFs2 f13WWACf4l3+mudUuqCy9jPnbG2GLXE= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=UaPF9q5G; spf=pass (imf18.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.43 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701128766; a=rsa-sha256; cv=none; b=PCweqpuJDx9QhYxhmaG7ELMw/ATiZEn1TcW+gW4DcKlduYDUhyssWepejADZ5F2g4TLfPY NF7H/eIpB0y6j7QeSXHMF4t+8Po3mMKXAnDbGTv6l9dCMBdhQa2Kuo2qvm4aghTlUKLQHQ O0EJkFwQEDKcx+aucyM75sRTPLRYvNU= Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-285d32c6f07so1221243a91.1 for ; Mon, 27 Nov 2023 15:46:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701128765; x=1701733565; 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=+QqTttvrK+ydHCThErTWQGU78pwuFOyKaqUvf3Lt6j8=; b=UaPF9q5Gub7KIpVCk8ybYnofzM0bN3d/2X2087ER+32bEoM+O1jwEOyuhvrgwwDtH6 lDtMZzyVPIJX3jwzNEY+A7T1au0F1g7v2FZ9h22X8G9pw5gWKTAnAFVFv8TrwkQmF04d 0rpK9jJ1hYD9GBf391Fa60FEDuwbtZf+IDawBmreC0wTWtbXRCNVBTTzUkJE2FoAdQPC 2miH/H1Lj0VaX65UoNXsvU67k7+apguSD79bge3deTsANx09xMNiESIDnu+3WPOZFu1d PY8MBQoyDoTeY8vQ8bWXhy41/mZrtNCDAgLQM/Gix/RL9ukPQ2fdyP5YJQndv3hwtZOi +bIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701128765; x=1701733565; 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=+QqTttvrK+ydHCThErTWQGU78pwuFOyKaqUvf3Lt6j8=; b=Vj+GQLs7aBwpI0WbyflQPLfDph1PcLVBhMLCgHAPMT01iVEVGe2TSqsKBLu66WoYHF ofXPT9OmslM3E+DqgdSHTLY+7wKyWaVpBgiGa6Upc2uIZdIcjnhnTWox49SfYQJZVXpK +ybUycqW9erm+lu3xEhYMQh+NfpDQBRMFzvhs3e5QYztCk4t4jv0TRD9oHvKmVNdVDOL aifuiJI7xhJQKfV4LkS9LsCbI6YZMVOoxiINym/BWVJa80pAJrf9BBjfnYAJ2UCvXf4/ XETZ3FB0xnomj3s0WSAX33y9n6sbsKHGUwFikY4qqAysXJ7rg4lmd6YPNKbViaaHio42 XJMQ== X-Gm-Message-State: AOJu0Yxb5pCKpnJwlMZiwKLjyFaRg9UYEfGyFUgbS9c08Br38CK3c0ez FOZmSy99WJ4xyA646dmj/E0= X-Google-Smtp-Source: AGHT+IExkmTDKAzglcJvC3UaGVQZ3+W9qPh/6zFr3PtHuO4ykPcK8P5QG1OBTphSE0yUc3YsgNVUPQ== X-Received: by 2002:a17:90b:4d06:b0:27c:f9e7:30fd with SMTP id mw6-20020a17090b4d0600b0027cf9e730fdmr12623338pjb.7.1701128765215; Mon, 27 Nov 2023 15:46:05 -0800 (PST) Received: from localhost (fwdproxy-prn-116.fbsv.net. [2a03:2880:ff:74::face:b00c]) by smtp.gmail.com with ESMTPSA id 25-20020a17090a031900b0027d0af2e9c3sm9103232pje.40.2023.11.27.15.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 15:46:04 -0800 (PST) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, cerasuolodomenico@gmail.com, yosryahmed@google.com, sjenning@redhat.com, ddstreet@ieee.org, vitaly.wool@konsulko.com, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, chrisl@kernel.org, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, shuah@kernel.org Subject: [PATCH v7 4/6] mm: memcg: add per-memcg zswap writeback stat Date: Mon, 27 Nov 2023 15:45:58 -0800 Message-Id: <20231127234600.2971029-5-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231127234600.2971029-1-nphamcs@gmail.com> References: <20231127234600.2971029-1-nphamcs@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 56FD61C04BD X-Rspam-User: X-Stat-Signature: zm9sjkqxgh3d4x63gpzp7t4ju1bq8dph X-Rspamd-Server: rspam01 X-HE-Tag: 1701128766-470868 X-HE-Meta: U2FsdGVkX1+5NKi8MIDbx4QFNjPVVe/V/NI+ZZsp7qu5/AkWG9ZW4rV7Al3G2PDy28d2S9PWKYcIwuvDLdjVl4qA8PTbbgmBdm+eHAjZSMbg7K5hQvtq/WuPstzid6hLCdRVi8SjVlgFzjbIsBaNnxshRj0yz8HEyGlZ4iAZ4ezJK/kUyIenNCrs+QRWS+f15dlVkDIPSNkaIT5J5Op9QZtCLUZLBx5eiPvKNqBbPyPVB8iYFnX0nnT98SXL3Aca2xMA6KIzfyVWe/ybqxoRFSzmCvmII5FaPpEJk4EIyJRjC7zdM4fdeJW5+4EJvzS3h41LXxQR4DHapTbiRyg+otXXSv5680cflZ0MbUuOj5GLX/mDrBOsGceRHV/hJl/mU4IEfL+8Om3wsRTiLaEa37nYXugm1GqtznBLZwrOT6sBl2BWnv8vC7bqbW14ePGNwdi+kmBux69yEivFXTqV99Mew8aT8ll/YiP6RKl5qN7CoyydiWlVD1RUHzz7xihbUlfbwEh7SXHGX7UNYPg2rWHciqa3Re85v1X0CjXF4rF15d0kzIt/vSwGnx4dAwq2NP3irv39IJ7pNjIVADw6/XxIZJnzxrj+4o2iLadrexYV/e8mjYF4SKv1HoS9SDaBrmFxNPqdeOxBonY8O4ZypV1jRvm0lqiKusqVe0q9+3ZXwyLn1pZGKhXL32OFQAuPv3JGaredtiHfFv1fgWenQUUjrSpwwhRe1PFbclEbReaNZA5eEFFZEWIxGbZpMlTooMWVRRFqZ6TigBMp2yGjmUN/nEa323GLUTRxzr+A7XHisIESQU2wuejVCz9APYBubMxx/yWrM8VwCcXYKlTFucMtJYvWU+u/goaymjC1y+BBkHoYb9bPFVRKDW71IISmbzuG8uhzLhCBoMUlovPEsgYwoha/ARusLIGjYa2i+YjhVTnV+aBP8VWVV52fagXfutp4vvDmYd3+XXc/Ljc ISw+5Lhl VE1IsQgikgIEoznhHfdMeKanCK+zlpsqpKnfJhWAENQ8biUqeCbv+AmocdWtqjdLjtX7iG1snX+qU8w0QL6597TITcaCKICeiCtuAIJmiTc0EjXPSnkVab9IWseKAPjmjMHJUpChzlrZVhFG38KuINhfFgpTaoXffzwzvn/yUeXetxSEklU2cztjodoZGYn0VddVcVfXzJeOdalxvLE56zN9KV4O87IsJ+5fV9+Z9RUOfjj9KCF/oNQbx6r9x7ZggcldDsE7+mS/NGpJZ8JbWc9BG+S8ebU0/WXwVeWK9IoSYcmILrxAO5eaBTgln+sqXtZXW5Ygj/uMJO76ENmqMNbZi4o5otkM3XGwVrjTSrSPlWxxKR2fzS1G9R7iFF96T4rxg6K0tYi8vC9X7E0M4unQVoJvBUcBsF0RlobyLqxrFCswpK2dxmMjp8lnVjAsdleKYNTN3ZCoCetg+MkBx06DO8w== 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: From: Domenico Cerasuolo Since zswap now writes back pages from memcg-specific LRUs, we now need a new stat to show writebacks count for each memcg. Suggested-by: Nhat Pham Signed-off-by: Domenico Cerasuolo Signed-off-by: Nhat Pham --- include/linux/vm_event_item.h | 1 + mm/memcontrol.c | 1 + mm/vmstat.c | 1 + mm/zswap.c | 3 +++ 4 files changed, 6 insertions(+) diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index d1b847502f09..f4569ad98edf 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -142,6 +142,7 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, #ifdef CONFIG_ZSWAP ZSWPIN, ZSWPOUT, + ZSWP_WB, #endif #ifdef CONFIG_X86 DIRECT_MAP_LEVEL2_SPLIT, diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8c0f3f971179..f88c8fd03689 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -703,6 +703,7 @@ static const unsigned int memcg_vm_event_stat[] = { #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) ZSWPIN, ZSWPOUT, + ZSWP_WB, #endif #ifdef CONFIG_TRANSPARENT_HUGEPAGE THP_FAULT_ALLOC, diff --git a/mm/vmstat.c b/mm/vmstat.c index afa5a38fcc9c..2249f85e4a87 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1401,6 +1401,7 @@ const char * const vmstat_text[] = { #ifdef CONFIG_ZSWAP "zswpin", "zswpout", + "zswp_wb", #endif #ifdef CONFIG_X86 "direct_map_level2_splits", diff --git a/mm/zswap.c b/mm/zswap.c index 5e397fc1f375..6a761753f979 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -754,6 +754,9 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o } zswap_written_back_pages++; + if (entry->objcg) + count_objcg_event(entry->objcg, ZSWP_WB); + /* * Writeback started successfully, the page now belongs to the * swapcache. Drop the entry from zswap - unless invalidate already -- 2.34.1