Re: [PATCH] md/raid456: remove depends on CONFIG_EXPERIMENTAL
From: NeilBrown <hidden>
Date: 2013-02-27 22:11:32
Also in:
lkml
Subsystem:
device-mapper (lvm), software raid (multiple disks) support, the rest · Maintainers:
Alasdair Kergon, Mike Snitzer, Mikulas Patocka, Benjamin Marzinski, Song Liu, Yu Kuai, Linus Torvalds
On Tue, 26 Feb 2013 17:27:45 -0800 Dan Williams [off-list ref] wrote:
On Fri, Feb 22, 2013 at 11:40 PM, Kees Cook [off-list ref] wrote:quoted
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a while now and is almost always enabled by default. As agreed during the Linux kernel summit, remove it from any "depends on" lines in Kconfigs. Signed-off-by: Kees Cook <redacted> Cc: Arjan van de Ven <redacted> Cc: Dan Williams <redacted> Cc: Alasdair G Kergon <agk@redhat.com> --- drivers/md/Kconfig | 1 - 1 file changed, 1 deletion(-)diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index 7cdf359..0cc3a3d 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig@@ -158,7 +158,6 @@ config MULTICORE_RAID456 bool "RAID-4/RAID-5/RAID-6 Multicore processing (EXPERIMENTAL)" depends on MD_RAID456 depends on SMP - depends on EXPERIMENTALIn this case MULTICORE_RAID456 and the related code should go as well... now that there are patches to supersede this implementation in md-next.
What a good idea. Following will be in -next shortly. NeilBrown From 51acbcec6c42b24482bac18e42befc822524535d Mon Sep 17 00:00:00 2001 From: NeilBrown <redacted> Date: Thu, 28 Feb 2013 09:08:34 +1100 Subject: [PATCH] md: remove CONFIG_MULTICORE_RAID456 This doesn't seem to actually help and we have an alternate multi-threading approach waiting in the wings, so just get rid of this config option and associated code. As a bonus, we remove one use of CONFIG_EXPERIMENTAL Cc: Dan Williams <redacted> Cc: Kees Cook <redacted> Signed-off-by: NeilBrown <redacted>
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 91a02ee..9a10313 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig@@ -154,17 +154,6 @@ config MD_RAID456 If unsure, say Y. -config MULTICORE_RAID456 - bool "RAID-4/RAID-5/RAID-6 Multicore processing (EXPERIMENTAL)" - depends on MD_RAID456 - depends on SMP - depends on EXPERIMENTAL - ---help--- - Enable the raid456 module to dispatch per-stripe raid operations to a - thread pool. - - If unsure, say N. - config MD_MULTIPATH tristate "Multipath I/O support" depends on BLK_DEV_MD
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 19d77a0..35031c8 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c@@ -1406,7 +1406,7 @@ static void ops_run_check_pq(struct stripe_head *sh, struct raid5_percpu *percpu &sh->ops.zero_sum_result, percpu->spare_page, &submit); } -static void __raid_run_ops(struct stripe_head *sh, unsigned long ops_request) +static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request) { int overlap_clear = 0, i, disks = sh->disks; struct dma_async_tx_descriptor *tx = NULL;
@@ -1471,36 +1471,6 @@ static void __raid_run_ops(struct stripe_head *sh, unsigned long ops_request) put_cpu(); } -#ifdef CONFIG_MULTICORE_RAID456 -static void async_run_ops(void *param, async_cookie_t cookie) -{ - struct stripe_head *sh = param; - unsigned long ops_request = sh->ops.request; - - clear_bit_unlock(STRIPE_OPS_REQ_PENDING, &sh->state); - wake_up(&sh->ops.wait_for_ops); - - __raid_run_ops(sh, ops_request); - release_stripe(sh); -} - -static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request) -{ - /* since handle_stripe can be called outside of raid5d context - * we need to ensure sh->ops.request is de-staged before another - * request arrives - */ - wait_event(sh->ops.wait_for_ops, - !test_and_set_bit_lock(STRIPE_OPS_REQ_PENDING, &sh->state)); - sh->ops.request = ops_request; - - atomic_inc(&sh->count); - async_schedule(async_run_ops, sh); -} -#else -#define raid_run_ops __raid_run_ops -#endif - static int grow_one_stripe(struct r5conf *conf) { struct stripe_head *sh;
@@ -1509,9 +1479,6 @@ static int grow_one_stripe(struct r5conf *conf) return 0; sh->raid_conf = conf; - #ifdef CONFIG_MULTICORE_RAID456 - init_waitqueue_head(&sh->ops.wait_for_ops); - #endif spin_lock_init(&sh->stripe_lock);
@@ -1630,9 +1597,6 @@ static int resize_stripes(struct r5conf *conf, int newsize) break; nsh->raid_conf = conf; - #ifdef CONFIG_MULTICORE_RAID456 - init_waitqueue_head(&nsh->ops.wait_for_ops); - #endif spin_lock_init(&nsh->stripe_lock); list_add(&nsh->lru, &newstripes);
Attachments
- signature.asc [application/pgp-signature] 828 bytes