Unverified Commit 40e4eb12 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7588 mm/swapfile: fix infinite loop in get_swap_pages after set memory.swapfile 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/55SDO6AEFMLC6KLKMJAZG4QWXMAV3CFV/ 
 
https://gitee.com/openeuler/kernel/issues/I9QRNR 
 
Link:https://gitee.com/openeuler/kernel/pulls/7588

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents d2fe270b cadcd419

mm/swapfile.c

+3 −5
Original line number Diff line number Diff line
@@ -1173,15 +1173,13 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_size, 
start_over:

	node = numa_node_id();

	plist_for_each_entry_safe(si, next, &swap_avail_heads[node], avail_lists[node]) {

		if (should_skip_swap_type(si->type, type))

			goto nextsi;



		/* requeue si to after same-priority siblings */

		plist_requeue(&si->avail_lists[node], &swap_avail_heads[node]);

		spin_unlock(&swap_avail_lock);

		spin_lock(&si->lock);

		if (should_skip_swap_type(si->type, type)) {

			spin_unlock(&si->lock);

			spin_lock(&swap_avail_lock);

			goto nextsi;

		}

		if (!si->highest_bit || !(si->flags & SWP_WRITEOK)) {

			spin_lock(&swap_avail_lock);

			if (plist_node_empty(&si->avail_lists[node])) {