Commit 22f2020f authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

vmpressure: change vmpressure::sr_lock to spinlock 



There is nothing that can sleep inside critical sections protected by
this lock and those sections are really small so there doesn't make much
sense to use mutex for them.  Change the log to a spinlock

Signed-off-by: default avatarMichal Hocko <mhocko@suse.cz>
Reported-by: default avatarTejun Heo <tj@kernel.org>
Cc: Anton Vorontsov <anton.vorontsov@linaro.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Li Zefan <lizefan@huawei.com>
Reviewed-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 62e32ac3

include/linux/vmpressure.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ struct vmpressure { 
	unsigned long scanned;

	unsigned long reclaimed;

	/* The lock is used to keep the scanned/reclaimed above in sync. */

	struct mutex sr_lock;

	struct spinlock sr_lock;



	/* The list of vmpressure_event structs. */

	struct list_head events;

mm/vmpressure.c

+5 −5
Original line number Diff line number Diff line
@@ -180,12 +180,12 @@ static void vmpressure_work_fn(struct work_struct *work) 
	if (!vmpr->scanned)

		return;



	mutex_lock(&vmpr->sr_lock);

	spin_lock(&vmpr->sr_lock);

	scanned = vmpr->scanned;

	reclaimed = vmpr->reclaimed;

	vmpr->scanned = 0;

	vmpr->reclaimed = 0;

	mutex_unlock(&vmpr->sr_lock);

	spin_unlock(&vmpr->sr_lock);



	do {

		if (vmpressure_event(vmpr, scanned, reclaimed))
@@ -240,11 +240,11 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, 
	if (!scanned)

		return;



	mutex_lock(&vmpr->sr_lock);

	spin_lock(&vmpr->sr_lock);

	vmpr->scanned += scanned;

	vmpr->reclaimed += reclaimed;

	scanned = vmpr->scanned;

	mutex_unlock(&vmpr->sr_lock);

	spin_unlock(&vmpr->sr_lock);



	if (scanned < vmpressure_win || work_pending(&vmpr->work))

		return;
@@ -367,7 +367,7 @@ void vmpressure_unregister_event(struct cgroup *cg, struct cftype *cft, 
 */

void vmpressure_init(struct vmpressure *vmpr)

{

	mutex_init(&vmpr->sr_lock);

	spin_lock_init(&vmpr->sr_lock);

	mutex_init(&vmpr->events_lock);

	INIT_LIST_HEAD(&vmpr->events);

	INIT_WORK(&vmpr->work, vmpressure_work_fn);

CRA Git | Maintained and supported by SUSTech CRA and CCSE