Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49ed5267 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ic9d78be3,Id5e110d7 into msm-4.14 

* changes:
  workqueue: allow WQ_MEM_RECLAIM on early init workqueues
  workqueue: separate out init_rescuer()
parents 400c9e31 889d1c56

kernel/workqueue.c

+40 −24
Original line number Diff line number Diff line
@@ -3964,6 +3964,37 @@ static int wq_clamp_max_active(int max_active, unsigned int flags, 
	return clamp_val(max_active, 1, lim);

}



/*

 * Workqueues which may be used during memory reclaim should have a rescuer

 * to guarantee forward progress.

 */

static int init_rescuer(struct workqueue_struct *wq)

{

	struct worker *rescuer;

	int ret;



	if (!(wq->flags & WQ_MEM_RECLAIM))

		return 0;



	rescuer = alloc_worker(NUMA_NO_NODE);

	if (!rescuer)

		return -ENOMEM;



	rescuer->rescue_wq = wq;

	rescuer->task = kthread_create(rescuer_thread, rescuer, "%s", wq->name);

	ret = PTR_ERR_OR_ZERO(rescuer->task);

	if (ret) {

		kfree(rescuer);

		return ret;

	}



	wq->rescuer = rescuer;

	kthread_bind_mask(rescuer->task, cpu_possible_mask);

	wake_up_process(rescuer->task);



	return 0;

}



struct workqueue_struct *__alloc_workqueue_key(const char *fmt,

					       unsigned int flags,

					       int max_active,
@@ -4026,30 +4057,9 @@ struct workqueue_struct *__alloc_workqueue_key(const char *fmt, 
	if (alloc_and_link_pwqs(wq) < 0)

		goto err_free_wq;



	/*

	 * Workqueues which may be used during memory reclaim should

	 * have a rescuer to guarantee forward progress.

	 */

	if (flags & WQ_MEM_RECLAIM) {

		struct worker *rescuer;



		rescuer = alloc_worker(NUMA_NO_NODE);

		if (!rescuer)

	if (wq_online && init_rescuer(wq) < 0)

		goto err_destroy;



		rescuer->rescue_wq = wq;

		rescuer->task = kthread_create(rescuer_thread, rescuer, "%s",

					       wq->name);

		if (IS_ERR(rescuer->task)) {

			kfree(rescuer);

			goto err_destroy;

		}



		wq->rescuer = rescuer;

		kthread_bind_mask(rescuer->task, cpu_possible_mask);

		wake_up_process(rescuer->task);

	}



	if ((wq->flags & WQ_SYSFS) && workqueue_sysfs_register(wq))

		goto err_destroy;
@@ -5673,6 +5683,8 @@ int __init workqueue_init(void) 
	 * archs such as power and arm64.  As per-cpu pools created

	 * previously could be missing node hint and unbound pools NUMA

	 * affinity, fix them up.

	 *

	 * Also, while iterating workqueues, create rescuers if requested.

	 */

	wq_numa_init();
@@ -5684,8 +5696,12 @@ int __init workqueue_init(void) 
		}

	}



	list_for_each_entry(wq, &workqueues, list)

	list_for_each_entry(wq, &workqueues, list) {

		wq_update_unbound_numa(wq, smp_processor_id(), true);

		WARN(init_rescuer(wq),

		     "workqueue: failed to create early rescuer for %s",

		     wq->name);

	}



	mutex_unlock(&wq_pool_mutex);