From: Fam Zheng <famz@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-nvme@lists.infradead.org,
Keith Busch <keith.busch@intel.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org,
"Michael S. Tsirkin" <mst@redhat.com>,
linux-block@vger.kernel.org,
Brian Norris <computersforpeace@gmail.com>,
Paul Mackerras <paulus@samba.org>,
linux-mtd@lists.infradead.org, "Ed L. Cashin" <ed.cashin@acm.org>,
Jens Axboe <axboe@kernel.dk>, Minchan Kim <minchan@kernel.org>,
virtualization@lists.linux-foundation.org,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
Nitin Gupta <ngupta@vflare.org>,
David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH 09/15] virtio-blk: Pass attribute group to device_add_disk
Date: Wed, 17 Aug 2016 15:15:09 +0800 [thread overview]
Message-ID: <1471418115-3654-10-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1471418115-3654-1-git-send-email-famz@redhat.com>
Previously after device_add_disk returns, the KOBJ_ADD uevent is already
emitted. Adding attributes after that is a poor usage of kobject, and
in practice may result in race conditions with userspace, for
example udev checks availability of certain attributes and initializes
/dev entries conditionally.
device_add_disk can handle adding attribute group better, so use it.
Meanwhile, handle error of device_add_disk.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
drivers/block/virtio_blk.c | 38 +++++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 4564df5..ff60d82 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -522,10 +522,10 @@ virtblk_cache_type_show(struct device *dev, struct device_attribute *attr,
return snprintf(buf, 40, "%s\n", virtblk_cache_types[writeback]);
}
-static const struct device_attribute dev_attr_cache_type_ro =
+static struct device_attribute dev_attr_cache_type_ro =
__ATTR(cache_type, S_IRUGO,
virtblk_cache_type_show, NULL);
-static const struct device_attribute dev_attr_cache_type_rw =
+static struct device_attribute dev_attr_cache_type_rw =
__ATTR(cache_type, S_IRUGO|S_IWUSR,
virtblk_cache_type_show, virtblk_cache_type_store);
@@ -550,6 +550,26 @@ static struct blk_mq_ops virtio_mq_ops = {
static unsigned int virtblk_queue_depth;
module_param_named(queue_depth, virtblk_queue_depth, uint, 0444);
+static struct attribute *virtblk_attrs_ro[] = {
+ &dev_attr_serial.attr,
+ &dev_attr_cache_type_ro.attr,
+ NULL
+};
+
+static struct attribute *virtblk_attrs_rw[] = {
+ &dev_attr_serial.attr,
+ &dev_attr_cache_type_rw.attr,
+ NULL
+};
+
+static struct attribute_group virtblk_attr_group_ro = {
+ .attrs = virtblk_attrs_ro,
+};
+
+static struct attribute_group virtblk_attr_group_rw = {
+ .attrs = virtblk_attrs_rw,
+};
+
static int virtblk_probe(struct virtio_device *vdev)
{
struct virtio_blk *vblk;
@@ -560,6 +580,7 @@ static int virtblk_probe(struct virtio_device *vdev)
u32 v, blk_size, sg_elems, opt_io_size;
u16 min_io_size;
u8 physical_block_exp, alignment_offset;
+ struct attribute_group *attr_group;
if (!vdev->config->get) {
dev_err(&vdev->dev, "%s failure: config access disabled\n",
@@ -719,19 +740,14 @@ static int virtblk_probe(struct virtio_device *vdev)
virtio_device_ready(vdev);
- device_add_disk(&vdev->dev, vblk->disk, NULL);
- err = device_create_file(disk_to_dev(vblk->disk), &dev_attr_serial);
- if (err)
- goto out_del_disk;
-
if (virtio_has_feature(vdev, VIRTIO_BLK_F_CONFIG_WCE))
- err = device_create_file(disk_to_dev(vblk->disk),
- &dev_attr_cache_type_rw);
+ attr_group = &virtblk_attr_group_rw;
else
- err = device_create_file(disk_to_dev(vblk->disk),
- &dev_attr_cache_type_ro);
+ attr_group = &virtblk_attr_group_ro;
+ err = device_add_disk(&vdev->dev, vblk->disk, attr_group);
if (err)
goto out_del_disk;
+
return 0;
out_del_disk:
--
2.7.4
next prev parent reply other threads:[~2016-08-17 7:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-17 7:15 [PATCH 00/15] Fix issue with KOBJ_ADD uevent versus disk attributes Fam Zheng
2016-08-17 7:15 ` [PATCH 01/15] disk: Drop add_disk in favor of device_add_disk Fam Zheng
2016-08-17 7:15 ` [PATCH 02/15] genhd: Return error from register_disk() Fam Zheng
2016-08-17 7:15 ` [PATCH 03/15] genhd: Return error from blk_register_region Fam Zheng
2016-08-17 7:15 ` [PATCH 04/15] block: Return error from blk_integrity_add Fam Zheng
2016-08-17 7:15 ` [PATCH 05/15] genhd: Return error from disk_{add,alloc}_events Fam Zheng
2016-08-17 7:15 ` [PATCH 06/15] genhd: Add return code to device_add_disk Fam Zheng
2016-08-17 8:49 ` Cornelia Huck
2016-08-17 8:48 ` Fam Zheng
2016-08-17 9:06 ` Cornelia Huck
2016-08-17 9:14 ` Fam Zheng
2016-08-18 1:09 ` Ed Cashin
2016-08-17 7:15 ` [PATCH 07/15] genhd: Add attribute group parameter " Fam Zheng
2016-08-17 7:15 ` [PATCH 08/15] nvme: Pass attribute group " Fam Zheng
2016-08-17 8:13 ` kbuild test robot
2016-08-17 7:15 ` Fam Zheng [this message]
2016-09-04 4:18 ` [PATCH 09/15] virtio-blk: " Michael S. Tsirkin
2016-08-17 7:15 ` [PATCH 10/15] mtd: " Fam Zheng
2016-08-17 7:15 ` [PATCH 11/15] zram: " Fam Zheng
2016-08-18 1:59 ` Sergey Senozhatsky
2016-08-18 2:06 ` Sergey Senozhatsky
2016-08-17 7:15 ` [PATCH 12/15] mtip: " Fam Zheng
2016-08-17 7:15 ` [PATCH 13/15] aoeblk: " Fam Zheng
2016-08-17 7:15 ` [PATCH 14/15] axonram: " Fam Zheng
2016-08-17 7:15 ` [PATCH 15/15] block: Add FIXME comment to handle device_add_disk error Fam Zheng
2016-08-18 2:36 ` Sergey Senozhatsky
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=1471418115-3654-10-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=axboe@kernel.dk \
--cc=benh@kernel.crashing.org \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=ed.cashin@acm.org \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=minchan@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=mst@redhat.com \
--cc=ngupta@vflare.org \
--cc=paulus@samba.org \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=virtualization@lists.linux-foundation.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).