From patchwork Sat May 4 07:30:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuanchu Xie X-Patchwork-Id: 13653799 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 A4F82C25B5C for ; Sat, 4 May 2024 07:30:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E50016B0096; Sat, 4 May 2024 03:30:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DB0196B0098; Sat, 4 May 2024 03:30:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B64C06B0099; Sat, 4 May 2024 03:30:55 -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 975A66B0096 for ; Sat, 4 May 2024 03:30:55 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 488E880F9D for ; Sat, 4 May 2024 07:30:55 +0000 (UTC) X-FDA: 82079891670.10.9BC1825 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf05.hostedemail.com (Postfix) with ESMTP id 7F7CB100010 for ; Sat, 4 May 2024 07:30:53 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="T1NGJ/Hw"; spf=pass (imf05.hostedemail.com: domain of 3LOQ1ZgcKCAU3zfshmzlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuanchu.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3LOQ1ZgcKCAU3zfshmzlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuanchu.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714807853; a=rsa-sha256; cv=none; b=kRxNZa+Y01G22RFR+Y/NwU6qV8Mfks9HdOn6/HZClmEXisDAdIPQ5ekceJFHZRB++KYnQq X5AKYfqmyAL9xxzNHQPeFvZIvi0mTeKFoRqDY+mekQKHpT8h6gKyP+USim9wi1IDhHCpdD doxD2H2Tg3uW2lixlrvMgR833GtRpNY= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="T1NGJ/Hw"; spf=pass (imf05.hostedemail.com: domain of 3LOQ1ZgcKCAU3zfshmzlttlqj.htrqnsz2-rrp0fhp.twl@flex--yuanchu.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3LOQ1ZgcKCAU3zfshmzlttlqj.htrqnsz2-rrp0fhp.twl@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=1714807853; 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=xaEmyCMslYMwuxpJOVLJZ4UUBBVY/3Xfmzid12imJ38=; b=FjsuQOsEXMn1KLXWAXEuclh3meFCWaDImCEs4si8sbXTI+7tUfBDAmDJ4TYpzU7xHWxazO DGjUz0e7RdwqefOyPM6A0fOcRpHa2jCq6dIntCZygbAiyGbFQ2hjEfXU5xJX/xh5VHucrt DWJ7eSfKslw5PDfwc1jpR5mwBaRA7ew= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-61be3f082b0so7201637b3.1 for ; Sat, 04 May 2024 00:30:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714807852; x=1715412652; 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=xaEmyCMslYMwuxpJOVLJZ4UUBBVY/3Xfmzid12imJ38=; b=T1NGJ/HwiBygp4hb4i4xfxLT/fpCgz17htH2WSQn3pMaY6JVS/biLh6PyBXx+VqQde 8L30rUa59aGJCanIjzH46/ma8sBulhZGWomy9jtrMa0jhCiVn8ObPMu6jaiEVz76//3J y7TSaSMsqOGtI1Ru20NKOaYusSi19yPyGgp9Ff9YcInV8lKGAge+Fye6L0kaKLwA3MiH XLqnXeh64nkwX5ExsDHkhQrI8wW31jk0YdgTX0mDgVsUOcn2Q8s5foFRbRqstdeWRuBo fw+FpziMo4mRnZtGZZTtv9L+DNbb162HbaEIo/WaWEck/SDs0CukGv15Dax8+E/MvEzz S4/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714807852; x=1715412652; 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=xaEmyCMslYMwuxpJOVLJZ4UUBBVY/3Xfmzid12imJ38=; b=UQZZghNgnC+ZBy5iYWbZ7Ras6NyQjvwYIT+xGfeSQqavmo0b0RpCzpuDNvHk0YkgK8 j0PZn6eJ/XrRbpPnP9hxlIdgv9zO/XMLqPI/fvtq3egRijepNLoXoz2oQjyeQTcLLx75 adLn1AX0sn0ccxrc4npA11u0SNdmBoIzXkK2M3RtpgNyzTR6Fz88C+qiaICpmIPlcOBM aEn3NklRloLSjyu19uhR9KA5bwNpOaIvlA7sh9LA0fM/D2sutBN0mQNui1w2M4m7vh2J b3RDLBtBCl2yt7WafJF2tV3ZUdRvrDzn5XR34cBW7MAxruGkrVWSU+4oMUH5vWg3IJK5 +HOw== X-Forwarded-Encrypted: i=1; AJvYcCV9IMvIaT3pxHuHS5RFC1Xx0vL8PkKkAGaMAufi042qRRV5kjVnsCsexXP6SXILWcpSAVHEWKXJDzgOmEqPz4RrolA= X-Gm-Message-State: AOJu0YzBMC8GBAn7j+JrVCX0cMTCfmlcuqpsr6SqBroPipgBsEGbREvz RaxdmOr8OLkoz1JOzj8Fo44XEiTAUOtSaGtmwq5aXv9LZKTngkSua60gF5bXHHnISDd9XcAj0f/ wGMIUZg== X-Google-Smtp-Source: AGHT+IEgDXzTdXOaK7MXB2FveB9irK572Lq296aA+UDNA71AYoSKYZI3L/RyqxlpQ13Ivr5db64iti7/LGM0 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:c0b:b0:de5:3003:4b83 with SMTP id fs11-20020a0569020c0b00b00de530034b83mr681924ybb.8.1714807852560; Sat, 04 May 2024 00:30:52 -0700 (PDT) Date: Sat, 4 May 2024 00:30:08 -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-5-yuanchu@google.com> Subject: [PATCH v1 4/7] 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 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: 5mokumsf3ieqjk3ux98gkecj1xannkrk X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 7F7CB100010 X-HE-Tag: 1714807853-472955 X-HE-Meta: U2FsdGVkX180W9IYLBDsRuoVZ549NlXimPvDHNF5VDFZ01hzmOmHAupujpXqHkVmDM/NFaoIm123jvxRlQUS/W4y/afcR3x1NrJEfNSqZehnGlSROP/nbUKqmFjcQxDgJFOm3epC7cy9PX5X3R4ibKbbEw0pBHfKuvEy2WapVGx0qZebGq0iBn0hsNelM+pwQXPkYxPhJ9/ttCjoSZEfMuZieUgKk+nsgLEk2W+9Ix2PvTQ4FKlsxu/1ZWBuklXZC89e9SV8oBv5pMEOquEXveh2zRytOVuT8Y7OTS4/9+AAGyK5AvwdC6D+U31hTSXvIsPOom8oSvRH0opTwkgkfUQ6SZfsDKrC6sG3uI87cE753CprAhxjuqfXD0Z9wdPZrygl9IVpVn9hjlUpO9WZteQGSZVhgZKMXJ0SBY5OosxYbp9hWLl1EFkJyVIraPs+Ozx8ZdYlvDvw6ZrtfSrg559KD1zV5gSIW1ruLYSnV9/Ufax1j3jHkFj+bK9ha2sseUHHjYBz3AJSsHWqAo/2lMLm2Ki3TzIrkNC/wJT6N689qLk7NvO9lCRWadC7prZRrS3xll5CXuW/WVjy+YAxQW6ytS/o0xzgqiwtzWzFSk12DxnKeCWsSu9tUfnsDq6sroojfLs4XaZ+s9A8X3qSngff5E37DS1IypDMPzLIxGX9cbUwYKi4ibnq9/NsFc+qVIRfmg//fhxNV9vmXP3e0aKzdIuhWRdwP96JQ/tdesRnv+wUGFh9c0QUz/wL72ifxb/U9aP8CCTx/VlOvzf87cx620cmc1brIBXxv2VQtzfB700ieUWm8ba9Yq98fH/OHpymP7pDSEwKPGm6GQRP3+StjExO1UQCqYEPHzY0CLmUeevqF3NFxggBfwbazVpoZzuzxYgigHi8GKJx/OBfSFlY02B2n0ow1B3AAMiMA4bY2QOxX6rqgpn5dxDUpj1K7z9m5wnyjhC2dfolJ79 bR0P4+/V ZQjksx4SL5Bwxw1SAqh4XFBSGBwtiQFzvcd1oRAD6eYBcGNaBjM7H73OJ+yglDoV8t/S69ghsfCU5h7Ey4NaD0H+w4x4ZW+2YKwlJP9YlNjG7EpehaH+NjKzlUN0X246sna3yqKOmNnreadf2+PCl5j5abdtKQksM0sRjDuR0OK6QHSY0r+3du+cHpBBe7/V4nWazw/X41/u2oAFxGBtL8SEr9byAqUrciL0/qKmdel7SDe+VN0MAB0OYn6VAn64QNfabFutZ4Gxm2WqvqHV21fK5MpEhRfE/WhyHYcq/u8KqYiAddqqWniSH6R+v+xszBdP+zj+CwImWdQFJP5+OGzUktChnr+GEjZl9i/DTXRpnR86INaxKNWC+eGk5DF/S1J5zOAC6xJHSw2c93NdLTbbRoB64FX1/IqOyrZZCXSOkkxIJdTjo+M6bCt189YtL6MPUFqHzI38ORODg4ksef4As8D05hrJ4uGcUt3w3RMRGNBAHXZsMdSddCOc+fzVtSEQpYMkygsDy4cs4gg+Ksc7Bj9txCVkBxkM9kvqwu0QNYzubBow5uqveaFjh8w/DkV4f2jW6bC42KirKhfGV+v5zkjAzoPMdGWk3geRiIcL7Js4/JxHdb255vLVMr90UqRl3WfyjQYjK6GfNZqJTEg1DQt9+RjbUpJ/MzKdHS0r4PXSAazFE6I6ruA== 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 | 6 +++++ mm/vmscan.c | 44 +++++++++++++++++++++++++++++++ mm/workingset_report.c | 43 +++++++++++++++++++++++++++++- 4 files changed, 96 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 151f09c6983e..36480c7ac0dd 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -209,8 +209,14 @@ extern void reclaim_throttle(pg_data_t *pgdat, enum vmscan_throttle_state reason /* * in mm/wsr.c */ +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); +#else +static inline void notify_workingset(struct mem_cgroup *memcg, + struct pglist_data *pgdat) +{ +} #endif /* diff --git a/mm/vmscan.c b/mm/vmscan.c index b7293baac1dd..1f11b252c15e 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2535,6 +2535,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 @@ -3936,6 +3945,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); @@ -5650,6 +5661,36 @@ void wsr_refresh_scan(struct lruvec *lruvec, unsigned long refresh_interval) } } } + +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 */ @@ -6177,6 +6218,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 56155acbe7e9..7dcf38525016 100644 --- a/mm/workingset_report.c +++ b/mm/workingset_report.c @@ -295,6 +295,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) { @@ -449,6 +476,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, @@ -470,8 +498,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); @@ -484,6 +517,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); +}