Commit 2dbf7084 authored by Jim Kukunas's avatar Jim Kukunas Committed by NeilBrown

lib/raid6: update test program for recovery functions

Test each combination of recovery and syndrome generation
functions.
Signed-off-by: default avatarJim Kukunas <james.t.kukunas@linux.intel.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 048a8b8c
...@@ -23,7 +23,7 @@ RANLIB = ranlib ...@@ -23,7 +23,7 @@ RANLIB = ranlib
all: raid6.a raid6test all: raid6.a raid6test
raid6.a: int1.o int2.o int4.o int8.o int16.o int32.o mmx.o sse1.o sse2.o \ raid6.a: int1.o int2.o int4.o int8.o int16.o int32.o mmx.o sse1.o sse2.o \
altivec1.o altivec2.o altivec4.o altivec8.o recov.o algos.o \ altivec1.o altivec2.o altivec4.o altivec8.o recov.o recov_ssse3.o algos.o \
tables.o tables.o
rm -f $@ rm -f $@
$(AR) cq $@ $^ $(AR) cq $@ $^
......
...@@ -90,25 +90,35 @@ static int test_disks(int i, int j) ...@@ -90,25 +90,35 @@ static int test_disks(int i, int j)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
const struct raid6_calls *const *algo; const struct raid6_calls *const *algo;
const struct raid6_recov_calls *const *ra;
int i, j; int i, j;
int err = 0; int err = 0;
makedata(); makedata();
for (algo = raid6_algos; *algo; algo++) { for (ra = raid6_recov_algos; *ra; ra++) {
if (!(*algo)->valid || (*algo)->valid()) { if ((*ra)->valid && !(*ra)->valid())
raid6_call = **algo; continue;
raid6_2data_recov = (*ra)->data2;
raid6_datap_recov = (*ra)->datap;
/* Nuke syndromes */ printf("using recovery %s\n", (*ra)->name);
memset(data[NDISKS-2], 0xee, 2*PAGE_SIZE);
/* Generate assumed good syndrome */ for (algo = raid6_algos; *algo; algo++) {
raid6_call.gen_syndrome(NDISKS, PAGE_SIZE, if (!(*algo)->valid || (*algo)->valid()) {
(void **)&dataptrs); raid6_call = **algo;
for (i = 0; i < NDISKS-1; i++) /* Nuke syndromes */
for (j = i+1; j < NDISKS; j++) memset(data[NDISKS-2], 0xee, 2*PAGE_SIZE);
err += test_disks(i, j);
/* Generate assumed good syndrome */
raid6_call.gen_syndrome(NDISKS, PAGE_SIZE,
(void **)&dataptrs);
for (i = 0; i < NDISKS-1; i++)
for (j = i+1; j < NDISKS; j++)
err += test_disks(i, j);
}
} }
printf("\n"); printf("\n");
} }
......
...@@ -35,24 +35,29 @@ static inline void kernel_fpu_end(void) ...@@ -35,24 +35,29 @@ static inline void kernel_fpu_end(void)
{ {
} }
#define __aligned(x) __attribute__((aligned(x)))
#define X86_FEATURE_MMX (0*32+23) /* Multimedia Extensions */ #define X86_FEATURE_MMX (0*32+23) /* Multimedia Extensions */
#define X86_FEATURE_FXSR (0*32+24) /* FXSAVE and FXRSTOR instructions #define X86_FEATURE_FXSR (0*32+24) /* FXSAVE and FXRSTOR instructions
* (fast save and restore) */ * (fast save and restore) */
#define X86_FEATURE_XMM (0*32+25) /* Streaming SIMD Extensions */ #define X86_FEATURE_XMM (0*32+25) /* Streaming SIMD Extensions */
#define X86_FEATURE_XMM2 (0*32+26) /* Streaming SIMD Extensions-2 */ #define X86_FEATURE_XMM2 (0*32+26) /* Streaming SIMD Extensions-2 */
#define X86_FEATURE_XMM3 (4*32+ 0) /* "pni" SSE-3 */
#define X86_FEATURE_SSSE3 (4*32+ 9) /* Supplemental SSE-3 */
#define X86_FEATURE_AVX (4*32+28) /* Advanced Vector Extensions */
#define X86_FEATURE_MMXEXT (1*32+22) /* AMD MMX extensions */ #define X86_FEATURE_MMXEXT (1*32+22) /* AMD MMX extensions */
/* Should work well enough on modern CPUs for testing */ /* Should work well enough on modern CPUs for testing */
static inline int boot_cpu_has(int flag) static inline int boot_cpu_has(int flag)
{ {
u32 eax = (flag >> 5) ? 0x80000001 : 1; u32 eax = (flag & 0x20) ? 0x80000001 : 1;
u32 edx; u32 ecx, edx;
asm volatile("cpuid" asm volatile("cpuid"
: "+a" (eax), "=d" (edx) : "+a" (eax), "=d" (edx), "=c" (ecx)
: : "ecx", "ebx"); : : "ebx");
return (edx >> (flag & 31)) & 1; return ((flag & 0x80 ? ecx : edx) >> (flag & 31)) & 1;
} }
#endif /* ndef __KERNEL__ */ #endif /* ndef __KERNEL__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment