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 87D90C47DD9 for ; Wed, 27 Mar 2024 21:31:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B2FAC6B0095; Wed, 27 Mar 2024 17:31:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ADB2D6B0096; Wed, 27 Mar 2024 17:31:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 907B86B0098; Wed, 27 Mar 2024 17:31:40 -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 6A5CA6B0095 for ; Wed, 27 Mar 2024 17:31:40 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3541614061B for ; Wed, 27 Mar 2024 21:31:40 +0000 (UTC) X-FDA: 81944115960.15.A586D59 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf16.hostedemail.com (Postfix) with ESMTP id 5FCD0180019 for ; Wed, 27 Mar 2024 21:31:38 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uGv7ELNW; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf16.hostedemail.com: domain of 3OZAEZgcKCKIaWCPEJWIQQING.EQONKPWZ-OOMXCEM.QTI@flex--yuanchu.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3OZAEZgcKCKIaWCPEJWIQQING.EQONKPWZ-OOMXCEM.QTI@flex--yuanchu.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711575098; a=rsa-sha256; cv=none; b=PZ3Z2pnk+m+rlPX+uTyuNAmXeHuvbf2xLsAVXl0gifUrTepPWgho85bddOnNff0tq+/F1u 6e09e2unhvNU11jyasikJmDOkl/8DzPFennwrhIBkpP175f+iwrJPNrKnnjdNsmyiGzuxg /yz33QUHK+ejV+knIPsm9lM7TpZ02Ac= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uGv7ELNW; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf16.hostedemail.com: domain of 3OZAEZgcKCKIaWCPEJWIQQING.EQONKPWZ-OOMXCEM.QTI@flex--yuanchu.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3OZAEZgcKCKIaWCPEJWIQQING.EQONKPWZ-OOMXCEM.QTI@flex--yuanchu.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711575098; 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=xaCDmpnOXna8KuNDUqa6ynYFsa6ZfJ9LVAHJUw2Aofg=; b=1KBBDzGtWbyNCYu9coT8D2LwIwPkwgmcpV185EBjcMtUgizpHsVAVRnkYG1xa8zdBj+UUD TH1fYPTY2ODYPB3bgH99JE3+Lj+BH4pu7ZfdTuZGBkaTIW82KYb3QXvEkB4cl1uNgGYv0v 9xLqci3z3T5a7tSPfhJSFlStlxHhwBc= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60cd073522cso5176687b3.1 for ; Wed, 27 Mar 2024 14:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711575097; x=1712179897; 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=xaCDmpnOXna8KuNDUqa6ynYFsa6ZfJ9LVAHJUw2Aofg=; b=uGv7ELNWZaYriuILgH34uxJXd/LTsilenLxRF/OVLefSy0VBq/+URby2sKz/1WI2VF NzDxYyMxnVtzOdK4KIizPqyo7YbCJkiKg3WibdBHjzAVdjs3oZHT1yUx3MsUYNhDZWTx Vllxz0i60WdpVpJy87Xynvz094yU8d2eXmhp0S4z3gVJDtysaHSks2Md+Fk3DxeIWW3e BacR12QknqM3bWYOuL1RWGelebpPeIB+2YZacdPSdiqB3x+0UoFw7RgjSTWVm18mR2qy Sngye6aCsmhDrLmOH9Iv2xpxHoOKcsfH0GZtqDldP/yypHsHS1NeKLXQyxkD/+Ydx1T3 II6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711575097; x=1712179897; 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=xaCDmpnOXna8KuNDUqa6ynYFsa6ZfJ9LVAHJUw2Aofg=; b=RpYFeVNyY/72z1WfLwFZeMtcTQehz1ZrutTX9ZYSPgxPzUgCSZNeoJ3g8x0qesIVSS ake1yN3dFgstxSLXht3biMzFPqWbwhQ13dwmJFv+0uRfG2QntJYRCcKk6PHwLVDhJR57 +9Ry+3l7e/99rn+IBsjNtsim5nS6TggIi86jrD6Z+XsSZOU9kA9XEtDxKJnkyOn9ywCr IjaY2/6PwwuFg8RMHCE51qzEuNDTT+WswanEtsIWIIl0C9mcobiMJvLKQayDEisCMZz7 al1nr8Xh2d2/KzrXhIH/2Adx5r932HSDA0ju3jcvs0gq5vvUKQfVfRfperwqXR5sSYyR tyQw== X-Forwarded-Encrypted: i=1; AJvYcCU7W+D6H9V3TftTRuPmall0EZMSyE/kEZ733WSF86ADDeBjPqREXlKNkK4vK0AMPRReSbKFjAu14lYGPcOTIobw7h4= X-Gm-Message-State: AOJu0YwMjWWYpAxKBBNLrkbR7pnZw9zNOKSczNo1RpVou6OLlIfkWojm DMeWmdivA/NqoQYzkm4lKGwuXchf0tyqeWiHhavpiqt0aztHvCs6IIRNnaSBOQ+M0WGX/FVjF5p 4ufTnuw== X-Google-Smtp-Source: AGHT+IHPhGifJWkaGVpVQkyYgUvbZ7gXC3zKKNE+5jad1F4KE6vLxnBUAJz0fdIi3IF4p9BgtNJpeDc4GOj3 X-Received: from yuanchu-desktop.svl.corp.google.com ([2620:15c:2a3:200:6df3:ef42:a58e:a6b1]) (user=yuanchu job=sendgmr) by 2002:a05:690c:b9a:b0:610:dc1b:8f39 with SMTP id ck26-20020a05690c0b9a00b00610dc1b8f39mr216073ywb.0.1711575097511; Wed, 27 Mar 2024 14:31:37 -0700 (PDT) Date: Wed, 27 Mar 2024 14:31:04 -0700 In-Reply-To: <20240327213108.2384666-1-yuanchu@google.com> Mime-Version: 1.0 References: <20240327213108.2384666-1-yuanchu@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240327213108.2384666-6-yuanchu@google.com> Subject: [RFC PATCH v3 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 Cc: 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 Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 5FCD0180019 X-Stat-Signature: iqddf5gbog49o5quax5s5z815co8h7q5 X-HE-Tag: 1711575098-568131 X-HE-Meta: U2FsdGVkX18wIMigWst5cFcMXmRu6ulz9dl61pMA406pb1i3bADzmPNmiW1YgAdlJlZsUApc1doM+NZZDC04LBUD1l+iMwVvt457Py1MLB42UDW+zESjxoaEgyvAr2qRzN5L74ZDdiwk0FRIe5hnCHadqTYOKXCeqxIFRqkogMaTjlGIbzkEnXHl29pJhVqVltxYFgWB5Fy6vHwyg2U/0YPHA/GYgVQcwQde415uPcaUnLek/3Z4AxCDUeJbpQNUJq11XhslCEnjN6ppxJvTR1ZvYyx4XRtcG9D2CcqWjKbtUij0my+zVJPlwCLdgkIKCQu45WvABsXF0ptmUIHSWtXEdOMbgpM/YYkLZDQ6hwCmI31M6kUS9W85doSTVsIgxWSYnnS09zTJ+2M1h71Ke2E75r1eJR9mU9ryzpwzvoDANDHXe6aWBeGjyU3/c4dSUTEAXb6QCc/X/fr85ZBqUUzs0Bu9wPF/Tc8mSr02ics4tor93QiCs3l+S4n0K6OvjJg/6vTPyGDR45kzpyRuJ3zA7BVq4q1tTQYlafsvDEwhQNXQetygrc+soQSIQoPOuHimPvGmHmFWYhANimSz94leqkoLZpxCGZoIBa4xnqNNIaZxDbgc0e1hjRxCI5lLy6Y1gVmSLlewoOjlhxNkQAeMQ2xt/FL7fyWl19qZbQSswhTrruPHdr8XqT3nwa+P8Im0GhRputfxRUh1xl0cX+z9My5qqmpEH4jtDeLICuYhj82/hGH95qze+SQOoMadBemhl1nQd9h57O08wgbcgS7GONi+DKgw6ZQLJouunICM+gXgnVhlIQP3y6PVMgwDff/Qi/qHLZit9zHslk6UJXrZDPB59+0ghEKFIYPtYdjM2uZCqBHYdAm1yrDG/K+GWHoRNHEUba0MCkax7HpBTea4crGNLCzBUuWt9iEZ3lfntul7B1jDiD6+VXEEncXW07GjMZhYLbuj2ljXRl3 rrQhwtcI mTXeHeF0eDIcHAQ0G1AbNBISzrD4PAEHMzuurmXiPI12kkJPx46B/c7a5/asPQsIGFsVyxbDkEc7BCqsjjabDQyM1VFKDFFF8DD1eqIjiuI8/ZoMT0Ny7ot6htMyB2BpNH9aLy/K6yjVsPYPTDu+ZF+lH+l2zaP+b3zzNsb5jim5eL9l3pvU3uMaqwq0cDudf86tZvD4zRD+f9snuMP18WScvNGioDVV/kIsl3Ysc8WLU9IaFwyRJBrb6P43QKcovYXEeCXot+1W7aTnrpWsZvNNIr5DLmlemK1V/DKGBtaZiVar/c1BCz6G1hxFD62y/iJJ/RM/yQaXI+apCRBPm0PL4UXk4JGMi5tq0fFR2bTpl+8WHj93TuMRgIXHINcGgC0DHRzbr8w6p/G6G9R53hOKkXruMvX905TAqdmVT2wK4TF4c+McBc0pdSSg64DNLsBH8RpJjRk2JKHfeASEbVwkB3fZqv6ZV2nnzSvJzsF1MtdDFRDk45YmwiAPHz/wRyquVRZtLnvF37qpooHqZNg7+aWunM4qBkAKi8JPnwwKceuf5LeILU3NSGX5YSUxreYvlhgsh/YmxNWrB1bEonTZG+cXicSajSG1oAjqyVxk8qnufHJ0OFN1wdbTnr4S0OHQbMer5jrpo81lQpPMujQWEJcweuNOwO07NksywLeU5KFbNLou/LwQCNA== 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. 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.page_age_intervals Configures the intervals for the page age histogram. This file operates on a per-node basis, allowing for different intervals for each node. e.g. echo N0=1000,2000,3000,4000,5000 > memory.workingset.page_age_intervals /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 | 267 +++++++++++++++++++++++++++++- mm/workingset_report.c | 10 +- 5 files changed, 286 insertions(+), 4 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 589d240d6251..502542c812b3 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 @@ -38,7 +39,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 2f07141de16c..75bda5f7994d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7005,6 +7005,245 @@ static ssize_t memory_reclaim(struct kernfs_open_file *of, char *buf, return nbytes; } +#ifdef CONFIG_WORKINGSET_REPORT +static int memory_ws_page_age_intervals_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; + struct wsr_page_age_histo *page_age; + int i, nr_bins; + + wsr = &mem_cgroup_lruvec(memcg, NODE_DATA(nid))->wsr; + mutex_lock(&wsr->page_age_lock); + page_age = wsr->page_age; + if (!page_age) + goto no_page_age; + seq_printf(m, "N%d=", nid); + nr_bins = page_age->bins.nr_bins; + for (i = 0; i < nr_bins; ++i) { + struct wsr_report_bin *bin = + &page_age->bins.bins[i]; + + seq_printf(m, "%u", jiffies_to_msecs(bin->idle_age)); + if (i + 1 < nr_bins) + seq_putc(m, ','); + } + seq_putc(m, ' '); +no_page_age: + mutex_unlock(&wsr->page_age_lock); + } + seq_putc(m, '\n'); + + return 0; +} + +static ssize_t memory_wsr_interval_parse(struct kernfs_open_file *of, char *buf, + size_t nbytes, unsigned int *nid_out, + struct wsr_report_bins *bins) +{ + char *node, *intervals; + unsigned int nid; + int err; + + buf = strstrip(buf); + intervals = buf; + node = strsep(&intervals, "="); + + 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 = workingset_report_intervals_parse(intervals, bins); + if (err < 0) + return err; + + *nid_out = nid; + return err; +} + +static ssize_t memory_ws_page_age_intervals_write(struct kernfs_open_file *of, + char *buf, size_t nbytes, + loff_t off) +{ + unsigned int nid; + int err; + struct wsr_page_age_histo *page_age = NULL, *old; + struct wsr_state *wsr; + struct mem_cgroup *memcg = mem_cgroup_from_css(of_css(of)); + + page_age = + kzalloc(sizeof(struct wsr_page_age_histo), GFP_KERNEL_ACCOUNT); + + if (!page_age) { + err = -ENOMEM; + goto failed; + } + + err = memory_wsr_interval_parse(of, buf, nbytes, &nid, &page_age->bins); + if (err < 0) + goto failed; + + if (err == 0) { + kfree(page_age); + page_age = NULL; + } + + wsr = &mem_cgroup_lruvec(memcg, NODE_DATA(nid))->wsr; + mutex_lock(&wsr->page_age_lock); + old = xchg(&wsr->page_age, page_age); + mutex_unlock(&wsr->page_age_lock); + kfree(old); + return nbytes; +failed: + kfree(page_age); + return err; +} + +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; + WRITE_ONCE(wsr->refresh_interval, msecs_to_jiffies(msecs)); + 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.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 +7312,33 @@ static struct cftype memory_files[] = { .flags = CFTYPE_NS_DELEGATABLE, .write = memory_reclaim, }, - { } /* terminate */ +#ifdef CONFIG_WORKINGSET_REPORT + { + .name = "workingset.page_age_intervals", + .flags = CFTYPE_NOT_ON_ROOT | CFTYPE_NS_DELEGATABLE, + .seq_show = memory_ws_page_age_intervals_show, + .write = memory_ws_page_age_intervals_write, + }, + { + .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 3ed3b0e8f8ad..b00ffbfebcab 100644 --- a/mm/workingset_report.c +++ b/mm/workingset_report.c @@ -20,9 +20,12 @@ void wsr_init(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(struct lruvec *lruvec) @@ -34,7 +37,7 @@ void wsr_destroy(struct lruvec *lruvec) memset(wsr, 0, sizeof(*wsr)); } -static int workingset_report_intervals_parse(char *src, +int workingset_report_intervals_parse(char *src, struct wsr_report_bins *bins) { int err = 0, i = 0; @@ -490,5 +493,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); } -- 2.44.0.396.g6e790dbe36-goog