scsi: zfcp: introduce sysfs interface for diagnostics of local SFP transceiver

This adds an interface to read the diagnostics of the local SFP transceiver
of an FCP-Channel from userspace. This comes in the form of new sysfs
entries that are attached to the CCW device representing the FCP
device. Each type of data gets its own sysfs entry; the whole collection of
entries is pooled into a new child-directory of the CCW device node:
"diagnostics".

Adds sysfs entries for:
 * sfp_invalid:    boolean value evaluating to whether the following 5
                   fields are invalid; {0, 1}; 1 - invalid
 * temperature:    transceiver temp.; unit 1/256°C;
                   range [-128°C, +128°C]
 * vcc:            supply voltage; unit 100μV; range [0, 6.55V]
 * tx_bias:        transmitter laser bias current; unit 2μA;
                   range [0, 131mA]
 * tx_power:       coupled TX output power; unit 0.1μW; range [0, 6.5mW]
 * rx_power:       received optical power; unit 0.1μW; range [0, 6.5mW]

 * optical_port:   boolean value evaluating to whether the FCP-Channel has
                   an optical port; {0, 1}; 1 - optical
 * fec_active:     boolean value evaluating to whether 16G FEC is active;
                   {0, 1}; 1 - active
 * port_tx_type:   nibble describing the port type; {0, 1, 2, 3};
                   0 - unknown,             1 - short wave,
                   2 - long wave LC 1310nm, 3 - long wave LL 1550nm
 * connector_type: two bits describing the connector type; {0, 1};
                   0 - unknown,             1 - SFP+

This is only supported if the FCP-Channel in turn supports reporting the
SFP Diagnostic Data, otherwise read() on these new entries will return
EOPNOTSUPP (this affects only adapters older than FICON Express8S, on
Mainframe generations older than z14). Other possible errors for read()
include ENOLINK, ENODEV and ENOMEM.

With this patch the userspace-interface will only read data stored in
the corresponding "diagnostic buffer" (that was stored during completion
of an previous Exchange Port Data command). Implicit updating will
follow later in this series.

Link: https://lore.kernel.org/r/1f9cce7c829c881e7d71a3f10c5b57f3dd84ab32.1572018132.git.bblock@linux.ibm.com
Reviewed-by: Steffen Maier <maier@linux.ibm.com>
Signed-off-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index a19189d7b3f326e1fcbb01fafea6f305f3a801d0..09ec846fe01d90bbee09460c25818001d3201c96 100644 (file)
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -407,6 +407,9 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device)
                               &zfcp_sysfs_adapter_attrs))
                goto failed;
 
+       if (zfcp_diag_sysfs_setup(adapter))
+               goto failed;
+
        /* report size limit per scatter-gather segment */
        adapter->ccw_device->dev.dma_parms = &adapter->dma_parms;
 
@@ -431,6 +434,7 @@ void zfcp_adapter_unregister(struct zfcp_adapter *adapter)
 
        zfcp_fc_wka_ports_force_offline(adapter->gs);
        zfcp_scsi_adapter_unregister(adapter);
+       zfcp_diag_sysfs_destroy(adapter);
        sysfs_remove_group(&cdev->dev.kobj, &zfcp_sysfs_adapter_attrs);
 
        zfcp_erp_thread_kill(adapter);

diff --git a/drivers/s390/scsi/zfcp_diag.c b/drivers/s390/scsi/zfcp_diag.c
index d7d2db85b32e74d8d197ca2ae39bcd9eeb9860f7..8df3ace6135d87bab876f1928ac6aa8c87147c67 100644 (file)
--- a/drivers/s390/scsi/zfcp_diag.c
+++ b/drivers/s390/scsi/zfcp_diag.c
@@ -10,6 +10,8 @@
 #include <linux/spinlock.h>
 #include <linux/jiffies.h>
 #include <linux/string.h>
+#include <linux/kernfs.h>
+#include <linux/sysfs.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 
@@ -77,6 +79,46 @@ void zfcp_diag_adapter_free(struct zfcp_adapter *const adapter)
        adapter->diagnostics = NULL;
 }
 
