All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] fio: fix interaction between offset/size limited threads and "max_open_zones"
@ 2020-03-20 18:06 Alexey Dobriyan
  2020-03-24  1:00 ` Damien Le Moal
  0 siblings, 1 reply; 5+ messages in thread
From: Alexey Dobriyan @ 2020-03-20 18:06 UTC (permalink / raw)
  To: axboe; +Cc: fio, damien.lemoal

If thread bumps into "max_open_zones" limit, it tries to close/reopen some
other zone before issuing IO. This scan is done over full list of block devices's
opened zones. It means that a zone which doesn't belong to thread's working
area can be altered or IO can be retargeted at such zone.

If IO is retargeted, then it will be dropped by "is_valid_offset()" check.

What happens with null block device testing is that one thread monopolises
IO and other thread do basically nothing.

This config will reliably succeed now:

	[global]
	zonemode=zbd
	zonesize=1M
	rw=randwrite
		...
	thread
	numjobs=2
	offset_increment=128M

	[j]
	max_open_zones=2
	size=2M

Starting 2 threads
zbd      7991  /dev/nullb0: zbd model string: host-managed
zbd      7991  Device /dev/nullb0 has 1024 zones of size 1024 KB
zbd      8009  /dev/nullb0: examining zones 0 .. 2
zbd      8010  /dev/nullb0: examining zones 128 .. 130
zbd      8009  /dev/nullb0: opening zone 0
zbd      8010  /dev/nullb0: opening zone 128
zbd      8009  /dev/nullb0: queued I/O (0, 4096) for zone 0
zbd      8009  zbd_convert_to_open_zone(/dev/nullb0): starting from zone 128 (offset 1552384, buflen 4096)

	retargeted for other thread's zone	(zone 0 => zone 128)

zbd      8010  /dev/nullb0: queued I/O (134217728, 4096) for zone 128
zbd      8009  zbd_convert_to_open_zone(/dev/nullb0): returning zone 128
zbd      8009  Dropped request with offset 134221824

	and dropped

Signed-off-by: Alexey Dobriyan (SK hynix) <adobriyan@gmail.com>
---

 zbd.c |   35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

--- a/zbd.c
+++ b/zbd.c
@@ -969,9 +969,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
 		 * This statement accesses f->zbd_info->open_zones[] on purpose
 		 * without locking.
 		 */
-		zone_idx = f->zbd_info->open_zones[(io_u->offset -
-						    f->file_offset) *
-				f->zbd_info->num_open_zones / f->io_size];
+		uint32_t tmp = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
+		zone_idx = f->zbd_info->open_zones[tmp];
 	} else {
 		zone_idx = zbd_zone_idx(f, io_u->offset);
 	}
@@ -985,6 +984,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
 	 * has been obtained. Hence the loop.
 	 */
 	for (;;) {
+		uint32_t tmp;
+
 		z = &f->zbd_info->zone_info[zone_idx];
 
 		zone_lock(td, z);
@@ -998,9 +999,33 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
 			       __func__, f->file_name);
 			return NULL;
 		}
-		open_zone_idx = (io_u->offset - f->file_offset) *
-			f->zbd_info->num_open_zones / f->io_size;
+		open_zone_idx = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
 		assert(open_zone_idx < f->zbd_info->num_open_zones);
+
+		for (tmp = open_zone_idx; tmp < f->zbd_info->num_open_zones; tmp++) {
+			uint32_t tmpz = f->zbd_info->open_zones[tmp];
+			struct fio_zone_info *z = &f->zbd_info->zone_info[tmpz];
+
+			if (is_valid_offset(f, z->start)) {
+				open_zone_idx = tmp;
+				goto found_candidate_zone;
+			}
+		}
+		for (tmp = 0; tmp < open_zone_idx; tmp++) {
+			uint32_t tmpz = f->zbd_info->open_zones[tmp];
+			struct fio_zone_info *z = &f->zbd_info->zone_info[tmpz];
+
+			if (is_valid_offset(f, z->start)) {
+				open_zone_idx = tmp;
+				goto found_candidate_zone;
+			}
+
+		}
+		dprint(FD_ZBD, "%s(%s): no candidate zone\n",
+			__func__, f->file_name);
+		return NULL;
+
+found_candidate_zone:
 		new_zone_idx = f->zbd_info->open_zones[open_zone_idx];
 		if (new_zone_idx == zone_idx)
 			break;


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] fio: fix interaction between offset/size limited threads and "max_open_zones"
  2020-03-20 18:06 [PATCH] fio: fix interaction between offset/size limited threads and "max_open_zones" Alexey Dobriyan
@ 2020-03-24  1:00 ` Damien Le Moal
  2020-03-25 17:52   ` [PATCH v2] " Alexey Dobriyan
  0 siblings, 1 reply; 5+ messages in thread
From: Damien Le Moal @ 2020-03-24  1:00 UTC (permalink / raw)
  To: Alexey Dobriyan, axboe; +Cc: fio

On 2020/03/21 3:06, Alexey Dobriyan wrote:
> If thread bumps into "max_open_zones" limit, it tries to close/reopen some
> other zone before issuing IO. This scan is done over full list of block devices's
> opened zones. It means that a zone which doesn't belong to thread's working
> area can be altered or IO can be retargeted at such zone.
> 
> If IO is retargeted, then it will be dropped by "is_valid_offset()" check.
> 
> What happens with null block device testing is that one thread monopolises
> IO and other thread do basically nothing.
> 
> This config will reliably succeed now:
> 
> 	[global]
> 	zonemode=zbd
> 	zonesize=1M
> 	rw=randwrite
> 		...
> 	thread
> 	numjobs=2
> 	offset_increment=128M
> 
> 	[j]
> 	max_open_zones=2
> 	size=2M
> 
> Starting 2 threads
> zbd      7991  /dev/nullb0: zbd model string: host-managed
> zbd      7991  Device /dev/nullb0 has 1024 zones of size 1024 KB
> zbd      8009  /dev/nullb0: examining zones 0 .. 2
> zbd      8010  /dev/nullb0: examining zones 128 .. 130
> zbd      8009  /dev/nullb0: opening zone 0
> zbd      8010  /dev/nullb0: opening zone 128
> zbd      8009  /dev/nullb0: queued I/O (0, 4096) for zone 0
> zbd      8009  zbd_convert_to_open_zone(/dev/nullb0): starting from zone 128 (offset 1552384, buflen 4096)
> 
> 	retargeted for other thread's zone	(zone 0 => zone 128)
> 
> zbd      8010  /dev/nullb0: queued I/O (134217728, 4096) for zone 128
> zbd      8009  zbd_convert_to_open_zone(/dev/nullb0): returning zone 128
> zbd      8009  Dropped request with offset 134221824
> 
> 	and dropped
> 
> Signed-off-by: Alexey Dobriyan (SK hynix) <adobriyan@gmail.com>
> ---
> 
>  zbd.c |   35 ++++++++++++++++++++++++++++++-----
>  1 file changed, 30 insertions(+), 5 deletions(-)
> 
> --- a/zbd.c
> +++ b/zbd.c
> @@ -969,9 +969,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
>  		 * This statement accesses f->zbd_info->open_zones[] on purpose
>  		 * without locking.
>  		 */
> -		zone_idx = f->zbd_info->open_zones[(io_u->offset -
> -						    f->file_offset) *
> -				f->zbd_info->num_open_zones / f->io_size];
> +		uint32_t tmp = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
> +		zone_idx = f->zbd_info->open_zones[tmp];
>  	} else {
>  		zone_idx = zbd_zone_idx(f, io_u->offset);
>  	}
> @@ -985,6 +984,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
>  	 * has been obtained. Hence the loop.
>  	 */
>  	for (;;) {
> +		uint32_t tmp;
> +
>  		z = &f->zbd_info->zone_info[zone_idx];
>  
>  		zone_lock(td, z);
> @@ -998,9 +999,33 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
>  			       __func__, f->file_name);
>  			return NULL;
>  		}
> -		open_zone_idx = (io_u->offset - f->file_offset) *
> -			f->zbd_info->num_open_zones / f->io_size;
> +		open_zone_idx = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
>  		assert(open_zone_idx < f->zbd_info->num_open_zones);
> +
> +		for (tmp = open_zone_idx; tmp < f->zbd_info->num_open_zones; tmp++) {
> +			uint32_t tmpz = f->zbd_info->open_zones[tmp];
> +			struct fio_zone_info *z = &f->zbd_info->zone_info[tmpz];
> +
> +			if (is_valid_offset(f, z->start)) {
> +				open_zone_idx = tmp;
> +				goto found_candidate_zone;
> +			}
> +		}
> +		for (tmp = 0; tmp < open_zone_idx; tmp++) {
> +			uint32_t tmpz = f->zbd_info->open_zones[tmp];
> +			struct fio_zone_info *z = &f->zbd_info->zone_info[tmpz];
> +
> +			if (is_valid_offset(f, z->start)) {
> +				open_zone_idx = tmp;
> +				goto found_candidate_zone;
> +			}
> +
> +		}

Adding a comment above the loop to explain what is being searched for would be
nice. Also, you can combine these 2 loops into one for simplicity, something like:

for (i = 0, tmp = open_zone_idx; i < f->zbd_info->num_open_zones; i++, tmp++) {
	unsigned int tmpz;
	struct fio_zone_info *z

	if (tmp >= f->zbd_info->num_open_zones)
		tmp = 0;
	tmpz = f->zbd_info->open_zones[tmp];
	z = &f->zbd_info->zone_info[tmpz];

	if (is_valid_offset(f, z->start)) {
		open_zone_idx = tmp;
		goto found_candidate_zone;
	}
}

> +		dprint(FD_ZBD, "%s(%s): no candidate zone\n",
> +			__func__, f->file_name);
> +		return NULL;
> +
> +found_candidate_zone:
>  		new_zone_idx = f->zbd_info->open_zones[open_zone_idx];
>  		if (new_zone_idx == zone_idx)
>  			break;
> 


-- 
Damien Le Moal
Western Digital Research


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2] fio: fix interaction between offset/size limited threads and "max_open_zones"
  2020-03-24  1:00 ` Damien Le Moal
