From nobody Thu Mar 2 17:48:31 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 4PSJVm1SLFz3w4ZW; Thu, 2 Mar 2023 17:48:32 +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 4PSJVm0bS9z3JRZ; Thu, 2 Mar 2023 17:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677779312; 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=3EiJbt/gXlq/afTlJZzneluXbJW8fg+QsQhNxEx5KkE=; b=GWD55khsOpVqz0kLbFstqeB1uzWQRCFZxEAHRk3LSNfOS4owmBfHyWjrGRF7sd3pYbrL/g PXsRagIerzF503eShwH1zNYq27vDBnuDZOusTOcvTORElbOufnv/RtNuHb2cttsSnxtuVd EfpqgO+bwxkcdjY8OD9foL0dhwVYKOjX8MpbLsYo8qRsW3qpr7wzbsfqz5b1xZCG3LLpl8 mk5N4mDl6NoJbVCuNKk+TDJzoJDg1bigreNii+K7grjDDBQE1LgB/xAMvF8rktdwvo1EzK FLlAaQ+fcm2NFiwAfRuSRgC0NmlGrxTJPNQdmzDzc+VH3OUa191gfUi0Q4b0qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677779312; 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=3EiJbt/gXlq/afTlJZzneluXbJW8fg+QsQhNxEx5KkE=; b=CoUshXX5JOcZ9SXIUSiptY8yTpbt7Tq9oBSJXEnhbz/0fhFwxCukXU+1UGekqrqL2yAgUp zF919ODCoI1lS4ydiL5WLxByCqAZs54ZN+EotwbUQnlIj6yNaumt4/ET+Njfft/lfDtRfm oV0ro22RBiBCqX2ZnOiNeZxbAJKXUvJVfIn9saJHt6wP017sKNbDJVDdQQRlFGb1uVkv/N +fV2JlLMOGsynVC2277gRrDxEYrTPMRsS0PBnXHLBdMqH0pDC+PrIe7YbP2yI8LqJ/DVmR KUoGo24r9SHGC9owqvh38cgjJGFVVUewLJFQuZQEVKOjuPOsEy9y/+SI7RXC3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677779312; a=rsa-sha256; cv=none; b=iu94NGDwfvsMzhcBQ0fvJRxmRX59KFHbpCQcEI7jYm0uDU9dfqLDh13DLaynooUqqzEhEb wJCF9X1QWH5fpuaj6PN5tIBx7EItAnfWSOiQDykfHObxwm1EDVujjBsVOSBmRRzj1SPSC0 PVzRga66GanOSpgqrlwrhYmHauvp5PsE+fHi7n27sYKaoNpbgbFZaWORID3asjT7vCbJCx g3ckMJmXh0cuiL0/ZTI03PILuD6rrZATKeoQuEYaENU0ig2CrFgMJ9TjOdv4tM8lo4Z+PZ zrkqqvdIB9sB3JBfZLago16iSUZWAtgg3RRtkr6wA1nlfOiKbxE4IaA23w+pXQ== 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 4PSJVl6nTKzQFH; Thu, 2 Mar 2023 17:48:31 +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 322HmVeZ084945; Thu, 2 Mar 2023 17:48:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322HmVBP084944; Thu, 2 Mar 2023 17:48:31 GMT (envelope-from git) Date: Thu, 2 Mar 2023 17:48:31 GMT Message-Id: <202303021748.322HmVBP084944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 413a08a9b668 - releng/13.2 - linprocfs(4): Fixup process size in the /proc/pid/stat file 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 413a08a9b66871fe599310e358555edf54dd61a8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=413a08a9b66871fe599310e358555edf54dd61a8 commit 413a08a9b66871fe599310e358555edf54dd61a8 Author: Dmitry Chagin AuthorDate: 2023-02-26 13:42:22 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-02 17:47:36 +0000 linprocfs(4): Fixup process size in the /proc/pid/stat file According to the Linux sources the kernel exposes a proces virtual memory size via proc filesystem into the three files - stat, status and statm. This is the struct mm->total_vm value adjusted to the corresponding units - bytes, kilobytes and pages. The fix is based on a fernape@ analysis. Approved by: re (delphij) PR: 265937 Reported by: Ray Bellis MFC after: 3 days (cherry picked from commit a55b5a9aed3981fcec205e246436991d138c78a2) (cherry picked from commit 867e8404efed7a33553646b89588831db1a2102b) --- sys/compat/linprocfs/linprocfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 3aa01de9ce65..9166e46355ec 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1023,7 +1023,7 @@ linprocfs_doprocstat(PFS_FILL_ARGS) PS_ADD("0", "%d", 0); /* removed field */ PS_ADD("itrealvalue", "%d", 0); /* XXX */ PS_ADD("starttime", "%lu", TV2J(&kp.ki_start) - TV2J(&boottime)); - PS_ADD("vsize", "%ju", P2K((uintmax_t)kp.ki_size)); + PS_ADD("vsize", "%ju", (uintmax_t)kp.ki_size); PS_ADD("rss", "%ju", (uintmax_t)kp.ki_rssize); PS_ADD("rlim", "%lu", kp.ki_rusage.ru_maxrss); PS_ADD("startcode", "%ju", (uintmax_t)startcode);