Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d443334 authored by Jinshan Xiong's avatar Jinshan Xiong Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ldlm: ELC picks locks in a safer policy 



Change the policy of ELC to pick locks that have no dirty pages,
no page in writeback state, and no locked pages.

Signed-off-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-on: http://review.whamcloud.com/9175
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4300


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarBobi Jam <bobijam@gmail.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 047d41bd

drivers/staging/lustre/lustre/include/lustre_dlm.h

+8 −5
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ struct ldlm_pool { 
	struct completion	 pl_kobj_unregister;

};



typedef int (*ldlm_cancel_for_recovery)(struct ldlm_lock *lock);

typedef int (*ldlm_cancel_cbt)(struct ldlm_lock *lock);



/**

 * LVB operations.
@@ -447,8 +447,11 @@ struct ldlm_namespace { 
	/** Limit of parallel AST RPC count. */

	unsigned		ns_max_parallel_ast;



	/** Callback to cancel locks before replaying it during recovery. */

	ldlm_cancel_for_recovery ns_cancel_for_recovery;

	/**

	 * Callback to check if a lock is good to be canceled by ELC or

	 * during recovery.

	 */

	ldlm_cancel_cbt		ns_cancel;



	/** LDLM lock stats */

	struct lprocfs_stats	*ns_stats;
@@ -480,9 +483,9 @@ static inline int ns_connect_lru_resize(struct ldlm_namespace *ns) 
}



static inline void ns_register_cancel(struct ldlm_namespace *ns,

				      ldlm_cancel_for_recovery arg)

				      ldlm_cancel_cbt arg)

{

	ns->ns_cancel_for_recovery = arg;

	ns->ns_cancel = arg;

}



struct ldlm_lock;

drivers/staging/lustre/lustre/ldlm/ldlm_request.c

+19 −9
Original line number Diff line number Diff line
@@ -1137,7 +1137,6 @@ static ldlm_policy_res_t ldlm_cancel_no_wait_policy(struct ldlm_namespace *ns, 
						    int count)

{

	ldlm_policy_res_t result = LDLM_POLICY_CANCEL_LOCK;

	ldlm_cancel_for_recovery cb = ns->ns_cancel_for_recovery;



	/* don't check added & count since we want to process all locks

	 * from unused list.
@@ -1147,7 +1146,7 @@ static ldlm_policy_res_t ldlm_cancel_no_wait_policy(struct ldlm_namespace *ns, 
	switch (lock->l_resource->lr_type) {

	case LDLM_EXTENT:

	case LDLM_IBITS:

		if (cb && cb(lock))

			if (ns->ns_cancel && ns->ns_cancel(lock) != 0)

			break;

	default:

		result = LDLM_POLICY_SKIP_LOCK;
@@ -1197,8 +1196,13 @@ static ldlm_policy_res_t ldlm_cancel_lrur_policy(struct ldlm_namespace *ns, 
	/* Stop when SLV is not yet come from server or lv is smaller than

	 * it is.

	 */

	return (slv == 0 || lv < slv) ?

		LDLM_POLICY_KEEP_LOCK : LDLM_POLICY_CANCEL_LOCK;

	if (slv == 0 || lv < slv)

		return LDLM_POLICY_KEEP_LOCK;



	if (ns->ns_cancel && ns->ns_cancel(lock) == 0)

		return LDLM_POLICY_KEEP_LOCK;



	return LDLM_POLICY_CANCEL_LOCK;

}



/**
@@ -1236,11 +1240,17 @@ static ldlm_policy_res_t ldlm_cancel_aged_policy(struct ldlm_namespace *ns, 
						 int unused, int added,

						 int count)

{

	/* Stop LRU processing if young lock is found and we reach past count */

	return ((added >= count) &&

		time_before(cfs_time_current(),

			    cfs_time_add(lock->l_last_used, ns->ns_max_age))) ?

		LDLM_POLICY_KEEP_LOCK : LDLM_POLICY_CANCEL_LOCK;

	if (added >= count)

		return LDLM_POLICY_KEEP_LOCK;



	if (time_before(cfs_time_current(),

			cfs_time_add(lock->l_last_used, ns->ns_max_age)))

		return LDLM_POLICY_KEEP_LOCK;



	if (ns->ns_cancel && ns->ns_cancel(lock) == 0)

		return LDLM_POLICY_KEEP_LOCK;



	return LDLM_POLICY_CANCEL_LOCK;

}



