LU-8130 ptlrpc: convert conn_hash to rhashtable

[fs/lustre-release.git] / lustre / include / lustre_net.h

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index b77a794..f456e6c 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -51,6 +51,7 @@
  * @{
  */
 #include <linux/kobject.h>
+#include <linux/rhashtable.h>
 #include <linux/uio.h>
 #include <libcfs/libcfs.h>
 #include <lnet/api.h>
@@ -530,7 +531,7 @@ struct ptlrpc_replay_async_args {
  */
 struct ptlrpc_connection {
        /** linkage for connections hash table */
-       struct hlist_node        c_hash;
+       struct rhash_head       c_hash;
        /** Our own lnet nid for this connection */
        lnet_nid_t              c_self;
        /** Remote side nid for this connection */
@@ -553,8 +554,8 @@ struct ptlrpc_client {
 
 /** state flags of requests */
 /* XXX only ones left are those used by the bulk descs as well! */
-#define PTL_RPC_FL_INTR      (1 << 0)  /* reply wait was interrupted by user */
-#define PTL_RPC_FL_TIMEOUT   (1 << 7)  /* request timed out waiting for reply */
+#define PTL_RPC_FL_INTR                BIT(0)  /* reply wait was interrupted by user */
+#define PTL_RPC_FL_TIMEOUT     BIT(7)  /* request timed out waiting for reply */
 
 #define REQ_MAX_ACK_LOCKS 8
 
@@ -1193,7 +1194,7 @@ static inline bool ptlrpc_nrs_req_can_move(struct ptlrpc_request *req)
 static inline bool lustre_req_swabbed(struct ptlrpc_request *req, size_t index)
 {
        LASSERT(index < sizeof(req->rq_req_swab_mask) * 8);
-       return req->rq_req_swab_mask & (1 << index);
+       return req->rq_req_swab_mask & BIT(index);
 }
 
 /**
@@ -1202,7 +1203,7 @@ static inline bool lustre_req_swabbed(struct ptlrpc_request *req, size_t index)
 static inline bool lustre_rep_swabbed(struct ptlrpc_request *req, size_t index)
 {
        LASSERT(index < sizeof(req->rq_rep_swab_mask) * 8);
-       return req->rq_rep_swab_mask & (1 << index);
+       return req->rq_rep_swab_mask & BIT(index);
 }
 
 /**
@@ -1227,9 +1228,9 @@ static inline bool ptlrpc_rep_need_swab(struct ptlrpc_request *req)
 static inline void lustre_set_req_swabbed(struct ptlrpc_request *req,
                                          size_t index)
 {
-        LASSERT(index < sizeof(req->rq_req_swab_mask) * 8);
-        LASSERT((req->rq_req_swab_mask & (1 << index)) == 0);
-        req->rq_req_swab_mask |= 1 << index;
+       LASSERT(index < sizeof(req->rq_req_swab_mask) * 8);
+       LASSERT((req->rq_req_swab_mask & BIT(index)) == 0);
+       req->rq_req_swab_mask |= BIT(index);
 }
 
 /**
@@ -1238,9 +1239,9 @@ static inline void lustre_set_req_swabbed(struct ptlrpc_request *req,
 static inline void lustre_set_rep_swabbed(struct ptlrpc_request *req,
                                          size_t index)
 {
-        LASSERT(index < sizeof(req->rq_rep_swab_mask) * 8);
-        LASSERT((req->rq_rep_swab_mask & (1 << index)) == 0);
-        req->rq_rep_swab_mask |= 1 << index;
+       LASSERT(index < sizeof(req->rq_rep_swab_mask) * 8);
+       LASSERT((req->rq_rep_swab_mask & BIT(index)) == 0);
+       req->rq_rep_swab_mask |= BIT(index);
 }
 
 /**
@@ -1425,6 +1426,7 @@ extern const struct ptlrpc_bulk_frag_ops ptlrpc_bulk_kiov_nopin_ops;
  *  Another user is readpage for MDT.
  */
 struct ptlrpc_bulk_desc {
+       unsigned int    bd_refs; /* number MD's assigned including zero-sends */
        /** completed with failure */
        unsigned long bd_failure:1;
        /** client side */
@@ -1447,6 +1449,7 @@ struct ptlrpc_bulk_desc {
        int                    bd_max_iov;      /* allocated size of bd_iov */
        int                    bd_nob;          /* # bytes covered */
        int                    bd_nob_transferred; /* # bytes GOT/PUT */
+       unsigned int            bd_nob_last;    /* # bytes in last MD */
 
        __u64                  bd_last_mbits;
 
@@ -1454,6 +1457,9 @@ struct ptlrpc_bulk_desc {
        lnet_nid_t             bd_sender;       /* stash event::sender */
        int                     bd_md_count;    /* # valid entries in bd_mds */
        int                     bd_md_max_brw;  /* max entries in bd_mds */
+
+       /** array of offsets for each MD */
+       unsigned int            bd_mds_off[PTLRPC_BULK_OPS_COUNT];
        /** array of associated MDs */
        struct lnet_handle_md   bd_mds[PTLRPC_BULK_OPS_COUNT];
 
@@ -1464,10 +1470,10 @@ struct ptlrpc_bulk_desc {
 
 enum {
        SVC_INIT        = 0,
-       SVC_STOPPED     = 1 << 0,
-       SVC_STOPPING    = 1 << 1,
-       SVC_STARTING    = 1 << 2,
-       SVC_RUNNING     = 1 << 3,
+       SVC_STOPPED     = BIT(0),
+       SVC_STOPPING    = BIT(1),
+       SVC_STARTING    = BIT(2),
+       SVC_RUNNING     = BIT(3),
 };
 
 #define PTLRPC_THR_NAME_LEN            32
@@ -1885,24 +1891,24 @@ struct ptlrpcd_ctl {
 
 /* Bits for pc_flags */
 enum ptlrpcd_ctl_flags {
-        /**
-         * Ptlrpc thread start flag.
-         */
-        LIOD_START       = 1 << 0,
-        /**
-         * Ptlrpc thread stop flag.
-         */
-        LIOD_STOP        = 1 << 1,
-        /**
-         * Ptlrpc thread force flag (only stop force so far).
-         * This will cause aborting any inflight rpcs handled
-         * by thread if LIOD_STOP is specified.
-         */
-        LIOD_FORCE       = 1 << 2,
-        /**
-         * This is a recovery ptlrpc thread.
-         */
-        LIOD_RECOVERY    = 1 << 3,
+       /**
+        * Ptlrpc thread start flag.
+        */
+       LIOD_START      = BIT(0),
+       /**
+        * Ptlrpc thread stop flag.
+        */
+       LIOD_STOP       = BIT(1),
+       /**
+        * Ptlrpc thread force flag (only stop force so far).
+        * This will cause aborting any inflight rpcs handled
+        * by thread if LIOD_STOP is specified.
+        */
+       LIOD_FORCE      = BIT(2),
+       /**
+        * This is a recovery ptlrpc thread.
+        */
+       LIOD_RECOVERY   = BIT(3),
 };
 
 /**
@@ -2020,7 +2026,7 @@ static inline int ptlrpc_server_bulk_active(struct ptlrpc_bulk_desc *desc)
        LASSERT(desc != NULL);
 
        spin_lock(&desc->bd_lock);
-       rc = desc->bd_md_count;
+       rc = desc->bd_refs;
        spin_unlock(&desc->bd_lock);
        return rc;
 }
@@ -2045,7 +2051,7 @@ static inline int ptlrpc_client_bulk_active(struct ptlrpc_request *req)
 
 
        spin_lock(&desc->bd_lock);
-       rc = desc->bd_md_count;
+       rc = desc->bd_refs;
        spin_unlock(&desc->bd_lock);
        return rc;
 }