X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosc%2Fosc_page.c;h=affd0d265e0beedeb403c60018d9b2d64428bf54;hp=0691f7b438997b407b1cdcce7da3e2733b6f189e;hb=27815a0611a2e315a9a7696a20c2f257d48aeb7e;hpb=1b2547843817b4b7adbeb87ea9b070d9cac35c90

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index 0691f7b..affd0d2 100644
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -63,23 +63,23 @@ static int osc_page_is_dlocked(const struct lu_env *env,
                                const struct osc_page *opg,
                                enum cl_lock_mode mode, int pending, int unref)
 {
-        struct cl_page         *page;
-        struct osc_object      *obj;
-        struct osc_thread_info *info;
-        struct ldlm_res_id     *resname;
-        struct lustre_handle   *lockh;
-        ldlm_policy_data_t     *policy;
-        ldlm_mode_t             dlmmode;
-        int                     flags;
-
-        cfs_might_sleep();
-
-        info = osc_env_info(env);
-        resname = &info->oti_resname;
-        policy = &info->oti_policy;
-        lockh = &info->oti_handle;
-        page = opg->ops_cl.cpl_page;
-        obj = cl2osc(opg->ops_cl.cpl_obj);
+	struct cl_page         *page;
+	struct osc_object      *obj;
+	struct osc_thread_info *info;
+	struct ldlm_res_id     *resname;
+	struct lustre_handle   *lockh;
+	ldlm_policy_data_t     *policy;
+	ldlm_mode_t             dlmmode;
+	__u64                   flags;
+
+	might_sleep();
+
+	info = osc_env_info(env);
+	resname = &info->oti_resname;
+	policy = &info->oti_policy;
+	lockh = &info->oti_handle;
+	page = opg->ops_cl.cpl_page;
+	obj = cl2osc(opg->ops_cl.cpl_obj);
 
         flags = LDLM_FL_TEST_LOCK | LDLM_FL_BLOCK_GRANTED;
         if (pending)
@@ -208,7 +208,7 @@ static void osc_page_transfer_add(const struct lu_env *env,
 
 	spin_lock(&obj->oo_seatbelt);
 	cfs_list_add(&opg->ops_inflight, &obj->oo_inflight[crt]);
-	opg->ops_submitter = cfs_current();
+	opg->ops_submitter = current;
 	spin_unlock(&obj->oo_seatbelt);
 }
 
@@ -544,6 +544,30 @@ int osc_page_init(const struct lu_env *env, struct cl_object *obj,
 	return result;
 }
 
+int osc_over_unstable_soft_limit(struct client_obd *cli)
+{
+	long obd_upages, obd_dpages, osc_upages;
+
+	/* Can't check cli->cl_unstable_count, therefore, no soft limit */
+	if (cli == NULL)
+		return 0;
+
+	obd_upages = cfs_atomic_read(&obd_unstable_pages);
+	obd_dpages = cfs_atomic_read(&obd_dirty_pages);
+
+	osc_upages = cfs_atomic_read(&cli->cl_unstable_count);
+
+	/* obd_max_dirty_pages is the max number of (dirty + unstable)
+	 * pages allowed at any given time. To simulate an unstable page
+	 * only limit, we subtract the current number of dirty pages
+	 * from this max. This difference is roughly the amount of pages
+	 * currently available for unstable pages. Thus, the soft limit
+	 * is half of that difference. Check osc_upages to ensure we don't
+	 * set SOFT_SYNC for OSCs without any outstanding unstable pages. */
+	return osc_upages != 0 &&
+	       obd_upages >= (obd_max_dirty_pages - obd_dpages) / 2;
+}
+
 /**
  * Helper function called by osc_io_submit() for every page in an immediate
  * transfer (i.e., transferred synchronously).
@@ -567,6 +591,9 @@ 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;
 
+	if (osc_over_unstable_soft_limit(oap->oap_cli))
+		oap->oap_brw_flags |= OBD_BRW_SOFT_SYNC;
+
 	if (!client_is_remote(osc_export(obj)) &&
 			cfs_capable(CFS_CAP_SYS_RESOURCE)) {
 		oap->oap_brw_flags |= OBD_BRW_NOQUOTA;
@@ -781,7 +808,7 @@ static void osc_lru_add(struct client_obd *cli, struct osc_page *opg)
 
 	if (wakeup) {
 		osc_lru_shrink(cli, osc_cache_too_much(cli));
-		cfs_waitq_broadcast(&osc_lru_waitq);
+		wake_up_all(&osc_lru_waitq);
 	}
 }
 
@@ -812,7 +839,7 @@ static void osc_lru_del(struct client_obd *cli, struct osc_page *opg, bool del)
 			if (cfs_atomic_read(&cli->cl_lru_shrinkers) == 0 &&
 			    !memory_pressure_get())
 				osc_lru_shrink(cli, osc_cache_too_much(cli));
-			cfs_waitq_signal(&osc_lru_waitq);
+			wake_up(&osc_lru_waitq);
 		}
 	} else {
 		LASSERT(cfs_list_empty(&opg->ops_lru));
@@ -900,7 +927,7 @@ static int osc_lru_reserve(const struct lu_env *env, struct osc_object *obj,
 		if (rc > 0)
 			continue;
 
-		cfs_cond_resched();
+		cond_resched();
 
 		/* slowest case, all of caching pages are busy, notifying
 		 * other OSCs that we're lack of LRU slots. */