LU-6325 ptlrpc: make ptlrpcd threads cpt-aware

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

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index 9a0b67e..64419d0 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -1872,34 +1872,42 @@ struct ptlrpcd_ctl {
         * Stop completion.
         */
        struct completion               pc_finishing;
-        /**
-         * Thread requests set.
-         */
-        struct ptlrpc_request_set  *pc_set;
-        /**
+       /**
+        * Thread requests set.
+        */
+       struct ptlrpc_request_set       *pc_set;
+       /**
         * Thread name used in kthread_run()
-         */
-        char                        pc_name[16];
-        /**
-         * Environment for request interpreters to run in.
-         */
-        struct lu_env               pc_env;
+        */
+       char                            pc_name[16];
+       /**
+        * Environment for request interpreters to run in.
+        */
+       struct lu_env                   pc_env;
+       /**
+        * CPT the thread is bound on.
+        */
+       int                             pc_cpt;
         /**
          * Index of ptlrpcd thread in the array.
          */
-        int                         pc_index;
-        /**
-         * Number of the ptlrpcd's partners.
-         */
-        int                         pc_npartners;
-        /**
-         * Pointer to the array of partners' ptlrpcd_ctl structure.
-         */
-        struct ptlrpcd_ctl        **pc_partners;
-        /**
-         * Record the partner index to be processed next.
-         */
-        int                         pc_cursor;
+       int                             pc_index;
+       /**
+        * Pointer to the array of partners' ptlrpcd_ctl structure.
+        */
+       struct ptlrpcd_ctl              **pc_partners;
+       /**
+        * Number of the ptlrpcd's partners.
+        */
+       int                             pc_npartners;
+       /**
+        * Record the partner index to be processed next.
+        */
+       int                             pc_cursor;
+       /**
+        * Error code if the thread failed to fully start.
+        */
+       int                             pc_error;
 };
 
 /* Bits for pc_flags */
@@ -1922,10 +1930,6 @@ enum ptlrpcd_ctl_flags {
          * This is a recovery ptlrpc thread.
          */
         LIOD_RECOVERY    = 1 << 3,
-        /**
-         * The ptlrpcd is bound to some CPU core.
-         */
-        LIOD_BIND        = 1 << 4,
 };
 
 /**
@@ -2636,43 +2640,11 @@ void ptlrpc_pinger_ir_down(void);
 /** @} */
 int ptlrpc_pinger_suppress_pings(void);
 
-/* ptlrpc daemon bind policy */
-typedef enum {
-        /* all ptlrpcd threads are free mode */
-        PDB_POLICY_NONE          = 1,
-        /* all ptlrpcd threads are bound mode */
-        PDB_POLICY_FULL          = 2,
-        /* <free1 bound1> <free2 bound2> ... <freeN boundN> */
-        PDB_POLICY_PAIR          = 3,
-        /* <free1 bound1> <bound1 free2> ... <freeN boundN> <boundN free1>,
-         * means each ptlrpcd[X] has two partners: thread[X-1] and thread[X+1].
-         * If kernel supports NUMA, pthrpcd threads are binded and
-         * grouped by NUMA node */
-        PDB_POLICY_NEIGHBOR      = 4,
-} pdb_policy_t;
-
-/* ptlrpc daemon load policy
- * It is caller's duty to specify how to push the async RPC into some ptlrpcd
- * queue, but it is not enforced, affected by "ptlrpcd_bind_policy". If it is
- * "PDB_POLICY_FULL", then the RPC will be processed by the selected ptlrpcd,
- * Otherwise, the RPC may be processed by the selected ptlrpcd or its partner,
- * depends on which is scheduled firstly, to accelerate the RPC processing. */
-typedef enum {
-        /* on the same CPU core as the caller */
-        PDL_POLICY_SAME         = 1,
-        /* within the same CPU partition, but not the same core as the caller */
-        PDL_POLICY_LOCAL        = 2,
-        /* round-robin on all CPU cores, but not the same core as the caller */
-        PDL_POLICY_ROUND        = 3,
-        /* the specified CPU core is preferred, but not enforced */
-        PDL_POLICY_PREFERRED    = 4,
-} pdl_policy_t;
-
 /* ptlrpc/ptlrpcd.c */
 void ptlrpcd_stop(struct ptlrpcd_ctl *pc, int force);
 void ptlrpcd_free(struct ptlrpcd_ctl *pc);
 void ptlrpcd_wake(struct ptlrpc_request *req);
-void ptlrpcd_add_req(struct ptlrpc_request *req, pdl_policy_t policy, int idx);
+void ptlrpcd_add_req(struct ptlrpc_request *req);
 void ptlrpcd_add_rqset(struct ptlrpc_request_set *set);
 int ptlrpcd_addref(void);
 void ptlrpcd_decref(void);