diff mbox series

mm: swapfile: check usable swap device in __folio_throttle_swaprate()

Message ID 20240418135644.2736748-1-wangkefeng.wang@huawei.com (mailing list archive)
State New
Headers show
Series mm: swapfile: check usable swap device in __folio_throttle_swaprate() | expand

Commit Message

Kefeng Wang April 18, 2024, 1:56 p.m. UTC 
Skip blk_cgroup_congested() if no usable swap device since no swapin/out,
suppose that no thorottle when swapon/swapoff, so no swap_lock, difference
as shows below from perf date of CoW pagefault,

 perf report -g -i perf.data.swapoff  | egrep "blk_cgroup_congested|__folio_throttle_swaprate"
     1.01%     0.16%  page_fault2_pro  [kernel.kallsyms]      [k] __folio_throttle_swaprate
     0.83%     0.80%  page_fault2_pro  [kernel.kallsyms]      [k] blk_cgroup_congested

 perf report -g -i perf.data.swapon   | egrep "blk_cgroup_congested|__folio_throttle_swaprate"
     0.15%     0.15%  page_fault2_pro  [kernel.kallsyms]      [k] __folio_throttle_swaprate

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 mm/swapfile.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 28642c188c93..96606580ee09 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2444,13 +2444,17 @@  static void reinsert_swap_info(struct swap_info_struct *p)
 	spin_unlock(&swap_lock);
 }
 
+static bool __has_usable_swap(void)
+{
+	return !plist_head_empty(&swap_active_head);
+}
+
 bool has_usable_swap(void)
 {
-	bool ret = true;
+	bool ret;
 
 	spin_lock(&swap_lock);
-	if (plist_head_empty(&swap_active_head))
-		ret = false;
+	ret = __has_usable_swap();
 	spin_unlock(&swap_lock);
 	return ret;
 }
@@ -3710,6 +3714,9 @@  void __folio_throttle_swaprate(struct folio *folio, gfp_t gfp)
 	if (!(gfp & __GFP_IO))
 		return;
 
+	if (!__has_usable_swap())
+		return;
+
 	if (!blk_cgroup_congested())
 		return;