diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 4529fa06dad7..5a9c5192155b 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -416,8 +416,6 @@ 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 69c516cfd2c4..8304d81ab3ac 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3875,7 +3875,6 @@ 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); @@ -4003,7 +4002,7 @@ static bool should_run_aging(struct lruvec *lruvec, unsigned long max_seq, unsig return false; } -static bool age_lruvec(struct lruvec *lruvec, struct scan_control *sc, unsigned long min_ttl) +static void age_lruvec(struct lruvec *lruvec, struct scan_control *sc) { bool need_aging; unsigned long nr_to_scan; @@ -4016,36 +4015,16 @@ static bool age_lruvec(struct lruvec *lruvec, struct scan_control *sc, unsigned VM_WARN_ON_ONCE(sc->memcg_low_reclaim); if (prot == MEMCG_PROT_MIN) - return false; + return; need_aging = should_run_aging(lruvec, max_seq, min_seq, sc, swappiness, &nr_to_scan); - - 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 (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()); @@ -4068,32 +4047,12 @@ static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_control *sc) do { struct lruvec *lruvec = mem_cgroup_lruvec(pgdat, memcg); - if (age_lruvec(lruvec, sc, min_ttl)) - success = true; + age_lruvec(lruvec, sc); cond_resched(); } while ((memcg = mem_cgroup_iter(NULL, memcg, NULL))); clear_mm_walk(); - - /* check the order to exclude compaction-induced reclaim */ - if (success || !min_ttl || sc->order) - return; - - /* - * The main goal is to OOM kill if every generation from all memcgs is - * younger than min_ttl. However, another possibility is all memcgs are - * either below min or empty. - */ - if (mutex_trylock(&oom_lock)) { - struct oom_control oc = { - .gfp_mask = sc->gfp_mask, - }; - - out_of_memory(&oc); - - mutex_unlock(&oom_lock); - } } /* @@ -4840,28 +4799,6 @@ unlock: * 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; @@ -4910,7 +4847,6 @@ 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 }; @@ -4926,16 +4862,12 @@ 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]);