From patchwork Thu Aug 19 19:55:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 12447915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C099C43214 for ; Thu, 19 Aug 2021 19:54:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0CAE060720 for ; Thu, 19 Aug 2021 19:54:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0CAE060720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id BE0886B0073; Thu, 19 Aug 2021 15:54:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B40CB6B0074; Thu, 19 Aug 2021 15:54:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A07526B0075; Thu, 19 Aug 2021 15:54:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0149.hostedemail.com [216.40.44.149]) by kanga.kvack.org (Postfix) with ESMTP id 866FB6B0073 for ; Thu, 19 Aug 2021 15:54:00 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 1E6371801C1A6 for ; Thu, 19 Aug 2021 19:54:00 +0000 (UTC) X-FDA: 78492881040.16.2F3F2BA Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by imf26.hostedemail.com (Postfix) with ESMTP id C632E20019C4 for ; Thu, 19 Aug 2021 19:53:59 +0000 (UTC) Received: by mail-qv1-f44.google.com with SMTP id q6so4256994qvs.12 for ; Thu, 19 Aug 2021 12:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8+UhPfvB4V7hB7D/Na/kzqHbrTzZZtUZNRqqvxGPOUU=; b=K0GYs6I/N/DQa4Q/WBxWRF15jR9c4tavLgSYprqqRx8sBXLmwecuXtr0ZktuI+aA56 fRP3qbALBqYGJL1cNqigf9watu8Lky+IsjBKMPjmAKfmitE0ykqdFm3AtqU//7+01RVz F0l0xvl7/hdOt7vjIiLI6C7r5fk4g9Cf5KGx95pp2EMnTGNYVezI+8f2wQ/T1XRvrGHI CyvOnGgAbyhjouRzgIyOpv3qnJFnoDprs/RbZUvn123LJppNO2yO/RISOh1gOepQU2j0 EuQqrVW8kd2yOVH90bTVnpOMDiPw1Dy8qBmaUYi7Di8/ZJygsovkDayuQCeZRRDnTnye Y6sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8+UhPfvB4V7hB7D/Na/kzqHbrTzZZtUZNRqqvxGPOUU=; b=CqK6LD7tNFC/E0tf+XJ5WvBj6GtqNtJfhMcweoDjczV44BWl6kJLXQlDgSYDntB3Gq cbYMPeoqYrBWFM/PXy45cguAFbgd8QwHItMJepV5EOICZarniN0haEmL76tLgXLIKJLW qqUhBdiRE4TBXBaAZe74gjzbBCMNyR5xwL8pgJsEwYJWdDJDhjrg3a9feJUW18tYY7j8 fKOV2qt3B+tZp6FSwlpUVs5JPET09HR45Maxd25eVI9LuMz65b6OLpNqCjRgrTZLhfmQ BK8uapBO7JlEHrshsrFH34TjB0T27Msgl+XWtUkO2vipZLe3r7kCLuaDeuOhX7YCE5+M bDaA== X-Gm-Message-State: AOAM531CgQUaZdk3nUHRiiNWwPKiO+EKEHlwDM8Rk1FUeVxfQ19GkDgp vEqM5SPF6Q4oNlrCzAtMOU7G0w== X-Google-Smtp-Source: ABdhPJyGrl6h+vXHMzNA02B4FcCZPgSeu/NJ4nBm+YlvcMFckMlp5WMer3tqpLgdavYnAW1XKwWjlQ== X-Received: by 2002:a05:6214:3ca:: with SMTP id ce10mr16219837qvb.42.1629402839186; Thu, 19 Aug 2021 12:53:59 -0700 (PDT) Received: from localhost (cpe-98-15-154-102.hvc.res.rr.com. [98.15.154.102]) by smtp.gmail.com with ESMTPSA id a17sm1688738qtp.61.2021.08.19.12.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 12:53:58 -0700 (PDT) From: Johannes Weiner To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 4/4] mm: zswap: add basic meminfo and vmstat coverage Date: Thu, 19 Aug 2021 15:55:33 -0400 Message-Id: <20210819195533.211756-4-hannes@cmpxchg.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210819195533.211756-1-hannes@cmpxchg.org> References: <20210819195533.211756-1-hannes@cmpxchg.org> MIME-Version: 1.0 Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b="K0GYs6I/"; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf26.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.44 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org X-Stat-Signature: ycg9pid1k7znzb6yzair4cksiu8fsqdm X-Rspamd-Queue-Id: C632E20019C4 X-Rspamd-Server: rspam05 X-HE-Tag: 1629402839-54744 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: Currently it requires poking at debugfs to figure out the size of the zswap cache size on a host. There are no counters for reads and writes against the cache. This makes it difficult to understand behavior on production systems. Print zswap memory consumption in /proc/meminfo, count zswapouts and zswapins in /proc/vmstat. Signed-off-by: Johannes Weiner Reported-by: kernel test robot --- fs/proc/meminfo.c | 4 ++++ include/linux/swap.h | 4 ++++ include/linux/vm_event_item.h | 4 ++++ mm/vmstat.c | 4 ++++ mm/zswap.c | 11 +++++------ 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 6fa761c9cc78..2dc474940691 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -86,6 +86,10 @@ static int meminfo_proc_show(struct seq_file *m, void *v) show_val_kb(m, "SwapTotal: ", i.totalswap); show_val_kb(m, "SwapFree: ", i.freeswap); +#ifdef CONFIG_ZSWAP + seq_printf(m, "Zswap: %8lu kB\n", + (unsigned long)(zswap_pool_total_size >> 10)); +#endif show_val_kb(m, "Dirty: ", global_node_page_state(NR_FILE_DIRTY)); show_val_kb(m, "Writeback: ", diff --git a/include/linux/swap.h b/include/linux/swap.h index 144727041e78..3b23c88b6a8d 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -696,6 +696,10 @@ static inline int mem_cgroup_swappiness(struct mem_cgroup *mem) } #endif +#ifdef CONFIG_ZSWAP +extern u64 zswap_pool_total_size; +#endif + #if defined(CONFIG_SWAP) && defined(CONFIG_MEMCG) && defined(CONFIG_BLK_CGROUP) extern void cgroup_throttle_swaprate(struct page *page, gfp_t gfp_mask); #else diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index ae0dd1948c2b..9dbebea09c69 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -125,6 +125,10 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, SWAP_RA, SWAP_RA_HIT, #endif +#ifdef CONFIG_ZSWAP + ZSWPIN, + ZSWPOUT, +#endif #ifdef CONFIG_X86 DIRECT_MAP_LEVEL2_SPLIT, DIRECT_MAP_LEVEL3_SPLIT, diff --git a/mm/vmstat.c b/mm/vmstat.c index cccee36b289c..31aada15c571 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1369,6 +1369,10 @@ const char * const vmstat_text[] = { "swap_ra", "swap_ra_hit", #endif +#ifdef CONFIG_ZSWAP + "zswpin", + "zswpout", +#endif #ifdef CONFIG_X86 "direct_map_level2_splits", "direct_map_level3_splits", diff --git a/mm/zswap.c b/mm/zswap.c index 20763267a219..f93a7c715f76 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -40,7 +40,7 @@ * statistics **********************************/ /* Total bytes used by the compressed storage */ -static u64 zswap_pool_total_size; +u64 zswap_pool_total_size; /* The number of compressed pages currently stored in zswap */ static atomic_t zswap_stored_pages = ATOMIC_INIT(0); /* The number of same-value filled pages currently stored in zswap */ @@ -1231,6 +1231,7 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset, /* update stats */ atomic_inc(&zswap_stored_pages); zswap_update_total_size(); + count_vm_event(ZSWAPOUT); return 0; @@ -1273,11 +1274,10 @@ static int zswap_frontswap_load(unsigned type, pgoff_t offset, zswap_fill_page(dst, entry->value); kunmap_atomic(dst); ret = 0; - goto freeentry; + goto stats; } if (!zpool_can_sleep_mapped(entry->pool->zpool)) { - tmp = kmalloc(entry->length, GFP_ATOMIC); if (!tmp) { ret = -ENOMEM; @@ -1292,10 +1292,8 @@ static int zswap_frontswap_load(unsigned type, pgoff_t offset, src += sizeof(struct zswap_header); if (!zpool_can_sleep_mapped(entry->pool->zpool)) { - memcpy(tmp, src, entry->length); src = tmp; - zpool_unmap_handle(entry->pool->zpool, entry->handle); } @@ -1314,7 +1312,8 @@ static int zswap_frontswap_load(unsigned type, pgoff_t offset, kfree(tmp); BUG_ON(ret); - +stats: + count_vm_event(ZSWAPIN); freeentry: spin_lock(&tree->lock); zswap_entry_put(tree, entry);