From nobody Wed Oct 28 15:07:44 2026 X-Original-To: dev-commits-src-branches@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 4jF9hc3Gm5z6xc4Y for ; Wed, 28 Oct 2026 15:07:44 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jF9hc20B6z4gVS for ; Wed, 28 Oct 2026 15:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793200064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/NIGiGsrdFkky6zUm/iG8ikFpuLVlrCddTG4sKIDje8=; b=m+LQywWN/NYMWNU8mPPU0t1eWtuoXRIYLhoMzFD9ezR55k2Hv0/CkO+xWrvIy9uS19wGa+ R12wbenSZxhmmXUfxikSnbCqQhs1TwLgIYeZ84D8WtXfuIV1m8cscVv1dCbAdoVr171o8d 1hmQAUzoWiMsxjrpO/g8Me/4vE2O0orOc3AArsI+yEL7vNiCMbB6zLsGpFOJaiPT4mwL+h 4sR5KKLVj8/BCp11Zr9t7yE5LIoiAEL1d6qlvxOv4hVTFH54JYvn2xbqN0AFmmEFolCwAB TMm+rQMrqv6xfeE1Rd4+C32CUeE21fdSWCIO3Jx7dmBl+iTAwmnwPYrq+M+46g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793200064; b=sx1YayIYn2wd8AvGBKz7WxW0ShaFargrcLTxrHrd7f9zHe2G8DL5lkGIb6KoKkObl+Y4gL +Om7PaxVQbibFY7mgLgjQmSDwxIwVWg+6XnW/6hdsULxIXMx8M+5Oxv7q9OWn1wiHUsNNs BX82jmx5wu60FPe5SnCICGnUw2OytLcD9XWMpyHq9F+Gj4fo+KdwG/I2ob+xH+s8e3nRtJ IQWo5PMnBzRQO5Jp6w4qW3haeszIH8sTrjQRfDFgiQgnynwFCtWbBGuMOqgbhDmFjzJS3/ sGM8BX7DtOKUP7kfhFXOavrMHxNGQvxEACAQhkcjO2avzQNPglR7FaFTfoiLYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793200064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/NIGiGsrdFkky6zUm/iG8ikFpuLVlrCddTG4sKIDje8=; b=v8SvJnqHWsUvuq5D7tWpTtVE2BcUjj88+Gn9S7aoBQranuK8gQHgG7ElyjyBKU7g15ZazL CVqoR0SDTKhtyrBygCflJSTZFAcQbpADaulINfqRUx2eorWyV8fyBzWJYEWidsdLMi3e0/ JMD2RY0UXpSEo8/ffRZNYzfNFUw23krYZIcRdRdp+7hNavvo6R5e6wigGivmKttvSDnPAh f/f5jl/1C4grumteBuYS78tmD42O0YO1HESngsBjOGegAKd+EEgVaNfvcuY+nC1N/ex1O1 Z3FUecAH3ihaYybXLtRuW9Pr+wHMe8PZ9QzomRPP5/aVHqYbUeM1pGLEnPBi0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jF9hc0ctqz1CCj for ; Wed, 28 Oct 2026 15:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d87 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 15:07:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: f6a8f38629b3 - stable/15 - est: prevent divide-by-zero in est_msr_info List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f6a8f38629b30a06f2ac2014164da3034e604b21 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 15:07:44 +0000 Message-Id: <6ae20fc0.21d87.185f4fe@gitrepo.freebsd.org> The branch stable/15 has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=f6a8f38629b30a06f2ac2014164da3034e604b21 commit f6a8f38629b30a06f2ac2014164da3034e604b21 Author: Abdelkader Boudih AuthorDate: 2026-06-17 14:49:52 +0000 Commit: Adrian Chadd CommitDate: 2026-10-28 15:07:21 +0000 est: prevent divide-by-zero in est_msr_info When hw.est.msr_info=1 is set, est_msr_info() extracts the bus clock from MSR_PERF_STATUS upper bits. On secondary CPUs, the MSR may contain zero in the frequency ratio field, causing a divide-by-zero panic. Observed in pre Skylake Intel cpu. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D57614 (cherry picked from commit 021a190c88fc41f981a79fe6822bdafbcda14e99) --- sys/x86/cpufreq/est.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/x86/cpufreq/est.c b/sys/x86/cpufreq/est.c index 82f35934aa99..804de162ec60 100644 --- a/sys/x86/cpufreq/est.c +++ b/sys/x86/cpufreq/est.c @@ -1181,11 +1181,15 @@ est_msr_info(device_t dev, uint64_t msr, freq_info **freqs, size_t *freqslen) /* Figure out the bus clock. */ freq = atomic_load_acq_64(&tsc_freq) / 1000000; id = msr >> 32; + if ((id >> 8) == 0) + return (EOPNOTSUPP); bus = freq / (id >> 8); device_printf(dev, "Guessed bus clock (high) of %d MHz\n", bus); if (!bus_speed_ok(bus)) { /* We may be running on the low frequency. */ id = msr >> 48; + if ((id >> 8) == 0) + return (EOPNOTSUPP); bus = freq / (id >> 8); device_printf(dev, "Guessed bus clock (low) of %d MHz\n", bus); if (!bus_speed_ok(bus))