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 2/4] block: only define 'nr_sects_seq' in hd_part for 32bit SMP
Date: Thu, 9 Jan 2020 14:21:07 +0800 [thread overview]
Message-ID: <20200109062109.2313-3-ming.lei@redhat.com> (raw)
In-Reply-To: <20200109062109.2313-1-ming.lei@redhat.com>
The seqcount of 'nr_sects_seq' is only needed in case of 32bit SMP,
so define it just for 32bit SMP.
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/genhd.c | 2 +-
block/partition-generic.c | 2 +-
include/linux/genhd.h | 9 +++++++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/block/genhd.c b/block/genhd.c
index 6029c94510f0..bfc4148ec341 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1506,7 +1506,7 @@ struct gendisk *__alloc_disk_node(int minors, int node_id)
* TODO: Ideally set_capacity() and get_capacity() should be
* converted to make use of bd_mutex and sequence counters.
*/
- seqcount_init(&disk->part0.nr_sects_seq);
+ hd_sects_seq_init(&disk->part0);
if (hd_ref_init(&disk->part0)) {
hd_free_part(&disk->part0);
kfree(disk);
diff --git a/block/partition-generic.c b/block/partition-generic.c
index 1739f750dbf2..eb606c2c3d6c 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -345,7 +345,7 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno,
goto out_free;
}
- seqcount_init(&p->nr_sects_seq);
+ hd_sects_seq_init(p);
pdev = part_to_dev(p);
p->start_sect = start;
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 1b09cfe00aa3..5f5718ce5e86 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -113,7 +113,9 @@ struct hd_struct {
* can be non-atomic on 32bit machines with 64bit sector_t.
*/
sector_t nr_sects;
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
seqcount_t nr_sects_seq;
+#endif
sector_t alignment_offset;
unsigned int discard_alignment;
struct device __dev;
@@ -713,6 +715,13 @@ static inline void hd_free_part(struct hd_struct *part)
percpu_ref_exit(&part->ref);
}
+static inline void hd_sects_seq_init(struct hd_struct *p)
+{
+#if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+ seqcount_init(&p->nr_sects_seq);
+#endif
+}
+
/*
* Any access of part->nr_sects which is not protected by partition
* bd_mutex or gendisk bdev bd_mutex, should be done using this
--
2.20.1
next prev parent reply other threads:[~2020-01-09 6:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 6:21 [PATCH 0/4] block: fix partition use-after-free and optimization Ming Lei
2020-01-09 6:21 ` [PATCH 1/4] block: fix use-after-free on cached last_lookup partition Ming Lei
2020-02-21 3:05 ` Yufen Yu
2020-02-21 4:03 ` Bart Van Assche
2020-02-21 7:47 ` Ming Lei
2020-01-09 6:21 ` Ming Lei [this message]
2020-01-09 6:21 ` [PATCH 3/4] block: re-organize fields of 'struct hd_part' Ming Lei
2020-01-09 6:21 ` [PATCH 4/4] block: don't hold part0's refcount in IO path Ming Lei
2020-05-07 8:52 [PATCH 0/4] block: fix partition use-after-free and optimization Ming Lei
2020-05-07 8:52 ` [PATCH 2/4] block: only define 'nr_sects_seq' in hd_part for 32bit SMP Ming Lei
2020-05-07 14:16 ` 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=20200109062109.2313-3-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).