| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Sat, 7 Nov 2020 13:59:54 +0100
From: Karsten Graul <kgraul@...ux.ibm.com>
To: davem@...emloft.net
Cc: netdev@...r.kernel.org, linux-s390@...r.kernel.org,
hca@...ux.ibm.com, raspl@...ux.ibm.com
Subject: [PATCH net-next v3 11/15] net/smc: Add SMC-D Linkgroup diagnostic support
From: Guvenc Gulce <guvenc@...ux.ibm.com>
Deliver SMCD Linkgroup information via netlink based
diagnostic interface.
Signed-off-by: Guvenc Gulce <guvenc@...ux.ibm.com>
Signed-off-by: Karsten Graul <kgraul@...ux.ibm.com>
---
include/uapi/linux/smc_diag.h | 7 +++
net/smc/smc_core.c | 7 +++
net/smc/smc_core.h | 2 +
net/smc/smc_diag.c | 108 ++++++++++++++++++++++++++++++++++
4 files changed, 124 insertions(+)
diff --git a/include/uapi/linux/smc_diag.h b/include/uapi/linux/smc_diag.h
index a57df0296aa4..5a80172df757 100644
--- a/include/uapi/linux/smc_diag.h
+++ b/include/uapi/linux/smc_diag.h
@@ -81,6 +81,7 @@ enum {
enum {
SMC_DIAG_LGR_INFO_SMCR = 1,
SMC_DIAG_LGR_INFO_SMCR_LINK,
+ SMC_DIAG_LGR_INFO_SMCD,
};
#define SMC_DIAG_MAX (__SMC_DIAG_MAX - 1)
@@ -155,6 +156,12 @@ struct smcd_diag_dmbinfo { /* SMC-D Socket internals */
__aligned_u64 my_gid; /* My GID */
__aligned_u64 token; /* Token of DMB */
__aligned_u64 peer_token; /* Token of remote DMBE */
+ /* Fields above used by legacy v1 code */
+ __u8 pnet_id[SMC_MAX_PNETID_LEN]; /* Pnet ID */
+ __u32 conns_num; /* Number of connections */
+ __u16 chid; /* Linkgroup CHID */
+ __u8 vlan_id; /* Linkgroup vlan id */
+ struct smc_diag_v2_lgr_info v2_lgr_info; /* SMCv2 info */
};
struct smc_diag_lgr {
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index 07b7cc88f9b9..c711b4967547 100644
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -204,6 +204,11 @@ static void smc_lgr_unregister_conn(struct smc_connection *conn)
conn->lgr = NULL;
}
+static struct smcd_dev_list *smc_get_smcd_dev_list(void)
+{
+ return &smcd_dev_list;
+}
+
static struct smc_lgr_list *smc_get_lgr_list(void)
{
return &smc_lgr_list;
@@ -211,6 +216,8 @@ static struct smc_lgr_list *smc_get_lgr_list(void)
static const struct smc_diag_ops smc_diag_ops = {
.get_lgr_list = smc_get_lgr_list,
+ .get_smcd_devices = smc_get_smcd_dev_list,
+ .get_chid = smc_ism_get_chid,
};
const struct smc_diag_ops *smc_get_diag_ops(void)
diff --git a/net/smc/smc_core.h b/net/smc/smc_core.h
index 0b6951a0b2d8..a705a67d6a39 100644
--- a/net/smc/smc_core.h
+++ b/net/smc/smc_core.h
@@ -23,6 +23,8 @@
/* Functions which are needed for diagnostic purposes by smc_diag module */
struct smc_diag_ops {
struct smc_lgr_list *(*get_lgr_list)(void);
+ struct smcd_dev_list *(*get_smcd_devices)(void);
+ u16 (*get_chid)(struct smcd_dev *smcd);
};
struct smc_lgr_list { /* list of link group definition */
diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c
index 9a41548d6263..a644e2299dbc 100644
--- a/net/smc/smc_diag.c
+++ b/net/smc/smc_diag.c
@@ -21,6 +21,7 @@
#include "smc.h"
#include "smc_ib.h"
+#include "smc_ism.h"
#include "smc_core.h"
static const struct smc_diag_ops *smc_diag_ops;
@@ -254,6 +255,53 @@ static int smc_diag_fill_lgr_link(struct smc_link_group *lgr,
return -EMSGSIZE;
}
+static int smc_diag_fill_smcd_lgr(struct smc_link_group *lgr,
+ struct sk_buff *skb,
+ struct netlink_callback *cb,
+ struct smc_diag_req_v2 *req)
+{
+ struct smcd_diag_dmbinfo smcd_lgr;
+ struct nlmsghdr *nlh;
+ int dummy = 0;
+ int rc = 0;
+
+ nlh = nlmsg_put(skb, NETLINK_CB(cb->skb).portid, MAGIC_SEQ_V2_ACK,
+ cb->nlh->nlmsg_type, 0, NLM_F_MULTI);
+ if (!nlh)
+ return -EMSGSIZE;
+
+ memset(&smcd_lgr, 0, sizeof(smcd_lgr));
+ memcpy(&smcd_lgr.linkid, lgr->id, sizeof(lgr->id));
+ smcd_lgr.conns_num = lgr->conns_num;
+ smcd_lgr.vlan_id = lgr->vlan_id;
+ smcd_lgr.peer_gid = lgr->peer_gid;
+ smcd_lgr.my_gid = lgr->smcd->local_gid;
+ smcd_lgr.chid = smc_diag_ops->get_chid(lgr->smcd);
+ memcpy(&smcd_lgr.v2_lgr_info.negotiated_eid, lgr->negotiated_eid,
+ sizeof(smcd_lgr.v2_lgr_info.negotiated_eid));
+ memcpy(&smcd_lgr.v2_lgr_info.peer_hostname, lgr->peer_hostname,
+ sizeof(smcd_lgr.v2_lgr_info.peer_hostname));
+ smcd_lgr.v2_lgr_info.peer_os = lgr->peer_os;
+ smcd_lgr.v2_lgr_info.peer_smc_release = lgr->peer_smc_release;
+ smcd_lgr.v2_lgr_info.smc_version = lgr->smc_version;
+ snprintf(smcd_lgr.pnet_id, sizeof(smcd_lgr.pnet_id), "%s",
+ lgr->smcd->pnetid);
+
+ /* Just a command place holder to signal back the command reply type */
+ if (nla_put(skb, SMC_DIAG_GET_LGR_INFO, sizeof(dummy), &dummy) < 0)
+ goto errout;
+
+ if (nla_put(skb, SMC_DIAG_LGR_INFO_SMCD,
+ sizeof(smcd_lgr), &smcd_lgr) < 0)
+ goto errout;
+
+ nlmsg_end(skb, nlh);
+ return rc;
+errout:
+ nlmsg_cancel(skb, nlh);
+ return -EMSGSIZE;
+}
+
static int smc_diag_fill_lgr(struct smc_link_group *lgr,
struct sk_buff *skb,
struct netlink_callback *cb,
@@ -345,6 +393,63 @@ static int smc_diag_fill_lgr_list(struct smc_lgr_list *smc_lgr,
return rc;
}
+static int smc_diag_handle_smcd_lgr(struct smcd_dev *dev,
+ struct sk_buff *skb,
+ struct netlink_callback *cb,
+ struct smc_diag_req_v2 *req)
+{
+ struct smc_diag_dump_ctx *cb_ctx = smc_dump_context(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_diag_fill_smcd_lgr(lgr, skb, cb, req);
+ if (rc < 0)
+ goto errout;
+next:
+ num++;
+ }
+errout:
+ spin_unlock_bh(&dev->lgr_lock);
+ cb_ctx->pos[1] = num;
+ return rc;
+}
+
+static int smc_diag_fill_smcd_dev(struct smcd_dev_list *dev_list,
+ struct sk_buff *skb,
+ struct netlink_callback *cb,
+ struct smc_diag_req_v2 *req)
+{
+ struct smc_diag_dump_ctx *cb_ctx = smc_dump_context(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_diag_handle_smcd_lgr(smcd_dev, skb,
+ cb, req);
+ if (rc < 0)
+ goto errout;
+next:
+ num++;
+ }
+errout:
+ mutex_unlock(&dev_list->mutex);
+ cb_ctx->pos[0] = num;
+ return rc;
+}
+
static int __smc_diag_dump(struct sock *sk, struct sk_buff *skb,
struct netlink_callback *cb,
const struct smc_diag_req *req)
@@ -443,6 +548,9 @@ static int smc_diag_dump_ext(struct sk_buff *skb, struct netlink_callback *cb)
if ((req->cmd_ext & (1 << (SMC_DIAG_LGR_INFO_SMCR - 1))))
smc_diag_fill_lgr_list(smc_diag_ops->get_lgr_list(),
skb, cb, req);
+ if ((req->cmd_ext & (1 << (SMC_DIAG_LGR_INFO_SMCD - 1))))
+ smc_diag_fill_smcd_dev(smc_diag_ops->get_smcd_devices(),
+ skb, cb, req);
}
return skb->len;
--
2.17.1
Powered by blists - more mailing lists