@ 2020-03-25 17:52   ` Alexey Dobriyan
  2020-03-28  8:34     ` Damien Le Moal
  2020-03-31  8:07     ` Damien Le Moal
  0 siblings, 2 replies; 5+ messages in thread
From: Alexey Dobriyan @ 2020-03-25 17:52 UTC (permalink / raw)
  To: axboe; +Cc: fio, Damien.LeMoal

If thread bumps into "max_open_zones" limit, it tries to close/reopen some
other zone before issuing IO. This scan is done over full list of block device's
opened zones. It means that a zone which doesn't belong to thread's working
area can be altered or IO can be retargeted at such zone.

If IO is retargeted, then it will be dropped by "is_valid_offset()" check.

What happens with null block device testing is that one thread monopolises
IO and others thread do basically nothing.

This config will reliably succeed now:

	[global]
	zonemode=zbd
	zonesize=1M
	rw=randwrite
		...
	thread
	numjobs=2
	offset_increment=128M

	[j]
	max_open_zones=2
	size=2M

Starting 2 threads
zbd      7991  /dev/nullb0: zbd model string: host-managed
zbd      7991  Device /dev/nullb0 has 1024 zones of size 1024 KB
zbd      8009  /dev/nullb0: examining zones 0 .. 2
zbd      8010  /dev/nullb0: examining zones 128 .. 130
zbd      8009  /dev/nullb0: opening zone 0
zbd      8010  /dev/nullb0: opening zone 128
zbd      8009  /dev/nullb0: queued I/O (0, 4096) for zone 0
zbd      8009  zbd_convert_to_open_zone(/dev/nullb0): starting from zone 128 (offset 1552384, buflen 4096)

	retargeted for other thread's zone	(zone 0 => zone 128)

zbd      8010  /dev/nullb0: queued I/O (134217728, 4096) for zone 128
zbd      8009  zbd_convert_to_open_zone(/dev/nullb0): returning zone 128
zbd      8009  Dropped request with offset 134221824

	and dropped

Signed-off-by: Alexey Dobriyan (SK hynix) <adobriyan@gmail.com>
---

 zbd.c |   35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

--- a/zbd.c
+++ b/zbd.c
@@ -969,9 +969,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
 		 * This statement accesses f->zbd_info->open_zones[] on purpose
 		 * without locking.
 		 */
-		zone_idx = f->zbd_info->open_zones[(io_u->offset -
-						    f->file_offset) *
-				f->zbd_info->num_open_zones / f->io_size];
+		uint32_t tmp = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
+		zone_idx = f->zbd_info->open_zones[tmp];
 	} else {
 		zone_idx = zbd_zone_idx(f, io_u->offset);
 	}
@@ -985,6 +984,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
 	 * has been obtained. Hence the loop.
 	 */
 	for (;;) {
+		uint32_t tmp;
+
 		z = &f->zbd_info->zone_info[zone_idx];
 
 		zone_lock(td, z);
@@ -998,9 +999,33 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
 			       __func__, f->file_name);
 			return NULL;
 		}
-		open_zone_idx = (io_u->offset - f->file_offset) *
-			f->zbd_info->num_open_zones / f->io_size;
+
+		/*
+		 * List of opened zones is per-device, shared across all threads.
+		 * Start with quasi-random candidate zone.
+		 * Ignore zones which don't belong to thread's offset/size area.
+		 */
+		open_zone_idx = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
 		assert(open_zone_idx < f->zbd_info->num_open_zones);
+		for (tmp = open_zone_idx, i = 0; i < f->zbd_info->num_open_zones; i++, tmp++) {
+			uint32_t tmpz;
+
+			if (tmp >= f->zbd_info->num_open_zones)
+				tmp = 0;
+			tmpz = f->zbd_info->open_zones[tmp];
+
+			if (is_valid_offset(f, f->zbd_info->zone_info[tmpz].start)) {
+				open_zone_idx = tmp;
+				goto found_candidate_zone;
+			}
+
+		}
+
+		dprint(FD_ZBD, "%s(%s): no candidate zone\n",
+			__func__, f->file_name);
+		return NULL;
+
+found_candidate_zone:
 		new_zone_idx = f->zbd_info->open_zones[open_zone_idx];
 		if (new_zone_idx == zone_idx)
 			break;


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2] fio: fix interaction between offset/size limited threads and "max_open_zones"
  2020-03-25 17:52   ` [PATCH v2] " Alexey Dobriyan
