net/smc: Add diagnostic information to link structure

During link creation add net-device ifindex and ib-device
name to link structure. This is needed for diagnostic purposes.

When diagnostic information is gathered, we need to traverse
device, linkgroup and link structures, to be able to do that
we need to hold a spinlock for the linkgroup list, without this
diagnostic information in link structure, another device list
mutex holding would be necessary to dereference the device
pointer in the link structure which would be impossible when
holding a spinlock already.

Signed-off-by: Guvenc Gulce <guvenc@linux.ibm.com>
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index 46087cec3bcd5fc926a5089f5be82109e24e36e5..0088511e30bfa2cd5834c075dcdaa8953117ac22 100644 (file)
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -313,6 +313,15 @@ static u8 smcr_next_link_id(struct smc_link_group *lgr)
        return link_id;
 }
 
+static void smcr_copy_dev_info_to_link(struct smc_link *link)
+{
+       struct smc_ib_device *smcibdev = link->smcibdev;
+
+       snprintf(link->ibname, sizeof(link->ibname), "%s",
+                smcibdev->ibdev->name);
+       link->ndev_ifidx = smcibdev->ndev_ifidx[link->ibport - 1];
+}
+
 int smcr_link_init(struct smc_link_group *lgr, struct smc_link *lnk,
                   u8 link_idx, struct smc_init_info *ini)
 {
@@ -327,6 +336,7 @@ int smcr_link_init(struct smc_link_group *lgr, struct smc_link *lnk,
        lnk->smcibdev = ini->ib_dev;
        lnk->ibport = ini->ib_port;
        smc_ibdev_cnt_inc(lnk);
+       smcr_copy_dev_info_to_link(lnk);
        lnk->path_mtu = ini->ib_dev->pattr[ini->ib_port - 1].active_mtu;
        atomic_set(&lnk->conn_cnt, 0);
        smc_llc_link_set_uid(lnk);

diff --git a/net/smc/smc_core.h b/net/smc/smc_core.h
index eefb6770b26855a0419320fb4cd5caded8a282f4..3a1bb8e4b81fbdc5420bba1b18bf72967f9e0d0e 100644 (file)
--- a/net/smc/smc_core.h
+++ b/net/smc/smc_core.h
@@ -124,6 +124,8 @@ struct smc_link {
        u8                      link_is_asym;   /* is link asymmetric? */
        struct smc_link_group   *lgr;           /* parent link group */
        struct work_struct      link_down_wrk;  /* wrk to bring link down */
+       char                    ibname[IB_DEVICE_NAME_MAX]; /* ib device name */
+       int                     ndev_ifidx; /* network device ifindex */
 
        enum smc_link_state     state;          /* state of link */
        struct delayed_work     llc_testlink_wrk; /* testlink worker */