Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CF2A30F522 for ; Tue, 23 Sep 2025 22:33:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758666802; cv=none; b=k5TR6Rvi7l8rf5aiMpQ9TAOB26YznTfBzwUUldHDhOk82Bs+8DB2J/lrOAFD5y2kDcfO6+OeECL2RoGCxuEiDHZ1/NusdLtCsObodjqSUJQwEdy1VVpGQYifqqQmYMrJ6MStQCOP8hM340ZFmVeeU9nVA7I7WXD6M/LFcorFZXo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758666802; c=relaxed/simple; bh=kZUHpU6S8UVYRUQDdu4Y2Rk+Jy5km31ZCsLgDDgmx3s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=hDmQVgI+/S8LwyfAu7m3PLTRM4fv04rHaiN4RKQ+hPSAeWczQhtZrbyCvPclDx2JoLql3R1SBJp4AYpqkWtZAvEfxbnD224wZXczxj49E6hr+HDbfVojas0ZpprbrkN65dMO8umwCN4xwaiH218Xcw5qEyu9uSw1srt9mThZEsk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=dAUQb2hZ; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dAUQb2hZ" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-77f68c697d3so93249b3a.1 for ; Tue, 23 Sep 2025 15:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758666801; x=1759271601; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=wAneJQAQnPj35Q6fil29jmDxaONd3Bnz5JZuwitT6KQ=; b=dAUQb2hZXAxf+Vknp/MJ7Abgh8e3ot0+ZdtEt8HFZcGb5XrKlvsvdJ9axIu9AVZq6b swnVJExEiJOqNGv+FH3Vct6oAA5pto/PQCl/sajLQl7/7oBr66J57RyMDXlpKj/SJovh gDP2hxiTISBxSeiJb1K7WFSbm6MhsjDs5JUflTYt+mJzi4zw50DkbSUWe+EvGlxskuOv 192+A7EFOH+ymKSvNx3AIGH+VzD9hnbRsPHmEdZw6swML47gWgYvfHOF4ylVGHxG5orZ xZ4mH3xWG6lzrwjAGhg/iKc3TZTyon39MBVomkKiQgicfXpv1GZ4nXMyxEc4teAJn5Od 98bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758666801; x=1759271601; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wAneJQAQnPj35Q6fil29jmDxaONd3Bnz5JZuwitT6KQ=; b=iNEWmRBXaLz7lVrcunpTp3JgM/6FY7QirtY+yQIRr1+VYcBsRGYsbKb2lVbZGykxMk yQQI+tnPP0fy4J6OpKWuUOXuURnDEfhbziOVg0V2BHHTavD2fjnRXdzXQBGPy0H8tK5h TT76kuR2rLQP6CPB5FVciAaelptyAQWIqQpZu5vV8vrczsj9oHUAqA7MWYsextoGihjq Ey7vzeg8kCyDpV80N7RzjwB17DH9/h4mfQ1IeTqNfoun6CXjH1KBkzx02D2PXUBiGoHl bJd73b5zTA7CrUrzhyTykikrhpA2lcG6YUgnCkrDPmQLgoLgX5x/2R50RuPm4dCQ06Mu mipA== X-Forwarded-Encrypted: i=1; AJvYcCXf6kh9k8jJQk8mJJ7V1s6Cw9/r0APSODAG+IAW8otQbl6mWDmJMD2nQ3H+aiqw4ZbEcV0f67cxfE272QppqQfl@vger.kernel.org X-Gm-Message-State: AOJu0YxTKOGU03DAhv2fdUIVMqaTyJLBx/SXNMjkj+stVvyfncABBv8F KwXWeCT98y+hLKaf4smLp71cL9ImZwCcG9ibup2QRb3WAAijdDMS12qZKQfFpskhi9sMfpggonF dbwnmonbmWA== X-Google-Smtp-Source: AGHT+IGvEAZz3dUvWFeTedMkEr4Rp+FHbKbyHuOPQj7EF8AK7MhewUeVb2Z1FB2w7KJiSa7pwO+2I4f3mna6 X-Received: from pfbfe12.prod.google.com ([2002:a05:6a00:2f0c:b0:775:f353:e9b0]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1788:b0:77d:a490:269c with SMTP id d2e1a72fcca58-77f53aa2471mr4904958b3a.29.1758666800226; Tue, 23 Sep 2025 15:33:20 -0700 (PDT) Date: Tue, 23 Sep 2025 15:32:45 -0700 In-Reply-To: <20250923223312.238185-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250923223312.238185-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.534.gc79095c0ca-goog Message-ID: <20250923223312.238185-2-irogers@google.com> Subject: [PATCH v6 01/28] perf stat: Allow retry for default events From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Xu Yang , Thomas Falcon , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Atish Patra , Beeman Strong , Leo Yan , Vince Weaver Content-Type: text/plain; charset="UTF-8" Default events are marked skippable. Checking skippable first means retrying and adding modifiers like exclude kernel isn't performed. Push the skippable checking after fallbacks are tried and avoid warning multiple times for the event. Fixes: 9eac5612da1c ("perf stat: Don't skip failing group events") Signed-off-by: Ian Rogers --- tools/perf/builtin-stat.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index ab567919b89a..303628189004 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -616,16 +616,7 @@ enum counter_recovery { static enum counter_recovery stat_handle_error(struct evsel *counter, int err) { char msg[BUFSIZ]; - - if (counter->skippable) { - if (verbose > 0) { - ui__warning("skipping event %s that kernel failed to open .\n", - evsel__name(counter)); - } - counter->supported = false; - counter->errored = true; - return COUNTER_SKIP; - } + bool warned = false; /* * PPC returns ENXIO for HW counters until 2.6.37 @@ -635,6 +626,7 @@ static enum counter_recovery stat_handle_error(struct evsel *counter, int err) if (verbose > 0) { ui__warning("%s event is not supported by the kernel.\n", evsel__name(counter)); + warned = true; } counter->supported = false; /* @@ -642,13 +634,15 @@ static enum counter_recovery stat_handle_error(struct evsel *counter, int err) * cpu event had a problem and needs to be reexamined. */ counter->errored = true; - } else if (evsel__fallback(counter, &target, err, msg, sizeof(msg))) { + goto skip_or_fatal; + } + if (evsel__fallback(counter, &target, err, msg, sizeof(msg))) { if (verbose > 0) ui__warning("%s\n", msg); return COUNTER_RETRY; - } else if (target__has_per_thread(&target) && err != EOPNOTSUPP && - evsel_list->core.threads && - evsel_list->core.threads->err_thread != -1) { + } + if (target__has_per_thread(&target) && err != EOPNOTSUPP && + evsel_list->core.threads && evsel_list->core.threads->err_thread != -1) { /* * For global --per-thread case, skip current * error thread. @@ -658,15 +652,29 @@ static enum counter_recovery stat_handle_error(struct evsel *counter, int err) evsel_list->core.threads->err_thread = -1; return COUNTER_RETRY; } - } else if (err == EOPNOTSUPP) { + goto skip_or_fatal; + } + if (err == EOPNOTSUPP) { if (verbose > 0) { ui__warning("%s event is not supported by the kernel.\n", evsel__name(counter)); + warned = true; } counter->supported = false; counter->errored = true; } +skip_or_fatal: + if (counter->skippable) { + if (verbose > 0 && !warned) { + ui__warning("skipping event %s that kernel failed to open .\n", + evsel__name(counter)); + } + counter->supported = false; + counter->errored = true; + return COUNTER_SKIP; + } + evsel__open_strerror(counter, &target, err, msg, sizeof(msg)); ui__error("%s\n", msg); -- 2.51.0.534.gc79095c0ca-goog