From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, Ming Lei <ming.lei@redhat.com>,
Yufen Yu <yuyufen@huawei.com>,
Christoph Hellwig <hch@infradead.org>,
Hou Tao <houtao1@huawei.com>
Subject: [PATCH V2 4/4] block: don't hold part0's refcount in IO path
Date: Fri, 8 May 2020 12:44:07 +0800 [thread overview]
Message-ID: <20200508044407.1371907-5-ming.lei@redhat.com> (raw)
In-Reply-To: <20200508044407.1371907-1-ming.lei@redhat.com>
gendisk can't be gone when there is IO activity, so not hold
part0's refcount in IO path.
Cc: Yufen Yu <yuyufen@huawei.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Hou Tao <houtao1@huawei.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
block/blk-core.c | 3 ++-
block/blk-merge.c | 3 ++-
block/genhd.c | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 826a8980997d..56cc61354671 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1343,7 +1343,8 @@ void blk_account_io_done(struct request *req, u64 now)
part_stat_add(part, nsecs[sgrp], now - req->start_time_ns);
part_dec_in_flight(req->q, part, rq_data_dir(req));
- hd_struct_put(part);
+ if (part->partno)
+ hd_struct_put(part);
part_stat_unlock();
}
}
diff --git a/block/blk-merge.c b/block/blk-merge.c
index a04e991b5ded..b44caa28ec04 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -672,7 +672,8 @@ static void blk_account_io_merge(struct request *req)
part_dec_in_flight(req->q, part, rq_data_dir(req));
- hd_struct_put(part);
+ if (part->partno)
+ hd_struct_put(part);
part_stat_unlock();
}
}
diff --git a/block/genhd.c b/block/genhd.c
index bf8cbb033d64..d97b95d1a2fd 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -345,7 +345,8 @@ static inline int sector_in_part(struct hd_struct *part, sector_t sector)
*
* CONTEXT:
* RCU read locked. The returned partition pointer is always valid
- * because its refcount is grabbed.
+ * because its refcount is grabbed except for part0, which lifetime
+ * is same with the disk.
*
* RETURNS:
* Found partition on success, part0 is returned if no partition matches
@@ -378,7 +379,6 @@ struct hd_struct *disk_map_sector_rcu(struct gendisk *disk, sector_t sector)
return part;
}
}
- hd_struct_get(&disk->part0);
return &disk->part0;
}
--
2.25.2
next prev parent reply other threads:[~2020-05-08 4:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 4:44 [PATCH V2 0/4] block: fix partition use-after-free and optimization Ming Lei
2020-05-08 4:44 ` [PATCH V2 1/4] block: fix use-after-free on cached last_lookup partition Ming Lei
2020-05-08 6:44 ` Christoph Hellwig
2020-05-08 4:44 ` [PATCH V2 2/4] block: only define 'nr_sects_seq' in hd_part for 32bit SMP Ming Lei
2020-05-08 4:44 ` [PATCH V2 3/4] block: re-organize fields of 'struct hd_part' Ming Lei
2020-05-08 4:44 ` Ming Lei [this message]
2020-05-08 6:41 ` [PATCH V2 4/4] block: don't hold part0's refcount in IO path Christoph Hellwig
2020-05-08 7:41 ` Ming Lei
2020-05-08 7:47 ` Christoph Hellwig
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=20200508044407.1371907-5-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=hch@infradead.org \
--cc=houtao1@huawei.com \
--cc=linux-block@vger.kernel.org \
--cc=yuyufen@huawei.com \
/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).