From: Huang Ying <ying.huang@intel.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Huang Ying <ying.huang@intel.com>,
David Hildenbrand <david@redhat.com>,
Hugh Dickins <hughd@google.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Matthew Wilcox <willy@infradead.org>,
Michal Hocko <mhocko@suse.com>, Minchan Kim <minchan@kernel.org>,
Tim Chen <tim.c.chen@linux.intel.com>,
Yang Shi <shy828301@gmail.com>, Yu Zhao <yuzhao@google.com>
Subject: [PATCH -V2 4/5] swap: remove get/put_swap_device() in __swap_duplicate()
Date: Mon, 22 May 2023 15:09:04 +0800 [thread overview]
Message-ID: <20230522070905.16773-5-ying.huang@intel.com> (raw)
In-Reply-To: <20230522070905.16773-1-ying.huang@intel.com>
__swap_duplicate() is called by
- swap_shmem_alloc(): the page lock of the swap cache is held.
- copy_nonpresent_pte() -> swap_duplicate() and try_to_unmap_one() ->
swap_duplicate(): the page table lock is held.
- __read_swap_cache_async() -> swapcache_prepare(): enclosed with
get/put_swap_device() in __read_swap_cache_async() already.
So, it's safe to remove get/put_swap_device() in __swap_duplicate().
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Yu Zhao <yuzhao@google.com>
---
mm/swapfile.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/mm/swapfile.c b/mm/swapfile.c
index e9cce775fb25..4dbaea64635d 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -3264,9 +3264,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage)
unsigned char has_cache;
int err;
- p = get_swap_device(entry);
- if (!p)
- return -EINVAL;
+ p = swp_swap_info(entry);
offset = swp_offset(entry);
ci = lock_cluster_or_swap_info(p, offset);
@@ -3313,7 +3311,6 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage)
unlock_out:
unlock_cluster_or_swap_info(p, ci);
- put_swap_device(p);
return err;
}
--
2.39.2
next prev parent reply other threads:[~2023-05-22 7:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 7:09 [PATCH -V2 0/5] swap: cleanup get/put_swap_device() usage Huang Ying
2023-05-22 7:09 ` [PATCH -V2 1/5] swap: Remove get/put_swap_device() in __swap_count() Huang Ying
2023-05-22 11:54 ` David Hildenbrand
2023-05-23 1:22 ` Yosry Ahmed
2023-05-23 1:47 ` Huang, Ying
2023-05-23 1:51 ` Yosry Ahmed
2023-05-22 7:09 ` [PATCH -V2 2/5] swap, __read_swap_cache_async(): enlarge get/put_swap_device protection range Huang Ying
2023-05-22 12:01 ` David Hildenbrand
2023-05-23 0:43 ` Huang, Ying
2023-05-22 7:09 ` [PATCH -V2 3/5] swap: remove __swp_swapcount() Huang Ying
2023-05-22 12:03 ` David Hildenbrand
2023-05-23 0:50 ` Huang, Ying
2023-05-22 7:09 ` Huang Ying [this message]
2023-05-22 12:06 ` [PATCH -V2 4/5] swap: remove get/put_swap_device() in __swap_duplicate() David Hildenbrand
2023-05-23 0:56 ` Huang, Ying
2023-05-23 7:59 ` David Hildenbrand
2023-05-23 1:39 ` Yosry Ahmed
2023-05-22 7:09 ` [PATCH -V2 5/5] swap: comments get_swap_device() with usage rule Huang Ying
2023-05-22 12:07 ` David Hildenbrand
2023-05-23 1:00 ` Huang, Ying
2023-05-23 1:37 ` Yosry Ahmed
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=20230522070905.16773-5-ying.huang@intel.com \
--to=ying.huang@intel.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=minchan@kernel.org \
--cc=shy828301@gmail.com \
--cc=tim.c.chen@linux.intel.com \
--cc=willy@infradead.org \
--cc=yuzhao@google.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