10 files changed, 50 insertions, 8 deletions

diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
index 73069cb6c54a..a7a06d1dcf9c 100644
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@ -72,6 +72,7 @@ extern const char raid6_empty_zero_page[PAGE_SIZE];
 /* Routine choices */
 struct raid6_calls {
         void (*gen_syndrome)(int, size_t, void **);
+        void (*xor_syndrome)(int, int, int, size_t, void **);
         int  (*valid)(void);    /* Returns 1 if this routine set is usable */
         const char *name;       /* Name of this routine set */
         int prefer;             /* Has special performance attribute */
diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
index dbef2314901e..975c6e0434bd 100644
--- a/lib/raid6/algos.c
+++ b/lib/raid6/algos.c
@@ -131,11 +131,12 @@ static inline const struct raid6_recov_calls *raid6_choose_recov(void)
 static inline const struct raid6_calls *raid6_choose_gen(
         void *(*const dptrs)[(65536/PAGE_SIZE)+2], const int disks)
 {
-        unsigned long perf, bestperf, j0, j1;
+        unsigned long perf, bestgenperf, bestxorperf, j0, j1;
+        int start = (disks>>1)-1, stop = disks-3;       /* work on the second half of the disks */
         const struct raid6_calls *const *algo;
         const struct raid6_calls *best;
 
-        for (bestperf = 0, best = NULL, algo = raid6_algos; *algo; algo++) {
+        for (bestgenperf = 0, bestxorperf = 0, best = NULL, algo = raid6_algos; *algo; algo++) {
                 if (!best || (*algo)->prefer >= best->prefer) {
                         if ((*algo)->valid && !(*algo)->valid())
                                 continue;
@@ -153,19 +154,45 @@ static inline const struct raid6_calls *raid6_choose_gen(
                         }
                         preempt_enable();
 
-                        if (perf > bestperf) {
-                                bestperf = perf;
+                        if (perf > bestgenperf) {
+                                bestgenperf = perf;
                                 best = *algo;
                         }
-                        pr_info("raid6: %-8s %5ld MB/s\n", (*algo)->name,
+                        pr_info("raid6: %-8s gen() %5ld MB/s\n", (*algo)->name,
                                (perf*HZ) >> (20-16+RAID6_TIME_JIFFIES_LG2));
+
+                        if (!(*algo)->xor_syndrome)
+                                continue;
+
+                        perf = 0;
+
+                        preempt_disable();
+                        j0 = jiffies;
+                        while ((j1 = jiffies) == j0)
+                                cpu_relax();
+                        while (time_before(jiffies,
+                                            j1 + (1<<RAID6_TIME_JIFFIES_LG2))) {
+                                (*algo)->xor_syndrome(disks, start, stop,
+                                                      PAGE_SIZE, *dptrs);
+                                perf++;
+                        }
+                        preempt_enable();
+
+                        if (best == *algo)
+                                bestxorperf = perf;
+
+                        pr_info("raid6: %-8s xor() %5ld MB/s\n", (*algo)->name,
+                                (perf*HZ) >> (20-16+RAID6_TIME_JIFFIES_LG2+1));
                 }
         }
 
         if (best) {
-                pr_info("raid6: using algorithm %s (%ld MB/s)\n",
+                pr_info("raid6: using algorithm %s gen() %ld MB/s\n",
                        best->name,
-                       (bestperf*HZ) >> (20-16+RAID6_TIME_JIFFIES_LG2));
+                       (bestgenperf*HZ) >> (20-16+RAID6_TIME_JIFFIES_LG2));
+                if (best->xor_syndrome)
+                        pr_info("raid6: .... xor() %ld MB/s, rmw enabled\n",
+                               (bestxorperf*HZ) >> (20-16+RAID6_TIME_JIFFIES_LG2+1));
                 raid6_call = *best;
         } else
                 pr_err("raid6: Yikes!  No algorithm found!\n");
diff --git a/lib/raid6/altivec.uc b/lib/raid6/altivec.uc
index 7cc12b532e95..bec27fce7501 100644
--- a/lib/raid6/altivec.uc
+++ b/lib/raid6/altivec.uc
@@ -119,6 +119,7 @@ int raid6_have_altivec(void)
 
 const struct raid6_calls raid6_altivec$# = {
         raid6_altivec$#_gen_syndrome,
+        NULL,                   /* XOR not yet implemented */
         raid6_have_altivec,
         "altivecx$#",
         0
diff --git a/lib/raid6/avx2.c b/lib/raid6/avx2.c
index bc3b1dd436eb..76734004358d 100644
--- a/lib/raid6/avx2.c
+++ b/lib/raid6/avx2.c
@@ -89,6 +89,7 @@ static void raid6_avx21_gen_syndrome(int disks, size_t bytes, void **ptrs)
 
 const struct raid6_calls raid6_avx2x1 = {
         raid6_avx21_gen_syndrome,
+        NULL,                   /* XOR not yet implemented */
         raid6_have_avx2,
         "avx2x1",
         1                       /* Has cache hints */
@@ -150,6 +151,7 @@ static void raid6_avx22_gen_syndrome(int disks, size_t bytes, void **ptrs)
 
 const struct raid6_calls raid6_avx2x2 = {
         raid6_avx22_gen_syndrome,
+        NULL,                   /* XOR not yet implemented */
         raid6_have_avx2,
         "avx2x2",
         1                       /* Has cache hints */
@@ -242,6 +244,7 @@ static void raid6_avx24_gen_syndrome(int disks, size_t bytes, void **ptrs)
 
 const struct raid6_calls raid6_avx2x4 = {
         raid6_avx24_gen_syndrome,
+        NULL,                   /* XOR not yet implemented */
         raid6_have_avx2,
         "avx2x4",
         1                       /* Has cache hints */
diff --git a/lib/raid6/int.uc b/lib/raid6/int.uc
index 5b50f8dfc5d2..5ca60bee1388 100644
--- a/lib/raid6/int.uc
+++ b/lib/raid6/int.uc
@@ -109,7 +109,8 @@ static void raid6_int$#_gen_syndrome(int disks, size_t bytes, void **ptrs)
 
 const struct raid6_calls raid6_intx$# = {
         raid6_int$#_gen_syndrome,
-        NULL,           /* always valid */
+        NULL,                   /* XOR not yet implemented */
+        NULL,                   /* always valid */
         "int" NSTRING "x$#",
         0
 };
diff --git a/lib/raid6/mmx.c b/lib/raid6/mmx.c
index 590c71c9e200..b3b0e1fcd3af 100644
--- a/lib/raid6/mmx.c
+++ b/lib/raid6/mmx.c
@@ -76,6 +76,7 @@ static void raid6_mmx1_gen_syndrome(int disks, size_t bytes, void **ptrs)
 
 const struct raid6_calls raid6_mmxx1 = {
         raid6_mmx1_gen_syndrome,
+        NULL,                   /* XOR not yet implemented */
         raid6_have_mmx,
         "mmxx1",
         0
@@ -134,6 +135,7 @@ static void raid6_mmx2_gen_syndrome(int disks, size_t bytes, void **ptrs)
 
 const struct raid6_calls raid6_mmxx2 = {
         raid6_mmx2_gen_syndrome,
+        NULL,                   /* XOR not yet implemented */
         raid6_have_mmx,
         "mmxx2",
         0
diff --git a/lib/raid6/neon.c b/lib/raid6/neon.c
index 36ad4705df1a..d9ad6ee284f4 100644
--- a/lib/raid6/neon.c
+++ b/lib/raid6/neon.c
@@ -42,6 +42,7 @@
         }                                                               \
         struct raid6_calls const raid6_neonx ## _n = {                  \
                 raid6_neon ## _n ## _gen_syndrome,                      \
+                NULL,           /* XOR not yet implemented */           \
                 raid6_have_neon,                                        \
                 "neonx" #_n,                                            \
                 0                                                       \
diff --git a/lib/raid6/sse1.c b/lib/raid6/sse1.c
index f76297139445..9025b8ca9aa3 100644
--- a/lib/raid6/sse1.c
+++ b/lib/raid6/sse1.c
@@ -92,6 +92,7 @@ static void raid6_sse11_gen_syndrome(int disks, size_t bytes, void **ptrs)
 
 const struct raid6_calls raid6_sse1x1 = {
         raid6_sse11_gen_syndrome,
+        NULL,                   /* XOR not yet implemented */
         raid6_have_sse1_or_mmxext,
         "sse1x1",
         1                       /* Has cache hints */
@@ -154,6 +155,7 @@ static void raid6_sse12_gen_syndrome(int disks, size_t bytes, void **ptrs)
 
 const struct raid6_calls raid6_sse1x2 = {