Commit 4ddcd16f authored by Jinshan Xiong's avatar Jinshan Xiong Committed by Greg Kroah-Hartman
Browse files

staging: lustre: osc: handle osc eviction correctly 



Cleanup everything if an OSC is being evicted.
Group lock is not well supported yet.

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


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarBobi Jam <bobijam@hotmail.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a43fbc3

drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

+1 −2
Original line number Diff line number Diff line
@@ -1131,8 +1131,7 @@ static int lock_matches(struct ldlm_lock *lock, struct lock_match_data *data) 
	if (!data->lmd_unref && LDLM_HAVE_MASK(lock, GONE))

		return INTERVAL_ITER_CONT;



	if ((data->lmd_flags & LDLM_FL_LOCAL_ONLY) &&

	    !ldlm_is_local(lock))

	if (!equi(data->lmd_flags & LDLM_FL_LOCAL_ONLY, ldlm_is_local(lock)))

		return INTERVAL_ITER_CONT;



	if (data->lmd_flags & LDLM_FL_TEST_LOCK) {

drivers/staging/lustre/lustre/osc/osc_cache.c

+13 −12
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static int osc_extent_sanity_check0(struct osc_extent *ext, 
		goto out;

	}



	if (ext->oe_dlmlock) {

	if (ext->oe_dlmlock && !ldlm_is_failed(ext->oe_dlmlock)) {

		struct ldlm_extent *extent;



		extent = &ext->oe_dlmlock->l_policy_data.l_extent;
@@ -2710,8 +2710,8 @@ int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj, 
/**

 * Called by osc_io_setattr_start() to freeze and destroy covering extents.

 */

int osc_cache_truncate_start(const struct lu_env *env, struct osc_io *oio,

			     struct osc_object *obj, __u64 size)

int osc_cache_truncate_start(const struct lu_env *env, struct osc_object *obj,

			     u64 size, struct osc_extent **extp)

{

	struct client_obd *cli = osc_cli(obj);

	struct osc_extent *ext;
@@ -2808,9 +2808,11 @@ int osc_cache_truncate_start(const struct lu_env *env, struct osc_io *oio, 
			/* we need to hold this extent in OES_TRUNC state so

			 * that no writeback will happen. This is to avoid

			 * BUG 17397.

			 * Only partial truncate can reach here, if @size is

			 * not zero, the caller should provide a valid @extp.

			 */

			LASSERT(!oio->oi_trunc);

			oio->oi_trunc = osc_extent_get(ext);

			LASSERT(!*extp);

			*extp = osc_extent_get(ext);

			OSC_EXTENT_DUMP(D_CACHE, ext,

					"trunc at %llu\n", size);

		}
@@ -2836,13 +2838,10 @@ int osc_cache_truncate_start(const struct lu_env *env, struct osc_io *oio, 
/**

 * Called after osc_io_setattr_end to add oio->oi_trunc back to cache.

 */

void osc_cache_truncate_end(const struct lu_env *env, struct osc_io *oio,

			    struct osc_object *obj)

void osc_cache_truncate_end(const struct lu_env *env, struct osc_extent *ext)

{

	struct osc_extent *ext = oio->oi_trunc;



	oio->oi_trunc = NULL;

	if (ext) {

		struct osc_object *obj = ext->oe_obj;

		bool unplug = false;



		EASSERT(ext->oe_nr_pages > 0, ext);
@@ -3183,8 +3182,10 @@ static int discard_cb(const struct lu_env *env, struct cl_io *io, 
	/* page is top page. */

	info->oti_next_index = osc_index(ops) + 1;

	if (cl_page_own(env, io, page) == 0) {

		KLASSERT(ergo(page->cp_type == CPT_CACHEABLE,

			      !PageDirty(cl_page_vmpage(page))));

		if (page->cp_type == CPT_CACHEABLE &&

		    PageDirty(cl_page_vmpage(page)))

			CL_PAGE_DEBUG(D_ERROR, env, page,

				      "discard dirty page?\n");



		/* discard the page */

		cl_page_discard(env, io, page);

drivers/staging/lustre/lustre/osc/osc_cl_internal.h

+7 −4
Original line number Diff line number Diff line
@@ -159,6 +159,10 @@ struct osc_object { 
	/* Protect osc_lock this osc_object has */

	spinlock_t		oo_ol_spin;

	struct list_head	oo_ol_list;



	/** number of active IOs of this object */

	atomic_t		oo_nr_ios;

	wait_queue_head_t	oo_io_waitq;

};



static inline void osc_object_lock(struct osc_object *obj)
@@ -399,10 +403,9 @@ int osc_flush_async_page(const struct lu_env *env, struct cl_io *io, 
			 struct osc_page *ops);

int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj,

			 struct list_head *list, int cmd, int brw_flags);

int osc_cache_truncate_start(const struct lu_env *env, struct osc_io *oio,

			     struct osc_object *obj, __u64 size);

void osc_cache_truncate_end(const struct lu_env *env, struct osc_io *oio,

			    struct osc_object *obj);

int osc_cache_truncate_start(const struct lu_env *env, struct osc_object *obj,

			     u64 size, struct osc_extent **extp);

void osc_cache_truncate_end(const struct lu_env *env, struct osc_extent *ext);

int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj,

			      pgoff_t start, pgoff_t end, int hp, int discard);

int osc_cache_wait_range(const struct lu_env *env, struct osc_object *obj,

drivers/staging/lustre/lustre/osc/osc_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -220,4 +220,6 @@ struct ldlm_lock *osc_dlmlock_at_pgoff(const struct lu_env *env, 
				       struct osc_object *obj, pgoff_t index,

				       enum osc_dap_flags flags);



int osc_object_invalidate(const struct lu_env *env, struct osc_object *osc);



#endif /* OSC_INTERNAL_H */

drivers/staging/lustre/lustre/osc/osc_io.c

+47 −13
Original line number Diff line number Diff line
@@ -330,7 +330,24 @@ static int osc_io_commit_async(const struct lu_env *env, 
	return result;

}



static int osc_io_rw_iter_init(const struct lu_env *env,

static 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;

	int rc = -EIO;



	spin_lock(&imp->imp_lock);

	if (likely(!imp->imp_invalid)) {

		atomic_inc(&osc->oo_nr_ios);

		rc = 0;

	}

	spin_unlock(&imp->imp_lock);



	return rc;

}



static int osc_io_write_iter_init(const struct lu_env *env,

				  const struct cl_io_slice *ios)

{

	struct cl_io *io = ios->cis_io;
@@ -342,7 +359,7 @@ static int osc_io_rw_iter_init(const struct lu_env *env, 
	unsigned long max_pages;



	if (cl_io_is_append(io))

		return 0;

		return osc_io_iter_init(env, ios);



	npages = io->u.ci_rw.crw_count >> PAGE_SHIFT;

	if (io->u.ci_rw.crw_pos & ~PAGE_MASK)
@@ -374,10 +391,20 @@ static int osc_io_rw_iter_init(const struct lu_env *env, 
		(void)ptlrpcd_queue_work(cli->cl_lru_work);

	}



	return 0;

	return osc_io_iter_init(env, ios);

}



static void osc_io_rw_iter_fini(const struct lu_env *env,

static void osc_io_iter_fini(const struct lu_env *env,

			     const struct cl_io_slice *ios)

{

	struct osc_object *osc = cl2osc(ios->cis_obj);



	LASSERT(atomic_read(&osc->oo_nr_ios) > 0);

	if (atomic_dec_and_test(&osc->oo_nr_ios))

		wake_up_all(&osc->oo_io_waitq);

}



static void osc_io_write_iter_fini(const struct lu_env *env,

				   const struct cl_io_slice *ios)

{

	struct osc_io *oio = osc_env_io(env);
@@ -389,6 +416,8 @@ static void osc_io_rw_iter_fini(const struct lu_env *env, 
		oio->oi_lru_reserved = 0;

	}

	oio->oi_write_osclock = NULL;



	osc_io_iter_fini(env, ios);

}



static int osc_io_fault_start(const struct lu_env *env,
@@ -479,7 +508,8 @@ static int osc_io_setattr_start(const struct lu_env *env, 


	/* truncate cache dirty pages first */

	if (cl_io_is_trunc(io))

		result = osc_cache_truncate_start(env, oio, cl2osc(obj), size);

		result = osc_cache_truncate_start(env, cl2osc(obj), size,

						  &oio->oi_trunc);



	if (result == 0 && oio->oi_lockless == 0) {

		cl_object_attr_lock(obj);
@@ -589,12 +619,10 @@ static void osc_io_setattr_end(const struct lu_env *env, 
		__u64 size = io->u.ci_setattr.sa_attr.lvb_size;



		osc_trunc_check(env, io, oio, size);

		if (oio->oi_trunc) {

			osc_cache_truncate_end(env, oio, cl2osc(obj));

		osc_cache_truncate_end(env, oio->oi_trunc);

		oio->oi_trunc = NULL;

	}

}

}



struct osc_data_version_args {

	struct osc_io *dva_oio;
@@ -832,17 +860,21 @@ static void osc_io_end(const struct lu_env *env, 
static const struct cl_io_operations osc_io_ops = {

	.op = {

		[CIT_READ] = {

			.cio_iter_init	= osc_io_iter_init,

			.cio_iter_fini	= osc_io_iter_fini,

			.cio_start  = osc_io_read_start,

			.cio_fini   = osc_io_fini

		},

		[CIT_WRITE] = {

			.cio_iter_init = osc_io_rw_iter_init,

			.cio_iter_fini = osc_io_rw_iter_fini,

			.cio_iter_init	= osc_io_write_iter_init,

			.cio_iter_fini	= osc_io_write_iter_fini,

			.cio_start  = osc_io_write_start,

			.cio_end    = osc_io_end,

			.cio_fini   = osc_io_fini

		},

		[CIT_SETATTR] = {

			.cio_iter_init	= osc_io_iter_init,

			.cio_iter_fini	= osc_io_iter_fini,

			.cio_start  = osc_io_setattr_start,

			.cio_end    = osc_io_setattr_end

		},
@@ -851,6 +883,8 @@ static const struct cl_io_operations osc_io_ops = { 
			.cio_end	= osc_io_data_version_end,

		},

		[CIT_FAULT] = {

			.cio_iter_init	= osc_io_iter_init,

			.cio_iter_fini	= osc_io_iter_fini,

			.cio_start  = osc_io_fault_start,

			.cio_end    = osc_io_end,

			.cio_fini   = osc_io_fini