From nobody Fri Dec 09 12:17:43 2022 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 4NT95M4D61z4kPt9; Fri, 9 Dec 2022 12:17:43 +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 4NT95M3HDbz3rLH; Fri, 9 Dec 2022 12:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670588263; 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=hU7Gq8LWavagslvxEudsCIk7b8v1mb27DKFkU7zYRGk=; b=vgWhXQ5G97wwbPM4bV9lpXTNOk+7vYAWiyjd+HtSREdbA7rD1bq0k5aiF2j3Ds27RQYGRV dAQwdJszgV1okTxBc8llS4I36DgEIBnuZJoAcGKbjxZ1E2qYYD3N5k/AFdfDZyiQIVCtfg pwRiojPyznSjfZb9nMmPCCHsJhrOp9bmfAFwD1lHANz2j80lKvPDw8KbWxWfBkVbrkCjWU PepSEm941IRSR7YqwVjy4h7T9EWuPkLPffnQPFOoThCsMb1QeUxs3/ekLvvD+k3Gjb6wgD CnER3bmmJVpwcybmWCZkSzlpTnCDouI2MluKVzCoafJPdNKWMT/6Yr+Ff56gAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670588263; 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=hU7Gq8LWavagslvxEudsCIk7b8v1mb27DKFkU7zYRGk=; b=cuApXmo+1KRPwygPjU7hwFACEbyejgBKEp3ZFQS2kJflkt0G8mtQcVV4I6/xR1KQlD7crP 7/ljaOD3PWAIpIoBWoWoJ1ENpk0MjI6jROfoj6CqgFr5Dwq2zjUgx5626TVIs3iasIIRFZ jaSYdQVUQ7Pp2qpQDejHUDVrjoHBbhzDNJnl+6JcHhx2w+q8aef4TEIGhZqvV6S4cSQqMg fw8EzHYuYNSaisu6WwDBwjU3hO9fPYxHFDXtK6JazBdD0XFWzgPy2OR/5qG91d3zV6ozc4 uqSg7UV5hKlqEsQ/gf+nGcYq/+fXhROmeoftaqDJX8K02vdNMAGHozUDtzhL/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670588263; a=rsa-sha256; cv=none; b=r53lYraSJ1+tqHJtn1n++lN5DYFsDNK7veZpz9OV2xTr2FKMuSxi/gNPYVfVhNLj6t1G6d 0rkpqUY0d2uXgrMaWr3or/v5nkx8xUSooLItmtA8RDZ3i3slqsHTyo37QB0yIeGPZGh5If 3j87ff2k6CQzw70MP768ZQViGhf5MFLR5mFdX4R7xIbTjbVLTM4IXl8mt+VZoXxEdXB6gy xLCbw18kva21byP4fp3aFnDbhm2nvqivdfY19RCDzqcvry+qlTVLLivW3cu+LTbQai3VLY /mK9SmqLlFyySCLYHCPzSBCxCg7Hc7pwv42MbASPw3BmRq1MClxgbOJkyHDYQw== 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 4NT95M2C3CzbNf; Fri, 9 Dec 2022 12:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B9CHhgg086541; Fri, 9 Dec 2022 12:17:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9CHha5086540; Fri, 9 Dec 2022 12:17:43 GMT (envelope-from git) Date: Fri, 9 Dec 2022 12:17:43 GMT Message-Id: <202212091217.2B9CHha5086540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1bbc5101348b - main - posixshmcontrol(1): for regular shmfd, report used pages number 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bbc5101348b9ca23cef6bde6c22751e69e8cf91 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1bbc5101348b9ca23cef6bde6c22751e69e8cf91 commit 1bbc5101348b9ca23cef6bde6c22751e69e8cf91 Author: Konstantin Belousov AuthorDate: 2022-11-23 22:01:05 +0000 Commit: Konstantin Belousov CommitDate: 2022-12-09 12:17:12 +0000 posixshmcontrol(1): for regular shmfd, report used pages number Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37097 --- usr.bin/posixshmcontrol/posixshmcontrol.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.bin/posixshmcontrol/posixshmcontrol.c b/usr.bin/posixshmcontrol/posixshmcontrol.c index f64fcd3dd663..3b9d1dc256c3 100644 --- a/usr.bin/posixshmcontrol/posixshmcontrol.c +++ b/usr.bin/posixshmcontrol/posixshmcontrol.c @@ -404,6 +404,8 @@ stat_one_shm(const char *path, bool hsize, bool uname) char sizebuf[8]; struct stat st; int error, fd, ret; + struct shm_largepage_conf conf_dummy; + bool largepage; fd = shm_open(path, O_RDONLY, 0); if (fd == -1) { @@ -442,9 +444,13 @@ stat_one_shm(const char *path, bool hsize, bool uname) (long)st.st_ctim.tv_nsec); printf("birth\t%ld.%09ld\n", (long)st.st_birthtim.tv_sec, (long)st.st_birthtim.tv_nsec); - if (st.st_blocks != 0) + error = ioctl(fd, FIOGSHMLPGCNF, &conf_dummy); + largepage = error == 0; + if (st.st_blocks != 0 && largepage) printf("pagesz\t%jd\n", roundup((uintmax_t)st.st_size, PAGE_SIZE) / st.st_blocks); + else + printf("pages\t%jd\n", st.st_blocks); } close(fd); return (ret);