From: Naohiro Aota <naohiro.aota@wdc.com>
To: Karel Zak <kzak@redhat.com>
Cc: util-linux@vger.kernel.org, Damien.LeMoal@wdc.com,
Naohiro Aota <naohiro.aota@wdc.com>
Subject: [PATCH v3 2/3] lsblk: add columns of zoned parameters
Date: Mon, 30 Aug 2021 14:52:56 +0900 [thread overview]
Message-ID: <20210830055257.1832523-3-naohiro.aota@wdc.com> (raw)
In-Reply-To: <20210830055257.1832523-1-naohiro.aota@wdc.com>
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;
--
2.33.0
next prev parent reply other threads:[~2021-08-30 5:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-30 5:52 [PATCH v3 0/3] add columns for zoned parameters Naohiro Aota
2021-08-30 5:52 ` [PATCH v3 1/3] lsblk: factor out function to read sysfs param as bytes Naohiro Aota
2021-08-30 5:52 ` Naohiro Aota [this message]
2021-08-30 6:22 ` [PATCH v3 2/3] lsblk: add columns of zoned parameters Damien Le Moal
2021-08-30 5:52 ` [PATCH v3 3/3] lsblk: add zoned columns to "lsblk -z" Naohiro Aota
2021-08-31 8:48 ` [PATCH v3 0/3] add columns for zoned parameters Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210830055257.1832523-3-naohiro.aota@wdc.com \
--to=naohiro.aota@wdc.com \
--cc=Damien.LeMoal@wdc.com \
--cc=kzak@redhat.com \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).