Somehow the Suggested-by tag was dropped from this one. Adding it back.

-matt

On Sep 24, 2015, at 2:39 PM, Matthew R. Ochs =

[off-list ref] wrote:

=20
Implement the following suggestions and add two new attributes
to allow for debugging the port LUN table.
=20
- use scnprintf() instead of snprintf()
- use DEVICE_ATTR_RO and DEVICE_ATTR_RW
=20
Signed-off-by: Matthew R. Ochs <redacted>
Signed-off-by: Manoj N. Kumar <redacted>

Suggested-by: Shane Seymour <redacted>

---
drivers/scsi/cxlflash/main.c | 180 =

+++++++++++++++++++++++++++++++++----------

b/drivers/scsi/cxlflash/main.c

scsi_device *sdev, int qdepth)

=20
/**
 * cxlflash_show_port_status() - queries and presents the current port =

status

- * @dev:	Generic device associated with the host owning the port.
- * @attr:	Device attribute representing the port.
+ * @port:	Desired port for status reporting.
+ * @afu:	AFU owning the specified port.
 * @buf:	Buffer of length PAGE_SIZE to report back port status in =

ASCII.

 *
 * Return: The size of the ASCII string returned in @buf.
 */
-static ssize_t cxlflash_show_port_status(struct device *dev,
-					 struct device_attribute *attr,
-					 char *buf)
+static ssize_t cxlflash_show_port_status(u32 port, struct afu *afu, =

char *buf)

