From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Justin Sanders" <justin@coraid.com>,
"Josef Bacik" <josef@toxicpanda.com>,
"Ilya Dryomov" <idryomov@gmail.com>,
"Jack Wang" <jinpu.wang@cloud.ionos.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Minchan Kim" <minchan@kernel.org>,
"Mike Snitzer" <snitzer@redhat.com>, "Song Liu" <song@kernel.org>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
dm-devel@redhat.com, linux-block@vger.kernel.org,
drbd-dev@lists.linbit.com, nbd@other.debian.org,
ceph-devel@vger.kernel.org, xen-devel@lists.xenproject.org,
linux-raid@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-scsi@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 12/24] aoe: don't call set_capacity from irq context
Date: Fri, 6 Nov 2020 20:03:24 +0100 [thread overview]
Message-ID: <20201106190337.1973127-13-hch@lst.de> (raw)
In-Reply-To: <20201106190337.1973127-1-hch@lst.de>
Updating the block device size from irq context can lead to torn
writes of the 64-bit value, and prevents us from using normal
process context locking primitives to serialize access to the 64-bit
nr_sectors value. Defer the set_capacity to the already existing
workqueue handler, where it can be merged with the update of the
block device size by using set_capacity_and_notify. As an extra
bonus this also adds proper uevent notifications for the resize.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/block/aoe/aoecmd.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 313f0b946fe2b3..ac720bdcd983e7 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -890,19 +890,13 @@ void
aoecmd_sleepwork(struct work_struct *work)
{
struct aoedev *d = container_of(work, struct aoedev, work);
- struct block_device *bd;
- u64 ssize;
if (d->flags & DEVFL_GDALLOC)
aoeblk_gdalloc(d);
if (d->flags & DEVFL_NEWSIZE) {
- ssize = get_capacity(d->gd);
- bd = bdget_disk(d->gd, 0);
- if (bd) {
- bd_set_nr_sectors(bd, ssize);
- bdput(bd);
- }
+ set_capacity_and_notify(d->gd, d->ssize);
+
spin_lock_irq(&d->lock);
d->flags |= DEVFL_UP;
d->flags &= ~DEVFL_NEWSIZE;
@@ -971,10 +965,9 @@ ataid_complete(struct aoedev *d, struct aoetgt *t, unsigned char *id)
d->geo.start = 0;
if (d->flags & (DEVFL_GDALLOC|DEVFL_NEWSIZE))
return;
- if (d->gd != NULL) {
- set_capacity(d->gd, ssize);
+ if (d->gd != NULL)
d->flags |= DEVFL_NEWSIZE;
- } else
+ else
d->flags |= DEVFL_GDALLOC;
schedule_work(&d->work);
}
--
2.28.0
next prev parent reply other threads:[~2020-11-06 19:05 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-06 19:03 cleanup updating the size of block devices Christoph Hellwig
2020-11-06 19:03 ` [PATCH 01/24] block: remove the call to __invalidate_device in check_disk_size_change Christoph Hellwig
2020-11-06 19:03 ` [PATCH 02/24] loop: remove loop_set_size Christoph Hellwig
2020-11-06 19:03 ` [PATCH 03/24] nvme: let set_capacity_revalidate_and_notify update the bdev size Christoph Hellwig
2020-11-09 7:53 ` Hannes Reinecke
2020-11-09 8:53 ` Christoph Hellwig
2020-11-09 9:25 ` Hannes Reinecke
2020-11-09 23:28 ` Sagi Grimberg
2020-11-10 7:00 ` Hannes Reinecke
2020-11-06 19:03 ` [PATCH 04/24] sd: update the bdev size in sd_revalidate_disk Christoph Hellwig
2020-11-11 4:18 ` Martin K. Petersen
2020-11-06 19:03 ` [PATCH 05/24] block: remove the update_bdev parameter from set_capacity_revalidate_and_notify Christoph Hellwig
2020-11-06 19:03 ` [PATCH 06/24] block: add a return value to set_capacity_and_notify Christoph Hellwig
2020-11-06 19:03 ` [PATCH 07/24] nbd: remove the call to set_blocksize Christoph Hellwig
2020-11-06 19:03 ` [PATCH 08/24] nbd: move the task_recv check into nbd_size_update Christoph Hellwig
2020-11-06 19:03 ` [PATCH 09/24] nbd: refactor size updates Christoph Hellwig
2020-11-06 19:03 ` [PATCH 10/24] nbd: validate the block size in nbd_set_size Christoph Hellwig
2020-11-06 19:03 ` [PATCH 11/24] nbd: use set_capacity_and_notify Christoph Hellwig
2020-11-06 19:03 ` Christoph Hellwig [this message]
2020-11-06 19:03 ` [PATCH 13/24] dm: " Christoph Hellwig
2020-11-06 19:03 ` [PATCH 14/24] pktcdvd: " Christoph Hellwig
2020-11-06 19:03 ` [PATCH 15/24] nvme: use set_capacity_and_notify in nvme_set_queue_dying Christoph Hellwig
2020-11-06 19:03 ` [PATCH 16/24] drbd: use set_capacity_and_notify Christoph Hellwig
2020-11-06 19:03 ` [PATCH 17/24] rbd: " Christoph Hellwig
2020-11-09 13:52 ` Ilya Dryomov
2020-11-06 19:03 ` [PATCH 18/24] rnbd: " Christoph Hellwig
2020-11-09 6:56 ` Jinpu Wang
2020-11-06 19:03 ` [PATCH 19/24] zram: " Christoph Hellwig
2020-11-06 19:03 ` [PATCH 20/24] dm-raid: " Christoph Hellwig
2020-11-06 19:03 ` [PATCH 21/24] md: " Christoph Hellwig
2020-11-07 0:32 ` Song Liu
2020-11-06 19:03 ` [PATCH 22/24] md: remove a spurious call to revalidate_disk_size in update_size Christoph Hellwig
2020-11-07 0:39 ` Song Liu
2020-11-06 19:03 ` [PATCH 23/24] virtio-blk: remove a spurious call to revalidate_disk_size Christoph Hellwig
2020-11-08 15:15 ` Paolo Bonzini
2020-11-09 10:22 ` Stefan Hajnoczi
2020-11-09 11:30 ` Michael S. Tsirkin
2020-11-06 19:03 ` [PATCH 24/24] block: unexport revalidate_disk_size Christoph Hellwig
2020-11-09 18:07 ` cleanup updating the size of block devices Josef Bacik
2020-11-11 8:26 cleanup updating the size of block devices v2 Christoph Hellwig
2020-11-11 8:26 ` [PATCH 12/24] aoe: don't call set_capacity from irq context 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=20201106190337.1973127-13-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=ceph-devel@vger.kernel.org \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=idryomov@gmail.com \
--cc=jasowang@redhat.com \
--cc=jinpu.wang@cloud.ionos.com \
--cc=josef@toxicpanda.com \
--cc=justin@coraid.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=minchan@kernel.org \
--cc=mst@redhat.com \
--cc=nbd@other.debian.org \
--cc=pbonzini@redhat.com \
--cc=roger.pau@citrix.com \
--cc=snitzer@redhat.com \
--cc=song@kernel.org \
--cc=stefanha@redhat.com \
--cc=xen-devel@lists.xenproject.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).