net: fix the use of this_cpu_ptr

Li RongQing · davem330 · commit 50eab0503a75 · 2013-03-29T15:13:27.000-04:00
flush_tasklet is not percpu var, and percpu is percpu var, and this_cpu_ptr(&info->cache->percpu->flush_tasklet) is not equal to &this_cpu_ptr(info->cache->percpu)->flush_tasklet 1f743b0(use this_cpu_ptr per-cpu helper) introduced this bug. Signed-off-by: Li RongQing <roy.qing.li@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/core/flow.c b/net/core/flow.c
@@ -328,7 +328,7 @@ static void flow_cache_flush_per_cpu(void *data)
 	struct flow_flush_info *info = data;
 	struct tasklet_struct *tasklet;
 
-	tasklet = this_cpu_ptr(&info->cache->percpu->flush_tasklet);
+	tasklet = &this_cpu_ptr(info->cache->percpu)->flush_tasklet;
 	tasklet->data = (unsigned long)info;
 	tasklet_schedule(tasklet);
 }

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ static void flow_cache_flush_per_cpu(void *data)`
`328`	`328`	`struct flow_flush_info *info = data;`
`329`	`329`	`struct tasklet_struct *tasklet;`
`330`	`330`
`331`		`- tasklet = this_cpu_ptr(&info->cache->percpu->flush_tasklet);`
	`331`	`+ tasklet = &this_cpu_ptr(info->cache->percpu)->flush_tasklet;`
`332`	`332`	`tasklet->data = (unsigned long)info;`
`333`	`333`	`tasklet_schedule(tasklet);`
`334`	`334`	`}`