linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 06/17] md: raid1/raid10: borrow .bi_error as pre-allocated page index
Date: Thu, 16 Feb 2017 19:45:36 +0800	[thread overview]
Message-ID: <1487245547-24384-7-git-send-email-tom.leiming@gmail.com> (raw)
In-Reply-To: <1487245547-24384-1-git-send-email-tom.leiming@gmail.com>

Before bio is submitted, it is safe to borrow .bi_error. This
patch uses .bi_error as index of pre-allocated page in bio, so
that we can avoid to mess .bi_vcnt. Especially the old way
will not work any more when multipage bvec is introduced.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
 drivers/md/raid1.c  | 12 ++++++++++--
 drivers/md/raid10.c | 14 ++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index c4791fbd69ac..8904a9149671 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2811,13 +2811,14 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,
 				len = sync_blocks<<9;
 		}
 
+		/* borrow .bi_error as pre-allocated page index */
 		for (i = 0 ; i < conf->raid_disks * 2; i++) {
 			bio = r1_bio->bios[i];
 			if (bio->bi_end_io) {
-				page = mdev_get_page_from_bio(bio, bio->bi_vcnt);
+				page = mdev_get_page_from_bio(bio, bio->bi_error++);
 				if (bio_add_page(bio, page, len, 0) == 0) {
 					/* stop here */
-					mdev_put_page_to_bio(bio, bio->bi_vcnt, page);
+					mdev_put_page_to_bio(bio, --bio->bi_error, page);
 					while (i > 0) {
 						i--;
 						bio = r1_bio->bios[i];
@@ -2836,6 +2837,13 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,
 		sync_blocks -= (len>>9);
 	} while (r1_bio->bios[disk]->bi_vcnt < RESYNC_PAGES);
  bio_full:
+	/* return .bi_error back to bio */
+	for (i = 0 ; i < conf->raid_disks * 2; i++) {
+		bio = r1_bio->bios[i];
+		if (bio->bi_end_io)
+			bio->bi_error = 0;
+	}
+
 	r1_bio->sectors = nr_sectors;
 
 	if (mddev_is_clustered(mddev) &&
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index b7dfbca869a3..9cfc22cd1330 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3348,7 +3348,6 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
 
 			bio = r10_bio->devs[i].bio;
 			bio_reset(bio);
-			bio->bi_error = -EIO;
 			rcu_read_lock();
 			rdev = rcu_dereference(conf->mirrors[d].rdev);
 			if (rdev == NULL || test_bit(Faulty, &rdev->flags)) {
@@ -3392,7 +3391,6 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
 			/* Need to set up for writing to the replacement */
 			bio = r10_bio->devs[i].repl_bio;
 			bio_reset(bio);
-			bio->bi_error = -EIO;
 
 			sector = r10_bio->devs[i].addr;
 			bio->bi_next = biolist;
@@ -3435,14 +3433,15 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
 			len = (max_sector - sector_nr) << 9;
 		if (len == 0)
 			break;
+		/* borrow .bi_error as pre-allocated page index */
 		for (bio= biolist ; bio ; bio=bio->bi_next) {
 			struct bio *bio2;
-			page = mdev_get_page_from_bio(bio, bio->bi_vcnt);
+			page = mdev_get_page_from_bio(bio, bio->bi_error++);
 			if (bio_add_page(bio, page, len, 0))
 				continue;
 
 			/* stop here */
-			mdev_put_page_to_bio(bio, bio->bi_vcnt, page);
+			mdev_put_page_to_bio(bio, --bio->bi_error, page);
 			for (bio2 = biolist;
 			     bio2 && bio2 != bio;
 			     bio2 = bio2->bi_next) {
@@ -3456,6 +3455,13 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
 		sector_nr += len>>9;
 	} while (biolist->bi_vcnt < RESYNC_PAGES);
  bio_full:
+	/* return .bi_error back to bio, and set resync's as -EIO */
+	for (bio= biolist ; bio ; bio=bio->bi_next)
+		if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery))
+			bio->bi_error = -EIO;
+		else
+			bio->bi_error = 0;
+
 	r10_bio->sectors = nr_sectors;
 
 	while (biolist) {
-- 
2.7.4

  parent reply	other threads:[~2017-02-16 11:51 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 ` Ming Lei [this message]
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 ` [PATCH 08/17] md: raid1: simplify r1buf_pool_free() Ming Lei
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-7-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).