@ 2020-03-28  8:34     ` Damien Le Moal
  2020-03-31  8:07     ` Damien Le Moal
  1 sibling, 0 replies; 5+ messages in thread
From: Damien Le Moal @ 2020-03-28  8:34 UTC (permalink / raw)
  To: Alexey Dobriyan, axboe; +Cc: fio

On 2020/03/26 2:52, Alexey Dobriyan wrote:
> If thread bumps into "max_open_zones" limit, it tries to close/reopen some
> other zone before issuing IO. This scan is done over full list of block device's
> opened zones. It means that a zone which doesn't belong to thread's working
> area can be altered or IO can be retargeted at such zone.
> 
> If IO is retargeted, then it will be dropped by "is_valid_offset()" check.
> 
> What happens with null block device testing is that one thread monopolises
> IO and others thread do basically nothing.
> 
> This config will reliably succeed now:
> 
> 	[global]
> 	zonemode=zbd
> 	zonesize=1M
> 	rw=randwrite
> 		...
> 	thread
> 	numjobs=2
> 	offset_increment=128M
> 
> 	[j]
> 	max_open_zones=2
> 	size=2M
> 
> Starting 2 threads
> zbd      7991  /dev/nullb0: zbd model string: host-managed
> zbd      7991  Device /dev/nullb0 has 1024 zones of size 1024 KB
> zbd      8009  /dev/nullb0: examining zones 0 .. 2
> zbd      8010  /dev/nullb0: examining zones 128 .. 130
> zbd      8009  /dev/nullb0: opening zone 0
> zbd      8010  /dev/nullb0: opening zone 128
> zbd      8009  /dev/nullb0: queued I/O (0, 4096) for zone 0
> zbd      8009  zbd_convert_to_open_zone(/dev/nullb0): starting from zone 128 (offset 1552384, buflen 4096)
> 
> 	retargeted for other thread's zone	(zone 0 => zone 128)
> 
> zbd      8010  /dev/nullb0: queued I/O (134217728, 4096) for zone 128
> zbd      8009  zbd_convert_to_open_zone(/dev/nullb0): returning zone 128
> zbd      8009  Dropped request with offset 134221824
> 
> 	and dropped
> 
> Signed-off-by: Alexey Dobriyan (SK hynix) <adobriyan@gmail.com>

