From nobody Wed Jun 17 14:50:32 2026 X-Original-To: dev-commits-src-main@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 4ggRcG0DqHz6hT1T for ; Wed, 17 Jun 2026 14:50:38 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ggRcF5sSwz42JJ for ; Wed, 17 Jun 2026 14:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781707837; 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=YbKlvZL0+LU2LldzHf8ZgQtsT/xdvZIssHCv1AFGiLM=; b=g1t6OB9thEhqEk6/+tl2F752Yn0K733bFnHGijBdbUKotDriqtH4PG3eLwwoJrb9aD/wBj rei2DOFSH9+Op5DPK3Lbi2i3EqkQ75woP7mS4AJ9SWZZRTLCgoORScH6jKEFpiB9XGc0Ho iJOUf7691a/5Qr38+s0j5GoqBSoff8E5Zspd1Q7aj5yNd/rOuyDtfaxUBfrtgXW4YYSZ9j V74luE5oaPN6AeGh4p4ScJCsGn35lGjPPzpxzv6kJw7tVGRhzbnFyW5/94msHNK9SAg2Tf Mvb8fScF8yONtfv/2k79O9TAgYUR3zxAPKxx0FH09Voe+YDfzOx0Wfxiiw6vPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781707837; a=rsa-sha256; cv=none; b=UpCPK+NQTg+SowpONVBCR/O13lTtnPavWX/UiMs7teRR3DHFSVJzPRkgy2ABNVNHuKukxM SAVnJyhtriTwhCARb1D6PZ0f8cygr7iYXxtfirc9QuxySK9nTw5yVBcPc7WI47FWXbVDKy 0FBouTiF7hTN2/jjCtfbDaSIqUbkX8RQmXcyzbKD5uT77QyrfyYmXKuLEdXQnU9/zI4TNF IMpa4BiLdSe4NVgo66jRSA3Hk5l4hDVDHfbn85NeAgNCD0+z7Cfywr4gYq5/CNaPC5o/3f eLml7r83m7rEv70Y2Mf9efHuCSUeji4fWK/JDXGh54lGwIsNxaZAqz47pupp2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781707837; 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=YbKlvZL0+LU2LldzHf8ZgQtsT/xdvZIssHCv1AFGiLM=; b=GRnkCIThlfnR3IRwWuPYudzMgipUv0/G2B4o+JhGPSKyKtbOgFLJHtg3/AKX3hI/S7/O3e /8VJY9U42J04OGJUZNC70iniOFSWrZaOVF2Wd3cBsgdAtoXpLtdJNhKMV4aXwsIazdfNZ4 jqeXEKB7eD0iejUxGE/uLr5e2QtzuwKjQ2auVcjMg+6yuLvjmO3d0g/FScr/0OamDzif6F HjKch5tcJzBr3idXXn+OYV/78ElFyDQvyC66Qs6nnyIFCSbvomk/+IMBA8pxnLKmXBcPG+ xA8xL6vsl6AWau6x2jiLnRgvuxAxLDZ1PWz233dATVPzUw/ENx7ZyAoG+uPwXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ggRcF55m2z1d3 for ; Wed, 17 Jun 2026 14:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dc25 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 17 Jun 2026 14:50:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 021a190c88fc - main - est: prevent divide-by-zero in est_msr_info List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 021a190c88fc41f981a79fe6822bdafbcda14e99 Auto-Submitted: auto-generated Date: Wed, 17 Jun 2026 14:50:32 +0000 Message-Id: <6a32b438.3dc25.45509592@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=021a190c88fc41f981a79fe6822bdafbcda14e99 commit 021a190c88fc41f981a79fe6822bdafbcda14e99 Author: Abdelkader Boudih AuthorDate: 2026-06-17 14:49:52 +0000 Commit: Adrian Chadd CommitDate: 2026-06-17 14:49:52 +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 --- 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))