diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-07-14 15:20:37 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-08-29 22:09:28 -0400 |
| commit | cb3c82992f62f838e6476a0bff12909158007fc6 (patch) | |
| tree | d6ced15a81340b9b8343c369fea22940f31f06eb | |
| parent | 58691d64c44ae41ddf098ecb31e9a994026e3cff (diff) | |
async_tx: raid6 recovery self test
Port drivers/md/raid6test/test.c to use the async raid6 recovery
routines. This is meant as a unit test for raid6 acceleration drivers. In
addition to the 16-drive test case this implements tests for the 4-disk and
5-disk special cases (dma devices can not generically handle less than 2
sources), and adds a test for the D+Q case.
Reviewed-by: Andre Noll <maan@systemlinux.org>
Acked-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
| -rw-r--r-- | crypto/async_tx/Makefile | 1 | ||||
| -rw-r--r-- | crypto/async_tx/raid6test.c | 241 | ||||
| -rw-r--r-- | drivers/md/Kconfig | 13 |
3 files changed, 255 insertions, 0 deletions
diff --git a/crypto/async_tx/Makefile b/crypto/async_tx/Makefile index 9a1a76811b80..d1e0e6f72bc1 100644 --- a/crypto/async_tx/Makefile +++ b/crypto/async_tx/Makefile | |||
| @@ -4,3 +4,4 @@ obj-$(CONFIG_ASYNC_MEMSET) += async_memset.o | |||
| 4 | obj-$(CONFIG_ASYNC_XOR) += async_xor.o | 4 | obj-$(CONFIG_ASYNC_XOR) += async_xor.o |
| 5 | obj-$(CONFIG_ASYNC_PQ) += async_pq.o | 5 | obj-$(CONFIG_ASYNC_PQ) += async_pq.o |
| 6 | obj-$(CONFIG_ASYNC_RAID6_RECOV) += async_raid6_recov.o | 6 | obj-$(CONFIG_ASYNC_RAID6_RECOV) += async_raid6_recov.o |
| 7 | obj-$(CONFIG_ASYNC_RAID6_TEST) += raid6test.o | ||
diff --git a/crypto/async_tx/raid6test.c b/crypto/async_tx/raid6test.c new file mode 100644 index 000000000000..98c83ca96c83 --- /dev/null +++ b/crypto/async_tx/raid6test.c | |||
| @@ -0,0 +1,241 @@ | |||
| 1 | /* | ||
| 2 | * asynchronous raid6 recovery self test | ||
| 3 | * Copyright (c) 2009, Intel Corporation. | ||
| 4 | * | ||
| 5 | * based on drivers/md/raid6test/test.c: | ||
| 6 | * Copyright 2002-2007 H. Peter Anvin | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify it | ||
| 9 | * under the terms and conditions of the GNU General Public License, | ||
| 10 | * version 2, as published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
| 13 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 14 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 15 | * more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License along with | ||
| 18 | * this program; if not, write to the Free Software Foundation, Inc., | ||
| 19 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
| 20 | * | ||
| 21 | */ | ||
| 22 | #include <linux/async_tx.h> | ||
| 23 | #include <linux/random.h> | ||
| 24 | |||
| 25 | #undef pr | ||
| 26 | #define pr(fmt, args...) pr_info("raid6test: " fmt, ##args) | ||
| 27 | |||
| 28 | #define NDISKS 16 /* Including P and Q */ | ||
| 29 | |||
| 30 | static struct page *dataptrs[NDISKS]; | ||
| 31 | static struct page *data[NDISKS+3]; | ||
| 32 | static struct page *spare; | ||
| 33 | static struct page *recovi; | ||
| 34 | static struct page *recovj; | ||
| 35 | |||
| 36 | static void callback(void *param) | ||
| 37 | { | ||
| 38 | struct completion *cmp = param; | ||
| 39 | |||
| 40 | complete(cmp); | ||
| 41 | } | ||
| 42 | |||
| 43 | static void makedata(int disks) | ||
| 44 | { | ||
| 45 | int i, j; | ||
| 46 | |||
| 47 | for (i = 0; i < disks; i++) { | ||
| 48 | for (j = 0; j < PAGE_SIZE/sizeof(u32); j += sizeof(u32)) { | ||
| 49 | u32 *p = page_address(data[i]) + j; | ||
| 50 | |||
| 51 | *p = random32(); | ||
| 52 | } | ||
| 53 | |||
| 54 | dataptrs[i] = data[i]; | ||
| 55 | } | ||
| 56 | } | ||
| 57 | |||
| 58 | static char disk_type(int d, int disks) | ||
| 59 | { | ||
| 60 | if (d == disks - 2) | ||
| 61 | return 'P'; | ||
| 62 | else if (d == disks - 1) | ||
| 63 | return 'Q'; | ||
| 64 | else | ||
| 65 | return 'D'; | ||
| 66 | } | ||
| 67 | |||
| 68 | /* Recover two failed blocks. */ | ||
| 69 | static void raid6_dual_recov(int disks, size_t bytes, int faila, int failb, struct page **ptrs) | ||
| 70 | { | ||
| 71 | struct async_submit_ctl submit; | ||
| 72 | addr_conv_t addr_conv[disks]; | ||
| 73 | struct completion cmp; | ||
| 74 | struct dma_async_tx_descriptor *tx = NULL; | ||
| 75 | enum sum_check_flags result = ~0; | ||
| 76 | |||
| 77 | if (faila > failb) | ||
| 78 | swap(faila, failb); | ||
| 79 | |||
| 80 | if (failb == disks-1) { | ||
| 81 | if (faila == disks-2) { | ||
| 82 | /* P+Q failure. Just rebuild the syndrome. */ | ||
| 83 | init_async_submit(&submit, 0, NULL, NULL, NULL, addr_conv); | ||
| 84 | tx = async_gen_syndrome(ptrs, 0, disks, bytes, &submit); | ||
| 85 | } else { | ||
| 86 | struct page *blocks[disks]; | ||
| 87 | struct page *dest; | ||
| 88 | int count = 0; | ||
| 89 | int i; | ||
| 90 | |||
| 91 | /* data+Q failure. Reconstruct data from P, | ||
| 92 | * then rebuild syndrome | ||
| 93 | */ | ||
| 94 | for (i = disks; i-- ; ) { | ||
| 95 | if (i == faila || i == failb) | ||
| 96 | continue; | ||
| 97 | blocks[count++] = ptrs[i]; | ||
| 98 | } | ||
| 99 | dest = ptrs[faila]; | ||
| 100 | init_async_submit(&submit, ASYNC_TX_XOR_ZERO_DST, NULL, | ||
| 101 | NULL, NULL, addr_conv); | ||
| 102 | tx = async_xor(dest, blocks, 0, count, bytes, &submit); | ||
| 103 | |||
| 104 | init_async_submit(&submit, 0, tx, NULL, NULL, addr_conv); | ||
| 105 | tx = async_gen_syndrome(ptrs, 0, disks, bytes, &submit); | ||
| 106 | } | ||
| 107 | } else { | ||
| 108 | if (failb == disks-2) { | ||
| 109 | /* data+P failure. */ | ||
| 110 | init_async_submit(&submit, 0, NULL, NULL, NULL, addr_conv); | ||
| 111 | tx = async_raid6_datap_recov(disks, bytes, faila, ptrs, &submit); | ||
| 112 | } else { | ||
| 113 | /* data+data failure. */ | ||
| 114 | init_async_submit(&submit, 0, NULL, NULL, NULL, addr_conv); | ||
| 115 | tx = async_raid6_2data_recov(disks, bytes, faila, failb, ptrs, &submit); | ||
| 116 | } | ||
| 117 | } | ||
| 118 | init_completion(&cmp); | ||
| 119 | init_async_submit(&submit, ASYNC_TX_ACK, tx, callback, &cmp, addr_conv); | ||
| 120 | tx = async_syndrome_val(ptrs, 0, disks, bytes, &result, spare, &submit); | ||
| 121 | async_tx_issue_pending(tx); | ||
| 122 | |||
| 123 | if (wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000)) == 0) | ||
| 124 | pr("%s: timeout! (faila: %d failb: %d disks: %d)\n", | ||
| 125 | __func__, faila, failb, disks); | ||
| 126 | |||
| 127 | if (result != 0) | ||
| 128 | pr("%s: validation failure! faila: %d failb: %d sum_check_flags: %x\n", | ||
| 129 | __func__, faila, failb, result); | ||
| 130 | } | ||
| 131 | |||
| 132 | static int test_disks(int i, int j, int disks) | ||
| 133 | { | ||
| 134 | int erra, errb; | ||
| 135 | |||
| 136 | memset(page_address(recovi), 0xf0, PAGE_SIZE); | ||
| 137 | memset(page_address(recovj), 0xba, PAGE_SIZE); | ||
| 138 | |||
| 139 | dataptrs[i] = recovi; | ||
| 140 | dataptrs[j] = recovj; | ||
| 141 | |||
| 142 | raid6_dual_recov(disks, PAGE_SIZE, i, j, dataptrs); | ||
| 143 | |||
| 144 | erra = memcmp(page_address(data[i]), page_address(recovi), PAGE_SIZE); | ||
| 145 | errb = memcmp(page_address(data[j]), page_address(recovj), PAGE_SIZE); | ||
| 146 | |||
| 147 | pr("%s(%d, %d): faila=%3d(%c) failb=%3d(%c) %s\n", | ||
| 148 | __func__, i, j, i, disk_type(i, disks), j, disk_type(j, disks), | ||
| 149 | (!erra && !errb) ? "OK" : !erra ? "ERRB" : !errb ? "ERRA" : "ERRAB"); | ||
| 150 | |||
| 151 | dataptrs[i] = data[i]; | ||
| 152 | dataptrs[j] = data[j]; | ||
| 153 | |||
| 154 | return erra || errb; | ||
| 155 | } | ||
| 156 | |||
| 157 | static int test(int disks, int *tests) | ||
| 158 | { | ||
| 159 | addr_conv_t addr_conv[disks]; | ||
| 160 | struct dma_async_tx_descriptor *tx; | ||
| 161 | struct async_submit_ctl submit; | ||
| 162 | struct completion cmp; | ||
| 163 | int err = 0; | ||
| 164 | int i, j; | ||
| 165 | |||
| 166 | recovi = data[disks]; | ||
| 167 | recovj = data[disks+1]; | ||
| 168 | spare = data[disks+2]; | ||
| 169 | |||
| 170 | makedata(disks); | ||
| 171 | |||
| 172 | /* Nuke syndromes */ | ||
| 173 | memset(page_address(data[disks-2]), 0xee, PAGE_SIZE); | ||
| 174 | memset(page_address(data[disks-1]), 0xee, PAGE_SIZE); | ||
| 175 | |||
| 176 | /* Generate assumed good syndrome */ | ||
| 177 | init_completion(&cmp); | ||
| 178 | init_async_submit(&submit, ASYNC_TX_ACK, NULL, callback, &cmp, addr_conv); | ||
| 179 | tx = async_gen_syndrome(dataptrs, 0, disks, PAGE_SIZE, &submit); | ||
| 180 | async_tx_issue_pending(tx); | ||
| 181 | |||
| 182 | if (wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000)) == 0) { | ||
| 183 | pr("error: initial gen_syndrome(%d) timed out\n", disks); | ||
| 184 | return 1; | ||
| 185 | } | ||
| 186 | |||
| 187 | pr("testing the %d-disk case...\n", disks); | ||
| 188 | for (i = 0; i < disks-1; i++) | ||
| 189 | for (j = i+1; j < disks; j++) { | ||
| 190 | (*tests)++; | ||
| 191 | err += test_disks(i, j, disks); | ||
| 192 | } | ||
| 193 | |||
| 194 | return err; | ||
| 195 | } | ||
| 196 | |||
| 197 | |||
| 198 | static int raid6_test(void) | ||
| 199 | { | ||
| 200 | int err = 0; | ||
| 201 | int tests = 0; | ||
| 202 | int i; | ||
| 203 | |||
| 204 | for (i = 0; i < NDISKS+3; i++) { | ||
| 205 | data[i] = alloc_page(GFP_KERNEL); | ||
| 206 | if (!data[i]) { | ||
| 207 | while (i--) | ||
| 208 | put_page(data[i]); | ||
| 209 | return -ENOMEM; | ||
| 210 | } | ||
| 211 | } | ||
| 212 | |||
| 213 | /* the 4-disk and 5-disk cases are special for the recovery code */ | ||
| 214 | if (NDISKS > 4) | ||
| 215 | err += test(4, &tests); | ||
| 216 | if (NDISKS > 5) | ||
| 217 | err += test(5, &tests); | ||
| 218 | err += test(NDISKS, &tests); | ||
| 219 | |||
| 220 | pr("\n"); | ||
| 221 | pr("complete (%d tests, %d failure%s)\n", | ||
| 222 | tests, err, err == 1 ? "" : "s"); | ||
| 223 | |||
| 224 | for (i = 0; i < NDISKS+3; i++) | ||
| 225 | put_page(data[i]); | ||
| 226 | |||
| 227 | return 0; | ||
| 228 | } | ||
| 229 | |||
| 230 | static void raid6_test_exit(void) | ||
| 231 | { | ||
| 232 | } | ||
| 233 | |||
| 234 | /* when compiled-in wait for drivers to load first (assumes dma drivers | ||
| 235 | * are also compliled-in) | ||
| 236 | */ | ||
| 237 | late_initcall(raid6_test); | ||
| 238 | module_exit(raid6_test_exit); | ||
| 239 | MODULE_AUTHOR("Dan Williams <dan.j.williams@intel.com>"); | ||
| 240 | MODULE_DESCRIPTION("asynchronous RAID-6 recovery self tests"); | ||
| 241 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index 36e0675be9f7..41b3ae25b813 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig | |||
| @@ -155,6 +155,19 @@ config MD_RAID456 | |||
| 155 | config MD_RAID6_PQ | 155 | config MD_RAID6_PQ |
| 156 | tristate | 156 | tristate |
| 157 | 157 | ||
| 158 | config ASYNC_RAID6_TEST | ||
| 159 | tristate "Self test for hardware accelerated raid6 recovery" | ||
| 160 | depends on MD_RAID6_PQ | ||
| 161 | select ASYNC_RAID6_RECOV | ||
| 162 | ---help--- | ||
| 163 | This is a one-shot self test that permutes through the | ||
| 164 | recovery of all the possible two disk failure scenarios for a | ||
| 165 | N-disk array. Recovery is performed with the asynchronous | ||
| 166 | raid6 recovery routines, and will optionally use an offload | ||
| 167 | engine if one is available. | ||
| 168 | |||
| 169 | If unsure, say N. | ||
| 170 | |||
| 158 | config MD_MULTIPATH | 171 | config MD_MULTIPATH |
| 159 | tristate "Multipath I/O support" | 172 | tristate "Multipath I/O support" |
| 160 | depends on BLK_DEV_MD | 173 | depends on BLK_DEV_MD |
