LU-3321 osc: Adjustment on osc LRU for performance

[fs/lustre-release.git] / lustre / osc / osc_cl_internal.h

diff --git a/lustre/osc/osc_cl_internal.h b/lustre/osc/osc_cl_internal.h
index d53c29f..405db95 100644 (file)
--- a/lustre/osc/osc_cl_internal.h
+++ b/lustre/osc/osc_cl_internal.h
@@ -80,6 +80,8 @@ struct osc_io {
         * page writeback from happening. */
        struct osc_extent *oi_trunc;
 
+       int oi_lru_reserved;
+
        struct obd_info    oi_info;
        struct obdo        oi_oa;
        struct osc_async_cbargs {
@@ -103,7 +105,7 @@ struct osc_session {
         struct osc_io       os_io;
 };
 
-#define OTI_PVEC_SIZE 64
+#define OTI_PVEC_SIZE 256
 struct osc_thread_info {
         struct ldlm_res_id      oti_resname;
         ldlm_policy_data_t      oti_policy;
@@ -368,29 +370,26 @@ struct osc_page {
         */
                              ops_in_lru:1,
        /**
-         * Set if the page must be transferred with OBD_BRW_SRVLOCK.
-         */
-                              ops_srvlock:1;
-       union {
-               /**
-                * lru page list. ops_inflight and ops_lru are exclusive so
-                * that they can share the same data.
-                */
-               cfs_list_t            ops_lru;
-               /**
-                * Linkage into a per-osc_object list of pages in flight. For
-                * debugging.
-                */
-               cfs_list_t            ops_inflight;
-       };
-        /**
-         * Thread that submitted this page for transfer. For debugging.
-         */
-        cfs_task_t           *ops_submitter;
-        /**
-         * Submit time - the time when the page is starting RPC. For debugging.
-         */
-        cfs_time_t            ops_submit_time;
+        * Set if the page must be transferred with OBD_BRW_SRVLOCK.
+        */
+                             ops_srvlock:1;
+       /**
+        * lru page list. See osc_lru_{del|use}() in osc_page.c for usage.
+        */
+       cfs_list_t            ops_lru;
+       /**
+        * Linkage into a per-osc_object list of pages in flight. For
+        * debugging.
+        */
+       cfs_list_t            ops_inflight;
+       /**
+        * Thread that submitted this page for transfer. For debugging.
+        */
+       struct task_struct           *ops_submitter;
+       /**
+        * Submit time - the time when the page is starting RPC. For debugging.
+        */
+       cfs_time_t            ops_submit_time;
 
         /**
          * A lock of which we hold a reference covers this page. Only used by
@@ -403,12 +402,12 @@ struct osc_page {
         struct cl_lock       *ops_lock;
 };
 
-extern cfs_mem_cache_t *osc_lock_kmem;
-extern cfs_mem_cache_t *osc_object_kmem;
-extern cfs_mem_cache_t *osc_thread_kmem;
-extern cfs_mem_cache_t *osc_session_kmem;
-extern cfs_mem_cache_t *osc_req_kmem;
-extern cfs_mem_cache_t *osc_extent_kmem;
+extern struct kmem_cache *osc_lock_kmem;
+extern struct kmem_cache *osc_object_kmem;
+extern struct kmem_cache *osc_thread_kmem;
+extern struct kmem_cache *osc_session_kmem;
+extern struct kmem_cache *osc_req_kmem;
+extern struct kmem_cache *osc_extent_kmem;
 
 extern struct lu_device_type osc_device_type;
 extern struct lu_context_key osc_key;
@@ -427,20 +426,21 @@ struct lu_object *osc_object_alloc(const struct lu_env *env,
                                    const struct lu_object_header *hdr,
                                    struct lu_device *dev);
 int osc_page_init(const struct lu_env *env, struct cl_object *obj,
-                 struct cl_page *page, cfs_page_t *vmpage);
+                 struct cl_page *page, struct page *vmpage);
 
 void osc_index2policy  (ldlm_policy_data_t *policy, const struct cl_object *obj,
                         pgoff_t start, pgoff_t end);
 int  osc_lvb_print     (const struct lu_env *env, void *cookie,
                         lu_printer_t p, const struct ost_lvb *lvb);
 
+void osc_lru_add_batch(struct client_obd *cli, cfs_list_t *list);
 void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
                     enum cl_req_type crt, int brw_flags);
 int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops);
 int osc_set_async_flags(struct osc_object *obj, struct osc_page *opg,
                        obd_flag async_flags);
 int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
-                       cfs_page_t *page, loff_t offset);
+                       struct page *page, loff_t offset);
 int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
                       struct osc_page *ops);
 int osc_teardown_async_page(const struct lu_env *env, struct osc_object *obj,
@@ -668,11 +668,11 @@ struct osc_extent {
        pgoff_t            oe_max_end;
        /** waitqueue - for those who want to be notified if this extent's
         * state has changed. */
-       cfs_waitq_t        oe_waitq;
+       wait_queue_head_t        oe_waitq;
        /** lock covering this extent */
        struct cl_lock    *oe_osclock;
        /** terminator of this extent. Must be true if this extent is in IO. */
-       cfs_task_t        *oe_owner;
+       struct task_struct        *oe_owner;
        /** return value of writeback. If somebody is waiting for this extent,
         * this value can be known by outside world. */
        int                oe_rc;