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 6C952CDB474 for ; Tue, 17 Oct 2023 23:35:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 12E8E8D0122; Tue, 17 Oct 2023 19:35:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 105BE8D011E; Tue, 17 Oct 2023 19:35:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F10218D0122; Tue, 17 Oct 2023 19:35:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E20B88D011E for ; Tue, 17 Oct 2023 19:35:28 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A05E280F06 for ; Tue, 17 Oct 2023 23:35:28 +0000 (UTC) X-FDA: 81356562336.18.05E6FD2 Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) by imf17.hostedemail.com (Postfix) with ESMTP id E9B1240019 for ; Tue, 17 Oct 2023 23:35:26 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=JW5dUeyw; spf=pass (imf17.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.166.179 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=1697585727; a=rsa-sha256; cv=none; b=DIo3ZHNCCsiTZG+aa2zYFOlzUxD5npfrHKpLI7ke3hD/egJ/f4JoiO0loWtzJCdfcrv1QN Sm1aNT+EbE8uwWa/Ee+gtKwx7XBHujh1y5hEvDYnbFUZpzPScDDQ3z8pCclBeN7O5azbPs J8p/Nni4TvwF31QLed53TLrZTOtsl0o= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=JW5dUeyw; spf=pass (imf17.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.166.179 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=1697585726; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tdTkOsSZlVefGaBdezW5bHhWJDivZZTWywSdxQVCUN4=; b=4TCCh6kNfZ/uwH/mSXEIGVnD1UQH0GCmWrv/bhtIC9GFM7QJ2w/bxFBdGGE+a9EOTW89ih StjEK0gv41Tskc/tCz9WgGy/a4LbUZ54dTMmMba0Iv74Q+BMIMbzEGFyBPkw186hQhFZcX whVdZR4nX/1yvgrM3fS3aO0T/3ZM04w= Received: by mail-il1-f179.google.com with SMTP id e9e14a558f8ab-35164833a21so18445465ab.0 for ; Tue, 17 Oct 2023 16:35:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697585726; x=1698190526; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=tdTkOsSZlVefGaBdezW5bHhWJDivZZTWywSdxQVCUN4=; b=JW5dUeywhFj3DcP8f5BPXtpml2CzTH0/MjJOi2WE6Zw6JU0+GvzfS+ZKj/bFA3lYGO qVAEM69hKOi3YAIe67+xBscOAQzoaeyB0L/i3/oP0nYzL3VrOB7IF4o2l7cncYICT/E6 /BMlQDnl96pavl6kvq6hTsuwbivVEDh8qQau06JLQweBlknoPWoFlOmem4obtAP3yPUD Z4HxzdU++jU8RlL69jR7C0nTrz0qzhjR1h0aKq59aWg9yGJZYj2jl2AzUq7cL9nR54Ta sgv7Q3noNe8H1xikSqgJ4YOzWDl7ZxcEcn8CDwyOZMCHKSSvZ5JU1IW5SBgY7x1Xj9Zu Iy2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697585726; x=1698190526; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tdTkOsSZlVefGaBdezW5bHhWJDivZZTWywSdxQVCUN4=; b=CQZSMJ+IkBJRRFt+4+BMbL8WUoRg1b2l7X6QBV8Ka3j5wE2aplQBpxpYkfnO3BKkI7 hNxcqpSsQqI/a8K8vYD/HqyZGDktOxdGTL5E503wc0XhpCHe+VZOdsqIohVnj+CB6XsP Z01Nke5XYFu9EOBf9aly/L4Jz2+sGPHaXX/W0X0NFfdSV3eaVoASBXbTH8QjW3ImcqBS wVCRwaZACiY4MGYqwFkSC205YxgJjgED/5iBL7nN8Rim4eiOEvJ5Q2uF0fPgt525bbXI 9LSclrHM5gk2QQ/Mrk3k+GHNH14ngR+fUy5Y/SrgcgSyLT5W+GUF3v7kUPT3+x5soWe5 a37g== X-Gm-Message-State: AOJu0YzG+CnbH7iW7dPLEPsNsPPMP6lwO/SUlnTVwsOuIbhd60nnyeoL msXUlvuz/pec3DDsmJyEJVj7a6faeJ98PmXWvns= X-Google-Smtp-Source: AGHT+IGNULEr1VCr1CogtesXNMKtN++yHXc6oz2Eu5RJNdWzMlS7JszuvVJ5xImYIQMrxF4YcuRnvOv4uLbYQJgZsbg= X-Received: by 2002:a05:6e02:3205:b0:351:375f:2a31 with SMTP id cd5-20020a056e02320500b00351375f2a31mr3101949ilb.6.1697585726148; Tue, 17 Oct 2023 16:35:26 -0700 (PDT) MIME-Version: 1.0 References: <20231017232152.2605440-1-nphamcs@gmail.com> <20231017232152.2605440-4-nphamcs@gmail.com> In-Reply-To: <20231017232152.2605440-4-nphamcs@gmail.com> From: Nhat Pham Date: Tue, 17 Oct 2023 16:35:13 -0700 Message-ID: Subject: Re: [PATCH v3 3/5] mm: memcg: add per-memcg zswap writeback stat 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: E9B1240019 X-Stat-Signature: 6ybnnsbn9qdnqubu6gs969ektp7iatcr X-Rspam-User: X-HE-Tag: 1697585726-964338 X-HE-Meta: U2FsdGVkX1+Wjt6FvPGHGXCX+/nWZ2RlBhrOOqvXWIvzGSEnpzAvAz4XW1REJpu66+kE6Cb2qoJ4MkPA+EAkcmnSwFNSe6m4L1DJjw6xukvDoiZUwMfAWQyeLsBH3t7PjfxuiGkHqtnfYSBf96gCfrYenyB2sCSUlonsaQGnxAPdK236Tv0nA+wRADQMijMQ0yEfpb8CkzflrjZRZhmXvH0jRiqRfyewzTyoffI1/ApUukXtSRltvevf76biDRpnamdk3fIZ8tEwD3JGI7M+ZdUcUkb03B1gFNfPvL+DCmHAHqwDTgQ3Sgw9bLh8ZmJf9dPNCzRdPwd3jWQM86bx1WvRX9R06Uam0/mzhWLWqPVT707BbD++GjFuK7f7nme1kXWr/tsc4w4jTg7j5ElrsYlY7k++OMZCNpLQzyyjyPCzWJGMEA1EjHTw/mY9bI85Ui7cTAzBM7LEOT5UtbeYWKEVTxuAIrOwtvsMwciQgZMdPEjF+/kyuoc0Z75cX2Ick+bXttpzp4+J4vdHLb2/Rtlp8jSApV7jiiapU/YiI0ZKmuhA4EGqDA6+vh9PZnjLo6PXiXWjhx9sg0vCH1rt8BC+nHxNHf5ZIQy63mQdvnkjLAcP4xMCgQbXnrJTYjd4kmcSygR/WqRYeVZ3BNg4Ib50QpvneW4ycz46nSKUb4GLurKsxRwgtqNyVFjXDnCob4QK+ZjQ4uIhw/dUBa0rkcyGl7NNA4bjESm47U5gUmjcWB+jBZCGa3cqc+FYIYz6wY42G7aHrNys6keCTXl/UFHkyyXJSvLan3TQ+kVN3fjVnpfwAYsoQTcaO9iWnkAT22nY6K1Ph+dJQFI81FlC/KgqpjOgwHm828JGjX7EUO8q390GlzQNxX82FJGivX8vF80CeC7RL8cWy+mMPLWySUaJcz+J1Xr4gwbPXxnmMt/WFnm1rNOnAr3aYWXd+BxIZc+f0wlqNkEWpwCka0L 5rEgM6/3 1r8S6ZBJ9cwbMWTy0AJhc2/IrsIvLCmDFD+aBwqsrF2hR1wxDpW4ri6ZRg2UxvsbUf0rDQ6WAc071pb4hUv9MxYB5965eRRGzFyHFASDqaPPKnAI9u8qNPeymS1QiB9j6FSas/hIn9EW0b2IpUeh4Xe0b844M0T6sTgpIl6tsyR043zRNnPWuDLrGDijYFpkDyDXURRjRUAM+fiolqQghgP2f3X1QmQ5Sg5L4aVHCAei5QYZd+Z90JxeiwRr7efrIm67/6HZucIxKaFtSBmcnsZ7NFb69vWt1PJfxawpmrSCouXeeYLZhKcupLUQxydYTL7oV7MSxftMYIB9z0gVB+h83wXUc7JClaDo+sbBM0QzXlIZMphtY4bX1P1aYMW7x+oe5kDAohrbeFDp32qsrRNCUp7CB1VLoQZjT 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: On Tue, Oct 17, 2023 at 4:21=E2=80=AFPM Nhat Pham wrote= : > > 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 /s/Signed-off/Acked This is Domenico's work :) I used the wrong tag here. Should be: 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_cgr= oup *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[] =3D = { > #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 =3D 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_he= ad *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 alrea= dy > -- > 2.34.1