Re: [PATCH v3 2/3] lsblk: add columns of zoned parameters

[Damien Le Moal <Damien.LeMoal@wdc.com>]

On 2021/08/30 14:53, Naohiro Aota wrote:
> Several parameters for zoned devices are missing from lsblk's columns. This
> commit introduces them as following.
> 
>  ZONE-SZ     zone size
>  ZONE-WGRAN  zone write granularity
>  ZONE-APP    zone append max bytes
>  ZONE-NR     number of zones
>  ZONE-OMAX   maximum number of open zones
>  ZONE-AMAX   maximum number of active zones
> 
> Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
> ---
>  bash-completion/lsblk |  3 ++-
>  misc-utils/lsblk.c    | 52 +++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 54 insertions(+), 1 deletion(-)
> 
> diff --git a/bash-completion/lsblk b/bash-completion/lsblk
> index 731ef3f4095d..ca0ad39d7345 100644
> --- a/bash-completion/lsblk
> +++ b/bash-completion/lsblk
> @@ -10,7 +10,8 @@ _lsblk_module()
>  		LABEL UUID PTUUID PTTYPE PARTTYPE PARTTYPENAME PARTLABEL PARTUUID PARTFLAGS RA
>  		RO RM HOTPLUG MODEL SERIAL SIZE STATE OWNER GROUP MODE ALIGNMENT MIN-IO OPT-IO
>  		PHY-SEC LOG-SEC ROTA SCHED RQ-SIZE TYPE DISC-ALN DISC-GRAN DISC-MAX DISC-ZERO
> -		WSAME WWN RAND PKNAME HCTL TRAN SUBSYSTEMS REV VENDOR ZONED DAX
> +		WSAME WWN RAND PKNAME HCTL TRAN SUBSYSTEMS REV VENDOR ZONED ZONE-SZ ZONE-WGRAN
> +		ZONE-APP ZONE-NR ZONE-OMAX ZONE-AMAX DAX
>  	"
>  
>  	case $prev in
> diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
> index 9c41e70adad7..807ddcfea631 100644
> --- a/misc-utils/lsblk.c
> +++ b/misc-utils/lsblk.c
> @@ -123,6 +123,12 @@ enum {
>  	COL_WSAME,
>  	COL_WWN,
>  	COL_ZONED,
> +	COL_ZONE_SZ,
> +	COL_ZONE_WGRAN,
> +	COL_ZONE_APP,
> +	COL_ZONE_NR,
> +	COL_ZONE_OMAX,
> +	COL_ZONE_AMAX,
>  };
>  
>  /* basic table settings */
> @@ -213,6 +219,12 @@ static struct colinfo infos[] = {
>  	[COL_WSAME] = { "WSAME", 6, SCOLS_FL_RIGHT, N_("write same max bytes"), COLTYPE_SIZE },
>  	[COL_WWN] = { "WWN", 18, 0, N_("unique storage identifier") },
>  	[COL_ZONED] = { "ZONED", 0.3, 0, N_("zone model") },
> +	[COL_ZONE_SZ] = { "ZONE-SZ", 9, SCOLS_FL_RIGHT, N_("zone size"), COLTYPE_NUM },
> +	[COL_ZONE_WGRAN] = { "ZONE-WGRAN", 10, SCOLS_FL_RIGHT, N_("zone write granularity"), COLTYPE_NUM },
> +	[COL_ZONE_APP] = { "ZONE-APP", 11, SCOLS_FL_RIGHT, N_("zone append max bytes"), COLTYPE_NUM },
> +	[COL_ZONE_NR] = { "ZONE-NR", 8, SCOLS_FL_RIGHT, N_("number of zones"), COLTYPE_NUM },
> +	[COL_ZONE_OMAX] = { "ZONE-OMAX", 10, SCOLS_FL_RIGHT, N_("maximum number of open zones"), COLTYPE_NUM },
> +	[COL_ZONE_AMAX] = { "ZONE-AMAX", 10, SCOLS_FL_RIGHT, N_("maximum number of active zones"), COLTYPE_NUM },
>  };
>  
>  struct lsblk *lsblk;	/* global handler */
> @@ -1068,6 +1080,46 @@ static char *device_get_data(
>  	case COL_ZONED:
>  		ul_path_read_string(dev->sysfs, &str, "queue/zoned");
>  		break;
> +	case COL_ZONE_SZ:
> +	{
> +		uint64_t x;
> +
> +		if (ul_path_read_u64(dev->sysfs, &x, "queue/chunk_sectors") == 0) {
> +			x <<= 9;
> +			if (lsblk->bytes)
> +				xasprintf(&str, "%ju", x);
> +			else
> +				str = size_to_human_string(SIZE_SUFFIX_1LETTER, x);
> +			if (sortdata)
> +				*sortdata = x;
> +		}
> +		break;
> +	}
> +	case COL_ZONE_WGRAN:
> +		device_read_bytes(dev, "queue/zone_write_granularity", &str, sortdata);
> +		break;
> +	case COL_ZONE_APP:
> +		device_read_bytes(dev, "queue/zone_append_max_bytes", &str, sortdata);
> +		break;
> +	case COL_ZONE_NR:
> +		ul_path_read_string(dev->sysfs, &str, "queue/nr_zones");
> +		if (sortdata)
> +			str2u64(str, sortdata);
> +		break;
> +	case COL_ZONE_OMAX:
> +		ul_path_read_string(dev->sysfs, &str, "queue/max_open_zones");
> +		if (!str)
> +			str = xstrdup("0");
> +		if (sortdata)
> +			str2u64(str, sortdata);
> +		break;
> +	case COL_ZONE_AMAX:
> +		ul_path_read_string(dev->sysfs, &str, "queue/max_active_zones");
> +		if (!str)
> +			str = xstrdup("0");
> +		if (sortdata)
> +			str2u64(str, sortdata);
> +		break;
>  	case COL_DAX:
>  		ul_path_read_string(dev->sysfs, &str, "queue/dax");
>  		break;
> 

Looks good to me.

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

-- 
Damien Le Moal
Western Digital Research