Commit 8f9dde4b authored by Guvenc Gulce's avatar Guvenc Gulce Committed by Jakub Kicinski
Browse files

net/smc: Add SMC-D Linkgroup diagnostic support 



Deliver SMCD Linkgroup information via netlink based
diagnostic interface.

Signed-off-by: default avatarGuvenc Gulce <guvenc@linux.ibm.com>
Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5a7e09d5

include/uapi/linux/smc.h

+27 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum { 
	SMC_NETLINK_GET_SYS_INFO = 1,

	SMC_NETLINK_GET_LGR_SMCR,

	SMC_NETLINK_GET_LINK_SMCR,

	SMC_NETLINK_GET_LGR_SMCD,

};



/* SMC_GENL_FAMILY top level attributes */
@@ -50,6 +51,7 @@ enum { 
	SMC_GEN_SYS_INFO,		/* nest */

	SMC_GEN_LGR_SMCR,		/* nest */

	SMC_GEN_LINK_SMCR,		/* nest */

	SMC_GEN_LGR_SMCD,		/* nest */

	__SMC_GEN_MAX,

	SMC_GEN_MAX = __SMC_GEN_MAX - 1

};
@@ -66,6 +68,15 @@ enum { 
	SMC_NLA_SYS_MAX = __SMC_NLA_SYS_MAX - 1

};



/* SMC_NLA_LGR_V2 nested attributes */

enum {

	SMC_NLA_LGR_V2_VER,		/* u8 */

	SMC_NLA_LGR_V2_REL,		/* u8 */

	SMC_NLA_LGR_V2_OS,		/* u8 */

	SMC_NLA_LGR_V2_NEG_EID,		/* string */

	SMC_NLA_LGR_V2_PEER_HOST,	/* string */

};



/* SMC_GEN_LGR_SMCR attributes */

enum {

	SMC_NLA_LGR_R_UNSPEC,
@@ -95,4 +106,20 @@ enum { 
	__SMC_NLA_LINK_MAX,

	SMC_NLA_LINK_MAX = __SMC_NLA_LINK_MAX - 1

};



/* SMC_GEN_LGR_SMCD attributes */

enum {

	SMC_NLA_LGR_D_UNSPEC,

	SMC_NLA_LGR_D_ID,		/* u32 */

	SMC_NLA_LGR_D_GID,		/* u64 */

	SMC_NLA_LGR_D_PEER_GID,		/* u64 */

	SMC_NLA_LGR_D_VLAN_ID,		/* u8 */

	SMC_NLA_LGR_D_CONNS_NUM,	/* u32 */

	SMC_NLA_LGR_D_PNETID,		/* string */

	SMC_NLA_LGR_D_CHID,		/* u16 */

	SMC_NLA_LGR_D_PAD,		/* flag */

	SMC_NLA_LGR_V2,			/* nest */

	__SMC_NLA_LGR_D_MAX,

	SMC_NLA_LGR_D_MAX = __SMC_NLA_LGR_D_MAX - 1

};

#endif /* _UAPI_LINUX_SMC_H */

net/smc/smc_core.c

+130 −0
Original line number Diff line number Diff line
@@ -426,6 +426,130 @@ static void smc_nl_fill_lgr_list(struct smc_lgr_list *smc_lgr, 
	cb_ctx->pos[0] = num;

}



static int smc_nl_fill_smcd_lgr(struct smc_link_group *lgr,

				struct sk_buff *skb,

				struct netlink_callback *cb)

{

	char smc_host[SMC_MAX_HOSTNAME_LEN + 1];

	char smc_pnet[SMC_MAX_PNETID_LEN + 1];

	char smc_eid[SMC_MAX_EID_LEN + 1];

	struct nlattr *v2_attrs;

	struct nlattr *attrs;

	void *nlh;



	nlh = genlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,

			  &smc_gen_nl_family, NLM_F_MULTI,

			  SMC_NETLINK_GET_LGR_SMCD);

	if (!nlh)

		goto errmsg;



	attrs = nla_nest_start(skb, SMC_GEN_LGR_SMCD);

	if (!attrs)

		goto errout;



	if (nla_put_u32(skb, SMC_NLA_LGR_D_ID, *((u32 *)&lgr->id)))

		goto errattr;

	if (nla_put_u64_64bit(skb, SMC_NLA_LGR_D_GID, lgr->smcd->local_gid,

			      SMC_NLA_LGR_D_PAD))

		goto errattr;

	if (nla_put_u64_64bit(skb, SMC_NLA_LGR_D_PEER_GID, lgr->peer_gid,

			      SMC_NLA_LGR_D_PAD))

		goto errattr;

	if (nla_put_u8(skb, SMC_NLA_LGR_D_VLAN_ID, lgr->vlan_id))

		goto errattr;

	if (nla_put_u32(skb, SMC_NLA_LGR_D_CONNS_NUM, lgr->conns_num))

		goto errattr;

	if (nla_put_u32(skb, SMC_NLA_LGR_D_CHID, smc_ism_get_chid(lgr->smcd)))

