From nobody Thu Mar 2 18:59:30 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 4PSL4g0Vzyz3w8Np; Thu, 2 Mar 2023 18:59:31 +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 4PSL4f6zp4z3kNK; Thu, 2 Mar 2023 18:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783571; 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=JKOje6UrYQ2uAMENjKncaVf/tjQwvF7/J/bZuI1oxNw=; b=OTpU54MwlDnfytxklE9IQbXZiu3AYP2J8/Akdnhrmpy2ZnpBnh1sLb2cWm2NP2R9QEH2ki ygkZDmc+7E6O8sz0/PntEQjEb4Cuj2ye9DstawexWoOlXT9GClt7qpsgi0yivlHTEv1ahT QKlrN4I4sc4luBBmK7Z/A6ZXR3lyxxFj6BKTrIk2Fn3B9qKd/QmOYE6G3FB+oVHPzDRtYi YgyYjON+37MembgQsoZ/b5eUR/vgIb4vhtDJfpEYgUQSH75DjGTKb75wivLx7pdTGeLRMD Dd+vDdnp7XRCr8Zq672lefFobJf4ScN3RTeZ5MHzCU4k87qslISdb0ix+69BiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677783571; 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=JKOje6UrYQ2uAMENjKncaVf/tjQwvF7/J/bZuI1oxNw=; b=tgnGoHfWwteAb0G7gLsMH1IbPCUqJc7k/Y8OmZe8Fqhpd/nof72+1rZgQdaHRe2UPsdkAX 3uCw1sYV78gcNT8E6UdSXb276QWkm62gEi26e9eZdmCDpBT8tgC/Co06Qrs3TQyGaxsxSj nfCB2iwJnDjhSKZGvQgY2HNZWz106zqYf+68iltxrtRIuwTfVjuOnNAXq8XfvyaS5L38c2 9VXnuvgkfEn3bbMkJRsNOwwCKR/mXpWr7XJQjNUqRJUurBACEg6waHgt2f53F+3CVL0W3V UDXtnkV6qsENmIJjyezOx6d/wnT2MWoL+a1V6y2DHJNZZnWSTUP7B276GnVxeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677783571; a=rsa-sha256; cv=none; b=BflFhc4KU2tICYZ5uJp6IT0Upfo41s8dr88Vrl1rXqZ1Eeh8F3lh564HiOy8VUF0rSYZoM ezJUB+LWoclhQhKoAcKsnQ8+rSGdOuqB4KNkkNM2o1Ni9ARI3QRJ9Hgc3QFLb5uaPcw/iE fl/hBHRPzPM+HaHOekwsGOdc4v8KkjuZXFxFimgFrlyI/6mC6VClE2QvlgnM56cEa2Rzzx ESkhJkjUDKPRS0ILybtpWXGce3IRlrTcSrhpKhgLmeY1JaZcbDyc/dubsqvvkr295LuDXt aWZ7iMBv98TlvyjlLhiKXnNRVOgo68xoxVyKldPm0CsETYpAOjz9LIQSDgoKFw== 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 4PSL4f63JWzS5F; Thu, 2 Mar 2023 18:59:30 +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 322IxUDS000788; Thu, 2 Mar 2023 18:59:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IxUPS000787; Thu, 2 Mar 2023 18:59:30 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:59:30 GMT Message-Id: <202303021859.322IxUPS000787@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: 3c4af6fe955f - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 3c4af6fe955fa8427ebc1206046bdc0d35a692bb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=3c4af6fe955fa8427ebc1206046bdc0d35a692bb commit 3c4af6fe955fa8427ebc1206046bdc0d35a692bb Author: Dmitry Chagin AuthorDate: 2023-02-26 13:42:22 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-02 18:59:19 +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. PR: 265937 Reported by: Ray Bellis MFC after: 3 days (cherry picked from commit a55b5a9aed3981fcec205e246436991d138c78a2) --- 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 de65078e7ee9..e0491581b090 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -848,7 +848,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);