From patchwork Tue Oct 17 23:21:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13426194 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 DD0AECDB488 for ; Tue, 17 Oct 2023 23:22:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E38E8D011D; Tue, 17 Oct 2023 19:21:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 395D18D0002; Tue, 17 Oct 2023 19:21:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 123C38D011D; Tue, 17 Oct 2023 19:21:59 -0400 (EDT) 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 EC18B8D0002 for ; Tue, 17 Oct 2023 19:21:58 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C009F80CB9 for ; Tue, 17 Oct 2023 23:21:58 +0000 (UTC) X-FDA: 81356528316.22.5CADEEC Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by imf17.hostedemail.com (Postfix) with ESMTP id DBAEE40003 for ; Tue, 17 Oct 2023 23:21:56 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Fy2M7XaX; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.215.173 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697584916; 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=Z7v4RebQyJpdc4sQlri0EPJCRWGhgONmwRgz8BMi8es=; b=Sopb/yaQfESEaCLL6Qtr9jBrzd4/uYfLQjcUoLK7Qz4q5zK96WBBKZm3DFu0KcXskQmSqR nURmWTExs93pguU6JsDJqG5y7J/jQqKjIC59KFRPoN8E1RToTgy5HaBPGqcRSkkXxPXgFx g08NuavNqT6WuI5UTguex1iEbZv2si8= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Fy2M7XaX; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.215.173 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697584916; a=rsa-sha256; cv=none; b=7SwkCBOOOSc1weaB70pZ8fCCcOlVCpaj2/8osoYHXsRaiXrVi0tvIGfsIB1baP+YN3cEUV Bq00KSbp8VZJ3uDN0+i9CVwXeSnjyY3Mm/H3AH20uCPZitggbmE1BhOfrCLf6NJKsl0EGQ Xn8mKsYyHb7eTuqUiRz1t8r6Mksef8g= Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-565334377d0so4666226a12.2 for ; Tue, 17 Oct 2023 16:21:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697584916; x=1698189716; 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=Z7v4RebQyJpdc4sQlri0EPJCRWGhgONmwRgz8BMi8es=; b=Fy2M7XaXXnjE0mkpsvZDDqDHsZbqMRHYZ4CvAKGPDdl+muS5NSrgJ9tZ3MhE2OyzIH qkMs0V1OJPEqmHIL6vSVLTCZjYG6alZTN2Ua4GD1Ht0/SUfN2rV4mIu7NK3h5CFu1KtU iZikU+wAmGApp07RyBTC5O6USakdXYpmrWBz7rQIJhBwa8VUpFZfhIQoNxiXzHABbeeu THFQeLQmkamf1vYa++EYJaHGI61n+pNH8dc+Aj+FLWaOxkkHrqfzrJ0dl0wRWIjsLDXH 50ZB/GowN8wtEfuW+ESZznK92+qa0Fbzv2+YYkUniV9rE7aj464IrMMrv82QgZ5bjzbI WJ6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697584916; x=1698189716; 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=Z7v4RebQyJpdc4sQlri0EPJCRWGhgONmwRgz8BMi8es=; b=nVoEzlem3vQwIQ3QDBmetf6r9JRwH2696IfpaHs5UxO//S/lGAXEk60dEzK7K0TyzF wl360Hg+Lip2RDVQpPyonqASiiXgp/O888nm50TmK7wioBMyd4EYe4mkJnfwzGqEWFkl CUqgLTdkwvr749LPeYkqwvOfXa5/DGdnZhdyp33Z+bETifMzQ3JK8VeWRmQijRcsIZkZ ybwbbER/asLLWwKZmKzB9L44cqZD6K5j4TkK/7i+twvQnJ76XvqNMER/pQyRT0rrk2Ko SjRba+5R54DfQcYpJSNV/C4EfaD16IWuCu9dj60946vyB23WBtF+pktoOMhvbSR486yn yO9A== X-Gm-Message-State: AOJu0YzeDOx7Zr4K0cQwZYjNcKZiYSPKfARzM3ee//x8zu8uXHsDWZ1t cFSSOO/129wgtlyvP4ULE5A= X-Google-Smtp-Source: AGHT+IEfthOH1/vbuwx8GBxLp7AV5HAOVBnZLimkJePzXVxapwVFQUAgYitw91LLn8qQzfjU7hhxjw== X-Received: by 2002:a05:6a20:938b:b0:17a:284:de50 with SMTP id x11-20020a056a20938b00b0017a0284de50mr4589053pzh.6.1697584915727; Tue, 17 Oct 2023 16:21:55 -0700 (PDT) Received: from localhost (fwdproxy-prn-008.fbsv.net. [2a03:2880:ff:8::face:b00c]) by smtp.gmail.com with ESMTPSA id e7-20020a170902b78700b001c735421215sm2116251pls.216.2023.10.17.16.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 16:21:55 -0700 (PDT) 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, 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 v3 3/5] mm: memcg: add per-memcg zswap writeback stat Date: Tue, 17 Oct 2023 16:21:50 -0700 Message-Id: <20231017232152.2605440-4-nphamcs@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017232152.2605440-1-nphamcs@gmail.com> References: <20231017232152.2605440-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: DBAEE40003 X-Stat-Signature: dx8pufazzkypd4nrar4p7cpjgaaqihcj X-Rspam-User: X-HE-Tag: 1697584916-14002 X-HE-Meta: U2FsdGVkX18sdVUbA70l/B+M8yCq69L9B6lqew7Lu5ZhsCT8mxJqq8n0vG6FlDcelIC5fW00pbijPGBDBLSZViXkQrjFx16ss00RJv0ZkVHzH8e+SCayv8ZZeoQyPcQaKLF8RtgMR2rqub6XUpprOW5omlV4lJ6bSkxLf6r9okcBIdDLYI2PRIZxanMhNGrmEpr34eB792sGVxTJDz/4oU9YJDpaTN0G5N8tjjcO1haXN2ru/utAkiSdegdBICKpmthEGtqgi6GuIQMVAQX3z76a78HiOoG1PS5ZxJIAfK2iRDybZxl/ELfqtrt6jX+8fAt9IGtBydDVbQYDRbRZ8wIIzBgNuqIbJV6HStQbx5NKfrdpnDp1fRWQ8bqDsOn+ZWFPFfKS3voLRXuHt+wVKYByH3WNw/Fbw7KCBg0yp238W/S0V1QVWwdPbinFfSmMdqEKECf26w/e57kiWUEenbxglwTgYohnOtytpdycHFaHE46ttT257OdRAslSd+gapmsNVmw65qr1QKsd2ZTCNM2c6TgAx6Dh8+F3TR5EU2AAcyj+VIfc3qx6zcQjbyVmxAv5S963YOOuLqRXduSPEMY0hc/2BUdsRXtpH6AVL2jBEq3dT1ckH8xFjbV2CpYkP3nG2k5NjFu3F0tLcG2nPoSXdJouhft4/JDULD8W4zDm5gTI5q5b39Gv1hE0p6a3Mi+GvaBU49OUWd4b7nWGYAczxx/88yb7wPer/7wq5yCnD8FRts1+Qg89iHt5wg/2diDaNkU5tcFe750HrULuiuGQ7Zxbtow8mldcQCDKyVbk3gi90CHvQoTuq6mqxk3e9rzl5Mg/iDPFoPu9RAdTvUA3dmsT0sVkH6OwjS6AAxU4NSsL5jA6Wq0UA/zHhGWGGgvIATSAOjueLWgQpFLu0xfSJHH5ELZaj7lxcqMZ+rh0zObM14bifpdT1n9qFyAgKudscX7FIKMC1xgmFgz TEkTRONF PCdCg04rAeRIsd5E9eN5gVoC+fIHzD4f3REYxuwDBXd1/i9AYl7su6fjbbRDXlVmXZWMvEfjMQJqizgaxlzat7fL8JBXtYtbss4JNL2Txl4ByMd+7BZepOxXF5F05OZvMPoMEBRjkqhXIYD1j9H9o+3bNO8L4eS7pfv8WNpD2/Tvw/fppiC+NHPwG8V0HO2zN0u26OlIo9ssy6erfEnbaRde1evnqrQMWSA0FMPccjd7OXLbPJy/yFDSU8REMtCg3c1pI2+W9bTs9rl+E+DpuG/nZeqLIzF+dzhhihGBdYn6LU4461ZN02m7vK50mDXDewdkXe3jlXI9HjPGNEjJkrivwaGDD9RRwqdJtfXYNOxjlYGBkSWPCD2INqLWyRmwe5jiCYP1WvLCkvcZUdhfktAbh9xOMLPZcNblMaZXfT7wfwjC2e8szVuFI2sxwoo2em/HLs0CgT5zZzMw2asvN7YYU7g== 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: 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 Acked-by: Nhat Pham --- include/linux/memcontrol.h | 2 ++ mm/memcontrol.c | 15 +++++++++++++++ mm/zswap.c | 3 +++ 3 files changed, 20 insertions(+) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 3de10fabea0f..7868b1e00bf5 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -38,6 +38,7 @@ enum memcg_stat_item { MEMCG_KMEM, MEMCG_ZSWAP_B, MEMCG_ZSWAPPED, + MEMCG_ZSWAP_WB, MEMCG_NR_STAT, }; @@ -1884,6 +1885,7 @@ static inline void count_objcg_event(struct obj_cgroup *objcg, bool obj_cgroup_may_zswap(struct obj_cgroup *objcg); void obj_cgroup_charge_zswap(struct obj_cgroup *objcg, size_t size); void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size); +void obj_cgroup_report_zswap_wb(struct obj_cgroup *objcg); #else static inline bool obj_cgroup_may_zswap(struct obj_cgroup *objcg) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1bde67b29287..a9118871e5a6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1505,6 +1505,7 @@ static const struct memory_stat memory_stats[] = { #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) { "zswap", MEMCG_ZSWAP_B }, { "zswapped", MEMCG_ZSWAPPED }, + { "zswap_wb", MEMCG_ZSWAP_WB }, #endif { "file_mapped", NR_FILE_MAPPED }, { "file_dirty", NR_FILE_DIRTY }, @@ -1541,6 +1542,7 @@ static int memcg_page_state_unit(int item) switch (item) { case MEMCG_PERCPU_B: case MEMCG_ZSWAP_B: + case MEMCG_ZSWAP_WB: case NR_SLAB_RECLAIMABLE_B: case NR_SLAB_UNRECLAIMABLE_B: case WORKINGSET_REFAULT_ANON: @@ -7861,6 +7863,19 @@ void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size) rcu_read_unlock(); } +void obj_cgroup_report_zswap_wb(struct obj_cgroup *objcg) +{ + struct mem_cgroup *memcg; + + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) + return; + + rcu_read_lock(); + memcg = obj_cgroup_memcg(objcg); + mod_memcg_state(memcg, MEMCG_ZSWAP_WB, 1); + rcu_read_unlock(); +} + static u64 zswap_current_read(struct cgroup_subsys_state *css, struct cftype *cft) { diff --git a/mm/zswap.c b/mm/zswap.c index d2989ad11814..15485427e3fa 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -704,6 +704,9 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o } zswap_written_back_pages++; + if (entry->objcg) + obj_cgroup_report_zswap_wb(entry->objcg); + /* * Writeback started successfully, the page now belongs to the * swapcache. Drop the entry from zswap - unless invalidate already