[PATCH] percpu_counters: create lib/percpu_counter.c

- Move percpu_counter routines from mm/swap.c to lib/percpu_counter.c Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] percpu_counters: create lib/percpu_counter.c
- Move percpu_counter routines from mm/swap.c to lib/percpu_counter.c Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ravikiran G Thirumalai · Linus Torvalds
1 parent d09042da72
Showing 3 changed files with 47 additions and 42 deletions Side-by-side Diff
lib/Makefile
lib/percpu_counter.c
mm/swap.c
@@ -46,6 +46,7 @@
 obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o
 obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
 obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
+obj-$(CONFIG_SMP) += percpu_counter.o
  
 obj-$(CONFIG_SWIOTLB) += swiotlb.o
  
+/*
+ * Fast batching percpu counters.
+ */
+
+#include <linux/percpu_counter.h>
+#include <linux/module.h>
+
+void percpu_counter_mod(struct percpu_counter *fbc, long amount)
+{
+	long count;
+	long *pcount;
+	int cpu = get_cpu();
+
+	pcount = per_cpu_ptr(fbc->counters, cpu);
+	count = *pcount + amount;
+	if (count >= FBC_BATCH || count <= -FBC_BATCH) {
+		spin_lock(&fbc->lock);
+		fbc->count += count;
+		*pcount = 0;
+		spin_unlock(&fbc->lock);
+	} else {
+		*pcount = count;
+	}
+	put_cpu();
+}
+EXPORT_SYMBOL(percpu_counter_mod);
+
+/*
+ * Add up all the per-cpu counts, return the result.  This is a more accurate
+ * but much slower version of percpu_counter_read_positive()
+ */
+long percpu_counter_sum(struct percpu_counter *fbc)
+{
+	long ret;
+	int cpu;
+
+	spin_lock(&fbc->lock);
+	ret = fbc->count;
+	for_each_possible_cpu(cpu) {
+		long *pcount = per_cpu_ptr(fbc->counters, cpu);
+		ret += *pcount;
+	}
+	spin_unlock(&fbc->lock);
+	return ret < 0 ? 0 : ret;
+}
+EXPORT_SYMBOL(percpu_counter_sum);
@@ -480,48 +480,6 @@
 #endif /* CONFIG_HOTPLUG_CPU */
 #endif /* CONFIG_SMP */
  
-#ifdef CONFIG_SMP
-void percpu_counter_mod(struct percpu_counter *fbc, long amount)
-{
-	long count;
-	long *pcount;
-	int cpu = get_cpu();
-
-	pcount = per_cpu_ptr(fbc->counters, cpu);
-	count = *pcount + amount;
-	if (count >= FBC_BATCH || count <= -FBC_BATCH) {
-		spin_lock(&fbc->lock);
-		fbc->count += count;
-		*pcount = 0;
-		spin_unlock(&fbc->lock);
-	} else {
-		*pcount = count;
-	}
-	put_cpu();
-}
-EXPORT_SYMBOL(percpu_counter_mod);
-
-/*
- * Add up all the per-cpu counts, return the result.  This is a more accurate
- * but much slower version of percpu_counter_read_positive()
- */
-long percpu_counter_sum(struct percpu_counter *fbc)
-{
-	long ret;
-	int cpu;
-
-	spin_lock(&fbc->lock);
-	ret = fbc->count;
-	for_each_possible_cpu(cpu) {
-		long *pcount = per_cpu_ptr(fbc->counters, cpu);
-		ret += *pcount;
-	}
-	spin_unlock(&fbc->lock);
-	return ret < 0 ? 0 : ret;
-}
-EXPORT_SYMBOL(percpu_counter_sum);
-#endif
-
 /*
  * Perform any setup for the swap system
  */
...	...	@@ -46,6 +46,7 @@
46	46	obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o
47	47	obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
48	48	obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
	49	+obj-$(CONFIG_SMP) += percpu_counter.o
49	50
50	51	obj-$(CONFIG_SWIOTLB) += swiotlb.o
51	52
	1	+/*
	2	+ * Fast batching percpu counters.
	3	+ */
	4	+
	5	+#include <linux/percpu_counter.h>
	6	+#include <linux/module.h>
	7	+
	8	+void percpu_counter_mod(struct percpu_counter *fbc, long amount)
	9	+{
	10	+ long count;
	11	+ long *pcount;
	12	+ int cpu = get_cpu();
	13	+
	14	+ pcount = per_cpu_ptr(fbc->counters, cpu);
	15	+ count = *pcount + amount;
	16	+ if (count >= FBC_BATCH \|\| count <= -FBC_BATCH) {
	17	+ spin_lock(&fbc->lock);
	18	+ fbc->count += count;
	19	+ *pcount = 0;
	20	+ spin_unlock(&fbc->lock);
	21	+ } else {
	22	+ *pcount = count;
	23	+ }
	24	+ put_cpu();
	25	+}
	26	+EXPORT_SYMBOL(percpu_counter_mod);
	27	+
	28	+/*
	29	+ * Add up all the per-cpu counts, return the result. This is a more accurate
	30	+ * but much slower version of percpu_counter_read_positive()
	31	+ */
	32	+long percpu_counter_sum(struct percpu_counter *fbc)
	33	+{
	34	+ long ret;
	35	+ int cpu;
	36	+
	37	+ spin_lock(&fbc->lock);
	38	+ ret = fbc->count;
	39	+ for_each_possible_cpu(cpu) {
	40	+ long *pcount = per_cpu_ptr(fbc->counters, cpu);
	41	+ ret += *pcount;
	42	+ }
	43	+ spin_unlock(&fbc->lock);
	44	+ return ret < 0 ? 0 : ret;
	45	+}
	46	+EXPORT_SYMBOL(percpu_counter_sum);
...	...	@@ -480,48 +480,6 @@
480	480	#endif /* CONFIG_HOTPLUG_CPU */
481	481	#endif /* CONFIG_SMP */
482	482
483		-#ifdef CONFIG_SMP
484		-void percpu_counter_mod(struct percpu_counter *fbc, long amount)
485		-{
486		- long count;
487		- long *pcount;
488		- int cpu = get_cpu();
489		-
490		- pcount = per_cpu_ptr(fbc->counters, cpu);
491		- count = *pcount + amount;
492		- if (count >= FBC_BATCH \|\| count <= -FBC_BATCH) {
493		- spin_lock(&fbc->lock);
494		- fbc->count += count;
495		- *pcount = 0;
496		- spin_unlock(&fbc->lock);
497		- } else {
498		- *pcount = count;
499		- }
500		- put_cpu();
501		-}
502		-EXPORT_SYMBOL(percpu_counter_mod);
503		-
504		-/*
505		- * Add up all the per-cpu counts, return the result. This is a more accurate
506		- * but much slower version of percpu_counter_read_positive()
507		- */
508		-long percpu_counter_sum(struct percpu_counter *fbc)
509		-{
510		- long ret;
511		- int cpu;
512		-
513		- spin_lock(&fbc->lock);
514		- ret = fbc->count;
515		- for_each_possible_cpu(cpu) {
516		- long *pcount = per_cpu_ptr(fbc->counters, cpu);
517		- ret += *pcount;
518		- }
519		- spin_unlock(&fbc->lock);
520		- return ret < 0 ? 0 : ret;
521		-}
522		-EXPORT_SYMBOL(percpu_counter_sum);
523		-#endif
524		-
525	483	/*
526	484	* Perform any setup for the swap system
527	485	*/