| Message ID | 20240730222707.2324536-2-nphamcs@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | improving dynamic zswap shrinker protection scheme | expand |
On Tue, Jul 30, 2024 at 3:27 PM Nhat Pham <nphamcs@gmail.com> wrote: > > Current zswap shrinker's heuristics to prevent overshrinking is brittle > and inaccurate, specifically in the way we decay the protection size > (i.e making pages in the zswap LRU eligible for reclaim). > > We currently decay protection aggressively in zswap_lru_add() calls. > This leads to the following unfortunate effect: when a new batch of > pages enter zswap, the protection size rapidly decays to below 25% of > the zswap LRU size, which is way too low. > > We have observed this effect in production, when experimenting with the > zswap shrinker: the rate of shrinking shoots up massively right after a > new batch of zswap stores. This is somewhat the opposite of what we want > originally - when new pages enter zswap, we want to protect both these > new pages AND the pages that are already protected in the zswap LRU. > > Replace existing heuristics with a second chance algorithm > > 1. When a new zswap entry is stored in the zswap pool, its reference bit > is set. Probably worth mentioning that this is added in a hole and doesn't consume any extra memory. > 2. When the zswap shrinker encounters a zswap entry with the reference > bit set, give it a second chance - only flips the reference bit and > rotate it in the LRU. > 3. If the shrinker encounters the entry again, this time with its > reference bit unset, then it can reclaim the entry. > > In this manner, the aging of the pages in the zswap LRUs are decoupled > from zswap stores, and picks up the pace with increasing memory pressure > (which is what we want). > > The second chance scheme allows us to modulate the writeback rate based > on recent pool activities. Entries that recently entered the pool will > be protected, so if the pool is dominated by such entries the writeback > rate will reduce proportionally, protecting the workload's workingset.On > the other hand, stale entries will be written back quickly, which > increases the effective writeback rate. > > We will still maintain the count of swapins, which is consumed and > subtracted from the lru size in zswap_shrinker_count(), to further > penalize past overshrinking that led to disk swapins. The idea is that > had we considered this many more pages in the LRU active/protected, they > would not have been written back and we would not have had to swapped > them in. > > To test this new heuristics, I built the kernel under a cgroup with > memory.max set to 2G, on a host with 36 cores: > > With the old shrinker: > > real: 263.89s > user: 4318.11s > sys: 673.29s > swapins: 227300.5 > > With the second chance algorithm: > > real: 244.85s > user: 4327.22s > sys: 664.39s > swapins: 94663 > > (average over 5 runs) > > We observe an 1.3% reduction in kernel CPU usage, and around 7.2% > reduction in real time. Note that the number of swapped in pages > dropped by 58%. > > Suggested-by: Johannes Weiner <hannes@cmpxchg.org> > Signed-off-by: Nhat Pham <nphamcs@gmail.com> > --- > include/linux/zswap.h | 16 +++--- > mm/zswap.c | 110 ++++++++++++++++++++++++------------------ > 2 files changed, 70 insertions(+), 56 deletions(-) > > diff --git a/include/linux/zswap.h b/include/linux/zswap.h > index 6cecb4a4f68b..b94b6ae262d5 100644 > --- a/include/linux/zswap.h > +++ b/include/linux/zswap.h > @@ -13,17 +13,15 @@ extern atomic_t zswap_stored_pages; > > struct zswap_lruvec_state { > /* > - * Number of pages in zswap that should be protected from the shrinker. > - * This number is an estimate of the following counts: > + * Number of swapped in pages, i.e not found in the zswap pool. With the next patch, this should be "Number of swapped in pages from disk". Without the "from disk", the second part about not being found in the zswap pool doesn't really make sense. Maybe also the variable name should be changed to nr_disk_swapins or similar. > * > - * a) Recent page faults. > - * b) Recent insertion to the zswap LRU. This includes new zswap stores, > - * as well as recent zswap LRU rotations. > - * > - * These pages are likely to be warm, and might incur IO if the are written > - * to swap. > + * This is consumed and subtracted from the lru size in > + * zswap_shrinker_count() to penalize past overshrinking that led to disk > + * swapins. The idea is that had we considered this many more pages in the > + * LRU active/protected and not written them back, we would not have had to > + * swapped them in. > */ > - atomic_long_t nr_zswap_protected; > + atomic_long_t nr_swapins; > }; > > unsigned long zswap_total_pages(void); > diff --git a/mm/zswap.c b/mm/zswap.c > index adeaf9c97fde..f4e001c9e7e0 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -184,6 +184,10 @@ static struct shrinker *zswap_shrinker; > * page within zswap. > * > * swpentry - associated swap entry, the offset indexes into the red-black tree > + * referenced - true if the entry recently entered the zswap pool. Unset by the > + * dynamic shrinker. The entry is only reclaimed by the dynamic > + * shrinker if referenced is unset. See comments in the shrinker > + * section for context. > * length - the length in bytes of the compressed page data. Needed during > * decompression. For a same value filled page length is 0, and both > * pool and lru are invalid and must be ignored. > @@ -196,6 +200,7 @@ static struct shrinker *zswap_shrinker; > struct zswap_entry { > swp_entry_t swpentry; > unsigned int length; > + bool referenced; > struct zswap_pool *pool; > union { > unsigned long handle; > @@ -700,11 +705,10 @@ static inline int entry_to_nid(struct zswap_entry *entry) > > static void zswap_lru_add(struct list_lru *list_lru, struct zswap_entry *entry) > { > - atomic_long_t *nr_zswap_protected; > - unsigned long lru_size, old, new; > int nid = entry_to_nid(entry); > struct mem_cgroup *memcg; > - struct lruvec *lruvec; > + > + entry->referenced = true; Would it be clearer to initialize this in zswap_store() with the rest of the zswap_entry initialization? > > /* > * Note that it is safe to use rcu_read_lock() here, even in the face of > @@ -722,19 +726,6 @@ static void zswap_lru_add(struct list_lru *list_lru, struct zswap_entry *entry) > memcg = mem_cgroup_from_entry(entry); > /* will always succeed */ > list_lru_add(list_lru, &entry->lru, nid, memcg); > - > - /* Update the protection area */ > - lru_size = list_lru_count_one(list_lru, nid, memcg); > - lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); > - nr_zswap_protected = &lruvec->zswap_lruvec_state.nr_zswap_protected; > - old = atomic_long_inc_return(nr_zswap_protected); > - /* > - * Decay to avoid overflow and adapt to changing workloads. > - * This is based on LRU reclaim cost decaying heuristics. > - */ > - do { > - new = old > lru_size / 4 ? old / 2 : old; > - } while (!atomic_long_try_cmpxchg(nr_zswap_protected, &old, new)); > rcu_read_unlock(); > } > > @@ -752,7 +743,7 @@ static void zswap_lru_del(struct list_lru *list_lru, struct zswap_entry *entry) > > void zswap_lruvec_state_init(struct lruvec *lruvec) > { > - atomic_long_set(&lruvec->zswap_lruvec_state.nr_zswap_protected, 0); > + atomic_long_set(&lruvec->zswap_lruvec_state.nr_swapins, 0); > } > > void zswap_folio_swapin(struct folio *folio) > @@ -761,7 +752,7 @@ void zswap_folio_swapin(struct folio *folio) > > if (folio) { > lruvec = folio_lruvec(folio); > - atomic_long_inc(&lruvec->zswap_lruvec_state.nr_zswap_protected); > + atomic_long_inc(&lruvec->zswap_lruvec_state.nr_swapins); > } > } > > @@ -1082,6 +1073,28 @@ static int zswap_writeback_entry(struct zswap_entry *entry, > /********************************* > * shrinker functions > **********************************/ > +/* > + * The dynamic shrinker is modulated by the following factors: > + * > + * 1. Each zswap entry has a referenced bit, which the shrinker unsets (giving > + * the entry a second chance) before rotating it in the LRU list. If the > + * entry is considered again by the shrinker, with its referenced bit unset, > + * it is written back. The writeback rate as a result is dynamically > + * adjusted by the pool activities - if the pool is dominated by new entries > + * (i.e lots of recent zswapouts), these entries will be protected and > + * the writeback rate will slow down. On the other hand, if the pool has a > + * lot of stagnant entries, these entries will be reclaimed immediately, > + * effectively increasing the writeback rate. > + * > + * 2. Swapins counter: If we observe swapins, it is a sign that we are > + * overshrinking and should slow down. We maintain a swapins counter, which > + * is consumed and subtract from the number of eligible objects on the LRU > + * in zswap_shrinker_count(). > + * > + * 3. Compression ratio. The better the workload compresses, the less gains we > + * can expect from writeback. We scale down the number of objects available > + * for reclaim by this ratio. > + */ Nice :) > static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l, > spinlock_t *lock, void *arg) > { > @@ -1091,6 +1104,16 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o > enum lru_status ret = LRU_REMOVED_RETRY; > int writeback_result; > > + /* > + * Second chance algorithm: if the entry has its referenced bit set, give it > + * a second chance. Only clear the referenced bit and rotate it in the > + * zswap's LRU list. > + */ > + if (entry->referenced) { > + entry->referenced = false; > + return LRU_ROTATE; > + } > + > /* > * As soon as we drop the LRU lock, the entry can be freed by > * a concurrent invalidation. This means the following: > @@ -1157,8 +1180,7 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o > static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, > struct shrink_control *sc) > { > - struct lruvec *lruvec = mem_cgroup_lruvec(sc->memcg, NODE_DATA(sc->nid)); > - unsigned long shrink_ret, nr_protected, lru_size; > + unsigned long shrink_ret; > bool encountered_page_in_swapcache = false; > > if (!zswap_shrinker_enabled || > @@ -1167,25 +1189,6 @@ static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, > return SHRINK_STOP; > } > > - nr_protected = > - atomic_long_read(&lruvec->zswap_lruvec_state.nr_zswap_protected); > - lru_size = list_lru_shrink_count(&zswap_list_lru, sc); > - > - /* > - * Abort if we are shrinking into the protected region. > - * > - * This short-circuiting is necessary because if we have too many multiple > - * concurrent reclaimers getting the freeable zswap object counts at the > - * same time (before any of them made reasonable progress), the total > - * number of reclaimed objects might be more than the number of unprotected > - * objects (i.e the reclaimers will reclaim into the protected area of the > - * zswap LRU). > - */ > - if (nr_protected >= lru_size - sc->nr_to_scan) { > - sc->nr_scanned = 0; > - return SHRINK_STOP; > - } > - Do we need a similar mechanism to protect against concurrent shrinkers quickly consuming nr_swapins? > shrink_ret = list_lru_shrink_walk(&zswap_list_lru, sc, &shrink_memcg_cb, > &encountered_page_in_swapcache); > > @@ -1200,7 +1203,8 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, > { > struct mem_cgroup *memcg = sc->memcg; > struct lruvec *lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(sc->nid)); > - unsigned long nr_backing, nr_stored, nr_freeable, nr_protected; > + atomic_long_t *nr_swapins = &lruvec->zswap_lruvec_state.nr_swapins; > + unsigned long nr_backing, nr_stored, lru_size, nr_swapins_cur, nr_remain; > > if (!zswap_shrinker_enabled || !mem_cgroup_zswap_writeback_enabled(memcg)) > return 0; > @@ -1233,14 +1237,26 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, > if (!nr_stored) > return 0; > > - nr_protected = > - atomic_long_read(&lruvec->zswap_lruvec_state.nr_zswap_protected); > - nr_freeable = list_lru_shrink_count(&zswap_list_lru, sc); > + lru_size = list_lru_shrink_count(&zswap_list_lru, sc); > + if (!lru_size) > + return 0; > + > /* > - * Subtract the lru size by an estimate of the number of pages > - * that should be protected. > + * Subtract the lru size by the number of pages that are recently swapped nit: I don't think "subtract by" is correct, it's usually "subtract from". So maybe "Subtract the number of pages that are recently swapped in from the lru size"? Also, should we remain consistent about mentioning that these are disk swapins throughout all the comments to keep things clear? > + * in. The idea is that had we protect the zswap's LRU by this amount of > + * pages, these swap in would not have happened. > */ > - nr_freeable = nr_freeable > nr_protected ? nr_freeable - nr_protected : 0; > + nr_swapins_cur = atomic_long_read(nr_swapins); > + do { > + if (lru_size >= nr_swapins_cur) > + nr_remain = 0; > + else > + nr_remain = nr_swapins_cur - lru_size; > + } while (!atomic_long_try_cmpxchg(nr_swapins, &nr_swapins_cur, nr_remain)); > + > + lru_size -= nr_swapins_cur - nr_remain; It's a little bit weird that we reduce the variable named "lru_size" by the consumed swapins. Maybe we should keep this named as "nr_freeable", or add another variable here to hold the value after subtraction? > + if (!lru_size) > + return 0; > > /* > * Scale the number of freeable pages by the memory saving factor. > @@ -1253,7 +1269,7 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, > * space. Hence, we may scale nr_freeable down a little bit more than we > * should if we have a lot of same-filled pages. > */ > - return mult_frac(nr_freeable, nr_backing, nr_stored); > + return mult_frac(lru_size, nr_backing, nr_stored); > } > > static struct shrinker *zswap_alloc_shrinker(void) > -- > 2.43.0
On Thu, Aug 1, 2024 at 12:57 PM Yosry Ahmed <yosryahmed@google.com> wrote: > > On Tue, Jul 30, 2024 at 3:27 PM Nhat Pham <nphamcs@gmail.com> wrote: > > > > Current zswap shrinker's heuristics to prevent overshrinking is brittle > > and inaccurate, specifically in the way we decay the protection size > > (i.e making pages in the zswap LRU eligible for reclaim). > > > > We currently decay protection aggressively in zswap_lru_add() calls. > > This leads to the following unfortunate effect: when a new batch of > > pages enter zswap, the protection size rapidly decays to below 25% of > > the zswap LRU size, which is way too low. > > > > We have observed this effect in production, when experimenting with the > > zswap shrinker: the rate of shrinking shoots up massively right after a > > new batch of zswap stores. This is somewhat the opposite of what we want > > originally - when new pages enter zswap, we want to protect both these > > new pages AND the pages that are already protected in the zswap LRU. > > > > Replace existing heuristics with a second chance algorithm > > > > 1. When a new zswap entry is stored in the zswap pool, its reference bit > > is set. > > Probably worth mentioning that this is added in a hole and doesn't > consume any extra memory. Will do! > > > 2. When the zswap shrinker encounters a zswap entry with the reference > > bit set, give it a second chance - only flips the reference bit and > > rotate it in the LRU. > > 3. If the shrinker encounters the entry again, this time with its > > reference bit unset, then it can reclaim the entry. > > > > In this manner, the aging of the pages in the zswap LRUs are decoupled > > from zswap stores, and picks up the pace with increasing memory pressure > > (which is what we want). > > > > The second chance scheme allows us to modulate the writeback rate based > > on recent pool activities. Entries that recently entered the pool will > > be protected, so if the pool is dominated by such entries the writeback > > rate will reduce proportionally, protecting the workload's workingset.On > > the other hand, stale entries will be written back quickly, which > > increases the effective writeback rate. > > > > We will still maintain the count of swapins, which is consumed and > > subtracted from the lru size in zswap_shrinker_count(), to further > > penalize past overshrinking that led to disk swapins. The idea is that > > had we considered this many more pages in the LRU active/protected, they > > would not have been written back and we would not have had to swapped > > them in. > > > > To test this new heuristics, I built the kernel under a cgroup with > > memory.max set to 2G, on a host with 36 cores: > > > > With the old shrinker: > > > > real: 263.89s > > user: 4318.11s > > sys: 673.29s > > swapins: 227300.5 > > > > With the second chance algorithm: > > > > real: 244.85s > > user: 4327.22s > > sys: 664.39s > > swapins: 94663 > > > > (average over 5 runs) > > > > We observe an 1.3% reduction in kernel CPU usage, and around 7.2% > > reduction in real time. Note that the number of swapped in pages > > dropped by 58%. > > > > Suggested-by: Johannes Weiner <hannes@cmpxchg.org> > > Signed-off-by: Nhat Pham <nphamcs@gmail.com> > > --- > > include/linux/zswap.h | 16 +++--- > > mm/zswap.c | 110 ++++++++++++++++++++++++------------------ > > 2 files changed, 70 insertions(+), 56 deletions(-) > > > > diff --git a/include/linux/zswap.h b/include/linux/zswap.h > > index 6cecb4a4f68b..b94b6ae262d5 100644 > > --- a/include/linux/zswap.h > > +++ b/include/linux/zswap.h > > @@ -13,17 +13,15 @@ extern atomic_t zswap_stored_pages; > > > > struct zswap_lruvec_state { > > /* > > - * Number of pages in zswap that should be protected from the shrinker. > > - * This number is an estimate of the following counts: > > + * Number of swapped in pages, i.e not found in the zswap pool. > > With the next patch, this should be "Number of swapped in pages from > disk". Without the "from disk", the second part about not being found > in the zswap pool doesn't really make sense. > > Maybe also the variable name should be changed to nr_disk_swapins or similar. Sounds good :) > > > * > > - * a) Recent page faults. > > - * b) Recent insertion to the zswap LRU. This includes new zswap stores, > > - * as well as recent zswap LRU rotations. > > - * > > - * These pages are likely to be warm, and might incur IO if the are written > > - * to swap. > > + * This is consumed and subtracted from the lru size in > > + * zswap_shrinker_count() to penalize past overshrinking that led to disk > > + * swapins. The idea is that had we considered this many more pages in the > > + * LRU active/protected and not written them back, we would not have had to > > + * swapped them in. > > */ > > - atomic_long_t nr_zswap_protected; > > + atomic_long_t nr_swapins; > > }; > > > > unsigned long zswap_total_pages(void); > > diff --git a/mm/zswap.c b/mm/zswap.c > > index adeaf9c97fde..f4e001c9e7e0 100644 > > --- a/mm/zswap.c > > +++ b/mm/zswap.c > > @@ -184,6 +184,10 @@ static struct shrinker *zswap_shrinker; > > * page within zswap. > > * > > * swpentry - associated swap entry, the offset indexes into the red-black tree > > + * referenced - true if the entry recently entered the zswap pool. Unset by the > > + * dynamic shrinker. The entry is only reclaimed by the dynamic > > + * shrinker if referenced is unset. See comments in the shrinker > > + * section for context. > > * length - the length in bytes of the compressed page data. Needed during > > * decompression. For a same value filled page length is 0, and both > > * pool and lru are invalid and must be ignored. > > @@ -196,6 +200,7 @@ static struct shrinker *zswap_shrinker; > > struct zswap_entry { > > swp_entry_t swpentry; > > unsigned int length; > > + bool referenced; > > struct zswap_pool *pool; > > union { > > unsigned long handle; > > @@ -700,11 +705,10 @@ static inline int entry_to_nid(struct zswap_entry *entry) > > > > static void zswap_lru_add(struct list_lru *list_lru, struct zswap_entry *entry) > > { > > - atomic_long_t *nr_zswap_protected; > > - unsigned long lru_size, old, new; > > int nid = entry_to_nid(entry); > > struct mem_cgroup *memcg; > > - struct lruvec *lruvec; > > + > > + entry->referenced = true; > > Would it be clearer to initialize this in zswap_store() with the rest > of the zswap_entry initialization? Sure thing! > > > > > /* > > * Note that it is safe to use rcu_read_lock() here, even in the face of > > @@ -722,19 +726,6 @@ static void zswap_lru_add(struct list_lru *list_lru, struct zswap_entry *entry) > > memcg = mem_cgroup_from_entry(entry); > > /* will always succeed */ > > list_lru_add(list_lru, &entry->lru, nid, memcg); > > - > > - /* Update the protection area */ > > - lru_size = list_lru_count_one(list_lru, nid, memcg); > > - lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); > > - nr_zswap_protected = &lruvec->zswap_lruvec_state.nr_zswap_protected; > > - old = atomic_long_inc_return(nr_zswap_protected); > > - /* > > - * Decay to avoid overflow and adapt to changing workloads. > > - * This is based on LRU reclaim cost decaying heuristics. > > - */ > > - do { > > - new = old > lru_size / 4 ? old / 2 : old; > > - } while (!atomic_long_try_cmpxchg(nr_zswap_protected, &old, new)); > > rcu_read_unlock(); > > } > > > > @@ -752,7 +743,7 @@ static void zswap_lru_del(struct list_lru *list_lru, struct zswap_entry *entry) > > > > void zswap_lruvec_state_init(struct lruvec *lruvec) > > { > > - atomic_long_set(&lruvec->zswap_lruvec_state.nr_zswap_protected, 0); > > + atomic_long_set(&lruvec->zswap_lruvec_state.nr_swapins, 0); > > } > > > > void zswap_folio_swapin(struct folio *folio) > > @@ -761,7 +752,7 @@ void zswap_folio_swapin(struct folio *folio) > > > > if (folio) { > > lruvec = folio_lruvec(folio); > > - atomic_long_inc(&lruvec->zswap_lruvec_state.nr_zswap_protected); > > + atomic_long_inc(&lruvec->zswap_lruvec_state.nr_swapins); > > } > > } > > > > @@ -1082,6 +1073,28 @@ static int zswap_writeback_entry(struct zswap_entry *entry, > > static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l, > > spinlock_t *lock, void *arg) > > { > > @@ -1091,6 +1104,16 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o > > enum lru_status ret = LRU_REMOVED_RETRY; > > int writeback_result; > > > > + /* > > + * Second chance algorithm: if the entry has its referenced bit set, give it > > + * a second chance. Only clear the referenced bit and rotate it in the > > + * zswap's LRU list. > > + */ > > + if (entry->referenced) { > > + entry->referenced = false; > > + return LRU_ROTATE; > > + } > > + > > /* > > * As soon as we drop the LRU lock, the entry can be freed by > > * a concurrent invalidation. This means the following: > > @@ -1157,8 +1180,7 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o > > static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, > > struct shrink_control *sc) > > { > > - struct lruvec *lruvec = mem_cgroup_lruvec(sc->memcg, NODE_DATA(sc->nid)); > > - unsigned long shrink_ret, nr_protected, lru_size; > > + unsigned long shrink_ret; > > bool encountered_page_in_swapcache = false; > > > > if (!zswap_shrinker_enabled || > > @@ -1167,25 +1189,6 @@ static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, > > return SHRINK_STOP; > > } > > > > - nr_protected = > > - atomic_long_read(&lruvec->zswap_lruvec_state.nr_zswap_protected); > > - lru_size = list_lru_shrink_count(&zswap_list_lru, sc); > > - > > - /* > > - * Abort if we are shrinking into the protected region. > > - * > > - * This short-circuiting is necessary because if we have too many multiple > > - * concurrent reclaimers getting the freeable zswap object counts at the > > - * same time (before any of them made reasonable progress), the total > > - * number of reclaimed objects might be more than the number of unprotected > > - * objects (i.e the reclaimers will reclaim into the protected area of the > > - * zswap LRU). > > - */ > > - if (nr_protected >= lru_size - sc->nr_to_scan) { > > - sc->nr_scanned = 0; > > - return SHRINK_STOP; > > - } > > - > > Do we need a similar mechanism to protect against concurrent shrinkers > quickly consuming nr_swapins? Not for nr_swapins consumption per se, and the original reason why I included this (racy) check is just so that concurrent reclaimers do not disrespect the protection scheme. We had no guarantee that we wouldn't just reclaim into the protected region (well even with this racy check technically). With the second chance scheme, a "protected" page (i.e with its referenced bit set) would not be reclaimed right away - a shrinker encountering it would have to "age" it first (by unsetting the referenced bit), so the intended protection is enforced. That said, I do believe we need a mechanism to limit the concurrency here. The amount of pages aged/reclaimed should scale (linearly? proportionally?) with the reclaim pressure, i.e more reclaimers == more pages reclaimed/aged, so the current behavior is desired. However, at some point, if we have more shrinkers than there are work assigned to each of them, we might be unnecessarily wasting resources (and potentially building up the nr_deferred counter that we discussed in v1 of the patch series). Additionally, we might be overshrinking in a very short amount of time, without letting the system have the chance to react and provide feedback (through swapins/refaults) to the memory reclaimers. But let's do this as a follow-up work :) It seems orthogonal to what we have here. > > - * Subtract the lru size by an estimate of the number of pages > > - * that should be protected. > > + * Subtract the lru size by the number of pages that are recently swapped > > nit: I don't think "subtract by" is correct, it's usually "subtract > from". So maybe "Subtract the number of pages that are recently > swapped in from the lru size"? Also, should we remain consistent about > mentioning that these are disk swapins throughout all the comments to > keep things clear? Yeah I should be clearer here - it should be swapped in from disk, or more generally (accurately?) swapped in from the backing swap device (but the latter can change once we decoupled swap from zswap). Or maybe swapped in from the secondary tier? Let's just not overthink and go with swapped in from disk for now :) > > > + * in. The idea is that had we protect the zswap's LRU by this amount of > > + * pages, these swap in would not have happened. > > */ > > - nr_freeable = nr_freeable > nr_protected ? nr_freeable - nr_protected : 0; > > + nr_swapins_cur = atomic_long_read(nr_swapins); > > + do { > > + if (lru_size >= nr_swapins_cur) > > + nr_remain = 0; > > + else > > + nr_remain = nr_swapins_cur - lru_size; > > + } while (!atomic_long_try_cmpxchg(nr_swapins, &nr_swapins_cur, nr_remain)); > > + > > + lru_size -= nr_swapins_cur - nr_remain; > > It's a little bit weird that we reduce the variable named "lru_size" > by the consumed swapins. Maybe we should keep this named as > "nr_freeable", or add another variable here to hold the value after > subtraction? Hmmmm yeah now I remember why I called it nr_freeable back then. Seems like past Nhat is a bit smarter than present Nhat :) I'll just revert this part then.
[..] > > > @@ -1167,25 +1189,6 @@ static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, > > > return SHRINK_STOP; > > > } > > > > > > - nr_protected = > > > - atomic_long_read(&lruvec->zswap_lruvec_state.nr_zswap_protected); > > > - lru_size = list_lru_shrink_count(&zswap_list_lru, sc); > > > - > > > - /* > > > - * Abort if we are shrinking into the protected region. > > > - * > > > - * This short-circuiting is necessary because if we have too many multiple > > > - * concurrent reclaimers getting the freeable zswap object counts at the > > > - * same time (before any of them made reasonable progress), the total > > > - * number of reclaimed objects might be more than the number of unprotected > > > - * objects (i.e the reclaimers will reclaim into the protected area of the > > > - * zswap LRU). > > > - */ > > > - if (nr_protected >= lru_size - sc->nr_to_scan) { > > > - sc->nr_scanned = 0; > > > - return SHRINK_STOP; > > > - } > > > - > > > > Do we need a similar mechanism to protect against concurrent shrinkers > > quickly consuming nr_swapins? > > Not for nr_swapins consumption per se, and the original reason why I > included this (racy) check is just so that concurrent reclaimers do > not disrespect the protection scheme. We had no guarantee that we > wouldn't just reclaim into the protected region (well even with this > racy check technically). With the second chance scheme, a "protected" > page (i.e with its referenced bit set) would not be reclaimed right > away - a shrinker encountering it would have to "age" it first (by > unsetting the referenced bit), so the intended protection is enforced. > > That said, I do believe we need a mechanism to limit the concurrency > here. The amount of pages aged/reclaimed should scale (linearly? > proportionally?) with the reclaim pressure, i.e more reclaimers == > more pages reclaimed/aged, so the current behavior is desired. > However, at some point, if we have more shrinkers than there are work > assigned to each of them, we might be unnecessarily wasting resources > (and potentially building up the nr_deferred counter that we discussed > in v1 of the patch series). Additionally, we might be overshrinking in > a very short amount of time, without letting the system have the > chance to react and provide feedback (through swapins/refaults) to the > memory reclaimers. > > But let's do this as a follow-up work :) It seems orthogonal to what > we have here. Agreed, as long as the data shows we don't regress by removing this part I am fine with doing this as a follow-up work. > > > > - * Subtract the lru size by an estimate of the number of pages > > > - * that should be protected. > > > + * Subtract the lru size by the number of pages that are recently swapped > > > > nit: I don't think "subtract by" is correct, it's usually "subtract > > from". So maybe "Subtract the number of pages that are recently > > swapped in from the lru size"? Also, should we remain consistent about > > mentioning that these are disk swapins throughout all the comments to > > keep things clear? > > Yeah I should be clearer here - it should be swapped in from disk, or > more generally (accurately?) swapped in from the backing swap device > (but the latter can change once we decoupled swap from zswap). Or > maybe swapped in from the secondary tier? > > Let's just not overthink and go with swapped in from disk for now :) Agreed :) I will take a look at the new version soon, thanks for working on this.
diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 6cecb4a4f68b..b94b6ae262d5 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -13,17 +13,15 @@ extern atomic_t zswap_stored_pages; struct zswap_lruvec_state { /* - * Number of pages in zswap that should be protected from the shrinker. - * This number is an estimate of the following counts: + * Number of swapped in pages, i.e not found in the zswap pool. * - * a) Recent page faults. - * b) Recent insertion to the zswap LRU. This includes new zswap stores, - * as well as recent zswap LRU rotations. - * - * These pages are likely to be warm, and might incur IO if the are written - * to swap. + * This is consumed and subtracted from the lru size in + * zswap_shrinker_count() to penalize past overshrinking that led to disk + * swapins. The idea is that had we considered this many more pages in the + * LRU active/protected and not written them back, we would not have had to + * swapped them in. */ - atomic_long_t nr_zswap_protected; + atomic_long_t nr_swapins; }; unsigned long zswap_total_pages(void); diff --git a/mm/zswap.c b/mm/zswap.c index adeaf9c97fde..f4e001c9e7e0 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -184,6 +184,10 @@ static struct shrinker *zswap_shrinker; * page within zswap. * * swpentry - associated swap entry, the offset indexes into the red-black tree + * referenced - true if the entry recently entered the zswap pool. Unset by the + * dynamic shrinker. The entry is only reclaimed by the dynamic + * shrinker if referenced is unset. See comments in the shrinker + * section for context. * length - the length in bytes of the compressed page data. Needed during * decompression. For a same value filled page length is 0, and both * pool and lru are invalid and must be ignored. @@ -196,6 +200,7 @@ static struct shrinker *zswap_shrinker; struct zswap_entry { swp_entry_t swpentry; unsigned int length; + bool referenced; struct zswap_pool *pool; union { unsigned long handle; @@ -700,11 +705,10 @@ static inline int entry_to_nid(struct zswap_entry *entry) static void zswap_lru_add(struct list_lru *list_lru, struct zswap_entry *entry) { - atomic_long_t *nr_zswap_protected; - unsigned long lru_size, old, new; int nid = entry_to_nid(entry); struct mem_cgroup *memcg; - struct lruvec *lruvec; + + entry->referenced = true; /* * Note that it is safe to use rcu_read_lock() here, even in the face of @@ -722,19 +726,6 @@ static void zswap_lru_add(struct list_lru *list_lru, struct zswap_entry *entry) memcg = mem_cgroup_from_entry(entry); /* will always succeed */ list_lru_add(list_lru, &entry->lru, nid, memcg); - - /* Update the protection area */ - lru_size = list_lru_count_one(list_lru, nid, memcg); - lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); - nr_zswap_protected = &lruvec->zswap_lruvec_state.nr_zswap_protected; - old = atomic_long_inc_return(nr_zswap_protected); - /* - * Decay to avoid overflow and adapt to changing workloads. - * This is based on LRU reclaim cost decaying heuristics. - */ - do { - new = old > lru_size / 4 ? old / 2 : old; - } while (!atomic_long_try_cmpxchg(nr_zswap_protected, &old, new)); rcu_read_unlock(); } @@ -752,7 +743,7 @@ static void zswap_lru_del(struct list_lru *list_lru, struct zswap_entry *entry) void zswap_lruvec_state_init(struct lruvec *lruvec) { - atomic_long_set(&lruvec->zswap_lruvec_state.nr_zswap_protected, 0); + atomic_long_set(&lruvec->zswap_lruvec_state.nr_swapins, 0); } void zswap_folio_swapin(struct folio *folio) @@ -761,7 +752,7 @@ void zswap_folio_swapin(struct folio *folio) if (folio) { lruvec = folio_lruvec(folio); - atomic_long_inc(&lruvec->zswap_lruvec_state.nr_zswap_protected); + atomic_long_inc(&lruvec->zswap_lruvec_state.nr_swapins); } } @@ -1082,6 +1073,28 @@ static int zswap_writeback_entry(struct zswap_entry *entry, /********************************* * shrinker functions **********************************/ +/* + * The dynamic shrinker is modulated by the following factors: + * + * 1. Each zswap entry has a referenced bit, which the shrinker unsets (giving + * the entry a second chance) before rotating it in the LRU list. If the + * entry is considered again by the shrinker, with its referenced bit unset, + * it is written back. The writeback rate as a result is dynamically + * adjusted by the pool activities - if the pool is dominated by new entries + * (i.e lots of recent zswapouts), these entries will be protected and + * the writeback rate will slow down. On the other hand, if the pool has a + * lot of stagnant entries, these entries will be reclaimed immediately, + * effectively increasing the writeback rate. + * + * 2. Swapins counter: If we observe swapins, it is a sign that we are + * overshrinking and should slow down. We maintain a swapins counter, which + * is consumed and subtract from the number of eligible objects on the LRU + * in zswap_shrinker_count(). + * + * 3. Compression ratio. The better the workload compresses, the less gains we + * can expect from writeback. We scale down the number of objects available + * for reclaim by this ratio. + */ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l, spinlock_t *lock, void *arg) { @@ -1091,6 +1104,16 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o enum lru_status ret = LRU_REMOVED_RETRY; int writeback_result; + /* + * Second chance algorithm: if the entry has its referenced bit set, give it + * a second chance. Only clear the referenced bit and rotate it in the + * zswap's LRU list. + */ + if (entry->referenced) { + entry->referenced = false; + return LRU_ROTATE; + } + /* * As soon as we drop the LRU lock, the entry can be freed by * a concurrent invalidation. This means the following: @@ -1157,8 +1180,7 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) { - struct lruvec *lruvec = mem_cgroup_lruvec(sc->memcg, NODE_DATA(sc->nid)); - unsigned long shrink_ret, nr_protected, lru_size; + unsigned long shrink_ret; bool encountered_page_in_swapcache = false; if (!zswap_shrinker_enabled || @@ -1167,25 +1189,6 @@ static unsigned long zswap_shrinker_scan(struct shrinker *shrinker, return SHRINK_STOP; } - nr_protected = - atomic_long_read(&lruvec->zswap_lruvec_state.nr_zswap_protected); - lru_size = list_lru_shrink_count(&zswap_list_lru, sc); - - /* - * Abort if we are shrinking into the protected region. - * - * This short-circuiting is necessary because if we have too many multiple - * concurrent reclaimers getting the freeable zswap object counts at the - * same time (before any of them made reasonable progress), the total - * number of reclaimed objects might be more than the number of unprotected - * objects (i.e the reclaimers will reclaim into the protected area of the - * zswap LRU). - */ - if (nr_protected >= lru_size - sc->nr_to_scan) { - sc->nr_scanned = 0; - return SHRINK_STOP; - } - shrink_ret = list_lru_shrink_walk(&zswap_list_lru, sc, &shrink_memcg_cb, &encountered_page_in_swapcache); @@ -1200,7 +1203,8 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, { struct mem_cgroup *memcg = sc->memcg; struct lruvec *lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(sc->nid)); - unsigned long nr_backing, nr_stored, nr_freeable, nr_protected; + atomic_long_t *nr_swapins = &lruvec->zswap_lruvec_state.nr_swapins; + unsigned long nr_backing, nr_stored, lru_size, nr_swapins_cur, nr_remain; if (!zswap_shrinker_enabled || !mem_cgroup_zswap_writeback_enabled(memcg)) return 0; @@ -1233,14 +1237,26 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, if (!nr_stored) return 0; - nr_protected = - atomic_long_read(&lruvec->zswap_lruvec_state.nr_zswap_protected); - nr_freeable = list_lru_shrink_count(&zswap_list_lru, sc); + lru_size = list_lru_shrink_count(&zswap_list_lru, sc); + if (!lru_size) + return 0; + /* - * Subtract the lru size by an estimate of the number of pages - * that should be protected. + * Subtract the lru size by the number of pages that are recently swapped + * in. The idea is that had we protect the zswap's LRU by this amount of + * pages, these swap in would not have happened. */ - nr_freeable = nr_freeable > nr_protected ? nr_freeable - nr_protected : 0; + nr_swapins_cur = atomic_long_read(nr_swapins); + do { + if (lru_size >= nr_swapins_cur) + nr_remain = 0; + else + nr_remain = nr_swapins_cur - lru_size; + } while (!atomic_long_try_cmpxchg(nr_swapins, &nr_swapins_cur, nr_remain)); + + lru_size -= nr_swapins_cur - nr_remain; + if (!lru_size) + return 0; /* * Scale the number of freeable pages by the memory saving factor. @@ -1253,7 +1269,7 @@ static unsigned long zswap_shrinker_count(struct shrinker *shrinker, * space. Hence, we may scale nr_freeable down a little bit more than we * should if we have a lot of same-filled pages. */ - return mult_frac(nr_freeable, nr_backing, nr_stored); + return mult_frac(lru_size, nr_backing, nr_stored); } static struct shrinker *zswap_alloc_shrinker(void)
Current zswap shrinker's heuristics to prevent overshrinking is brittle and inaccurate, specifically in the way we decay the protection size (i.e making pages in the zswap LRU eligible for reclaim). We currently decay protection aggressively in zswap_lru_add() calls. This leads to the following unfortunate effect: when a new batch of pages enter zswap, the protection size rapidly decays to below 25% of the zswap LRU size, which is way too low. We have observed this effect in production, when experimenting with the zswap shrinker: the rate of shrinking shoots up massively right after a new batch of zswap stores. This is somewhat the opposite of what we want originally - when new pages enter zswap, we want to protect both these new pages AND the pages that are already protected in the zswap LRU. Replace existing heuristics with a second chance algorithm 1. When a new zswap entry is stored in the zswap pool, its reference bit is set. 2. When the zswap shrinker encounters a zswap entry with the reference bit set, give it a second chance - only flips the reference bit and rotate it in the LRU. 3. If the shrinker encounters the entry again, this time with its reference bit unset, then it can reclaim the entry. In this manner, the aging of the pages in the zswap LRUs are decoupled from zswap stores, and picks up the pace with increasing memory pressure (which is what we want). The second chance scheme allows us to modulate the writeback rate based on recent pool activities. Entries that recently entered the pool will be protected, so if the pool is dominated by such entries the writeback rate will reduce proportionally, protecting the workload's workingset.On the other hand, stale entries will be written back quickly, which increases the effective writeback rate. We will still maintain the count of swapins, which is consumed and subtracted from the lru size in zswap_shrinker_count(), to further penalize past overshrinking that led to disk swapins. The idea is that had we considered this many more pages in the LRU active/protected, they would not have been written back and we would not have had to swapped them in. To test this new heuristics, I built the kernel under a cgroup with memory.max set to 2G, on a host with 36 cores: With the old shrinker: real: 263.89s user: 4318.11s sys: 673.29s swapins: 227300.5 With the second chance algorithm: real: 244.85s user: 4327.22s sys: 664.39s swapins: 94663 (average over 5 runs) We observe an 1.3% reduction in kernel CPU usage, and around 7.2% reduction in real time. Note that the number of swapped in pages dropped by 58%. Suggested-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Nhat Pham <nphamcs@gmail.com> --- include/linux/zswap.h | 16 +++--- mm/zswap.c | 110 ++++++++++++++++++++++++------------------ 2 files changed, 70 insertions(+), 56 deletions(-)