LU-13814 osc: add osc_dio_page_submit

This patch adds the osc_dio_page_submit and specializes
osc_page_submit to take only BIO pages.

Test-Parameters: fortestonly
Test-Parameters: forjanitoronly
Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: I048bbcd25ffee28fbbd8fee26017796b5e3586bd

diff --git a/lustre/include/lustre_osc.h b/lustre/include/lustre_osc.h
index 2c9de2f..aec534a 100644 (file)
--- a/lustre/include/lustre_osc.h
+++ b/lustre/include/lustre_osc.h
@@ -552,6 +552,8 @@ void osc_index2policy(union ldlm_policy_data *policy, const struct cl_object *ob
 void osc_lru_add_batch(struct client_obd *cli, struct list_head *list);
 void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
                     enum cl_req_type crt, int brw_flags);
+void osc_dio_page_submit(const struct lu_env *env, struct osc_page *opg,
+                        enum cl_req_type crt, int *brw_flags);
 int lru_queue_work(const struct lu_env *env, void *data);
 long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,
                    long target, bool force);
@@ -886,6 +888,20 @@ enum osc_extent_state {
 };
 
 /**
+ * tracking structure for the DIO pages in extents
+ */
+struct osc_dio_pages {
+       /* the cl_dio pages struct this is from */
+       struct cl_dio_pages *odp_cdp;
+       int odp_brw_flags;
+       /* this osc dio pages contains a subset of pages in the cdp, this
+        * tells us the range
+        */
+       int odp_from;
+       int odp_to;
+};
+
+/**
  * osc_extent data to manage dirty pages.
  * osc_extent has the following attributes:
  * 1. all pages in the same must be in one RPC in write back;
@@ -952,6 +968,8 @@ struct osc_extent {
        unsigned int            oe_nr_pages;
        /** list of pending oap pages. Pages in this list are NOT sorted. */
        struct list_head        oe_pages;
+       /* tracking structure for dio pages */
+       struct osc_dio_pages    oe_odp;
        /** start and end index of this extent, include start and end
         * themselves. Page offset here is the page index of osc_pages.
         * oe_start is used as keyword for red-black tree. */

diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c
index f4c8da9..03e644c 100644 (file)
--- a/lustre/osc/osc_cache.c
+++ b/lustre/osc/osc_cache.c
@@ -2591,6 +2591,8 @@ int osc_queue_dio_pages(const struct lu_env *env, struct cl_io *io,
        ext->oe_srvlock = !!(brw_flags & OBD_BRW_SRVLOCK);
        ext->oe_ndelay = !!(brw_flags & OBD_BRW_NDELAY);
        ext->oe_dio = true;
+       ext->oe_odp.odp_cdp = cdp;
+       ext->oe_odp.odp_brw_flags = brw_flags;
        oscl = oio->oi_write_osclock ? : oio->oi_read_osclock;
        if (oscl && oscl->ols_dlmlock != NULL) {
                ext->oe_dlmlock = LDLM_LOCK_GET(oscl->ols_dlmlock);

diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c
index 4f4d155..ad28e56 100644 (file)
--- a/lustre/osc/osc_io.c
+++ b/lustre/osc/osc_io.c
@@ -309,7 +309,7 @@ int osc_dio_submit(const struct lu_env *env, struct cl_io *io,
                if (from == -1)
                        from = i;
 
-               osc_page_submit(env, opg, crt, brw_flags);
+               osc_dio_page_submit(env, opg, crt, &brw_flags);
                list_add_tail(&oap->oap_pending_item, &list);
 
                queued++;

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index d7fb3d4..35fe70e 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -298,6 +298,27 @@ int osc_page_init(const struct lu_env *env, struct cl_io *io,
 EXPORT_SYMBOL(osc_page_init);
 
 /**
+ * Helper function called by osc_io_submit() for every page in a dio
+ */
+void osc_dio_page_submit(const struct lu_env *env, struct osc_page *opg,
+                        enum cl_req_type crt, int *brw_flags)
+{
+       struct osc_async_page *oap = &opg->ops_oap;
+       struct osc_io *oio = osc_env_io(env);
+
+       LASSERT(oap->oap_async_flags & ASYNC_READY);
+       LASSERT(oap->oap_async_flags & ASYNC_COUNT_STABLE);
+
+       oap->oap_cmd = crt == CRT_WRITE ? OBD_BRW_WRITE : OBD_BRW_READ;
+       oap->oap_brw_flags = OBD_BRW_SYNC | *brw_flags;
+
+       if (oio->oi_cap_sys_resource)
+               oap->oap_brw_flags |= OBD_BRW_SYS_RESOURCE;
+
+       *brw_flags = oap->oap_brw_flags;
+}
+
+/**
  * Helper function called by osc_io_submit() for every page in an immediate
  * transfer (i.e., transferred synchronously).
  */
@@ -305,7 +326,6 @@ void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
                     enum cl_req_type crt, int brw_flags)
 {
        struct osc_object *obj = osc_page_object(opg);
-       struct cl_page *page = opg->ops_cl.cpl_page;
        struct osc_async_page *oap = &opg->ops_oap;
        struct osc_io *oio = osc_env_io(env);
 
@@ -318,10 +338,8 @@ void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
        if (oio->oi_cap_sys_resource)
                oap->oap_brw_flags |= OBD_BRW_SYS_RESOURCE;
 
-       if (page->cp_type != CPT_TRANSIENT) {
-               osc_page_transfer_get(opg, "transfer\0imm");
-               osc_lru_use(osc_cli(obj), opg);
-       }
+       osc_page_transfer_get(opg, "transfer\0imm");
+       osc_lru_use(osc_cli(obj), opg);
 }
 
 /* --------------- LRU page management ------------------ */