From: Ming Lei <tom.leiming@gmail.com>
To: Shaohua Li <shli@kernel.org>, Jens Axboe <axboe@fb.com>,
linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
linux-block@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>, NeilBrown <neilb@suse.com>
Cc: Ming Lei <tom.leiming@gmail.com>
Subject: [PATCH 08/17] md: raid1: simplify r1buf_pool_free()
Date: Thu, 16 Feb 2017 19:45:38 +0800 [thread overview]
Message-ID: <1487245547-24384-9-git-send-email-tom.leiming@gmail.com> (raw)
In-Reply-To: <1487245547-24384-1-git-send-email-tom.leiming@gmail.com>
This patch gets each page's reference of each bio for resync,
then r1buf_pool_free() gets simplified.
The same policy has been taken in raid10's buf pool allocation/free
too.
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
drivers/md/raid1.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 23a3a678a9ed..ebea8615344a 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -143,9 +143,12 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
/* If not user-requests, copy the page pointers to all bios */
if (!test_bit(MD_RECOVERY_REQUESTED, &pi->mddev->recovery)) {
for (i=0; i<RESYNC_PAGES ; i++)
- for (j=1; j<pi->raid_disks; j++)
- r1_bio->bios[j]->bi_io_vec[i].bv_page =
+ for (j=1; j<pi->raid_disks; j++) {
+ struct page *page =
r1_bio->bios[0]->bi_io_vec[i].bv_page;
+ get_page(page);
+ r1_bio->bios[j]->bi_io_vec[i].bv_page = page;
+ }
}
r1_bio->master_bio = NULL;
@@ -170,12 +173,8 @@ static void r1buf_pool_free(void *__r1_bio, void *data)
struct r1bio *r1bio = __r1_bio;
for (i = 0; i < RESYNC_PAGES; i++)
- for (j = pi->raid_disks; j-- ;) {
- if (j == 0 ||
- r1bio->bios[j]->bi_io_vec[i].bv_page !=
- r1bio->bios[0]->bi_io_vec[i].bv_page)
- safe_put_page(r1bio->bios[j]->bi_io_vec[i].bv_page);
- }
+ for (j = pi->raid_disks; j-- ;)
+ safe_put_page(r1bio->bios[j]->bi_io_vec[i].bv_page);
for (i=0 ; i < pi->raid_disks; i++)
bio_put(r1bio->bios[i]);
--
2.7.4
next prev parent reply other threads:[~2017-02-16 11:46 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-16 11:45 [PATCH 00/17] md: cleanup on direct access to bvec table Ming Lei
2017-02-16 11:45 ` [PATCH 01/17] block: introduce bio_segments_all() Ming Lei
2017-02-16 11:45 ` [PATCH 02/17] block: introduce bio_remove_last_page() Ming Lei
2017-02-16 12:08 ` Johannes Thumshirn
2017-02-16 13:30 ` Ming Lei
2017-02-16 13:40 ` Johannes Thumshirn
2017-02-16 13:59 ` Ming Lei
2017-02-16 14:10 ` Johannes Thumshirn
2017-02-16 11:45 ` [PATCH 03/17] md: raid1/raid10: use bio_remove_last_page() Ming Lei
2017-02-16 11:45 ` [PATCH 04/17] md: introduce helpers for dealing with fetch/store preallocated pages in bio Ming Lei
2017-02-16 11:45 ` [PATCH 05/17] md: raid1/raid10: use the introduced helpers Ming Lei
2017-02-16 11:45 ` [PATCH 06/17] md: raid1/raid10: borrow .bi_error as pre-allocated page index Ming Lei
2017-02-16 11:45 ` [PATCH 07/17] md: raid1/raid10: don't use .bi_vcnt to check if all pages are added Ming Lei
2017-02-16 11:45 ` Ming Lei [this message]
2017-02-16 11:45 ` [PATCH 09/17] md: raid1/raid10: use bio helper in *_pool_free Ming Lei
2017-02-16 11:45 ` [PATCH 10/17] md: raid1: remove direct access to bvec table in fix_sync_read_error Ming Lei
2017-02-16 11:45 ` [PATCH 11/17] md: raid1: use bio helper in process_checks() Ming Lei
2017-02-16 11:45 ` [PATCH 12/17] md: raid1: avoid direct access to bvec table " Ming Lei
2017-02-17 8:33 ` kbuild test robot
2017-02-16 11:45 ` [PATCH 13/17] md: raid1: use bio_segments_all() Ming Lei
2017-02-16 12:35 ` Johannes Thumshirn
2017-02-16 13:32 ` Ming Lei
2017-02-16 13:34 ` Johannes Thumshirn
2017-02-16 13:38 ` Ming Lei
2017-02-16 11:45 ` [PATCH 14/17] md: raid10: avoid direct access to bvec table in sync_request_write() Ming Lei
2017-02-16 11:45 ` [PATCH 15/17] md: raid10: avoid direct access to bvec table in fix_recovery_read_error Ming Lei
2017-02-16 11:45 ` [PATCH 16/17] md: raid10: avoid direct access to bvec table in reshape_request Ming Lei
2017-02-16 11:45 ` [PATCH 17/17] md: raid10: avoid direct access to bvec table in handle_reshape_read_error Ming Lei
2017-02-16 22:16 ` [PATCH 00/17] md: cleanup on direct access to bvec table Shaohua Li
2017-02-17 1:25 ` Ming Lei
2017-02-17 4:16 ` Shaohua Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487245547-24384-9-git-send-email-tom.leiming@gmail.com \
--to=tom.leiming@gmail.com \
--cc=axboe@fb.com \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=neilb@suse.com \
--cc=shli@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).