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 72128C0018A for ; Mon, 6 Nov 2023 18:32:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E9D86B0275; Mon, 6 Nov 2023 13:32:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FA776B0277; Mon, 6 Nov 2023 13:32:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 023B86B0278; Mon, 6 Nov 2023 13:32:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D77F46B0275 for ; Mon, 6 Nov 2023 13:32:07 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AF03BA0819 for ; Mon, 6 Nov 2023 18:32:07 +0000 (UTC) X-FDA: 81428373894.18.E90D41B Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf27.hostedemail.com (Postfix) with ESMTP id CE7CE40015 for ; Mon, 6 Nov 2023 18:32:05 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=bUZBp11s; spf=pass (imf27.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.210.170 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=1699295525; 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=CKTpKLeSBdUqUozne8dOLG7XHxiGHFR4EgqMwDuCKlY=; b=gbq5TFOd5d+jxpne4BmUc+Dwp5HFdB4oiAe7vEXVgjQ9Qsn1RP8GSrFkyeEzAlXz2Guz8q yHr5Da+9LiTVEIOdvaXHKL4tFVYlulWE+U6PFyVYltEA3l5RUQfMzljhdqeIoRXqoldm3v VBo7quE72Mt9yjphPgDBNRGqCDIgBZs= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=bUZBp11s; spf=pass (imf27.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.210.170 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=1699295525; a=rsa-sha256; cv=none; b=7o9lcHUJksfpUq5lrnYDkyO+fVt4h7+5ISPQh0aWCdhpnk+GzneH2w5KdjgXz5lzJr5DNf x1GAwdfldOZNhLNAUMSizvXcOG4wjzJZjc/2ughL7YKH18EwJvi8paRQdZwfqSzQ/qERa2 vADI+RXaWlqAMth8p7GYTqJyqKqItjw= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6b20a48522fso4034558b3a.1 for ; Mon, 06 Nov 2023 10:32:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699295525; x=1699900325; 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=CKTpKLeSBdUqUozne8dOLG7XHxiGHFR4EgqMwDuCKlY=; b=bUZBp11s4KQ/wIxPfLzLiuu4s+7Axzag+D+V5y1wRLiKCF34e23gpTmniPiasaiN0q KIdeBwoIyFls+8yMUW/PlaLyWcCCK3ifhGmMAA51GCxOGSOG3UX60UwPxjOSlbExoZ4U CMSJdfFbmsRugXDW/tOO8JnMGduOjbPM0u/4sJ7wvmQmWlqXBHVS76WASFcdN5+sW028 /1Uw8jtSvXFLtoS1bl23HaukM93ss8bN0MlVWtgWBegwfWfkxtPPzi6rMXgZzZmF1nGf LXJSgI9MbAMtpzeY6T8QkAo2FYnLAz7+Y1+k+2COGa3IZXJsxvjjK+ZGDluwARw4UU6k OHBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699295525; x=1699900325; 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=CKTpKLeSBdUqUozne8dOLG7XHxiGHFR4EgqMwDuCKlY=; b=GkxN2iPcQkK/pKiqyfTCmsdis5HxNH2l6yqt1URRdFdWZzOj5pgQo21RkVwPw2Tg2v AOGGyxbtWSykIW2iwsXIOt17KkfIgaUMqfOlffHUFo4YPUO7HO1WLsKa+KLIiMOSYHs1 u9H+bdMckMDBAledHsWdlk8BnoxclBMMZo+oQnqxOThexidKftSs/CGC33U3ehiWHwSL eYITfYknpYPZ8rsKkfVqCI7Jvp2k+TDXFXV4uSy5jPFCXu0IRI70WbP5GoIn81UOrlue Xo1pPHkwhTbMFochbvkmGNnlVMEMas6rAvG2+iflc7705iugSWD11uEcdD1b+toKkEgi FWVQ== X-Gm-Message-State: AOJu0YydMphO2GWd8ujHhxeYZUw/GwaoR8+qhylOJpqCk1lpWN1dbKtl PoOclfx4uwUJ4y016gR+g8Y= X-Google-Smtp-Source: AGHT+IEajdjXne5TgvRI7wLvY5VaXI1+x16n9o7YmP2T+LGhqO+wFg1B1TlhqVvjHYOcgf56WSD/SA== X-Received: by 2002:a05:6a20:914e:b0:172:83b8:67f8 with SMTP id x14-20020a056a20914e00b0017283b867f8mr26904604pzc.29.1699295524682; Mon, 06 Nov 2023 10:32:04 -0800 (PST) Received: from localhost (fwdproxy-prn-119.fbsv.net. [2a03:2880:ff:77::face:b00c]) by smtp.gmail.com with ESMTPSA id j8-20020a170903024800b001c9d968563csm6161658plh.79.2023.11.06.10.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 10:32: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 v5 4/6] mm: memcg: add per-memcg zswap writeback stat Date: Mon, 6 Nov 2023 10:31:57 -0800 Message-Id: <20231106183159.3562879-5-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231106183159.3562879-1-nphamcs@gmail.com> References: <20231106183159.3562879-1-nphamcs@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CE7CE40015 X-Rspam-User: X-Stat-Signature: d3uuar67er9wzsacdonyp1qanfs5h3xu X-Rspamd-Server: rspam01 X-HE-Tag: 1699295525-191251 X-HE-Meta: U2FsdGVkX19G+/iBqmWexSg76njWrH9heJbUKOT8nXVzXii4a+fBPpKSUtOfV9jeKoY2ht+ydSlVqTp0A0VBvRGzu5QXk2qW9r8xKhArQQOTvESE4MNRPgaH0CTXNKo+sq4gflNsUB4+cOWkuJiUSs9M/RyeQKauFNC3aRRyEZbDbRXRJ2ngOOD8++RpuNwsIj2m8QxR9327HA16nuwFmhgdbQnTXhgXBKQTAJcYKdU6/WOOTqPf+ZMDjMnryqhBykrnyZdNrS0zD2ikjoB1t+h6aH5B//C007/vvnj0EjVAg3jWpRIZAAiRI89PP4jv91mldy3miS71kDYMJnyj3g4zwmbPFA1u3ouisrBoC3IVw2kv+NfX/MOVPwGpSdb5LyFtYJrb1mgg1Faxb5ZS3yQYyHbnmuMDqETK63ebObtSdXvKh1rnh0/Stw2WnEgrdNXPfD4ZY6tBEwAIuhGNDv6TacCh/aQjJ6ba/wzup6mE6m+zoWF6nhNxj/2vbazlmEfJRWPgoZqD+ewccoNHy89J7KpgaPNKNI7/5G5Iruv3eNS3cktc/imNXiTx/8JFvg5mdxDQp37Lv0kieDtZNKf7kDGc4B3NxN3cBbB8TGW+WIA79f2sAQHgwWmaPHOLnCtIS+fxtoF09lC/ldU88r3OtQk17GwQp7XdmRSyuM5K5VkaqKXjO+/Nsf8Qa0BdrGlCd7rY6BCst3BlczjsZvpZteMzRd+rTL+paYsqseyw2CocepjF+pVPwjdd10rLrFord6I0/sjByN/iFYndLM9yLf07xIo0Fnm+93yVg1DaFrq2p1vIrwDGFnSnRL04AGJiTcHgPs+UtFIgEIyQtgWQeIiNCxeY/RHWFay6Wvy1YGnsv6Gc04mCVHus7YLScM0DezwNh73xLQd2v5LmhNmUAiYkPHjGjD+ITIj6qpY8PTwz/wBcNNui0ldvMVlLDWtIkn1eiGKZgK8+6UX KIsblyr0 8NIJp8JUxZ8xB77C1cZKTg9aWOcy/Zy3NCKqpjmGUc/XACDvmtJELgJs4wz5NDL/JQTvSZbMSc9gK1a13sOEE4wkY4XRYM1yuGannx3RivC+s6YP4dUr8lOqoLANhl6JCMxnfE+2zEqaS3DG8NECBnOWcYIgRLijx9B+sRDp3Y0elD5WSCv53O/F6kmz/tBkAF6Av8SxFkMXDQ0xNgsR8jFN2W7fAcXpIzALZNJID6TkpGYr0sFrbMzCAEC0IviwvZ3lsX2xy+xwdQgFCVVSd5q3H6x8/hCU5S0X3NQBXd5ReNNNWLl1ZX9mPZeA7sgbBTxhx+BzdYXm96Y854MmG6cirkgNExyNFLHEAAGcp5aPMRgWsqF4+AWQTxq52q4LUQpYZrcLHUL4rIFEIAiWh50ZDYFf3GRgQzP4LbD5ZLXQO+2zZGGgQH5n/f6IuT6cY/pqFtOjruQWzzw11SIrbAC3Opw== 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 8abfa1240040..3153359c3841 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -145,6 +145,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 2ef49b471a16..e43b5aba8efc 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -593,6 +593,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 359460deb377..5e5572f3b456 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 2654b0d214cc..03ee41a8b884 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -755,6 +755,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