From patchwork Tue Jun 4 02:05:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanchu Xie X-Patchwork-Id: 13684572 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 00F65C25B78 for ; Tue, 4 Jun 2024 02:06:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 980096B0098; Mon, 3 Jun 2024 22:06:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9093C6B0099; Mon, 3 Jun 2024 22:06:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6494D6B009A; Mon, 3 Jun 2024 22:06:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3E3266B0098 for ; Mon, 3 Jun 2024 22:06:20 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 28C71120F67 for ; Tue, 4 Jun 2024 02:06:19 +0000 (UTC) X-FDA: 82191566478.19.1F96055 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf11.hostedemail.com (Postfix) with ESMTP id 5970E40017 for ; Tue, 4 Jun 2024 02:06:17 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="e/dnw44Z"; spf=pass (imf11.hostedemail.com: domain of 3mHZeZgcKCDktpViXcpbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--yuanchu.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3mHZeZgcKCDktpViXcpbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--yuanchu.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717466777; a=rsa-sha256; cv=none; b=RyStrDoiCtfqkeG2cdAJ/rPXYmIqDx4ZPebyMRY/TJuge9/7CWfPjfEPj2bq0qDTFW/zo5 X6g1RKWyd1CikAUrAlkUoNa+it09PPaebNl59nk3/kW9VyRuqyKl2ACudzGpAj5cnCf/At Db0LYyWME2Ydsi9+DTIn1itxTZhZUrA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="e/dnw44Z"; spf=pass (imf11.hostedemail.com: domain of 3mHZeZgcKCDktpViXcpbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--yuanchu.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3mHZeZgcKCDktpViXcpbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--yuanchu.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717466777; 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=dRO4mHrw3JGh6nKhs6HXawOt4KQi22Ngkfo+vgcJs3s=; b=b6sF91tg0nJ4n3KHMhTCLmz3g7RBejlWCS8tuU2czgv+5jRDPmGzSh1aSqAq6qbaZ+Q3y+ kkV+nTvF9blIy+CCzZ0XJYmtCVPs3PGRUK0H8wVwzJdpoQYG0p7bAY6t74gbHsyIj/1shN Clz7/qzIlhj25dUMIYkPtuF/5+l1bzE= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-62a0825e365so94515487b3.1 for ; Mon, 03 Jun 2024 19:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1717466776; x=1718071576; 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=dRO4mHrw3JGh6nKhs6HXawOt4KQi22Ngkfo+vgcJs3s=; b=e/dnw44ZyO9R9QZAftayg33gQsMIZE3mDRu0xNQDjWAwIwimLdWcSk6cdz2/ama+9t sW9dFppHiuy6yPd5bEcz3oaw5mwqhK45ipTaMaeuPBkJImkxDrjUkT39IgwNTCOHYBbY y2cPaDopQjls1cLG+25TysbaEgdEcyeyEgvWha2k7aUv4otd0wtLMoqY0o552GGmwyhO 7IH4sEDZzNqJYC3e6l5iW7HLPzceVca7ueJmm/hL3m6fi00DKMgUXYpUWQjIdBbLJd1h A2bbtvKEf2TZTsrFcnYrBd9OXjn/O3bW7rTt0WubMMCMYN9crcE9SC0IbNs3HujKX3Ps jCvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717466776; x=1718071576; 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=dRO4mHrw3JGh6nKhs6HXawOt4KQi22Ngkfo+vgcJs3s=; b=s1n8XnGIpXbEtFPCkBu0AbjFZWPK1hFrwWQpAtlsY8QsRnBnmbRzqXqBl3mCgisc87 2Y+S47Pt7WUWifrT1OIhK9DCoJC/Z4ooHZJXDHu4eGQKWDY8IGfdFBwqqG5uPZ05EUFb lBrDdetRSyx5wHzvA75pvrqg7P1KqpWicex6oPvzrjHmAqVH/VTklqhI/iDTRerAg6WT UAJi0oHoEKKgYMWwJPi3Px94huXPNfOqPQBLXbuxf6V0CR0X/mznKF9lTXmGJpoCygXb g4kV78NxFpHyz1kSgtWM018xqlSu1YI4KgNeeTW54n8qNsUEg6mStBKdTiwFiLztM121 CDbA== X-Forwarded-Encrypted: i=1; AJvYcCU8vlS6aXb8Imcsu2plMJ7F69APxETGbSoaV5Y90L86JRk1pwVqlGw/ezZZSMapDiuG9h3uMPx9oebzeCSK9E4d7CY= X-Gm-Message-State: AOJu0YxXYbde8d+XSymwE3vTKXTh5nYX5YgcKlNXrFlGju/7C/12TTiD dXSV7Q7DhoSypCny3SPEeGIlBX5vpVdHm0cDFO8CA9RB0RR6N7I4kzD0NoOApo7OQOj0v00SWWQ T2DFbOQ== X-Google-Smtp-Source: AGHT+IEA7IxV4E1j3KloZIYFfUw/fULB2Z+7pThTKaRON0/8bQkhXcDdKIm+z8+ZQ9n1pMUXwDRfYO5MgVc/ X-Received: from yuanchu-desktop.svl.corp.google.com ([2620:15c:2a3:200:367f:7387:3dd2:73f1]) (user=yuanchu job=sendgmr) by 2002:a05:690c:fd5:b0:61c:89a4:dd5f with SMTP id 00721157ae682-62c794a2504mr34231327b3.0.1717466776247; Mon, 03 Jun 2024 19:06:16 -0700 (PDT) Date: Mon, 3 Jun 2024 19:05:46 -0700 In-Reply-To: <20240604020549.1017540-1-yuanchu@google.com> Mime-Version: 1.0 References: <20240604020549.1017540-1-yuanchu@google.com> X-Mailer: git-send-email 2.45.1.467.gbab1589fc0-goog Message-ID: <20240604020549.1017540-6-yuanchu@google.com> Subject: [PATCH v2 5/8] 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 , Muhammad Usama Anjum 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: rspam06 X-Rspamd-Queue-Id: 5970E40017 X-Stat-Signature: w6qz85h5afwxhzxpupaua39jr55pawu7 X-HE-Tag: 1717466777-356276 X-HE-Meta: U2FsdGVkX18urwLepaKAJcOKjpSmClcWXQzyGWFGxZO+WNgPW8Hl3jiSzRoKlzAg4pwV49tW0WFoCod5Y5Ata/bgLKpvOCWRyDfyYKgRcschBAI9OLxcKbV4iVDdKP7ymJLQ71JQGX8cRVFcytNXbXNeyHQ7qzPq6wztW3Yo/wvtdh9st59dL2j940TwZCfNdAy53Ce7/8cGuM60X9P8Ur8IOSfosqo1BOgWpuKYgsK3xxMLs8tUcDBVm/hGR/QCInM6/8JGdUzS26d+HR+WIhfZ5fr3uju8sZYWmSmkK0K3Ml+29ePULZlv6B9ZdMuelshB3vkya4oc0AU6xLP0QnqwKFgk8EU643Eg5LAOiADfcKTZ2KDQzJnGOkm7kiEO94qd58iXJUkUZYHxyziTEEib7NRAhuh5FL88byo4zXaoLEnCLAcRRhu/4sOfeGhzItVxVUCmeOFOvR8c1qxVRM1EibWcRD+xAHfOU5EmCByEHnHaJUSzovVE8UGWWikCquGZfycv690bKxXbnTaMzDMxHOd8dlNQ1pWcsG8QJ+F8tcU8KAi8izbKTnVoeAtd6qB/EyECJlnNxyQpQr4pHHYfJIHgXfvhrnxHuNtAubKW+8Gpf0Mn81wfnqHeG943MK1vLKKuB/Mzv6mH7+7PzBvpdY8mlZttjjXl50pHxmLRn5BXNJBy+9KpZGmu+KjLnb3ZAzsvX73rK3FLKfeZ+VHubGKe9G8P/GUgN4DbSYtiCKw9le5m3C6JEo2BoU+PliUxR8LwDW7dZmxcbICQ5DGJhSSrXlAFdafPv2b09Rk0SdTi8nLA7DnvIN66THsgys7qmAtIybGbnHbfgmPP9xqfr8LUnbIyKhdPCwseT7SmNKNypb70qt2G8YVCFmKo78k8KiZpj3WYiZB+1XvNpPTUJWxksYzhY7cRRV7hIqGGA34aFUEG0x9cC1woJ+JaRDlq1UQF+kcx7nISYDz 5Z27pRwm qauLtVLvb1t3GypZ1rm6BmJxm1lSm6R+eY4+y11ZUOR5XVv7NP10LNBVfRbI2aAK2HTtJ5nn/rTRZVsXqIXzhUR9BnR44gpjMT6HDv9vB4w1lZux/22+gZeobn2ZXqhYjMTLauzya19ut2nh+eDl8SOKPxxVRjHc+6db2h3VcJ40g61asAJONZoncfxPPrbFdvZ98qeLmoAXsu85fizpUF0C4YaN0xWUxcAUNduIVrxhH1uhpF0wEzlpUovtxVh/PRH8AZIp1/fU4K2Jys2zsJ0Yx6joHoJhE9uDpfQ4U218jr6IgbqGjR+U2B+r7/PQz/Gfu/y88XOaET/vqMDd7/ECDuV9UShNBjvRnCNsBAFNZ7cWkl4eCxL1ap8lH97cdYb0mrOS97svkGkohqmGnhSJmw9SjIb8nwXSmAb3XumUn5rNeDAZB2pwpEwlhBaF90eLZKYOgFEjTnfncXuXe3qAX7EAnSHfLlfR2H5YqxcmJ8HqxwVOTT2eodBZLGsIFWTLIi8BX9P5LixZwDjgcDYgOUG0FT0S8HatAJYzWnt6HyjgEYtPgXEr4DJPPPNd34E4Z+js/gxhBjqAnG5N0/G5IL4RbXxlBo4VtOAoijtSFzS1tCFhshbwKqdwwez5znom2yS5zRBWdehMgzB30JzbzGPC3p8SGWn25Ay1a5Th39ZV0SumkEhLfdw== 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 030d34e9d117..91b08123950b 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -319,6 +319,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 3246384317f6..cf523a7c2048 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -404,6 +404,8 @@ void set_task_reclaim_state(struct task_struct *task, struct reclaim_state *rs); * in mm/wsr.c */ void notify_workingset(struct mem_cgroup *memcg, struct pglist_data *pgdat); +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 f973679e4a24..48cdc9422794 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7226,6 +7226,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", @@ -7294,7 +7450,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 801ac8e5c1da..72f2cad85a0d 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); @@ -542,5 +545,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); }