From nobody Mon Jul 04 18:09:19 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 212101C3ECF8; Mon, 4 Jul 2022 18:09:21 +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 4LcDMz75bqz4kDW; Mon, 4 Jul 2022 18:09:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958160; 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=aT5p7DkIgJciwJUHEy4T3TksIoUT7iwtTOO+ibj4Gew=; b=uFX5jC/KZkT4SodIpiqh6y+76vH3FVOxQPFd0QiwPbLuSjy6r6wUtHtihirrBSFGpdDLsG GSJwUsaDDzZyODwFjuNBzN4iktUy3AcxGazhE+UHCzxPKH37CK9YAgkTWf5TXzUW1r00Hx paxHRj/9m5mXKH6DfUNI7CZdu7XgcDTL9ALjmDGSYmd01ZOr5g6xWzUgWFtfCVVFijGnGV XyF2vlwHcHzoJCrOVq3J5R98wGPCFNxc6ZBkBgDUt4W6Gzj14W3aRrjA+d/0vul2xDL8/Z dFncg+RfYS6+PxsSdcafx6M4JSj4Z2CNeyHmChPX92lIuSRIHUW3MGBVKDHzNA== 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 7C35116206; Mon, 4 Jul 2022 18:09:19 +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 264I9JqS064331; Mon, 4 Jul 2022 18:09:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264I9J4f064330; Mon, 4 Jul 2022 18:09:19 GMT (envelope-from git) Date: Mon, 4 Jul 2022 18:09:19 GMT Message-Id: <202207041809.264I9J4f064330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 2154db222027 - stable/13 - hwpmc: Correct selection of Intel fixed counters. 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2154db2220272cfdb1cc5f88482d6ea02a4aa1f6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958160; 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=aT5p7DkIgJciwJUHEy4T3TksIoUT7iwtTOO+ibj4Gew=; b=tD5yJ7fSA4OzgMbJmvfooKvLK8LrX1Lf4XUgx5AjpyigJo6/tD5vSWAhiymgzyviZT+UBa CAqghWsDzkFPezkTtFUOzpfoT4ZD7NtDC4D5HIwCRtRB9QVad3/8ujrXhvBAp6S48VSJZl rjMlZQj92GH4SwzXcX86ythAoRWTkRPkNxIoFERdynAqC0Yna/A0QyNqgZV82NplywCwZf 8O9KOqqRhxaaCccCRd+xKNFRGmXD960NbgP44YcCmP+Dr9SBN9HHNpEkwrkawRpsNdl2L5 o99eRm1NC13NK7sx2K/jONHmnh2NkPl6Edw8EjJTfEOt036lPCxFAZUPipsUyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656958160; a=rsa-sha256; cv=none; b=wEnOZDnOP4QarWHQmB4qSf8L71Cfja1xsq32hgPunm+Ik0FsbNtxpSSBovY3TdK3be7j1w A78Vyowd7s6KZNKATuzmUE5MWROW7cDRHxlRWMU9CfuyogNzAWP+wAAJwUNkv9MA5domrt wx4LXPqXdKZznKLGBfsdvr6X6ITVEd/jGAxuKOG7L1yJNiYcrFQohPJYn0L8XszygMv6aX zB5RsM6hN8dHlHlM9Lgz0ReqqiTCX87ul9unroYM+WYbdLRP9/bkMD3g4Z7OX1/0hSflmY lBh4+DBHl8phwnAyPdbpO/x9qpnm8ucQ2UVaqSBSyKW+TsbflzboGMsoSciPRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=2154db2220272cfdb1cc5f88482d6ea02a4aa1f6 commit 2154db2220272cfdb1cc5f88482d6ea02a4aa1f6 Author: Alexander Motin AuthorDate: 2022-05-30 23:46:48 +0000 Commit: Alexander Motin CommitDate: 2022-07-04 17:48:09 +0000 hwpmc: Correct selection of Intel fixed counters. Intel json's use event=0 to specify fixed counter number via umask. Alternatively fixed counters have equivalent programmable event/umask. MFC after: 1 month (cherry picked from commit c1e813d1230915e19a236ec687cadc1051841e56) --- sys/dev/hwpmc/hwpmc_core.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c index 1581c28da78f..7d359e732291 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -248,15 +248,31 @@ iaf_allocate_pmc(int cpu, int ri, struct pmc *pm, ev = IAP_EVSEL_GET(config); umask = IAP_UMASK_GET(config); - /* INST_RETIRED.ANY */ - if (ev == 0xC0 && ri != 0) - return (EINVAL); - /* CPU_CLK_UNHALTED.THREAD */ - if (ev == 0x3C && ri != 1) - return (EINVAL); - /* CPU_CLK_UNHALTED.REF */ - if (ev == 0x0 && umask == 0x3 && ri != 2) - return (EINVAL); + if (ev == 0x0) { + if (umask != ri + 1) + return (EINVAL); + } else { + switch (ri) { + case 0: /* INST_RETIRED.ANY */ + if (ev != 0xC0 || umask != 0x00) + return (EINVAL); + break; + case 1: /* CPU_CLK_UNHALTED.THREAD */ + if (ev != 0x3C || umask != 0x00) + return (EINVAL); + break; + case 2: /* CPU_CLK_UNHALTED.REF */ + if (ev != 0x3C || umask != 0x01) + return (EINVAL); + break; + case 3: /* TOPDOWN.SLOTS */ + if (ev != 0xA4 || umask != 0x01) + return (EINVAL); + break; + default: + return (EINVAL); + } + } pmc_alloc_refs++; if ((cpu_stdext_feature3 & CPUID_STDEXT3_TSXFA) != 0 &&