From patchwork Thu Nov 30 19:40:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 172082 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp637916vqy; Thu, 30 Nov 2023 11:41:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IGQpdsqxCQI0ea2am2N7yy7D16ba0SVjpSVi2CeyI98HqoeZ02/TuO5uTfj9s5YqxrCfj+L X-Received: by 2002:a17:90b:4d88:b0:27d:3439:c141 with SMTP id oj8-20020a17090b4d8800b0027d3439c141mr21112070pjb.39.1701373292920; Thu, 30 Nov 2023 11:41:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701373292; cv=none; d=google.com; s=arc-20160816; b=xwHmp17/JDx5NR7vdLzPwIFxlFQ9hxuOUFPdTaH99VqyUyntB9KglZdquJA9JHgivT pXbfrwZo1m6jz+nZkMIWQU53vsl1eB6aPzkReI1Jx0B45PEorxSboOSEwwhhR4exPMbz k+bM4KWjLx+nyAuNKkaS1vPqKrzb/PrT6urWEoM6yX6q9Z2Y9zHyNTxhnaLSHoIxZjwR 9GhNEIJbpMrR5aqGn4dgQkZ2ZJhYNSj9mU6aTAzrX7OOFzslmJNgxR69eSn6LRideQEt 5kjGW9XlxtCzxxptUpgzA1rX9OaPGEQ/DQmf1UiXLT90ZdDro5zfrbNCB36xcMQfCWWr rG4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=niZWwQJsg3s1qyFf7Pomuagp8ezW4TnieKlMs2EcKiM=; fh=5ynFD2G6LA0fdRuAOSZxbBxHoIIG4U3xrwbnkupZs28=; b=DClUVYBsmiNupEFSdjXkuzAKEOLdHa2RvzQ65Q/W8TP+Q+itC5N3IvVUsEZ6ClKIuW IES7bCXUwCUPYE52cFcGmByr9nhC5Ll3EYwmK3SpgyQX52U0RT6FrJLQE4APJl0MztYS g/ydM8vaDVNbtpQMog1d30k/1BnJMoa2kD34GOZc7tFP9rqhKMhDCnNI9uFPym0DEP1H UXaQYF6XH8onA8I6YSF4pU8DALJ+W78yBqKnjRZsUExVZDcms8CMqZn7cmAG29CUhN1e cAg+yGHil8tzGesf0YBhOYmwAYM29MGexeNcy4+XLN7QP9mg8qAar7v7t0MLZjE6vErH J9oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=N0UCbEt1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id i10-20020a17090a974a00b0026b365096e5si4155323pjw.53.2023.11.30.11.41.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 11:41:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=N0UCbEt1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 95D7D853A0F8; Thu, 30 Nov 2023 11:41:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376545AbjK3Tk3 (ORCPT + 99 others); Thu, 30 Nov 2023 14:40:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376544AbjK3TkW (ORCPT ); Thu, 30 Nov 2023 14:40:22 -0500 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51F1C10EA; Thu, 30 Nov 2023 11:40:28 -0800 (PST) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1d03bcf27e9so7066955ad.0; Thu, 30 Nov 2023 11:40:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701373228; x=1701978028; darn=vger.kernel.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=niZWwQJsg3s1qyFf7Pomuagp8ezW4TnieKlMs2EcKiM=; b=N0UCbEt1llaMGS5NVeWsQHtIr7AXbwC+liy73RKvhcNHQ+zFiTZWe29FVSE96euwkc hS8V/pw3x7ZXPvfhgkaJ2+5v6LKyeqPMlqBTW+wyp/q/QrKvCwagOSZakATKd75tdF0a EO3crZvlWFPDDj1G3VkS4BSmYNLJ3hxnr13Ko82MnZ22wCWL0RdpAp3N29IVd4bl5Vlj wEJyE4b+jN679hwQnGFf8NrrirMhMKiZ6zSshNmVJThFZ/ZzllZ5RhaN9vZ+oSsyev6j 4+0of5hsnHE4jygvP6sJAexJchU+sSJUGEcJ+IQNMNW88QQERqSAEuZECmo0q49Tq79D 1j5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701373228; x=1701978028; 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=niZWwQJsg3s1qyFf7Pomuagp8ezW4TnieKlMs2EcKiM=; b=WeE29vg9GEhO31su0u2+OXVIih3hEAS65pqN9TQSmA30OVKGG/iYUAsW+KIJRrlY5P RflqGymzegtBVtCxM/dzz7y5KnFnvvI8z3nqg4vvm+kNIcrL4yvd3qDsMRn9GfugWU6Y CmxsjPM/I8Ob5hhi/OsNsQVjmuqqtIX9Gb9VR6NeDKk0h3dwj7FH1fIEJ25vAEuR8XUV 1AZB74DhPSOvD6+04jb2vbJt7+EQ3gpxcKpgonwBWK4TFJoVQ4S+3UJZTUQ+O8hJ1cJR YxnH84EgWHzyh6MhI27s6Zh5VO9usgSa4eCs0QXnOYNvCEmqgl/QqcKtdIEZCAx13Tx6 zf6w== X-Gm-Message-State: AOJu0YxGoMraRiDuYCsbqEaTmmb7i8GcoGUntgXHHyajpk0AICLFtyFM XhMqjz3BOIStAsX04ymfZtU= X-Received: by 2002:a17:902:82c3:b0:1cc:237c:75d6 with SMTP id u3-20020a17090282c300b001cc237c75d6mr21599414plz.67.1701373227682; Thu, 30 Nov 2023 11:40:27 -0800 (PST) Received: from localhost (fwdproxy-prn-003.fbsv.net. [2a03:2880:ff:3::face:b00c]) by smtp.gmail.com with ESMTPSA id b13-20020a170902d30d00b001cf9eac2d3asm1781733plc.118.2023.11.30.11.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 11:40:27 -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 v8 4/6] mm: memcg: add per-memcg zswap writeback stat Date: Thu, 30 Nov 2023 11:40:21 -0800 Message-Id: <20231130194023.4102148-5-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231130194023.4102148-1-nphamcs@gmail.com> References: <20231130194023.4102148-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 30 Nov 2023 11:41:26 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784019201955952685 X-GMAIL-MSGID: 1784019201955952685 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 | 4 ++++ 4 files changed, 7 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 792ca21c5815..21d79249c8b4 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 f323e45cbdc7..49b79393e472 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -760,6 +760,10 @@ 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); + + count_vm_event(ZSWP_WB); /* * Writeback started successfully, the page now belongs to the * swapcache. Drop the entry from zswap - unless invalidate already