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

Commit d87aae2f authored by Al Viro's avatar Al Viro
Browse files

switch the protection of percpu_counter list to spinlock 



... making percpu_counter_destroy() non-blocking

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4a55c101

lib/percpu_counter.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ 




#ifdef CONFIG_HOTPLUG_CPU

#ifdef CONFIG_HOTPLUG_CPU

static LIST_HEAD(percpu_counters);

static LIST_HEAD(percpu_counters);

static DEFINE_MUTEX(percpu_counters_lock);

static DEFINE_SPINLOCK(percpu_counters_lock);

#endif

#endif





#ifdef CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER

#ifdef CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER
@@ -123,9 +123,9 @@ int __percpu_counter_init(struct percpu_counter *fbc, s64 amount, 




#ifdef CONFIG_HOTPLUG_CPU

#ifdef CONFIG_HOTPLUG_CPU

	INIT_LIST_HEAD(&fbc->list);

	INIT_LIST_HEAD(&fbc->list);

	mutex_lock(&percpu_counters_lock);

	spin_lock(&percpu_counters_lock);

	list_add(&fbc->list, &percpu_counters);

	list_add(&fbc->list, &percpu_counters);

	mutex_unlock(&percpu_counters_lock);

	spin_unlock(&percpu_counters_lock);

#endif

#endif

	return 0;

	return 0;

}

}
@@ -139,9 +139,9 @@ void percpu_counter_destroy(struct percpu_counter *fbc) 
	debug_percpu_counter_deactivate(fbc);

	debug_percpu_counter_deactivate(fbc);





#ifdef CONFIG_HOTPLUG_CPU

#ifdef CONFIG_HOTPLUG_CPU

	mutex_lock(&percpu_counters_lock);

	spin_lock(&percpu_counters_lock);

	list_del(&fbc->list);

	list_del(&fbc->list);

	mutex_unlock(&percpu_counters_lock);

	spin_unlock(&percpu_counters_lock);

#endif

#endif

	free_percpu(fbc->counters);

	free_percpu(fbc->counters);

	fbc->counters = NULL;

	fbc->counters = NULL;
@@ -170,7 +170,7 @@ static int __cpuinit percpu_counter_hotcpu_callback(struct notifier_block *nb, 
		return NOTIFY_OK;

		return NOTIFY_OK;





	cpu = (unsigned long)hcpu;

	cpu = (unsigned long)hcpu;

	mutex_lock(&percpu_counters_lock);

	spin_lock(&percpu_counters_lock);

	list_for_each_entry(fbc, &percpu_counters, list) {

	list_for_each_entry(fbc, &percpu_counters, list) {

		s32 *pcount;

		s32 *pcount;

		unsigned long flags;

		unsigned long flags;
@@ -181,7 +181,7 @@ static int __cpuinit percpu_counter_hotcpu_callback(struct notifier_block *nb, 
		*pcount = 0;

		*pcount = 0;

		raw_spin_unlock_irqrestore(&fbc->lock, flags);

		raw_spin_unlock_irqrestore(&fbc->lock, flags);

	}

	}

	mutex_unlock(&percpu_counters_lock);

	spin_unlock(&percpu_counters_lock);

#endif

#endif

	return NOTIFY_OK;

	return NOTIFY_OK;

}

}