		goto errattr;

	snprintf(smc_pnet, sizeof(smc_pnet), "%s", lgr->smcd->pnetid);

	if (nla_put_string(skb, SMC_NLA_LGR_D_PNETID, smc_pnet))

		goto errattr;



	v2_attrs = nla_nest_start(skb, SMC_NLA_LGR_V2);

	if (!v2_attrs)

		goto errattr;

	if (nla_put_u8(skb, SMC_NLA_LGR_V2_VER, lgr->smc_version))

		goto errv2attr;

	if (nla_put_u8(skb, SMC_NLA_LGR_V2_REL, lgr->peer_smc_release))

		goto errv2attr;

	if (nla_put_u8(skb, SMC_NLA_LGR_V2_OS, lgr->peer_os))

		goto errv2attr;

	snprintf(smc_host, sizeof(smc_host), "%s", lgr->peer_hostname);

	if (nla_put_string(skb, SMC_NLA_LGR_V2_PEER_HOST, smc_host))

		goto errv2attr;

	snprintf(smc_eid, sizeof(smc_eid), "%s", lgr->negotiated_eid);

	if (nla_put_string(skb, SMC_NLA_LGR_V2_NEG_EID, smc_eid))

		goto errv2attr;



	nla_nest_end(skb, v2_attrs);

	nla_nest_end(skb, attrs);

	genlmsg_end(skb, nlh);

	return 0;



errv2attr:

	nla_nest_cancel(skb, v2_attrs);

errattr:

	nla_nest_cancel(skb, attrs);

errout:

	genlmsg_cancel(skb, nlh);

errmsg:

	return -EMSGSIZE;

}



static int smc_nl_handle_smcd_lgr(struct smcd_dev *dev,

				  struct sk_buff *skb,

				  struct netlink_callback *cb)

{

	struct smc_nl_dmp_ctx *cb_ctx = smc_nl_dmp_ctx(cb);

	struct smc_link_group *lgr;

	int snum = cb_ctx->pos[1];

	int rc = 0, num = 0;



	spin_lock_bh(&dev->lgr_lock);

	list_for_each_entry(lgr, &dev->lgr_list, list) {

		if (!lgr->is_smcd)

			continue;

		if (num < snum)

			goto next;

		rc = smc_nl_fill_smcd_lgr(lgr, skb, cb);

		if (rc)

			goto errout;

next:

		num++;

	}

errout:

	spin_unlock_bh(&dev->lgr_lock);

	cb_ctx->pos[1] = num;

	return rc;

}



static int smc_nl_fill_smcd_dev(struct smcd_dev_list *dev_list,

				struct sk_buff *skb,

				struct netlink_callback *cb)

{

	struct smc_nl_dmp_ctx *cb_ctx = smc_nl_dmp_ctx(cb);

	struct smcd_dev *smcd_dev;

	int snum = cb_ctx->pos[0];

	int rc = 0, num = 0;



	mutex_lock(&dev_list->mutex);

	list_for_each_entry(smcd_dev, &dev_list->list, list) {

		if (list_empty(&smcd_dev->lgr_list))

			continue;

		if (num < snum)

			goto next;

		rc = smc_nl_handle_smcd_lgr(smcd_dev, skb, cb);

		if (rc)

			goto errout;

next:

		num++;

	}

errout:

	mutex_unlock(&dev_list->mutex);

	cb_ctx->pos[0] = num;

	return rc;

}



int smcr_nl_get_lgr(struct sk_buff *skb, struct netlink_callback *cb)

{

	bool list_links = false;
@@ -442,6 +566,12 @@ int smcr_nl_get_link(struct sk_buff *skb, struct netlink_callback *cb) 
	return skb->len;

}



int smcd_nl_get_lgr(struct sk_buff *skb, struct netlink_callback *cb)

{

	smc_nl_fill_smcd_dev(&smcd_dev_list, skb, cb);

	return skb->len;

}



void smc_lgr_cleanup_early(struct smc_connection *conn)

{

	struct smc_link_group *lgr = conn->lgr;

net/smc/smc_core.h

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ void smcr_link_down_cond_sched(struct smc_link *lnk); 
int smc_nl_get_sys_info(struct sk_buff *skb, struct netlink_callback *cb);

int smcr_nl_get_lgr(struct sk_buff *skb, struct netlink_callback *cb);

int smcr_nl_get_link(struct sk_buff *skb, struct netlink_callback *cb);

int smcd_nl_get_lgr(struct sk_buff *skb, struct netlink_callback *cb);



static inline struct smc_link_group *smc_get_lgr(struct smc_link *link)

{

net/smc/smc_netlink.c

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ static const struct genl_ops smc_gen_nl_ops[] = { 
		/* can be retrieved by unprivileged users */

		.dumpit = smcr_nl_get_link,

	},

	{

		.cmd = SMC_NETLINK_GET_LGR_SMCD,

		/* can be retrieved by unprivileged users */

		.dumpit = smcd_nl_get_lgr,

	},

};



static const struct nla_policy smc_gen_nl_policy[2] = {