Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3128c6c7 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] iscsi cls: sysfs group is_visible callout for conn attrs 



The iscsi class currently does not support writable sysfs
attrs for LLD sysfs settings. This patch converts the
iscsi class and drivers to use the attribute container
sysfs group and the sysfs group's is_visible callout
to be able to support readable or writable sysfs attrs.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent ed1086e0

drivers/infiniband/ulp/iser/iscsi_iser.c

+27 −11
Original line number Diff line number Diff line
@@ -632,6 +632,31 @@ iscsi_iser_ep_disconnect(struct iscsi_endpoint *ep) 
	iser_conn_terminate(ib_conn);

}



static mode_t iser_attr_is_visible(int param_type, int param)

{

	switch (param_type) {

	case ISCSI_PARAM:

		switch (param) {

		case ISCSI_PARAM_MAX_RECV_DLENGTH:

		case ISCSI_PARAM_MAX_XMIT_DLENGTH:

		case ISCSI_PARAM_HDRDGST_EN:

		case ISCSI_PARAM_DATADGST_EN:

		case ISCSI_PARAM_CONN_ADDRESS:

		case ISCSI_PARAM_CONN_PORT:

		case ISCSI_PARAM_EXP_STATSN:

		case ISCSI_PARAM_PERSISTENT_ADDRESS:

		case ISCSI_PARAM_PERSISTENT_PORT:

		case ISCSI_PARAM_PING_TMO:

		case ISCSI_PARAM_RECV_TMO:

			return S_IRUGO;

		default:

			return 0;

		}

	}



	return 0;

}



static struct scsi_host_template iscsi_iser_sht = {

	.module                 = THIS_MODULE,

