Differential D9299 Diff 24611 sys/cam/ctl/ctl_frontend_iscsi.c

Changeset View

Standalone View

sys/cam/ctl/ctl_frontend_iscsi.c

Context not available.
	#include <sys/systm.h>	#include <sys/systm.h>
	#include <sys/uio.h>	#include <sys/uio.h>
	#include <sys/unistd.h>	#include <sys/unistd.h>
		#include <sys/nv.h>
		#include <sys/dnv.h>
	#include <vm/uma.h>	#include <vm/uma.h>

	#include <cam/scsi/scsi_all.h>	#include <cam/scsi/scsi_all.h>
Context not available.
	{	{
	struct cfiscsi_target *ct;	struct cfiscsi_target *ct;
	struct ctl_port *port;	struct ctl_port *port;
	const char target, alias, *tags;	const char target, alias, *val;
	struct scsi_vpd_id_descriptor *desc;	struct scsi_vpd_id_descriptor *desc;
	ctl_options_t opts;
	int retval, len, idlen;	int retval, len, idlen;
	uint16_t tag;	uint16_t tag;

	ctl_init_opts(&opts, req->num_args, req->kern_args);	target = dnvlist_get_string(req->args_nvl, "cfiscsi_target", NULL);
	target = ctl_get_opt(&opts, "cfiscsi_target");	alias = dnvlist_get_string(req->args_nvl, "cfiscsi_target_alias", NULL);
	alias = ctl_get_opt(&opts, "cfiscsi_target_alias");	val = dnvlist_get_string(req->args_nvl, "cfiscsi_portal_group_tag",
	tags = ctl_get_opt(&opts, "cfiscsi_portal_group_tag");	NULL);
	if (target == NULL \|\| tags == NULL) {

		if (target == NULL \|\| val == NULL) {
	req->status = CTL_LUN_ERROR;	req->status = CTL_LUN_ERROR;
	snprintf(req->error_str, sizeof(req->error_str),	snprintf(req->error_str, sizeof(req->error_str),
	"Missing required argument");	"Missing required argument");
	ctl_free_opts(&opts);
	return;	return;
	}	}
	tag = strtol(tags, (char **)NULL, 10);
		tag = (uint16_t)strtoul(val, NULL, 0);
		mavUnsubmitted Done Inline Actions This change is probably not needed. I am usually trying to clean such ones during final patch review. mav: This change is probably not needed. I am usually trying to clean such ones during final patch…
	ct = cfiscsi_target_find_or_create(&cfiscsi_softc, target, alias, tag);	ct = cfiscsi_target_find_or_create(&cfiscsi_softc, target, alias, tag);
	if (ct == NULL) {	if (ct == NULL) {
	req->status = CTL_LUN_ERROR;	req->status = CTL_LUN_ERROR;
	snprintf(req->error_str, sizeof(req->error_str),	snprintf(req->error_str, sizeof(req->error_str),
	"failed to create target \"%s\"", target);	"failed to create target \"%s\"", target);
	ctl_free_opts(&opts);
	return;	return;
	}	}
	if (ct->ct_state == CFISCSI_TARGET_STATE_ACTIVE) {	if (ct->ct_state == CFISCSI_TARGET_STATE_ACTIVE) {
Context not available.
	req->status = CTL_LUN_ERROR;	req->status = CTL_LUN_ERROR;
	snprintf(req->error_str, sizeof(req->error_str),	snprintf(req->error_str, sizeof(req->error_str),
	"target \"%s\" for portal group tag %u already exists",	"target \"%s\" for portal group tag %u already exists",
	target, tag);	target, (uint16_t)tag);
		mavUnsubmitted Done Inline Actions Type conversion is not needed here any more. mav: Type conversion is not needed here any more.
	cfiscsi_target_release(ct);	cfiscsi_target_release(ct);
	ctl_free_opts(&opts);
	return;	return;
	}	}
	port = &ct->ct_port;	port = &ct->ct_port;
Context not available.
	/* XXX KDM what should the real number be here? */	/* XXX KDM what should the real number be here? */
	port->num_requested_ctl_io = 4096;	port->num_requested_ctl_io = 4096;
	port->port_name = "iscsi";	port->port_name = "iscsi";
	port->physical_port = tag;	port->physical_port = (int)tag;
	port->virtual_port = ct->ct_target_id;	port->virtual_port = ct->ct_target_id;
	port->port_online = cfiscsi_online;	port->port_online = cfiscsi_online;
	port->port_offline = cfiscsi_offline;	port->port_offline = cfiscsi_offline;
Context not available.
	port->fe_datamove = cfiscsi_datamove;	port->fe_datamove = cfiscsi_datamove;
	port->fe_done = cfiscsi_done;	port->fe_done = cfiscsi_done;
	port->targ_port = -1;	port->targ_port = -1;
		port->options = nvlist_clone(req->args_nvl);

	port->options = opts;
	STAILQ_INIT(&opts);

	/* Generate Port ID. */	/* Generate Port ID. */
	idlen = strlen(target) + strlen(",t,0x0001") + 1;	idlen = strlen(target) + strlen(",t,0x0001") + 1;
	idlen = roundup2(idlen, 4);	idlen = roundup2(idlen, 4);
		mavUnsubmitted Not Done Inline Actions Here should also be (uint16_t), same as in other cases. I would much prefer uint16_t variable, if not the error checking using magic -1 value. mav: Here should also be (uint16_t), same as in other cases. I would much prefer uint16_t variable…
Context not available.

	retval = ctl_port_register(port);	retval = ctl_port_register(port);
	if (retval != 0) {	if (retval != 0) {
	ctl_free_opts(&port->options);
	cfiscsi_target_release(ct);	cfiscsi_target_release(ct);
	free(port->port_devid, M_CFISCSI);	free(port->port_devid, M_CFISCSI);
	free(port->target_devid, M_CFISCSI);	free(port->target_devid, M_CFISCSI);
Context not available.
	done:	done:
	ct->ct_state = CFISCSI_TARGET_STATE_ACTIVE;	ct->ct_state = CFISCSI_TARGET_STATE_ACTIVE;
	req->status = CTL_LUN_OK;	req->status = CTL_LUN_OK;
	memcpy(req->kern_args[0].kvalue, &port->targ_port,	req->result_nvl = nvlist_create(0);
	sizeof(port->targ_port)); //XXX	nvlist_add_number(req->result_nvl, "port_id", port->targ_port);
	}	}

	static void	static void
Context not available.
	cfiscsi_ioctl_port_remove(struct ctl_req *req)	cfiscsi_ioctl_port_remove(struct ctl_req *req)
	{	{
	struct cfiscsi_target *ct;	struct cfiscsi_target *ct;
	const char target, tags;	const char target, val;
	ctl_options_t opts;
	uint16_t tag;	uint16_t tag;

	ctl_init_opts(&opts, req->num_args, req->kern_args);	target = dnvlist_get_string(req->args_nvl, "cfiscsi_target", NULL);
	target = ctl_get_opt(&opts, "cfiscsi_target");	val = dnvlist_get_string(req->args_nvl, "cfiscsi_portal_group_tag",
	tags = ctl_get_opt(&opts, "cfiscsi_portal_group_tag");	NULL);
	if (target == NULL \|\| tags == NULL) {
	ctl_free_opts(&opts);	if (target == NULL \|\| val == 0) {
		mavUnsubmitted Done Inline Actions Here should better be NULL instead of 0. mav: Here should better be NULL instead of 0.
	req->status = CTL_LUN_ERROR;	req->status = CTL_LUN_ERROR;
	snprintf(req->error_str, sizeof(req->error_str),	snprintf(req->error_str, sizeof(req->error_str),
	"Missing required argument");	"Missing required argument");
	return;	return;
	}	}
	tag = strtol(tags, (char **)NULL, 10);
		tag = (uint16_t)strtoul(val, NULL, 0);
		mavUnsubmitted Done Inline Actions Same as above. mav: Same as above.
	ct = cfiscsi_target_find(&cfiscsi_softc, target, tag);	ct = cfiscsi_target_find(&cfiscsi_softc, target, tag);
	if (ct == NULL) {	if (ct == NULL) {
	ctl_free_opts(&opts);
	req->status = CTL_LUN_ERROR;	req->status = CTL_LUN_ERROR;
	snprintf(req->error_str, sizeof(req->error_str),	snprintf(req->error_str, sizeof(req->error_str),
	"can't find target \"%s\"", target);	"can't find target \"%s\"", target);
Context not available.
	return;	return;
	}	}
	if (ct->ct_state != CFISCSI_TARGET_STATE_ACTIVE) {	if (ct->ct_state != CFISCSI_TARGET_STATE_ACTIVE) {
	ctl_free_opts(&opts);
	req->status = CTL_LUN_ERROR;	req->status = CTL_LUN_ERROR;
	snprintf(req->error_str, sizeof(req->error_str),	snprintf(req->error_str, sizeof(req->error_str),
	"target \"%s\" is already dying", target);	"target \"%s\" is already dying", target);
	return;	return;
	}	}
	ctl_free_opts(&opts);

	ct->ct_state = CFISCSI_TARGET_STATE_DYING;	ct->ct_state = CFISCSI_TARGET_STATE_DYING;
	ctl_port_offline(&ct->ct_port);	ctl_port_offline(&ct->ct_port);
Context not available.