From nobody Fri Jan 20 03:23:36 2023 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 4NylFj2rrsz30vbH; Fri, 20 Jan 2023 03:23:37 +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 4NylFj1WfZz3nVN; Fri, 20 Jan 2023 03:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185017; 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=DWJ29W5Fhvena/vI3muoEwD1Ly7RAvkNk3jwzf0anPs=; b=c/EQ6K8ldG79Ylhc3+fZ3ZkvCHBVPIg/nTwkuLHcvSBfQc3GCJV7Z6J/vNCLU4O2rxIcZN q9o2iPKTJDDxADQn86FiTFBnAbYzVG5sFelC31UvuHQJAvT2LtEPLJ3Ww+MbC1dG8qjuUp XV0jrl6HQ45vvuSfOKbo2q046x9hjx+xNG1dlh0M9vJa3fxL++FSg/MegEFFYxerBFmNaN I0gFdD+GigZIsQN2ubkJLaFQqGzRZsjY1Uml1Veuq9z6+BoW6LcQy9R0WRhmXY4Y18RCys ntuZ+5LFjLAcbWcf5M17DkYExmFYSqA5tqAemNkR4N7WbPazkmiEAgyYGZXG/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185017; 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=DWJ29W5Fhvena/vI3muoEwD1Ly7RAvkNk3jwzf0anPs=; b=iLahXXVzd5pP0MWtMARaQgoXovDfSJXbLW3Ox6HwXE/HsLKKChTwQRBNS+Eo9vfECBOrc2 Scyd2MgtxjhOYfiKV/Vyhrf3GNjeGvNro/f0ku5dX8LYBrmqnEzQg4286X/Mv0XYH2G6G/ W1Vi/C9Vp427NCJ0onwgaZpver7OEieFcgmM/ml8EvcokylIMAWF/uF72G73CKjFCxQoBh T/9xKlWBxXbz79dJZYHvflsCKoVbw1DVUPhqJQ8R+8IBoLnvx8UFG/Md8CFVL/qhMdbS1B VeDus/Lwhla+PSCprGw4Qnb9KdhIVQYThn24OBDPhEegZJYTyc1iB1ZSUhb4LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674185017; a=rsa-sha256; cv=none; b=ui1WDGiypKcY8k2JRTIlPqE7cR7ljja3cccIeyiBmbfZ5JlCvbdP8ipIlUSx1JiXGAc5UZ YWiftC6ZfisQuvS+fCpVWWFR6XrY8ojuPPN7ViCvdcsTVT/ssM4WVbHKZaevbXF4ZG8Mdw TALB5//ZRCFXou/TNtltsKzGL+222SAc/IoViA1xH2yaXFe/5WyAWBRIfVzssL0V7feDAi 4AQ5FZWeHcLplxZ6w7H74KGY9fcWwhY40Bixd8Mlrecri9kTXYINi4lUZ3b9Ku4t8xrfpx MgfZ3t9a5xrAjxFdBqDIX7CAt2SArCT/Y/+7tR4QKlA1HOtezJLhjIZw3p3V2w== 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 4NylFj0dD7zG7C; Fri, 20 Jan 2023 03:23:37 +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 30K3Na4V042400; Fri, 20 Jan 2023 03:23:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K3NaWm042399; Fri, 20 Jan 2023 03:23:36 GMT (envelope-from git) Date: Fri, 20 Jan 2023 03:23:36 GMT Message-Id: <202301200323.30K3NaWm042399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 376418fcbd4e - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 376418fcbd4e933f7dc3fbc687a2814699fbb7cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=376418fcbd4e933f7dc3fbc687a2814699fbb7cf commit 376418fcbd4e933f7dc3fbc687a2814699fbb7cf Author: Konstantin Belousov AuthorDate: 2022-11-23 22:01:05 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 03:20:11 +0000 posixshmcontrol(1): for regular shmfd, report used pages number Tested by: pho (cherry picked from commit 1bbc5101348b9ca23cef6bde6c22751e69e8cf91) --- 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);