LU-7734 lnet: proper cpt locking

[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 b064c0b..454b962 100644 (file)
--- a/lnet/include/lnet/lib-dlc.h
+++ b/lnet/include/lnet/lib-dlc.h
@@ -20,7 +20,7 @@
  *
  */
 /*
- * Copyright (c) 2014, Intel Corporation.
+ * Copyright (c) 2014, 2016, Intel Corporation.
  */
 /*
  * Author: Amir Shehata <amir.shehata@intel.com>
@@ -37,12 +37,24 @@
 #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;
-       __u32 lct_peer_timeout;
-       __u32 lct_peer_tx_credits;
-       __u32 lct_peer_rtr_credits;
-       __u32 lct_max_tx_credits;
+       __s32 lct_peer_timeout;
+       __s32 lct_peer_tx_credits;
+       __s32 lct_peer_rtr_credits;
+       __s32 lct_max_tx_credits;
 };
 
 struct lnet_ioctl_config_o2iblnd_tunables {
@@ -56,11 +68,15 @@ struct lnet_ioctl_config_o2iblnd_tunables {
        __u32 pad;
 };
 
+struct lnet_lnd_tunables {
+       union {
+               struct lnet_ioctl_config_o2iblnd_tunables lnd_o2ib;
+       } lnd_tun_u;
+};
+
 struct lnet_ioctl_config_lnd_tunables {
        struct lnet_ioctl_config_lnd_cmn_tunables lt_cmn;
-       union {
-               struct lnet_ioctl_config_o2iblnd_tunables lt_o2ib;
-       } lt_tun_u;
+       struct lnet_lnd_tunables lt_tun;
 };
 
 struct lnet_ioctl_net_config {
@@ -77,6 +93,10 @@ 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;
@@ -121,26 +141,90 @@ struct lnet_ioctl_config_data {
        char cfg_bulk[0];
 };
 
+struct lnet_ioctl_element_stats {
+       __u32   send_count;
+       __u32   recv_count;
+       __u32   drop_count;
+};
+
+/*
+ * 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_MAX_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                    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_rtr_credits;
+       __s32 cr_peer_min_rtr_credits;
+       __u32 cr_peer_tx_qnob;
+       __u32 cr_ncpt;
+};
+
 struct lnet_ioctl_peer {
        struct libcfs_ioctl_hdr pr_hdr;
        __u32 pr_count;
        __u32 pr_pad;
-       __u64 pr_nid;
+       lnet_nid_t pr_nid;
 
        union {
-               struct {
-                       char cr_aliveness[LNET_MAX_STR_LEN];
-                       __u32 cr_refcount;
-                       __u32 cr_ni_peer_tx_credits;
-                       __u32 cr_peer_tx_credits;
-                       __u32 cr_peer_rtr_credits;
-                       __u32 cr_peer_min_rtr_credits;
-                       __u32 cr_peer_tx_qnob;
-                       __u32 cr_ncpt;
-               } pr_peer_credits;
+               struct lnet_peer_ni_credit_info  pr_peer_credits;
        } 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_cfg_nid;
+       __u32 prcfg_idx;
+       bool prcfg_mr;
+       char prcfg_bulk[0];
+};
+
+struct lnet_ioctl_numa_range {
+       struct libcfs_ioctl_hdr nr_hdr;
+       __u32 nr_range;
+};
+
 struct lnet_ioctl_lnet_stats {
        struct libcfs_ioctl_hdr st_hdr;
        struct lnet_counters st_cntrs;