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

Commit 20f6814b authored by Joe Thornber's avatar Joe Thornber Committed by Mike Snitzer
Browse files

dm cache: pass a new 'critical' flag to the policies when requesting writeback work 



We only allow non critical writeback if the origin is idle.  It is up
to the policy to decide what writeback work is critical.

Signed-off-by: default avatarJoe Thornber <ejt@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 066dbaa3

drivers/md/dm-cache-policy-cleaner.c

+2 −1
Original line number Diff line number Diff line
@@ -359,7 +359,8 @@ static struct wb_cache_entry *get_next_dirty_entry(struct policy *p) 


static int wb_writeback_work(struct dm_cache_policy *pe,

			     dm_oblock_t *oblock,

			     dm_cblock_t *cblock)

			     dm_cblock_t *cblock,

			     bool critical_only)

{

	int r = -ENOENT;

	struct policy *p = to_policy(pe);

drivers/md/dm-cache-policy-internal.h

+3 −2
Original line number Diff line number Diff line
@@ -55,9 +55,10 @@ static inline int policy_walk_mappings(struct dm_cache_policy *p, 


static inline int policy_writeback_work(struct dm_cache_policy *p,

					dm_oblock_t *oblock,

					dm_cblock_t *cblock)

					dm_cblock_t *cblock,

					bool critical_only)

{

	return p->writeback_work ? p->writeback_work(p, oblock, cblock) : -ENOENT;

	return p->writeback_work ? p->writeback_work(p, oblock, cblock, critical_only) : -ENOENT;

}



static inline void policy_remove_mapping(struct dm_cache_policy *p, dm_oblock_t oblock)

drivers/md/dm-cache-policy-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -1236,7 +1236,7 @@ static int __mq_writeback_work(struct mq_policy *mq, dm_oblock_t *oblock, 
}



static int mq_writeback_work(struct dm_cache_policy *p, dm_oblock_t *oblock,

			     dm_cblock_t *cblock)

			     dm_cblock_t *cblock, bool critical_only)

{

	int r;

	struct mq_policy *mq = to_mq_policy(p);

drivers/md/dm-cache-policy.h

+5 −2
Original line number Diff line number Diff line
@@ -178,7 +178,9 @@ struct dm_cache_policy { 
	int (*remove_cblock)(struct dm_cache_policy *p, dm_cblock_t cblock);



	/*

	 * Provide a dirty block to be written back by the core target.

	 * Provide a dirty block to be written back by the core target.  If

	 * critical_only is set then the policy should only provide work if

	 * it urgently needs it.

	 *

	 * Returns:

	 *
@@ -186,7 +188,8 @@ struct dm_cache_policy { 
	 *

	 * -ENODATA: no dirty blocks available

	 */

	int (*writeback_work)(struct dm_cache_policy *p, dm_oblock_t *oblock, dm_cblock_t *cblock);

	int (*writeback_work)(struct dm_cache_policy *p, dm_oblock_t *oblock, dm_cblock_t *cblock,

			      bool critical_only);



	/*

	 * How full is the cache?

drivers/md/dm-cache-target.c

+2 −1
Original line number Diff line number Diff line
@@ -1787,6 +1787,7 @@ static void writeback_some_dirty_blocks(struct cache *cache) 
	dm_cblock_t cblock;

	struct prealloc structs;

	struct dm_bio_prison_cell *old_ocell;

	bool busy = !iot_idle_for(&cache->origin_tracker, HZ);



	memset(&structs, 0, sizeof(structs));
@@ -1794,7 +1795,7 @@ static void writeback_some_dirty_blocks(struct cache *cache) 
		if (prealloc_data_structs(cache, &structs))

			break;



		r = policy_writeback_work(cache->policy, &oblock, &cblock);

		r = policy_writeback_work(cache->policy, &oblock, &cblock, busy);

		if (r)

			break;