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

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

staging: lustre: llite: reset writeback index in ll_writepages 



Otherwise after one round the writeback index will become beyond
the file size and ->writepages() turns into an empty operation.

Also, a safety guard is added to limit the wait time for grant to
10 minutes(take recovery into consideration) at maximum in the
osc_enter_cache() function. Otherwise, EDQUOT will be returned to
the applications to start sync write.

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


Reviewed-by: default avatarBobi Jam <bobijam@gmail.com>
Reviewed-by: default avatarNiu Yawei <yawei.niu@intel.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 610cc3a4

drivers/staging/lustre/lustre/llite/rw.c

+3 −2
Original line number Diff line number Diff line
@@ -1105,7 +1105,8 @@ int ll_writepages(struct address_space *mapping, struct writeback_control *wbc) 


	if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0)) {

		if (end == OBD_OBJECT_EOF)

			end = i_size_read(inode);

			mapping->writeback_index = 0;

		else

			mapping->writeback_index = (end >> PAGE_SHIFT) + 1;

	}

	return result;

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

+22 −10
Original line number Diff line number Diff line
@@ -1383,15 +1383,19 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap, 
	return 0;

}



#define OSC_DUMP_GRANT(cli, fmt, args...) do {				      \

#define OSC_DUMP_GRANT(lvl, cli, fmt, args...) do {			      \

	struct client_obd *__tmp = (cli);				      \

	CDEBUG(D_CACHE, "%s: { dirty: %ld/%ld dirty_pages: %d/%d "	      \

	       "dropped: %ld avail: %ld, reserved: %ld, flight: %d } " fmt,   \

	CDEBUG(lvl, "%s: grant { dirty: %ld/%ld dirty_pages: %d/%d "	      \

	       "dropped: %ld avail: %ld, reserved: %ld, flight: %d } "	      \

	       "lru {in list: %d, left: %d, waiters: %d }" fmt,		      \

	       __tmp->cl_import->imp_obd->obd_name,			      \

	       __tmp->cl_dirty, __tmp->cl_dirty_max,			      \

	       atomic_read(&obd_dirty_pages), obd_max_dirty_pages,	      \

	       __tmp->cl_lost_grant, __tmp->cl_avail_grant,		      \

	       __tmp->cl_reserved_grant, __tmp->cl_w_in_flight, ##args);      \

	       __tmp->cl_reserved_grant, __tmp->cl_w_in_flight,		      \

	       atomic_read(&__tmp->cl_lru_in_list),			      \

	       atomic_read(&__tmp->cl_lru_busy),			      \

	       atomic_read(&__tmp->cl_lru_shrinkers), ##args);		      \

} while (0)



/* caller must hold loi_list_lock */
@@ -1531,7 +1535,7 @@ static int osc_enter_cache_try(struct client_obd *cli, 
{

	int rc;



	OSC_DUMP_GRANT(cli, "need:%d.\n", bytes);

	OSC_DUMP_GRANT(D_CACHE, cli, "need:%d.\n", bytes);



	rc = osc_reserve_grant(cli, bytes);

	if (rc < 0)
@@ -1576,10 +1580,11 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli, 
	struct osc_object *osc = oap->oap_obj;

	struct lov_oinfo *loi = osc->oo_oinfo;

	struct osc_cache_waiter ocw;

	struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL);

	struct l_wait_info lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(600), NULL,

						  LWI_ON_SIGNAL_NOOP, NULL);

	int rc = -EDQUOT;



	OSC_DUMP_GRANT(cli, "need:%d.\n", bytes);

	OSC_DUMP_GRANT(D_CACHE, cli, "need:%d.\n", bytes);



	spin_lock(&cli->cl_loi_list_lock);
@@ -1623,8 +1628,15 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli, 


		spin_lock(&cli->cl_loi_list_lock);



		/* l_wait_event is interrupted by signal */

		/* l_wait_event is interrupted by signal, or timed out */

		if (rc < 0) {

			if (rc == -ETIMEDOUT) {

				OSC_DUMP_GRANT(D_ERROR, cli,

					       "try to reserve %d.\n", bytes);

				osc_extent_tree_dump(D_ERROR, osc);

				rc = -EDQUOT;

			}



			list_del_init(&ocw.ocw_entry);

			goto out;

		}
@@ -1641,7 +1653,7 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli, 
	}

out:

	spin_unlock(&cli->cl_loi_list_lock);

	OSC_DUMP_GRANT(cli, "returned %d.\n", rc);

	OSC_DUMP_GRANT(D_CACHE, cli, "returned %d.\n", rc);

	return rc;

}
@@ -3014,7 +3026,7 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj, 
			result = rc;

	}



	OSC_IO_DEBUG(obj, "cache page out.\n");

	OSC_IO_DEBUG(obj, "pageout [%lu, %lu], %d.\n", start, end, result);

	return result;

}