13768 mpapi is too clever with its ioctls tripping SSP

Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Dan McDonald <danmcd@joyent.com>

2 files changed, 18 insertions, 19 deletions

diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/mpapi_impl.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/mpapi_impl.c
index 1747c02d69..474a83e9e3 100644
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/mpapi_impl.c
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/mpapi_impl.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2021 Racktop Systems, Inc.
  */
 
 /*
@@ -244,10 +245,6 @@ vhci_mpapi_validate(void *udata, mp_iocdata_t *mpioc, int mode, cred_t *credp)
 	case MP_GET_DRIVER_PROP:
 	{
 		olen = sizeof (mp_driver_prop_t);
-		/* Adjust olen to account for the caddr_t in 32-bit mode */
-		if (mode32 == 1) {
-			olen -= 4;
-		}
 
 		if ((mpioc->mp_obuf == NULL) ||
 		    (mpioc->mp_olen < olen) ||
@@ -282,10 +279,6 @@ vhci_mpapi_validate(void *udata, mp_iocdata_t *mpioc, int mode, cred_t *credp)
 	case MP_GET_LU_PROP:
 	{
 		olen = sizeof (mp_logical_unit_prop_t);
-		/* Adjust olen to account for the caddr_t in 32-bit mode */
-		if (mode32 == 1) {
-			olen -= 4;
-		}
 
 		if ((mpioc->mp_ilen != sizeof (uint64_t)) ||
 		    (mpioc->mp_ibuf == NULL) ||
@@ -304,10 +297,6 @@ vhci_mpapi_validate(void *udata, mp_iocdata_t *mpioc, int mode, cred_t *credp)
 	case MP_GET_PATH_PROP:
 	{
 		olen = sizeof (mp_path_prop_t);
-		/* Adjust olen to account for the caddr_t in 32-bit mode */
-		if (mode32 == 1) {
-			olen -= 4;
-		}
 
 		if ((mpioc->mp_ilen != sizeof (uint64_t)) ||
 		    (mpioc->mp_ibuf == NULL) ||
@@ -380,10 +369,6 @@ vhci_mpapi_validate(void *udata, mp_iocdata_t *mpioc, int mode, cred_t *credp)
 	case MP_GET_PROPRIETARY_LOADBALANCE_PROP:
 	{
 		olen = sizeof (mp_proprietary_loadbalance_prop_t);
-		/* Adjust olen to account for the caddr_t in 32-bit mode */
-		if (mode32 == 1) {
-			olen -= 4;
-		}
 
 		if ((mpioc->mp_ilen != sizeof (uint64_t)) ||
 		    (mpioc->mp_ibuf == NULL) ||
diff --git a/usr/src/uts/common/sys/scsi/adapters/mpapi_impl.h b/usr/src/uts/common/sys/scsi/adapters/mpapi_impl.h
index a2f8343a50..f19c0c9346 100644
--- a/usr/src/uts/common/sys/scsi/adapters/mpapi_impl.h
+++ b/usr/src/uts/common/sys/scsi/adapters/mpapi_impl.h
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2021 RackTop Systems, Inc.
  */
 
 #ifndef _SYS_SCSI_ADAPTERS_MPAPI_IMPL_H
@@ -28,6 +29,7 @@
 #include <sys/sunmdi.h>
 #include <sys/sunddi.h>
 #include <sys/mdi_impldefs.h>
+#include <sys/debug.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -69,7 +71,11 @@ typedef struct mp_driver_prop {
 	uint32_t	autoProbingEnabled;
 	uint32_t	proprietaryPropSize;
 	caddr_t		proprietaryProp;
+#ifdef _ILP32
+	uint32_t	pad;
+#endif
 } mp_driver_prop_t;
+CTASSERT(sizeof (mp_driver_prop_t) == 0x248);
 
 
 /* Size of "proprietaryProp" field */
@@ -161,7 +167,11 @@ typedef struct mp_logical_unit_prop {
 	boolean_t			overridePathInUse;
 	uint32_t			proprietaryPropSize;
 	caddr_t				proprietaryProp;
+#ifdef _ILP32
+	uint32_t			pad;
+#endif
 } mp_logical_unit_prop_t;
+CTASSERT(sizeof (mp_logical_unit_prop_t) == 0x268);
 
 
 /* Constants for nameType */
@@ -262,7 +272,11 @@ typedef struct mp_proprietary_loadbalance_prop {
 	uint32_t	typeIndex;
 	uint32_t	proprietaryPropSize;
 	caddr_t		proprietaryProp;
+#ifdef _ILP32
+	uint32_t	pad;
+#endif
 } mp_proprietary_loadbalance_prop_t;
+CTASSERT(sizeof (mp_proprietary_loadbalance_prop_t) == 0x218);
 
 
 /*
@@ -283,7 +297,7 @@ typedef struct mp_uscsi_cmd {
 	struct buf		*rqbp;		/* auto-rqsense packet */
 	mdi_pathinfo_t		*pip;		/* path information */
 	int			arq_enabled;	/* auto-rqsense enable flag */
-}mp_uscsi_cmd_t;
+} mp_uscsi_cmd_t;
 
 /*
  * Structure used as input to
@@ -369,7 +383,7 @@ typedef struct mp_iocdata32 {
 #define	MP_OBJECT_TYPE_DEVICE_PRODUCT		6
 #define	MP_OBJECT_TYPE_TARGET_PORT_GROUP	7
 #define	MP_OBJECT_TYPE_PROPRIETARY_LOAD_BALANCE	8
-#define	MP_OBJECT_TYPE_LAST_ENTRY 	MP_OBJECT_TYPE_PROPRIETARY_LOAD_BALANCE
+#define	MP_OBJECT_TYPE_LAST_ENTRY	MP_OBJECT_TYPE_PROPRIETARY_LOAD_BALANCE
 #define	MP_MAX_OBJECT_TYPE	(MP_OBJECT_TYPE_LAST_ENTRY + 1)
 
 
@@ -399,7 +413,7 @@ typedef struct mp_iocdata32 {
 #define	MP_GET_TARGET_PORT_LIST_FOR_TPG		(MP_SUB_CMD + 0x11)
 #define	MP_SET_TPG_ACCESS_STATE			(MP_SUB_CMD + 0x12)
 #define	MP_ENABLE_AUTO_FAILBACK			(MP_SUB_CMD + 0x13)
-#define	MP_DISABLE_AUTO_FAILBACK 		(MP_SUB_CMD + 0x14)
+#define	MP_DISABLE_AUTO_FAILBACK		(MP_SUB_CMD + 0x14)
 #define	MP_ENABLE_PATH				(MP_SUB_CMD + 0x15)
 #define	MP_DISABLE_PATH				(MP_SUB_CMD + 0x16)
 #define	MP_GET_PROPRIETARY_LOADBALANCE_LIST	(MP_SUB_CMD + 0x17)