020-v6.1-11-mm-multi-gen-LRU-thrashing-prevention.patch 7.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226
  1. From 73d1ff551760f0c79c47ab70faa4c2ca91413f5c Mon Sep 17 00:00:00 2001
  2. From: Yu Zhao <[email protected]>
  3. Date: Sun, 18 Sep 2022 02:00:08 -0600
  4. Subject: [PATCH 11/29] mm: multi-gen LRU: thrashing prevention
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Add /sys/kernel/mm/lru_gen/min_ttl_ms for thrashing prevention, as
  9. requested by many desktop users [1].
  10. When set to value N, it prevents the working set of N milliseconds from
  11. getting evicted. The OOM killer is triggered if this working set cannot
  12. be kept in memory. Based on the average human detectable lag (~100ms),
  13. N=1000 usually eliminates intolerable lags due to thrashing. Larger
  14. values like N=3000 make lags less noticeable at the risk of premature OOM
  15. kills.
  16. Compared with the size-based approach [2], this time-based approach
  17. has the following advantages:
  18. 1. It is easier to configure because it is agnostic to applications
  19. and memory sizes.
  20. 2. It is more reliable because it is directly wired to the OOM killer.
  21. [1] https://lore.kernel.org/r/Ydza%[email protected]/
  22. [2] https://lore.kernel.org/r/[email protected]/
  23. Link: https://lkml.kernel.org/r/[email protected]
  24. Signed-off-by: Yu Zhao <[email protected]>
  25. Acked-by: Brian Geffon <[email protected]>
  26. Acked-by: Jan Alexander Steffens (heftig) <[email protected]>
  27. Acked-by: Oleksandr Natalenko <[email protected]>
  28. Acked-by: Steven Barrett <[email protected]>
  29. Acked-by: Suleiman Souhlal <[email protected]>
  30. Tested-by: Daniel Byrne <[email protected]>
  31. Tested-by: Donald Carr <[email protected]>
  32. Tested-by: Holger Hoffstätte <[email protected]>
  33. Tested-by: Konstantin Kharlamov <[email protected]>
  34. Tested-by: Shuang Zhai <[email protected]>
  35. Tested-by: Sofia Trinh <[email protected]>
  36. Tested-by: Vaibhav Jain <[email protected]>
  37. Cc: Andi Kleen <[email protected]>
  38. Cc: Aneesh Kumar K.V <[email protected]>
  39. Cc: Barry Song <[email protected]>
  40. Cc: Catalin Marinas <[email protected]>
  41. Cc: Dave Hansen <[email protected]>
  42. Cc: Hillf Danton <[email protected]>
  43. Cc: Jens Axboe <[email protected]>
  44. Cc: Johannes Weiner <[email protected]>
  45. Cc: Jonathan Corbet <[email protected]>
  46. Cc: Linus Torvalds <[email protected]>
  47. Cc: Matthew Wilcox <[email protected]>
  48. Cc: Mel Gorman <[email protected]>
  49. Cc: Miaohe Lin <[email protected]>
  50. Cc: Michael Larabel <[email protected]>
  51. Cc: Michal Hocko <[email protected]>
  52. Cc: Mike Rapoport <[email protected]>
  53. Cc: Mike Rapoport <[email protected]>
  54. Cc: Peter Zijlstra <[email protected]>
  55. Cc: Qi Zheng <[email protected]>
  56. Cc: Tejun Heo <[email protected]>
  57. Cc: Vlastimil Babka <[email protected]>
  58. Cc: Will Deacon <[email protected]>
  59. Signed-off-by: Andrew Morton <[email protected]>
  60. ---
  61. include/linux/mmzone.h | 2 ++
  62. mm/vmscan.c | 74 ++++++++++++++++++++++++++++++++++++++++--
  63. 2 files changed, 73 insertions(+), 3 deletions(-)
  64. --- a/include/linux/mmzone.h
  65. +++ b/include/linux/mmzone.h
  66. @@ -399,6 +399,8 @@ struct lru_gen_struct {
  67. unsigned long max_seq;
  68. /* the eviction increments the oldest generation numbers */
  69. unsigned long min_seq[ANON_AND_FILE];
  70. + /* the birth time of each generation in jiffies */
  71. + unsigned long timestamps[MAX_NR_GENS];
  72. /* the multi-gen LRU lists, lazily sorted on eviction */
  73. struct list_head lists[MAX_NR_GENS][ANON_AND_FILE][MAX_NR_ZONES];
  74. /* the multi-gen LRU sizes, eventually consistent */
  75. --- a/mm/vmscan.c
  76. +++ b/mm/vmscan.c
  77. @@ -4064,6 +4064,7 @@ static void inc_max_seq(struct lruvec *l
  78. for (type = 0; type < ANON_AND_FILE; type++)
  79. reset_ctrl_pos(lruvec, type, false);
  80. + WRITE_ONCE(lrugen->timestamps[next], jiffies);
  81. /* make sure preceding modifications appear */
  82. smp_store_release(&lrugen->max_seq, lrugen->max_seq + 1);
  83. @@ -4193,7 +4194,7 @@ static bool should_run_aging(struct lruv
  84. return false;
  85. }
  86. -static void age_lruvec(struct lruvec *lruvec, struct scan_control *sc)
  87. +static bool age_lruvec(struct lruvec *lruvec, struct scan_control *sc, unsigned long min_ttl)
  88. {
  89. bool need_aging;
  90. unsigned long nr_to_scan;
  91. @@ -4207,16 +4208,36 @@ static void age_lruvec(struct lruvec *lr
  92. mem_cgroup_calculate_protection(NULL, memcg);
  93. if (mem_cgroup_below_min(memcg))
  94. - return;
  95. + return false;
  96. need_aging = should_run_aging(lruvec, max_seq, min_seq, sc, swappiness, &nr_to_scan);
  97. +
  98. + if (min_ttl) {
  99. + int gen = lru_gen_from_seq(min_seq[LRU_GEN_FILE]);
  100. + unsigned long birth = READ_ONCE(lruvec->lrugen.timestamps[gen]);
  101. +
  102. + if (time_is_after_jiffies(birth + min_ttl))
  103. + return false;
  104. +
  105. + /* the size is likely too small to be helpful */
  106. + if (!nr_to_scan && sc->priority != DEF_PRIORITY)
  107. + return false;
  108. + }
  109. +
  110. if (need_aging)
  111. try_to_inc_max_seq(lruvec, max_seq, sc, swappiness);
  112. +
  113. + return true;
  114. }
  115. +/* to protect the working set of the last N jiffies */
  116. +static unsigned long lru_gen_min_ttl __read_mostly;
  117. +
  118. static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_control *sc)
  119. {
  120. struct mem_cgroup *memcg;
  121. + bool success = false;
  122. + unsigned long min_ttl = READ_ONCE(lru_gen_min_ttl);
  123. VM_WARN_ON_ONCE(!current_is_kswapd());
  124. @@ -4239,12 +4260,32 @@ static void lru_gen_age_node(struct pgli
  125. do {
  126. struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat);
  127. - age_lruvec(lruvec, sc);
  128. + if (age_lruvec(lruvec, sc, min_ttl))
  129. + success = true;
  130. cond_resched();
  131. } while ((memcg = mem_cgroup_iter(NULL, memcg, NULL)));
  132. clear_mm_walk();
  133. +
  134. + /* check the order to exclude compaction-induced reclaim */
  135. + if (success || !min_ttl || sc->order)
  136. + return;
  137. +
  138. + /*
  139. + * The main goal is to OOM kill if every generation from all memcgs is
  140. + * younger than min_ttl. However, another possibility is all memcgs are
  141. + * either below min or empty.
  142. + */
  143. + if (mutex_trylock(&oom_lock)) {
  144. + struct oom_control oc = {
  145. + .gfp_mask = sc->gfp_mask,
  146. + };
  147. +
  148. + out_of_memory(&oc);
  149. +
  150. + mutex_unlock(&oom_lock);
  151. + }
  152. }
  153. /*
  154. @@ -5002,6 +5043,28 @@ unlock:
  155. * sysfs interface
  156. ******************************************************************************/
  157. +static ssize_t show_min_ttl(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
  158. +{
  159. + return sprintf(buf, "%u\n", jiffies_to_msecs(READ_ONCE(lru_gen_min_ttl)));
  160. +}
  161. +
  162. +static ssize_t store_min_ttl(struct kobject *kobj, struct kobj_attribute *attr,
  163. + const char *buf, size_t len)
  164. +{
  165. + unsigned int msecs;
  166. +
  167. + if (kstrtouint(buf, 0, &msecs))
  168. + return -EINVAL;
  169. +
  170. + WRITE_ONCE(lru_gen_min_ttl, msecs_to_jiffies(msecs));
  171. +
  172. + return len;
  173. +}
  174. +
  175. +static struct kobj_attribute lru_gen_min_ttl_attr = __ATTR(
  176. + min_ttl_ms, 0644, show_min_ttl, store_min_ttl
  177. +);
  178. +
  179. static ssize_t show_enabled(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
  180. {
  181. unsigned int caps = 0;
  182. @@ -5050,6 +5113,7 @@ static struct kobj_attribute lru_gen_ena
  183. );
  184. static struct attribute *lru_gen_attrs[] = {
  185. + &lru_gen_min_ttl_attr.attr,
  186. &lru_gen_enabled_attr.attr,
  187. NULL
  188. };
  189. @@ -5065,12 +5129,16 @@ static struct attribute_group lru_gen_at
  190. void lru_gen_init_lruvec(struct lruvec *lruvec)
  191. {
  192. + int i;
  193. int gen, type, zone;
  194. struct lru_gen_struct *lrugen = &lruvec->lrugen;
  195. lrugen->max_seq = MIN_NR_GENS + 1;
  196. lrugen->enabled = lru_gen_enabled();
  197. + for (i = 0; i <= MIN_NR_GENS + 1; i++)
  198. + lrugen->timestamps[i] = jiffies;
  199. +
  200. for_each_gen_type_zone(gen, type, zone)
  201. INIT_LIST_HEAD(&lrugen->lists[gen][type][zone]);