/**

drivers/staging/lustre/lustre/mdc/mdc_request.c

+2 −2
Original line number Diff line number Diff line
@@ -2249,7 +2249,7 @@ static struct obd_uuid *mdc_get_uuid(struct obd_export *exp) 
 * recovery, non zero value will be return if the lock can be canceled,

 * or zero returned for not

 */

static int mdc_cancel_for_recovery(struct ldlm_lock *lock)

static int mdc_cancel_weight(struct ldlm_lock *lock)

{

	if (lock->l_resource->lr_type != LDLM_IBITS)

		return 0;
@@ -2331,7 +2331,7 @@ static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg) 
	sptlrpc_lprocfs_cliobd_attach(obd);

	ptlrpc_lprocfs_register_obd(obd);



	ns_register_cancel(obd->obd_namespace, mdc_cancel_for_recovery);

	ns_register_cancel(obd->obd_namespace, mdc_cancel_weight);



	obd->obd_namespace->ns_lvbo = &inode_lvbo;

drivers/staging/lustre/lustre/osc/osc_lock.c

+3 −1
Original line number Diff line number Diff line
@@ -635,7 +635,9 @@ static int weigh_cb(const struct lu_env *env, struct cl_io *io, 
{

	struct cl_page *page = ops->ops_cl.cpl_page;



	if (cl_page_is_vmlocked(env, page)) {

	if (cl_page_is_vmlocked(env, page) ||

	    PageDirty(page->cp_vmpage) || PageWriteback(page->cp_vmpage)

	   ) {

		(*(unsigned long *)cbdata)++;

		return CLP_GANG_ABORT;

	}

drivers/staging/lustre/lustre/osc/osc_request.c

+7 −12
Original line number Diff line number Diff line
@@ -2292,15 +2292,13 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id, 
	if (*flags & LDLM_FL_TEST_LOCK)

		return -ENOLCK;

	if (intent) {

		LIST_HEAD(cancels);



		req = ptlrpc_request_alloc(class_exp2cliimp(exp),

					   &RQF_LDLM_ENQUEUE_LVB);

		if (!req)

			return -ENOMEM;



		rc = ldlm_prep_enqueue_req(exp, req, &cancels, 0);

		if (rc) {

		rc = ptlrpc_request_pack(req, LUSTRE_DLM_VERSION, LDLM_ENQUEUE);

		if (rc < 0) {

			ptlrpc_request_free(req);

			return rc;

		}
@@ -3110,17 +3108,14 @@ static int osc_import_event(struct obd_device *obd, 
 * \retval zero the lock can't be canceled

 * \retval other ok to cancel

 */

static int osc_cancel_for_recovery(struct ldlm_lock *lock)

static int osc_cancel_weight(struct ldlm_lock *lock)

{

	/*

	 * Cancel all unused extent lock in granted mode LCK_PR or LCK_CR.

	 *

	 * XXX as a future improvement, we can also cancel unused write lock

	 * if it doesn't have dirty data and active mmaps.

	 * Cancel all unused and granted extent lock.

	 */

	if (lock->l_resource->lr_type == LDLM_EXTENT &&

	    (lock->l_granted_mode == LCK_PR ||

	     lock->l_granted_mode == LCK_CR) && osc_ldlm_weigh_ast(lock) == 0)

	    lock->l_granted_mode == lock->l_req_mode &&

	    osc_ldlm_weigh_ast(lock) == 0)

		return 1;



	return 0;
@@ -3197,7 +3192,7 @@ int osc_setup(struct obd_device *obd, struct lustre_cfg *lcfg) 
	}



	INIT_LIST_HEAD(&cli->cl_grant_shrink_list);

	ns_register_cancel(obd->obd_namespace, osc_cancel_for_recovery);

	ns_register_cancel(obd->obd_namespace, osc_cancel_weight);

	return rc;



out_ptlrpcd_work: