net/smc: Add support for obtaining SMCR device list
Deliver SMCR device information via netlink based diagnostic interface. 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>
This commit is contained in:
parent
aaf95523d5
commit
a3db10efcc
|
@ -46,6 +46,7 @@ enum {
|
||||||
SMC_NETLINK_GET_LINK_SMCR,
|
SMC_NETLINK_GET_LINK_SMCR,
|
||||||
SMC_NETLINK_GET_LGR_SMCD,
|
SMC_NETLINK_GET_LGR_SMCD,
|
||||||
SMC_NETLINK_GET_DEV_SMCD,
|
SMC_NETLINK_GET_DEV_SMCD,
|
||||||
|
SMC_NETLINK_GET_DEV_SMCR,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* SMC_GENL_FAMILY top level attributes */
|
/* SMC_GENL_FAMILY top level attributes */
|
||||||
|
@ -56,6 +57,7 @@ enum {
|
||||||
SMC_GEN_LINK_SMCR, /* nest */
|
SMC_GEN_LINK_SMCR, /* nest */
|
||||||
SMC_GEN_LGR_SMCD, /* nest */
|
SMC_GEN_LGR_SMCD, /* nest */
|
||||||
SMC_GEN_DEV_SMCD, /* nest */
|
SMC_GEN_DEV_SMCD, /* nest */
|
||||||
|
SMC_GEN_DEV_SMCR, /* nest */
|
||||||
__SMC_GEN_MAX,
|
__SMC_GEN_MAX,
|
||||||
SMC_GEN_MAX = __SMC_GEN_MAX - 1
|
SMC_GEN_MAX = __SMC_GEN_MAX - 1
|
||||||
};
|
};
|
||||||
|
@ -127,16 +129,20 @@ enum {
|
||||||
SMC_NLA_LGR_D_MAX = __SMC_NLA_LGR_D_MAX - 1
|
SMC_NLA_LGR_D_MAX = __SMC_NLA_LGR_D_MAX - 1
|
||||||
};
|
};
|
||||||
|
|
||||||
/* SMC_NLA_DEV_PORT attributes */
|
/* SMC_NLA_DEV_PORT nested attributes */
|
||||||
enum {
|
enum {
|
||||||
SMC_NLA_DEV_PORT_UNSPEC,
|
SMC_NLA_DEV_PORT_UNSPEC,
|
||||||
SMC_NLA_DEV_PORT_PNET_USR, /* u8 */
|
SMC_NLA_DEV_PORT_PNET_USR, /* u8 */
|
||||||
SMC_NLA_DEV_PORT_PNETID, /* string */
|
SMC_NLA_DEV_PORT_PNETID, /* string */
|
||||||
|
SMC_NLA_DEV_PORT_NETDEV, /* u32 */
|
||||||
|
SMC_NLA_DEV_PORT_STATE, /* u8 */
|
||||||
|
SMC_NLA_DEV_PORT_VALID, /* u8 */
|
||||||
|
SMC_NLA_DEV_PORT_LNK_CNT, /* u32 */
|
||||||
__SMC_NLA_DEV_PORT_MAX,
|
__SMC_NLA_DEV_PORT_MAX,
|
||||||
SMC_NLA_DEV_PORT_MAX = __SMC_NLA_DEV_PORT_MAX - 1
|
SMC_NLA_DEV_PORT_MAX = __SMC_NLA_DEV_PORT_MAX - 1
|
||||||
};
|
};
|
||||||
|
|
||||||
/* SMC_GEN_DEV_SMCD attributes */
|
/* SMC_GEN_DEV_SMCD and SMC_GEN_DEV_SMCR attributes */
|
||||||
enum {
|
enum {
|
||||||
SMC_NLA_DEV_UNSPEC,
|
SMC_NLA_DEV_UNSPEC,
|
||||||
SMC_NLA_DEV_USE_CNT, /* u32 */
|
SMC_NLA_DEV_USE_CNT, /* u32 */
|
||||||
|
@ -147,7 +153,10 @@ enum {
|
||||||
SMC_NLA_DEV_PCI_DEVICE, /* u16 */
|
SMC_NLA_DEV_PCI_DEVICE, /* u16 */
|
||||||
SMC_NLA_DEV_PCI_ID, /* string */
|
SMC_NLA_DEV_PCI_ID, /* string */
|
||||||
SMC_NLA_DEV_PORT, /* nest */
|
SMC_NLA_DEV_PORT, /* nest */
|
||||||
|
SMC_NLA_DEV_PORT2, /* nest */
|
||||||
|
SMC_NLA_DEV_IB_NAME, /* string */
|
||||||
__SMC_NLA_DEV_MAX,
|
__SMC_NLA_DEV_MAX,
|
||||||
SMC_NLA_DEV_MAX = __SMC_NLA_DEV_MAX - 1
|
SMC_NLA_DEV_MAX = __SMC_NLA_DEV_MAX - 1
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* _UAPI_LINUX_SMC_H */
|
#endif /* _UAPI_LINUX_SMC_H */
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
#define SMC_LGR_FREE_DELAY_SERV (600 * HZ)
|
#define SMC_LGR_FREE_DELAY_SERV (600 * HZ)
|
||||||
#define SMC_LGR_FREE_DELAY_CLNT (SMC_LGR_FREE_DELAY_SERV + 10 * HZ)
|
#define SMC_LGR_FREE_DELAY_CLNT (SMC_LGR_FREE_DELAY_SERV + 10 * HZ)
|
||||||
|
|
||||||
static struct smc_lgr_list smc_lgr_list = { /* established link groups */
|
struct smc_lgr_list smc_lgr_list = { /* established link groups */
|
||||||
.lock = __SPIN_LOCK_UNLOCKED(smc_lgr_list.lock),
|
.lock = __SPIN_LOCK_UNLOCKED(smc_lgr_list.lock),
|
||||||
.list = LIST_HEAD_INIT(smc_lgr_list.list),
|
.list = LIST_HEAD_INIT(smc_lgr_list.list),
|
||||||
.num = 0,
|
.num = 0,
|
||||||
|
|
156
net/smc/smc_ib.c
156
net/smc/smc_ib.c
|
@ -25,6 +25,7 @@
|
||||||
#include "smc_core.h"
|
#include "smc_core.h"
|
||||||
#include "smc_wr.h"
|
#include "smc_wr.h"
|
||||||
#include "smc.h"
|
#include "smc.h"
|
||||||
|
#include "smc_netlink.h"
|
||||||
|
|
||||||
#define SMC_MAX_CQE 32766 /* max. # of completion queue elements */
|
#define SMC_MAX_CQE 32766 /* max. # of completion queue elements */
|
||||||
|
|
||||||
|
@ -326,6 +327,161 @@ int smc_ib_create_protection_domain(struct smc_link *lnk)
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool smcr_diag_is_dev_critical(struct smc_lgr_list *smc_lgr,
|
||||||
|
struct smc_ib_device *smcibdev)
|
||||||
|
{
|
||||||
|
struct smc_link_group *lgr;
|
||||||
|
bool rc = false;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
spin_lock_bh(&smc_lgr->lock);
|
||||||
|
list_for_each_entry(lgr, &smc_lgr->list, list) {
|
||||||
|
if (lgr->is_smcd)
|
||||||
|
continue;
|
||||||
|
for (i = 0; i < SMC_LINKS_PER_LGR_MAX; i++) {
|
||||||
|
if (lgr->lnk[i].state == SMC_LNK_UNUSED ||
|
||||||
|
lgr->lnk[i].smcibdev != smcibdev)
|
||||||
|
continue;
|
||||||
|
if (lgr->type == SMC_LGR_SINGLE ||
|
||||||
|
lgr->type == SMC_LGR_ASYMMETRIC_LOCAL) {
|
||||||
|
rc = true;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out:
|
||||||
|
spin_unlock_bh(&smc_lgr->lock);
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int smc_nl_handle_dev_port(struct sk_buff *skb,
|
||||||
|
struct ib_device *ibdev,
|
||||||
|
struct smc_ib_device *smcibdev,
|
||||||
|
int port)
|
||||||
|
{
|
||||||
|
char smc_pnet[SMC_MAX_PNETID_LEN + 1];
|
||||||
|
struct nlattr *port_attrs;
|
||||||
|
unsigned char port_state;
|
||||||
|
int lnk_count = 0;
|
||||||
|
|
||||||
|
port_attrs = nla_nest_start(skb, SMC_NLA_DEV_PORT + port);
|
||||||
|
if (!port_attrs)
|
||||||
|
goto errout;
|
||||||
|
|
||||||
|
if (nla_put_u8(skb, SMC_NLA_DEV_PORT_PNET_USR,
|
||||||
|
smcibdev->pnetid_by_user[port]))
|
||||||
|
goto errattr;
|
||||||
|
snprintf(smc_pnet, sizeof(smc_pnet), "%s",
|
||||||
|
(char *)&smcibdev->pnetid[port]);
|
||||||
|
if (nla_put_string(skb, SMC_NLA_DEV_PORT_PNETID, smc_pnet))
|
||||||
|
goto errattr;
|
||||||
|
if (nla_put_u32(skb, SMC_NLA_DEV_PORT_NETDEV,
|
||||||
|
smcibdev->ndev_ifidx[port]))
|
||||||
|
goto errattr;
|
||||||
|
if (nla_put_u8(skb, SMC_NLA_DEV_PORT_VALID, 1))
|
||||||
|
goto errattr;
|
||||||
|
port_state = smc_ib_port_active(smcibdev, port + 1);
|
||||||
|
if (nla_put_u8(skb, SMC_NLA_DEV_PORT_STATE, port_state))
|
||||||
|
goto errattr;
|
||||||
|
lnk_count = atomic_read(&smcibdev->lnk_cnt_by_port[port]);
|
||||||
|
if (nla_put_u32(skb, SMC_NLA_DEV_PORT_LNK_CNT, lnk_count))
|
||||||
|
goto errattr;
|
||||||
|
nla_nest_end(skb, port_attrs);
|
||||||
|
return 0;
|
||||||
|
errattr:
|
||||||
|
nla_nest_cancel(skb, port_attrs);
|
||||||
|
errout:
|
||||||
|
return -EMSGSIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int smc_nl_handle_smcr_dev(struct smc_ib_device *smcibdev,
|
||||||
|
struct sk_buff *skb,
|
||||||
|
struct netlink_callback *cb)
|
||||||
|
{
|
||||||
|
char smc_ibname[IB_DEVICE_NAME_MAX + 1];
|
||||||
|
struct smc_pci_dev smc_pci_dev;
|
||||||
|
struct pci_dev *pci_dev;
|
||||||
|
unsigned char is_crit;
|
||||||
|
struct nlattr *attrs;
|
||||||
|
void *nlh;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
nlh = genlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,
|
||||||
|
&smc_gen_nl_family, NLM_F_MULTI,
|
||||||
|
SMC_NETLINK_GET_DEV_SMCR);
|
||||||
|
if (!nlh)
|
||||||
|
goto errmsg;
|
||||||
|
attrs = nla_nest_start(skb, SMC_GEN_DEV_SMCR);
|
||||||
|
if (!attrs)
|
||||||
|
goto errout;
|
||||||
|
is_crit = smcr_diag_is_dev_critical(&smc_lgr_list, smcibdev);
|
||||||
|
if (nla_put_u8(skb, SMC_NLA_DEV_IS_CRIT, is_crit))
|
||||||
|
goto errattr;
|
||||||
|
memset(&smc_pci_dev, 0, sizeof(smc_pci_dev));
|
||||||
|
pci_dev = to_pci_dev(smcibdev->ibdev->dev.parent);
|
||||||
|
smc_set_pci_values(pci_dev, &smc_pci_dev);
|
||||||
|
if (nla_put_u32(skb, SMC_NLA_DEV_PCI_FID, smc_pci_dev.pci_fid))
|
||||||
|
goto errattr;
|
||||||
|
if (nla_put_u16(skb, SMC_NLA_DEV_PCI_CHID, smc_pci_dev.pci_pchid))
|
||||||
|
goto errattr;
|
||||||
|
if (nla_put_u16(skb, SMC_NLA_DEV_PCI_VENDOR, smc_pci_dev.pci_vendor))
|
||||||
|
goto errattr;
|
||||||
|
if (nla_put_u16(skb, SMC_NLA_DEV_PCI_DEVICE, smc_pci_dev.pci_device))
|
||||||
|
goto errattr;
|
||||||
|
if (nla_put_string(skb, SMC_NLA_DEV_PCI_ID, smc_pci_dev.pci_id))
|
||||||
|
goto errattr;
|
||||||
|
snprintf(smc_ibname, sizeof(smc_ibname), "%s", smcibdev->ibdev->name);
|
||||||
|
if (nla_put_string(skb, SMC_NLA_DEV_IB_NAME, smc_ibname))
|
||||||
|
goto errattr;
|
||||||
|
for (i = 1; i <= SMC_MAX_PORTS; i++) {
|
||||||
|
if (!rdma_is_port_valid(smcibdev->ibdev, i))
|
||||||
|
continue;
|
||||||
|
if (smc_nl_handle_dev_port(skb, smcibdev->ibdev,
|
||||||
|
smcibdev, i - 1))
|
||||||
|
goto errattr;
|
||||||
|
}
|
||||||
|
|
||||||
|
nla_nest_end(skb, attrs);
|
||||||
|
genlmsg_end(skb, nlh);
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
errattr:
|
||||||
|
nla_nest_cancel(skb, attrs);
|
||||||
|
errout:
|
||||||
|
genlmsg_cancel(skb, nlh);
|
||||||
|
errmsg:
|
||||||
|
return -EMSGSIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void smc_nl_prep_smcr_dev(struct smc_ib_devices *dev_list,
|
||||||
|
struct sk_buff *skb,
|
||||||
|
struct netlink_callback *cb)
|
||||||
|
{
|
||||||
|
struct smc_nl_dmp_ctx *cb_ctx = smc_nl_dmp_ctx(cb);
|
||||||
|
struct smc_ib_device *smcibdev;
|
||||||
|
int snum = cb_ctx->pos[0];
|
||||||
|
int num = 0;
|
||||||
|
|
||||||
|
mutex_lock(&dev_list->mutex);
|
||||||
|
list_for_each_entry(smcibdev, &dev_list->list, list) {
|
||||||
|
if (num < snum)
|
||||||
|
goto next;
|
||||||
|
if (smc_nl_handle_smcr_dev(smcibdev, skb, cb))
|
||||||
|
goto errout;
|
||||||
|
next:
|
||||||
|
num++;
|
||||||
|
}
|
||||||
|
errout:
|
||||||
|
mutex_unlock(&dev_list->mutex);
|
||||||
|
cb_ctx->pos[0] = num;
|
||||||
|
}
|
||||||
|
|
||||||
|
int smcr_nl_get_device(struct sk_buff *skb, struct netlink_callback *cb)
|
||||||
|
{
|
||||||
|
smc_nl_prep_smcr_dev(&smc_ib_devices, skb, cb);
|
||||||
|
return skb->len;
|
||||||
|
}
|
||||||
|
|
||||||
static void smc_ib_qp_event_handler(struct ib_event *ibevent, void *priv)
|
static void smc_ib_qp_event_handler(struct ib_event *ibevent, void *priv)
|
||||||
{
|
{
|
||||||
struct smc_link *lnk = (struct smc_link *)priv;
|
struct smc_link *lnk = (struct smc_link *)priv;
|
||||||
|
|
|
@ -30,6 +30,7 @@ struct smc_ib_devices { /* list of smc ib devices definition */
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct smc_ib_devices smc_ib_devices; /* list of smc ib devices */
|
extern struct smc_ib_devices smc_ib_devices; /* list of smc ib devices */
|
||||||
|
extern struct smc_lgr_list smc_lgr_list; /* list of linkgroups */
|
||||||
|
|
||||||
struct smc_ib_device { /* ib-device infos for smc */
|
struct smc_ib_device { /* ib-device infos for smc */
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
|
@ -91,4 +92,5 @@ void smc_ib_sync_sg_for_device(struct smc_link *lnk,
|
||||||
int smc_ib_determine_gid(struct smc_ib_device *smcibdev, u8 ibport,
|
int smc_ib_determine_gid(struct smc_ib_device *smcibdev, u8 ibport,
|
||||||
unsigned short vlan_id, u8 gid[], u8 *sgid_index);
|
unsigned short vlan_id, u8 gid[], u8 *sgid_index);
|
||||||
bool smc_ib_is_valid_local_systemid(void);
|
bool smc_ib_is_valid_local_systemid(void);
|
||||||
|
int smcr_nl_get_device(struct sk_buff *skb, struct netlink_callback *cb);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
#include "smc_core.h"
|
#include "smc_core.h"
|
||||||
#include "smc_ism.h"
|
#include "smc_ism.h"
|
||||||
|
#include "smc_ib.h"
|
||||||
#include "smc_netlink.h"
|
#include "smc_netlink.h"
|
||||||
|
|
||||||
#define SMC_CMD_MAX_ATTR 1
|
#define SMC_CMD_MAX_ATTR 1
|
||||||
|
@ -49,6 +50,11 @@ static const struct genl_ops smc_gen_nl_ops[] = {
|
||||||
/* can be retrieved by unprivileged users */
|
/* can be retrieved by unprivileged users */
|
||||||
.dumpit = smcd_nl_get_device,
|
.dumpit = smcd_nl_get_device,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.cmd = SMC_NETLINK_GET_DEV_SMCR,
|
||||||
|
/* can be retrieved by unprivileged users */
|
||||||
|
.dumpit = smcr_nl_get_device,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct nla_policy smc_gen_nl_policy[2] = {
|
static const struct nla_policy smc_gen_nl_policy[2] = {
|
||||||
|
|
Loading…
Reference in a new issue