Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 B32B726FA5A for ; Tue, 23 Sep 2025 04:18:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758601132; cv=none; b=qMBybBHewsafUFd+Z47R/SYVQR1Ak5/VYYfiF/zHSlY/81kFGbphJYykLRjcJ44/xTHDyuAi4NrJK2kq7zB7WUHCa3U0sLj1980LEdhxYf7RPiRA5wrj8Z7m09HGnAFqI2xXwCsozW2UJFqqpUMShPjzP3lgCuCjGBoXmx5T3U8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758601132; c=relaxed/simple; bh=kZUHpU6S8UVYRUQDdu4Y2Rk+Jy5km31ZCsLgDDgmx3s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=CeItpbMCga/9RatBv6WVEgmNsQIFjEDE2KNrXZpNNBqnf/HQSbzXo9S+IR/heHhrl+saFl9vJK6fqvcHuiJYHn4NauFMQWII3qB6nomwGck8yM7o998nUV8htw185/D4p8H/zYkg5Sp0XSQ8ePN3SOUQvjc+9nzTKtSnZfHlp/s= 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=2oDf8trK; arc=none smtp.client-ip=209.85.215.201 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="2oDf8trK" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b55443b4114so1634950a12.2 for ; Mon, 22 Sep 2025 21:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758601130; x=1759205930; 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=2oDf8trK5Mpjy18SHbfWQQfK6Kog4/izu9Kjj4hQcpLLKJVwi/myF7kAe07RapFNw1 +xWGRDWDhZp/+/Kd03Y8yLHPs7U2Ih521WeY7jbEUBmCdgFUZpJZYL7YBjCYhxrftZlF hAHYyOjvKrlCahTc8pRCek7A0x9zNM+rFOw4FVWo+o5YBTC2NgmSwgpcDcxVnptCykXj TzV6k2oermnv+Pt+sZNB4MH+/tVix9us0ccYxdBXvKG9spHYa6INOXj2NzTtoHmPOgD9 ODq5sKhcZ8a6z1I7Gms2ZYbm2phEdFRAt+muX/KIf3e/m46IMIuBDSGVuilSRilqgZVS dZ2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758601130; x=1759205930; 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=HjqHmeYFat4hbbCGaC5JxfSxuh0/9auUwECD5nSwqXAQmKqrTE9fydu0FvG2lTnPSx 8t4C7JVkpSD7vq7dzFlvRybUte//fXo1ir+TMV4XE1CDXIWv2qOll/zoODmdpWEb0XbF 1Z/WsLuV2cj7dv95z9VEsdqV4KvJDmc2oa16YXKP8SQ1k43YyDPw2bPfFwLdx48yLLl9 Hy/kOwjPJhWZwhl/CtlhS9AJiOTtaXQUZwAqUWICZ4ECjqpcw389cnNbvsBWDdFyDvku ktqzmYObMuM7zPE9u4A2mzoXu36cInEk4/3d/6r0ZVJXnjx2CSviCJv+YARhCqsTG2Ve YZTQ== X-Forwarded-Encrypted: i=1; AJvYcCVoyFxyeIlppdwHtX7a4SaQO76pGPGEcm+bi0p1EyWI6EHFqPxgHQ8XMAfBhAFSL8wFSUQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxGOFXr1JNJD79EtsbOCdSLyHwOinr3uI07X1b+qrlelVrxSr7i puoAmswn9Fjv5YGFEvrJcq0gN4WrUbVEWuFxJkc3H0AM0jQt+IdNpdIUbHPxfIDqIGOgICb1MOb d/mqi4DqDRQ== X-Google-Smtp-Source: AGHT+IF6cYJDVK0H1bznB4eKbhN5Iu7fH1Fhc2pqoTFchudp7dMnQGWMpjFfFdl4jZSERPz88R1Nl3DJuiwZ X-Received: from pgbds10.prod.google.com ([2002:a05:6a02:430a:b0:b4e:3302:ce42]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:9990:b0:246:354:e0ff with SMTP id adf61e73a8af0-2cfd603fad0mr1701034637.8.1758601130012; Mon, 22 Sep 2025 21:18:50 -0700 (PDT) Date: Mon, 22 Sep 2025 21:18:20 -0700 In-Reply-To: <20250923041844.400164-1-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250923041844.400164-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.534.gc79095c0ca-goog Message-ID: <20250923041844.400164-2-irogers@google.com> Subject: [PATCH v5 01/25] 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, bpf@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