summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Kukunas <james.t.kukunas@linux.intel.com>2012-05-22 13:54:04 +1000
committerNeilBrown <neilb@suse.de>2012-05-22 13:54:04 +1000
commit56a519913eeba2bdae4d7ee39e80fab442c3836c (patch)
treeb228cf5faec3d85648fda09e5bcaf2e38f6ea018
parent6a328475cccacb99a13b06978091da936dd51d89 (diff)
downloadlinux-56a519913eeba2bdae4d7ee39e80fab442c3836c.tar.bz2
crypto: disable preemption while benchmarking RAID5 xor checksumming
With CONFIG_PREEMPT=y, we need to disable preemption while benchmarking RAID5 xor checksumming to ensure we're actually measuring what we think we're measuring. Signed-off-by: Jim Kukunas <james.t.kukunas@linux.intel.com> Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--crypto/xor.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/xor.c b/crypto/xor.c
index 87884435bddb..84daa1111dad 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -21,6 +21,7 @@
#include <linux/gfp.h>
#include <linux/raid/xor.h>
#include <linux/jiffies.h>
+#include <linux/preempt.h>
#include <asm/xor.h>
/* The xor routines to use. */
@@ -69,6 +70,8 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
tmpl->next = template_list;
template_list = tmpl;
+ preempt_disable();
+
/*
* Count the number of XORs done during a whole jiffy, and use
* this to calculate the speed of checksumming. We use a 2-page
@@ -91,6 +94,8 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
max = count;
}
+ preempt_enable();
+
speed = max * (HZ * BENCH_SIZE / 1024);
tmpl->speed = speed;