	.name                   = "iSCSI Initiator over iSER, v." DRV_VER,
@@ -653,28 +678,18 @@ static struct iscsi_transport iscsi_iser_transport = { 
	.owner                  = THIS_MODULE,

	.name                   = "iser",

	.caps                   = CAP_RECOVERY_L0 | CAP_MULTI_R2T,

	.param_mask		= ISCSI_MAX_RECV_DLENGTH |

				  ISCSI_MAX_XMIT_DLENGTH |

				  ISCSI_HDRDGST_EN |

				  ISCSI_DATADGST_EN |

				  ISCSI_INITIAL_R2T_EN |

	.param_mask		= ISCSI_INITIAL_R2T_EN |

				  ISCSI_MAX_R2T |

				  ISCSI_IMM_DATA_EN |

				  ISCSI_FIRST_BURST |

				  ISCSI_MAX_BURST |

				  ISCSI_PDU_INORDER_EN |

				  ISCSI_DATASEQ_INORDER_EN |

				  ISCSI_CONN_PORT |

				  ISCSI_CONN_ADDRESS |

				  ISCSI_EXP_STATSN |

				  ISCSI_PERSISTENT_PORT |

				  ISCSI_PERSISTENT_ADDRESS |

				  ISCSI_TARGET_NAME | ISCSI_TPGT |

				  ISCSI_USERNAME | ISCSI_PASSWORD |

				  ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN |

				  ISCSI_FAST_ABORT | ISCSI_ABORT_TMO |

				  ISCSI_LU_RESET_TMO | ISCSI_TGT_RESET_TMO |

				  ISCSI_PING_TMO | ISCSI_RECV_TMO |

				  ISCSI_IFACE_NAME | ISCSI_INITIATOR_NAME,

	.host_param_mask	= ISCSI_HOST_HWADDRESS |

				  ISCSI_HOST_NETDEV_NAME |
@@ -686,6 +701,7 @@ static struct iscsi_transport iscsi_iser_transport = { 
	.create_conn            = iscsi_iser_conn_create,

	.bind_conn              = iscsi_iser_conn_bind,

	.destroy_conn           = iscsi_iser_conn_destroy,

	.attr_is_visible	= iser_attr_is_visible,

	.set_param              = iscsi_iser_set_param,

	.get_conn_param		= iscsi_conn_get_param,

	.get_ep_param		= iscsi_iser_get_ep_param,

drivers/scsi/be2iscsi/be_iscsi.c

+25 −0
Original line number Diff line number Diff line
@@ -733,3 +733,28 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep) 
	beiscsi_unbind_conn_to_cid(phba, beiscsi_ep->ep_cid);

	iscsi_destroy_endpoint(beiscsi_ep->openiscsi_ep);

}



mode_t be2iscsi_attr_is_visible(int param_type, int param)

{

	switch (param_type) {

	case ISCSI_PARAM:

		switch (param) {

		case ISCSI_PARAM_MAX_RECV_DLENGTH:

		case ISCSI_PARAM_MAX_XMIT_DLENGTH:

		case ISCSI_PARAM_HDRDGST_EN:

		case ISCSI_PARAM_DATADGST_EN:

		case ISCSI_PARAM_CONN_ADDRESS:

		case ISCSI_PARAM_CONN_PORT:

		case ISCSI_PARAM_EXP_STATSN:

		case ISCSI_PARAM_PERSISTENT_ADDRESS:

		case ISCSI_PARAM_PERSISTENT_PORT:

		case ISCSI_PARAM_PING_TMO:

		case ISCSI_PARAM_RECV_TMO:

			return S_IRUGO;

		default:

			return 0;

		}

	}



	return 0;

}

drivers/scsi/be2iscsi/be_iscsi.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#define BE2_IPV4  0x1

#define BE2_IPV6  0x10



mode_t be2iscsi_attr_is_visible(int param_type, int param);



void beiscsi_offload_connection(struct beiscsi_conn *beiscsi_conn,

				struct beiscsi_offload_params *params);

drivers/scsi/be2iscsi/be_main.c

+2 −10
Original line number Diff line number Diff line
@@ -4364,10 +4364,7 @@ struct iscsi_transport beiscsi_iscsi_transport = { 
	.name = DRV_NAME,

	.caps = CAP_RECOVERY_L0 | CAP_HDRDGST | CAP_TEXT_NEGO |

		CAP_MULTI_R2T | CAP_DATADGST | CAP_DATA_PATH_OFFLOAD,

	.param_mask = ISCSI_MAX_RECV_DLENGTH |

		ISCSI_MAX_XMIT_DLENGTH |

		ISCSI_HDRDGST_EN |

		ISCSI_DATADGST_EN |

	.param_mask =

		ISCSI_INITIAL_R2T_EN |

		ISCSI_MAX_R2T |

		ISCSI_IMM_DATA_EN |
@@ -4376,17 +4373,11 @@ struct iscsi_transport beiscsi_iscsi_transport = { 
		ISCSI_PDU_INORDER_EN |

		ISCSI_DATASEQ_INORDER_EN |

		ISCSI_ERL |

		ISCSI_CONN_PORT |

		ISCSI_CONN_ADDRESS |

		ISCSI_EXP_STATSN |

		ISCSI_PERSISTENT_PORT |

		ISCSI_PERSISTENT_ADDRESS |

		ISCSI_TARGET_NAME | ISCSI_TPGT |

		ISCSI_USERNAME | ISCSI_PASSWORD |

		ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN |

		ISCSI_FAST_ABORT | ISCSI_ABORT_TMO |

		ISCSI_LU_RESET_TMO |

		ISCSI_PING_TMO | ISCSI_RECV_TMO |

		ISCSI_IFACE_NAME | ISCSI_INITIATOR_NAME,

	.host_param_mask = ISCSI_HOST_HWADDRESS | ISCSI_HOST_IPADDRESS |

				ISCSI_HOST_INITIATOR_NAME,
@@ -4395,6 +4386,7 @@ struct iscsi_transport beiscsi_iscsi_transport = { 
	.create_conn = beiscsi_conn_create,

	.bind_conn = beiscsi_conn_bind,

	.destroy_conn = iscsi_conn_teardown,

	.attr_is_visible = be2iscsi_attr_is_visible,

	.set_param = beiscsi_set_param,

	.get_conn_param = iscsi_conn_get_param,

	.get_session_param = iscsi_session_get_param,

drivers/scsi/bnx2i/bnx2i_iscsi.c

+26 −11
Original line number Diff line number Diff line
@@ -2177,6 +2177,30 @@ static int bnx2i_nl_set_path(struct Scsi_Host *shost, struct iscsi_path *params) 
	return 0;

}



static mode_t bnx2i_attr_is_visible(int param_type, int param)

{

	switch (param_type) {

	case ISCSI_PARAM:

		switch (param) {

		case ISCSI_PARAM_MAX_RECV_DLENGTH:

		case ISCSI_PARAM_MAX_XMIT_DLENGTH:

		case ISCSI_PARAM_HDRDGST_EN:

		case ISCSI_PARAM_DATADGST_EN:

		case ISCSI_PARAM_CONN_ADDRESS:

		case ISCSI_PARAM_CONN_PORT:

		case ISCSI_PARAM_EXP_STATSN:

		case ISCSI_PARAM_PERSISTENT_ADDRESS:

		case ISCSI_PARAM_PERSISTENT_PORT:

		case ISCSI_PARAM_PING_TMO:

		case ISCSI_PARAM_RECV_TMO:

			return S_IRUGO;

		default:

			return 0;

		}

	}



	return 0;

}



/*

 * 'Scsi_Host_Template' structure and 'iscsi_tranport' structure template
@@ -2207,11 +2231,7 @@ struct iscsi_transport bnx2i_iscsi_transport = { 
				  CAP_MULTI_R2T | CAP_DATADGST |

				  CAP_DATA_PATH_OFFLOAD |

				  CAP_TEXT_NEGO,

	.param_mask		= ISCSI_MAX_RECV_DLENGTH |

				  ISCSI_MAX_XMIT_DLENGTH |

				  ISCSI_HDRDGST_EN |

				  ISCSI_DATADGST_EN |

				  ISCSI_INITIAL_R2T_EN |

	.param_mask		= ISCSI_INITIAL_R2T_EN |

				  ISCSI_MAX_R2T |

				  ISCSI_IMM_DATA_EN |

				  ISCSI_FIRST_BURST |
@@ -2219,17 +2239,11 @@ struct iscsi_transport bnx2i_iscsi_transport = { 
				  ISCSI_PDU_INORDER_EN |

				  ISCSI_DATASEQ_INORDER_EN |

				  ISCSI_ERL |

				  ISCSI_CONN_PORT |

				  ISCSI_CONN_ADDRESS |

				  ISCSI_EXP_STATSN |

				  ISCSI_PERSISTENT_PORT |

				  ISCSI_PERSISTENT_ADDRESS |

				  ISCSI_TARGET_NAME | ISCSI_TPGT |

				  ISCSI_USERNAME | ISCSI_PASSWORD |

				  ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN |

				  ISCSI_FAST_ABORT | ISCSI_ABORT_TMO |

				  ISCSI_LU_RESET_TMO | ISCSI_TGT_RESET_TMO |

				  ISCSI_PING_TMO | ISCSI_RECV_TMO |

				  ISCSI_IFACE_NAME | ISCSI_INITIATOR_NAME,

	.host_param_mask	= ISCSI_HOST_HWADDRESS | ISCSI_HOST_IPADDRESS |

				  ISCSI_HOST_NETDEV_NAME,
@@ -2238,6 +2252,7 @@ struct iscsi_transport bnx2i_iscsi_transport = { 
	.create_conn		= bnx2i_conn_create,

	.bind_conn		= bnx2i_conn_bind,

	.destroy_conn		= bnx2i_conn_destroy,

	.attr_is_visible	= bnx2i_attr_is_visible,

	.set_param		= iscsi_set_param,

	.get_conn_param		= iscsi_conn_get_param,

	.get_session_param	= iscsi_session_get_param,