From patchwork Sat May 4 07:30:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanchu Xie X-Patchwork-Id: 13653800 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 617EEC4345F for ; Sat, 4 May 2024 07:30:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C00E6B0098; Sat, 4 May 2024 03:30:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 56F276B0099; Sat, 4 May 2024 03:30:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 300F56B009A; Sat, 4 May 2024 03:30:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0ACC96B0099 for ; Sat, 4 May 2024 03:30:56 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 48BF441248 for ; Sat, 4 May 2024 07:30:53 +0000 (UTC) X-FDA: 82079891586.18.8768DBC Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf09.hostedemail.com (Postfix) with ESMTP id 7D31F140019 for ; Sat, 4 May 2024 07:30:51 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="4dQ1Um3/"; spf=pass (imf09.hostedemail.com: domain of 3KuQ1ZgcKCAM1xdqfkxjrrjoh.frpolqx0-ppnydfn.ruj@flex--yuanchu.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3KuQ1ZgcKCAM1xdqfkxjrrjoh.frpolqx0-ppnydfn.ruj@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=1714807851; 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=+esKTT8j37wn7GqAICF1gBoKkjcIdKDssnbLJgB8I3o=; b=HCktIOvx+jRYlD3uEXwU8vGLOuCXlU2PJHqKfiSBHKdKGffMmxZfv+HlxorjvjwW9V4v5T kOmZorSoyE1p/Yd+zuNUTdT4dUoPlsCyg1leRVvIonIqkWeVwbdFd5xCrWOgtWnxPKo8hJ nqRCF+E/tdG9if+uXheJV2RR4cnnywY= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="4dQ1Um3/"; spf=pass (imf09.hostedemail.com: domain of 3KuQ1ZgcKCAM1xdqfkxjrrjoh.frpolqx0-ppnydfn.ruj@flex--yuanchu.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3KuQ1ZgcKCAM1xdqfkxjrrjoh.frpolqx0-ppnydfn.ruj@flex--yuanchu.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714807851; a=rsa-sha256; cv=none; b=gJg0Qo68qmQR2/C1k2nLhh0FlLrohrUaie+TEl/+oQmJW42/5p5asiu8e8uF0mBuHUqikM l8Rp2FmY1bDIikbCKhg/7vKYaJ5WSXBm6royjJLFQKotpaDkr2M2d7azy7RZCct5/DuB2Q QMmhbNX2SZrSXTD6OkC8WMDKhPIOIns= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dbf216080f5so884420276.1 for ; Sat, 04 May 2024 00:30:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714807850; x=1715412650; 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=+esKTT8j37wn7GqAICF1gBoKkjcIdKDssnbLJgB8I3o=; b=4dQ1Um3/XIDfP9JEf3t/IJzYgM82DqOIiZxkMF07ERgOXNywOF1V5Qi/xWpzVjQfAi U78WLlyXVa0XUfTaY2nv33rqXJH0EeGFCElcNqMFyxnKJ800kXY1uCglIysWpeJIZicM 0iI0z9ixJ9rGdWnnl5ARqDouDwAwkkKquDLTItfuO8UENjSKLEIlqcFXqZpkwR4iFPbQ HjFSzFSNy3Ab386A7CfJtRK++Ioc7LxM25hy6AxTgFGfBjAwO23sHgBcFfwjOW7iB2Og kv9mopfq81ri+xsU6YzhWQipROSK66SvADyTW0KbqI9LOBs4aOA7sNFPIRmRFgZVkhlD jFTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714807850; x=1715412650; 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=+esKTT8j37wn7GqAICF1gBoKkjcIdKDssnbLJgB8I3o=; b=AiOBp53g5rNx5va0rWWfQW7hBDBgmbrm1U/9zFTsrzHPS7548DpuJRVhT+fAEOCLNj mD0mExuBA9XToQRkvsE70gv8e1HK7NVU69cmLcaSCNv1kIHoyFRuAdQZomcDF1QOyL1u xSIcaZqHgabM6/ub2l1rTTOq88fqgKgpq7RdQkIb2lyupM4p4dXMpJwH0MAdjAYXf44C 00PuaJn3Dd0Mqws1F6hHudPl2fe9ojLjl47lwBZyASAbBytvjOE2HNYLsIEDqbSM2QE6 z9BwLI4XRXueO0QL+ltiOtSwGsiZ5AlPrOniLr/zNhpGKgEmxwrgYiFGMNgpnwbyg6BX kbCQ== X-Forwarded-Encrypted: i=1; AJvYcCWp5tlNoy181lgVzIRDSnkfCnAtP/Ji31MFayE4oQTMrY3BFb2iRblhPEEqaYU1n6mnmvjkJ5i1brkzPnZXDldFXeI= X-Gm-Message-State: AOJu0YxAjxwFvN9Z0YD9ivlwxkK2iIgHrGxaC+AjI99NwWdtwz+tGakY zGbG/sgAao1t/tNeVMTYdBwjN2yVKrP1gE3QFibw07pZqpA8bq9RkWMrENIkkK6rCY6DUVplqor F4EFACQ== X-Google-Smtp-Source: AGHT+IGpqecW4RBq1KKdblvfWTC4PDXr5GnnaakPH7N839yUP3w23VFJCVQbib80PviIg8Tn4iBf4ov4rT3U 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:c11:b0:de5:2b18:3b74 with SMTP id fs17-20020a0569020c1100b00de52b183b74mr1531852ybb.2.1714807850514; Sat, 04 May 2024 00:30:50 -0700 (PDT) Date: Sat, 4 May 2024 00:30:07 -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-4-yuanchu@google.com> Subject: [PATCH v1 3/7] mm: use refresh interval to rate-limit workingset report aggregation 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-Stat-Signature: gzjomnk6wppd5e5u9i47rtb7goe8zbts X-Rspamd-Queue-Id: 7D31F140019 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714807851-440730 X-HE-Meta: U2FsdGVkX1+bin/QKtlqbMFK8kVU/tAtvOdJp84RHxTvk6K8CoM0XtaYlpLYMDFz8j3OLyKVBSTkJxt8FBwmyLM4qPIfIb6TXG0XoxtKgUR9eAcwPnEgWe98Wtcq+Uhz+SKouPoFXqtYiMfTZ7sMUy/ZLtSr9Yuofv7ST8okSpUemVs0vcGawKdjvKn08wXn/Y/Q53UY9hkzMFYNGLeKDHu+9iMl0kCbEVUOvyOo8ZeOSsuXlGgBNMTCL0qmwlFcy2vA5BojTueUCulP0iT13K5iZyb8hiZFKv4RYAGRlcF5kzBbBCR74cJ0onhFlPODGqdL9OOzYS1e9nkPSDce9B1SuBSY5gOjpyjaAsZhLo1KuiqvcE7vv5P+ZMyX954r3k84f2MGV8FOVYdqziTDtAG/VrbVD2woAe2aoUkP1a2AcOfnb6GTQ6UjbnyfVxX0YSUsmPZkgbRK0FxA71rV+tDk1l71zBr0X3hJBPV4NKjnMs9wc/lHUhVxc70LpY5XmufiOTlnbs7AdT/Ya44aZbba9gLxz8xcfXBlAIhXd/AK9vIHgwf015LAwEhaWKPmjK8TiS7osKfXZ8gm7WcTKrhu62kVYya6es7Zp0DVFn9/2Ta9XHtuAmTLvpqFx3a3XzE+55DMHPLTvoVyWBLsD8xF3Rqiv4nZ50OLCjqYj6ulhW+ked4Xa0qAR0HcIQUTu3vPg5jEbETxZTbi46VURKCe+yI9XzAhgeMCBM0BCJrZ0wRLQUfqaAI9h+p7Jgf1U818geuODOMsObZ6rvT5mb8ySq84wnrBq23X6L9M7oi5YDb83PsAgwen/fMJysEJfbtXVnXwBuRpxFnfMQwddOGoKfXBls5yJ3BP+5yR4rqa5iKHYgC2jJLPWX6W8aLmuVINayDuyzj7TNRRMDSt9aVQzFRFqXn9tsYqLy6JmB/vBCor5UefANFgplp9pHxVVH84QhCtO6kC/s2Bp55 H+amRbqX t9x3mTY7UZLyBmaOLySt/19wTV1VC93mtjL/H6Ac98ANqxRHGK4hcpsAW8v19lr1b/l+Hq6tEr2ztMaD0T9idsHMTD0GmEsV53ARMSe9bGIwRRgwox2zkp2/14cWRJqQnRQbt6uUaZoYMl2qWY7Ly85p4T2R2jSe+WceBh4MfB7qpiychH5NYQty28OaO0ciM+Fsoq6eZBeMAkH4SE7N/tKxS28agKrak4+TunieQdzK2iwuI4/R9wyIloWi899eRYD+TW39jHwv+rbOsewNepsoynLwLf9gtrvl1txvRGVTRKyEH28wRUp83BkI4dasxge5eaoJG8udbr14Aw4KFzDVGlvxp6w4ntYcBc2KpG+sNTFxES6J4hoTijBUXrWpIZEwFjER8vCuzoR3wDiBHLx7RnlA4tMQw+hLzNkU5IA+t6dv8/HHCaE5015JwgWFitgIKdDRiDjDZMFkHHggQGJaCDKxecG6YD59OnmiTKmyZrKdbebQOh4DjkhGQZq4OXQOFgHlY798u4sdswh15anMHmk0mK4IUWPXZorF8knoqzUBzB001W/guuVau8FHzlHNQ+P04mZDhhMQJ7Ye1AHLO50cP6fgkHdVzRvDeP26W/XNsLJ2Ex43wXFr0NxWtWSeztVKdiLdy/d3jXut/kQem0v5rHKRBo0urKLe56sm5MGJw2IReByO1dw== 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: The refresh interval is a rate limiting factor to workingset page age histogram reads. When a workingset report is generated, a timestamp is noted, and the same report will be read until it expires beyond the refresh interval, at which point a new report is generated. Sysfs interface /sys/devices/system/node/nodeX/workingset_report/refresh_interval time in milliseconds specifying how long the report is valid for Signed-off-by: Yuanchu Xie --- include/linux/workingset_report.h | 1 + mm/internal.h | 2 +- mm/vmscan.c | 27 +++++++---- mm/workingset_report.c | 81 +++++++++++++++++++++++++------ 4 files changed, 85 insertions(+), 26 deletions(-) diff --git a/include/linux/workingset_report.h b/include/linux/workingset_report.h index d7c2ee14ec87..8bae6a600410 100644 --- a/include/linux/workingset_report.h +++ b/include/linux/workingset_report.h @@ -37,6 +37,7 @@ struct wsr_page_age_histo { }; struct wsr_state { + unsigned long refresh_interval; /* breakdown of workingset by page age */ struct mutex page_age_lock; struct wsr_page_age_histo *page_age; diff --git a/mm/internal.h b/mm/internal.h index 5e0caba64ee4..151f09c6983e 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -210,7 +210,7 @@ extern void reclaim_throttle(pg_data_t *pgdat, enum vmscan_throttle_state reason * in mm/wsr.c */ /* Requires wsr->page_age_lock held */ -void wsr_refresh_scan(struct lruvec *lruvec); +void wsr_refresh_scan(struct lruvec *lruvec, unsigned long refresh_interval); #endif /* diff --git a/mm/vmscan.c b/mm/vmscan.c index 9af6793a6534..b7293baac1dd 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -5620,7 +5620,7 @@ late_initcall(init_lru_gen); * workingset reporting ******************************************************************************/ #ifdef CONFIG_WORKINGSET_REPORT -void wsr_refresh_scan(struct lruvec *lruvec) +void wsr_refresh_scan(struct lruvec *lruvec, unsigned long refresh_interval) { DEFINE_MAX_SEQ(lruvec); struct scan_control sc = { @@ -5633,15 +5633,22 @@ void wsr_refresh_scan(struct lruvec *lruvec) }; unsigned int flags; - set_task_reclaim_state(current, &sc.reclaim_state); - flags = memalloc_noreclaim_save(); - /* - * setting can_swap=true and force_scan=true ensures - * proper workingset stats when the system cannot swap. - */ - try_to_inc_max_seq(lruvec, max_seq, &sc, true, true); - memalloc_noreclaim_restore(flags); - set_task_reclaim_state(current, NULL); + if (refresh_interval) { + int gen = lru_gen_from_seq(max_seq); + unsigned long birth = READ_ONCE(lruvec->lrugen.timestamps[gen]); + + if (time_is_before_jiffies(birth + refresh_interval)) { + set_task_reclaim_state(current, &sc.reclaim_state); + flags = memalloc_noreclaim_save(); + /* + * setting can_swap=true and force_scan=true ensures + * proper workingset stats when the system cannot swap. + */ + try_to_inc_max_seq(lruvec, max_seq, &sc, true, true); + memalloc_noreclaim_restore(flags); + set_task_reclaim_state(current, NULL); + } + } } #endif /* CONFIG_WORKINGSET_REPORT */ diff --git a/mm/workingset_report.c b/mm/workingset_report.c index 7b872b9fa7da..56155acbe7e9 100644 --- a/mm/workingset_report.c +++ b/mm/workingset_report.c @@ -195,7 +195,8 @@ static void collect_page_age(struct wsr_page_age_histo *page_age, /* First step: hierarchically scan child memcgs. */ static void refresh_scan(struct wsr_state *wsr, struct mem_cgroup *root, - struct pglist_data *pgdat) + struct pglist_data *pgdat, + unsigned long refresh_interval) { struct mem_cgroup *memcg; @@ -203,7 +204,7 @@ static void refresh_scan(struct wsr_state *wsr, struct mem_cgroup *root, do { struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat); - wsr_refresh_scan(lruvec); + wsr_refresh_scan(lruvec, refresh_interval); cond_resched(); } while ((memcg = mem_cgroup_iter(root, memcg, NULL))); } @@ -257,17 +258,25 @@ bool wsr_refresh_report(struct wsr_state *wsr, struct mem_cgroup *root, struct pglist_data *pgdat) { struct wsr_page_age_histo *page_age; + unsigned long refresh_interval = READ_ONCE(wsr->refresh_interval); if (!READ_ONCE(wsr->page_age)) return false; - refresh_scan(wsr, root, pgdat); + if (!refresh_interval) + return false; + mutex_lock(&wsr->page_age_lock); page_age = READ_ONCE(wsr->page_age); - if (page_age) { - copy_node_bins(pgdat, page_age); - refresh_aggregate(page_age, root, pgdat); - } + if (!page_age) + goto unlock; + if (page_age->timestamp && + time_is_after_jiffies(page_age->timestamp + refresh_interval)) + goto unlock; + refresh_scan(wsr, root, pgdat, refresh_interval); + copy_node_bins(pgdat, page_age); + refresh_aggregate(page_age, root, pgdat); +unlock: mutex_unlock(&wsr->page_age_lock); return !!page_age; } @@ -286,6 +295,52 @@ static struct wsr_state *kobj_to_wsr(struct kobject *kobj) return &mem_cgroup_lruvec(NULL, kobj_to_pgdat(kobj))->wsr; } +static ssize_t refresh_interval_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct wsr_state *wsr = kobj_to_wsr(kobj); + unsigned int interval = READ_ONCE(wsr->refresh_interval); + + return sysfs_emit(buf, "%u\n", jiffies_to_msecs(interval)); +} + +static ssize_t refresh_interval_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t len) +{ + unsigned int interval; + int err; + struct wsr_state *wsr = kobj_to_wsr(kobj); + + err = kstrtouint(buf, 0, &interval); + if (err) + return err; + + mutex_lock(&wsr->page_age_lock); + if (interval && !wsr->page_age) { + struct wsr_page_age_histo *page_age = + kzalloc(sizeof(struct wsr_page_age_histo), GFP_KERNEL); + + if (!page_age) { + err = -ENOMEM; + goto unlock; + } + wsr->page_age = page_age; + } + if (!interval && wsr->page_age) { + kfree(wsr->page_age); + wsr->page_age = NULL; + } + + WRITE_ONCE(wsr->refresh_interval, msecs_to_jiffies(interval)); +unlock: + mutex_unlock(&wsr->page_age_lock); + return err ?: len; +} + +static struct kobj_attribute refresh_interval_attr = + __ATTR_RW(refresh_interval); + static ssize_t page_age_intervals_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { @@ -369,13 +424,6 @@ static ssize_t page_age_show(struct kobject *kobj, struct kobj_attribute *attr, int ret = 0; struct wsr_state *wsr = kobj_to_wsr(kobj); - - mutex_lock(&wsr->page_age_lock); - if (!wsr->page_age) - wsr->page_age = - kzalloc(sizeof(struct wsr_page_age_histo), GFP_KERNEL); - mutex_unlock(&wsr->page_age_lock); - wsr_refresh_report(wsr, NULL, kobj_to_pgdat(kobj)); mutex_lock(&wsr->page_age_lock); @@ -401,7 +449,10 @@ static ssize_t page_age_show(struct kobject *kobj, struct kobj_attribute *attr, static struct kobj_attribute page_age_attr = __ATTR_RO(page_age); static struct attribute *workingset_report_attrs[] = { - &page_age_intervals_attr.attr, &page_age_attr.attr, NULL + &refresh_interval_attr.attr, + &page_age_intervals_attr.attr, + &page_age_attr.attr, + NULL }; static const struct attribute_group workingset_report_attr_group = {