From: Tony Asleson <tasleson@redhat.com> To: linux-block@vger.kernel.org, linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, b.zolnierkie@samsung.com, axboe@kernel.dk Subject: [v4 04/11] scsi: Add durable_name for dev_printk Date: Fri, 24 Jul 2020 12:16:59 -0500 Message-ID: <20200724171706.1550403-5-tasleson@redhat.com> (raw) In-Reply-To: <20200724171706.1550403-1-tasleson@redhat.com> Add the needed functions to fill out the durable_name function call back for scsi based storage devices. This allows calls into dev_printk for scsi devices to have a persistent id associated with them. Signed-off-by: Tony Asleson <tasleson@redhat.com> --- drivers/scsi/scsi_lib.c | 14 ++++++++++++++ drivers/scsi/scsi_sysfs.c | 23 +++++++++++++++++++++++ drivers/scsi/sd.c | 2 ++ include/scsi/scsi_device.h | 3 +++ 4 files changed, 42 insertions(+) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 06c260f6cdae..9f6c41162c55 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -3142,3 +3142,17 @@ int scsi_vpd_tpg_id(struct scsi_device *sdev, int *rel_id) return group_id; } EXPORT_SYMBOL(scsi_vpd_tpg_id); + +int scsi_durable_name(struct scsi_device *sdev, char *buf, size_t len) +{ + int vpd_len = 0; + + vpd_len = scsi_vpd_lun_id(sdev, buf, len); + if (vpd_len > 0 && vpd_len < len) + vpd_len++; + else + vpd_len = 0; + + return vpd_len; +} +EXPORT_SYMBOL(scsi_durable_name); diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 163dbcb741c1..f719b63f4b63 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1582,6 +1582,28 @@ static struct device_type scsi_dev_type = { .groups = scsi_sdev_attr_groups, }; + +int dev_to_scsi_durable_name(const struct device *dev, char *buf, size_t len) +{ + struct scsi_device *sd_dev = NULL; + + // When we go through dev_printk in the scsi layer, dev is embedded + // in a struct scsi_device. When we go through the block layer, + // dev is embedded in struct genhd, thus we need different paths to + // retrieve the struct scsi_device to call scsi_durable_name. + if (dev->type == &scsi_dev_type) { + sd_dev = to_scsi_device(dev); + } else if (dev->parent && dev->parent->type == &scsi_dev_type) { + sd_dev = to_scsi_device(dev->parent); + } else { + // We have a pointer to something else, bail + return 0; + } + + return scsi_durable_name(sd_dev, buf, len); +} +EXPORT_SYMBOL(dev_to_scsi_durable_name); + void scsi_sysfs_device_initialize(struct scsi_device *sdev) { unsigned long flags; @@ -1591,6 +1613,7 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev) device_initialize(&sdev->sdev_gendev); sdev->sdev_gendev.bus = &scsi_bus_type; sdev->sdev_gendev.type = &scsi_dev_type; + sdev->sdev_gendev.durable_name = dev_to_scsi_durable_name; dev_set_name(&sdev->sdev_gendev, "%d:%d:%d:%llu", sdev->host->host_no, sdev->channel, sdev->id, sdev->lun); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index a793cb08d025..f40e4cb4a5f6 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3360,6 +3360,8 @@ static int sd_probe(struct device *dev) gd->private_data = &sdkp->driver; gd->queue = sdkp->device->request_queue; + disk_to_dev(gd)->durable_name = dev_to_scsi_durable_name; + /* defaults, until the device tells us otherwise */ sdp->sector_size = 512; sdkp->capacity = 0; diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index c3cba2aaf934..7be5861565f7 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -461,6 +461,9 @@ extern void sdev_disable_disk_events(struct scsi_device *sdev); extern void sdev_enable_disk_events(struct scsi_device *sdev); extern int scsi_vpd_lun_id(struct scsi_device *, char *, size_t); extern int scsi_vpd_tpg_id(struct scsi_device *, int *); +extern int dev_to_scsi_durable_name(const struct device *dev, char *buf, + size_t len); +extern int scsi_durable_name(struct scsi_device *sdev, char *buf, size_t len); #ifdef CONFIG_PM extern int scsi_autopm_get_device(struct scsi_device *); -- 2.26.2
next prev parent reply index Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-24 17:16 [v4 00/11] Add persistent durable identifier to storage log messages Tony Asleson 2020-07-24 17:16 ` [v4 01/11] struct device: Add function callback durable_name Tony Asleson 2020-07-24 17:16 ` [v4 02/11] create_syslog_header: Add durable name Tony Asleson 2020-07-24 17:16 ` [v4 03/11] dev_vprintk_emit: Increase hdr size Tony Asleson 2020-07-25 10:05 ` Andy Shevchenko 2020-08-26 18:26 ` Tony Asleson 2020-07-24 17:16 ` Tony Asleson [this message] 2020-07-25 10:20 ` [v4 04/11] scsi: Add durable_name for dev_printk Andy Shevchenko 2020-07-24 17:17 ` [v4 05/11] nvme: Add durable name " Tony Asleson 2020-07-25 9:05 ` Sergei Shtylyov 2020-07-25 10:23 ` Andy Shevchenko 2020-07-24 17:17 ` [v4 06/11] libata: Add ata_scsi_durable_name Tony Asleson 2020-07-25 0:48 ` kernel test robot 2020-07-25 1:07 ` kernel test robot 2020-07-25 1:07 ` [RFC PATCH] libata: ata_scsi_durable_name() can be static kernel test robot 2020-07-25 1:18 ` [v4 06/11] libata: Add ata_scsi_durable_name kernel test robot 2020-07-25 10:26 ` Andy Shevchenko 2020-07-24 17:17 ` [v4 07/11] Add durable_name_printk Tony Asleson 2020-07-24 17:17 ` [v4 08/11] libata: use durable_name_printk Tony Asleson 2020-07-24 17:17 ` [v4 09/11] Add durable_name_printk_ratelimited Tony Asleson 2020-07-24 17:17 ` [v4 10/11] print_req_error: Use durable_name_printk_ratelimited Tony Asleson 2020-07-25 9:15 ` Sergei Shtylyov 2020-07-24 17:17 ` [v4 11/11] buffer_io_error: " Tony Asleson 2020-07-25 10:29 ` Andy Shevchenko 2020-07-26 15:10 ` [v4 00/11] Add persistent durable identifier to storage log messages Christoph Hellwig 2020-07-27 15:45 ` Tony Asleson 2020-07-27 16:46 ` Hannes Reinecke 2020-07-27 17:42 ` Tony Asleson 2020-07-27 19:17 ` Douglas Gilbert 2020-07-27 20:27 ` Tony Asleson
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=20200724171706.1550403-5-tasleson@redhat.com \ --to=tasleson@redhat.com \ --cc=axboe@kernel.dk \ --cc=b.zolnierkie@samsung.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-ide@vger.kernel.org \ --cc=linux-scsi@vger.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
Linux-ide Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-ide/0 linux-ide/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-ide linux-ide/ https://lore.kernel.org/linux-ide \ linux-ide@vger.kernel.org public-inbox-index linux-ide Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-ide AGPL code for this site: git clone https://public-inbox.org/public-inbox.git