From nobody Tue Mar 05 17:29:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tq2c50FpMz5D52f; Tue, 5 Mar 2024 17:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tq2c46pgNz4P9v; Tue, 5 Mar 2024 17:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709659749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N81vBvcRKlqoqXGhWRCrhWIvRas/i4JJYWR15YUr7Nk=; b=p6/5822h/0If3WxZWcI+ZTzLswOuIl/Fm9dY+bFUNQASKt774SVwF1K8EMZbO/B+nCIT+6 nZY4o0fo0tvNdgzViyOeNj3cBmWvJr4/xDssOk1nMmq4nvunrUSLE9oP/6CXpig9uA9sKS msF9kczMv76HG6rfbbws8DgJBlxYPFVq8wWZ4Vp4OWStQkBmt71LEvmDOLRe3GBTRNOUYx GGxQdZ6PYXBQSSuVUxyYx5QpzgQ/ckkDdUPgfV99UMipMLP/Z9YQAHOUfZH6s+9gC2A6vo uHQ0GLaQMmkHMVi9dVBI+Xy9Ss2KVuogWxHX1bsy/qcs8KQ1SuK23Zt5ePZ6cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709659749; a=rsa-sha256; cv=none; b=T/AF6XFceIaELrmnGbP45sDTTQ/LxNoOsgfg6XvHRDHk9GLfTei5kLQaCYhcmMP+zsqHhE SsTtA9UK+bqro+qcXclDhxirmX0mf1sDm7SAVOPQdzkunpUAUWaXmIMM+xxFwYiTHNavkS Ql3e3tKziB/fE93vlcnnuucA2XAnL2zI3UK43fqtXRxz+lt8Jra4sID56zVi7nBevKzru6 YOlRGHXmqwQC2VTtiqOlg9oDpY/f4J6YBo8g3pOXK+W4bwHGmTqLzSrvXG12rilg0cr/dB Rgu4hgdHbt/74+kZRRAlRrpFJotVD+0khaeomj8Xy4IPx2DgF3TTngcZoY+tkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709659749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N81vBvcRKlqoqXGhWRCrhWIvRas/i4JJYWR15YUr7Nk=; b=YRJRjLNh68tRvGdjoX8vUvzSwnYwtyyEb9a36+i/DKIozWWJSPG5pJ+Hziscq0cpEFKc9i stkJWotFutjltN0dLGOjWvx4kqLQoq5JPgQLtuzR68BJTU436ubGqMXZ/KERETAUm2Yxff rznqDEMZBWsBAqZlyfZcOwYXhkBrG7gobr7DUlPK7JjoJt99Hp+AXbrsRYAdusIcMrMJdt PyK+q8mOd0Bnaf02gLh+vYL/dmiTbZ29O/03BxUJ+vfcaz0Xc/79oABOXlIC7qhYYOLbk3 eF+SQ9yXWzFS8ig4Pl1H5/CCvFKmkPoxwc+TkVX9Nuqw7dIZhrGzMXKDugAJvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tq2c46PwYzFk5; Tue, 5 Mar 2024 17:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 425HT8RH093299; Tue, 5 Mar 2024 17:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 425HT8iu093296; Tue, 5 Mar 2024 17:29:08 GMT (envelope-from git) Date: Tue, 5 Mar 2024 17:29:08 GMT Message-Id: <202403051729.425HT8iu093296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: e333110d1de7 - main - diskinfo(8): introduce new option -l List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e333110d1de748e50051d1305b5438d1bc54eeb4 Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=e333110d1de748e50051d1305b5438d1bc54eeb4 commit e333110d1de748e50051d1305b5438d1bc54eeb4 Author: Eugene Grosbein AuthorDate: 2024-03-05 17:23:41 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-05 17:29:04 +0000 diskinfo(8): introduce new option -l In modes -p or -s, add an option -l to start each line with a device name separated with a tab. Update the manual page. Add an example to list names with corresponding serial numbers: diskinfo -ls /dev/da? MFC after: 2 weeks --- usr.sbin/diskinfo/diskinfo.8 | 23 ++++++++++++++++++++--- usr.sbin/diskinfo/diskinfo.c | 15 ++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/usr.sbin/diskinfo/diskinfo.8 b/usr.sbin/diskinfo/diskinfo.8 index 72fd1df4eb08..970bafd4f8e5 100644 --- a/usr.sbin/diskinfo/diskinfo.8 +++ b/usr.sbin/diskinfo/diskinfo.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 4, 2017 +.Dd March 5, 2024 .Dt DISKINFO 8 .Os .Sh NAME @@ -38,10 +38,12 @@ .Op Fl citSvw .Ar disk ... .Nm -.Op Fl p +.Op Fl l +.Fl p .Ar disk ... .Nm -.Op Fl s +.Op Fl l +.Fl s .Ar disk ... .Sh DESCRIPTION The @@ -57,6 +59,13 @@ Print fields one per line with a descriptive comment. Perform a simple measurement of the I/O read command overhead. .It Fl i Perform a simple IOPS benchmark. +.It Fl l +In case of +.Fl p +or +.Fl s +modes prepend each line of an output with a device name using a tab +character as a separator. .It Fl p Return the physical path of the disk. This is a string that identifies the physical path to the disk in the @@ -80,6 +89,14 @@ with the following fields: device name, sectorsize, media size in bytes, media size in sectors, stripe size, stripe offset, firmware cylinders, firmware heads, and firmware sectors. The last three fields are only present if the information is available. +.Sh EXAMPLES +List first ten (at most) +.Xr da 4 +devices with corresponding serial numbers: +.Pp +.Dl diskinfo -ls /dev/da? +.Sh SEE ALSO +.Xr da 4 .Sh HISTORY The .Nm diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c index 4cc4517a1f26..f091d0ccfbea 100644 --- a/usr.sbin/diskinfo/diskinfo.c +++ b/usr.sbin/diskinfo/diskinfo.c @@ -58,11 +58,14 @@ static void usage(void) { - fprintf(stderr, "usage: diskinfo [-cipsStvw] disk ...\n"); + fprintf(stderr, "usage: diskinfo [-ciStvw] disk ...\n" + " diskinfo [-l] -p disk ...\n" + " diskinfo [-l] -s disk ...\n" + ); exit (1); } -static int opt_c, opt_i, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; +static int opt_c, opt_i, opt_l, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; static bool candelete(int fd); static void speeddisk(int fd, off_t mediasize, u_int sectorsize); @@ -88,7 +91,7 @@ main(int argc, char **argv) u_int sectorsize, fwsectors, fwheads, zoned = 0, isreg; uint32_t zone_mode; - while ((ch = getopt(argc, argv, "cipsStvw")) != -1) { + while ((ch = getopt(argc, argv, "cilpsStvw")) != -1) { switch (ch) { case 'c': opt_c = 1; @@ -98,6 +101,9 @@ main(int argc, char **argv) opt_i = 1; opt_v = 1; break; + case 'l': + opt_l = 1; + break; case 'p': opt_p = 1; break; @@ -169,6 +175,9 @@ main(int argc, char **argv) goto out; } } else { + if (opt_l && (opt_p || opt_s)) { + printf("%s\t", argv[i]); + } if (opt_p) { if (ioctl(fd, DIOCGPHYSPATH, physpath) == 0) { printf("%s\n", physpath);