Whamcloud - gitweb
LU-12093 osc: don't check capability for every page 78/34478/4
authorLi Dongyang <dongyangli@ddn.com>
Thu, 21 Mar 2019 03:05:14 +0000 (14:05 +1100)
committerOleg Drokin <green@whamcloud.com>
Tue, 21 May 2019 05:12:33 +0000 (05:12 +0000)
We check CFS_CAP_SYS_RESOURCE for every page during the io.
This is expensive on apparmor enabled systems, we can only
do that once for the entire io and use the result when
submitting the pages.

Don't init the oap_brw_flags during osc_page_init(), the flag
will be set in either osc_queue_async_io() or osc_page_submit().

Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Change-Id: I0e664f43ce31c276b33476fdff11794185ab0a3b
Reviewed-on: https://review.whamcloud.com/34478
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Gu Zheng <gzheng@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/include/lustre_osc.h
lustre/osc/osc_cache.c
lustre/osc/osc_io.c
lustre/osc/osc_page.c

index 3c9ebef..32a2c63 100644 (file)
@@ -135,7 +135,9 @@ struct osc_io {
        /** true if this io is lockless. */
        unsigned int       oi_lockless:1,
        /** true if this io is counted as active IO */
        /** true if this io is lockless. */
        unsigned int       oi_lockless:1,
        /** true if this io is counted as active IO */
-                          oi_is_active:1;
+                          oi_is_active:1,
+       /** true if this io has CAP_SYS_RESOURCE */
+                          oi_cap_sys_resource:1;
        /** how many LRU pages are reserved for this IO */
        unsigned long      oi_lru_reserved;
 
        /** how many LRU pages are reserved for this IO */
        unsigned long      oi_lru_reserved;
 
index 9984fc1..3e179c1 100644 (file)
@@ -2336,9 +2336,6 @@ int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
        oap->oap_obj_off = offset;
        LASSERT(!(offset & ~PAGE_MASK));
 
        oap->oap_obj_off = offset;
        LASSERT(!(offset & ~PAGE_MASK));
 
-       if (cfs_capable(CFS_CAP_SYS_RESOURCE))
-               oap->oap_brw_flags = OBD_BRW_NOQUOTA;
-
        INIT_LIST_HEAD(&oap->oap_pending_item);
        INIT_LIST_HEAD(&oap->oap_rpc_item);
 
        INIT_LIST_HEAD(&oap->oap_pending_item);
        INIT_LIST_HEAD(&oap->oap_rpc_item);
 
@@ -2378,7 +2375,7 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
 
        /* Set the OBD_BRW_SRVLOCK before the page is queued. */
        brw_flags |= ops->ops_srvlock ? OBD_BRW_SRVLOCK : 0;
 
        /* Set the OBD_BRW_SRVLOCK before the page is queued. */
        brw_flags |= ops->ops_srvlock ? OBD_BRW_SRVLOCK : 0;
-       if (cfs_capable(CFS_CAP_SYS_RESOURCE)) {
+       if (oio->oi_cap_sys_resource) {
                brw_flags |= OBD_BRW_NOQUOTA;
                cmd |= OBD_BRW_NOQUOTA;
        }
                brw_flags |= OBD_BRW_NOQUOTA;
                cmd |= OBD_BRW_NOQUOTA;
        }
index 8fef8f6..25e6239 100644 (file)
@@ -357,18 +357,20 @@ int osc_io_iter_init(const struct lu_env *env, const struct cl_io_slice *ios)
 {
        struct osc_object *osc = cl2osc(ios->cis_obj);
        struct obd_import *imp = osc_cli(osc)->cl_import;
 {
        struct osc_object *osc = cl2osc(ios->cis_obj);
        struct obd_import *imp = osc_cli(osc)->cl_import;
+       struct osc_io *oio = osc_env_io(env);
        int rc = -EIO;
 
        spin_lock(&imp->imp_lock);
        if (likely(!imp->imp_invalid)) {
        int rc = -EIO;
 
        spin_lock(&imp->imp_lock);
        if (likely(!imp->imp_invalid)) {
-               struct osc_io *oio = osc_env_io(env);
-
                atomic_inc(&osc->oo_nr_ios);
                oio->oi_is_active = 1;
                rc = 0;
        }
        spin_unlock(&imp->imp_lock);
 
                atomic_inc(&osc->oo_nr_ios);
                oio->oi_is_active = 1;
                rc = 0;
        }
        spin_unlock(&imp->imp_lock);
 
+       if (cfs_capable(CFS_CAP_SYS_RESOURCE))
+               oio->oi_cap_sys_resource = 1;
+
        return rc;
 }
 EXPORT_SYMBOL(osc_io_iter_init);
        return rc;
 }
 EXPORT_SYMBOL(osc_io_iter_init);
index cd4107b..7a7dc1d 100644 (file)
@@ -327,6 +327,7 @@ EXPORT_SYMBOL(osc_page_init);
 void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
                     enum cl_req_type crt, int brw_flags)
 {
 void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
                     enum cl_req_type crt, int brw_flags)
 {
+       struct osc_io *oio = osc_env_io(env);
        struct osc_async_page *oap = &opg->ops_oap;
 
        LASSERTF(oap->oap_magic == OAP_MAGIC, "Bad oap magic: oap %p, "
        struct osc_async_page *oap = &opg->ops_oap;
 
        LASSERTF(oap->oap_magic == OAP_MAGIC, "Bad oap magic: oap %p, "
@@ -339,7 +340,7 @@ void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
        oap->oap_count     = opg->ops_to - opg->ops_from;
        oap->oap_brw_flags = OBD_BRW_SYNC | brw_flags;
 
        oap->oap_count     = opg->ops_to - opg->ops_from;
        oap->oap_brw_flags = OBD_BRW_SYNC | brw_flags;
 
-       if (cfs_capable(CFS_CAP_SYS_RESOURCE)) {
+       if (oio->oi_cap_sys_resource) {
                oap->oap_brw_flags |= OBD_BRW_NOQUOTA;
                oap->oap_cmd |= OBD_BRW_NOQUOTA;
        }
                oap->oap_brw_flags |= OBD_BRW_NOQUOTA;
                oap->oap_cmd |= OBD_BRW_NOQUOTA;
        }