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

Commit dc58f760 authored by Andy Grover's avatar Andy Grover Committed by Nicholas Bellinger
Browse files

target/iscsi: Replace conn->login_ip with login_sockaddr 



Very similar to how it went with local_sockaddr.

It was embedded in iscsi_login_stats so some changes there, and we needed
to copy in a sockaddr_storage comparison function. Hopefully the kernel
will get a standard one soon, our implementation makes the 3rd.

isert_set_conn_info() became much smaller.

IPV6_ADDRESS_SPACE define goes away, had to modify a call to in6_pton(),
can just use -1 since we are sure string is null-terminated.

Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 69d75574

drivers/infiniband/ulp/isert/ib_isert.c

+2 −19
Original line number Original line Diff line number Diff line
@@ -3206,28 +3206,11 @@ isert_set_conn_info(struct iscsi_np *np, struct iscsi_conn *conn, 
{

{

	struct rdma_cm_id *cm_id = isert_conn->cm_id;

	struct rdma_cm_id *cm_id = isert_conn->cm_id;

	struct rdma_route *cm_route = &cm_id->route;

	struct rdma_route *cm_route = &cm_id->route;

	struct sockaddr_in *sock_in;

	struct sockaddr_in6 *sock_in6;





	conn->login_family = np->np_sockaddr.ss_family;

	conn->login_family = np->np_sockaddr.ss_family;





	if (np->np_sockaddr.ss_family == AF_INET6) {

	conn->login_sockaddr = cm_route->addr.dst_addr;

		sock_in6 = (struct sockaddr_in6 *)&cm_route->addr.dst_addr;

	conn->local_sockaddr = cm_route->addr.src_addr;

		snprintf(conn->login_ip, sizeof(conn->login_ip), "%pI6c",

			 &sock_in6->sin6_addr.in6_u);

		conn->login_port = ntohs(sock_in6->sin6_port);



		sock_in6 = (struct sockaddr_in6 *)&cm_route->addr.src_addr;

		memcpy(&conn->local_sockaddr , &sock_in6, sizeof(sock_in6));

	} else {

		sock_in = (struct sockaddr_in *)&cm_route->addr.dst_addr;

		sprintf(conn->login_ip, "%pI4",

			&sock_in->sin_addr.s_addr);

		conn->login_port = ntohs(sock_in->sin_port);



		sock_in = (struct sockaddr_in *)&cm_route->addr.src_addr;

		memcpy(&conn->local_sockaddr , &sock_in, sizeof(sock_in));

	}

}

}





static int

static int

drivers/target/iscsi/iscsi_target_configfs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -267,7 +267,7 @@ static struct se_tpg_np *lio_target_call_addnptotpg( 
		sock_in6 = (struct sockaddr_in6 *)&sockaddr;

		sock_in6 = (struct sockaddr_in6 *)&sockaddr;

		sock_in6->sin6_family = AF_INET6;

		sock_in6->sin6_family = AF_INET6;

		sock_in6->sin6_port = htons((unsigned short)port);

		sock_in6->sin6_port = htons((unsigned short)port);

		ret = in6_pton(str, IPV6_ADDRESS_SPACE,

		ret = in6_pton(str, -1,

				(void *)&sock_in6->sin6_addr.in6_u, -1, &end);

				(void *)&sock_in6->sin6_addr.in6_u, -1, &end);

		if (ret <= 0) {

		if (ret <= 0) {

			pr_err("in6_pton returned: %d\n", ret);

			pr_err("in6_pton returned: %d\n", ret);
@@ -753,7 +753,7 @@ static ssize_t lio_target_nacl_show_info( 
				break;

				break;

			}

			}





			rb += sprintf(page+rb, "   Address %s %s", conn->login_ip,

			rb += sprintf(page+rb, "   Address %pISc %s", &conn->login_sockaddr,

				(conn->network_transport == ISCSI_TCP) ?

				(conn->network_transport == ISCSI_TCP) ?

				"TCP" : "SCTP");

				"TCP" : "SCTP");

			rb += sprintf(page+rb, "  StatSN: 0x%08x\n",

			rb += sprintf(page+rb, "  StatSN: 0x%08x\n",

drivers/target/iscsi/iscsi_target_login.c

+17 −18
Original line number Original line Diff line number Diff line
@@ -728,8 +728,8 @@ int iscsi_post_login_handler( 
			stop_timer = 1;

			stop_timer = 1;

		}

		}





		pr_debug("iSCSI Login successful on CID: %hu from %s to"

		pr_debug("iSCSI Login successful on CID: %hu from %pISpc to"

			" %pISpc,%hu\n", conn->cid, conn->login_ip,

			" %pISpc,%hu\n", conn->cid, &conn->login_sockaddr,

			&conn->local_sockaddr, tpg->tpgt);

			&conn->local_sockaddr, tpg->tpgt);





		list_add_tail(&conn->conn_list, &sess->sess_conn_list);

		list_add_tail(&conn->conn_list, &sess->sess_conn_list);
@@ -774,8 +774,8 @@ int iscsi_post_login_handler( 
	pr_debug("Moving to TARG_SESS_STATE_LOGGED_IN.\n");

	pr_debug("Moving to TARG_SESS_STATE_LOGGED_IN.\n");

	sess->session_state = TARG_SESS_STATE_LOGGED_IN;

	sess->session_state = TARG_SESS_STATE_LOGGED_IN;





	pr_debug("iSCSI Login successful on CID: %hu from %s to %pISpc,%hu\n",

	pr_debug("iSCSI Login successful on CID: %hu from %pISpc to %pISpc,%hu\n",

		conn->cid, conn->login_ip, &conn->local_sockaddr,

		conn->cid, &conn->login_sockaddr, &conn->local_sockaddr,

		tpg->tpgt);

		tpg->tpgt);





	spin_lock_bh(&sess->conn_lock);

	spin_lock_bh(&sess->conn_lock);
@@ -1015,13 +1015,15 @@ int iscsit_accept_np(struct iscsi_np *np, struct iscsi_conn *conn) 
		rc = conn->sock->ops->getname(conn->sock,

		rc = conn->sock->ops->getname(conn->sock,

				(struct sockaddr *)&sock_in6, &err, 1);

				(struct sockaddr *)&sock_in6, &err, 1);

		if (!rc) {

		if (!rc) {

			if (!ipv6_addr_v4mapped(&sock_in6.sin6_addr))

			if (!ipv6_addr_v4mapped(&sock_in6.sin6_addr)) {

				snprintf(conn->login_ip, sizeof(conn->login_ip), "[%pI6c]",

				memcpy(&conn->login_sockaddr, &sock_in6, sizeof(sock_in6));

					&sock_in6.sin6_addr.in6_u);

			} else {

			else

				/* Pretend to be an ipv4 socket */

				snprintf(conn->login_ip, sizeof(conn->login_ip), "%pI4",

				sock_in.sin_family = AF_INET;

					&sock_in6.sin6_addr.s6_addr32[3]);

				sock_in.sin_port = sock_in6.sin6_port;

			conn->login_port = ntohs(sock_in6.sin6_port);

				memcpy(&sock_in.sin_addr, &sock_in6.sin6_addr.s6_addr32[3], 4);

				memcpy(&conn->login_sockaddr, &sock_in, sizeof(sock_in));

			}

		}

		}





		rc = conn->sock->ops->getname(conn->sock,

		rc = conn->sock->ops->getname(conn->sock,
@@ -1042,11 +1044,8 @@ int iscsit_accept_np(struct iscsi_np *np, struct iscsi_conn *conn) 




		rc = conn->sock->ops->getname(conn->sock,

		rc = conn->sock->ops->getname(conn->sock,

				(struct sockaddr *)&sock_in, &err, 1);

				(struct sockaddr *)&sock_in, &err, 1);

		if (!rc) {

		if (!rc)

			sprintf(conn->login_ip, "%pI4",

			memcpy(&conn->login_sockaddr, &sock_in, sizeof(sock_in));

					&sock_in.sin_addr.s_addr);

			conn->login_port = ntohs(sock_in.sin_port);

		}





		rc = conn->sock->ops->getname(conn->sock,

		rc = conn->sock->ops->getname(conn->sock,

				(struct sockaddr *)&sock_in, &err, 0);

				(struct sockaddr *)&sock_in, &err, 0);
@@ -1311,8 +1310,8 @@ static int __iscsi_target_login_thread(struct iscsi_np *np) 




	conn->network_transport = np->np_network_transport;

	conn->network_transport = np->np_network_transport;





	pr_debug("Received iSCSI login request from %s on %s Network"

	pr_debug("Received iSCSI login request from %pISpc on %s Network"

		" Portal %pISpc\n", conn->login_ip, np->np_transport->name,

		" Portal %pISpc\n", &conn->login_sockaddr, np->np_transport->name,

		&conn->local_sockaddr);

		&conn->local_sockaddr);





	pr_debug("Moving to TARG_CONN_STATE_IN_LOGIN.\n");

	pr_debug("Moving to TARG_CONN_STATE_IN_LOGIN.\n");

drivers/target/iscsi/iscsi_target_stat.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -430,7 +430,7 @@ static ssize_t iscsi_stat_tgt_attr_show_attr_fail_intr_addr( 
	int ret;

	int ret;





	spin_lock(&lstat->lock);

	spin_lock(&lstat->lock);

	ret = snprintf(page, PAGE_SIZE, "%s\n", lstat->last_intr_fail_ip_addr);

	ret = snprintf(page, PAGE_SIZE, "%pISc\n", &lstat->last_intr_fail_sockaddr);

	spin_unlock(&lstat->lock);

	spin_unlock(&lstat->lock);





	return ret;

	return ret;

drivers/target/iscsi/iscsi_target_util.c

+29 −3
Original line number Original line Diff line number Diff line
@@ -1372,6 +1372,33 @@ int tx_data( 
	return iscsit_do_tx_data(conn, &c);

	return iscsit_do_tx_data(conn, &c);

}

}





static bool sockaddr_equal(struct sockaddr_storage *x, struct sockaddr_storage *y)

{

	switch (x->ss_family) {

	case AF_INET: {

		struct sockaddr_in *sinx = (struct sockaddr_in *)x;

		struct sockaddr_in *siny = (struct sockaddr_in *)y;

		if (sinx->sin_addr.s_addr != siny->sin_addr.s_addr)

			return false;

		if (sinx->sin_port != siny->sin_port)

			return false;

		break;

	}

	case AF_INET6: {

		struct sockaddr_in6 *sinx = (struct sockaddr_in6 *)x;

		struct sockaddr_in6 *siny = (struct sockaddr_in6 *)y;

		if (!ipv6_addr_equal(&sinx->sin6_addr, &siny->sin6_addr))

			return false;

		if (sinx->sin6_port != siny->sin6_port)

			return false;

		break;

	}

	default:

		return false;

	}

	return true;

}



void iscsit_collect_login_stats(

void iscsit_collect_login_stats(

	struct iscsi_conn *conn,

	struct iscsi_conn *conn,

	u8 status_class,

	u8 status_class,
@@ -1388,7 +1415,7 @@ void iscsit_collect_login_stats( 
	ls = &tiqn->login_stats;

	ls = &tiqn->login_stats;





	spin_lock(&ls->lock);

	spin_lock(&ls->lock);

	if (!strcmp(conn->login_ip, ls->last_intr_fail_ip_addr) &&

	if (sockaddr_equal(&conn->login_sockaddr, &ls->last_intr_fail_sockaddr) &&

	    ((get_jiffies_64() - ls->last_fail_time) < 10)) {

	    ((get_jiffies_64() - ls->last_fail_time) < 10)) {

		/* We already have the failure info for this login */

		/* We already have the failure info for this login */

		spin_unlock(&ls->lock);

		spin_unlock(&ls->lock);
@@ -1428,8 +1455,7 @@ void iscsit_collect_login_stats( 




		ls->last_intr_fail_ip_family = conn->login_family;

		ls->last_intr_fail_ip_family = conn->login_family;





		snprintf(ls->last_intr_fail_ip_addr, IPV6_ADDRESS_SPACE,

		ls->last_intr_fail_sockaddr = conn->login_sockaddr;

				"%s", conn->login_ip);

		ls->last_fail_time = get_jiffies_64();

		ls->last_fail_time = get_jiffies_64();

	}

	}