net/smc: save SMC-R peer link_uid

During SMC-R link establishment the peers exchange the link_uid that
is used for debugging purposes. Save the peer link_uid in smc_link so it
can be retrieved by the smc_diag netlink interface.

Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Reviewed-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index c67272007f4112edd87bde51eaeb52800c1ec127..4e4421c95ca17007b6b1a9084f80468b32b38795 100644 (file)
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -390,6 +390,7 @@ static int smcr_clnt_conf_first_link(struct smc_sock *smc)
                                      SMC_CLC_DECLINE, CLC_WAIT_TIME_SHORT);
                return rc == -EAGAIN ? SMC_CLC_DECL_TIMEOUT_CL : rc;
        }
+       smc_llc_save_peer_uid(qentry);
        rc = smc_llc_eval_conf_link(qentry, SMC_LLC_REQ);
        smc_llc_flow_qentry_del(&link->lgr->llc_flow_lcl);
        if (rc)
@@ -1056,6 +1057,7 @@ static int smcr_serv_conf_first_link(struct smc_sock *smc)
                                      SMC_CLC_DECLINE, CLC_WAIT_TIME_SHORT);
                return rc == -EAGAIN ? SMC_CLC_DECL_TIMEOUT_CL : rc;
        }
+       smc_llc_save_peer_uid(qentry);
        rc = smc_llc_eval_conf_link(qentry, SMC_LLC_RESP);
        smc_llc_flow_qentry_del(&link->lgr->llc_flow_lcl);
        if (rc)

diff --git a/net/smc/smc_core.h b/net/smc/smc_core.h
index e2ace20db7fd1f99eac2381e4fe75efaf3522c7b..4ae76802214ff5c26f8608942d8094c441053a57 100644 (file)
--- a/net/smc/smc_core.h
+++ b/net/smc/smc_core.h
@@ -119,6 +119,7 @@ struct smc_link {
        u8                      peer_gid[SMC_GID_SIZE]; /* gid of peer*/
        u8                      link_id;        /* unique # within link group */
        u8                      link_uid[SMC_LGR_ID_SIZE]; /* unique lnk id */
+       u8                      peer_link_uid[SMC_LGR_ID_SIZE]; /* peer uid */
        u8                      link_idx;       /* index in lgr link array */
        u8                      link_is_asym;   /* is link asymmetric? */
        struct smc_link_group   *lgr;           /* parent link group */

diff --git a/net/smc/smc_llc.c b/net/smc/smc_llc.c
index afb889d608819c154c50be7a861c93516a6a1467..66ddc9cf5e2fd1db4e974c104e0dfa5aa5f45094 100644 (file)
--- a/net/smc/smc_llc.c
+++ b/net/smc/smc_llc.c
@@ -770,6 +770,7 @@ static int smc_llc_cli_conf_link(struct smc_link *link,
                smc_llc_flow_qentry_del(&lgr->llc_flow_lcl);
                return -ENOLINK;
        }
+       smc_llc_save_peer_uid(qentry);
        smc_llc_flow_qentry_del(&lgr->llc_flow_lcl);
 
        rc = smc_ib_modify_qp_rts(link_new);
@@ -1041,6 +1042,7 @@ static int smc_llc_srv_conf_link(struct smc_link *link,
                                         false, SMC_LLC_DEL_LOST_PATH);
                return -ENOLINK;
        }
+       smc_llc_save_peer_uid(qentry);
        smc_llc_link_active(link_new);
        if (lgr_new_t == SMC_LGR_ASYMMETRIC_LOCAL ||
            lgr_new_t == SMC_LGR_ASYMMETRIC_PEER)
@@ -1783,6 +1785,13 @@ void smc_llc_link_set_uid(struct smc_link *link)
        memcpy(link->link_uid, &link_uid, SMC_LGR_ID_SIZE);
 }
 
+/* save peers link user id, used for debug purposes */
+void smc_llc_save_peer_uid(struct smc_llc_qentry *qentry)
+{
+       memcpy(qentry->link->peer_link_uid, qentry->msg.confirm_link.link_uid,
+              SMC_LGR_ID_SIZE);
+}
+
 /* evaluate confirm link request or response */
 int smc_llc_eval_conf_link(struct smc_llc_qentry *qentry,
                           enum smc_llc_reqresp type)

diff --git a/net/smc/smc_llc.h b/net/smc/smc_llc.h
index 1b68f229cb99fa7d5f6e6ed0a9a0ca24c361d2b7..55287376112d974e6b1817c15515300203c88c97 100644 (file)
--- a/net/smc/smc_llc.h
+++ b/net/smc/smc_llc.h
@@ -93,6 +93,7 @@ void smc_llc_flow_stop(struct smc_link_group *lgr, struct smc_llc_flow *flow);
 int smc_llc_eval_conf_link(struct smc_llc_qentry *qentry,
                           enum smc_llc_reqresp type);
 void smc_llc_link_set_uid(struct smc_link *link);
+void smc_llc_save_peer_uid(struct smc_llc_qentry *qentry);
 struct smc_llc_qentry *smc_llc_wait(struct smc_link_group *lgr,
                                    struct smc_link *lnk,
                                    int time_out, u8 exp_msg);