]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
mm: do not start/end writeback for pages stored in zswap
authorUsama Arif <usamaarif642@gmail.com>
Mon, 10 Jun 2024 14:30:37 +0000 (15:30 +0100)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 4 Jul 2024 02:30:07 +0000 (19:30 -0700)
Most of the work done in folio_start_writeback is reversed in
folio_end_writeback.  For e.g.  NR_WRITEBACK and NR_ZONE_WRITE_PENDING are
incremented in start_writeback and decremented in end_writeback.  Calling
end_writeback immediately after start_writeback (separated by
folio_unlock) cancels the affect of most of the work done in start hence
can be removed.

There is some extra work done in folio_end_writeback, however it is
incorrect/not applicable to zswap:
- folio_end_writeback incorrectly increments NR_WRITTEN counter,
  eventhough the pages aren't written to disk, hence this change
  corrects this behaviour.
- folio_end_writeback calls folio_rotate_reclaimable, but that only
  makes sense for async writeback pages, while for zswap pages are
  synchronously reclaimed.

Link: https://lkml.kernel.org/r/20240612100109.1616626-1-usamaarif642@gmail.com
Link: https://lkml.kernel.org/r/20240610143037.812955-1-usamaarif642@gmail.com
Signed-off-by: Usama Arif <usamaarif642@gmail.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Shakeel Butt <shakeel.butt@linux.dev>
Acked-by: Yosry Ahmed <yosryahmed@google.com>
Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev>
Suggested-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Nhat Pham <nphamcs@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/page_io.c

index f1a9cfab6e74864511b1b23b42cd60f021d1979d..488ecacef84f5f5751ded766afc9a6a6e3b815d1 100644 (file)
@@ -196,9 +196,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
                return ret;
        }
        if (zswap_store(folio)) {
-               folio_start_writeback(folio);
                folio_unlock(folio);
-               folio_end_writeback(folio);
                return 0;
        }
        if (!mem_cgroup_zswap_writeback_enabled(folio_memcg(folio))) {