+/**
+ * zfcp_diag_sysfs_setup() - Setup the sysfs-group for adapter-diagnostics.
+ * @adapter: target adapter to which the group should be added.
+ *
+ * Return: 0 on success; Something else otherwise (see sysfs_create_group()).
+ */
+int zfcp_diag_sysfs_setup(struct zfcp_adapter *const adapter)
+{
+       int rc = sysfs_create_group(&adapter->ccw_device->dev.kobj,
+                                   &zfcp_sysfs_diag_attr_group);
+       if (rc == 0)
+               adapter->diagnostics->sysfs_established = 1;
+
+       return rc;
+}
+
+/**
+ * zfcp_diag_sysfs_destroy() - Remove the sysfs-group for adapter-diagnostics.
+ * @adapter: target adapter from which the group should be removed.
+ */
+void zfcp_diag_sysfs_destroy(struct zfcp_adapter *const adapter)
+{
+       if (adapter->diagnostics == NULL ||
+           !adapter->diagnostics->sysfs_established)
+               return;
+
+       /*
+        * We need this state-handling so we can prevent warnings being printed
+        * on the kernel-console in case we have to abort a halfway done
+        * zfcp_adapter_enqueue(), in which the sysfs-group was not yet
+        * established. sysfs_remove_group() does this checking as well, but
+        * still prints a warning in case we try to remove a group that has not
+        * been established before
+        */
+       adapter->diagnostics->sysfs_established = 0;
+       sysfs_remove_group(&adapter->ccw_device->dev.kobj,
+                          &zfcp_sysfs_diag_attr_group);
+}
+
+
 /**
  * zfcp_diag_update_xdata() - Update a diagnostics buffer.
  * @hdr: the meta data to update.

diff --git a/drivers/s390/scsi/zfcp_diag.h b/drivers/s390/scsi/zfcp_diag.h
index a3eb21cc201d66ac5e6f17b76ea9cb9f1d332754..2deebccda17de102e1bee1e395af847c6d601f7f 100644 (file)
--- a/drivers/s390/scsi/zfcp_diag.h
+++ b/drivers/s390/scsi/zfcp_diag.h
@@ -40,6 +40,8 @@ struct zfcp_diag_header {
 /**
  * struct zfcp_diag_adapter - central storage for all diagnostics concerning an
  *                           adapter.
+ * @sysfs_established: flag showing that the associated sysfs-group was created
+ *                    during run of zfcp_adapter_enqueue().
  * @port_data: data retrieved using exchange port data.
  * @port_data.header: header with metadata for the cache in @port_data.data.
  * @port_data.data: cached QTCB Bottom of command exchange port data.
@@ -48,6 +50,8 @@ struct zfcp_diag_header {
  * @config_data.data: cached QTCB Bottom of command exchange config data.
  */
 struct zfcp_diag_adapter {
+       u64     sysfs_established       :1;
+
        struct {
                struct zfcp_diag_header         header;
                struct fsf_qtcb_bottom_port     data;
@@ -61,7 +65,21 @@ struct zfcp_diag_adapter {
 int zfcp_diag_adapter_setup(struct zfcp_adapter *const adapter);
 void zfcp_diag_adapter_free(struct zfcp_adapter *const adapter);
 
+int zfcp_diag_sysfs_setup(struct zfcp_adapter *const adapter);
+void zfcp_diag_sysfs_destroy(struct zfcp_adapter *const adapter);
+
 void zfcp_diag_update_xdata(struct zfcp_diag_header *const hdr,
                            const void *const data, const bool incomplete);
 
+/**
+ * zfcp_diag_support_sfp() - Return %true if the @adapter supports reporting
+ *                          SFP Data.
+ * @adapter: adapter to test the availability of SFP Data reporting for.
+ */
+static inline bool
+zfcp_diag_support_sfp(const struct zfcp_adapter *const adapter)
+{
+       return !!(adapter->adapter_features & FSF_FEATURE_REPORT_SFP_DATA);
+}
+
 #endif /* ZFCP_DIAG_H */

diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index 31e8a7240fd7eaaafad530fd8fa1700225c7cbad..c8556787cfdc9b6df3c0c91d02bcc5a682614261 100644 (file)
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -167,6 +167,7 @@ extern const struct attribute_group *zfcp_port_attr_groups[];
 extern struct mutex zfcp_sysfs_port_units_mutex;
 extern struct device_attribute *zfcp_sysfs_sdev_attrs[];
 extern struct device_attribute *zfcp_sysfs_shost_attrs[];
+extern const struct attribute_group zfcp_sysfs_diag_attr_group;
 bool zfcp_sysfs_port_is_removing(const struct zfcp_port *const port);
 
 /* zfcp_unit.c */

diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 90d851d49410344bde884bc0ed110d7a75010822..6c0cea71ae5da57cb34b8a6132a9f98b83e907b8 100644 (file)
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -11,6 +11,7 @@
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/slab.h>
+#include "zfcp_diag.h"
 #include "zfcp_ext.h"
 
 #define ZFCP_DEV_ATTR(_feat, _name, _mode, _show, _store) \
@@ -664,3 +665,73 @@ struct device_attribute *zfcp_sysfs_shost_attrs[] = {
        &dev_attr_queue_full,
        NULL
 };
+
+#define ZFCP_DEFINE_DIAG_SFP_ATTR(_name, _qtcb_member, _prtsize, _prtfmt)      \
+       static ssize_t zfcp_sysfs_adapter_diag_sfp_##_name##_show(             \
+               struct device *dev, struct device_attribute *attr, char *buf)  \
+       {                                                                      \
+               struct zfcp_adapter *const adapter =                           \
+                       zfcp_ccw_adapter_by_cdev(to_ccwdev(dev));              \
+               struct zfcp_diag_header *diag_hdr;                             \
+               ssize_t rc = -ENOLINK;                                         \
+               unsigned long flags;                                           \
+               unsigned int status;                                           \
+                                                                              \
+               if (!adapter)                                                  \
+                       return -ENODEV;                                        \
+                                                                              \
+               status = atomic_read(&adapter->status);                        \
+               if (0 == (status & ZFCP_STATUS_COMMON_OPEN) ||                 \
+                   0 == (status & ZFCP_STATUS_COMMON_UNBLOCKED) ||            \
+                   0 != (status & ZFCP_STATUS_COMMON_ERP_FAILED))             \
+                       goto out;                                              \
+                                                                              \
+               if (!zfcp_diag_support_sfp(adapter)) {                         \
+                       rc = -EOPNOTSUPP;                                      \
+                       goto out;                                              \
+               }                                                              \
+                                                                              \
+               diag_hdr = &adapter->diagnostics->port_data.header;            \
+                                                                              \
+               spin_lock_irqsave(&diag_hdr->access_lock, flags);              \
+               rc = scnprintf(                                                \
+                       buf, (_prtsize) + 2, _prtfmt "\n",                     \
+                       adapter->diagnostics->port_data.data._qtcb_member);    \
+               spin_unlock_irqrestore(&diag_hdr->access_lock, flags);         \
+                                                                              \
+       out:                                                                   \
+               zfcp_ccw_adapter_put(adapter);                                 \
+               return rc;                                                     \
+       }                                                                      \
+       static ZFCP_DEV_ATTR(adapter_diag_sfp, _name, 0400,                    \
+                            zfcp_sysfs_adapter_diag_sfp_##_name##_show, NULL)
+
+ZFCP_DEFINE_DIAG_SFP_ATTR(temperature, temperature, 5, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(vcc, vcc, 5, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(tx_bias, tx_bias, 5, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(tx_power, tx_power, 5, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(rx_power, rx_power, 5, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(port_tx_type, sfp_flags.port_tx_type, 2, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(optical_port, sfp_flags.optical_port, 1, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(sfp_invalid, sfp_flags.sfp_invalid, 1, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(connector_type, sfp_flags.connector_type, 1, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(fec_active, sfp_flags.fec_active, 1, "%hu");
+
+static struct attribute *zfcp_sysfs_diag_attrs[] = {
+       &dev_attr_adapter_diag_sfp_temperature.attr,
+       &dev_attr_adapter_diag_sfp_vcc.attr,
+       &dev_attr_adapter_diag_sfp_tx_bias.attr,
+       &dev_attr_adapter_diag_sfp_tx_power.attr,
+       &dev_attr_adapter_diag_sfp_rx_power.attr,
+       &dev_attr_adapter_diag_sfp_port_tx_type.attr,
+       &dev_attr_adapter_diag_sfp_optical_port.attr,
+       &dev_attr_adapter_diag_sfp_sfp_invalid.attr,
+       &dev_attr_adapter_diag_sfp_connector_type.attr,
+       &dev_attr_adapter_diag_sfp_fec_active.attr,
+       NULL,
+};
+
+const struct attribute_group zfcp_sysfs_diag_attr_group = {
+       .name = "diagnostics",
+       .attrs = zfcp_sysfs_diag_attrs,
+};