Commit a16b7dee authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Mike Snitzer
Browse files

dm zoned: terminate reclaim on congestion 



When dmz_get_chunk_mapping() selects a zone which is under reclaim
we should terminate the reclaim copy process. Since we're changing
the zone itself, reclaim needs to run afterwards again anyway.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent c5c78859

drivers/md/dm-zoned-metadata.c

+2 −0
Original line number Diff line number Diff line
@@ -1851,7 +1851,9 @@ static void dmz_wait_for_reclaim(struct dmz_metadata *zmd, struct dm_zone *zone) 
{

	dmz_unlock_map(zmd);

	dmz_unlock_metadata(zmd);

	set_bit(DMZ_RECLAIM_TERMINATE, &zone->flags);

	wait_on_bit_timeout(&zone->flags, DMZ_RECLAIM, TASK_UNINTERRUPTIBLE, HZ);

	clear_bit(DMZ_RECLAIM_TERMINATE, &zone->flags);

	dmz_lock_metadata(zmd);

	dmz_lock_map(zmd);

}

drivers/md/dm-zoned-reclaim.c

+4 −2
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ static int dmz_reclaim_copy(struct dmz_reclaim *zrc, 
		if (dst_dev->flags & DMZ_BDEV_DYING)

			return -EIO;



		if (dmz_reclaim_should_terminate(src_zone))

			return -EINTR;



		/* Get a valid region from the source zone */

		ret = dmz_first_valid_block(zmd, src_zone, &block);

		if (ret <= 0)
@@ -515,7 +518,7 @@ static void dmz_reclaim_work(struct work_struct *work) 
		dmz_nr_rnd_zones(zmd));



	ret = dmz_do_reclaim(zrc);

	if (ret) {

	if (ret && ret != -EINTR) {

		DMDEBUG("(%s): Reclaim error %d",

			dmz_metadata_label(zmd), ret);

		if (!dmz_check_dev(zmd))
@@ -615,4 +618,3 @@ void dmz_schedule_reclaim(struct dmz_reclaim *zrc) 
	if (dmz_should_reclaim(zrc, p_unmap))

		mod_delayed_work(zrc->wq, &zrc->work, 0);

}

drivers/md/dm-zoned.h

+3 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ enum { 
	/* Zone internal state */

	DMZ_RECLAIM,

	DMZ_SEQ_WRITE_ERR,

	DMZ_RECLAIM_TERMINATE,

};



/*
@@ -140,6 +141,8 @@ enum { 
#define dmz_is_readonly(z)	test_bit(DMZ_READ_ONLY, &(z)->flags)

#define dmz_in_reclaim(z)	test_bit(DMZ_RECLAIM, &(z)->flags)

#define dmz_seq_write_err(z)	test_bit(DMZ_SEQ_WRITE_ERR, &(z)->flags)

#define dmz_reclaim_should_terminate(z) \

				test_bit(DMZ_RECLAIM_TERMINATE, &(z)->flags)



#define dmz_is_meta(z)		test_bit(DMZ_META, &(z)->flags)

#define dmz_is_buf(z)		test_bit(DMZ_BUF, &(z)->flags)

CRA Git | Maintained and supported by SUSTech CRA and CCSE