From patchwork Tue Jun 4 02:05:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanchu Xie X-Patchwork-Id: 13684571 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 33D87C25B75 for ; Tue, 4 Jun 2024 02:06:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DA3E56B0095; Mon, 3 Jun 2024 22:06:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D018F6B0096; Mon, 3 Jun 2024 22:06:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ADF486B0098; Mon, 3 Jun 2024 22:06:17 -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 839396B0095 for ; Mon, 3 Jun 2024 22:06:17 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id EB97B80AAE for ; Tue, 4 Jun 2024 02:06:16 +0000 (UTC) X-FDA: 82191566352.12.357FF4F Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf11.hostedemail.com (Postfix) with ESMTP id 3370940015 for ; Tue, 4 Jun 2024 02:06:15 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=XoxIVekG; spf=pass (imf11.hostedemail.com: domain of 3lnZeZgcKCDcrnTgVanZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--yuanchu.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3lnZeZgcKCDcrnTgVanZhhZeX.Vhfebgnq-ffdoTVd.hkZ@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=1717466775; 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=pSleViApJ1HtHahn3WgRlaq3aZcfr2+vjvy3KUqVlAc=; b=VH/c8qjqlhO5eB/b/5pMgixUERgmkE+VZPOYnVwl5u3DGbfeM21UoEdj950GPofKprPsH1 CJzSNcEMzUKZVz2BEPCheb1uBQJ++3/H4gdouW5rxpewo7hQOnsHZ8fUvtvA+VF1pI2XS7 t2s6Cz6jk8AazTajLcVYa7G2onnicSY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=XoxIVekG; spf=pass (imf11.hostedemail.com: domain of 3lnZeZgcKCDcrnTgVanZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--yuanchu.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3lnZeZgcKCDcrnTgVanZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--yuanchu.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717466775; a=rsa-sha256; cv=none; b=QwWJHa9M87vIWLm/Yw/S6Z92vKgFI+4G56PzuysGn7MhgbxqnAzRBMhTM1oq5WEH1eVPTX otgVhvB+dbYElnqyxKaSlO12I/CdXdmHAHqviRzgUtwJ/5Wed+POW8ngxS4Mo71gmEbSZ4 nPgoLgy1CWEwtSMNzXGFVTbTbDJQOv8= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dfa73db88dcso5804207276.0 for ; Mon, 03 Jun 2024 19:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1717466774; x=1718071574; 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=pSleViApJ1HtHahn3WgRlaq3aZcfr2+vjvy3KUqVlAc=; b=XoxIVekGz5j2hglWIB0WFSB6k5h94l4p81Ohpvgt058EFW0J5VOq0lIxBS+nd7J1Ac Ct/VVJfOn75NQ7ixozmIb3GSFtHWty0vtxudtM8MP3Pz+FJzRq8HHZGrIrb2W0jtZNBI ggUI4yl6m5/2BNaEWGON8gEACevNG+i5fiQ5VDNlv/zuRJ7jcivO9/OiSOd4cdEDvQpa /OEVien0+edB0mSFO9m3nt4jndwgkhMOK42TIq48mGEriZd61Aae0qCWO1KtOG7YJd9p QGe8rMM4UzGfAvBUkaKzv61e8c6JrnWG0s4eM+rIDKmKN+TmC3eGUL0Ql1JfUo1yfSHM mC3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717466774; x=1718071574; 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=pSleViApJ1HtHahn3WgRlaq3aZcfr2+vjvy3KUqVlAc=; b=mWXxzUrF8gHML+z+N13ZTY5bFDfU4MLF1cwE7MgMpthvGI+VTgzoWsYhx2b1wKOX5g YAeYTeELPtO2V1mbXRTOwNd7On1gHZXRL3Arzoe6hhNavQm529+QG6NQEZUhUtDBl7XD /C6c5vW4PlnCUfnhPVUTP2Gf8gl4na7vdwI6eAmUWefC6HPLOYoeZxAJ3QPrwQjLcVRb KyE7VD61HZyvxJQq8IZ1/wr8tcGfDb18ur0NiqG1d6L/NcAwjvy1h+/EzY2gJ/Uwn2IL SUDOsThpEZFlJwqIF9b879odCnG4tYOxXnK0xNVzqSOqWiPbfC0IHpwUpfVg+VKzvMQL 6T9A== X-Forwarded-Encrypted: i=1; AJvYcCUusVlvb6S4hEKIjouy/O1qBI2NNXKoCH9VMbeHbg7pwA0C3O5/fAv2JKwfljCNQZAQ9a1AkGoEvIzS7yrvGyw9LPA= X-Gm-Message-State: AOJu0Yxbwd+GyktfZi+sfGTkHArAAyWWueXvd8QTb0h/PT1EvJQG6o/s S0TjJPsX/px3NbugUHQYCQSh5RZduVFmNO1DT0fWbkMjk5+LScBkUtaUdeoS4xpcJ9vc1h9jX1L 8jvadMA== X-Google-Smtp-Source: AGHT+IHvvDuGpbRREo0VJ2AwDl8RRdoBG5TFOYaDueQhzCeuZnnIw7idyIAR3QbgubkDUEdsnEZqQs0sZPOl X-Received: from yuanchu-desktop.svl.corp.google.com ([2620:15c:2a3:200:367f:7387:3dd2:73f1]) (user=yuanchu job=sendgmr) by 2002:a05:6902:2b03:b0:dfa:4b1f:56f6 with SMTP id 3f1490d57ef6-dfa73bf78b3mr1338312276.5.1717466774166; Mon, 03 Jun 2024 19:06:14 -0700 (PDT) Date: Mon, 3 Jun 2024 19:05:45 -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-5-yuanchu@google.com> Subject: [PATCH v2 4/8] mm: report workingset during memory pressure driven scanning 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: rspam09 X-Rspamd-Queue-Id: 3370940015 X-Stat-Signature: gajuftijrdkmi1odh7m6ckrnofhbutha X-HE-Tag: 1717466775-508101 X-HE-Meta: U2FsdGVkX1+XQykarZvumneiovjw2l4w3hZxf3WG2qld1xN6iNmwnhy4lvRtpBJT/ZNqOTmJG+Tr/01tFkDi68SPIPaThec1tUf3Emwn8d2qJzdulAwvY9SwHjBjMdTu/BEnbaHeph3WTuaHdyOMtxHjoCqPmcE11326ruh4IOagoIX+ffVvLbVYIgaOz/rBC6ckLOScD4mjkQEIlV6arSUmtsUKtFYcC4oAeymOp6i7Bt6nJJDp+v4a0yWEymLRxAsZKa1yTJpct8hYdBqTK7mKpUtAvkPi5MpIBxw6YV5bYrZO7Wqkcwa4FceMUgtttJUIVuX28Fvj4+HXMJIjXwERfQoLtFKOwFXdPY0HVhOBAO4FEFxbGq11HI91zrW4tQ45/L5KaaootlGi8ipxZdnBAPqqpuvAm7ghQKUYrxAxHftf6e7cjbuN1Y/yQLGUpFV7TYGOnYYXgUDTTSctl9A58U7CcI7VQf8NUFiV0rrak5X/TLidLd8WAgXSgg1m4R0gZJzZWpX7LVLwRvhnuxtX05utVOd40P+FYq1UHEvxo9d23OrhOh75O6+F1GzazzQtliQQ/pkvOV9DJjBQcM6VIxoKCGfoid9HtbSimWgt9a0/enKy96ZaEkTa9qdeiCrnKpkUrISUrZ0MXTYOuViWkDvdjDSJ6+D2ZovViFB0ELJn2PmP9kOkY/MPSALRdNpi8rfMzfFvWPJPnD8pCHL3NI2wUyg3k7XLtugVN2RHJa7OMNv2voVjBgm2m8/XN+y0B9jv2ykuC0oSZ1H+5xpjlg+x4CjY/Gct0zaix5thRzxn0ncbSEVCP19VqZBfJqG/CazsnL7fc2DelDs7IoJWIo64qQfTsx21hi1C6wBoo3pLk9eecWQhRSLnksnp8nDEU4fx+xCK0go32HqE3xJ+TgI8QmGK/wzXUW4TLrmxLiJYib3iLdB7PV8RIOYvk0N0RtIKdqsdvccZt+1 IFWxoeXA RG9p6PPMegZRhAKKI0PU6IIIBbYYIxoDUEuCGg2lyr+xq5u+Q9mUovSn8ptmncdVnBTkgKP5CJ6dBKJVPLboa1ohFtNEbD1rAsEZMU/8piFs1Sfu33hvvhwryJ9bGqLRrS+0R3LgcdsoMq3Eil1Hngsx2R80EHwkYzfF5KBQQS/myv9cNmWG2rMD9BBf9oYNFvRQVuRVh2O3I4L2RkmhwdwLH7tBUyuhpuB/yNOHG/+EqsIXYcwxhleVuiTfDDOa2cFaf/NfD4h6pAWsuaObiU63TJtn9LZig/fle1iRZYiou2sXst2Nwh9euzHGTt1OOO27YBelW0O8LUeR/juhP1+Qsbnt6xav/lULKF/dec8Wr/JLc2JW8WLn2+m8d9DmUReksWbboCqXtx9Nem6qeMHtsF5bNdsTQMHkDbHC3FFb7s7VCnpaDKP6a/G+iqh/Ge2nKP98KbMuHdd/uWORt7XFpqFkW7VGHHPf1gEP2AbP8BtwLZK5sphS8nV1com/VKh++7LjyoAGhcs6ro2uRTVHlbWJ0t5SbxNvK1vojW0njFAvg4VaSQZpIGyNzdZzuVN+ciVFSdZEWVA6CXP9UrgNBp+ro5HJ18JYdq4WRO9xAUA7GJibQKkO3A6rKJ5DS/BX0RP8d68VMWfOCaL8aPk80ZLcLnzBwGJMr8iquxNcykTk= 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: When a node reaches its low watermarks and wakes up kswapd, notify all userspace programs waiting on the workingset page age histogram of the memory pressure, so a userspace agent can read the workingset report in time and make policy decisions, such as logging, oom-killing, or migration. Sysfs interface: /sys/devices/system/node/nodeX/workingset_report/report_threshold time in milliseconds that specifies how often the userspace agent can be notified for node memory pressure. Signed-off-by: Yuanchu Xie --- include/linux/workingset_report.h | 4 +++ mm/internal.h | 12 ++++++++ mm/vmscan.c | 46 +++++++++++++++++++++++++++++++ mm/workingset_report.c | 43 ++++++++++++++++++++++++++++- 4 files changed, 104 insertions(+), 1 deletion(-) diff --git a/include/linux/workingset_report.h b/include/linux/workingset_report.h index 8bae6a600410..2ec8b927b200 100644 --- a/include/linux/workingset_report.h +++ b/include/linux/workingset_report.h @@ -37,7 +37,11 @@ struct wsr_page_age_histo { }; struct wsr_state { + unsigned long report_threshold; unsigned long refresh_interval; + + struct kernfs_node *page_age_sys_file; + /* 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 b5cd86b3fec8..3246384317f6 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -399,6 +399,18 @@ bool try_to_inc_max_seq(struct lruvec *lruvec, unsigned long seq, bool can_swap, bool force_scan); void set_task_reclaim_state(struct task_struct *task, struct reclaim_state *rs); +#ifdef CONFIG_WORKINGSET_REPORT +/* + * in mm/wsr.c + */ +void notify_workingset(struct mem_cgroup *memcg, struct pglist_data *pgdat); +#else +static inline void notify_workingset(struct mem_cgroup *memcg, + struct pglist_data *pgdat) +{ +} +#endif + /* * in mm/rmap.c: */ diff --git a/mm/vmscan.c b/mm/vmscan.c index a05f1e8e5cb3..9bba7c05c128 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2559,6 +2559,15 @@ static bool can_age_anon_pages(struct pglist_data *pgdat, return can_demote(pgdat->node_id, sc); } +#ifdef CONFIG_WORKINGSET_REPORT +static void try_to_report_workingset(struct pglist_data *pgdat, struct scan_control *sc); +#else +static inline void try_to_report_workingset(struct pglist_data *pgdat, + struct scan_control *sc) +{ +} +#endif + #ifdef CONFIG_LRU_GEN #ifdef CONFIG_LRU_GEN_ENABLED @@ -3962,6 +3971,8 @@ static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_control *sc) if (!min_ttl || sc->order || sc->priority == DEF_PRIORITY) return; + try_to_report_workingset(pgdat, sc); + memcg = mem_cgroup_iter(NULL, NULL, NULL); do { struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat); @@ -5637,6 +5648,38 @@ static int __init init_lru_gen(void) }; late_initcall(init_lru_gen); +#ifdef CONFIG_WORKINGSET_REPORT +static void try_to_report_workingset(struct pglist_data *pgdat, + struct scan_control *sc) +{ + struct mem_cgroup *memcg = sc->target_mem_cgroup; + struct wsr_state *wsr = &mem_cgroup_lruvec(memcg, pgdat)->wsr; + unsigned long threshold = READ_ONCE(wsr->report_threshold); + + if (sc->priority == DEF_PRIORITY) + return; + + if (!threshold) + return; + + if (!mutex_trylock(&wsr->page_age_lock)) + return; + + if (!wsr->page_age) { + mutex_unlock(&wsr->page_age_lock); + return; + } + + if (time_is_after_jiffies(wsr->page_age->timestamp + threshold)) { + mutex_unlock(&wsr->page_age_lock); + return; + } + + mutex_unlock(&wsr->page_age_lock); + notify_workingset(memcg, pgdat); +} +#endif /* CONFIG_WORKINGSET_REPORT */ + #else /* !CONFIG_LRU_GEN */ static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_control *sc) @@ -6167,6 +6210,9 @@ static void shrink_zones(struct zonelist *zonelist, struct scan_control *sc) if (zone->zone_pgdat == last_pgdat) continue; last_pgdat = zone->zone_pgdat; + + if (!sc->proactive) + try_to_report_workingset(zone->zone_pgdat, sc); shrink_node(zone->zone_pgdat, sc); } diff --git a/mm/workingset_report.c b/mm/workingset_report.c index fe553c0a653e..801ac8e5c1da 100644 --- a/mm/workingset_report.c +++ b/mm/workingset_report.c @@ -311,6 +311,33 @@ static struct wsr_state *kobj_to_wsr(struct kobject *kobj) return &mem_cgroup_lruvec(NULL, kobj_to_pgdat(kobj))->wsr; } +static ssize_t report_threshold_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct wsr_state *wsr = kobj_to_wsr(kobj); + unsigned int threshold = READ_ONCE(wsr->report_threshold); + + return sysfs_emit(buf, "%u\n", jiffies_to_msecs(threshold)); +} + +static ssize_t report_threshold_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t len) +{ + unsigned int threshold; + struct wsr_state *wsr = kobj_to_wsr(kobj); + + if (kstrtouint(buf, 0, &threshold)) + return -EINVAL; + + WRITE_ONCE(wsr->report_threshold, msecs_to_jiffies(threshold)); + + return len; +} + +static struct kobj_attribute report_threshold_attr = + __ATTR_RW(report_threshold); + static ssize_t refresh_interval_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { @@ -465,6 +492,7 @@ 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[] = { + &report_threshold_attr.attr, &refresh_interval_attr.attr, &page_age_intervals_attr.attr, &page_age_attr.attr, @@ -486,8 +514,13 @@ void wsr_init_sysfs(struct node *node) wsr = kobj_to_wsr(kobj); - if (sysfs_create_group(kobj, &workingset_report_attr_group)) + if (sysfs_create_group(kobj, &workingset_report_attr_group)) { pr_warn("Workingset report failed to create sysfs files\n"); + return; + } + + wsr->page_age_sys_file = + kernfs_walk_and_get(kobj->sd, "workingset_report/page_age"); } EXPORT_SYMBOL_GPL(wsr_init_sysfs); @@ -500,6 +533,14 @@ void wsr_remove_sysfs(struct node *node) return; wsr = kobj_to_wsr(kobj); + kernfs_put(wsr->page_age_sys_file); sysfs_remove_group(kobj, &workingset_report_attr_group); } EXPORT_SYMBOL_GPL(wsr_remove_sysfs); + +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); +}