LU-8943 lnd: Enable Multiple OPA Endpoints between Nodes

[fs/lustre-release.git] / lnet / include / lnet / lib-dlc.h

diff --git a/lnet/include/lnet/lib-dlc.h b/lnet/include/lnet/lib-dlc.h
index 016e392..48662b9 100644 (file)
--- a/lnet/include/lnet/lib-dlc.h
+++ b/lnet/include/lnet/lib-dlc.h
@@ -65,7 +65,8 @@ struct lnet_ioctl_config_o2iblnd_tunables {
        __u32 lnd_fmr_pool_size;
        __u32 lnd_fmr_flush_trigger;
        __u32 lnd_fmr_cache;
-       __u32 pad;
+       __u16 lnd_conns_per_peer;
+       __u16 pad;
 };
 
 struct lnet_lnd_tunables {
@@ -80,7 +81,7 @@ struct lnet_ioctl_config_lnd_tunables {
 };
 
 struct lnet_ioctl_net_config {
-       char ni_interfaces[LNET_MAX_INTERFACES][LNET_MAX_STR_LEN];
+       char ni_interfaces[LNET_NUM_INTERFACES][LNET_MAX_STR_LEN];
        __u32 ni_status;
        __u32 ni_cpts[LNET_MAX_SHOW_NUM_CPT];
        char cfg_bulk[0];
@@ -93,10 +94,6 @@ struct lnet_ioctl_net_config {
 /* # different router buffer pools */
 #define LNET_NRBPOOLS          (LNET_LARGE_BUF_IDX + 1)
 
-enum lnet_dbg_task {
-       LNET_DBG_INCR_DLC_SEQ = 0
-};
-
 struct lnet_ioctl_pool_cfg {
        struct {
                __u32 pl_npages;
@@ -107,6 +104,17 @@ struct lnet_ioctl_pool_cfg {
        __u32 pl_routing;
 };
 
+struct lnet_ioctl_ping_data {
+       struct libcfs_ioctl_hdr ping_hdr;
+
+       __u32 op_param;
+       __u32 ping_count;
+       __u32 ping_flags;
+       bool mr_info;
+       lnet_process_id_t ping_id;
+       lnet_process_id_t __user *ping_buf;
+};
+
 struct lnet_ioctl_config_data {
        struct libcfs_ioctl_hdr cfg_hdr;
 
@@ -141,6 +149,28 @@ struct lnet_ioctl_config_data {
        char cfg_bulk[0];
 };
 
+struct lnet_ioctl_comm_count {
+       __u32 ico_get_count;
+       __u32 ico_put_count;
+       __u32 ico_reply_count;
+       __u32 ico_ack_count;
+       __u32 ico_hello_count;
+};
+
+struct lnet_ioctl_element_stats {
+       __u32 iel_send_count;
+       __u32 iel_recv_count;
+       __u32 iel_drop_count;
+};
+
+struct lnet_ioctl_element_msg_stats {
+       struct libcfs_ioctl_hdr im_hdr;
+       __u32 im_idx;
+       struct lnet_ioctl_comm_count im_send_stats;
+       struct lnet_ioctl_comm_count im_recv_stats;
+       struct lnet_ioctl_comm_count im_drop_stats;
+};
+
 /*
  * lnet_ioctl_config_ni
  *  This structure describes an NI configuration. There are multiple components
@@ -154,15 +184,16 @@ struct lnet_ioctl_config_data {
 struct lnet_ioctl_config_ni {
        struct libcfs_ioctl_hdr lic_cfg_hdr;
        lnet_nid_t              lic_nid;
-       char                    lic_ni_intf[LNET_MAX_INTERFACES][LNET_MAX_STR_LEN];
+       char                    lic_ni_intf[LNET_NUM_INTERFACES][LNET_MAX_STR_LEN];
        char                    lic_legacy_ip2nets[LNET_MAX_STR_LEN];
-       __u32                   lic_cpts[LNET_MAX_SHOW_NUM_CPT];
+       __u32                   lic_cpts[LNET_MAX_SHOW_NUM_CPT];
        __u32                   lic_ncpts;
        __u32                   lic_status;
        __u32                   lic_tcp_bonding;
        __u32                   lic_idx;
        __s32                   lic_dev_cpt;
-       char                    lic_bulk[0];
+       char                    pad[4];
+       char                    lic_bulk[0];
 };
 
 struct lnet_peer_ni_credit_info {
@@ -170,9 +201,10 @@ struct lnet_peer_ni_credit_info {
        __u32 cr_refcount;
        __s32 cr_ni_peer_tx_credits;
        __s32 cr_peer_tx_credits;
+       __s32 cr_peer_min_tx_credits;
+       __u32 cr_peer_tx_qnob;
        __s32 cr_peer_rtr_credits;
        __s32 cr_peer_min_rtr_credits;
-       __u32 cr_peer_tx_qnob;
        __u32 cr_ncpt;
 };
 
@@ -187,31 +219,15 @@ struct lnet_ioctl_peer {
        } pr_lnd_u;
 };
 
-struct lnet_dbg_task_info {
-       /*
-        * TODO: a union can be added if the task requires more
-        * information from user space to be carried out in kernel space.
-        */
-};
-
-/*
- * This structure is intended to allow execution of debugging tasks. This
- * is not intended to be backwards compatible. Extra tasks can be added in
- * the future
- */
-struct lnet_ioctl_dbg {
-       struct libcfs_ioctl_hdr dbg_hdr;
-       enum lnet_dbg_task dbg_task;
-       char dbg_bulk[0];
-};
-
 struct lnet_ioctl_peer_cfg {
        struct libcfs_ioctl_hdr prcfg_hdr;
-       lnet_nid_t prcfg_key_nid;
+       lnet_nid_t prcfg_prim_nid;
        lnet_nid_t prcfg_cfg_nid;
-       __u32 prcfg_idx;
+       __u32 prcfg_count;
        bool prcfg_mr;
-       char prcfg_bulk[0];
+       __u32 prcfg_state;
+       __u32 prcfg_size;
+       void __user *prcfg_bulk;
 };
 
 struct lnet_ioctl_numa_range {