diff options
| author | Shaohua Li <shli@kernel.org> | 2013-08-27 17:50:39 +0800 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2013-08-28 11:55:53 +1000 |
| commit | 773ca82fa1ee58dd1bf88b6a5ca385ec83a2cac6 (patch) | |
| tree | 9dd6c1d72a9fab76d668ae2500e98003290c75a4 /drivers/md/raid5.h | |
| parent | 260fa034ef7a4ff8b73068b48ac497edd5217491 (diff) | |
| download | talos-op-linux-773ca82fa1ee58dd1bf88b6a5ca385ec83a2cac6.tar.gz talos-op-linux-773ca82fa1ee58dd1bf88b6a5ca385ec83a2cac6.zip | |
raid5: make release_stripe lockless
release_stripe still has big lock contention. We just add the stripe to a llist
without taking device_lock. We let the raid5d thread to do the real stripe
release, which must hold device_lock anyway. In this way, release_stripe
doesn't hold any locks.
The side effect is the released stripes order is changed. But sounds not a big
deal, stripes are never handled in order. And I thought block layer can already
do nice request merge, which means order isn't that important.
I kept the unplug release batch, which is unnecessary with this patch from lock
contention avoid point of view, and actually if we delete it, the stripe_head
release_list and lru can share storage. But the unplug release batch is also
helpful for request merge. We probably can delay wakeup raid5d till unplug, but
I'm still afraid of the case which raid5d is running.
Signed-off-by: Shaohua Li <shli@fusionio.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid5.h')
| -rw-r--r-- | drivers/md/raid5.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index 70c49329ca9a..a98f99d2a58f 100644 --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h @@ -197,6 +197,7 @@ enum reconstruct_states { struct stripe_head { struct hlist_node hash; struct list_head lru; /* inactive_list or handle_list */ + struct llist_node release_list; struct r5conf *raid_conf; short generation; /* increments with every * reshape */ @@ -321,6 +322,7 @@ enum { STRIPE_OPS_REQ_PENDING, STRIPE_ON_UNPLUG_LIST, STRIPE_DISCARD, + STRIPE_ON_RELEASE_LIST, }; /* @@ -445,6 +447,7 @@ struct r5conf { */ atomic_t active_stripes; struct list_head inactive_list; + struct llist_head released_stripes; wait_queue_head_t wait_for_stripe; wait_queue_head_t wait_for_overlap; int inactive_blocked; /* release of inactive stripes blocked, |
