From nobody Sat Jan 15 00:08:25 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 0770C19541A5; Sat, 15 Jan 2022 00:08:26 +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 4JbJRF6M5fz3tYk; Sat, 15 Jan 2022 00:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642205305; 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=xfgV7X4u8MyM66oeFLrAm41ZMVQMZj/0UVgi57SM9aY=; b=EnNQkF2F4XF5M6CRImPBndXNS2PXOJ6gjsD77URIt608ynVotsobeUyeB3zmh6193CDrJH yCLrHOA2v6HMTtXen+LxQp4f2IVMAZwVuHs1uXpF3Y2JfHfDo9xyUzzThxDkHwt9PEH3Sb l1M9gS3z6iYhwgCJq0owlX7OgMT3zTBt3zXT6KY8XVmRiEH88TLcuTdhWz4D2W+bA0S8Rj ZBivHDil0idaHmSJU6k9nVQZwDLcwqcpCUovgJDb0g85nfk8WmWNA1Mg2zl3X0ErFqt56o KNYGwTmlvngsaQj/jOtEvvnuWWuRsOWdQ5XriaDTqA7jiAjnM566AbsjK+tqng== 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 9A2791D4A1; Sat, 15 Jan 2022 00:08:25 +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 20F08Pv5067241; Sat, 15 Jan 2022 00:08:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20F08PhQ067240; Sat, 15 Jan 2022 00:08:25 GMT (envelope-from git) Date: Sat, 15 Jan 2022 00:08:25 GMT Message-Id: <202201150008.20F08PhQ067240@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: bacb140f31aa - main - Ignore calcru: runtime went backwards for vm_guest 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bacb140f31aa64a7e73c1846834cc7065daee687 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642205305; 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=xfgV7X4u8MyM66oeFLrAm41ZMVQMZj/0UVgi57SM9aY=; b=m359i3Lrl8IlTvwxSlzY+neI41plXqnvSxxsjFGCrh7Tctlzhj9EcjCZTtFQ2zjVYMQSoI 5gL2+K3OC4QF/FxQe5N2O1fNfwye+7lKfw3WMuVcXK2yoEFpClzVqxtDsha6NwkozjyiqN 1vwipYWxozWTbw4tEclCWKnsdZ9fuvPqPqH9zD4qWlP+jeqVwfivCxGtj0AxRQDtCF0sy2 wG5p7Nmjym0zHpClQwVjp5lgu2UqlAHRhPrdG2cujb6BTu7GkaRbJzpPwh3IyuuHooOCAx tyfIXY/LWtVu05PvC8wyA0Iv7E4LAJ+e2qf4LrlZ4MzXDhqAUAwKL0NvFxPbug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642205305; a=rsa-sha256; cv=none; b=NUD+fD4uWedlql1au1KpA+A9t6mvMHQJGFdvEHvzlxHIypqBu9uKUbFdJ5v6v1ka6UcXk8 OoyseqF8SQKCEoJ0wu0ifgW1mYdpltA9cNrvMac8LhwariTUpVsoi71dzLvj0RDX73akNp l1K8zgv+4b51K1YMvLDLVKHon6G1t6qGLIa0MHOy3+fv9Jp6tIQ2yDmckFlNAcsT8RKHLr xyJfzWjAtPziYrfIeF6JhvYRnbpgfV6HGlWgtM5xZBOtUd/7VOf7NwTCN9oUrRaV8CZ0lC mZf/T4D58LTP/S08UfKP91S941Ks3Zvg6X/2mtXrJJo6F9KtvgY+HiluOe4Q1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=bacb140f31aa64a7e73c1846834cc7065daee687 commit bacb140f31aa64a7e73c1846834cc7065daee687 Author: Simon J. Gerraty AuthorDate: 2022-01-15 00:07:43 +0000 Commit: Simon J. Gerraty CommitDate: 2022-01-15 00:07:43 +0000 Ignore calcru: runtime went backwards for vm_guest VM's have little control over CPU speed, don't make matters worse by constantly spaming console. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D33902 --- sys/kern/kern_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 793ded63d91c..527e7f16e297 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -1018,7 +1018,7 @@ calcru1(struct proc *p, struct rusage_ext *ruxp, struct timeval *up, uu = ruxp->rux_uu; su = ruxp->rux_su; tu = ruxp->rux_tu; - } else { /* tu < ruxp->rux_tu */ + } else if (vm_guest == VM_GUEST_NO) { /* tu < ruxp->rux_tu */ /* * What happened here was likely that a laptop, which ran at * a reduced clock frequency at boot, kicked into high gear.