From nobody Mon Jul 04 16:43:03 2022 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 42FE418A8E7B; Mon, 4 Jul 2022 16:43:05 +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 4LcBSS4Nnyz4Vqv; Mon, 4 Jul 2022 16:43:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656952984; 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=QUcqIIZB9i+sXm/3FzF8tnx0CQkVEIqQZQl4H9+p9RE=; b=vpxNLke1NBqx6J6WTnFxCRf0+6s6B5exgQ93Ner/auHBe3m9U2pSSjIP2eiM6x0StXXm3i wZANGFLUIG1Huv3UHV3ChFf6zVIEI1pXmEzeDfVeuN0mYiBcXrXkD99YIlsLmeCuU/JZlO 5gkTpkQwmWQN6otZXR13JUaX0YUrMUHlkdbmK7xKYi5NjGqpqxcFCkHDjFyzyU2sgfQ102 3MM9IOzKny1YExnS01LPwL9xpRB/KW6jnjwO31Bw2f7f8r8v1DMnSqlUmYx3Zh+DQNzMSE 2JBi3OcGrSruT3fqexIU+PzE4FzVPZPYSQmLoaQ/CK6vMgol4fCH+L9XEliYPA== 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 ED8FA15016; Mon, 4 Jul 2022 16:43:03 +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 264Gh3W3054656; Mon, 4 Jul 2022 16:43:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264Gh3ZI054655; Mon, 4 Jul 2022 16:43:03 GMT (envelope-from git) Date: Mon, 4 Jul 2022 16:43:03 GMT Message-Id: <202207041643.264Gh3ZI054655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 0aa150775179 - main - pmcstat: fix log analysis 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0aa150775179a4f683fade5f1d6325a47b5f695f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656952984; 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=QUcqIIZB9i+sXm/3FzF8tnx0CQkVEIqQZQl4H9+p9RE=; b=IlUsKgehTRlDuDXIJmX1neJrIqUFsNH1qwFlqXWUrP24aD34nCgjsTU84WvdeTGTR6r58+ c3HRcJIrSmnEXPNAhgogZam+pqPza+45YtOzMF+qkioKeUrSNVRdM2NQPP4JYCWrtdpx9O tDpfhbO695YHLcnbzjPtTQoxNpTwr+8E7uaYHfgixNZ+HeR+gC0iNV+5j+dQ7ibMDueUrG Om8kVO+iRj6cZZiDM7dWogfhcLk29jxVgARY1Ykvgg9FX5I9u0DZ1IAgU3d68SyuX/mcci SVp9PbuvBwrmGGmS3qLbh2kCM7KIU/5Ax2MuxjkH6E/swSN4zmHpkiFsPhwFSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656952984; a=rsa-sha256; cv=none; b=Sqdt3RIrzdOL1d2rjgmbH6bvEFphWxNPUq1M7Ggen5WNwukfnPWaHswFranYX5VC4ru7u7 LHurJEJogMuEyqC6k+Wa+PZELTgTdapC1KRPEXBVMoPu2E8MZ5fuIGxGPi+mFzYA2akhE9 ezj76fydJdepyMp3rukJYHGh+7PXVEl5iTmiCFZ8LQ66cTyZKPPWptKlsYOZ/ot+x9qZDO lJvvG4G74e0iyFWyE6XyqvB8GW6i52303LwuFPjNnJhyibGnOw+J/Vek/kiF3wTyUrfDKs lJPwZ6eMh4aYvK9NCnl3C+phgvs9n6yd9jgz4dfUmDOLTBssHBaf5U5w75lvDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=0aa150775179a4f683fade5f1d6325a47b5f695f commit 0aa150775179a4f683fade5f1d6325a47b5f695f Author: Andrew Gallatin AuthorDate: 2022-07-04 16:40:35 +0000 Commit: Andrew Gallatin CommitDate: 2022-07-04 16:42:39 +0000 pmcstat: fix log analysis pmcstat has been broken for analyzing logs since D35342 / b6e28991bf3aadb. This is because the pmc for the first CPU is not added when reading logs because unlike its clones, its event id is not invalid. That causes us to fail the assertion at lib/libpmcstat/libpmcstat_logging.c:293 when encountering samples from cpu0. Fix this by removing the check that the PMC is invalid Reviewed by: tsoome Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35709 --- usr.sbin/pmcstat/pmcstat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c index 08e43d5d446a..f366e2175a25 100644 --- a/usr.sbin/pmcstat/pmcstat.c +++ b/usr.sbin/pmcstat/pmcstat.c @@ -1187,8 +1187,7 @@ main(int argc, char **argv) */ STAILQ_FOREACH(ev, &args.pa_events, ev_next) { - if (ev->ev_pmcid == PMC_ID_INVALID && - pmc_allocate(ev->ev_spec, ev->ev_mode, + if (pmc_allocate(ev->ev_spec, ev->ev_mode, ev->ev_flags, ev->ev_cpu, &ev->ev_pmcid, ev->ev_count) < 0) err(EX_OSERR,