From patchwork Sat May 4 07:30:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanchu Xie X-Patchwork-Id: 13653801 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 41034C10F1A for ; Sat, 4 May 2024 07:31:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E4F306B0099; Sat, 4 May 2024 03:30:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD50F6B009A; Sat, 4 May 2024 03:30:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C03266B009C; Sat, 4 May 2024 03:30:57 -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 9CBA36B0099 for ; Sat, 4 May 2024 03:30:57 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 316CA1C1628 for ; Sat, 4 May 2024 07:30:57 +0000 (UTC) X-FDA: 82079891754.17.623D573 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf30.hostedemail.com (Postfix) with ESMTP id 6BAFC8000B for ; Sat, 4 May 2024 07:30:55 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=gxzM6UWN; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf30.hostedemail.com: domain of 3LuQ1ZgcKCAc51hujo1nvvnsl.jvtspu14-ttr2hjr.vyn@flex--yuanchu.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3LuQ1ZgcKCAc51hujo1nvvnsl.jvtspu14-ttr2hjr.vyn@flex--yuanchu.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714807855; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OLxnf5SNOBvzXGjywTGAaG+Rg/LHUrvR7uH9tSjT/P0=; b=1E07P5J8yGhM7+s/mmBhILbZTRV3it4wM+Uxsk8Ht/eOW29L578Sdk3+arE0DOWi7N2NPB wS8jrCnkwS+7AXYmMWUPXlUwWPUXgmzgY/NKGm+nnNQoK0IgNkf0XjUbO/KzNurvj8N42M NdcQsW5mRYMGHquggpgG4djaz0HX0No= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=gxzM6UWN; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf30.hostedemail.com: domain of 3LuQ1ZgcKCAc51hujo1nvvnsl.jvtspu14-ttr2hjr.vyn@flex--yuanchu.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3LuQ1ZgcKCAc51hujo1nvvnsl.jvtspu14-ttr2hjr.vyn@flex--yuanchu.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714807855; a=rsa-sha256; cv=none; b=jhQrxTwUSiOmHJMWC3q6mJcvKRNkU1A/BhUI+Y2d4NrYJTn05r9QYNtFlSp0gMijY/4bNI fy8fmrmWcqlBUsY+bw+aYxpfmuO26AL1EtB/ep8FFq1EoaWQkRjnlM5BjFLkfmnM1HDaU/ cFiWgu4TpRBY1oM02fVyujIN9VM1TkE= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc647f65573so1095417276.2 for ; Sat, 04 May 2024 00:30:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714807854; x=1715412654; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=OLxnf5SNOBvzXGjywTGAaG+Rg/LHUrvR7uH9tSjT/P0=; b=gxzM6UWNiBBS6S5W1T9Oon+A/dY50brxa3g53BdBtq+LdvLCWIwcs6FMoC8ziBbitw mMR5en6udsUrAbFk3SdKQcBKdK86UHduXFpYNXpoDRw3lZOtYwLYDnxhkP0ovnfXT2p/ aQtZDigD4QRU6X+iIB7dKML9SRF7I4lhW/js8TcppPeCYjQSYzQ/++O9VqLmMQxBfI95 HCnnEAXU99LrzysZD9ypp6HiEsld9qRsZxX731md0tBr7vfBsnnsUuvpVtWlqB3mfb2Q qC55A0TRqH6XwiSqDxjIi+thcVNVuvE4yIhKsDPyAShcR/e88HmZdy4YmGUJhJACT3BA Jb1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714807854; x=1715412654; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OLxnf5SNOBvzXGjywTGAaG+Rg/LHUrvR7uH9tSjT/P0=; b=dE1XsdiNcTt7QjGcplWZNfG4ED1i3lSyV2lpGEHNKZl433lsszurfquSduMQm/7mjC Q9YSD6WmuRSSTQHXSAnmdZg2EJIU5LiDljvu98RS72Bz/yMTEaY6zUDF57H+q6Bigjrc 5ZIEYct92c0pPsL3Aa4BShApypbv0qRSdXMX71NR1cFgMM0Jh4t+aOZ8pibI1hxhr1So N9iEYn3iq2kmZn/5pi1/TX8DyD6G/Tcp4iWEX6x6rhsK5ym3BGDf/JsRMf68kjVLqLqA 2nc77p8Citsn8EuWZqkfhdtaxrxcc+uCSvrg2WRZRYNqmXfRKYALFB4CshDHuZD4pMrp glGQ== X-Forwarded-Encrypted: i=1; AJvYcCW06OOt0Mowzdnlq73rqpDMA0bleemLsOCHjsw1WtijT/RutULPNiGtl8a6q0keYiq1cYOnaDTa1weFQSi3fwShHXY= X-Gm-Message-State: AOJu0YweYBtKs7sf2S9ktSK1Q3qgWz+LWoRp4ychc0NRbo0tIUwqxovd 5oNcrTNMGX6/I53p+AUDlksLNaKd39tFE+mNkEz265s3MkqpXas6iX7Et7j/g+N1vP/svzGgp9d 6V0Ykrg== X-Google-Smtp-Source: AGHT+IFMWIH0/B+L30esndwBVP4G+01F+1D+FQUWzGkdOFH/SC8SF749caf3CDFWxV8mCGfLO0eXl3n/4iIt X-Received: from yuanchu-desktop.svl.corp.google.com ([2620:15c:2a3:200:da8f:bd07:9977:eb21]) (user=yuanchu job=sendgmr) by 2002:a05:6902:1146:b0:de5:2325:72a1 with SMTP id p6-20020a056902114600b00de5232572a1mr1491589ybu.4.1714807854549; Sat, 04 May 2024 00:30:54 -0700 (PDT) Date: Sat, 4 May 2024 00:30:09 -0700 In-Reply-To: <20240504073011.4000534-1-yuanchu@google.com> Mime-Version: 1.0 References: <20240504073011.4000534-1-yuanchu@google.com> X-Mailer: git-send-email 2.45.0.rc1.225.g2a3ae87e7f-goog Message-ID: <20240504073011.4000534-6-yuanchu@google.com> Subject: [PATCH v1 5/7] mm: extend working set reporting to memcgs From: Yuanchu Xie To: David Hildenbrand , "Aneesh Kumar K.V" , Khalid Aziz , Henry Huang , Yu Zhao , Dan Williams , Gregory Price , Huang Ying Cc: Kalesh Singh , Wei Xu , David Rientjes , Greg Kroah-Hartman , "Rafael J. Wysocki" , Andrew Morton , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Shuah Khan , Yosry Ahmed , Matthew Wilcox , Sudarshan Rajagopalan , Kairui Song , "Michael S. Tsirkin" , Vasily Averin , Nhat Pham , Miaohe Lin , Qi Zheng , Abel Wu , "Vishal Moola (Oracle)" , Kefeng Wang , Yuanchu Xie , linux-kernel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kselftest@vger.kernel.org X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 6BAFC8000B X-Stat-Signature: qc4u5njhxyu3f5jc7s5xqdefs7rn4isd X-HE-Tag: 1714807855-994029 X-HE-Meta: U2FsdGVkX19rtsF+F+4tv+6s0xAus5Aw2Ui1zrhUUr8A/CzpErjS1xmuwbQgzV23upI915VdBNVW7GQbd1tDPHQR/NJzXfxOOTWwAU08GjHWl/aJMEz78gLm3lEeQBSjr/5NR27KVvFqYLyZNP5/zDyobkei2/FjW3ApazuU3Pkpn4gwwWMZFdoTiRXMKv4LxInkwc5+/0mBgEmO5Kl38eucKt12reZ9IfJu2FAMi6AzeH5a0t7NP/sVxw2HIOeA7lFpKWGdNqf4SBLIUo6Yk8PZlxMD2WJESH8cL+p8HnH0k4bYIzAIDg4oj70r9AnK5aGfCnizTvl6hpjWizEV6Kehi1VUUIstWieMdN5RT9uQTVl2PnniwO1uBU4FVuvQ4UPzogRL+BNaxzvagWAsnaWaeRdQ5DrHkHpRtBpMxfiA/K2+BBgHhbT7CIEKW0WSwg4uJHa15ThkBJavv6IGFi3B/TDljJyqmcp/aXvXVHwUUbEW7+48VICa40O5IW6SOUvnlxQYoOKDCtOHxUW62k1texQ3Ic7kLd4TaKD1gvUEsVj52Ho8FLcaVLEPdA6FoPHNk4HTilNnGlKMWSNN8pjXlSXfvOhcNXVPxNfHFBUx7cSYvsnUDiJ2T9WLxQ6BewkzNXsh4sXHpNXYbu35OQxcLpzpJRHug4/XjhA71ub77wAEkgJd1RQL1IpkpScHpqKGlus7ltvkfhat9jWjaiEE5Ixiz6Q4qZupG6Sj+og/LNnroyubVtKYbdDVM5ar6kOvh1Q0I+91vOd10I3vVVZxcqfp7EfMuWarK0+HhgNpFbpHsPpf0iVCA/2mcrbDRTNIiDOVCIOoCxTZIvVu6ZJvLVaRTdImCAGMk3l0AgyM8Dm4nzfYid3054q1w4T2YF6/aMdG6xDI56a9x1w/gFfk7s0ysi/Utn0r6tKKYCXuHw3z81cexh87p2xfAH9QVdS9neTy2kAOq6CFHGK NcHw31tN i19hrwMVt/F6rgJ8syQQmoOb2dxEeR4Bi5tDabPBFk3Dt8UZnaRcRYyiUGs+cpV/J5begVnLOC3pptDKY0NkgPEUyezeAYE946GLNGCpqjNsBSP1LW4ssberkIzctJayjRHBW9YS6AkNfsRMl5LlX/1wzlvzUN57N63RIPG8uNV3hE2fg0TK5juvo0YPF9lYf+FYE5q72eJNBWSUDmz69L7iBlHUBKWHgoG508eWkr1BHHkZcaIBY4xuWv9lbkhaWHTC113NxCAslM5f9ttwhqHSGBnLQZUN9yGKrwF15OAFXQJAVl7/V4mhqysrNFsFoMKmrdaXYaF6sOvWDjgUaVMY0vIIx+c7oK1tzrZ/crI5Pccfv2iHLdWnjVxZiWE/BKLUdZM7qf7avzQea70QPXnlbpzLnyLAbmdOOebd5U7PcHcNwA5321UCf2l8m9YnaxC5DdeH+hCLHRk9IsOGBBNgzRLeL32Dk9eN7BDyZl4bMcsXWDFnGQk6EdDt4MKeT96BNxsLJRw+fSdP/TMOQbi/kMYFGssOYZ+zQdlOi3IqdGUUJqBSSyNBdC9omV6lwxZQ/pAL7VvOmCgH/wP7Cj9krKSV3yNEX4I4VEOuf3WzijnaXejY45djnTR4wGwU08y2n+FyMR021TL7IBI6JfTAWmPoV6iRDWSxnJgq/Aom6USjcAm46S8Hd1Q== 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: List-Subscribe: List-Unsubscribe: Break down the system-wide working set reporting into per-memcg reports, which aggregages its children hierarchically. The per-node working set reporting histograms and refresh/report threshold files are presented as memcg files, showing a report containing all the nodes. The per-node page age interval is configurable in sysfs and not available per-memcg, while the refresh interval and report threshold are configured per-memcg. Memcg interface: /sys/fs/cgroup/.../memory.workingset.page_age The memcg equivalent of the sysfs workingset page age histogram, breaks down the workingset of this memcg and its children into page age intervals. Each node is prefixed with a node header and a newline. Non-proactive direct reclaim on this memcg can also wake up userspace agents that are waiting on this file. e.g. N0 1000 anon=0 file=0 2000 anon=0 file=0 3000 anon=0 file=0 4000 anon=0 file=0 5000 anon=0 file=0 18446744073709551615 anon=0 file=0 /sys/fs/cgroup/.../memory.workingset.refresh_interval The memcg equivalent of the sysfs refresh interval. A per-node number of how much time a page age histogram is valid for, in milliseconds. e.g. echo N0=2000 > memory.workingset.refresh_interval /sys/fs/cgroup/.../memory.workingset.report_threshold The memcg equivalent of the sysfs report threshold. A per-node number of how often userspace agent waiting on the page age histogram can be woken up, in milliseconds. e.g. echo N0=1000 > memory.workingset.report_threshold Signed-off-by: Yuanchu Xie --- include/linux/memcontrol.h | 5 + include/linux/workingset_report.h | 6 +- mm/internal.h | 2 + mm/memcontrol.c | 178 +++++++++++++++++++++++++++++- mm/workingset_report.c | 12 +- 5 files changed, 198 insertions(+), 5 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 20ff87f8e001..7d7bc0928961 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -335,6 +335,11 @@ struct mem_cgroup { struct lru_gen_mm_list mm_list; #endif +#ifdef CONFIG_WORKINGSET_REPORT + /* memory.workingset.page_age file */ + struct cgroup_file workingset_page_age_file; +#endif + struct mem_cgroup_per_node *nodeinfo[]; }; diff --git a/include/linux/workingset_report.h b/include/linux/workingset_report.h index 2ec8b927b200..ae412d408037 100644 --- a/include/linux/workingset_report.h +++ b/include/linux/workingset_report.h @@ -9,6 +9,7 @@ struct mem_cgroup; struct pglist_data; struct node; struct lruvec; +struct cgroup_file; #ifdef CONFIG_WORKINGSET_REPORT @@ -40,7 +41,10 @@ struct wsr_state { unsigned long report_threshold; unsigned long refresh_interval; - struct kernfs_node *page_age_sys_file; + union { + struct kernfs_node *page_age_sys_file; + struct cgroup_file *page_age_cgroup_file; + }; /* breakdown of workingset by page age */ struct mutex page_age_lock; diff --git a/mm/internal.h b/mm/internal.h index 36480c7ac0dd..3730c8399ad4 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -212,6 +212,8 @@ extern void reclaim_throttle(pg_data_t *pgdat, enum vmscan_throttle_state reason void notify_workingset(struct mem_cgroup *memcg, struct pglist_data *pgdat); /* Requires wsr->page_age_lock held */ void wsr_refresh_scan(struct lruvec *lruvec, unsigned long refresh_interval); +int workingset_report_intervals_parse(char *src, + struct wsr_report_bins *bins); #else static inline void notify_workingset(struct mem_cgroup *memcg, struct pglist_data *pgdat) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b5b67c93c287..c6c0d2772279 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7005,6 +7005,162 @@ static ssize_t memory_reclaim(struct kernfs_open_file *of, char *buf, return nbytes; } +#ifdef CONFIG_WORKINGSET_REPORT +static int memory_ws_refresh_interval_show(struct seq_file *m, void *v) +{ + int nid; + struct mem_cgroup *memcg = mem_cgroup_from_seq(m); + + for_each_node_state(nid, N_MEMORY) { + struct wsr_state *wsr = + &mem_cgroup_lruvec(memcg, NODE_DATA(nid))->wsr; + + seq_printf(m, "N%d=%u ", nid, + jiffies_to_msecs(READ_ONCE(wsr->refresh_interval))); + } + seq_putc(m, '\n'); + + return 0; +} + +static ssize_t memory_wsr_threshold_parse(char *buf, size_t nbytes, + unsigned int *nid_out, + unsigned int *msecs) +{ + char *node, *threshold; + unsigned int nid; + int err; + + buf = strstrip(buf); + threshold = buf; + node = strsep(&threshold, "="); + + if (*node != 'N') + return -EINVAL; + + err = kstrtouint(node + 1, 0, &nid); + if (err) + return err; + + if (nid >= nr_node_ids || !node_state(nid, N_MEMORY)) + return -EINVAL; + + err = kstrtouint(threshold, 0, msecs); + if (err) + return err; + + *nid_out = nid; + + return nbytes; +} + +static ssize_t memory_ws_refresh_interval_write(struct kernfs_open_file *of, + char *buf, size_t nbytes, + loff_t off) +{ + unsigned int nid, msecs; + struct wsr_state *wsr; + struct mem_cgroup *memcg = mem_cgroup_from_css(of_css(of)); + ssize_t ret = memory_wsr_threshold_parse(buf, nbytes, &nid, &msecs); + + if (ret < 0) + return ret; + + wsr = &mem_cgroup_lruvec(memcg, NODE_DATA(nid))->wsr; + + mutex_lock(&wsr->page_age_lock); + if (msecs && !wsr->page_age) { + struct wsr_page_age_histo *page_age = + kzalloc(sizeof(struct wsr_page_age_histo), GFP_KERNEL); + + if (!page_age) { + ret = -ENOMEM; + goto unlock; + } + wsr->page_age = page_age; + } + if (!msecs && wsr->page_age) { + kfree(wsr->page_age); + wsr->page_age = NULL; + } + + WRITE_ONCE(wsr->refresh_interval, msecs_to_jiffies(msecs)); +unlock: + mutex_unlock(&wsr->page_age_lock); + return ret; +} + +static int memory_ws_report_threshold_show(struct seq_file *m, void *v) +{ + int nid; + struct mem_cgroup *memcg = mem_cgroup_from_seq(m); + + for_each_node_state(nid, N_MEMORY) { + struct wsr_state *wsr = + &mem_cgroup_lruvec(memcg, NODE_DATA(nid))->wsr; + + seq_printf(m, "N%d=%u ", nid, + jiffies_to_msecs(READ_ONCE(wsr->report_threshold))); + } + seq_putc(m, '\n'); + + return 0; +} + +static ssize_t memory_ws_report_threshold_write(struct kernfs_open_file *of, + char *buf, size_t nbytes, + loff_t off) +{ + unsigned int nid, msecs; + struct wsr_state *wsr; + struct mem_cgroup *memcg = mem_cgroup_from_css(of_css(of)); + ssize_t ret = memory_wsr_threshold_parse(buf, nbytes, &nid, &msecs); + + if (ret < 0) + return ret; + + wsr = &mem_cgroup_lruvec(memcg, NODE_DATA(nid))->wsr; + WRITE_ONCE(wsr->report_threshold, msecs_to_jiffies(msecs)); + return ret; +} + +static int memory_ws_page_age_show(struct seq_file *m, void *v) +{ + int nid; + struct mem_cgroup *memcg = mem_cgroup_from_seq(m); + + for_each_node_state(nid, N_MEMORY) { + struct wsr_state *wsr = + &mem_cgroup_lruvec(memcg, NODE_DATA(nid))->wsr; + struct wsr_report_bin *bin; + + if (!READ_ONCE(wsr->page_age)) + continue; + + wsr_refresh_report(wsr, memcg, NODE_DATA(nid)); + mutex_lock(&wsr->page_age_lock); + if (!wsr->page_age) + goto unlock; + seq_printf(m, "N%d\n", nid); + for (bin = wsr->page_age->bins; + bin->idle_age != WORKINGSET_INTERVAL_MAX; bin++) + seq_printf(m, "%u anon=%lu file=%lu\n", + jiffies_to_msecs(bin->idle_age), + bin->nr_pages[0] * PAGE_SIZE, + bin->nr_pages[1] * PAGE_SIZE); + + seq_printf(m, "%lu anon=%lu file=%lu\n", WORKINGSET_INTERVAL_MAX, + bin->nr_pages[0] * PAGE_SIZE, + bin->nr_pages[1] * PAGE_SIZE); + +unlock: + mutex_unlock(&wsr->page_age_lock); + } + + return 0; +} +#endif + static struct cftype memory_files[] = { { .name = "current", @@ -7073,7 +7229,27 @@ static struct cftype memory_files[] = { .flags = CFTYPE_NS_DELEGATABLE, .write = memory_reclaim, }, - { } /* terminate */ +#ifdef CONFIG_WORKINGSET_REPORT + { + .name = "workingset.refresh_interval", + .flags = CFTYPE_NOT_ON_ROOT | CFTYPE_NS_DELEGATABLE, + .seq_show = memory_ws_refresh_interval_show, + .write = memory_ws_refresh_interval_write, + }, + { + .name = "workingset.report_threshold", + .flags = CFTYPE_NOT_ON_ROOT | CFTYPE_NS_DELEGATABLE, + .seq_show = memory_ws_report_threshold_show, + .write = memory_ws_report_threshold_write, + }, + { + .name = "workingset.page_age", + .flags = CFTYPE_NOT_ON_ROOT | CFTYPE_NS_DELEGATABLE, + .file_offset = offsetof(struct mem_cgroup, workingset_page_age_file), + .seq_show = memory_ws_page_age_show, + }, +#endif + {} /* terminate */ }; struct cgroup_subsys memory_cgrp_subsys = { diff --git a/mm/workingset_report.c b/mm/workingset_report.c index 7dcf38525016..5a9bf3ebb914 100644 --- a/mm/workingset_report.c +++ b/mm/workingset_report.c @@ -37,9 +37,12 @@ void wsr_destroy_pgdat(struct pglist_data *pgdat) void wsr_init_lruvec(struct lruvec *lruvec) { struct wsr_state *wsr = &lruvec->wsr; + struct mem_cgroup *memcg = lruvec_memcg(lruvec); memset(wsr, 0, sizeof(*wsr)); mutex_init(&wsr->page_age_lock); + if (memcg && !mem_cgroup_is_root(memcg)) + wsr->page_age_cgroup_file = &memcg->workingset_page_age_file; } void wsr_destroy_lruvec(struct lruvec *lruvec) @@ -51,8 +54,8 @@ void wsr_destroy_lruvec(struct lruvec *lruvec) memset(wsr, 0, sizeof(*wsr)); } -static int workingset_report_intervals_parse(char *src, - struct wsr_report_bins *bins) +int workingset_report_intervals_parse(char *src, + struct wsr_report_bins *bins) { int err = 0, i = 0; char *cur, *next = strim(src); @@ -526,5 +529,8 @@ void notify_workingset(struct mem_cgroup *memcg, struct pglist_data *pgdat) { struct wsr_state *wsr = &mem_cgroup_lruvec(memcg, pgdat)->wsr; - kernfs_notify(wsr->page_age_sys_file); + if (mem_cgroup_is_root(memcg)) + kernfs_notify(wsr->page_age_sys_file); + else + cgroup_file_notify(wsr->page_age_cgroup_file); }