Alexey,

Did you run t/zbd/test-zbd-support or t/zbd/run-tests-against-xxx-nullb with
this patch applied ?

I am still scratching my head about this change:

> -		zone_idx = f->zbd_info->open_zones[(io_u->offset -
> -						    f->file_offset) *
> -				f->zbd_info->num_open_zones / f->io_size];
> +		uint32_t tmp = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
> +		zone_idx = f->zbd_info->open_zones[tmp];

Since this removes the use of f->file_offset, if the thread has an offset+size
option specified to operate on a specific range of zones, it does look to me
like a zone from outside that range could end up being chosen... Will test and
dig some more Monday.

Best regards.

> ---
> 
>  zbd.c |   35 ++++++++++++++++++++++++++++++-----
>  1 file changed, 30 insertions(+), 5 deletions(-)
> 
> --- a/zbd.c
> +++ b/zbd.c
> @@ -969,9 +969,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
>  		 * This statement accesses f->zbd_info->open_zones[] on purpose
>  		 * without locking.
>  		 */
> -		zone_idx = f->zbd_info->open_zones[(io_u->offset -
> -						    f->file_offset) *
> -				f->zbd_info->num_open_zones / f->io_size];
> +		uint32_t tmp = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
> +		zone_idx = f->zbd_info->open_zones[tmp];
>  	} else {
>  		zone_idx = zbd_zone_idx(f, io_u->offset);
>  	}
> @@ -985,6 +984,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
>  	 * has been obtained. Hence the loop.
>  	 */
>  	for (;;) {
> +		uint32_t tmp;
> +
>  		z = &f->zbd_info->zone_info[zone_idx];
>  
>  		zone_lock(td, z);
> @@ -998,9 +999,33 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
>  			       __func__, f->file_name);
>  			return NULL;
>  		}
> -		open_zone_idx = (io_u->offset - f->file_offset) *
> -			f->zbd_info->num_open_zones / f->io_size;
> +
> +		/*
> +		 * List of opened zones is per-device, shared across all threads.
> +		 * Start with quasi-random candidate zone.
> +		 * Ignore zones which don't belong to thread's offset/size area.
> +		 */
> +		open_zone_idx = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
>  		assert(open_zone_idx < f->zbd_info->num_open_zones);
> +		for (tmp = open_zone_idx, i = 0; i < f->zbd_info->num_open_zones; i++, tmp++) {
> +			uint32_t tmpz;
> +
> +			if (tmp >= f->zbd_info->num_open_zones)
> +				tmp = 0;
> +			tmpz = f->zbd_info->open_zones[tmp];
> +
> +			if (is_valid_offset(f, f->zbd_info->zone_info[tmpz].start)) {
> +				open_zone_idx = tmp;
> +				goto found_candidate_zone;
> +			}
> +
> +		}
> +
> +		dprint(FD_ZBD, "%s(%s): no candidate zone\n",
> +			__func__, f->file_name);
> +		return NULL;
> +
> +found_candidate_zone:
>  		new_zone_idx = f->zbd_info->open_zones[open_zone_idx];
>  		if (new_zone_idx == zone_idx)
>  			break;
> 


