CTL: Increase maximum SCSI tag size from 32 to 64 bits.HEADmain

SAM-5 specification states maximum size of command identifier (tag),
defined by specific transports, should not be larger than 64 bits.
While most of supported transports use 32 bits or less, it was
reported that virtio-scsi uses 64 bits.  Truncation to 32 bits in
bhyve code caused false tag conflict errors reported and possibly
other issues.

This changes CTL ABI and HA protocol, so CTL_HA_VERSION is bumped.

While we make HA protocol incompatible, increase default maximum
number of ports in CTL from 256 to 1024, matching number of LUNs.
There are many reports from people who need many iSCSI targets with
only one LUN each.  Increased memory consumption should be less of
a problem these days.

PR:	267539

7 files changed, 21 insertions, 20 deletions

diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 07ebade1e44a..a9551c875f7a 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -435,7 +435,7 @@ SYSCTL_INT(_kern_cam_ctl, OID_AUTO, max_luns, CTLFLAG_RDTUN,
 /*
  * Maximum number of ports registered at one time.
  */
-#define	CTL_DEFAULT_MAX_PORTS		256
+#define	CTL_DEFAULT_MAX_PORTS		1024
 static int ctl_max_ports = CTL_DEFAULT_MAX_PORTS;
 TUNABLE_INT("kern.cam.ctl.max_ports", &ctl_max_ports);
 SYSCTL_INT(_kern_cam_ctl, OID_AUTO, max_ports, CTLFLAG_RDTUN,
@@ -2443,7 +2443,7 @@ ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio)
 	case CTL_ACTION_OVERLAP_TAG:
 		LIST_REMOVE(&ctsio->io_hdr, ooa_links);
 		mtx_unlock(&lun->lun_lock);
-		ctl_set_overlapped_tag(ctsio, ctsio->tag_num);
+		ctl_set_overlapped_tag(ctsio, ctsio->tag_num & 0xff);
 badjuju:
 		ctl_copy_sense_data_back((union ctl_io *)ctsio, &msg_info);
 		msg_info.hdr.original_sc = ctsio->io_hdr.remote_io;
@@ -2491,6 +2491,7 @@ ctl_ioctl_fill_ooa(struct ctl_lun *lun, uint32_t *cur_fill_num,
 		entry = &kern_entries[*cur_fill_num];
 
 		entry->tag_num = io->scsiio.tag_num;
+		entry->tag_type = io->scsiio.tag_type;
 		entry->lun_num = lun->lun;
 #ifdef CTL_TIME_IO
 		entry->start_bt = io->io_hdr.start_bt;
@@ -12594,7 +12595,7 @@ ctl_datamove(union ctl_io *io)
 	 * the data move.
 	 */
 	if (io->io_hdr.flags & CTL_FLAG_ABORT) {
-		printf("ctl_datamove: tag 0x%04x on (%u:%u:%u) aborted\n",
+		printf("ctl_datamove: tag 0x%jx on (%u:%u:%u) aborted\n",
 		       io->scsiio.tag_num, io->io_hdr.nexus.initid,
 		       io->io_hdr.nexus.targ_port,
 		       io->io_hdr.nexus.targ_lun);
@@ -12996,7 +12997,7 @@ ctl_datamove_remote(union ctl_io *io)
 	 * have been done if need be on the other controller.
 	 */
 	if (io->io_hdr.flags & CTL_FLAG_ABORT) {
-		printf("%s: tag 0x%04x on (%u:%u:%u) aborted\n", __func__,
+		printf("%s: tag 0x%jx on (%u:%u:%u) aborted\n", __func__,
 		       io->scsiio.tag_num, io->io_hdr.nexus.initid,
 		       io->io_hdr.nexus.targ_port,
 		       io->io_hdr.nexus.targ_lun);
@@ -13042,12 +13043,12 @@ ctl_process_done(union ctl_io *io)
 			ctl_scsi_command_string(&io->scsiio, NULL, &sb);
 			sbuf_printf(&sb, "\n");
 			sbuf_cat(&sb, path_str);
-			sbuf_printf(&sb, "Tag: 0x%04x/%d, Prio: %d\n",
+			sbuf_printf(&sb, "Tag: 0x%jx/%d, Prio: %d\n",
 				    io->scsiio.tag_num, io->scsiio.tag_type,
 				    io->scsiio.priority);
 			break;
 		case CTL_IO_TASK:
-			sbuf_printf(&sb, "Task Action: %d Tag: 0x%04x/%d\n",
+			sbuf_printf(&sb, "Task Action: %d Tag: 0x%jx/%d\n",
 				    io->taskio.task_action,
 				    io->taskio.tag_num, io->taskio.tag_type);
 			break;
diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c
index f326100cb013..f53dae694867 100644
--- a/sys/cam/ctl/ctl_frontend_ioctl.c
+++ b/sys/cam/ctl/ctl_frontend_ioctl.c
@@ -75,7 +75,7 @@ struct ctl_fe_ioctl_params {
 
 struct cfi_port {
 	TAILQ_ENTRY(cfi_port)	link;
-	uint32_t		cur_tag_num;
+	u_int			cur_tag_num;
 	struct cdev *		dev;
 	struct ctl_port		port;
 };
@@ -634,7 +634,7 @@ ctl_ioctl_io(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 	io->io_hdr.flags |= CTL_FLAG_USER_REQ;
 	if ((io->io_hdr.io_type == CTL_IO_SCSI) &&
 	    (io->scsiio.tag_type != CTL_TAG_UNTAGGED))
-		io->scsiio.tag_num = cfi->cur_tag_num++;
+		io->scsiio.tag_num = atomic_fetchadd_int(&cfi->cur_tag_num, 1);
 
 	retval = cfi_submit_wait(io);
 	if (retval == 0)
diff --git a/sys/cam/ctl/ctl_io.h b/sys/cam/ctl/ctl_io.h
index de312608da8e..9f22898e3ee5 100644
--- a/sys/cam/ctl/ctl_io.h
+++ b/sys/cam/ctl/ctl_io.h
@@ -328,8 +328,7 @@ struct ctl_scsiio {
 	uint8_t	   scsi_status;		/* SCSI status byte */
 	uint8_t	   seridx;		/* Serialization index. */
 	uint8_t	   priority;		/* Command priority */
-	uint32_t   residual;		/* Unused */
-	uint32_t   tag_num;		/* tag number */
+	uint64_t   tag_num;		/* tag number */
 	ctl_tag_type tag_type;		/* simple, ordered, head of queue,etc.*/
 	uint8_t    cdb_len;		/* CDB length */
 	uint8_t	   cdb[CTL_MAX_CDBLEN];	/* CDB */
@@ -373,7 +372,7 @@ typedef enum {
 struct ctl_taskio {
 	struct ctl_io_hdr	io_hdr;      /* common to all I/O types */
 	ctl_task_type		task_action; /* Target Reset, Abort, etc.  */
-	uint32_t		tag_num;     /* tag number */
+	uint64_t		tag_num;     /* tag number */
 	ctl_tag_type		tag_type;    /* simple, ordered, etc. */
 	uint8_t			task_status; /* Complete, Succeeded, etc. */
 	uint8_t			task_resp[3];/* Response information */
@@ -382,7 +381,7 @@ struct ctl_taskio {
 /*
  * HA link messages.
  */
-#define	CTL_HA_VERSION		3
+#define	CTL_HA_VERSION		4
 
 /*
  * Used for CTL_MSG_LOGIN.
@@ -483,7 +482,7 @@ struct ctl_ha_msg_dt {
  */
 struct ctl_ha_msg_scsi {
 	struct ctl_ha_msg_hdr	hdr;
-	uint32_t		tag_num;     /* tag number */
+	uint64_t		tag_num;     /* tag number */
 	ctl_tag_type		tag_type;    /* simple, ordered, etc. */
 	uint8_t			cdb[CTL_MAX_CDBLEN];	/* CDB */
 	uint8_t			cdb_len;	/* CDB length */
@@ -502,7 +501,7 @@ struct ctl_ha_msg_scsi {
 struct ctl_ha_msg_task {
 	struct ctl_ha_msg_hdr	hdr;
 	ctl_task_type		task_action; /* Target Reset, Abort, etc.  */
-	uint32_t		tag_num;     /* tag number */
+	uint64_t		tag_num;     /* tag number */
 	ctl_tag_type		tag_type;    /* simple, ordered, etc. */
 };
 
diff --git a/sys/cam/ctl/ctl_ioctl.h b/sys/cam/ctl/ctl_ioctl.h
index 543f97a65d30..a5d237f2b65e 100644
--- a/sys/cam/ctl/ctl_ioctl.h
+++ b/sys/cam/ctl/ctl_ioctl.h
@@ -256,7 +256,8 @@ struct ctl_ooa_entry {
 	ctl_ooa_cmd_flags	cmd_flags;
 	uint8_t			cdb[CTL_MAX_CDBLEN];
 	uint8_t			cdb_len;
-	uint32_t		tag_num;
+	uint64_t		tag_num;
+	ctl_tag_type		tag_type;
 	uint32_t		lun_num;
 	struct bintime		start_bt;
 };
diff --git a/sys/cam/ctl/ctl_tpc_local.c b/sys/cam/ctl/ctl_tpc_local.c
index ba6deada86a3..e661cde27234 100644
--- a/sys/cam/ctl/ctl_tpc_local.c
+++ b/sys/cam/ctl/ctl_tpc_local.c
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
 
 struct tpcl_softc {
 	struct ctl_port port;
-	int cur_tag_num;
+	u_int cur_tag_num;
 };
 
 static struct tpcl_softc tpcl_softc;
diff --git a/sys/cam/ctl/ctl_util.c b/sys/cam/ctl/ctl_util.c
index 245c3e89dfb9..0406388ce4bf 100644
--- a/sys/cam/ctl/ctl_util.c
+++ b/sys/cam/ctl/ctl_util.c
@@ -740,7 +740,7 @@ ctl_io_sbuf(union ctl_io *io, struct sbuf *sb)
 	case CTL_IO_SCSI:
 		sbuf_cat(sb, path_str);
 		ctl_scsi_command_string(&io->scsiio, NULL, sb);
-		sbuf_printf(sb, " Tag: %#x/%d, Prio: %d\n",
+		sbuf_printf(sb, " Tag: %#jx/%d, Prio: %d\n",
 			    io->scsiio.tag_num, io->scsiio.tag_type,
 			    io->scsiio.priority);
 		break;
@@ -754,7 +754,7 @@ ctl_io_sbuf(union ctl_io *io, struct sbuf *sb)
 			sbuf_printf(sb, "Task Action: %s", task_desc);
 		switch (io->taskio.task_action) {
 		case CTL_TASK_ABORT_TASK:
-			sbuf_printf(sb, " Tag: %#x/%d\n",
+			sbuf_printf(sb, " Tag: %#jx/%d\n",
 			    io->taskio.tag_num, io->taskio.tag_type);
 			break;
 		default:
@@ -869,7 +869,7 @@ ctl_data_print(union ctl_io *io)
 	for (i = 0; i < len; ) {
 		sbuf_new(&sb, str, sizeof(str), SBUF_FIXEDLEN);
 		sbuf_cat(&sb, path_str);
-		sbuf_printf(&sb, " %#6x:%04x:", io->scsiio.tag_num, i);
+		sbuf_printf(&sb, " %#jx:%04x:", io->scsiio.tag_num, i);
 		for (j = 0; j < 16 && i < len; i++, j++) {
 			if (j == 8)
 				sbuf_cat(&sb, " ");
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index 8c141a88e155..b54ae89a53ca 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -1185,7 +1185,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 		bcopy(atio_cdb_ptr(atio), io->scsiio.cdb, io->scsiio.cdb_len);
 
 #ifdef CTLFEDEBUG
-		printf("%s: %u:%u:%u: tag %04x CDB %02x\n", __func__,
+		printf("%s: %u:%u:%u: tag %jx CDB %02x\n", __func__,
 		        io->io_hdr.nexus.initid,
 		        io->io_hdr.nexus.targ_port,
 		        io->io_hdr.nexus.targ_lun,