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 1213eb7..48662b9 100644 (file)
--- a/lnet/include/lnet/lib-dlc.h
+++ b/lnet/include/lnet/lib-dlc.h
@@ -37,6 +37,18 @@
 #define LNET_MAX_SHOW_NUM_CPT  128
 #define LNET_UNDEFINED_HOPS    ((__u32) -1)
 
+/*
+ * To allow for future enhancements to extend the tunables
+ * add a hdr to this structure, so that the version can be set
+ * and checked for backwards compatibility. Newer versions of LNet
+ * can still work with older versions of lnetctl. The restriction is
+ * that the structure can be added to and not removed from in order
+ * to not invalidate older lnetctl utilities. Moreover, the order of
+ * fields must remain the same, and new fields appended to the structure
+ *
+ * That said all existing LND tunables will be added in this structure
+ * to avoid future changes.
+ */
 struct lnet_ioctl_config_lnd_cmn_tunables {
        __u32 lct_version;
        __s32 lct_peer_timeout;
@@ -53,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 {
@@ -68,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];
@@ -91,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;
 
@@ -125,14 +149,62 @@ 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
+ *  when configuring an NI: Net, Interfaces, CPT list and LND tunables
+ *  A network is passed as a string to the DLC and translated using
+ *  libcfs_str2net()
+ *  An interface is the name of the system configured interface
+ *  (ex eth0, ib1)
+ *  CPT is the list of CPTS LND tunables are passed in the lic_bulk area
+ */
+struct lnet_ioctl_config_ni {
+       struct libcfs_ioctl_hdr lic_cfg_hdr;
+       lnet_nid_t              lic_nid;
+       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_ncpts;
+       __u32                   lic_status;
+       __u32                   lic_tcp_bonding;
+       __u32                   lic_idx;
+       __s32                   lic_dev_cpt;
+       char                    pad[4];
+       char                    lic_bulk[0];
+};
+
 struct lnet_peer_ni_credit_info {
        char cr_aliveness[LNET_MAX_STR_LEN];
        __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;
 };
 
@@ -149,10 +221,18 @@ struct lnet_ioctl_peer {
 
 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;
-       char prcfg_bulk[0];
+       __u32 prcfg_count;
+       bool prcfg_mr;
+       __u32 prcfg_state;
+       __u32 prcfg_size;
+       void __user *prcfg_bulk;
+};
+
+struct lnet_ioctl_numa_range {
+       struct libcfs_ioctl_hdr nr_hdr;
+       __u32 nr_range;
 };
 
 struct lnet_ioctl_lnet_stats {