From: Wei Yang <richard.weiyang@gmail.com>
To: Wei Yang <richard.weiyang@gmail.com>
Cc: akpm@linux-foundation.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Hugh Dickins <hughd@google.com>
Subject: Re: [PATCH] mm/swapfile.c: simplify the scan loop in scan_swap_map_slots()
Date: Sat, 29 Feb 2020 22:06:13 +0000 [thread overview]
Message-ID: <20200229220613.oyryopfshe6juvro@master> (raw)
In-Reply-To: <20200229131537.3475-1-richard.weiyang@gmail.com>
On Sat, Feb 29, 2020 at 01:15:37PM +0000, Wei Yang wrote:
>After commit c60aa176c6de8 ("swapfile: swap allocation cycle if
>nonrot"), swap allocation is cyclic. Current approach is done with two
>separate loop on the upper and lower half. This looks a little
>redundant.
>
>>From another point of view, the loop iterates [lowest_bit, highest_bit]
>range starting with (offset + 1) but except scan_base. So we can
>simplify the loop with condition (next_offset() != scan_base) by
>introducing next_offset() which makes sure offset fit in that range
>with correct order.
>
>Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
>CC: Hugh Dickins <hughd@google.com>
>---
> mm/swapfile.c | 26 +++++++++-----------------
> 1 file changed, 9 insertions(+), 17 deletions(-)
>
>diff --git a/mm/swapfile.c b/mm/swapfile.c
>index 95024f9b691a..42c5c2010bfc 100644
>--- a/mm/swapfile.c
>+++ b/mm/swapfile.c
>@@ -729,6 +729,14 @@ static void swap_range_free(struct swap_info_struct *si, unsigned long offset,
> }
> }
>
>+static unsigned long next_offset(struct swap_info_struct *si,
>+ unsigned long *offset)
>+{
>+ if (++(*offset) > si->highest_bit)
>+ *offset = si->lowest_bit;
Hmm... I found one potential problem here. If someone has eaten the lower
part, (si->lowest_bit > scan_base), we would fall into infinite loop.
Will wait for some comment before sending v2.
>+ return *offset;
>+}
>+
> static int scan_swap_map_slots(struct swap_info_struct *si,
> unsigned char usage, int nr,
> swp_entry_t slots[])
>@@ -883,7 +891,7 @@ static int scan_swap_map_slots(struct swap_info_struct *si,
>
> scan:
> spin_unlock(&si->lock);
>- while (++offset <= si->highest_bit) {
>+ while (next_offset(si, &offset) != scan_base) {
> if (!si->swap_map[offset]) {
> spin_lock(&si->lock);
> goto checks;
>@@ -897,22 +905,6 @@ static int scan_swap_map_slots(struct swap_info_struct *si,
> latency_ration = LATENCY_LIMIT;
> }
> }
>- offset = si->lowest_bit;
>- while (offset < scan_base) {
>- if (!si->swap_map[offset]) {
>- spin_lock(&si->lock);
>- goto checks;
>- }
>- if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {
>- spin_lock(&si->lock);
>- goto checks;
>- }
>- if (unlikely(--latency_ration < 0)) {
>- cond_resched();
>- latency_ration = LATENCY_LIMIT;
>- }
>- offset++;
>- }
> spin_lock(&si->lock);
>
> no_page:
>--
>2.23.0
--
Wei Yang
Help you, Help me
prev parent reply other threads:[~2020-02-29 22:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-29 13:15 [PATCH] mm/swapfile.c: simplify the scan loop in scan_swap_map_slots() Wei Yang
2020-02-29 22:06 ` Wei Yang [this message]
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=20200229220613.oyryopfshe6juvro@master \
--to=richard.weiyang@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/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).