LU-10391 lnet: change tp_nid to 16byte in lnet_test_peer.

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

diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h
index b8e2a2e..d375c3e 100644 (file)
--- a/lnet/include/lnet/lib-types.h
+++ b/lnet/include/lnet/lib-types.h
@@ -90,7 +90,7 @@ struct lnet_rsp_tracker {
        /* cpt to lock */
        int rspt_cpt;
        /* nid of next hop */
-       lnet_nid_t rspt_next_hop_nid;
+       struct lnet_nid rspt_next_hop_nid;
        /* deadline of the REPLY/ACK */
        ktime_t rspt_deadline;
        /* parent MD */
@@ -236,7 +236,7 @@ struct lnet_libmd {
 struct lnet_test_peer {
        /* info about peers we are trying to fail */
        struct list_head        tp_list;        /* ln_test_peers */
-       lnet_nid_t              tp_nid;         /* matching nid */
+       struct lnet_nid         tp_nid;         /* matching nid */
        unsigned int            tp_threshold;   /* # failures to simulate */
 };
 
@@ -251,7 +251,11 @@ struct netstrfns {
        char    *nf_name;
        char    *nf_modname;
        void    (*nf_addr2str)(u32 addr, char *str, size_t size);
+       void    (*nf_addr2str_size)(const __be32 *addr, size_t asize,
+                                   char *str, size_t size);
        int     (*nf_str2addr)(const char *str, int nob, u32 *addr);
+       int     (*nf_str2addr_size)(const char *str, int nob,
+                                   __be32 *addr, size_t *asize);
        int     (*nf_parse_addrlist)(char *str, int len,
                                     struct list_head *list);
        int     (*nf_print_addrlist)(char *buffer, int count,
@@ -311,6 +315,10 @@ struct lnet_lnd {
 
        /* accept a new connection */
        int (*lnd_accept)(struct lnet_ni *ni, struct socket *sock);
+
+       /* get dma_dev priority */
+       unsigned int (*lnd_get_dev_prio)(struct lnet_ni *ni,
+                                        unsigned int dev_idx);
 };
 
 struct lnet_tx_queue {
@@ -451,7 +459,7 @@ struct lnet_ni {
        __u32                   *ni_cpts;
 
        /* interface's NID */
-       lnet_nid_t              ni_nid;
+       struct lnet_nid         ni_nid;
 
        /* instance-specific data */
        void                    *ni_data;
@@ -589,7 +597,7 @@ struct lnet_peer_ni {
        /* network peer is on */
        struct lnet_net         *lpni_net;
        /* peer's NID */
-       lnet_nid_t              lpni_nid;
+       struct lnet_nid         lpni_nid;
        /* # refs */
        struct kref             lpni_kref;
        /* health value for the peer */
@@ -652,12 +660,12 @@ struct lnet_peer {
        struct list_head        lp_rtr_list;
 
        /* primary NID of the peer */
-       lnet_nid_t              lp_primary_nid;
+       struct lnet_nid         lp_primary_nid;
 
        /* source NID to use during discovery */
-       lnet_nid_t              lp_disc_src_nid;
+       struct lnet_nid         lp_disc_src_nid;
        /* destination NID to use during discovery */
-       lnet_nid_t              lp_disc_dst_nid;
+       struct lnet_nid         lp_disc_dst_nid;
 
        /* net to perform discovery on */
        __u32                   lp_disc_net_id;
@@ -799,6 +807,13 @@ struct lnet_peer {
 #define LNET_PEER_MARK_DELETION                BIT(18)
 /* lnet_peer_del()/lnet_peer_del_locked() has been called on the peer */
 #define LNET_PEER_MARK_DELETED         BIT(19)
+/* lock primary NID to what's requested by ULP */
+#define LNET_PEER_LOCK_PRIMARY         BIT(20)
+/* this is for informational purposes only. It is set if a peer gets
+ * configured from Lustre with a primary NID which belongs to another peer
+ * which is also configured by Lustre as the primary NID.
+ */
+#define LNET_PEER_BAD_CONFIG           BIT(21)
 
 struct lnet_peer_net {
        /* chain on lp_peer_nets */
@@ -868,7 +883,7 @@ struct lnet_route {
        struct list_head        lr_list;        /* chain on net */
        struct list_head        lr_gwlist;      /* chain on gateway */
        struct lnet_peer        *lr_gateway;    /* router node */
-       lnet_nid_t              lr_nid;         /* NID used to add route */
+       struct lnet_nid         lr_nid;         /* NID used to add route */
        __u32                   lr_net;         /* remote network number */
        __u32                   lr_lnet;        /* local network number */
        int                     lr_seq;         /* sequence for round-robin */