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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97100C4167B for ; Wed, 29 Nov 2023 02:42:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234835AbjK2CmI (ORCPT ); Tue, 28 Nov 2023 21:42:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230361AbjK2CmC (ORCPT ); Tue, 28 Nov 2023 21:42:02 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 661041707 for ; Tue, 28 Nov 2023 18:42:08 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0064C433CB; Wed, 29 Nov 2023 02:42:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1701225728; bh=jb4AtzigHdbd212vQqGPuwv+zmXtsbjGxFnV7fPD7y8=; h=Date:To:From:Subject:From; b=u4RYSAxdz2QP81Zd08XBIdDictgnzcPE67hsPds1vAR1EUiX7MjMzz+LZptJiZ37W WP2abUhMkNQGUWiOG8N5Gf2KlNVoA6/0JgM51njs9WOkG2Ej7t3ICnwLKUGiRkRgtG SKsj7SzKskyvSHHhI1Z1j8KTgdVJunTyklfFNf0I= Date: Tue, 28 Nov 2023 18:42:06 -0800 To: mm-commits@vger.kernel.org, yosryahmed@google.com, vitaly.wool@konsulko.com, sjenning@redhat.com, shuah@kernel.org, shakeelb@google.com, roman.gushchin@linux.dev, nphamcs@gmail.com, muchun.song@linux.dev, mhocko@kernel.org, hannes@cmpxchg.org, ddstreet@ieee.org, chrisl@kernel.org, cerasuolodomenico@gmail.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-memcg-add-per-memcg-zswap-writeback-stat.patch added to mm-unstable branch Message-Id: <20231129024207.F0064C433CB@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm: memcg: add per-memcg zswap writeback stat has been added to the -mm mm-unstable branch. Its filename is mm-memcg-add-per-memcg-zswap-writeback-stat.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-memcg-add-per-memcg-zswap-writeback-stat.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Domenico Cerasuolo Subject: mm: memcg: add per-memcg zswap writeback stat Date: Mon, 27 Nov 2023 15:45:58 -0800 Since zswap now writes back pages from memcg-specific LRUs, we now need a new stat to show writebacks count for each memcg. Link: https://lkml.kernel.org/r/20231127234600.2971029-5-nphamcs@gmail.com Signed-off-by: Domenico Cerasuolo Signed-off-by: Nhat Pham Suggested-by: Nhat Pham Cc: Chris Li Cc: Dan Streetman Cc: Johannes Weiner Cc: Michal Hocko Cc: Muchun Song Cc: Roman Gushchin Cc: Seth Jennings Cc: Shakeel Butt Cc: Shuah Khan Cc: Vitaly Wool Cc: Yosry Ahmed Signed-off-by: Andrew Morton --- include/linux/vm_event_item.h | 1 + mm/memcontrol.c | 1 + mm/vmstat.c | 1 + mm/zswap.c | 3 +++ 4 files changed, 6 insertions(+) --- a/include/linux/vm_event_item.h~mm-memcg-add-per-memcg-zswap-writeback-stat +++ a/include/linux/vm_event_item.h @@ -142,6 +142,7 @@ enum vm_event_item { PGPGIN, PGPGOUT, PS #ifdef CONFIG_ZSWAP ZSWPIN, ZSWPOUT, + ZSWP_WB, #endif #ifdef CONFIG_X86 DIRECT_MAP_LEVEL2_SPLIT, --- a/mm/memcontrol.c~mm-memcg-add-per-memcg-zswap-writeback-stat +++ a/mm/memcontrol.c @@ -703,6 +703,7 @@ static const unsigned int memcg_vm_event #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) ZSWPIN, ZSWPOUT, + ZSWP_WB, #endif #ifdef CONFIG_TRANSPARENT_HUGEPAGE THP_FAULT_ALLOC, --- a/mm/vmstat.c~mm-memcg-add-per-memcg-zswap-writeback-stat +++ a/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", --- a/mm/zswap.c~mm-memcg-add-per-memcg-zswap-writeback-stat +++ a/mm/zswap.c @@ -754,6 +754,9 @@ static enum lru_status shrink_memcg_cb(s } 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 _ Patches currently in -mm which might be from cerasuolodomenico@gmail.com are zswap-make-shrinking-memcg-aware.patch mm-memcg-add-per-memcg-zswap-writeback-stat.patch selftests-cgroup-update-per-memcg-zswap-writeback-selftest.patch