target/iscsi: Keep local_ip as the actual sockaddr

This is a more natural format that lets us format it with the appropriate
printk specifier as needed.

This also lets us handle v4-mapped ipv6 addresses a little more nicely, by
storing the addr as an actual v4 sockaddr in conn->local_sockaddr.

Finally, we no longer need to maintain variables for port, since this is
contained in sockaddr. Remove iscsi_np.np_port and iscsi_conn.local_port.

Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

6 files changed, 48 insertions, 65 deletions

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 771700963127..9e7094c244ea 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -3218,9 +3218,7 @@ isert_set_conn_info(struct iscsi_np *np, struct iscsi_conn *conn,
                 conn->login_port = ntohs(sock_in6->sin6_port);
 
                 sock_in6 = (struct sockaddr_in6 *)&cm_route->addr.src_addr;
-                snprintf(conn->local_ip, sizeof(conn->local_ip), "%pI6c",
-                         &sock_in6->sin6_addr.in6_u);
-                conn->local_port = ntohs(sock_in6->sin6_port);
+                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",
@@ -3228,9 +3226,7 @@ isert_set_conn_info(struct iscsi_np *np, struct iscsi_conn *conn,
                 conn->login_port = ntohs(sock_in->sin_port);
 
                 sock_in = (struct sockaddr_in *)&cm_route->addr.src_addr;
-                sprintf(conn->local_ip, "%pI4",
-                        &sock_in->sin_addr.s_addr);
-                conn->local_port = ntohs(sock_in->sin_port);
+                memcpy(&conn->local_sockaddr , &sock_in, sizeof(sock_in));
         }
 }
 
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index d75eeb5ce13a..f752235a1615 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -276,7 +276,7 @@ bool iscsit_check_np_match(
         struct sockaddr_in *sock_in, *sock_in_e;
         struct sockaddr_in6 *sock_in6, *sock_in6_e;
         bool ip_match = false;
-        u16 port;
+        u16 port, port_e;
 
         if (sockaddr->ss_family == AF_INET6) {
                 sock_in6 = (struct sockaddr_in6 *)sockaddr;
@@ -288,6 +288,7 @@ bool iscsit_check_np_match(
                         ip_match = true;
 
                 port = ntohs(sock_in6->sin6_port);
+                port_e = ntohs(sock_in6_e->sin6_port);
         } else {
                 sock_in = (struct sockaddr_in *)sockaddr;
                 sock_in_e = (struct sockaddr_in *)&np->np_sockaddr;
@@ -296,9 +297,10 @@ bool iscsit_check_np_match(
                         ip_match = true;
 
                 port = ntohs(sock_in->sin_port);
+                port_e = ntohs(sock_in_e->sin_port);
         }
 
-        if (ip_match && (np->np_port == port) &&
+        if (ip_match && (port_e == port) &&
             (np->np_network_transport == network_transport))
                 return true;
 
@@ -343,8 +345,6 @@ struct iscsi_np *iscsit_add_np(
         struct __kernel_sockaddr_storage *sockaddr,
         int network_transport)
 {
-        struct sockaddr_in *sock_in;
-        struct sockaddr_in6 *sock_in6;
         struct iscsi_np *np;
         int ret;
 
@@ -367,14 +367,6 @@ struct iscsi_np *iscsit_add_np(
         }
 
         np->np_flags |= NPF_IP_NETWORK;
-        if (sockaddr->ss_family == AF_INET6) {
-                sock_in6 = (struct sockaddr_in6 *)sockaddr;
-                np->np_port = ntohs(sock_in6->sin6_port);
-        } else {
-                sock_in = (struct sockaddr_in *)sockaddr;
-                np->np_port = ntohs(sock_in->sin_port);
-        }
-
         np->np_network_transport = network_transport;
         spin_lock_init(&np->np_thread_lock);
         init_completion(&np->np_restart_comp);
@@ -408,8 +400,8 @@ struct iscsi_np *iscsit_add_np(
         list_add_tail(&np->np_list, &g_np_list);
         mutex_unlock(&np_lock);
 
-        pr_debug("CORE[0] - Added Network Portal: %pISc:%hu on %s\n",
-                &np->np_sockaddr, np->np_port, np->np_transport->name);
+        pr_debug("CORE[0] - Added Network Portal: %pISpc on %s\n",
+                &np->np_sockaddr, np->np_transport->name);
 
         return np;
 }
@@ -478,8 +470,8 @@ int iscsit_del_np(struct iscsi_np *np)
         list_del(&np->np_list);
         mutex_unlock(&np_lock);
 
-        pr_debug("CORE[0] - Removed Network Portal: %pISc:%hu on %s\n",
-                &np->np_sockaddr, np->np_port, np->np_transport->name);
+        pr_debug("CORE[0] - Removed Network Portal: %pISpc on %s\n",
+                &np->np_sockaddr, np->np_transport->name);
 
         iscsit_put_transport(np->np_transport);
         kfree(np);
@@ -3460,6 +3452,7 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd,
                                                 tpg_np_list) {
                                 struct iscsi_np *np = tpg_np->tpg_np;
                                 bool inaddr_any = iscsit_check_inaddr_any(np);
+                                struct __kernel_sockaddr_storage *sockaddr;
 
                                 if (np->np_network_transport != network_transport)
                                         continue;
@@ -3487,18 +3480,15 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd,
                                         }
                                 }
 
-                                if (inaddr_any) {
-                                        len = sprintf(buf, "TargetAddress="
-                                                      "%s:%hu,%hu",
-                                                      conn->local_ip,
-                                                      np->np_port,
-                                                      tpg->tpgt);
-                                } else {
-                                        len = sprintf(buf, "TargetAddress="
-                                                      "%pISpc,%hu",
-                                                      &np->np_sockaddr,
-                                                      tpg->tpgt);
-                                }
+                                if (inaddr_any)
+                                        sockaddr = &conn->local_sockaddr;
+                                else
+                                        sockaddr = &np->np_sockaddr;
+
+                                len = sprintf(buf, "TargetAddress="
+                                              "%pISpc,%hu",
+                                              sockaddr,
+                                              tpg->tpgt);
                                 len += 1;
 
                                 if ((len + payload_len) > buffer_len) {
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index ad6a889dadc0..8d69c4132221 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -344,8 +344,8 @@ static void lio_target_call_delnpfromtpg(
 
         se_tpg = &tpg->tpg_se_tpg;
         pr_debug("LIO_Target_ConfigFS: DEREGISTER -> %s TPGT: %hu"
-                " PORTAL: %pISc:%hu\n", config_item_name(&se_tpg->se_tpg_wwn->wwn_group.cg_item),
-                tpg->tpgt, &tpg_np->tpg_np->np_sockaddr, tpg_np->tpg_np->np_port);
+                " PORTAL: %pISpc\n", config_item_name(&se_tpg->se_tpg_wwn->wwn_group.cg_item),
+                tpg->tpgt, &tpg_np->tpg_np->np_sockaddr);
 
         ret = iscsit_tpg_del_network_portal(tpg, tpg_np);
         if (ret < 0)
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index 88e0b97e8ea6..007299acefbd 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -729,8 +729,8 @@ int iscsi_post_login_handler(
                 }
 
                 pr_debug("iSCSI Login successful on CID: %hu from %s to"
-                        " %s:%hu,%hu\n", conn->cid, conn->login_ip,
-                        conn->local_ip, conn->local_port, tpg->tpgt);
+                        " %pISpc,%hu\n", conn->cid, conn->login_ip,
+                        &conn->local_sockaddr, tpg->tpgt);
 
                 list_add_tail(&conn->conn_list, &sess->sess_conn_list);
                 atomic_inc(&sess->nconn);
@@ -774,8 +774,8 @@ int iscsi_post_login_handler(
         pr_debug("Moving to TARG_SESS_STATE_LOGGED_IN.\n");
         sess->session_state = TARG_SESS_STATE_LOGGED_IN;
 
-        pr_debug("iSCSI Login successful on CID: %hu from %s to %s:%hu,%hu\n",
-                conn->cid, conn->login_ip, conn->local_ip, conn->local_port,
+        pr_debug("iSCSI Login successful on CID: %hu from %s to %pISpc,%hu\n",
+                conn->cid, conn->login_ip, &conn->local_sockaddr,
                 tpg->tpgt);
 
         spin_lock_bh(&sess->conn_lock);
@@ -823,8 +823,8 @@ static void iscsi_handle_login_thread_timeout(unsigned long data)
         struct iscsi_np *np = (struct iscsi_np *) data;
 
         spin_lock_bh(&np->np_thread_lock);
-        pr_err("iSCSI Login timeout on Network Portal %pISc:%hu\n",
-                        &np->np_sockaddr, np->np_port);
+        pr_err("iSCSI Login timeout on Network Portal %pISpc\n",
+                        &np->np_sockaddr);
 
         if (np->np_login_timer_flags & ISCSI_TF_STOP) {
                 spin_unlock_bh(&np->np_thread_lock);
@@ -1027,13 +1027,15 @@ int iscsit_accept_np(struct iscsi_np *np, struct iscsi_conn *conn)
                 rc = conn->sock->ops->getname(conn->sock,
                                 (struct sockaddr *)&sock_in6, &err, 0);
                 if (!rc) {
-                        if (!ipv6_addr_v4mapped(&sock_in6.sin6_addr))
-                                snprintf(conn->local_ip, sizeof(conn->local_ip), "[%pI6c]",
-                                        &sock_in6.sin6_addr.in6_u);
-                        else
-                                snprintf(conn->local_ip, sizeof(conn->local_ip), "%pI4",
-                                        &sock_in6.sin6_addr.s6_addr32[3]);
-                        conn->local_port = ntohs(sock_in6.sin6_port);
+                        if (!ipv6_addr_v4mapped(&sock_in6.sin6_addr)) {
+                                memcpy(&conn->local_sockaddr, &sock_in6, sizeof(sock_in6));
+                        } else {
+                                /* Pretend to be an ipv4 socket */
+                                sock_in.sin_family = AF_INET;
+                                sock_in.sin_port = sock_in6.sin6_port;
+                                memcpy(&sock_in.sin_addr, &sock_in6.sin6_addr.s6_addr32[3], 4);
+                                memcpy(&conn->local_sockaddr, &sock_in, sizeof(sock_in));
+                        }
                 }
         } else {
                 memset(&sock_in, 0, sizeof(struct sockaddr_in));
@@ -1048,11 +1050,8 @@ int iscsit_accept_np(struct iscsi_np *np, struct iscsi_conn *conn)
 
                 rc = conn->sock->ops->getname(conn->sock,
                                 (struct sockaddr *)&sock_in, &err, 0);
-                if (!rc) {
-                        sprintf(conn->local_ip, "%pI4",
-                                        &sock_in.sin_addr.s_addr);
-                        conn->local_port = ntohs(sock_in.sin_port);
-                }
+                if (!rc)
+                        memcpy(&conn->local_sockaddr, &sock_in, sizeof(sock_in));
         }
 
         return 0;
@@ -1302,8 +1301,8 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
         spin_lock_bh(&np->np_thread_lock);
         if (np->np_thread_state != ISCSI_NP_THREAD_ACTIVE) {
                 spin_unlock_bh(&np->np_thread_lock);
-                pr_err("iSCSI Network Portal on %pISc:%hu currently not"
-                        " active.\n", &np->np_sockaddr, np->np_port);
+                pr_err("iSCSI Network Portal on %pISpc currently not"
+                        " active.\n", &np->np_sockaddr);
                 iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
                                 ISCSI_LOGIN_STATUS_SVC_UNAVAILABLE);
                 goto new_sess_out;
@@ -1313,8 +1312,8 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
         conn->network_transport = np->np_network_transport;
 
         pr_debug("Received iSCSI login request from %s on %s Network"
-                " Portal %s:%hu\n", conn->login_ip, np->np_transport->name,
-                conn->local_ip, conn->local_port);
+                " Portal %pISpc\n", conn->login_ip, np->np_transport->name,
+                &conn->local_sockaddr);
 
         pr_debug("Moving to TARG_CONN_STATE_IN_LOGIN.\n");
         conn->conn_state        = TARG_CONN_STATE_IN_LOGIN;
diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index 31007cb4c877..d61ae5167c42 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -514,8 +514,8 @@ struct iscsi_tpg_np *iscsit_tpg_add_network_portal(
                 spin_unlock(&tpg_np_parent->tpg_np_parent_lock);
         }
 
-        pr_debug("CORE[%s] - Added Network Portal: %pISc:%hu,%hu on %s\n",
-                tpg->tpg_tiqn->tiqn, &np->np_sockaddr, np->np_port, tpg->tpgt,
+        pr_debug("CORE[%s] - Added Network Portal: %pISpc,%hu on %s\n",
+                tpg->tpg_tiqn->tiqn, &np->np_sockaddr, tpg->tpgt,
                 np->np_transport->name);
 
         return tpg_np;
@@ -528,8 +528,8 @@ static int iscsit_tpg_release_np(
 {
         iscsit_clear_tpg_np_login_thread(tpg_np, tpg, true);
 
-        pr_debug("CORE[%s] - Removed Network Portal: %pISc:%hu,%hu on %s\n",
-                tpg->tpg_tiqn->tiqn, &np->np_sockaddr, np->np_port, tpg->tpgt,
+        pr_debug("CORE[%s] - Removed Network Portal: %pISpc,%hu on %s\n",
+                tpg->tpg_tiqn->tiqn, &np->np_sockaddr, tpg->tpgt,
                 np->np_transport->name);
 
         tpg_np->tpg_np = NULL;
diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h
index 1051d0c40ddd..b9434117785f 100644
--- a/include/target/iscsi/iscsi_target_core.h
+++ b/include/target/iscsi/iscsi_target_core.h
@@ -519,7 +519,6 @@ struct iscsi_conn {
         u16                     cid;
         /* Remote TCP Port */
         u16                     login_port;
-        u16                     local_port;
         int                     net_size;
         int                     login_family;
         u32                     auth_id;
@@ -531,7 +530,7 @@ struct iscsi_conn {
         u32                     stat_sn;
 #define IPV6_ADDRESS_SPACE                              48
         unsigned char           login_ip[IPV6_ADDRESS_SPACE];
-        unsigned char           local_ip[IPV6_ADDRESS_SPACE];
+        struct __kernel_sockaddr_storage local_sockaddr;
         int                     conn_usage_count;
         int                     conn_waiting_on_uc;
         atomic_t                check_immediate_queue;
@@ -778,7 +777,6 @@ struct iscsi_np {
         enum iscsi_timer_flags_table np_login_timer_flags;
         u32                     np_exports;
         enum np_flags_table     np_flags;
-        u16                     np_port;
         spinlock_t              np_thread_lock;
         struct completion       np_restart_comp;
         struct socket           *np_socket;