Commit 10407a72 authored by Liu Shixin's avatar Liu Shixin
Browse files

mm/dynamic_pool: use batch to add free pages to dpool 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAO6DE



--------------------------------

In the commit 8ee84018 ("mm/dynamic_pool: disable irq for dynamic_pool
lock"), the spinlock has been changed to spinlock_irq to address potential
deadlock scenarios during interrupts. However, during dpool_init(), the
lock will be released and sleep in order to avoid lockup. This is not
appropriate, as disabling the interrupt will render this scheduling
ineffective. To resolve this, add pages to dpool via batch.

Fixes: 8ee84018 ("mm/dynamic_pool: disable irq for dynamic_pool lock")
Signed-off-by: default avatarMa Wupeng <mawupeng1@huawei.com>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent 362ef656

mm/dynamic_pool.c

+11 −10
Original line number Diff line number Diff line
@@ -1576,7 +1576,9 @@ static int dpool_fill_from_pagelist(struct dynamic_pool *dpool, void *arg) 
{

	struct dpool_info *info = (struct dpool_info *)arg;

	struct pages_pool *pool = &dpool->pool[PAGES_POOL_4K];

	int i, ret = -EINVAL;

	unsigned long nr_pages = 0;

	int i;

	LIST_HEAD(page_list);



	dpool->range_cnt = info->range_cnt;

	dpool->pfn_ranges =
@@ -1587,8 +1589,6 @@ static int dpool_fill_from_pagelist(struct dynamic_pool *dpool, void *arg) 
	memcpy(dpool->pfn_ranges, info->pfn_ranges,

		sizeof(struct range) * dpool->range_cnt);



	spin_lock_irq(&dpool->lock);



	for (i = 0; i < dpool->range_cnt; i++) {

		struct range *range = &dpool->pfn_ranges[i];

		u64 pfn;
@@ -1601,22 +1601,23 @@ static int dpool_fill_from_pagelist(struct dynamic_pool *dpool, void *arg) 


			if (!dpool_free_page_prepare(page)) {

				pr_err("fill pool failed, check pages failed\n");

				goto unlock;

				return -EINVAL;

			}



			__SetPageDpool(page);

			list_add_tail(&page->lru, &pool->freelist);

			pool->free_pages++;

			list_add_tail(&page->lru, &page_list);

			nr_pages++;



			cond_resched_lock(&dpool->lock);

			cond_resched();

		}

	}

	ret = 0;



unlock:

	spin_lock_irq(&dpool->lock);

	list_splice(&page_list, &pool->freelist);

	pool->free_pages += nr_pages;

	spin_unlock_irq(&dpool->lock);



	return ret;

	return 0;

}



static int dpool_drain_to_pagelist(struct dynamic_pool *dpool)