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>
Cc: Ming Lei <tom.leiming@gmail.com>
Subject: [PATCH v1 08/14] md: raid1: retrieve page from pre-allocated resync page array
Date: Fri, 24 Feb 2017 23:42:45 +0800 [thread overview]
Message-ID: <1487950971-1131-9-git-send-email-tom.leiming@gmail.com> (raw)
In-Reply-To: <1487950971-1131-1-git-send-email-tom.leiming@gmail.com>
Now one page array is allocated for each resync bio, and we can
retrieve page from this table directly.
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
drivers/md/raid1.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 4a208220ff0f..9371caace379 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1970,6 +1970,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
struct mddev *mddev = r1_bio->mddev;
struct r1conf *conf = mddev->private;
struct bio *bio = r1_bio->bios[r1_bio->read_disk];
+ struct page **pages = get_resync_pages(bio)->pages;
sector_t sect = r1_bio->sector;
int sectors = r1_bio->sectors;
int idx = 0;
@@ -2003,7 +2004,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
*/
rdev = conf->mirrors[d].rdev;
if (sync_page_io(rdev, sect, s<<9,
- bio->bi_io_vec[idx].bv_page,
+ pages[idx],
REQ_OP_READ, 0, false)) {
success = 1;
break;
@@ -2058,7 +2059,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
continue;
rdev = conf->mirrors[d].rdev;
if (r1_sync_page_io(rdev, sect, s,
- bio->bi_io_vec[idx].bv_page,
+ pages[idx],
WRITE) == 0) {
r1_bio->bios[d]->bi_end_io = NULL;
rdev_dec_pending(rdev, mddev);
@@ -2073,7 +2074,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
continue;
rdev = conf->mirrors[d].rdev;
if (r1_sync_page_io(rdev, sect, s,
- bio->bi_io_vec[idx].bv_page,
+ pages[idx],
READ) != 0)
atomic_add(s, &rdev->corrected_errors);
}
@@ -2149,6 +2150,8 @@ static void process_checks(struct r1bio *r1_bio)
struct bio *pbio = r1_bio->bios[primary];
struct bio *sbio = r1_bio->bios[i];
int error = sbio->bi_error;
+ struct page **ppages = get_resync_pages(pbio)->pages;
+ struct page **spages = get_resync_pages(sbio)->pages;
if (sbio->bi_end_io != end_sync_read)
continue;
@@ -2157,11 +2160,8 @@ static void process_checks(struct r1bio *r1_bio)
if (!error) {
for (j = vcnt; j-- ; ) {
- struct page *p, *s;
- p = pbio->bi_io_vec[j].bv_page;
- s = sbio->bi_io_vec[j].bv_page;
- if (memcmp(page_address(p),
- page_address(s),
+ if (memcmp(page_address(ppages[j]),
+ page_address(spages[j]),
sbio->bi_io_vec[j].bv_len))
break;
}
--
2.7.4
next prev parent reply other threads:[~2017-02-24 15:42 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 15:42 [PATCH v1 00/14] md: cleanup on direct access to bvec table Ming Lei
2017-02-24 15:42 ` [PATCH v1 01/14] block: introduce bio_segments_all() Ming Lei
2017-02-25 18:22 ` Christoph Hellwig
2017-02-28 12:15 ` Ming Lei
2017-02-24 15:42 ` [PATCH v1 02/14] block: introduce bio_remove_last_page() Ming Lei
2017-02-25 18:23 ` Christoph Hellwig
2017-02-28 12:18 ` Ming Lei
2017-02-24 15:42 ` [PATCH v1 03/14] md: raid1/raid10: use bio_remove_last_page() Ming Lei
2017-02-24 15:42 ` [PATCH v1 04/14] md: move two macros into md.h Ming Lei
2017-02-24 15:42 ` [PATCH v1 05/14] md: prepare for managing resync I/O pages in clean way Ming Lei
2017-02-24 15:42 ` [PATCH v1 06/14] md: raid1: simplify r1buf_pool_free() Ming Lei
2017-02-24 15:42 ` [PATCH v1 07/14] md: raid1: don't use bio's vec table to manage resync pages Ming Lei
2017-02-24 15:42 ` Ming Lei [this message]
2017-02-24 15:42 ` [PATCH v1 09/14] md: raid1: use bio helper in process_checks() Ming Lei
2017-02-24 15:42 ` [PATCH v1 10/14] md: raid1: use bio_segments_all() Ming Lei
2017-02-24 15:42 ` [PATCH v1 11/14] md: raid10: refactor code of read reshape's .bi_end_io Ming Lei
2017-02-24 15:42 ` [PATCH v1 12/14] md: raid10: don't use bio's vec table to manage resync pages Ming Lei
2017-02-24 15:42 ` [PATCH v1 13/14] md: raid10: retrieve page from preallocated resync page array Ming Lei
2017-02-24 15:42 ` [PATCH v1 14/14] md: raid10: avoid direct access to bvec table in handle_reshape_read_error Ming Lei
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=1487950971-1131-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=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).