| Message ID | 20240307214418.3812290-3-ipylypiv@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | NCQ Priority sysfs sttributes for libsas | expand |
On Thu, Mar 07, 2024 at 01:44:13PM -0800, Igor Pylypiv wrote: > Libata sysfs attributes cannot be used for libsas managed SATA devices > because the ata_port location is different for libsas. > > Defined sysfs attributes (visible for SATA devices only): > - /sys/block/sda/device/ncq_prio_enable > - /sys/block/sda/device/ncq_prio_supported > > The newly defined attributes will pass the correct ata_port to libata > helper functions. > > Reviewed-by: John Garry <john.g.garry@oracle.com> > Reviewed-by: Damien Le Moal <dlemoal@kernel.org> > Reviewed-by: Jason Yan <yanaijie@huawei.com> > Signed-off-by: Igor Pylypiv <ipylypiv@google.com> > --- Reviewed-by: Niklas Cassel <cassel@kernel.org>
Hi Igor, On Thu, Mar 7, 2024 at 10:55 PM Igor Pylypiv <ipylypiv@google.com> wrote: > Libata sysfs attributes cannot be used for libsas managed SATA devices > because the ata_port location is different for libsas. > > Defined sysfs attributes (visible for SATA devices only): > - /sys/block/sda/device/ncq_prio_enable > - /sys/block/sda/device/ncq_prio_supported > > The newly defined attributes will pass the correct ata_port to libata > helper functions. > > Reviewed-by: John Garry <john.g.garry@oracle.com> > Reviewed-by: Damien Le Moal <dlemoal@kernel.org> > Reviewed-by: Jason Yan <yanaijie@huawei.com> > Signed-off-by: Igor Pylypiv <ipylypiv@google.com> Thanks for your patch, which is now commit b4d3ddd2df7531e3 ("scsi: libsas: Define NCQ Priority sysfs attributes for SATA devices") in scsi-mkp/for-next > --- a/drivers/scsi/libsas/sas_ata.c > +++ b/drivers/scsi/libsas/sas_ata.c > + > +DEVICE_ATTR(ncq_prio_supported, S_IRUGO, sas_ncq_prio_supported_show, NULL); > + [...] > + > +DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR, > + sas_ncq_prio_enable_show, sas_ncq_prio_enable_store); > + When both CONFIG_SCSI_SAS_ATA and CONFIG_SATA_HOST are enabled: aarch64-linux-gnu-ld: drivers/ata/libata-sata.o:(.data+0x110): multiple definition of `dev_attr_ncq_prio_supported'; drivers/scsi/libsas/sas_ata.o:(.data+0x260): first defined here aarch64-linux-gnu-ld: drivers/ata/libata-sata.o:(.data+0xd8): multiple definition of `dev_attr_ncq_prio_enable'; drivers/scsi/libsas/sas_ata.o:(.data+0x228): first defined here Making both new DEVICE_ATTR() declarations static doesn't work, as <linux/libata.h> contains a forward declaration for the existing global dev_attr_ncq_prio_supported in libata: In file included from include/linux/async.h:14, from drivers/scsi/libsas/sas_ata.c:12: include/linux/device.h:156:33: error: static declaration of ‘dev_attr_ncq_prio_supported’ follows non-static declaration 156 | struct device_attribute dev_attr_##_name = __ATTR(_name, _mode, _show, _store) | ^~~~~~~~~ drivers/scsi/libsas/sas_ata.c:984:8: note: in expansion of macro ‘DEVICE_ATTR’ 984 | static DEVICE_ATTR(ncq_prio_supported, S_IRUGO, sas_ncq_prio_supported_show, | ^~~~~~~~~~~ In file included from include/scsi/sas_ata.h:13, from drivers/scsi/libsas/sas_ata.c:15: include/linux/libata.h:508:32: note: previous declaration of ‘dev_attr_ncq_prio_supported’ with type ‘struct device_attribute’ 508 | extern struct device_attribute dev_attr_ncq_prio_supported; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from include/linux/async.h:14, from drivers/scsi/libsas/sas_ata.c:12: include/linux/device.h:156:33: error: static declaration of ‘dev_attr_ncq_prio_enable’ follows non-static declaration 156 | struct device_attribute dev_attr_##_name = __ATTR(_name, _mode, _show, _store) | ^~~~~~~~~ drivers/scsi/libsas/sas_ata.c:1023:8: note: in expansion of macro ‘DEVICE_ATTR’ 1023 | static DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR, | ^~~~~~~~~~~ In file included from include/scsi/sas_ata.h:13, from drivers/scsi/libsas/sas_ata.c:15: include/linux/libata.h:509:32: note: previous declaration of ‘dev_attr_ncq_prio_enable’ with type ‘struct device_attribute’ 509 | extern struct device_attribute dev_attr_ncq_prio_enable; | ^~~~~~~~~~~~~~~~~~~~~~~~ Perhaps the new attributes can be renamed? Alternatively, the DEVICE_ATTR() can be open-coded, so the actual device_attribute structures are named differently. Gr{oetje,eeting}s, Geert
On 3/26/24 18:53, Geert Uytterhoeven wrote: > Hi Igor, > > On Thu, Mar 7, 2024 at 10:55 PM Igor Pylypiv <ipylypiv@google.com> wrote: >> Libata sysfs attributes cannot be used for libsas managed SATA devices >> because the ata_port location is different for libsas. >> >> Defined sysfs attributes (visible for SATA devices only): >> - /sys/block/sda/device/ncq_prio_enable >> - /sys/block/sda/device/ncq_prio_supported >> >> The newly defined attributes will pass the correct ata_port to libata >> helper functions. >> >> Reviewed-by: John Garry <john.g.garry@oracle.com> >> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> >> Reviewed-by: Jason Yan <yanaijie@huawei.com> >> Signed-off-by: Igor Pylypiv <ipylypiv@google.com> > > Thanks for your patch, which is now commit b4d3ddd2df7531e3 ("scsi: > libsas: Define NCQ Priority sysfs attributes for SATA devices") > in scsi-mkp/for-next > >> --- a/drivers/scsi/libsas/sas_ata.c >> +++ b/drivers/scsi/libsas/sas_ata.c > >> + >> +DEVICE_ATTR(ncq_prio_supported, S_IRUGO, sas_ncq_prio_supported_show, NULL); >> + > > [...] > >> + >> +DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR, >> + sas_ncq_prio_enable_show, sas_ncq_prio_enable_store); >> + > > When both CONFIG_SCSI_SAS_ATA and CONFIG_SATA_HOST are enabled: > > aarch64-linux-gnu-ld: drivers/ata/libata-sata.o:(.data+0x110): > multiple definition of `dev_attr_ncq_prio_supported'; > drivers/scsi/libsas/sas_ata.o:(.data+0x260): first defined here > aarch64-linux-gnu-ld: drivers/ata/libata-sata.o:(.data+0xd8): multiple > definition of `dev_attr_ncq_prio_enable'; > drivers/scsi/libsas/sas_ata.o:(.data+0x228): first defined here > > Making both new DEVICE_ATTR() declarations static doesn't work, > as <linux/libata.h> contains a forward declaration for the existing global > dev_attr_ncq_prio_supported in libata: > > In file included from include/linux/async.h:14, > from drivers/scsi/libsas/sas_ata.c:12: > include/linux/device.h:156:33: error: static declaration of > ‘dev_attr_ncq_prio_supported’ follows non-static declaration > 156 | struct device_attribute dev_attr_##_name = > __ATTR(_name, _mode, _show, _store) > | ^~~~~~~~~ > drivers/scsi/libsas/sas_ata.c:984:8: note: in expansion of macro ‘DEVICE_ATTR’ > 984 | static DEVICE_ATTR(ncq_prio_supported, S_IRUGO, > sas_ncq_prio_supported_show, > | ^~~~~~~~~~~ > In file included from include/scsi/sas_ata.h:13, > from drivers/scsi/libsas/sas_ata.c:15: > include/linux/libata.h:508:32: note: previous declaration of > ‘dev_attr_ncq_prio_supported’ with type ‘struct device_attribute’ > 508 | extern struct device_attribute dev_attr_ncq_prio_supported; > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from include/linux/async.h:14, > from drivers/scsi/libsas/sas_ata.c:12: > include/linux/device.h:156:33: error: static declaration of > ‘dev_attr_ncq_prio_enable’ follows non-static declaration > 156 | struct device_attribute dev_attr_##_name = > __ATTR(_name, _mode, _show, _store) > | ^~~~~~~~~ > drivers/scsi/libsas/sas_ata.c:1023:8: note: in expansion of macro ‘DEVICE_ATTR’ > 1023 | static DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR, > | ^~~~~~~~~~~ > In file included from include/scsi/sas_ata.h:13, > from drivers/scsi/libsas/sas_ata.c:15: > include/linux/libata.h:509:32: note: previous declaration of > ‘dev_attr_ncq_prio_enable’ with type ‘struct device_attribute’ > 509 | extern struct device_attribute dev_attr_ncq_prio_enable; > | ^~~~~~~~~~~~~~~~~~~~~~~~ > > Perhaps the new attributes can be renamed? > Alternatively, the DEVICE_ATTR() can be open-coded, so the actual > device_attribute structures are named differently. I think we need to do that because I do not want the attribute name to change in sysfs as that creates hell for the user to control a feature that is identical beside the different transport (which the user should not care about). I will send something asap. > > Gr{oetje,eeting}s, > > Geert >
On 3/26/24 18:53, Geert Uytterhoeven wrote: > Hi Igor, > > On Thu, Mar 7, 2024 at 10:55 PM Igor Pylypiv <ipylypiv@google.com> wrote: >> Libata sysfs attributes cannot be used for libsas managed SATA devices >> because the ata_port location is different for libsas. >> >> Defined sysfs attributes (visible for SATA devices only): >> - /sys/block/sda/device/ncq_prio_enable >> - /sys/block/sda/device/ncq_prio_supported >> >> The newly defined attributes will pass the correct ata_port to libata >> helper functions. >> >> Reviewed-by: John Garry <john.g.garry@oracle.com> >> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> >> Reviewed-by: Jason Yan <yanaijie@huawei.com> >> Signed-off-by: Igor Pylypiv <ipylypiv@google.com> > > Thanks for your patch, which is now commit b4d3ddd2df7531e3 ("scsi: > libsas: Define NCQ Priority sysfs attributes for SATA devices") > in scsi-mkp/for-next > >> --- a/drivers/scsi/libsas/sas_ata.c >> +++ b/drivers/scsi/libsas/sas_ata.c > >> + >> +DEVICE_ATTR(ncq_prio_supported, S_IRUGO, sas_ncq_prio_supported_show, NULL); >> + > > [...] > >> + >> +DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR, >> + sas_ncq_prio_enable_show, sas_ncq_prio_enable_store); >> + > > When both CONFIG_SCSI_SAS_ATA and CONFIG_SATA_HOST are enabled: I have both enabled in my config and I do not see any issue. What is special with these on ARM ? > > aarch64-linux-gnu-ld: drivers/ata/libata-sata.o:(.data+0x110): > multiple definition of `dev_attr_ncq_prio_supported'; > drivers/scsi/libsas/sas_ata.o:(.data+0x260): first defined here > aarch64-linux-gnu-ld: drivers/ata/libata-sata.o:(.data+0xd8): multiple > definition of `dev_attr_ncq_prio_enable'; > drivers/scsi/libsas/sas_ata.o:(.data+0x228): first defined here > > Making both new DEVICE_ATTR() declarations static doesn't work, > as <linux/libata.h> contains a forward declaration for the existing global > dev_attr_ncq_prio_supported in libata: > > In file included from include/linux/async.h:14, > from drivers/scsi/libsas/sas_ata.c:12: > include/linux/device.h:156:33: error: static declaration of > ‘dev_attr_ncq_prio_supported’ follows non-static declaration > 156 | struct device_attribute dev_attr_##_name = > __ATTR(_name, _mode, _show, _store) > | ^~~~~~~~~ > drivers/scsi/libsas/sas_ata.c:984:8: note: in expansion of macro ‘DEVICE_ATTR’ > 984 | static DEVICE_ATTR(ncq_prio_supported, S_IRUGO, > sas_ncq_prio_supported_show, > | ^~~~~~~~~~~ > In file included from include/scsi/sas_ata.h:13, > from drivers/scsi/libsas/sas_ata.c:15: > include/linux/libata.h:508:32: note: previous declaration of > ‘dev_attr_ncq_prio_supported’ with type ‘struct device_attribute’ > 508 | extern struct device_attribute dev_attr_ncq_prio_supported; > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from include/linux/async.h:14, > from drivers/scsi/libsas/sas_ata.c:12: > include/linux/device.h:156:33: error: static declaration of > ‘dev_attr_ncq_prio_enable’ follows non-static declaration > 156 | struct device_attribute dev_attr_##_name = > __ATTR(_name, _mode, _show, _store) > | ^~~~~~~~~ > drivers/scsi/libsas/sas_ata.c:1023:8: note: in expansion of macro ‘DEVICE_ATTR’ > 1023 | static DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR, > | ^~~~~~~~~~~ > In file included from include/scsi/sas_ata.h:13, > from drivers/scsi/libsas/sas_ata.c:15: > include/linux/libata.h:509:32: note: previous declaration of > ‘dev_attr_ncq_prio_enable’ with type ‘struct device_attribute’ > 509 | extern struct device_attribute dev_attr_ncq_prio_enable; > | ^~~~~~~~~~~~~~~~~~~~~~~~ > > Perhaps the new attributes can be renamed? > Alternatively, the DEVICE_ATTR() can be open-coded, so the actual > device_attribute structures are named differently. > > Gr{oetje,eeting}s, > > Geert >
Hi Damien, On Tue, Mar 26, 2024 at 11:07 AM Damien Le Moal <dlemoal@kernel.org> wrote: > On 3/26/24 18:53, Geert Uytterhoeven wrote: > > On Thu, Mar 7, 2024 at 10:55 PM Igor Pylypiv <ipylypiv@google.com> wrote: > >> Libata sysfs attributes cannot be used for libsas managed SATA devices > >> because the ata_port location is different for libsas. > >> > >> Defined sysfs attributes (visible for SATA devices only): > >> - /sys/block/sda/device/ncq_prio_enable > >> - /sys/block/sda/device/ncq_prio_supported > >> > >> The newly defined attributes will pass the correct ata_port to libata > >> helper functions. > >> > >> Reviewed-by: John Garry <john.g.garry@oracle.com> > >> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> > >> Reviewed-by: Jason Yan <yanaijie@huawei.com> > >> Signed-off-by: Igor Pylypiv <ipylypiv@google.com> > > > > Thanks for your patch, which is now commit b4d3ddd2df7531e3 ("scsi: > > libsas: Define NCQ Priority sysfs attributes for SATA devices") > > in scsi-mkp/for-next > > > >> --- a/drivers/scsi/libsas/sas_ata.c > >> +++ b/drivers/scsi/libsas/sas_ata.c > > > >> + > >> +DEVICE_ATTR(ncq_prio_supported, S_IRUGO, sas_ncq_prio_supported_show, NULL); > >> + > > > > [...] > > > >> + > >> +DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR, > >> + sas_ncq_prio_enable_show, sas_ncq_prio_enable_store); > >> + > > > > When both CONFIG_SCSI_SAS_ATA and CONFIG_SATA_HOST are enabled: > > I have both enabled in my config and I do not see any issue. What is special > with these on ARM ? Modular or built-in? I have them built-in, and it fails on arm64 (with renesas_defconfig, which is not upstream). It also fails with shmobile_defconfig on arm32, after manually adding CONFIG_SCSI_SAS_LIBSAS=y and CONFIG_SCSI_SAS_ATA=y. Gr{oetje,eeting}s, Geert
On 3/26/24 19:16, Geert Uytterhoeven wrote: > Hi Damien, > > On Tue, Mar 26, 2024 at 11:07 AM Damien Le Moal <dlemoal@kernel.org> wrote: >> On 3/26/24 18:53, Geert Uytterhoeven wrote: >>> On Thu, Mar 7, 2024 at 10:55 PM Igor Pylypiv <ipylypiv@google.com> wrote: >>>> Libata sysfs attributes cannot be used for libsas managed SATA devices >>>> because the ata_port location is different for libsas. >>>> >>>> Defined sysfs attributes (visible for SATA devices only): >>>> - /sys/block/sda/device/ncq_prio_enable >>>> - /sys/block/sda/device/ncq_prio_supported >>>> >>>> The newly defined attributes will pass the correct ata_port to libata >>>> helper functions. >>>> >>>> Reviewed-by: John Garry <john.g.garry@oracle.com> >>>> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> >>>> Reviewed-by: Jason Yan <yanaijie@huawei.com> >>>> Signed-off-by: Igor Pylypiv <ipylypiv@google.com> >>> >>> Thanks for your patch, which is now commit b4d3ddd2df7531e3 ("scsi: >>> libsas: Define NCQ Priority sysfs attributes for SATA devices") >>> in scsi-mkp/for-next >>> >>>> --- a/drivers/scsi/libsas/sas_ata.c >>>> +++ b/drivers/scsi/libsas/sas_ata.c >>> >>>> + >>>> +DEVICE_ATTR(ncq_prio_supported, S_IRUGO, sas_ncq_prio_supported_show, NULL); >>>> + >>> >>> [...] >>> >>>> + >>>> +DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR, >>>> + sas_ncq_prio_enable_show, sas_ncq_prio_enable_store); >>>> + >>> >>> When both CONFIG_SCSI_SAS_ATA and CONFIG_SATA_HOST are enabled: >> >> I have both enabled in my config and I do not see any issue. What is special >> with these on ARM ? > > Modular or built-in? > I have them built-in, and it fails on arm64 (with renesas_defconfig, > which is not upstream). > It also fails with shmobile_defconfig on arm32, after manually adding > CONFIG_SCSI_SAS_LIBSAS=y and CONFIG_SCSI_SAS_ATA=y. Hmm... That must be it. I did a modular build. Will check that again and send a fix. Thanks.
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 12e2653846e3..b57c041a5544 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -964,3 +964,85 @@ int sas_execute_ata_cmd(struct domain_device *device, u8 *fis, int force_phy_id) force_phy_id, &tmf_task); } EXPORT_SYMBOL_GPL(sas_execute_ata_cmd); + +static ssize_t sas_ncq_prio_supported_show(struct device *device, + struct device_attribute *attr, + char *buf) +{ + struct scsi_device *sdev = to_scsi_device(device); + struct domain_device *ddev = sdev_to_domain_dev(sdev); + bool supported; + int rc; + + rc = ata_ncq_prio_supported(ddev->sata_dev.ap, sdev, &supported); + if (rc) + return rc; + + return sysfs_emit(buf, "%d\n", supported); +} + +DEVICE_ATTR(ncq_prio_supported, S_IRUGO, sas_ncq_prio_supported_show, NULL); + +static ssize_t sas_ncq_prio_enable_show(struct device *device, + struct device_attribute *attr, + char *buf) +{ + struct scsi_device *sdev = to_scsi_device(device); + struct domain_device *ddev = sdev_to_domain_dev(sdev); + bool enabled; + int rc; + + rc = ata_ncq_prio_enabled(ddev->sata_dev.ap, sdev, &enabled); + if (rc) + return rc; + + return sysfs_emit(buf, "%d\n", enabled); +} + +static ssize_t sas_ncq_prio_enable_store(struct device *device, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct scsi_device *sdev = to_scsi_device(device); + struct domain_device *ddev = sdev_to_domain_dev(sdev); + bool enable; + int rc; + + rc = kstrtobool(buf, &enable); + if (rc) + return rc; + + rc = ata_ncq_prio_enable(ddev->sata_dev.ap, sdev, enable); + if (rc) + return rc; + + return len; +} + +DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR, + sas_ncq_prio_enable_show, sas_ncq_prio_enable_store); + +static struct attribute *sas_ata_sdev_attrs[] = { + &dev_attr_ncq_prio_supported.attr, + &dev_attr_ncq_prio_enable.attr, + NULL +}; + +static umode_t sas_ata_attr_is_visible(struct kobject *kobj, + struct attribute *attr, int i) +{ + struct device *dev = kobj_to_dev(kobj); + struct scsi_device *sdev = to_scsi_device(dev); + struct domain_device *ddev = sdev_to_domain_dev(sdev); + + if (!dev_is_sata(ddev)) + return 0; + + return attr->mode; +} + +const struct attribute_group sas_ata_sdev_attr_group = { + .attrs = sas_ata_sdev_attrs, + .is_visible = sas_ata_attr_is_visible, +}; +EXPORT_SYMBOL_GPL(sas_ata_sdev_attr_group); diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h index 2f8c719840a6..92e27e7bf088 100644 --- a/include/scsi/sas_ata.h +++ b/include/scsi/sas_ata.h @@ -39,6 +39,9 @@ int smp_ata_check_ready_type(struct ata_link *link); int sas_discover_sata(struct domain_device *dev); int sas_ata_add_dev(struct domain_device *parent, struct ex_phy *phy, struct domain_device *child, int phy_id); + +extern const struct attribute_group sas_ata_sdev_attr_group; + #else static inline void sas_ata_disabled_notice(void) @@ -123,6 +126,9 @@ static inline int sas_ata_add_dev(struct domain_device *parent, struct ex_phy *p sas_ata_disabled_notice(); return -ENODEV; } + +#define sas_ata_sdev_attr_group ((struct attribute_group) {}) + #endif #endif /* _SAS_ATA_H_ */