-- 
Damien Le Moal
Western Digital Research


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2] fio: fix interaction between offset/size limited threads and "max_open_zones"
  2020-03-25 17:52   ` [PATCH v2] " Alexey Dobriyan
  2020-03-28  8:34     ` Damien Le Moal
@ 2020-03-31  8:07     ` Damien Le Moal
  1 sibling, 0 replies; 5+ messages in thread
From: Damien Le Moal @ 2020-03-31  8:07 UTC (permalink / raw)
  To: Alexey Dobriyan, axboe; +Cc: fio

On 2020/03/26 2:52, Alexey Dobriyan wrote:
> If thread bumps into "max_open_zones" limit, it tries to close/reopen some
> other zone before issuing IO. This scan is done over full list of block device's
> opened zones. It means that a zone which doesn't belong to thread's working
> area can be altered or IO can be retargeted at such zone.
> 
> If IO is retargeted, then it will be dropped by "is_valid_offset()" check.
> 
> What happens with null block device testing is that one thread monopolises
> IO and others thread do basically nothing.
> 
> This config will reliably succeed now:
> 
> 	[global]
> 	zonemode=zbd
> 	zonesize=1M
> 	rw=randwrite
> 		...
> 	thread
> 	numjobs=2
> 	offset_increment=128M
> 
> 	[j]
> 	max_open_zones=2
> 	size=2M
> 
> Starting 2 threads
> zbd      7991  /dev/nullb0: zbd model string: host-managed
> zbd      7991  Device /dev/nullb0 has 1024 zones of size 1024 KB
> zbd      8009  /dev/nullb0: examining zones 0 .. 2
> zbd      8010  /dev/nullb0: examining zones 128 .. 130
> zbd      8009  /dev/nullb0: opening zone 0
> zbd      8010  /dev/nullb0: opening zone 128
> zbd      8009  /dev/nullb0: queued I/O (0, 4096) for zone 0
> zbd      8009  zbd_convert_to_open_zone(/dev/nullb0): starting from zone 128 (offset 1552384, buflen 4096)
> 
> 	retargeted for other thread's zone	(zone 0 => zone 128)
> 
> zbd      8010  /dev/nullb0: queued I/O (134217728, 4096) for zone 128
> zbd      8009  zbd_convert_to_open_zone(/dev/nullb0): returning zone 128
> zbd      8009  Dropped request with offset 134221824
> 
> 	and dropped
> 
> Signed-off-by: Alexey Dobriyan (SK hynix) <adobriyan@gmail.com>

I tested your patch. I confirm that it works and results in much better IO
patterns with multiple jobs (less zone contention).
I just have a few more comments below.

> ---
> 
>  zbd.c |   35 ++++++++++++++++++++++++++++++-----
>  1 file changed, 30 insertions(+), 5 deletions(-)
> 
> --- a/zbd.c
> +++ b/zbd.c
> @@ -969,9 +969,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
>  		 * This statement accesses f->zbd_info->open_zones[] on purpose
>  		 * without locking.
>  		 */
> -		zone_idx = f->zbd_info->open_zones[(io_u->offset -
> -						    f->file_offset) *
> -				f->zbd_info->num_open_zones / f->io_size];
> +		uint32_t tmp = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;

You are using tmp here and then tmp and below. Instead of repeating the
declaration locally, move it to the function whole scope and call it tmp_idx
(tmp is a little too generic in my opinion).

Also please try to avoid lines longer than 80 chars (split the calculation above
on two lines).

> +		zone_idx = f->zbd_info->open_zones[tmp];
>  	} else {
>  		zone_idx = zbd_zone_idx(f, io_u->offset);
>  	}
> @@ -985,6 +984,8 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
>  	 * has been obtained. Hence the loop.
>  	 */
>  	for (;;) {
> +		uint32_t tmp;
> +

Remove this.

>  		z = &f->zbd_info->zone_info[zone_idx];
>  
>  		zone_lock(td, z);
> @@ -998,9 +999,33 @@ static struct fio_zone_info *zbd_convert_to_open_zone(struct thread_data *td,
>  			       __func__, f->file_name);
>  			return NULL;
>  		}
> -		open_zone_idx = (io_u->offset - f->file_offset) *
> -			f->zbd_info->num_open_zones / f->io_size;
> +
> +		/*
> +		 * List of opened zones is per-device, shared across all threads.
> +		 * Start with quasi-random candidate zone.
> +		 * Ignore zones which don't belong to thread's offset/size area.
> +		 */
> +		open_zone_idx = io_u->offset * f->zbd_info->num_open_zones / f->real_file_size;
>  		assert(open_zone_idx < f->zbd_info->num_open_zones);
> +		for (tmp = open_zone_idx, i = 0; i < f->zbd_info->num_open_zones; i++, tmp++) {
> +			uint32_t tmpz;
> +
> +			if (tmp >= f->zbd_info->num_open_zones)
> +				tmp = 0;
> +			tmpz = f->zbd_info->open_zones[tmp];
> +
> +			if (is_valid_offset(f, f->zbd_info->zone_info[tmpz].start)) {
> +				open_zone_idx = tmp;
> +				goto found_candidate_zone;
> +			}
> +
> +		}
> +
> +		dprint(FD_ZBD, "%s(%s): no candidate zone\n",
> +			__func__, f->file_name);
> +		return NULL;
> +
> +found_candidate_zone:
>  		new_zone_idx = f->zbd_info->open_zones[open_zone_idx];
>  		if (new_zone_idx == zone_idx)
>  			break;
> 

With the above nits corrected, please feel free to add:

Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Tested-by: Damien Le Moal <damien.lemoal@wdc.com>

Cheers.

-- 
Damien Le Moal
Western Digital Research


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-03-31  8:07 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-20 18:06 [PATCH] fio: fix interaction between offset/size limited threads and "max_open_zones" Alexey Dobriyan
2020-03-24  1:00 ` Damien Le Moal
2020-03-25 17:52   ` [PATCH v2] " Alexey Dobriyan
2020-03-28  8:34     ` Damien Le Moal
2020-03-31  8:07     ` Damien Le Moal

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.