From: Yosry Ahmed <yosryahmed@google.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>,
Nhat Pham <nphamcs@gmail.com>, Chris Li <chrisl@kernel.org>,
Chengming Zhou <zhouchengming@bytedance.com>,
Huang Ying <ying.huang@intel.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Yosry Ahmed <yosryahmed@google.com>
Subject: [PATCH 1/2] mm: swap: update inuse_pages after all cleanups are done
Date: Sat, 20 Jan 2024 02:40:06 +0000 [thread overview]
Message-ID: <20240120024007.2850671-2-yosryahmed@google.com> (raw)
In-Reply-To: <20240120024007.2850671-1-yosryahmed@google.com>
In swap_range_free(), we update inuse_pages then do some cleanups (arch
invalidation, zswap invalidation, swap cache cleanups, etc). During
swapoff, try_to_unuse() uses inuse_pages to make sure all swap entries
are freed. Make sure we only update inuse_pages after we are done with
the cleanups.
In practice, this shouldn't matter, because swap_range_free() is called
with the swap info lock held, and the swapoff code will spin for that
lock after try_to_unuse() anyway.
The goal is to make it obvious and more future proof that once
try_to_unuse() returns, all cleanups are done. This also facilitates a
following zswap cleanup patch which uses this fact to simplify
zswap_swapoff().
Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
---
mm/swapfile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 556ff7347d5f0..2fedb148b9404 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -737,8 +737,6 @@ static void swap_range_free(struct swap_info_struct *si, unsigned long offset,
if (was_full && (si->flags & SWP_WRITEOK))
add_to_avail_list(si);
}
- atomic_long_add(nr_entries, &nr_swap_pages);
- WRITE_ONCE(si->inuse_pages, si->inuse_pages - nr_entries);
if (si->flags & SWP_BLKDEV)
swap_slot_free_notify =
si->bdev->bd_disk->fops->swap_slot_free_notify;
@@ -752,6 +750,8 @@ static void swap_range_free(struct swap_info_struct *si, unsigned long offset,
offset++;
}
clear_shadow_from_swap_cache(si->type, begin, end);
+ atomic_long_add(nr_entries, &nr_swap_pages);
+ WRITE_ONCE(si->inuse_pages, si->inuse_pages - nr_entries);
}
static void set_cluster_next(struct swap_info_struct *si, unsigned long next)
--
2.43.0.429.g432eaa2c6b-goog
next prev parent reply other threads:[~2024-01-20 2:40 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-20 2:40 [PATCH 0/2] mm: zswap: simplify zswap_swapoff() Yosry Ahmed
2024-01-20 2:40 ` Yosry Ahmed [this message]
2024-01-22 13:17 ` [PATCH 1/2] mm: swap: update inuse_pages after all cleanups are done Chengming Zhou
2024-01-23 8:59 ` Huang, Ying
2024-01-23 9:40 ` Yosry Ahmed
2024-01-23 9:54 ` Yosry Ahmed
2024-01-24 3:13 ` Huang, Ying
2024-01-24 3:20 ` Yosry Ahmed
2024-01-24 3:27 ` Huang, Ying
2024-01-24 4:15 ` Yosry Ahmed
2024-01-20 2:40 ` [PATCH 2/2] mm: zswap: remove unnecessary tree cleanups in zswap_swapoff() Yosry Ahmed
2024-01-22 13:13 ` Chengming Zhou
2024-01-22 20:19 ` Johannes Weiner
2024-01-22 20:39 ` Yosry Ahmed
2024-01-23 15:38 ` Johannes Weiner
2024-01-23 15:54 ` Yosry Ahmed
2024-01-23 20:12 ` Johannes Weiner
2024-01-23 21:02 ` Yosry Ahmed
2024-01-24 6:57 ` Yosry Ahmed
2024-01-25 5:28 ` Chris Li
2024-01-25 7:59 ` Yosry Ahmed
2024-01-25 18:55 ` Chris Li
2024-01-25 20:57 ` Yosry Ahmed
2024-01-25 22:31 ` Chris Li
2024-01-25 22:33 ` Yosry Ahmed
2024-01-26 1:09 ` Chris Li
2024-01-24 7:20 ` Chengming Zhou
2024-01-25 5:44 ` Chris Li
2024-01-25 8:01 ` Yosry Ahmed
2024-01-25 19:03 ` Chris Li
2024-01-25 21:01 ` Yosry Ahmed
2024-01-25 7:53 ` Yosry Ahmed
2024-01-25 8:03 ` Yosry Ahmed
2024-01-25 8:30 ` Chengming Zhou
2024-01-25 8:42 ` Yosry Ahmed
2024-01-25 8:52 ` Chengming Zhou
2024-01-25 9:03 ` Yosry Ahmed
2024-01-25 9:22 ` Chengming Zhou
2024-01-25 9:26 ` Yosry Ahmed
2024-01-25 9:38 ` Chengming Zhou
2024-01-26 0:03 ` Chengming Zhou
2024-01-26 0:05 ` Yosry Ahmed
2024-01-26 0:10 ` Chengming Zhou
2024-01-23 20:30 ` Nhat Pham
2024-01-23 21:04 ` Yosry Ahmed
2024-01-22 21:21 ` Nhat Pham
2024-01-22 22:31 ` Chris Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240120024007.2850671-2-yosryahmed@google.com \
--to=yosryahmed@google.com \
--cc=akpm@linux-foundation.org \
--cc=chrisl@kernel.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nphamcs@gmail.com \
--cc=ying.huang@intel.com \
--cc=zhouchengming@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).