diff options
author | Jim Kukunas <james.t.kukunas@linux.intel.com> | 2012-05-21 23:54:18 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2012-05-21 23:54:18 -0400 |
commit | 048a8b8c89dc427dd7a58527c8923224b1e66d83 (patch) | |
tree | c8e09964537839f3848d0ad0e25ee40e873c3d09 | |
parent | f674ef7b43881b2ac11f98d6ba2dc5d9dd0dd118 (diff) |
lib/raid6: Add SSSE3 optimized recovery functions
Add SSSE3 optimized recovery functions, as well as a system
for selecting the most appropriate recovery functions to use.
Originally-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Jim Kukunas <james.t.kukunas@linux.intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r-- | include/linux/raid/pq.h | 18 | ||||
-rw-r--r-- | lib/raid6/Makefile | 2 | ||||
-rw-r--r-- | lib/raid6/algos.c | 37 | ||||
-rw-r--r-- | lib/raid6/mktables.c | 25 | ||||
-rw-r--r-- | lib/raid6/recov.c | 15 | ||||
-rw-r--r-- | lib/raid6/recov_ssse3.c | 335 |
6 files changed, 425 insertions, 7 deletions
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h index 53272e9860a7..640c69ceec96 100644 --- a/include/linux/raid/pq.h +++ b/include/linux/raid/pq.h | |||
@@ -99,8 +99,20 @@ extern const struct raid6_calls raid6_altivec2; | |||
99 | extern const struct raid6_calls raid6_altivec4; | 99 | extern const struct raid6_calls raid6_altivec4; |
100 | extern const struct raid6_calls raid6_altivec8; | 100 | extern const struct raid6_calls raid6_altivec8; |
101 | 101 | ||
102 | struct raid6_recov_calls { | ||
103 | void (*data2)(int, size_t, int, int, void **); | ||
104 | void (*datap)(int, size_t, int, void **); | ||
105 | int (*valid)(void); | ||
106 | const char *name; | ||
107 | int priority; | ||
108 | }; | ||
109 | |||
110 | extern const struct raid6_recov_calls raid6_recov_intx1; | ||
111 | extern const struct raid6_recov_calls raid6_recov_ssse3; | ||
112 | |||
102 | /* Algorithm list */ | 113 | /* Algorithm list */ |
103 | extern const struct raid6_calls * const raid6_algos[]; | 114 | extern const struct raid6_calls * const raid6_algos[]; |
115 | extern const struct raid6_recov_calls *const raid6_recov_algos[]; | ||
104 | int raid6_select_algo(void); | 116 | int raid6_select_algo(void); |
105 | 117 | ||
106 | /* Return values from chk_syndrome */ | 118 | /* Return values from chk_syndrome */ |
@@ -111,14 +123,16 @@ int raid6_select_algo(void); | |||
111 | 123 | ||
112 | /* Galois field tables */ | 124 | /* Galois field tables */ |
113 | extern const u8 raid6_gfmul[256][256] __attribute__((aligned(256))); | 125 | extern const u8 raid6_gfmul[256][256] __attribute__((aligned(256))); |
126 | extern const u8 raid6_vgfmul[256][32] __attribute__((aligned(256))); | ||
114 | extern const u8 raid6_gfexp[256] __attribute__((aligned(256))); | 127 | extern const u8 raid6_gfexp[256] __attribute__((aligned(256))); |
115 | extern const u8 raid6_gfinv[256] __attribute__((aligned(256))); | 128 | extern const u8 raid6_gfinv[256] __attribute__((aligned(256))); |
116 | extern const u8 raid6_gfexi[256] __attribute__((aligned(256))); | 129 | extern const u8 raid6_gfexi[256] __attribute__((aligned(256))); |
117 | 130 | ||
118 | /* Recovery routines */ | 131 | /* Recovery routines */ |
119 | void raid6_2data_recov(int disks, size_t bytes, int faila, int failb, | 132 | extern void (*raid6_2data_recov)(int disks, size_t bytes, int faila, int failb, |
120 | void **ptrs); | 133 | void **ptrs); |
121 | void raid6_datap_recov(int disks, size_t bytes, int faila, void **ptrs); | 134 | extern void (*raid6_datap_recov)(int disks, size_t bytes, int faila, |
135 | void **ptrs); | ||
122 | void raid6_dual_recov(int disks, size_t bytes, int faila, int failb, | 136 | void raid6_dual_recov(int disks, size_t bytes, int faila, int failb, |
123 | void **ptrs); | 137 | void **ptrs); |
124 | 138 | ||
diff --git a/lib/raid6/Makefile b/lib/raid6/Makefile index 8a38102770f3..de06dfe165b8 100644 --- a/lib/raid6/Makefile +++ b/lib/raid6/Makefile | |||
@@ -1,6 +1,6 @@ | |||
1 | obj-$(CONFIG_RAID6_PQ) += raid6_pq.o | 1 | obj-$(CONFIG_RAID6_PQ) += raid6_pq.o |
2 | 2 | ||
3 | raid6_pq-y += algos.o recov.o tables.o int1.o int2.o int4.o \ | 3 | raid6_pq-y += algos.o recov.o recov_ssse3.o tables.o int1.o int2.o int4.o \ |
4 | int8.o int16.o int32.o altivec1.o altivec2.o altivec4.o \ | 4 | int8.o int16.o int32.o altivec1.o altivec2.o altivec4.o \ |
5 | altivec8.o mmx.o sse1.o sse2.o | 5 | altivec8.o mmx.o sse1.o sse2.o |
6 | hostprogs-y += mktables | 6 | hostprogs-y += mktables |
diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c index f6a0f7899163..5a7f8022be13 100644 --- a/lib/raid6/algos.c +++ b/lib/raid6/algos.c | |||
@@ -64,6 +64,20 @@ const struct raid6_calls * const raid6_algos[] = { | |||
64 | NULL | 64 | NULL |
65 | }; | 65 | }; |
66 | 66 | ||
67 | void (*raid6_2data_recov)(int, size_t, int, int, void **); | ||
68 | EXPORT_SYMBOL_GPL(raid6_2data_recov); | ||
69 | |||
70 | void (*raid6_datap_recov)(int, size_t, int, void **); | ||
71 | EXPORT_SYMBOL_GPL(raid6_datap_recov); | ||
72 | |||
73 | const struct raid6_recov_calls *const raid6_recov_algos[] = { | ||
74 | #if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__) | ||
75 | &raid6_recov_ssse3, | ||
76 | #endif | ||
77 | &raid6_recov_intx1, | ||
78 | NULL | ||
79 | }; | ||
80 | |||
67 | #ifdef __KERNEL__ | 81 | #ifdef __KERNEL__ |
68 | #define RAID6_TIME_JIFFIES_LG2 4 | 82 | #define RAID6_TIME_JIFFIES_LG2 4 |
69 | #else | 83 | #else |
@@ -72,6 +86,26 @@ const struct raid6_calls * const raid6_algos[] = { | |||
72 | #define time_before(x, y) ((x) < (y)) | 86 | #define time_before(x, y) ((x) < (y)) |
73 | #endif | 87 | #endif |
74 | 88 | ||
89 | static inline void raid6_choose_recov(void) | ||
90 | { | ||
91 | const struct raid6_recov_calls *const *algo; | ||
92 | const struct raid6_recov_calls *best; | ||
93 | |||
94 | for (best = NULL, algo = raid6_recov_algos; *algo; algo++) | ||
95 | if (!best || (*algo)->priority > best->priority) | ||
96 | if (!(*algo)->valid || (*algo)->valid()) | ||
97 | best = *algo; | ||
98 | |||
99 | if (best) { | ||
100 | raid6_2data_recov = best->data2; | ||
101 | raid6_datap_recov = best->datap; | ||
102 | |||
103 | printk("raid6: using %s recovery algorithm\n", best->name); | ||
104 | } else | ||
105 | printk("raid6: Yikes! No recovery algorithm found!\n"); | ||
106 | } | ||
107 | |||
108 | |||
75 | /* Try to pick the best algorithm */ | 109 | /* Try to pick the best algorithm */ |
76 | /* This code uses the gfmul table as convenient data set to abuse */ | 110 | /* This code uses the gfmul table as convenient data set to abuse */ |
77 | 111 | ||
@@ -141,6 +175,9 @@ int __init raid6_select_algo(void) | |||
141 | 175 | ||
142 | free_pages((unsigned long)syndromes, 1); | 176 | free_pages((unsigned long)syndromes, 1); |
143 | 177 | ||
178 | /* select raid recover functions */ | ||
179 | raid6_choose_recov(); | ||
180 | |||
144 | return best ? 0 : -EINVAL; | 181 | return best ? 0 : -EINVAL; |
145 | } | 182 | } |
146 | 183 | ||
diff --git a/lib/raid6/mktables.c b/lib/raid6/mktables.c index 8a3780902cec..39787db588b0 100644 --- a/lib/raid6/mktables.c +++ b/lib/raid6/mktables.c | |||
@@ -81,6 +81,31 @@ int main(int argc, char *argv[]) | |||
81 | printf("EXPORT_SYMBOL(raid6_gfmul);\n"); | 81 | printf("EXPORT_SYMBOL(raid6_gfmul);\n"); |
82 | printf("#endif\n"); | 82 | printf("#endif\n"); |
83 | 83 | ||
84 | /* Compute vector multiplication table */ | ||
85 | printf("\nconst u8 __attribute__((aligned(256)))\n" | ||
86 | "raid6_vgfmul[256][32] =\n" | ||
87 | "{\n"); | ||
88 | for (i = 0; i < 256; i++) { | ||
89 | printf("\t{\n"); | ||
90 | for (j = 0; j < 16; j += 8) { | ||
91 | printf("\t\t"); | ||
92 | for (k = 0; k < 8; k++) | ||
93 | printf("0x%02x,%c", gfmul(i, j + k), | ||
94 | (k == 7) ? '\n' : ' '); | ||
95 | } | ||
96 | for (j = 0; j < 16; j += 8) { | ||
97 | printf("\t\t"); | ||
98 | for (k = 0; k < 8; k++) | ||
99 | printf("0x%02x,%c", gfmul(i, (j + k) << 4), | ||
100 | (k == 7) ? '\n' : ' '); | ||
101 | } | ||
102 | printf("\t},\n"); | ||
103 | } | ||
104 | printf("};\n"); | ||
105 | printf("#ifdef __KERNEL__\n"); | ||
106 | printf("EXPORT_SYMBOL(raid6_vgfmul);\n"); | ||
107 | printf("#endif\n"); | ||
108 | |||
84 | /* Compute power-of-2 table (exponent) */ | 109 | /* Compute power-of-2 table (exponent) */ |
85 | v = 1; | 110 | v = 1; |
86 | printf("\nconst u8 __attribute__((aligned(256)))\n" | 111 | printf("\nconst u8 __attribute__((aligned(256)))\n" |
diff --git a/lib/raid6/recov.c b/lib/raid6/recov.c index fe275d7b6b36..1805a5cc5daa 100644 --- a/lib/raid6/recov.c +++ b/lib/raid6/recov.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/raid/pq.h> | 22 | #include <linux/raid/pq.h> |
23 | 23 | ||
24 | /* Recover two failed data blocks. */ | 24 | /* Recover two failed data blocks. */ |
25 | void raid6_2data_recov(int disks, size_t bytes, int faila, int failb, | 25 | void raid6_2data_recov_intx1(int disks, size_t bytes, int faila, int failb, |
26 | void **ptrs) | 26 | void **ptrs) |
27 | { | 27 | { |
28 | u8 *p, *q, *dp, *dq; | 28 | u8 *p, *q, *dp, *dq; |
@@ -64,10 +64,9 @@ void raid6_2data_recov(int disks, size_t bytes, int faila, int failb, | |||
64 | p++; q++; | 64 | p++; q++; |
65 | } | 65 | } |
66 | } | 66 | } |
67 | EXPORT_SYMBOL_GPL(raid6_2data_recov); | ||
68 | 67 | ||
69 | /* Recover failure of one data block plus the P block */ | 68 | /* Recover failure of one data block plus the P block */ |
70 | void raid6_datap_recov(int disks, size_t bytes, int faila, void **ptrs) | 69 | void raid6_datap_recov_intx1(int disks, size_t bytes, int faila, void **ptrs) |
71 | { | 70 | { |
72 | u8 *p, *q, *dq; | 71 | u8 *p, *q, *dq; |
73 | const u8 *qmul; /* Q multiplier table */ | 72 | const u8 *qmul; /* Q multiplier table */ |
@@ -96,7 +95,15 @@ void raid6_datap_recov(int disks, size_t bytes, int faila, void **ptrs) | |||
96 | q++; dq++; | 95 | q++; dq++; |
97 | } | 96 | } |
98 | } | 97 | } |
99 | EXPORT_SYMBOL_GPL(raid6_datap_recov); | 98 | |
99 | |||
100 | const struct raid6_recov_calls raid6_recov_intx1 = { | ||
101 | .data2 = raid6_2data_recov_intx1, | ||
102 | .datap = raid6_datap_recov_intx1, | ||
103 | .valid = NULL, | ||
104 | .name = "intx1", | ||
105 | .priority = 0, | ||
106 | }; | ||
100 | 107 | ||
101 | #ifndef __KERNEL__ | 108 | #ifndef __KERNEL__ |
102 | /* Testing only */ | 109 | /* Testing only */ |
diff --git a/lib/raid6/recov_ssse3.c b/lib/raid6/recov_ssse3.c new file mode 100644 index 000000000000..37ae61930559 --- /dev/null +++ b/lib/raid6/recov_ssse3.c | |||
@@ -0,0 +1,335 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2012 Intel Corporation | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public License | ||
6 | * as published by the Free Software Foundation; version 2 | ||
7 | * of the License. | ||
8 | */ | ||
9 | |||
10 | #if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__) | ||
11 | |||
12 | #include <linux/raid/pq.h> | ||
13 | #include "x86.h" | ||
14 | |||
15 | static int raid6_has_ssse3(void) | ||
16 | { | ||
17 | return boot_cpu_has(X86_FEATURE_XMM) && | ||
18 | boot_cpu_has(X86_FEATURE_XMM2) && | ||
19 | boot_cpu_has(X86_FEATURE_SSSE3); | ||
20 | } | ||
21 | |||
22 | void raid6_2data_recov_ssse3(int disks, size_t bytes, int faila, int failb, | ||
23 | void **ptrs) | ||
24 | { | ||
25 | u8 *p, *q, *dp, *dq; | ||
26 | const u8 *pbmul; /* P multiplier table for B data */ | ||
27 | const u8 *qmul; /* Q multiplier table (for both) */ | ||
28 | static const u8 __aligned(16) x0f[16] = { | ||
29 | 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, | ||
30 | 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f}; | ||
31 | |||
32 | p = (u8 *)ptrs[disks-2]; | ||
33 | q = (u8 *)ptrs[disks-1]; | ||
34 | |||
35 | /* Compute syndrome with zero for the missing data pages | ||
36 | Use the dead data pages as temporary storage for | ||
37 | delta p and delta q */ | ||
38 | dp = (u8 *)ptrs[faila]; | ||
39 | ptrs[faila] = (void *)raid6_empty_zero_page; | ||
40 | ptrs[disks-2] = dp; | ||
41 | dq = (u8 *)ptrs[failb]; | ||
42 | ptrs[failb] = (void *)raid6_empty_zero_page; | ||
43 | ptrs[disks-1] = dq; | ||
44 | |||
45 | raid6_call.gen_syndrome(disks, bytes, ptrs); | ||
46 | |||
47 | /* Restore pointer table */ | ||
48 | ptrs[faila] = dp; | ||
49 | ptrs[failb] = dq; | ||
50 | ptrs[disks-2] = p; | ||
51 | ptrs[disks-1] = q; | ||
52 | |||
53 | /* Now, pick the proper data tables */ | ||
54 | pbmul = raid6_vgfmul[raid6_gfexi[failb-faila]]; | ||
55 | qmul = raid6_vgfmul[raid6_gfinv[raid6_gfexp[faila] ^ | ||
56 | raid6_gfexp[failb]]]; | ||
57 | |||
58 | kernel_fpu_begin(); | ||
59 | |||
60 | asm volatile("movdqa %0,%%xmm7" : : "m" (x0f[0])); | ||
61 | |||
62 | #ifdef CONFIG_X86_64 | ||
63 | asm volatile("movdqa %0,%%xmm6" : : "m" (qmul[0])); | ||
64 | asm volatile("movdqa %0,%%xmm14" : : "m" (pbmul[0])); | ||
65 | asm volatile("movdqa %0,%%xmm15" : : "m" (pbmul[16])); | ||
66 | #endif | ||
67 | |||
68 | /* Now do it... */ | ||
69 | while (bytes) { | ||
70 | #ifdef CONFIG_X86_64 | ||
71 | /* xmm6, xmm14, xmm15 */ | ||
72 | |||
73 | asm volatile("movdqa %0,%%xmm1" : : "m" (q[0])); | ||
74 | asm volatile("movdqa %0,%%xmm9" : : "m" (q[16])); | ||
75 | asm volatile("movdqa %0,%%xmm0" : : "m" (p[0])); | ||
76 | asm volatile("movdqa %0,%%xmm8" : : "m" (p[16])); | ||
77 | asm volatile("pxor %0,%%xmm1" : : "m" (dq[0])); | ||
78 | asm volatile("pxor %0,%%xmm9" : : "m" (dq[16])); | ||
79 | asm volatile("pxor %0,%%xmm0" : : "m" (dp[0])); | ||
80 | asm volatile("pxor %0,%%xmm8" : : "m" (dp[16])); | ||
81 | |||
82 | /* xmm0/8 = px */ | ||
83 | |||
84 | asm volatile("movdqa %xmm6,%xmm4"); | ||
85 | asm volatile("movdqa %0,%%xmm5" : : "m" (qmul[16])); | ||
86 | asm volatile("movdqa %xmm6,%xmm12"); | ||
87 | asm volatile("movdqa %xmm5,%xmm13"); | ||
88 | asm volatile("movdqa %xmm1,%xmm3"); | ||
89 | asm volatile("movdqa %xmm9,%xmm11"); | ||
90 | asm volatile("movdqa %xmm0,%xmm2"); /* xmm2/10 = px */ | ||
91 | asm volatile("movdqa %xmm8,%xmm10"); | ||
92 | asm volatile("psraw $4,%xmm1"); | ||
93 | asm volatile("psraw $4,%xmm9"); | ||
94 | asm volatile("pand %xmm7,%xmm3"); | ||
95 | asm volatile("pand %xmm7,%xmm11"); | ||
96 | asm volatile("pand %xmm7,%xmm1"); | ||
97 | asm volatile("pand %xmm7,%xmm9"); | ||
98 | asm volatile("pshufb %xmm3,%xmm4"); | ||
99 | asm volatile("pshufb %xmm11,%xmm12"); | ||
100 | asm volatile("pshufb %xmm1,%xmm5"); | ||
101 | asm volatile("pshufb %xmm9,%xmm13"); | ||
102 | asm volatile("pxor %xmm4,%xmm5"); | ||
103 | asm volatile("pxor %xmm12,%xmm13"); | ||
104 | |||
105 | /* xmm5/13 = qx */ | ||
106 | |||
107 | asm volatile("movdqa %xmm14,%xmm4"); | ||
108 | asm volatile("movdqa %xmm15,%xmm1"); | ||
109 | asm volatile("movdqa %xmm14,%xmm12"); | ||
110 | asm volatile("movdqa %xmm15,%xmm9"); | ||
111 | asm volatile("movdqa %xmm2,%xmm3"); | ||
112 | asm volatile("movdqa %xmm10,%xmm11"); | ||
113 | asm volatile("psraw $4,%xmm2"); | ||
114 | asm volatile("psraw $4,%xmm10"); | ||
115 | asm volatile("pand %xmm7,%xmm3"); | ||
116 | asm volatile("pand %xmm7,%xmm11"); | ||
117 | asm volatile("pand %xmm7,%xmm2"); | ||
118 | asm volatile("pand %xmm7,%xmm10"); | ||
119 | asm volatile("pshufb %xmm3,%xmm4"); | ||
120 | asm volatile("pshufb %xmm11,%xmm12"); | ||
121 | asm volatile("pshufb %xmm2,%xmm1"); | ||
122 | asm volatile("pshufb %xmm10,%xmm9"); | ||
123 | asm volatile("pxor %xmm4,%xmm1"); | ||
124 | asm volatile("pxor %xmm12,%xmm9"); | ||
125 | |||
126 | /* xmm1/9 = pbmul[px] */ | ||
127 | asm volatile("pxor %xmm5,%xmm1"); | ||
128 | asm volatile("pxor %xmm13,%xmm9"); | ||
129 | /* xmm1/9 = db = DQ */ | ||
130 | asm volatile("movdqa %%xmm1,%0" : "=m" (dq[0])); | ||
131 | asm volatile("movdqa %%xmm9,%0" : "=m" (dq[16])); | ||
132 | |||
133 | asm volatile("pxor %xmm1,%xmm0"); | ||
134 | asm volatile("pxor %xmm9,%xmm8"); | ||
135 | asm volatile("movdqa %%xmm0,%0" : "=m" (dp[0])); | ||
136 | asm volatile("movdqa %%xmm8,%0" : "=m" (dp[16])); | ||
137 | |||
138 | bytes -= 32; | ||
139 | p += 32; | ||
140 | q += 32; | ||
141 | dp += 32; | ||
142 | dq += 32; | ||
143 | #else | ||
144 | asm volatile("movdqa %0,%%xmm1" : : "m" (*q)); | ||
145 | asm volatile("movdqa %0,%%xmm0" : : "m" (*p)); | ||
146 | asm volatile("pxor %0,%%xmm1" : : "m" (*dq)); | ||
147 | asm volatile("pxor %0,%%xmm0" : : "m" (*dp)); | ||
148 | |||
149 | /* 1 = dq ^ q | ||
150 | * 0 = dp ^ p | ||
151 | */ | ||
152 | asm volatile("movdqa %0,%%xmm4" : : "m" (qmul[0])); | ||
153 | asm volatile("movdqa %0,%%xmm5" : : "m" (qmul[16])); | ||
154 | |||
155 | asm volatile("movdqa %xmm1,%xmm3"); | ||
156 | asm volatile("psraw $4,%xmm1"); | ||
157 | asm volatile("pand %xmm7,%xmm3"); | ||
158 | asm volatile("pand %xmm7,%xmm1"); | ||
159 | asm volatile("pshufb %xmm3,%xmm4"); | ||
160 | asm volatile("pshufb %xmm1,%xmm5"); | ||
161 | asm volatile("pxor %xmm4,%xmm5"); | ||
162 | |||
163 | asm volatile("movdqa %xmm0,%xmm2"); /* xmm2 = px */ | ||
164 | |||
165 | /* xmm5 = qx */ | ||
166 | |||
167 | asm volatile("movdqa %0,%%xmm4" : : "m" (pbmul[0])); | ||
168 | asm volatile("movdqa %0,%%xmm1" : : "m" (pbmul[16])); | ||
169 | asm volatile("movdqa %xmm2,%xmm3"); | ||
170 | asm volatile("psraw $4,%xmm2"); | ||
171 | asm volatile("pand %xmm7,%xmm3"); | ||
172 | asm volatile("pand %xmm7,%xmm2"); | ||
173 | asm volatile("pshufb %xmm3,%xmm4"); | ||
174 | asm volatile("pshufb %xmm2,%xmm1"); | ||
175 | asm volatile("pxor %xmm4,%xmm1"); | ||
176 | |||
177 | /* xmm1 = pbmul[px] */ | ||
178 | asm volatile("pxor %xmm5,%xmm1"); | ||
179 | /* xmm1 = db = DQ */ | ||
180 | asm volatile("movdqa %%xmm1,%0" : "=m" (*dq)); | ||
181 | |||
182 | asm volatile("pxor %xmm1,%xmm0"); | ||
183 | asm volatile("movdqa %%xmm0,%0" : "=m" (*dp)); | ||
184 | |||
185 | bytes -= 16; | ||
186 | p += 16; | ||
187 | q += 16; | ||
188 | dp += 16; | ||
189 | dq += 16; | ||
190 | #endif | ||
191 | } | ||
192 | |||
193 | kernel_fpu_end(); | ||
194 | } | ||
195 | |||
196 | |||
197 | void raid6_datap_recov_ssse3(int disks, size_t bytes, int faila, void **ptrs) | ||
198 | { | ||
199 | u8 *p, *q, *dq; | ||
200 | const u8 *qmul; /* Q multiplier table */ | ||
201 | static const u8 __aligned(16) x0f[16] = { | ||
202 | 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, | ||
203 | 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f}; | ||
204 | |||
205 | p = (u8 *)ptrs[disks-2]; | ||
206 | q = (u8 *)ptrs[disks-1]; | ||
207 | |||
208 | /* Compute syndrome with zero for the missing data page | ||
209 | Use the dead data page as temporary storage for delta q */ | ||
210 | dq = (u8 *)ptrs[faila]; | ||
211 | ptrs[faila] = (void *)raid6_empty_zero_page; | ||
212 | ptrs[disks-1] = dq; | ||
213 | |||
214 | raid6_call.gen_syndrome(disks, bytes, ptrs); | ||
215 | |||
216 | /* Restore pointer table */ | ||
217 | ptrs[faila] = dq; | ||
218 | ptrs[disks-1] = q; | ||
219 | |||
220 | /* Now, pick the proper data tables */ | ||
221 | qmul = raid6_vgfmul[raid6_gfinv[raid6_gfexp[faila]]]; | ||
222 | |||
223 | kernel_fpu_begin(); | ||
224 | |||
225 | asm volatile("movdqa %0, %%xmm7" : : "m" (x0f[0])); | ||
226 | |||
227 | while (bytes) { | ||
228 | #ifdef CONFIG_X86_64 | ||
229 | asm volatile("movdqa %0, %%xmm3" : : "m" (dq[0])); | ||
230 | asm volatile("movdqa %0, %%xmm4" : : "m" (dq[16])); | ||
231 | asm volatile("pxor %0, %%xmm3" : : "m" (q[0])); | ||
232 | asm volatile("movdqa %0, %%xmm0" : : "m" (qmul[0])); | ||
233 | |||
234 | /* xmm3 = q[0] ^ dq[0] */ | ||
235 | |||
236 | asm volatile("pxor %0, %%xmm4" : : "m" (q[16])); | ||
237 | asm volatile("movdqa %0, %%xmm1" : : "m" (qmul[16])); | ||
238 | |||
239 | /* xmm4 = q[16] ^ dq[16] */ | ||
240 | |||
241 | asm volatile("movdqa %xmm3, %xmm6"); | ||
242 | asm volatile("movdqa %xmm4, %xmm8"); | ||
243 | |||
244 | /* xmm4 = xmm8 = q[16] ^ dq[16] */ | ||
245 | |||
246 | asm volatile("psraw $4, %xmm3"); | ||
247 | asm volatile("pand %xmm7, %xmm6"); | ||
248 | asm volatile("pand %xmm7, %xmm3"); | ||
249 | asm volatile("pshufb %xmm6, %xmm0"); | ||
250 | asm volatile("pshufb %xmm3, %xmm1"); | ||
251 | asm volatile("movdqa %0, %%xmm10" : : "m" (qmul[0])); | ||
252 | asm volatile("pxor %xmm0, %xmm1"); | ||
253 | asm volatile("movdqa %0, %%xmm11" : : "m" (qmul[16])); | ||
254 | |||
255 | /* xmm1 = qmul[q[0] ^ dq[0]] */ | ||
256 | |||
257 | asm volatile("psraw $4, %xmm4"); | ||
258 | asm volatile("pand %xmm7, %xmm8"); | ||
259 | asm volatile("pand %xmm7, %xmm4"); | ||
260 | asm volatile("pshufb %xmm8, %xmm10"); | ||
261 | asm volatile("pshufb %xmm4, %xmm11"); | ||
262 | asm volatile("movdqa %0, %%xmm2" : : "m" (p[0])); | ||
263 | asm volatile("pxor %xmm10, %xmm11"); | ||
264 | asm volatile("movdqa %0, %%xmm12" : : "m" (p[16])); | ||
265 | |||
266 | /* xmm11 = qmul[q[16] ^ dq[16]] */ | ||
267 | |||
268 | asm volatile("pxor %xmm1, %xmm2"); | ||
269 | |||
270 | /* xmm2 = p[0] ^ qmul[q[0] ^ dq[0]] */ | ||
271 | |||
272 | asm volatile("pxor %xmm11, %xmm12"); | ||
273 | |||
274 | /* xmm12 = p[16] ^ qmul[q[16] ^ dq[16]] */ | ||
275 | |||
276 | asm volatile("movdqa %%xmm1, %0" : "=m" (dq[0])); | ||
277 | asm volatile("movdqa %%xmm11, %0" : "=m" (dq[16])); | ||
278 | |||
279 | asm volatile("movdqa %%xmm2, %0" : "=m" (p[0])); | ||
280 | asm volatile("movdqa %%xmm12, %0" : "=m" (p[16])); | ||
281 | |||
282 | bytes -= 32; | ||
283 | p += 32; | ||
284 | q += 32; | ||
285 | dq += 32; | ||
286 | |||
287 | #else | ||
288 | asm volatile("movdqa %0, %%xmm3" : : "m" (dq[0])); | ||
289 | asm volatile("movdqa %0, %%xmm0" : : "m" (qmul[0])); | ||
290 | asm volatile("pxor %0, %%xmm3" : : "m" (q[0])); | ||
291 | asm volatile("movdqa %0, %%xmm1" : : "m" (qmul[16])); | ||
292 | |||
293 | /* xmm3 = *q ^ *dq */ | ||
294 | |||
295 | asm volatile("movdqa %xmm3, %xmm6"); | ||
296 | asm volatile("movdqa %0, %%xmm2" : : "m" (p[0])); | ||
297 | asm volatile("psraw $4, %xmm3"); | ||
298 | asm volatile("pand %xmm7, %xmm6"); | ||
299 | asm volatile("pand %xmm7, %xmm3"); | ||
300 | asm volatile("pshufb %xmm6, %xmm0"); | ||
301 | asm volatile("pshufb %xmm3, %xmm1"); | ||
302 | asm volatile("pxor %xmm0, %xmm1"); | ||
303 | |||
304 | /* xmm1 = qmul[*q ^ *dq */ | ||
305 | |||
306 | asm volatile("pxor %xmm1, %xmm2"); | ||
307 | |||
308 | /* xmm2 = *p ^ qmul[*q ^ *dq] */ | ||
309 | |||
310 | asm volatile("movdqa %%xmm1, %0" : "=m" (dq[0])); | ||
311 | asm volatile("movdqa %%xmm2, %0" : "=m" (p[0])); | ||
312 | |||
313 | bytes -= 16; | ||
314 | p += 16; | ||
315 | q += 16; | ||
316 | dq += 16; | ||
317 | #endif | ||
318 | } | ||
319 | |||
320 | kernel_fpu_end(); | ||
321 | } | ||
322 | |||
323 | const struct raid6_recov_calls raid6_recov_ssse3 = { | ||
324 | .data2 = raid6_2data_recov_ssse3, | ||
325 | .datap = raid6_datap_recov_ssse3, | ||
326 | .valid = raid6_has_ssse3, | ||
327 | #ifdef CONFIG_X86_64 | ||
328 | .name = "ssse3x2", | ||
329 | #else | ||
330 | .name = "ssse3x1", | ||
331 | #endif | ||
332 | .priority = 1, | ||
333 | }; | ||
334 | |||
335 | #endif | ||