From patchwork Tue Jun 14 07:16:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 12880541 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 77866C43334 for ; Tue, 14 Jun 2022 07:17:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DEC718D021E; Tue, 14 Jun 2022 03:17:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D4A5E8D0216; Tue, 14 Jun 2022 03:17:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B76308D021E; Tue, 14 Jun 2022 03:17:43 -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 938D38D0216 for ; Tue, 14 Jun 2022 03:17:43 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 64D741227 for ; Tue, 14 Jun 2022 07:17:43 +0000 (UTC) X-FDA: 79575986406.22.69A5422 Received: from mail-io1-f74.google.com (mail-io1-f74.google.com [209.85.166.74]) by imf02.hostedemail.com (Postfix) with ESMTP id C66E9800A2 for ; Tue, 14 Jun 2022 07:17:42 +0000 (UTC) Received: by mail-io1-f74.google.com with SMTP id p3-20020a6b8d03000000b00669c6d6c089so3933586iod.1 for ; Tue, 14 Jun 2022 00:17:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=hWQ/pnH1IXBczpgDhNdPRVcRKkX01kpJeoSQmJTZ/E8=; b=NP0JFeVh5/LPbnW/y3636zUCWVda9EYqywiDnvF21ZXsgIBShq1h7BvC4Rrl603A8T +Ace/YsvlFsB0aaxLzuvXzyIhd58XHpVrU//G+O7x2dqEMj1C6LeIb36fPHxh1LZc5zi yub5O7gzo5kn+xhaS8slwkOTTjt6wpwZI0pb5jESWxPZrEIaXq9Rlu/n4JVK2KQoxT5P d3uX+1JCbWJz+sWb9DsMV9q9PLbaZ2v3wHc50k2QgsqR4rfcyPU1cm1TuOqghHT8ZEWV 2UxQspqmHz7pUvNuMLC+39LM+xSbuaOWvvsqA9n0TOWQ4ZxUjAmF27Oi8jQabEtD73Pm tCzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=hWQ/pnH1IXBczpgDhNdPRVcRKkX01kpJeoSQmJTZ/E8=; b=E/10b6cfJKaJa/7k/tRq5DS6HNq4JlW8Ht4DNsDRD5j9FIYn5YAvBCqHrrxgtZdUPQ 9fOBLklQC9OnzDXcNEHPVjz1MdxnejHhyeLxI7IffxcGVOiiVvLN7nzF2aeX6ysBRSea XpfpAZ3Nf13YYNMcLVupLufa+fpLxI2TOVtaasGLSaRd90trRDB+q8kRlrB/JG5PKyu7 GoppkM1o4WqGA8j9zAAYGgKRZGSeEpSzmPlk2sVcpO4i+8SKIxwyHiqmmnvF0Evd6LZc HvpN6Us1gbHcOmUI9mH9cmZHYvn0wLydske/AMlahLUudY9MyCHXxAHzE93YZtMjyadf z5gQ== X-Gm-Message-State: AOAM5329GD/PnV0Wq4bjwED64jqto14zJnWMuJtd4HiZdSpFAdRXpYjb d2+VxKulgc95Mdc6qkVLyBW1BAbQDHQ= X-Google-Smtp-Source: ABdhPJw5kkiLi1VUjJRTA9t18NMo5X41YB0/ctzW7svU9pT/nobxcfccImde+K9fDSALv1ESSLJTpNZDXas= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:eaa7:1f3f:e74a:2a26]) (user=yuzhao job=sendgmr) by 2002:a5d:96d0:0:b0:654:91d3:97b7 with SMTP id r16-20020a5d96d0000000b0065491d397b7mr1829135iol.164.1655191062117; Tue, 14 Jun 2022 00:17:42 -0700 (PDT) Date: Tue, 14 Jun 2022 01:16:48 -0600 In-Reply-To: <20220614071650.206064-1-yuzhao@google.com> Message-Id: <20220614071650.206064-12-yuzhao@google.com> Mime-Version: 1.0 References: <20220614071650.206064-1-yuzhao@google.com> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog Subject: [PATCH v12 11/14] mm: multi-gen LRU: thrashing prevention From: Yu Zhao To: Andrew Morton Cc: Andi Kleen , Aneesh Kumar , Catalin Marinas , Dave Hansen , Hillf Danton , Jens Axboe , Johannes Weiner , Jonathan Corbet , Linus Torvalds , Matthew Wilcox , Mel Gorman , Michael Larabel , Michal Hocko , Mike Rapoport , Peter Zijlstra , Tejun Heo , Vlastimil Babka , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, page-reclaim@google.com, Yu Zhao , Brian Geffon , Jan Alexander Steffens , Oleksandr Natalenko , Steven Barrett , Suleiman Souhlal , Daniel Byrne , Donald Carr , " =?utf-8?q?Holger_Hoffst=C3=A4tte?= " , Konstantin Kharlamov , Shuang Zhai , Sofia Trinh , Vaibhav Jain ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655191062; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hWQ/pnH1IXBczpgDhNdPRVcRKkX01kpJeoSQmJTZ/E8=; b=jDIiM294W7ppJPB/ZnzabZ6x47RHNxzKOr0YlLGSLY+11rdVrGuz8j/kPM1PTlL+Tsgha+ YxFRd6wrn8kfo8HhL8yq4SPFDGI6cbCDJ+I8BBU/JZikaUgYl1AvHgkrNyYJ4DlhJYu7Dm jVcWpHPGlryEwYNS8zHhCLUAu0Klto4= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=NP0JFeVh; spf=pass (imf02.hostedemail.com: domain of 3FjaoYgYKCD8zv0ibphpphmf.dpnmjovy-nnlwbdl.psh@flex--yuzhao.bounces.google.com designates 209.85.166.74 as permitted sender) smtp.mailfrom=3FjaoYgYKCD8zv0ibphpphmf.dpnmjovy-nnlwbdl.psh@flex--yuzhao.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655191062; a=rsa-sha256; cv=none; b=Vub48iJ1zNZyAi5guO5J+mWTwRLPtfojyEYpbCG4LcxcnngJCkip3OjukBNf5OTe4dknqx XgsHGCARUkwDcNjuVwj9zEItRYMd+xuFQBj8b2CfpHsfGp8D7gKgQ54aIvIyNuxG+vp+zA rndtihL9EB4RHls0TeI+jGrP+uyM0Iw= X-Stat-Signature: 3yo164r6r77ck9ajau647jf44je17731 X-Rspamd-Queue-Id: C66E9800A2 X-Rspamd-Server: rspam11 X-Rspam-User: Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=NP0JFeVh; spf=pass (imf02.hostedemail.com: domain of 3FjaoYgYKCD8zv0ibphpphmf.dpnmjovy-nnlwbdl.psh@flex--yuzhao.bounces.google.com designates 209.85.166.74 as permitted sender) smtp.mailfrom=3FjaoYgYKCD8zv0ibphpphmf.dpnmjovy-nnlwbdl.psh@flex--yuzhao.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-HE-Tag: 1655191062-320739 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: Add /sys/kernel/mm/lru_gen/min_ttl_ms for thrashing prevention, as requested by many desktop users [1]. When set to value N, it prevents the working set of N milliseconds from getting evicted. The OOM killer is triggered if this working set cannot be kept in memory. Based on the average human detectable lag (~100ms), N=1000 usually eliminates intolerable lags due to thrashing. Larger values like N=3000 make lags less noticeable at the risk of premature OOM kills. Compared with the size-based approach [2], this time-based approach has the following advantages: 1. It is easier to configure because it is agnostic to applications and memory sizes. 2. It is more reliable because it is directly wired to the OOM killer. [1] https://lore.kernel.org/r/Ydza%2FzXKY9ATRoh6@google.com/ [2] https://lore.kernel.org/r/20101028191523.GA14972@google.com/ Signed-off-by: Yu Zhao Acked-by: Brian Geffon Acked-by: Jan Alexander Steffens (heftig) Acked-by: Oleksandr Natalenko Acked-by: Steven Barrett Acked-by: Suleiman Souhlal Tested-by: Daniel Byrne Tested-by: Donald Carr Tested-by: Holger Hoffstätte Tested-by: Konstantin Kharlamov Tested-by: Shuang Zhai Tested-by: Sofia Trinh Tested-by: Vaibhav Jain --- include/linux/mmzone.h | 2 ++ mm/vmscan.c | 71 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 840b7ca8b91f..472bd5335517 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -419,6 +419,8 @@ struct lru_gen_struct { unsigned long max_seq; /* the eviction increments the oldest generation numbers */ unsigned long min_seq[ANON_AND_FILE]; + /* the birth time of each generation in jiffies */ + unsigned long timestamps[MAX_NR_GENS]; /* the multi-gen LRU lists, lazily sorted on eviction */ struct list_head lists[MAX_NR_GENS][ANON_AND_FILE][MAX_NR_ZONES]; /* the multi-gen LRU sizes, eventually consistent */ diff --git a/mm/vmscan.c b/mm/vmscan.c index 2b6de7e38aa7..075525a9526a 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4231,6 +4231,7 @@ static void inc_max_seq(struct lruvec *lruvec, bool can_swap) for (type = 0; type < ANON_AND_FILE; type++) reset_ctrl_pos(lruvec, type, false); + WRITE_ONCE(lrugen->timestamps[next], jiffies); /* make sure preceding modifications appear */ smp_store_release(&lrugen->max_seq, lrugen->max_seq + 1); @@ -4357,7 +4358,7 @@ static unsigned long get_nr_evictable(struct lruvec *lruvec, unsigned long max_s return total; } -static void age_lruvec(struct lruvec *lruvec, struct scan_control *sc) +static bool age_lruvec(struct lruvec *lruvec, struct scan_control *sc, unsigned long min_ttl) { bool need_aging; unsigned long nr_to_scan; @@ -4371,21 +4372,40 @@ static void age_lruvec(struct lruvec *lruvec, struct scan_control *sc) mem_cgroup_calculate_protection(NULL, memcg); if (mem_cgroup_below_min(memcg)) - return; + return false; nr_to_scan = get_nr_evictable(lruvec, max_seq, min_seq, swappiness, &need_aging); if (!nr_to_scan) - return; + return false; nr_to_scan >>= mem_cgroup_online(memcg) ? sc->priority : 0; + if (min_ttl) { + int gen = lru_gen_from_seq(min_seq[LRU_GEN_FILE]); + unsigned long birth = READ_ONCE(lruvec->lrugen.timestamps[gen]); + + if (time_is_after_jiffies(birth + min_ttl)) + return false; + + /* the size is likely too small to be helpful */ + if (!nr_to_scan && sc->priority != DEF_PRIORITY) + return false; + } + if (nr_to_scan && need_aging) try_to_inc_max_seq(lruvec, max_seq, sc, swappiness); + + return true; } +/* to protect the working set of the last N jiffies */ +static unsigned long lru_gen_min_ttl __read_mostly; + static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_control *sc) { struct mem_cgroup *memcg; + bool success = false; + unsigned long min_ttl = READ_ONCE(lru_gen_min_ttl); VM_WARN_ON_ONCE(!current_is_kswapd()); @@ -4411,12 +4431,28 @@ static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_control *sc) do { struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat); - age_lruvec(lruvec, sc); + if (age_lruvec(lruvec, sc, min_ttl)) + success = true; cond_resched(); } while ((memcg = mem_cgroup_iter(NULL, memcg, NULL))); clear_mm_walk(); + + /* + * The main goal is to OOM kill if every generation from all memcgs is + * younger than min_ttl. However, another theoretical possibility is all + * memcgs are either below min or empty. + */ + if (!success && !sc->order && mutex_trylock(&oom_lock)) { + struct oom_control oc = { + .gfp_mask = sc->gfp_mask, + }; + + out_of_memory(&oc); + + mutex_unlock(&oom_lock); + } } /* @@ -5128,6 +5164,28 @@ static void lru_gen_change_state(bool enabled) * sysfs interface ******************************************************************************/ +static ssize_t show_min_ttl(struct kobject *kobj, struct kobj_attribute *attr, char *buf) +{ + return sprintf(buf, "%u\n", jiffies_to_msecs(READ_ONCE(lru_gen_min_ttl))); +} + +static ssize_t store_min_ttl(struct kobject *kobj, struct kobj_attribute *attr, + const char *buf, size_t len) +{ + unsigned int msecs; + + if (kstrtouint(buf, 0, &msecs)) + return -EINVAL; + + WRITE_ONCE(lru_gen_min_ttl, msecs_to_jiffies(msecs)); + + return len; +} + +static struct kobj_attribute lru_gen_min_ttl_attr = __ATTR( + min_ttl_ms, 0644, show_min_ttl, store_min_ttl +); + static ssize_t show_enabled(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { unsigned int caps = 0; @@ -5176,6 +5234,7 @@ static struct kobj_attribute lru_gen_enabled_attr = __ATTR( ); static struct attribute *lru_gen_attrs[] = { + &lru_gen_min_ttl_attr.attr, &lru_gen_enabled_attr.attr, NULL }; @@ -5191,12 +5250,16 @@ static struct attribute_group lru_gen_attr_group = { void lru_gen_init_lruvec(struct lruvec *lruvec) { + int i; int gen, type, zone; struct lru_gen_struct *lrugen = &lruvec->lrugen; lrugen->max_seq = MIN_NR_GENS + 1; lrugen->enabled = lru_gen_enabled(); + for (i = 0; i <= MIN_NR_GENS + 1; i++) + lrugen->timestamps[i] = jiffies; + for_each_gen_type_zone(gen, type, zone) INIT_LIST_HEAD(&lrugen->lists[gen][type][zone]);