mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
![Tejun Heo](/assets/img/avatar_default.png)
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
248 lines
6.3 KiB
C
248 lines
6.3 KiB
C
/*
|
|
* asynchronous raid6 recovery self test
|
|
* Copyright (c) 2009, Intel Corporation.
|
|
*
|
|
* based on drivers/md/raid6test/test.c:
|
|
* Copyright 2002-2007 H. Peter Anvin
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
*/
|
|
#include <linux/async_tx.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/random.h>
|
|
|
|
#undef pr
|
|
#define pr(fmt, args...) pr_info("raid6test: " fmt, ##args)
|
|
|
|
#define NDISKS 16 /* Including P and Q */
|
|
|
|
static struct page *dataptrs[NDISKS];
|
|
static addr_conv_t addr_conv[NDISKS];
|
|
static struct page *data[NDISKS+3];
|
|
static struct page *spare;
|
|
static struct page *recovi;
|
|
static struct page *recovj;
|
|
|
|
static void callback(void *param)
|
|
{
|
|
struct completion *cmp = param;
|
|
|
|
complete(cmp);
|
|
}
|
|
|
|
static void makedata(int disks)
|
|
{
|
|
int i, j;
|
|
|
|
for (i = 0; i < disks; i++) {
|
|
for (j = 0; j < PAGE_SIZE/sizeof(u32); j += sizeof(u32)) {
|
|
u32 *p = page_address(data[i]) + j;
|
|
|
|
*p = random32();
|
|
}
|
|
|
|
dataptrs[i] = data[i];
|
|
}
|
|
}
|
|
|
|
static char disk_type(int d, int disks)
|
|
{
|
|
if (d == disks - 2)
|
|
return 'P';
|
|
else if (d == disks - 1)
|
|
return 'Q';
|
|
else
|
|
return 'D';
|
|
}
|
|
|
|
/* Recover two failed blocks. */
|
|
static void raid6_dual_recov(int disks, size_t bytes, int faila, int failb, struct page **ptrs)
|
|
{
|
|
struct async_submit_ctl submit;
|
|
struct completion cmp;
|
|
struct dma_async_tx_descriptor *tx = NULL;
|
|
enum sum_check_flags result = ~0;
|
|
|
|
if (faila > failb)
|
|
swap(faila, failb);
|
|
|
|
if (failb == disks-1) {
|
|
if (faila == disks-2) {
|
|
/* P+Q failure. Just rebuild the syndrome. */
|
|
init_async_submit(&submit, 0, NULL, NULL, NULL, addr_conv);
|
|
tx = async_gen_syndrome(ptrs, 0, disks, bytes, &submit);
|
|
} else {
|
|
struct page *blocks[disks];
|
|
struct page *dest;
|
|
int count = 0;
|
|
int i;
|
|
|
|
/* data+Q failure. Reconstruct data from P,
|
|
* then rebuild syndrome
|
|
*/
|
|
for (i = disks; i-- ; ) {
|
|
if (i == faila || i == failb)
|
|
continue;
|
|
blocks[count++] = ptrs[i];
|
|
}
|
|
dest = ptrs[faila];
|
|
init_async_submit(&submit, ASYNC_TX_XOR_ZERO_DST, NULL,
|
|
NULL, NULL, addr_conv);
|
|
tx = async_xor(dest, blocks, 0, count, bytes, &submit);
|
|
|
|
init_async_submit(&submit, 0, tx, NULL, NULL, addr_conv);
|
|
tx = async_gen_syndrome(ptrs, 0, disks, bytes, &submit);
|
|
}
|
|
} else {
|
|
if (failb == disks-2) {
|
|
/* data+P failure. */
|
|
init_async_submit(&submit, 0, NULL, NULL, NULL, addr_conv);
|
|
tx = async_raid6_datap_recov(disks, bytes, faila, ptrs, &submit);
|
|
} else {
|
|
/* data+data failure. */
|
|
init_async_submit(&submit, 0, NULL, NULL, NULL, addr_conv);
|
|
tx = async_raid6_2data_recov(disks, bytes, faila, failb, ptrs, &submit);
|
|
}
|
|
}
|
|
init_completion(&cmp);
|
|
init_async_submit(&submit, ASYNC_TX_ACK, tx, callback, &cmp, addr_conv);
|
|
tx = async_syndrome_val(ptrs, 0, disks, bytes, &result, spare, &submit);
|
|
async_tx_issue_pending(tx);
|
|
|
|
if (wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000)) == 0)
|
|
pr("%s: timeout! (faila: %d failb: %d disks: %d)\n",
|
|
__func__, faila, failb, disks);
|
|
|
|
if (result != 0)
|
|
pr("%s: validation failure! faila: %d failb: %d sum_check_flags: %x\n",
|
|
__func__, faila, failb, result);
|
|
}
|
|
|
|
static int test_disks(int i, int j, int disks)
|
|
{
|
|
int erra, errb;
|
|
|
|
memset(page_address(recovi), 0xf0, PAGE_SIZE);
|
|
memset(page_address(recovj), 0xba, PAGE_SIZE);
|
|
|
|
dataptrs[i] = recovi;
|
|
dataptrs[j] = recovj;
|
|
|
|
raid6_dual_recov(disks, PAGE_SIZE, i, j, dataptrs);
|
|
|
|
erra = memcmp(page_address(data[i]), page_address(recovi), PAGE_SIZE);
|
|
errb = memcmp(page_address(data[j]), page_address(recovj), PAGE_SIZE);
|
|
|
|
pr("%s(%d, %d): faila=%3d(%c) failb=%3d(%c) %s\n",
|
|
__func__, i, j, i, disk_type(i, disks), j, disk_type(j, disks),
|
|
(!erra && !errb) ? "OK" : !erra ? "ERRB" : !errb ? "ERRA" : "ERRAB");
|
|
|
|
dataptrs[i] = data[i];
|
|
dataptrs[j] = data[j];
|
|
|
|
return erra || errb;
|
|
}
|
|
|
|
static int test(int disks, int *tests)
|
|
{
|
|
struct dma_async_tx_descriptor *tx;
|
|
struct async_submit_ctl submit;
|
|
struct completion cmp;
|
|
int err = 0;
|
|
int i, j;
|
|
|
|
recovi = data[disks];
|
|
recovj = data[disks+1];
|
|
spare = data[disks+2];
|
|
|
|
makedata(disks);
|
|
|
|
/* Nuke syndromes */
|
|
memset(page_address(data[disks-2]), 0xee, PAGE_SIZE);
|
|
memset(page_address(data[disks-1]), 0xee, PAGE_SIZE);
|
|
|
|
/* Generate assumed good syndrome */
|
|
init_completion(&cmp);
|
|
init_async_submit(&submit, ASYNC_TX_ACK, NULL, callback, &cmp, addr_conv);
|
|
tx = async_gen_syndrome(dataptrs, 0, disks, PAGE_SIZE, &submit);
|
|
async_tx_issue_pending(tx);
|
|
|
|
if (wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000)) == 0) {
|
|
pr("error: initial gen_syndrome(%d) timed out\n", disks);
|
|
return 1;
|
|
}
|
|
|
|
pr("testing the %d-disk case...\n", disks);
|
|
for (i = 0; i < disks-1; i++)
|
|
for (j = i+1; j < disks; j++) {
|
|
(*tests)++;
|
|
err += test_disks(i, j, disks);
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
|
|
static int raid6_test(void)
|
|
{
|
|
int err = 0;
|
|
int tests = 0;
|
|
int i;
|
|
|
|
for (i = 0; i < NDISKS+3; i++) {
|
|
data[i] = alloc_page(GFP_KERNEL);
|
|
if (!data[i]) {
|
|
while (i--)
|
|
put_page(data[i]);
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
|
|
/* the 4-disk and 5-disk cases are special for the recovery code */
|
|
if (NDISKS > 4)
|
|
err += test(4, &tests);
|
|
if (NDISKS > 5)
|
|
err += test(5, &tests);
|
|
/* the 11 and 12 disk cases are special for ioatdma (p-disabled
|
|
* q-continuation without extended descriptor)
|
|
*/
|
|
if (NDISKS > 12) {
|
|
err += test(11, &tests);
|
|
err += test(12, &tests);
|
|
}
|
|
err += test(NDISKS, &tests);
|
|
|
|
pr("\n");
|
|
pr("complete (%d tests, %d failure%s)\n",
|
|
tests, err, err == 1 ? "" : "s");
|
|
|
|
for (i = 0; i < NDISKS+3; i++)
|
|
put_page(data[i]);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void raid6_test_exit(void)
|
|
{
|
|
}
|
|
|
|
/* when compiled-in wait for drivers to load first (assumes dma drivers
|
|
* are also compliled-in)
|
|
*/
|
|
late_initcall(raid6_test);
|
|
module_exit(raid6_test_exit);
|
|
MODULE_AUTHOR("Dan Williams <dan.j.williams@intel.com>");
|
|
MODULE_DESCRIPTION("asynchronous RAID-6 recovery self tests");
|
|
MODULE_LICENSE("GPL");
|