{
-	struct Scsi_Host *shost =3D class_to_shost(dev);
-	struct cxlflash_cfg *cfg =3D (struct cxlflash_cfg =

*)shost->hostdata;

-	struct afu *afu =3D cfg->afu;
-
	char *disp_status;
-	int rc;
-	u32 port;
	u64 status;
-	u64 *fc_regs;
+	__be64 __iomem *fc_regs;
=20
-	rc =3D kstrtouint((attr->attr.name + 4), 10, &port);
-	if (rc || (port >=3D NUM_FC_PORTS))
+	if (port >=3D NUM_FC_PORTS)
		return 0;
=20
	fc_regs =3D &afu->afu_map->global.fc_regs[port][0];
-	status =3D
-	    (readq_be(&fc_regs[FC_MTIP_STATUS / 8]) & =

FC_MTIP_STATUS_MASK);

cxlflash_show_port_status(struct device *dev,

	else
		disp_status =3D "unknown";
=20
-	return snprintf(buf, PAGE_SIZE, "%s\n", disp_status);
+	return scnprintf(buf, PAGE_SIZE, "%s\n", disp_status);
+}
+
+/**
+ * port0_show() - queries and presents the current status of port 0
+ * @dev:	Generic device associated with the host owning the port.
+ * @attr:	Device attribute representing the port.
+ * @buf:	Buffer of length PAGE_SIZE to report back port status in =

ASCII.

+ *
+ * Return: The size of the ASCII string returned in @buf.
+ */
+static ssize_t port0_show(struct device *dev,
+			  struct device_attribute *attr,
+			  char *buf)
+{
+	struct Scsi_Host *shost =3D class_to_shost(dev);
+	struct cxlflash_cfg *cfg =3D (struct cxlflash_cfg =

*)shost->hostdata;

+	struct afu *afu =3D cfg->afu;
+
+	return cxlflash_show_port_status(0, afu, buf);
}
=20
/**
- * cxlflash_show_lun_mode() - presents the current LUN mode of the =

host

+ * port1_show() - queries and presents the current status of port 1
+ * @dev:	Generic device associated with the host owning the port.
+ * @attr:	Device attribute representing the port.
+ * @buf:	Buffer of length PAGE_SIZE to report back port status in =

ASCII.

+ *
+ * Return: The size of the ASCII string returned in @buf.
+ */
+static ssize_t port1_show(struct device *dev,
+			  struct device_attribute *attr,
+			  char *buf)
+{
+	struct Scsi_Host *shost =3D class_to_shost(dev);
+	struct cxlflash_cfg *cfg =3D (struct cxlflash_cfg =

*)shost->hostdata;

+	struct afu *afu =3D cfg->afu;
+
+	return cxlflash_show_port_status(1, afu, buf);
+}
+
+/**
+ * lun_mode_show() - presents the current LUN mode of the host
 * @dev:	Generic device associated with the host.
- * @attr:	Device attribute representing the lun mode.
+ * @attr:	Device attribute representing the LUN mode.
 * @buf:	Buffer of length PAGE_SIZE to report back the LUN mode =

in ASCII.

 *
 * Return: The size of the ASCII string returned in @buf.
 */
-static ssize_t cxlflash_show_lun_mode(struct device *dev,
-				      struct device_attribute *attr, =

char *buf)

+static ssize_t lun_mode_show(struct device *dev,
+			     struct device_attribute *attr, char *buf)
{
	struct Scsi_Host *shost =3D class_to_shost(dev);
	struct cxlflash_cfg *cfg =3D (struct cxlflash_cfg =

*)shost->hostdata;

	struct afu *afu =3D cfg->afu;
=20
-	return snprintf(buf, PAGE_SIZE, "%u\n", afu->internal_lun);
+	return scnprintf(buf, PAGE_SIZE, "%u\n", afu->internal_lun);
}
=20
/**
- * cxlflash_store_lun_mode() - sets the LUN mode of the host
+ * lun_mode_store() - sets the LUN mode of the host
 * @dev:	Generic device associated with the host.
- * @attr:	Device attribute representing the lun mode.
+ * @attr:	Device attribute representing the LUN mode.
 * @buf:	Buffer of length PAGE_SIZE containing the LUN mode in =

ASCII.

device *dev,

 *
 * Return: The size of the ASCII string returned in @buf.
 */
-static ssize_t cxlflash_store_lun_mode(struct device *dev,
-				       struct device_attribute *attr,
-				       const char *buf, size_t count)
+static ssize_t lun_mode_store(struct device *dev,
+			      struct device_attribute *attr,
+			      const char *buf, size_t count)
{
	struct Scsi_Host *shost =3D class_to_shost(dev);
	struct cxlflash_cfg *cfg =3D (struct cxlflash_cfg =

*)shost->hostdata;

device *dev,

}
=20
/**
- * cxlflash_show_ioctl_version() - presents the hosts current ioctl =

version

+ * ioctl_version_show() - presents the current ioctl version of the =

host

 * @dev:	Generic device associated with the host.
 * @attr:	Device attribute representing the ioctl version.
 * @buf:	Buffer of length PAGE_SIZE to report back the ioctl =

version.

 *
 * Return: The size of the ASCII string returned in @buf.
 */
-static ssize_t cxlflash_show_ioctl_version(struct device *dev,
-					   struct device_attribute =

*attr,

-					   char *buf)
+static ssize_t ioctl_version_show(struct device *dev,
+				  struct device_attribute *attr, char =

*buf)

{
	return scnprintf(buf, PAGE_SIZE, "%u\n", DK_CXLFLASH_VERSION_0);
}
=20
/**
- * cxlflash_show_dev_mode() - presents the current mode of the device
+ * cxlflash_show_port_lun_table() - queries and presents the port LUN =

table

+ * @port:	Desired port for status reporting.
+ * @afu:	AFU owning the specified port.
+ * @buf:	Buffer of length PAGE_SIZE to report back port status in =

ASCII.

+ *
+ * Return: The size of the ASCII string returned in @buf.
+ */
+static ssize_t cxlflash_show_port_lun_table(u32 port,
+					    struct afu *afu,
+					    char *buf)
+{
+	int i;
+	ssize_t bytes =3D 0;
+	__be64 __iomem *fc_port;
+
+	if (port >=3D NUM_FC_PORTS)
+		return 0;
+
+	fc_port =3D &afu->afu_map->global.fc_port[port][0];
+
+	for (i =3D 0; i < CXLFLASH_NUM_VLUNS; i++)
+		bytes +=3D scnprintf(buf + bytes, PAGE_SIZE - bytes,
+				   "%03d: %016llX\n", i, =

readq_be(&fc_port[i]));

+	return bytes;
+}
+
+/**
+ * port0_lun_table_show() - presents the current LUN table of port 0
+ * @dev:	Generic device associated with the host owning the port.
+ * @attr:	Device attribute representing the port.
+ * @buf:	Buffer of length PAGE_SIZE to report back port status in =

ASCII.

+ *
+ * Return: The size of the ASCII string returned in @buf.
+ */
+static ssize_t port0_lun_table_show(struct device *dev,
+				    struct device_attribute *attr,
+				    char *buf)
+{
+	struct Scsi_Host *shost =3D class_to_shost(dev);
+	struct cxlflash_cfg *cfg =3D (struct cxlflash_cfg =

*)shost->hostdata;

+	struct afu *afu =3D cfg->afu;
+
+	return cxlflash_show_port_lun_table(0, afu, buf);
+}
+
+/**
+ * port1_lun_table_show() - presents the current LUN table of port 1
+ * @dev:	Generic device associated with the host owning the port.
+ * @attr:	Device attribute representing the port.
+ * @buf:	Buffer of length PAGE_SIZE to report back port status in =

ASCII.

+ *
+ * Return: The size of the ASCII string returned in @buf.
+ */
+static ssize_t port1_lun_table_show(struct device *dev,
+				    struct device_attribute *attr,
+				    char *buf)
+{
+	struct Scsi_Host *shost =3D class_to_shost(dev);
+	struct cxlflash_cfg *cfg =3D (struct cxlflash_cfg =

*)shost->hostdata;

+	struct afu *afu =3D cfg->afu;
+
+	return cxlflash_show_port_lun_table(1, afu, buf);
+}
+
+/**
+ * mode_show() - presents the current mode of the device
 * @dev:	Generic device associated with the device.
 * @attr:	Device attribute representing the device mode.
 * @buf:	Buffer of length PAGE_SIZE to report back the dev mode =

in ASCII.

 *
 * Return: The size of the ASCII string returned in @buf.
 */
-static ssize_t cxlflash_show_dev_mode(struct device *dev,
-				      struct device_attribute *attr, =

char *buf)

+static ssize_t mode_show(struct device *dev,
+			 struct device_attribute *attr, char *buf)
{
	struct scsi_device *sdev =3D to_scsi_device(dev);
=20
-	return snprintf(buf, PAGE_SIZE, "%s\n",
-			sdev->hostdata ? "superpipe" : "legacy");
+	return scnprintf(buf, PAGE_SIZE, "%s\n",
+			 sdev->hostdata ? "superpipe" : "legacy");
}
=20
/*
 * Host attributes
 */
-static DEVICE_ATTR(port0, S_IRUGO, cxlflash_show_port_status, NULL);
-static DEVICE_ATTR(port1, S_IRUGO, cxlflash_show_port_status, NULL);
-static DEVICE_ATTR(lun_mode, S_IRUGO | S_IWUSR, =

cxlflash_show_lun_mode,

-		   cxlflash_store_lun_mode);
-static DEVICE_ATTR(ioctl_version, S_IRUGO, =

cxlflash_show_ioctl_version, NULL);

+static DEVICE_ATTR_RO(port0);
+static DEVICE_ATTR_RO(port1);
+static DEVICE_ATTR_RW(lun_mode);
+static DEVICE_ATTR_RO(ioctl_version);
+static DEVICE_ATTR_RO(port0_lun_table);
+static DEVICE_ATTR_RO(port1_lun_table);
=20
static struct device_attribute *cxlflash_host_attrs[] =3D {
	&dev_attr_port0,
	&dev_attr_port1,
	&dev_attr_lun_mode,
	&dev_attr_ioctl_version,
+	&dev_attr_port0_lun_table,
+	&dev_attr_port1_lun_table,
	NULL
};
=20
/*
 * Device attributes
 */
-static DEVICE_ATTR(mode, S_IRUGO, cxlflash_show_dev_mode, NULL);
+static DEVICE_ATTR_RO(mode);
=20
static struct device_attribute *cxlflash_dev_attrs[] =3D {
	&dev_attr_mode,
--=20
2.1.0
=20
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" =

in

the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
=20