net/smc: extend diagnostic netlink interface
v3 cover net/smc: extend diagnostic netlink interface
Please apply the following patch series for smc to netdev's net-next tree.
This patch series refactors the current netlink API in smc_diag module which is used for diagnostic purposes and extends the netlink API in a backward compatible way so that the extended API can provide information about SMC linkgroups, links and devices (both for SMC-R and SMC-D) and can still work with the legacy netlink API.
Please note that patch 9 triggers a checkpatch warning because a comment line was added using the style of the already existing comment block.
v2: In patch 10, add missing include to uapi header smc_diag.h.
v3: Apply code style recommendations from review comments.
Instead of using EXPORTs to allow the smc_diag module to access data of the smc module, introduce struct smc_diag_ops and let smc_diag access the required data using function pointers.
Guvenc Gulce (14):
net/smc: Use active link of the connection net/smc: Add connection counters for links net/smc: Add link counters for IB device ports net/smc: Add diagnostic information to smc ib-device net/smc: Add diagnostic information to link structure net/smc: Refactor the netlink reply processing routine net/smc: Add ability to work with extended SMC netlink API net/smc: Introduce SMCR get linkgroup command net/smc: Introduce SMCR get link command net/smc: Add SMC-D Linkgroup diagnostic support net/smc: Add support for obtaining SMCD device list net/smc: Add support for obtaining SMCR device list net/smc: Refactor smc ism v2 capability handling net/smc: Add support for obtaining system information
Karsten Graul (1):
net/smc: use helper smc_conn_abort() in listen processing
include/net/smc.h | 2 +- include/uapi/linux/smc.h | 8 + include/uapi/linux/smc_diag.h | 109 +++++ net/smc/af_smc.c | 29 +- net/smc/smc.h | 4 +- net/smc/smc_clc.c | 5 + net/smc/smc_clc.h | 1 + net/smc/smc_core.c | 62 ++- net/smc/smc_core.h | 55 ++- net/smc/smc_diag.c | 768 ++++++++++++++++++++++++++++++---- net/smc/smc_ib.c | 45 ++ net/smc/smc_ib.h | 5 +- net/smc/smc_ism.c | 8 +- net/smc/smc_ism.h | 5 +- net/smc/smc_pnet.c | 3 + 15 files changed, 986 insertions(+), 123 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/15 net/smc: use helper smc_conn_abort() in listen processing
The helper smc_connect_abort() can be used by the listen processing functions, too. And rename this helper to smc_conn_abort() to make the purpose clearer.
No functional change.
--- net/smc/af_smc.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
net/smc/af_smc.c +5 -12
@@ -552,8 +552,7 @@ static int smc_connect_decline_fallback(struct smc_sock *smc, int reason_code,return smc_connect_fallback (smc, reason_code); } -/* abort connecting */ -static void smc_connect_abort (struct smc_sock *smc,int local_first) +static void smc_conn_abort (struct smc_sock *smc,int local_first) {if (local_first)smc_lgr_cleanup_early (&smc->conn);
@@ -814,7 +813,7 @@ static int smc_connect_rdma(struct smc_sock *smc,return 0 ; connect_abort: -smc_connect_abort (smc, ini->first_contact_local); +smc_conn_abort (smc, ini->first_contact_local);mutex_unlock (&smc_client_lgr_pending); smc->connect_nonblock =0 ;
@@ -893,7 +892,7 @@ static int smc_connect_ism(struct smc_sock *smc,return 0 ; connect_abort: -smc_connect_abort (smc, ini->first_contact_local); +smc_conn_abort (smc, ini->first_contact_local);mutex_unlock (&smc_server_lgr_pending); smc->connect_nonblock =0 ;
@@ -1320,10 +1319,7 @@ static void smc_listen_decline(struct smc_sock *new_smc, int reason_code, int local_first, u8 version) {/* RDMA setup failed, switch back to TCP */ -if (local_first) -smc_lgr_cleanup_early (&new_smc->conn); -else -smc_conn_free (&new_smc->conn); +smc_conn_abort (new_smc ,local_first );if (reason_code <0 ) {/* error, no fallback possible */ smc_listen_out_err (new_smc);return ;
@@ -1429,10 +1425,7 @@ static int smc_listen_ism_init(struct smc_sock *new_smc,/* Create send and receive buffers */ rc =smc_buf_create (new_smc, true);if (rc) { -if (ini->first_contact_local) -smc_lgr_cleanup_early (&new_smc->conn); -else -smc_conn_free (&new_smc->conn); +smc_conn_abort (new_smc, ini->first_contact_local);return (rc == -ENOSPC ) ?SMC_CLC_DECL_MAX_DMB :SMC_CLC_DECL_MEM ; }
Signature · 1 line
2.17.1
PATCH v3 2/15 net/smc: Use active link of the connection
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Use active link of the connection directly and not via linkgroup array structure when obtaining link data of the connection.
--- net/smc/smc_diag.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/smc/smc_diag.c +5 -5
@@ -160,17 +160,17 @@ static int __smc_diag_dump(struct sock *sk, struct sk_buff *skb, !list_empty(&smc->conn.lgr->list)) {struct smc_diag_lgrinfo linfo = { .role = smc->conn.lgr->role, - .lnk[0 ].ibport = smc->conn.lgr->lnk[0 ].ibport, - .lnk[0 ].link_id = smc->conn.lgr->lnk[0 ].link_id, + .lnk[0 ].ibport = smc->conn.lnk->ibport, + .lnk[0 ].link_id = smc->conn.lnk->link_id, };memcpy (linfo.lnk[0 ].ibname, smc->conn.lgr->lnk[0 ].smcibdev->ibdev->name, -sizeof (smc->conn.lgr->lnk[0 ].smcibdev->ibdev->name)); +sizeof (smc->conn.lnk->smcibdev->ibdev->name));smc_gid_be16_convert (linfo.lnk[0 ].gid, - smc->conn.lgr->lnk[0 ].gid); + smc->conn.lnk->gid);smc_gid_be16_convert (linfo.lnk[0 ].peer_gid, - smc->conn.lgr->lnk[0 ].peer_gid); + smc->conn.lnk->peer_gid);if (nla_put (skb,SMC_DIAG_LGRINFO ,sizeof (linfo), &linfo) <0 ) goto errout;
Signature · 1 line
2.17.1
PATCH v3 3/15 net/smc: Add connection counters for links
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Add connection counters to the structure of the link. Increase/decrease the counters as needed in the corresponding routines.
--- net/smc/smc_core.c | 16 ++++++++++++++-- net/smc/smc_core.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-)
net/smc/smc_core.c +14 -2
@@ -139,6 +139,7 @@ static int smcr_lgr_conn_assign_link(struct smc_connection *conn, bool first) }if (!conn->lnk)return SMC_CLC_DECL_NOACTLINK ; +atomic_inc (&conn->lnk->conn_cnt);return 0 ; }
@@ -180,6 +181,8 @@ static void __smc_lgr_unregister_conn(struct smc_connection *conn)struct smc_link_group *lgr = conn->lgr;rb_erase (&conn->alert_node, &lgr->conns_all); +if (conn->lnk) +atomic_dec (&conn->lnk->conn_cnt); lgr->conns_num--; conn->alert_token_local =0 ;sock_put (&smc->sk);/* sock_hold in smc_lgr_register_conn() */
@@ -314,6 +317,7 @@ int smcr_link_init(struct smc_link_group *lgr, struct smc_link *lnk, lnk->smcibdev = ini->ib_dev; lnk->ibport = ini->ib_port; 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);INIT_WORK (&lnk->link_down_wrk, smc_link_down_work);if (!ini->ib_dev->initialized) {
@@ -526,6 +530,14 @@ static int smc_switch_cursor(struct smc_sock *smc, struct smc_cdc_tx_pend *pend,return rc; } +static inline void smc_switch_link_and_count (struct smc_connection *conn, +struct smc_link *to_lnk) +{ +atomic_dec (&conn->lnk->conn_cnt); + conn->lnk = to_lnk; +atomic_inc (&conn->lnk->conn_cnt); +} +struct smc_link *smc_switch_conns (struct smc_link_group *lgr,struct smc_link *from_lnk,bool is_dev_err) {
@@ -574,7 +586,7 @@ struct smc_link *smc_switch_conns(struct smc_link_group *lgr, smc->sk.sk_state == SMC_PEERABORTWAIT || smc->sk.sk_state == SMC_PROCESSABORT) {spin_lock_bh (&conn->send_lock); - conn->lnk = to_lnk; +smc_switch_link_and_count (conn, to_lnk);spin_unlock_bh (&conn->send_lock);continue ; }
@@ -588,7 +600,7 @@ struct smc_link *smc_switch_conns(struct smc_link_group *lgr, }/* avoid race with smcr_tx_sndbuf_nonempty() */ spin_lock_bh (&conn->send_lock); - conn->lnk = to_lnk; +smc_switch_link_and_count (conn, to_lnk); rc =smc_switch_cursor (smc, pend, wr_buf);spin_unlock_bh (&conn->send_lock);sock_put (&smc->sk);
net/smc/smc_core.h +1 -0
@@ -129,6 +129,7 @@ struct smc_link {struct delayed_work llc_testlink_wrk;/* testlink worker */ struct completion llc_testlink_resp;/* wait for rx of testlink */ int llc_testlink_time;/* testlink interval */ +atomic_t conn_cnt; };/* For now we just allow one parallel link per link group. The SMC protocol
Signature · 1 line
2.17.1
Jakub Kicinski
maintainerRe: [PATCH net-next v3 03/15] net/smc: Add connection counters for links
net/smc/smc_core.c static int smc_switch_cursor(struct smc_sock *smc, struct smc_cdc_tx_pend *pend, · line 534
Quoted 2 lines · On Sat, 7 Nov 2020 13:59:46 +0100 Karsten Graul wrote:
net/smc/smc_core.c +2
-0+static inline void smc_switch_link_and_count (struct smc_connection *conn, +struct smc_link *to_lnk)
Please avoid the use of static inline functions.
The compiler should inline this 3 instruction function anyway.
Please fix other instances in this submission as well.
Quoted 5 lines
net/smc/smc_core.c +5
-0+{ +atomic_dec (&conn->lnk->conn_cnt); + conn->lnk = to_lnk; +atomic_inc (&conn->lnk->conn_cnt); +}
PATCH v3 4/15 net/smc: Add link counters for IB device ports
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Add link counters to the structure of the smc ib device, one counter per ib port. Increase/decrease the counters as needed in the corresponding routines.
--- net/smc/smc_core.c | 3 +++ net/smc/smc_core.h | 10 ++++++++++ net/smc/smc_ib.h | 2 ++ 3 files changed, 15 insertions(+)
net/smc/smc_core.c +3 -0
@@ -316,6 +316,7 @@ int smcr_link_init(struct smc_link_group *lgr, struct smc_link *lnk, lnk->link_idx = link_idx; lnk->smcibdev = ini->ib_dev; lnk->ibport = ini->ib_port; +smc_ibdev_cnt_inc (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);
@@ -359,6 +360,7 @@ int smcr_link_init(struct smc_link_group *lgr, struct smc_link *lnk, clear_llc_lnk:smc_llc_link_clear (lnk, false); out: +smc_ibdev_cnt_dec (lnk);put_device (&ini->ib_dev->ibdev->dev);memset (lnk,0 ,sizeof (struct smc_link )); lnk->state =SMC_LNK_UNUSED ;
@@ -749,6 +751,7 @@ void smcr_link_clear(struct smc_link *lnk, bool log)smc_ib_destroy_queue_pair (lnk);smc_ib_dealloc_protection_domain (lnk);smc_wr_free_link_mem (lnk); +smc_ibdev_cnt_dec (lnk);put_device (&lnk->smcibdev->ibdev->dev); smcibdev = lnk->smcibdev;memset (lnk,0 ,sizeof (struct smc_link ));
net/smc/smc_core.h +10 -0
@@ -364,6 +364,16 @@ static inline bool smc_link_active(struct smc_link *lnk)return lnk->state ==SMC_LNK_ACTIVE ; } +static inline void smc_ibdev_cnt_inc (struct smc_link *lnk) +{ +atomic_inc (&lnk->smcibdev->lnk_cnt_by_port[lnk->ibport -1 ]); +} + +static inline void smc_ibdev_cnt_dec (struct smc_link *lnk) +{ +atomic_dec (&lnk->smcibdev->lnk_cnt_by_port[lnk->ibport -1 ]); +} +struct smc_sock ;struct smc_clc_msg_accept_confirm ;struct smc_clc_msg_local ;
net/smc/smc_ib.h +2 -0
@@ -53,6 +53,8 @@ struct smc_ib_device { /* ib-device infos for smc */atomic_t lnk_cnt;/* number of links on ibdev */ wait_queue_head_t lnks_deleted;/* wait 4 removal of all links*/ struct mutex mutex;/* protect dev setup+cleanup */ +atomic_t lnk_cnt_by_port[SMC_MAX_PORTS ]; +/* number of links per port */ };struct smc_buf_desc ;
Signature · 1 line
2.17.1
PATCH v3 5/15 net/smc: Add diagnostic information to smc ib-device
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
During smc ib-device creation, add network device name to smc ib-device structure. Register for netdevice name changes and update ib-device accordingly. This is needed for diagnostic purposes.
--- net/smc/smc_ib.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ net/smc/smc_ib.h | 2 ++ net/smc/smc_pnet.c | 3 +++ 3 files changed, 50 insertions(+)
net/smc/smc_ib.c +45 -0
@@ -557,6 +557,50 @@ static void smc_ib_cleanup_per_ibdev(struct smc_ib_device *smcibdev)static struct ib_client smc_ib_client; +static void smc_copy_netdev_name (struct smc_ib_device *smcibdev,int port) +{ +struct ib_device *ibdev = smcibdev->ibdev; +struct net_device *ndev; + +if (!ibdev->ops.get_netdev) +return ; + ndev = ibdev->ops.get_netdev (ibdev, port +1 ); +if (ndev) { +snprintf (smcibdev->netdev[port], +sizeof (smcibdev->netdev[port]), +"%s" , ndev->name); +dev_put (ndev); + } +} + +void smc_ib_ndev_name_change (struct net_device *ndev) +{ +struct smc_ib_device *smcibdev; +struct ib_device *libdev; +struct net_device *lndev; +u8 port_cnt; +int i; + +mutex_lock (&smc_ib_devices.mutex); +list_for_each_entry (smcibdev, &smc_ib_devices.list, list) { + port_cnt = smcibdev->ibdev->phys_port_cnt; +for (i =0 ; i <min_t (size_t, port_cnt,SMC_MAX_PORTS ); i++) { + libdev = smcibdev->ibdev; +if (!libdev->ops.get_netdev) +continue ; + lndev = libdev->ops.get_netdev (libdev, i +1 ); +if (lndev) +dev_put (lndev); +if (lndev != ndev) +continue ; +snprintf (smcibdev->netdev[i], +sizeof (smcibdev->netdev[i]), +"%s" , ndev->name); + } + } +mutex_unlock (&smc_ib_devices.mutex); +} +/* callback function for ib_register_client() */ static int smc_ib_add_dev (struct ib_device *ibdev) {
@@ -596,6 +640,7 @@ static int smc_ib_add_dev(struct ib_device *ibdev)if (smc_pnetid_by_dev_port (ibdev->dev.parent, i, smcibdev->pnetid[i]))smc_pnetid_by_table_ib (smcibdev, i +1 ); +smc_copy_netdev_name (smcibdev, i); pr_warn_ratelimited("smc: ib device %s port %d has pnetid " "%.16s%s\n", smcibdev->ibdev->name, i + 1,
net/smc/smc_ib.h +2 -0
@@ -55,11 +55,13 @@ struct smc_ib_device { /* ib-device infos for smc */struct mutex mutex;/* protect dev setup+cleanup */ atomic_t lnk_cnt_by_port[SMC_MAX_PORTS ];/* number of links per port */ +char netdev[SMC_MAX_PORTS ][IFNAMSIZ ];/* ndev names */ };struct smc_buf_desc ;struct smc_link ; +void smc_ib_ndev_name_change (struct net_device *ndev);int smc_ib_register_client (void )__init ;void smc_ib_unregister_client (void );bool smc_ib_port_active (struct smc_ib_device *smcibdev,u8 ibport);
net/smc/smc_pnet.c +3 -0
@@ -828,6 +828,9 @@ static int smc_pnet_netdev_event(struct notifier_block *this,case NETDEV_UNREGISTER :smc_pnet_remove_by_ndev (event_dev);return NOTIFY_OK ; +case NETDEV_CHANGENAME : +smc_ib_ndev_name_change (event_dev); +return NOTIFY_OK ;case NETDEV_REGISTER :smc_pnet_add_by_ndev (event_dev);return NOTIFY_OK ;
Signature · 1 line
2.17.1
PATCH v3 6/15 net/smc: Add diagnostic information to link structure
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
During link creation add network 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.
--- net/smc/smc_core.c | 11 +++++++++++ net/smc/smc_core.h | 3 +++ 2 files changed, 14 insertions(+)
net/smc/smc_core.c +11 -0
@@ -303,6 +303,16 @@ static u8 smcr_next_link_id(struct smc_link_group *lgr)return link_id; } +static inline 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); +snprintf (link->ndevname,sizeof (link->ndevname),"%s" , + smcibdev->netdev[link->ibport -1 ]); +} +int smcr_link_init (struct smc_link_group *lgr,struct smc_link *lnk,u8 link_idx,struct smc_init_info *ini) {
@@ -317,6 +327,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);
net/smc/smc_core.h +3 -0
@@ -124,6 +124,9 @@ 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 */ +/* Diagnostic relevant link information */ +char ibname[IB_DEVICE_NAME_MAX ];/* ib device name */ +char ndevname[IFNAMSIZ ];/* network device name */ enum smc_link_state state;/* state of link */ struct delayed_work llc_testlink_wrk;/* testlink worker */
Signature · 1 line
2.17.1
PATCH v3 7/15 net/smc: Refactor the netlink reply processing routine
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Refactor the netlink reply processing routine so that it provides sub functions for specific parts of the processing.
--- net/smc/smc_diag.c | 218 +++++++++++++++++++++++++++------------------ 1 file changed, 133 insertions(+), 85 deletions(-)
net/smc/smc_diag.c +133 -85
@@ -69,35 +69,25 @@ static void smc_diag_msg_common_fill(struct smc_diag_msg *r, struct sock *sk) } } -static int smc_diag_msg_attrs_fill (struct sock *sk,struct sk_buff *skb, -struct smc_diag_msg *r, -struct user_namespace *user_ns) +static bool smc_diag_msg_attrs_fill (struct sock *sk,struct sk_buff *skb, +struct smc_diag_msg *r, +struct user_namespace *user_ns) { -if (nla_put_u8 (skb,SMC_DIAG_SHUTDOWN , sk->sk_shutdown)) -return 1 ; +if (nla_put_u8 (skb,SMC_DIAG_SHUTDOWN , sk->sk_shutdown) <0 ) +return false; r->diag_uid =from_kuid_munged (user_ns,sock_i_uid (sk)); r->diag_inode =sock_i_ino (sk); -return 0 ; +return true; } -static int __smc_diag_dump (struct sock *sk,struct sk_buff *skb, -struct netlink_callback *cb, -const struct smc_diag_req *req, -struct nlattr *bc) +static bool smc_diag_fill_base_struct (struct sock *sk,struct sk_buff *skb, +struct netlink_callback *cb, +struct smc_diag_msg *r) {struct smc_sock *smc =smc_sk (sk); -struct smc_diag_fallback fallback;struct user_namespace *user_ns; -struct smc_diag_msg *r; -struct nlmsghdr *nlh; - nlh =nlmsg_put (skb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq, - cb->nlh->nlmsg_type,sizeof (*r),NLM_F_MULTI ); -if (!nlh) -return -EMSGSIZE ; - - r =nlmsg_data (nlh);smc_diag_msg_common_fill (r, sk); r->diag_state = sk->sk_state;if (smc->use_fallback)
@@ -107,89 +97,148 @@ static int __smc_diag_dump(struct sock *sk, struct sk_buff *skb,else r->diag_mode =SMC_DIAG_MODE_SMCR ; user_ns =sk_user_ns (NETLINK_CB (cb->skb).sk); -if (smc_diag_msg_attrs_fill (sk, skb, r, user_ns)) - goto errout; +if (!smc_diag_msg_attrs_fill (sk, skb, r, user_ns)) +return false; +return true; +} + +static bool smc_diag_fill_fallback (struct sock *sk,struct sk_buff *skb) +{ +struct smc_diag_fallback fallback; +struct smc_sock *smc =smc_sk (sk); + +memset (&fallback,0 ,sizeof (fallback)); fallback.reason = smc->fallback_rsn; fallback.peer_diagnosis = smc->peer_diagnosis;if (nla_put (skb,SMC_DIAG_FALLBACK ,sizeof (fallback), &fallback) <0 ) +return false; + +return true; +} + +static bool smc_diag_fill_conninfo (struct sock *sk,struct sk_buff *skb) +{ +struct smc_host_cdc_msg *local_tx, *local_rx; +struct smc_diag_conninfo cinfo; +struct smc_connection *conn; +struct smc_sock *smc; + + smc =smc_sk (sk); + conn = &smc->conn; + local_tx = &conn->local_tx_ctrl; + local_rx = &conn->local_rx_ctrl; +memset (&cinfo,0 ,sizeof (cinfo)); + cinfo.token = conn->alert_token_local; + cinfo.sndbuf_size = conn->sndbuf_desc ? conn->sndbuf_desc->len :0 ; + cinfo.rmbe_size = conn->rmb_desc ? conn->rmb_desc->len :0 ; + cinfo.peer_rmbe_size = conn->peer_rmbe_size; + + cinfo.rx_prod.wrap = local_rx->prod.wrap; + cinfo.rx_prod.count = local_rx->prod.count; + cinfo.rx_cons.wrap = local_rx->cons.wrap; + cinfo.rx_cons.count = local_rx->cons.count; + + cinfo.tx_prod.wrap = local_tx->prod.wrap; + cinfo.tx_prod.count = local_tx->prod.count; + cinfo.tx_cons.wrap = local_tx->cons.wrap; + cinfo.tx_cons.count = local_tx->cons.count; + + cinfo.tx_prod_flags = *(u8 *)&local_tx->prod_flags; + cinfo.tx_conn_state_flags = *(u8 *)&local_tx->conn_state_flags; + cinfo.rx_prod_flags = *(u8 *)&local_rx->prod_flags; + cinfo.rx_conn_state_flags = *(u8 *)&local_rx->conn_state_flags; + + cinfo.tx_prep.wrap = conn->tx_curs_prep.wrap; + cinfo.tx_prep.count = conn->tx_curs_prep.count; + cinfo.tx_sent.wrap = conn->tx_curs_sent.wrap; + cinfo.tx_sent.count = conn->tx_curs_sent.count; + cinfo.tx_fin.wrap = conn->tx_curs_fin.wrap; + cinfo.tx_fin.count = conn->tx_curs_fin.count; + +if (nla_put (skb,SMC_DIAG_CONNINFO ,sizeof (cinfo), &cinfo) <0 ) +return false; + +return true; +} + +static bool smc_diag_fill_lgrinfo (struct sock *sk,struct sk_buff *skb) +{ +struct smc_sock *smc =smc_sk (sk); +struct smc_diag_lgrinfo linfo; + +memset (&linfo,0 ,sizeof (linfo)); + linfo.role = smc->conn.lgr->role; + linfo.lnk[0 ].ibport = smc->conn.lnk->ibport; + linfo.lnk[0 ].link_id = smc->conn.lnk->link_id; +memcpy (linfo.lnk[0 ].ibname, smc->conn.lnk->ibname, +sizeof (linfo.lnk[0 ].ibname)); +smc_gid_be16_convert (linfo.lnk[0 ].gid, + smc->conn.lnk->gid); +smc_gid_be16_convert (linfo.lnk[0 ].peer_gid, + smc->conn.lnk->peer_gid); + +if (nla_put (skb,SMC_DIAG_LGRINFO ,sizeof (linfo), &linfo) <0 ) +return false; + +return true; +} + +static bool smc_diag_fill_dmbinfo (struct sock *sk,struct sk_buff *skb) +{ +struct smc_sock *smc =smc_sk (sk); +struct smcd_diag_dmbinfo dinfo; +struct smc_connection *conn; + +memset (&dinfo,0 ,sizeof (dinfo)); + conn = &smc->conn; + dinfo.linkid = *((u32 *)conn->lgr->id); + dinfo.peer_gid = conn->lgr->peer_gid; + dinfo.my_gid = conn->lgr->smcd->local_gid; + dinfo.token = conn->rmb_desc->token; + dinfo.peer_token = conn->peer_token; + +if (nla_put (skb,SMC_DIAG_DMBINFO ,sizeof (dinfo), &dinfo) <0 ) +return false; +return true; +} + +static int __smc_diag_dump (struct sock *sk,struct sk_buff *skb, +struct netlink_callback *cb, +const struct smc_diag_req *req) +{ +struct smc_sock *smc =smc_sk (sk); +struct smc_diag_msg *r; +struct nlmsghdr *nlh; + + nlh =nlmsg_put (skb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq, + cb->nlh->nlmsg_type,sizeof (*r),NLM_F_MULTI ); +if (!nlh) +return -EMSGSIZE ; + + r =nlmsg_data (nlh); +if (!smc_diag_fill_base_struct (sk, skb, cb, r)) + goto errout; + +if (!smc_diag_fill_fallback (sk, skb)) goto errout;if ((req->diag_ext & (1 << (SMC_DIAG_CONNINFO -1 ))) && smc->conn.alert_token_local) { -struct smc_connection *conn = &smc->conn; -struct smc_diag_conninfo cinfo = { - .token = conn->alert_token_local, - .sndbuf_size = conn->sndbuf_desc ? - conn->sndbuf_desc->len :0 , - .rmbe_size = conn->rmb_desc ? conn->rmb_desc->len :0 , - .peer_rmbe_size = conn->peer_rmbe_size, - - .rx_prod.wrap = conn->local_rx_ctrl.prod.wrap, - .rx_prod.count = conn->local_rx_ctrl.prod.count, - .rx_cons.wrap = conn->local_rx_ctrl.cons.wrap, - .rx_cons.count = conn->local_rx_ctrl.cons.count, - - .tx_prod.wrap = conn->local_tx_ctrl.prod.wrap, - .tx_prod.count = conn->local_tx_ctrl.prod.count, - .tx_cons.wrap = conn->local_tx_ctrl.cons.wrap, - .tx_cons.count = conn->local_tx_ctrl.cons.count, - - .tx_prod_flags = - *(u8 *)&conn->local_tx_ctrl.prod_flags, - .tx_conn_state_flags = - *(u8 *)&conn->local_tx_ctrl.conn_state_flags, - .rx_prod_flags = *(u8 *)&conn->local_rx_ctrl.prod_flags, - .rx_conn_state_flags = - *(u8 *)&conn->local_rx_ctrl.conn_state_flags, - - .tx_prep.wrap = conn->tx_curs_prep.wrap, - .tx_prep.count = conn->tx_curs_prep.count, - .tx_sent.wrap = conn->tx_curs_sent.wrap, - .tx_sent.count = conn->tx_curs_sent.count, - .tx_fin.wrap = conn->tx_curs_fin.wrap, - .tx_fin.count = conn->tx_curs_fin.count, - }; - -if (nla_put (skb,SMC_DIAG_CONNINFO ,sizeof (cinfo), &cinfo) <0 ) +if (!smc_diag_fill_conninfo (sk, skb)) goto errout; }if (smc->conn.lgr && !smc->conn.lgr->is_smcd && (req->diag_ext & (1 << (SMC_DIAG_LGRINFO -1 ))) && !list_empty (&smc->conn.lgr->list)) { -struct smc_diag_lgrinfo linfo = { - .role = smc->conn.lgr->role, - .lnk[0 ].ibport = smc->conn.lnk->ibport, - .lnk[0 ].link_id = smc->conn.lnk->link_id, - }; - -memcpy (linfo.lnk[0 ].ibname, - smc->conn.lgr->lnk[0 ].smcibdev->ibdev->name, -sizeof (smc->conn.lnk->smcibdev->ibdev->name)); -smc_gid_be16_convert (linfo.lnk[0 ].gid, - smc->conn.lnk->gid); -smc_gid_be16_convert (linfo.lnk[0 ].peer_gid, - smc->conn.lnk->peer_gid); - -if (nla_put (skb,SMC_DIAG_LGRINFO ,sizeof (linfo), &linfo) <0 ) +if (!smc_diag_fill_lgrinfo (sk, skb)) goto errout; }if (smc->conn.lgr && smc->conn.lgr->is_smcd && (req->diag_ext & (1 << (SMC_DIAG_DMBINFO -1 ))) && !list_empty (&smc->conn.lgr->list)) { -struct smc_connection *conn = &smc->conn; -struct smcd_diag_dmbinfo dinfo; - -memset (&dinfo,0 ,sizeof (dinfo)); - - dinfo.linkid = *((u32 *)conn->lgr->id); - dinfo.peer_gid = conn->lgr->peer_gid; - dinfo.my_gid = conn->lgr->smcd->local_gid; - dinfo.token = conn->rmb_desc->token; - dinfo.peer_token = conn->peer_token; - -if (nla_put (skb,SMC_DIAG_DMBINFO ,sizeof (dinfo), &dinfo) <0 ) +if (!smc_diag_fill_dmbinfo (sk, skb)) goto errout; }
@@ -207,7 +256,6 @@ static int smc_diag_dump_proto(struct proto *prot, struct sk_buff *skb,struct smc_diag_dump_ctx *cb_ctx =smc_dump_context (cb);struct net *net =sock_net (skb->sk);int snum = cb_ctx->pos[p_type]; -struct nlattr *bc =NULL ;struct hlist_head *head;int rc =0 , num =0 ;struct sock *sk;
@@ -222,7 +270,7 @@ static int smc_diag_dump_proto(struct proto *prot, struct sk_buff *skb,continue ;if (num < snum) goto next; - rc =__smc_diag_dump (sk, skb, cb,nlmsg_data (cb->nlh), bc); + rc =__smc_diag_dump (sk, skb, cb,nlmsg_data (cb->nlh));if (rc <0 ) goto out; next:
Signature · 1 line
2.17.1
PATCH v3 8/15 net/smc: Add ability to work with extended SMC netlink API
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
smc_diag module should be able to work with legacy and extended netlink api. This is done by using the sequence field of the netlink message header. Sequence field is optional and was filled with a constant value MAGIC_SEQ in the current implementation.
New constant values MAGIC_SEQ_V2 and MAGIC_SEQ_V2_ACK are used to signal the usage of the new Netlink API between userspace and kernel.
--- include/uapi/linux/smc_diag.h | 7 +++++++ net/smc/smc_diag.c | 21 +++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-)
include/uapi/linux/smc_diag.h +7 -0
@@ -6,6 +6,13 @@#include <linux/inet_diag.h> #include <rdma/ib_user_verbs.h> +/* Sequence numbers */ +enum { +MAGIC_SEQ =123456 , +MAGIC_SEQ_V2 , +MAGIC_SEQ_V2_ACK , +}; +/* Request structure */ struct smc_diag_req {__u8 diag_family;
net/smc/smc_diag.c +13 -8
@@ -293,19 +293,24 @@ static int smc_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)return skb->len; } +static int smc_diag_dump_ext (struct sk_buff *skb,struct netlink_callback *cb) +{ +return skb->len; +} +static int smc_diag_handler_dump (struct sk_buff *skb,struct nlmsghdr *h) {struct net *net =sock_net (skb->sk); - +struct netlink_dump_control c = { + .min_dump_alloc =SKB_WITH_OVERHEAD (32768 ), + };if (h->nlmsg_type ==SOCK_DIAG_BY_FAMILY && h->nlmsg_flags &NLM_F_DUMP ) { - { -struct netlink_dump_control c = { - .dump = smc_diag_dump, - .min_dump_alloc =SKB_WITH_OVERHEAD (32768 ), - }; -return netlink_dump_start (net->diag_nlsk, skb, h, &c); - } +if (h->nlmsg_seq >=MAGIC_SEQ_V2 ) + c.dump = smc_diag_dump_ext; +else + c.dump = smc_diag_dump; +return netlink_dump_start (net->diag_nlsk, skb, h, &c); }return 0 ; }
Signature · 1 line
2.17.1
PATCH v3 9/15 net/smc: Introduce SMCR get linkgroup command
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Introduce get linkgroup command which loops through all available SMCR linkgroups. It uses the SMC-R linkgroup list as entry point, not the socket list, which makes linkgroup diagnosis possible, in case linkgroup does not contain active connections anymore.
--- include/net/smc.h | 2 +- include/uapi/linux/smc.h | 5 ++ include/uapi/linux/smc_diag.h | 43 +++++++++++++++++ net/smc/smc.h | 4 +- net/smc/smc_core.c | 15 ++++++ net/smc/smc_core.h | 7 ++- net/smc/smc_diag.c | 91 +++++++++++++++++++++++++++++++++++ 7 files changed, 162 insertions(+), 5 deletions(-)
include/net/smc.h +1 -1
@@ -10,8 +10,8 @@*/ #ifndef _SMC_H #define _SMC_H +#include <linux/smc.h> -#define SMC_MAX_PNETID_LEN 16 /* Max. length of PNET id */ struct smc_hashinfo { rwlock_t lock;
include/uapi/linux/smc.h +5 -0
@@ -3,6 +3,7 @@* Shared Memory Communications over RDMA (SMC-R) and RoCE * * Definitions for generic netlink based configuration of an SMC-R PNET table +* Definitions for SMC Linkgroup and Devices. * * Copyright IBM Corp. 2016 *
@@ -33,4 +34,8 @@ enum { /* SMC PNET Table commands */#define SMCR_GENL_FAMILY_NAME "SMC_PNETID"#define SMCR_GENL_FAMILY_VERSION 1 +#define SMC_MAX_PNETID_LEN 16/* Max. length of PNET id */ +#define SMC_LGR_ID_SIZE 4 +#define SMC_MAX_HOSTNAME_LEN 32/* Max length of hostname */ +#define SMC_MAX_EID_LEN 32/* Max length of eid */ #endif /* _UAPI_LINUX_SMC_H */
include/uapi/linux/smc_diag.h +43 -0
74 lines not on this page · raw message
net/smc/smc.h +1 -3
@@ -14,6 +14,7 @@#include <linux/socket.h> #include <linux/types.h> #include <linux/compiler.h> /* __aligned */ +#include <uapi/linux/smc.h> #include <net/sock.h> #include "smc_ib.h"
@@ -29,9 +30,6 @@* devices */ -#define SMC_MAX_HOSTNAME_LEN 32 -#define SMC_MAX_EID_LEN 32 -extern struct proto smc_proto;extern struct proto smc_proto6;
net/smc/smc_core.c +15 -0
@@ -204,6 +204,21 @@ static void smc_lgr_unregister_conn(struct smc_connection *conn) conn->lgr =NULL ; } +static struct smc_lgr_list *smc_get_lgr_list (void ) +{ +return &smc_lgr_list; +} + +static const struct smc_diag_ops smc_diag_ops = { + .get_lgr_list = smc_get_lgr_list, +}; + +const struct smc_diag_ops *smc_get_diag_ops (void ) +{ +return &smc_diag_ops; +} +EXPORT_SYMBOL_GPL (smc_get_diag_ops); +void smc_lgr_cleanup_early (struct smc_connection *conn) {struct smc_link_group *lgr = conn->lgr;
net/smc/smc_core.h +6 -1
@@ -20,6 +20,11 @@#define SMC_RMBS_PER_LGR_MAX 255/* max. # of RMBs per link group */ +/* Functions which are needed for diagnostic purposes by smc_diag module */ +struct smc_diag_ops { +struct smc_lgr_list *(*get_lgr_list)(void ); +}; +struct smc_lgr_list {/* list of link group definition */ struct list_head list;spinlock_t lock;/* protects list of link groups */
@@ -70,7 +75,6 @@ struct smc_rdma_wr { /* work requests per messagestruct ib_rdma_wr wr_tx_rdma[SMC_MAX_RDMA_WRITES ]; }; -#define SMC_LGR_ID_SIZE 4struct smc_link {struct smc_ib_device *smcibdev;/* ib-device */
@@ -424,6 +428,7 @@ struct smc_link *smc_switch_conns(struct smc_link_group *lgr, struct smc_link *from_lnk, bool is_dev_err);void smcr_link_down_cond (struct smc_link *lnk);void smcr_link_down_cond_sched (struct smc_link *lnk); +const struct smc_diag_ops *smc_get_diag_ops (void );static inline struct smc_link_group *smc_get_lgr (struct smc_link *link) {
net/smc/smc_diag.c +91 -0
115 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 10/15 net/smc: Introduce SMCR get link command
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Introduce get link command which loops through all available links of all available link groups. It uses the SMC-R linkgroup list as entry point, not the socket list, which makes linkgroup diagnosis possible, in case linkgroup does not contain active connections anymore.
--- include/uapi/linux/smc_diag.h | 8 +++++ net/smc/smc_diag.c | 62 ++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 1 deletion(-)
include/uapi/linux/smc_diag.h +8 -0
@@ -4,6 +4,7 @@#include <linux/types.h> #include <linux/inet_diag.h> +#include <linux/if.h> #include <linux/smc.h> #include <rdma/ib_user_verbs.h>
@@ -79,6 +80,7 @@ enum {/* SMC_DIAG_GET_LGR_INFO command extensions */ enum {SMC_DIAG_LGR_INFO_SMCR =1 , +SMC_DIAG_LGR_INFO_SMCR_LINK , };#define SMC_DIAG_MAX (__SMC_DIAG_MAX - 1)
@@ -129,6 +131,12 @@ struct smc_diag_linkinfo {__u8 ibport;/* RDMA device port number */ __u8 gid[40 ];/* local GID */ __u8 peer_gid[40 ];/* peer GID */ +/* Fields above used by legacy v1 code */ +__u32 conn_cnt; +__u8 netdev[IFNAMSIZ ];/* ethernet device name */ +__u8 link_uid[4 ];/* unique link id */ +__u8 peer_link_uid[4 ];/* unique peer link id */ +__u32 link_state;/* link state */ };struct smc_diag_lgrinfo {
net/smc/smc_diag.c +61 -1
86 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 11/15 net/smc: Add SMC-D Linkgroup diagnostic support
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Deliver SMCD Linkgroup information via netlink based diagnostic interface.
--- 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(+)
include/uapi/linux/smc_diag.h +7 -0
@@ -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 {
net/smc/smc_core.c +7 -0
@@ -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 )
net/smc/smc_core.h +2 -0
@@ -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 */
net/smc/smc_diag.c +108 -0
132 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 12/15 net/smc: Add support for obtaining SMCD device list
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Deliver SMCD device information via netlink based
diagnostic interface.
--- include/uapi/linux/smc.h | 2 + include/uapi/linux/smc_diag.h | 20 +++++++++ net/smc/smc_core.h | 27 +++++++++++++ net/smc/smc_diag.c | 76 +++++++++++++++++++++++++++++++++++ net/smc/smc_ib.h | 1 - 5 files changed, 125 insertions(+), 1 deletion(-)
include/uapi/linux/smc.h +2 -0
@@ -38,4 +38,6 @@ enum { /* SMC PNET Table commands */#define SMC_LGR_ID_SIZE 4#define SMC_MAX_HOSTNAME_LEN 32/* Max length of hostname */ #define SMC_MAX_EID_LEN 32/* Max length of eid */ +#define SMC_MAX_PORTS 2/* Max # of ports per ib device */ +#define SMC_PCI_ID_STR_LEN 16/* Max length of pci id string */ #endif /* _UAPI_LINUX_SMC_H */
include/uapi/linux/smc_diag.h +20 -0
@@ -74,6 +74,7 @@ enum {/* V2 Commands */ enum {SMC_DIAG_GET_LGR_INFO =SMC_DIAG_EXTS_PER_CMD , +SMC_DIAG_GET_DEV_INFO , __SMC_DIAG_EXT_MAX, };
@@ -84,6 +85,11 @@ enum { SMC_DIAG_LGR_INFO_SMCD, }; +/* SMC_DIAG_GET_DEV_INFO command extensions */ +enum { +SMC_DIAG_DEV_INFO_SMCD =1 , +}; +#define SMC_DIAG_MAX (__SMC_DIAG_MAX - 1)#define SMC_DIAG_EXT_MAX (__SMC_DIAG_EXT_MAX - 1)
@@ -164,6 +170,20 @@ struct smcd_diag_dmbinfo { /* SMC-D Socket internals */struct smc_diag_v2_lgr_info v2_lgr_info;/* SMCv2 info */ }; +struct smc_diag_dev_info { +/* Pnet ID per device port */ +__u8 pnet_id[SMC_MAX_PORTS ][SMC_MAX_PNETID_LEN ]; +/* whether pnetid is set by user */ +__u8 pnetid_by_user[SMC_MAX_PORTS ]; +__u32 use_cnt;/* Number of linkgroups */ +__u8 is_critical;/* Is device critical */ +__u32 pci_fid;/* PCI FID */ +__u16 pci_pchid;/* PCI CHID */ +__u16 pci_vendor;/* PCI Vendor */ +__u16 pci_device;/* PCI Device Vendor ID */ +__u8 pci_id[SMC_PCI_ID_STR_LEN ];/* PCI ID */ +}; +struct smc_diag_lgr {__u8 lgr_id[SMC_LGR_ID_SIZE ];/* Linkgroup identifier */ __u8 lgr_role;/* Linkgroup role */
net/smc/smc_core.h +27 -0
@@ -13,6 +13,7 @@#define _SMC_CORE_H#include <linux/atomic.h> +#include <linux/pci.h> #include <rdma/ib_verbs.h> #include "smc.h"
@@ -383,6 +384,32 @@ static inline void smc_ibdev_cnt_dec(struct smc_link *lnk)atomic_dec (&lnk->smcibdev->lnk_cnt_by_port[lnk->ibport -1 ]); } +struct smc_pci_dev { +__u32 pci_fid; +__u16 pci_pchid; +__u16 pci_vendor; +__u16 pci_device; +__u8 pci_id[SMC_PCI_ID_STR_LEN ]; +}; + +static inline void smc_set_pci_values (struct pci_dev *pci_dev, +struct smc_pci_dev *smc_dev) +{ + smc_dev->pci_vendor = pci_dev->vendor; + smc_dev->pci_device = pci_dev->device; +snprintf (smc_dev->pci_id,sizeof (smc_dev->pci_id),"%s" , +pci_name (pci_dev)); +#if IS_ENABLED (CONFIG_S390 ) + { +struct zpci_dev *zdev; + + zdev =to_zpci (pci_dev); + smc_dev->pci_fid = zdev->fid; + smc_dev->pci_pchid = zdev->pchid; + } +#endif +} +struct smc_sock ;struct smc_clc_msg_accept_confirm ;struct smc_clc_msg_local ;
net/smc/smc_diag.c +76 -0
88 lines not on this page · raw message
net/smc/smc_ib.h +0 -1
@@ -19,7 +19,6 @@#include <rdma/ib_verbs.h> #include <net/smc.h> -#define SMC_MAX_PORTS 2/* Max # of ports */ #define SMC_GID_SIZE sizeof(union ib_gid)#define SMC_IB_MAX_SEND_SGE 2
Signature · 1 line
2.17.1
PATCH v3 13/15 net/smc: Add support for obtaining SMCR device list
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Deliver SMCR device information via netlink based
diagnostic interface.
--- include/uapi/linux/smc_diag.h | 6 ++ net/smc/smc_core.c | 7 ++ net/smc/smc_core.h | 2 + net/smc/smc_diag.c | 133 ++++++++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+)
include/uapi/linux/smc_diag.h +6 -0
@@ -88,6 +88,7 @@ enum {/* SMC_DIAG_GET_DEV_INFO command extensions */ enum {SMC_DIAG_DEV_INFO_SMCD =1 , +SMC_DIAG_DEV_INFO_SMCR , };#define SMC_DIAG_MAX (__SMC_DIAG_MAX - 1)
@@ -182,6 +183,11 @@ struct smc_diag_dev_info {__u16 pci_vendor;/* PCI Vendor */ __u16 pci_device;/* PCI Device Vendor ID */ __u8 pci_id[SMC_PCI_ID_STR_LEN ];/* PCI ID */ +__u8 dev_name[IB_DEVICE_NAME_MAX ];/* IB Device name */ +__u8 netdev[SMC_MAX_PORTS ][IFNAMSIZ ];/* Netdev name(s) */ +__u8 port_state[SMC_MAX_PORTS ];/* IB Port State */ +__u8 port_valid[SMC_MAX_PORTS ];/* Is IB Port valid */ +__u32 lnk_cnt_by_port[SMC_MAX_PORTS ];/* # lnks per port */ };struct smc_diag_lgr {
net/smc/smc_core.c +7 -0
@@ -204,6 +204,11 @@ static void smc_lgr_unregister_conn(struct smc_connection *conn) conn->lgr =NULL ; } +static struct smc_ib_devices *smc_get_smc_ib_devices (void ) +{ +return &smc_ib_devices; +} +static struct smcd_dev_list *smc_get_smcd_dev_list (void ) {return &smcd_dev_list;
@@ -218,6 +223,8 @@ 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, + .get_ib_devices = smc_get_smc_ib_devices, + .is_ib_port_active = smc_ib_port_active, };const struct smc_diag_ops *smc_get_diag_ops (void )
net/smc/smc_core.h +2 -0
@@ -26,6 +26,8 @@ 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_ib_devices *(*get_ib_devices)(void ); +bool (*is_ib_port_active)(struct smc_ib_device *smcibdev,u8 ibport); };struct smc_lgr_list {/* list of link group definition */
net/smc/smc_diag.c +133 -0
151 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 14/15 net/smc: Refactor smc ism v2 capability handling
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Encapsulate the smc ism v2 capability boolean value in a function for better information hiding.
--- net/smc/af_smc.c | 12 ++++++------ net/smc/smc_ism.c | 8 +++++++- net/smc/smc_ism.h | 5 ++--- 3 files changed, 15 insertions(+), 10 deletions(-)
net/smc/af_smc.c +6 -6
@@ -668,7 +668,7 @@ static int smc_find_proposal_devices(struct smc_sock *smc, ini->smc_type_v1 =SMC_TYPE_N ; }/* else RDMA is supported for this connection */ } -if (smc_ism_v2_capable &&smc_find_ism_v2_device_clnt (smc, ini)) +if (smc_ism_is_v2_capable () &&smc_find_ism_v2_device_clnt (smc, ini)) ini->smc_type_v2 =SMC_TYPE_N ;/* if neither ISM nor RDMA are supported, fallback */
@@ -920,7 +920,7 @@ static int smc_connect_check_aclc(struct smc_init_info *ini,/* perform steps before actually connecting */ static int __smc_connect (struct smc_sock *smc) { -u8 version = smc_ism_v2_capable ?SMC_V2 :SMC_V1 ; +u8 version =smc_ism_is_v2_capable () ?SMC_V2 :SMC_V1 ;struct smc_clc_msg_accept_confirm_v2 *aclc2;struct smc_clc_msg_accept_confirm *aclc;struct smc_init_info *ini =NULL ;
@@ -945,9 +945,9 @@ static int __smc_connect(struct smc_sock *smc) version); ini->smcd_version =SMC_V1 ; - ini->smcd_version |= smc_ism_v2_capable ?SMC_V2 :0 ; + ini->smcd_version |=smc_ism_is_v2_capable () ?SMC_V2 :0 ; ini->smc_type_v1 =SMC_TYPE_B ; - ini->smc_type_v2 = smc_ism_v2_capable ?SMC_TYPE_D :SMC_TYPE_N ; + ini->smc_type_v2 =smc_ism_is_v2_capable () ?SMC_TYPE_D :SMC_TYPE_N ;/* get vlan id from IP device */ if (smc_vlan_by_tcpsk (smc->clcsock, ini)) {
@@ -1354,7 +1354,7 @@ static int smc_listen_v2_check(struct smc_sock *new_smc, rc =SMC_CLC_DECL_PEERNOSMC ; goto out; } -if (!smc_ism_v2_capable) { +if (!smc_ism_is_v2_capable ()) { ini->smcd_version &= ~SMC_V2 ; rc =SMC_CLC_DECL_NOISM2SUPP ; goto out;
@@ -1680,7 +1680,7 @@ static void smc_listen_work(struct work_struct *work) { struct smc_sock *new_smc = container_of(work, struct smc_sock, smc_listen_work); -u8 version = smc_ism_v2_capable ?SMC_V2 :SMC_V1 ; +u8 version =smc_ism_is_v2_capable () ?SMC_V2 :SMC_V1 ;struct socket *newclcsock = new_smc->clcsock;struct smc_clc_msg_accept_confirm *cclc;struct smc_clc_msg_proposal_area *buf;
net/smc/smc_ism.c +7 -1
@@ -21,7 +21,7 @@ struct smcd_dev_list smcd_dev_list = { .mutex = __MUTEX_INITIALIZER(smcd_dev_list.mutex) }; -bool smc_ism_v2_capable; +static bool smc_ism_v2_capable;/* Test if an ISM communication is possible - same CPC */ int smc_ism_cantalk (u64 peer_gid,unsigned short vlan_id,struct smcd_dev *smcd)
@@ -51,6 +51,12 @@ u16 smc_ism_get_chid(struct smcd_dev *smcd)return smcd->ops->get_chid (smcd); } +/* HW supports ISM V2 and thus System EID is defined */ +bool smc_ism_is_v2_capable (void ) +{ +return smc_ism_v2_capable; +} +/* Set a connection using this DMBE. */ void smc_ism_set_conn (struct smc_connection *conn) {
net/smc/smc_ism.h +2 -3
@@ -10,6 +10,7 @@#define SMCD_ISM_H #include <linux/uio.h> +#include <linux/types.h> #include <linux/mutex.h> #include "smc.h"
@@ -20,9 +21,6 @@ struct smcd_dev_list { /* List of SMCD devices */ };extern struct smcd_dev_list smcd_dev_list;/* list of smcd devices */ -extern bool smc_ism_v2_capable;/* HW supports ISM V2 and thus -* System EID is defined -*/ struct smc_ism_vlanid {/* VLAN id set on ISM device */ struct list_head list;
@@ -52,5 +50,6 @@ int smc_ism_write(struct smcd_dev *dev, const struct smc_ism_position *pos,int smc_ism_signal_shutdown (struct smc_link_group *lgr);void smc_ism_get_system_eid (struct smcd_dev *dev,u8 **eid);u16 smc_ism_get_chid (struct smcd_dev *dev); +bool smc_ism_is_v2_capable (void );void smc_ism_init (void );#endif
Signature · 1 line
2.17.1
PATCH v3 15/15 net/smc: Add support for obtaining system information
In reply to Karsten GraulFrom: Guvenc Gulce <[email protected]>
Add new netlink command to obtain system information of the smc module.
--- include/uapi/linux/smc.h | 1 + include/uapi/linux/smc_diag.h | 18 +++++++++++ net/smc/smc_clc.c | 5 +++ net/smc/smc_clc.h | 1 + net/smc/smc_core.c | 3 ++ net/smc/smc_core.h | 3 ++ net/smc/smc_diag.c | 61 +++++++++++++++++++++++++++++++++++ 7 files changed, 92 insertions(+)
include/uapi/linux/smc.h +1 -0
@@ -38,6 +38,7 @@ enum { /* SMC PNET Table commands */#define SMC_LGR_ID_SIZE 4#define SMC_MAX_HOSTNAME_LEN 32/* Max length of hostname */ #define SMC_MAX_EID_LEN 32/* Max length of eid */ +#define SMC_MAX_EID 8/* Max number of eids */ #define SMC_MAX_PORTS 2/* Max # of ports per ib device */ #define SMC_PCI_ID_STR_LEN 16/* Max length of pci id string */ #endif /* _UAPI_LINUX_SMC_H */
include/uapi/linux/smc_diag.h +18 -0
@@ -75,6 +75,7 @@ enum {enum {SMC_DIAG_GET_LGR_INFO =SMC_DIAG_EXTS_PER_CMD ,SMC_DIAG_GET_DEV_INFO , +SMC_DIAG_GET_SYS_INFO , __SMC_DIAG_EXT_MAX, };
@@ -91,6 +92,11 @@ enum { SMC_DIAG_DEV_INFO_SMCR, }; +/* SMC_DIAG_GET_SYS_INFO command extensions */ +enum { +SMC_DIAG_SYS_INFO =1 , +}; +#define SMC_DIAG_MAX (__SMC_DIAG_MAX - 1)#define SMC_DIAG_EXT_MAX (__SMC_DIAG_EXT_MAX - 1)
@@ -131,6 +137,18 @@ struct smc_diag_v2_lgr_info {__u8 peer_hostname[SMC_MAX_HOSTNAME_LEN ];/* Peer host */ }; + +struct smc_system_info { +__u8 smc_version;/* SMC Version */ +__u8 smc_release;/* SMC Release */ +__u8 ueid_count;/* Number of UEIDs */ +__u8 smc_ism_is_v2;/* Is ISM SMC v2 capable */ +__u32 reserved;/* Reserved for future use */ +__u8 local_hostname[SMC_MAX_HOSTNAME_LEN ];/* Hostnames */ +__u8 seid[SMC_MAX_EID_LEN ];/* System EID */ +__u8 ueid[SMC_MAX_EID ][SMC_MAX_EID_LEN ];/* User EIDs */ +}; +/* SMC_DIAG_LINKINFO */ struct smc_diag_linkinfo {
net/smc/smc_clc.c +5 -0
@@ -772,6 +772,11 @@ int smc_clc_send_accept(struct smc_sock *new_smc, bool srv_first_contact,return len >0 ?0 : len; } +void smc_clc_get_hostname (u8 **host) +{ + *host = &smc_hostname[0 ]; +} +void __init smc_clc_init (void ) {struct new_utsname *u;
net/smc/smc_clc.h +1 -0
@@ -334,5 +334,6 @@ int smc_clc_send_confirm(struct smc_sock *smc, bool clnt_first_contact,int smc_clc_send_accept (struct smc_sock *smc,bool srv_first_contact,u8 version);void smc_clc_init (void )__init ; +void smc_clc_get_hostname (u8 **host);#endif
net/smc/smc_core.c +3 -0
@@ -225,6 +225,9 @@ static const struct smc_diag_ops smc_diag_ops = { .get_chid = smc_ism_get_chid, .get_ib_devices = smc_get_smc_ib_devices, .is_ib_port_active = smc_ib_port_active, + .get_system_eid = smc_ism_get_system_eid, + .get_hostname = smc_clc_get_hostname, + .is_v2_capable = smc_ism_is_v2_capable, };const struct smc_diag_ops *smc_get_diag_ops (void )
net/smc/smc_core.h +3 -0
@@ -28,6 +28,9 @@ struct smc_diag_ops {u16 (*get_chid)(struct smcd_dev *smcd);struct smc_ib_devices *(*get_ib_devices)(void );bool (*is_ib_port_active)(struct smc_ib_device *smcibdev,u8 ibport); +void (*get_system_eid)(struct smcd_dev *smcd,u8 **eid); +void (*get_hostname)(u8 **host); +bool (*is_v2_capable)(void ); };struct smc_lgr_list {/* list of link group definition */
net/smc/smc_diag.c +61 -0
73 lines not on this page · raw message
Signature · 1 line
2.17.1
Jakub Kicinski
maintainerRe: [PATCH net-next v3 15/15] net/smc: Add support for obtaining system information
Quoted 7 lines · On Sat, 7 Nov 2020 13:59:58 +0100 Karsten Graul wrote:
From: Guvenc Gulce <[email protected]>
Add new netlink command to obtain system information of the smc module.
Signed-off-by Guvenc Gulce <[email protected]>Signed-off-by Karsten Graul <[email protected]>
Checkpatch says:
CHECK: Please don't use multiple blank lines
#62: FILE: include/uapi/linux/smc_diag.h:140:
+
WARNING: line length of 84 exceeds 80 columns
#172: FILE: net/smc/smc_diag.c:687:
+ smcd_dev = list_first_entry_or_null(&dev_list->list, struct smcd_dev, list);
Re: [PATCH net-next v3 15/15] net/smc: Add support for obtaining system information
Quoted 19 lines · Jakub Kicinski
Quoted 7 lines · On Sat, 7 Nov 2020 13:59:58 +0100 Karsten Graul wrote:
From: Guvenc Gulce <[email protected]>
Add new netlink command to obtain system information of the smc module.
Signed-off-by Guvenc Gulce <[email protected]>Signed-off-by Karsten Graul <[email protected]>Checkpatch says:
CHECK: Please don't use multiple blank lines
#62: FILE:include/uapi/linux/smc_diag.h:140:+
WARNING: line length of 84 exceeds 80 columns
#172: FILE:net/smc/smc_diag.c:687:
net/smc/smc_diag.c static int smc_diag_prep_smcr_dev(struct smc_ib_devices *dev_list, · line 687
Quoted 1 line
net/smc/smc_diag.c +1
-0+ smcd_dev = list_first_entry_or_null(&dev_list->list, struct smcd_dev, list);
The checkpatch.pl script in net-next does not bring up this length warning. We will address it in a v4.
Signature · 3 lines
Karsten (I'm a dude)