From: Hannes Reinecke <hare@suse.de>
To: Phil Pemberton <philpem@philpem.me.uk>,
linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Damien Le Moal <dlemoal@kernel.org>,
Niklas Cassel <cassel@kernel.org>,
"James E . J . Bottomley" <James.Bottomley@HansenPartnership.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>
Subject: Re: [PATCH v6 2/6] ata: libata-scsi: convert dev->sdev to per-LUN array
Date: Tue, 9 Jun 2026 09:22:42 +0200 [thread overview]
Message-ID: <fb133176-358a-4908-85b0-a75edad582af@suse.de> (raw)
In-Reply-To: <20260608213443.2296614-3-philpem@philpem.me.uk>
On 6/8/26 23:34, Phil Pemberton wrote:
> Multi-LUN ATAPI devices (PD/CD combos, CD changers) share a single
> ata_device but expose multiple scsi_devices. The previous single
> dev->sdev pointer could only track one LUN, making all other LUNs
> invisible to code that operates on sdevs: port detach, suspend/resume,
> ACPI uevent, ZPODD, media change notification, and EH teardown.
>
> Replace the scalar struct scsi_device *sdev with a fixed-size array
> dev->sdev[ATAPI_MAX_LUN] indexed by LUN number, where ATAPI_MAX_LUN
> is 8 (the SCSI-2 ceiling, LUN values 0..7). Add a companion field
> dev->nr_luns recording the number of valid entries -- defaults to 1
> during ata_dev_init() and is bumped during multi-LUN probe -- so the
> common single-LUN case iterates one slot, not eight.
>
> Add an inline helper ata_dev_scsi_device(dev, lun) that returns
> dev->sdev[lun] guarded by a WARN_ON_ONCE(lun >= dev->nr_luns) bounds
> check. Use it for the hardcoded LUN-0 references in libata-acpi
> (uevent kobj), libata-zpodd (disk events, wake notify), and the
> door-lock and OF-node paths in libata-scsi.
>
> Key changes per call site:
> - ata_scsi_dev_config: assign sdev to dev->sdev[sdev->lun]
> - ata_scsi_sdev_destroy: clear dev->sdev[sdev->lun]; only trigger
> ATA-level detach when LUN 0 is destroyed, since removing a higher
> LUN should not tear down the underlying ATA device
> - ata_port_detach: iterate dev->nr_luns slots (high->low)
> - ata_scsi_offline_dev: iterate dev->nr_luns slots
> - ata_scsi_remove_dev: snapshot and remove all LUN slots, then
> scsi_remove_device each one outside the lock
> - ata_scsi_media_change_notify: send event to all populated LUNs
> - ata_scsi_dev_rescan: resume and rescan each populated LUN
> - ACPI, ZPODD, ofnode, door-lock: use ata_dev_scsi_device(dev, 0)
>
> For single-LUN devices (the vast majority) only dev->sdev[0] is ever
> populated and dev->nr_luns stays at 1, so existing call paths see no
> change in behaviour.
>
> Signed-off-by: Phil Pemberton <philpem@philpem.me.uk>
> ---
> drivers/ata/libata-acpi.c | 6 +-
> drivers/ata/libata-core.c | 11 ++-
> drivers/ata/libata-scsi.c | 151 +++++++++++++++++++------------------
> drivers/ata/libata-zpodd.c | 6 +-
> include/linux/libata.h | 11 ++-
> 5 files changed, 103 insertions(+), 82 deletions(-)
>
> diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
> index 4433f626246b..8af35d0b1053 100644
> --- a/drivers/ata/libata-acpi.c
> +++ b/drivers/ata/libata-acpi.c
> @@ -153,8 +153,10 @@ static void ata_acpi_uevent(struct ata_port *ap, struct ata_device *dev,
> char *envp[] = { event_string, NULL };
>
> if (dev) {
> - if (dev->sdev)
> - kobj = &dev->sdev->sdev_gendev.kobj;
> + struct scsi_device *sdev = ata_dev_scsi_device(dev, 0);
> +
> + if (sdev)
> + kobj = &sdev->sdev_gendev.kobj;
> } else
> kobj = &ap->dev->kobj;
>
> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
> index 4408b1fb48c7..1cb159d9dbc7 100644
> --- a/drivers/ata/libata-core.c
> +++ b/drivers/ata/libata-core.c
> @@ -5564,6 +5564,7 @@ void ata_dev_init(struct ata_device *dev)
> dev->pio_mask = UINT_MAX;
> dev->mwdma_mask = UINT_MAX;
> dev->udma_mask = UINT_MAX;
> + dev->nr_luns = 1;
> }
>
> /**
> @@ -6275,11 +6276,15 @@ static void ata_port_detach(struct ata_port *ap)
> /* Remove scsi devices */
> ata_for_each_link(link, ap, HOST_FIRST) {
> ata_for_each_dev(dev, link, ALL) {
> - if (dev->sdev) {
> + int lun;
> +
> + for (lun = dev->nr_luns - 1; lun >= 0; lun--) {
> + if (!dev->sdev[lun])
> + continue;
> spin_unlock_irqrestore(ap->lock, flags);
> - scsi_remove_device(dev->sdev);
> + scsi_remove_device(dev->sdev[lun]);
> spin_lock_irqsave(ap->lock, flags);
> - dev->sdev = NULL;
> + dev->sdev[lun] = NULL;
As pointed out by sashiko, this is racy.
Please move 'dev->sdev[lun] = NULL' before unlock, and hold
'sdev' in a temporary variable.
Maybe even make this a separate patch, then this patch can be kept
as just the interface change.
> }
> }
> }
> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
> index 32c6a0e497cf..7c3d31dc49a1 100644
> --- a/drivers/ata/libata-scsi.c
> +++ b/drivers/ata/libata-scsi.c
> @@ -1131,7 +1131,7 @@ int ata_scsi_dev_config(struct scsi_device *sdev, struct queue_limits *lim,
> if (dev->flags & ATA_DFLAG_TRUSTED)
> sdev->security_supported = 1;
>
> - dev->sdev = sdev;
> + dev->sdev[sdev->lun] = sdev;
> return 0;
> }
>
> @@ -1202,10 +1202,10 @@ EXPORT_SYMBOL_GPL(ata_scsi_sdev_configure);
> *
> * @sdev is about to be destroyed for hot/warm unplugging. If
> * this unplugging was initiated by libata as indicated by NULL
> - * dev->sdev, this function doesn't have to do anything.
> + * dev->sdev[], this function doesn't have to do anything.
> * Otherwise, SCSI layer initiated warm-unplug is in progress.
> - * Clear dev->sdev, schedule the device for ATA detach and invoke
> - * EH.
> + * Clear the per-LUN slot; when the last LUN (LUN 0) is destroyed,
> + * schedule ATA-level detach via EH.
> *
> * LOCKING:
> * Defined by SCSI layer. We don't really care.
> @@ -1220,11 +1220,12 @@ void ata_scsi_sdev_destroy(struct scsi_device *sdev)
>
> spin_lock_irqsave(ap->lock, flags);
> dev = __ata_scsi_find_dev(ap, sdev);
> - if (dev && dev->sdev) {
> - /* SCSI device already in CANCEL state, no need to offline it */
> - dev->sdev = NULL;
> - dev->flags |= ATA_DFLAG_DETACH;
> - ata_port_schedule_eh(ap);
> + if (dev && dev->sdev[sdev->lun] == sdev) {
> + dev->sdev[sdev->lun] = NULL;
> + if (sdev->lun == 0) {
> + dev->flags |= ATA_DFLAG_DETACH;
> + ata_port_schedule_eh(ap);
> + }
> }
> spin_unlock_irqrestore(ap->lock, flags);
>
> @@ -2911,10 +2912,15 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)
> * avoid this infinite loop.
> *
> * This may happen before SCSI scan is complete. Make
> - * sure qc->dev->sdev isn't NULL before dereferencing.
> + * sure the LUN-0 sdev isn't NULL before dereferencing.
> */
> - if (qc->cdb[0] == ALLOW_MEDIUM_REMOVAL && qc->dev->sdev)
> - qc->dev->sdev->locked = 0;
> + if (qc->cdb[0] == ALLOW_MEDIUM_REMOVAL) {
> + struct scsi_device *sdev =
> + ata_dev_scsi_device(qc->dev, 0);
> +
> + if (sdev)
> + sdev->locked = 0;
> + }
>
> ata_scsi_qc_done(qc, true, SAM_STAT_CHECK_CONDITION);
> return;
> @@ -4658,7 +4664,7 @@ int ata_scsi_add_hosts(struct ata_host *host, const struct scsi_host_template *s
> #ifdef CONFIG_OF
> static void ata_scsi_assign_ofnode(struct ata_device *dev, struct ata_port *ap)
> {
> - struct scsi_device *sdev = dev->sdev;
> + struct scsi_device *sdev = ata_dev_scsi_device(dev, 0);
> struct device *d = ap->host->dev;
> struct device_node *np = d->of_node;
> struct device_node *child;
> @@ -4696,7 +4702,7 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)
> struct scsi_device *sdev;
> int channel = 0, id = 0;
>
> - if (dev->sdev)
> + if (dev->sdev[0])
> continue;
>
> if (ata_is_host_link(link))
> @@ -4707,11 +4713,11 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)
> sdev = __scsi_add_device(ap->scsi_host, channel, id, 0,
> NULL);
> if (!IS_ERR(sdev)) {
> - dev->sdev = sdev;
> + dev->sdev[0] = sdev;
> ata_scsi_assign_ofnode(dev, ap);
> scsi_device_put(sdev);
> } else {
> - dev->sdev = NULL;
> + dev->sdev[0] = NULL;
> }
> }
> }
> @@ -4722,7 +4728,7 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)
> */
> ata_for_each_link(link, ap, EDGE) {
> ata_for_each_dev(dev, link, ENABLED) {
> - if (!dev->sdev)
> + if (!dev->sdev[0])
> goto exit_loop;
> }
> }
> @@ -4763,7 +4769,7 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)
> *
> * This function is called from ata_eh_detach_dev() and is responsible for
> * taking the SCSI device attached to @dev offline. This function is
> - * called with host lock which protects dev->sdev against clearing.
> + * called with host lock which protects dev->sdev[] against clearing.
> *
> * LOCKING:
> * spin_lock_irqsave(host lock)
> @@ -4773,11 +4779,16 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)
> */
> bool ata_scsi_offline_dev(struct ata_device *dev)
> {
> - if (dev->sdev) {
> - scsi_device_set_state(dev->sdev, SDEV_OFFLINE);
> - return true;
> + bool found = false;
> + int lun;
> +
> + for (lun = dev->nr_luns - 1; lun >= 0; lun--) {
> + if (dev->sdev[lun]) {
> + scsi_device_set_state(dev->sdev[lun], SDEV_OFFLINE);
> + found = true;
> + }
> }
> - return false;
> + return found;
> }
>
> /**
> @@ -4793,49 +4804,38 @@ bool ata_scsi_offline_dev(struct ata_device *dev)
> static void ata_scsi_remove_dev(struct ata_device *dev)
> {
> struct ata_port *ap = dev->link->ap;
> - struct scsi_device *sdev;
> + struct scsi_device *sdevs[ATAPI_MAX_LUN] = {};
> unsigned long flags;
> + int lun;
>
> - /* Alas, we need to grab scan_mutex to ensure SCSI device
> - * state doesn't change underneath us and thus
> - * scsi_device_get() always succeeds. The mutex locking can
> - * be removed if there is __scsi_device_get() interface which
> - * increments reference counts regardless of device state.
> - */
> mutex_lock(&ap->scsi_host->scan_mutex);
> spin_lock_irqsave(ap->lock, flags);
>
> - /* clearing dev->sdev is protected by host lock */
> - sdev = dev->sdev;
> - dev->sdev = NULL;
> + for (lun = dev->nr_luns - 1; lun >= 0; lun--) {
> + struct scsi_device *sdev = dev->sdev[lun];
> +
> + dev->sdev[lun] = NULL;
> + if (!sdev)
> + continue;
>
> - if (sdev) {
> - /* If user initiated unplug races with us, sdev can go
> - * away underneath us after the host lock and
> - * scan_mutex are released. Hold onto it.
> - */
> if (scsi_device_get(sdev) == 0) {
> - /* The following ensures the attached sdev is
> - * offline on return from ata_scsi_offline_dev()
> - * regardless it wins or loses the race
> - * against this function.
> - */
> scsi_device_set_state(sdev, SDEV_OFFLINE);
> + sdevs[lun] = sdev;
> } else {
> WARN_ON(1);
> - sdev = NULL;
> }
> }
>
> spin_unlock_irqrestore(ap->lock, flags);
> mutex_unlock(&ap->scsi_host->scan_mutex);
>
> - if (sdev) {
> + for (lun = dev->nr_luns - 1; lun >= 0; lun--) {
> + if (!sdevs[lun])
> + continue;
> ata_dev_info(dev, "detaching (SCSI %s)\n",
> - dev_name(&sdev->sdev_gendev));
> -
> - scsi_remove_device(sdev);
> - scsi_device_put(sdev);
> + dev_name(&sdevs[lun]->sdev_gendev));
> + scsi_remove_device(sdevs[lun]);
> + scsi_device_put(sdevs[lun]);
> }> }
>
Wouldn't it be simpler to have another mutex under 'dev' to protect
'dev->sdev[]' ?
That would get us out of this mess, and we could do away with the
temporary adev array.
> @@ -4872,9 +4872,12 @@ static void ata_scsi_handle_link_detach(struct ata_link *link)
> */
> void ata_scsi_media_change_notify(struct ata_device *dev)
> {
> - if (dev->sdev)
> - sdev_evt_send_simple(dev->sdev, SDEV_EVT_MEDIA_CHANGE,
> - GFP_ATOMIC);
> + int lun;
> +
> + for (lun = 0; lun < dev->nr_luns; lun++)
> + if (dev->sdev[lun])
> + sdev_evt_send_simple(dev->sdev[lun],
> + SDEV_EVT_MEDIA_CHANGE, GFP_ATOMIC);
> }
I guess the iteration need to be protected somehow, either by
taking 'ap->lock' or with the dedicated mutex from the above
comments.
>
> /**
> @@ -5007,37 +5010,39 @@ void ata_scsi_dev_rescan(struct work_struct *work)
>
> ata_for_each_link(link, ap, EDGE) {
> ata_for_each_dev(dev, link, ENABLED) {
> - struct scsi_device *sdev = dev->sdev;
> + int lun;
>
> - /*
> - * If the port was suspended before this was scheduled,
> - * bail out.
> - */
> if (ap->pflags & ATA_PFLAG_SUSPENDED)
> goto unlock_ap;
>
> - if (!sdev)
> - continue;
> - if (scsi_device_get(sdev))
> - continue;
> -
> do_resume = dev->flags & ATA_DFLAG_RESUMING;
>
> - spin_unlock_irqrestore(ap->lock, flags);
> - if (do_resume) {
> - ret = scsi_resume_device(sdev);
> - if (ret == -EWOULDBLOCK) {
> - scsi_device_put(sdev);
> - goto unlock_scan;
> + for (lun = 0; lun < dev->nr_luns; lun++) {
> + struct scsi_device *sdev = dev->sdev[lun];
> +
> + if (!sdev)
> + continue;
> + if (scsi_device_get(sdev))
> + continue;
> +
> + spin_unlock_irqrestore(ap->lock, flags);
> + if (do_resume) {
> + ret = scsi_resume_device(sdev);
> + if (ret == -EWOULDBLOCK) {
> + scsi_device_put(sdev);
> + goto unlock_scan;
> + }
> }> - dev->flags &= ~ATA_DFLAG_RESUMING;
> + ret = scsi_rescan_device(sdev);
> + scsi_device_put(sdev);
> + spin_lock_irqsave(ap->lock, flags);
> +
> + if (ret)
> + goto unlock_ap;
> }
> - ret = scsi_rescan_device(sdev);
> - scsi_device_put(sdev);
> - spin_lock_irqsave(ap->lock, flags);
>
> - if (ret)
> - goto unlock_ap;
> + if (do_resume)
> + dev->flags &= ~ATA_DFLAG_RESUMING;
> }
> }
>
> diff --git a/drivers/ata/libata-zpodd.c b/drivers/ata/libata-zpodd.c
> index 414e7c63bd85..dca774d8ec05 100644
> --- a/drivers/ata/libata-zpodd.c
> +++ b/drivers/ata/libata-zpodd.c
> @@ -185,7 +185,7 @@ void zpodd_enable_run_wake(struct ata_device *dev)
> {
> struct zpodd *zpodd = dev->zpodd;
>
> - sdev_disable_disk_events(dev->sdev);
> + sdev_disable_disk_events(ata_dev_scsi_device(dev, 0));
I _think_ we should call this for every LUN.
>
> zpodd->powered_off = true;
> acpi_pm_set_device_wakeup(&dev->tdev, true);
> @@ -233,14 +233,14 @@ void zpodd_post_poweron(struct ata_device *dev)
> zpodd->zp_sampled = false;
> zpodd->zp_ready = false;
>
> - sdev_enable_disk_events(dev->sdev);
> + sdev_enable_disk_events(ata_dev_scsi_device(dev, 0));
Same here.
> }
>
> static void zpodd_wake_dev(acpi_handle handle, u32 event, void *context)
> {
> struct ata_device *ata_dev = context;
> struct zpodd *zpodd = ata_dev->zpodd;
> - struct device *dev = &ata_dev->sdev->sdev_gendev;
> + struct device *dev = &ata_dev_scsi_device(ata_dev, 0)->sdev_gendev;
And here.
>
> if (event == ACPI_NOTIFY_DEVICE_WAKE && pm_runtime_suspended(dev)) {
> zpodd->from_notify = true;
> diff --git a/include/linux/libata.h b/include/linux/libata.h
> index 3e33ee30628d..5db8a2e3f051 100644
> --- a/include/linux/libata.h
> +++ b/include/linux/libata.h
> @@ -722,7 +722,8 @@ struct ata_device {
> unsigned int devno; /* 0 or 1 */
> u64 quirks; /* List of broken features */
> unsigned long flags; /* ATA_DFLAG_xxx */
> - struct scsi_device *sdev; /* attached SCSI device */
> + struct scsi_device *sdev[ATAPI_MAX_LUN]; /* per-LUN SCSI devices */
> + unsigned int nr_luns; /* valid entries in sdev[] */
> void *private_data;
> #ifdef CONFIG_ATA_ACPI
> union acpi_object *gtf_cache;
> @@ -1715,6 +1716,14 @@ static inline unsigned int ata_dev_absent(const struct ata_device *dev)
> return ata_class_absent(dev->class);
> }
>
> +static inline struct scsi_device *
> +ata_dev_scsi_device(struct ata_device *dev, unsigned int lun)
> +{
> + if (WARN_ON_ONCE(lun >= dev->nr_luns))
> + return NULL;
> + return dev->sdev[lun];
> +}
> +
> /*
> * link helpers
> */
Cheers,
Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
hare@suse.de +49 911 74053 688
SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg
HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich
next prev parent reply other threads:[~2026-06-09 7:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-08 21:34 [PATCH v6 0/6] ata: libata-scsi: multi-LUN ATAPI device support Phil Pemberton
2026-06-08 21:34 ` [PATCH v6 1/6] ata: libata-scsi: add atapi_max_lun module parameter Phil Pemberton
2026-06-08 21:34 ` [PATCH v6 2/6] ata: libata-scsi: convert dev->sdev to per-LUN array Phil Pemberton
2026-06-09 7:22 ` Hannes Reinecke [this message]
2026-06-10 23:14 ` Phil Pemberton
2026-06-08 21:34 ` [PATCH v6 3/6] ata: libata-scsi: route non-zero LUN commands for multi-LUN ATAPI Phil Pemberton
2026-06-09 7:24 ` Hannes Reinecke
2026-06-08 21:34 ` [PATCH v6 4/6] scsi: add BLIST_NO_LUN_1F blacklist flag Phil Pemberton
2026-06-09 7:24 ` Hannes Reinecke
2026-06-16 1:09 ` Martin K. Petersen
2026-06-17 12:23 ` Niklas Cassel
2026-06-08 21:34 ` [PATCH v6 5/6] ata: libata-scsi: probe additional LUNs for multi-LUN ATAPI devices Phil Pemberton
2026-06-09 7:25 ` Hannes Reinecke
2026-06-08 21:34 ` [PATCH v6 6/6] scsi: scsi_devinfo: add COMPAQ PD-1 multi-LUN ATAPI device quirk Phil Pemberton
2026-06-16 1:08 ` Martin K. Petersen
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=fb133176-358a-4908-85b0-a75edad582af@suse.de \
--to=hare@suse.de \
--cc=James.Bottomley@HansenPartnership.com \
--cc=cassel@kernel.org \
--cc=dlemoal@kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=philpem@philpem.me.uk \
/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
all inboxes | Powered by JetHome®