From nobody Sun May 24 22:33:51 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp10.broadcom.com [192.19.144.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40A1A233933; Wed, 20 May 2026 16:33:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.144.205 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294810; cv=none; b=pKTzKyM4tqs0F9p9kSobZS8r0SNUNUBgTEZDslrjRx0GC9lqzMr0a+C06aAq0hMu3um/vAGCp7Vt5odWVy4JZrLRD21vHhHWYdXM69RU5JMyWh/vpS+qsLeO7oP1eZphkHi7rswOLyh7Mfc3QFgA/TTLKPjTf1v4ZuQ9nEriW+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294810; c=relaxed/simple; bh=11Nhxf9fHyBoI0yRiaT3dCMBCOtHwTPAH4MnOa9BpUM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bvBtItijEvkdU4Lqtto/5KsY7kGYQF5VW5y5/8M9Zi1DF8oLC78IWP4zlAIx3U8Wy58tLHZcGiIgc8SjZBXB+P3dqsoIpGzsT3t4Gok0v1capAqTvYsA3GdqQQ8C61sLM7RcZ2g13I8lqcYIqAtK2DMkc92uCFCSDjL4pL25Njg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=sLjcrEDG; arc=none smtp.client-ip=192.19.144.205 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="sLjcrEDG" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 5208FC000C9A; Wed, 20 May 2026 09:33:28 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 5208FC000C9A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1779294808; bh=11Nhxf9fHyBoI0yRiaT3dCMBCOtHwTPAH4MnOa9BpUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sLjcrEDGB43bw4gxJmDJLwgfekTO2rEOygslyDOdpxHepQ4whgxaj6k7TYNLNMn2z vfPSWHYlUIsVIiwpV7cVMijcbOU8Baz+M4jFE+v2lCgNAeqmke0I0QZjILzb8S8Yfa AiTp5Ruj8ro9CZrcFCvcuv3Z1ZgrnlJvbPLOMeds= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id CE157AEA3; Wed, 20 May 2026 12:33:26 -0400 (EDT) From: Florian Fainelli To: stable@vger.kernel.org Cc: Ian Rogers , Adrian Hunter , Alexander Shishkin , Ingo Molnar , Jiri Olsa , Mark Rutland , Namhyung Kim , Paolo Bonzini , Peter Zijlstra , Sean Christopherson , Arnaldo Carvalho de Melo , Florian Fainelli , Arnaldo Carvalho de Melo , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-perf-users@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM), linux-kernel@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM), bpf@vger.kernel.org (open list:BPF [MISC]), llvm@lists.linux.dev (open list:CLANG/LLVM BUILD SUPPORT), bcm-kernel-feedback-list@broadcom.com Subject: [PATCH stable 6.1 v2 1/5] perf build: Conditionally define NDEBUG Date: Wed, 20 May 2026 09:33:16 -0700 Message-Id: <20260520163320.3073037-2-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260520163320.3073037-1-florian.fainelli@broadcom.com> References: <20260520163320.3073037-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ian Rogers commit 616b14b47a86d880ba21a363440f20f82152d8f2 upstream When a build is done without DEBUG=3D1 then define NDEBUG. This will compile out asserts and other debug code. Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Ingo Molnar Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Sean Christopherson Link: https://lore.kernel.org/r/20230330183827.1412303-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Florian Fainelli --- tools/perf/Makefile.config | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 249f3d841563..c54692976001 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -228,6 +228,7 @@ ifndef DEBUG endif =20 ifeq ($(DEBUG),0) +CORE_CFLAGS +=3D -DNDEBUG=3D1 ifeq ($(CC_NO_CLANG), 0) CORE_CFLAGS +=3D -O3 else --=20 2.34.1 From nobody Sun May 24 22:33:51 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp11.broadcom.com [192.19.166.231]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D39EC369D61; Wed, 20 May 2026 16:33:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.231 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294812; cv=none; b=UJYDnsPbhqbowpxYqcTppBp85AlOJid6COQskOaRtILPZnfvqCg6Np0+2aEyRAXvWS+YXqYzGW8ulf5kO/iB7a1YTgwQ6be0824U8lUIxjSPt/RwPz4t9blvSrWDFHXHLCQz7pv6KZsvRiLqh8c8AF0lqetWQ/f9jI94oybnTkg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294812; c=relaxed/simple; bh=CKsIF0fCaBVEsWMMogugn8G7cs1NuJPfituR9/kqfmc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WP5nf4Bgh9yIJqUi9M5XKuqguEju0AjCDwt5lE/Lq5sr8rPaidkdJk0XJKCWn9hYA2dWp+4UE2hQgFH+M3PjWNqjtfutaqe+J0Q7+2W5m2T2x95jdms0N4cSFn5BdVxcdWbyEkVuZtDaxYxnO5MDwv8QOPsRH+oWp3rOxMlxFBY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=pKIDAqrS; arc=none smtp.client-ip=192.19.166.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="pKIDAqrS" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 3EE20C0000F3; Wed, 20 May 2026 09:33:30 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 3EE20C0000F3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1779294810; bh=CKsIF0fCaBVEsWMMogugn8G7cs1NuJPfituR9/kqfmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pKIDAqrSIjjX5gJi+GFHpOG41enaNc51k1ggD+2stw+OaPJF6ZTmj5o2XCJk5o+Dd fzB4oY5MbczoiesPktSeaAxKtmoC27SAQp04vo3qiMjOoxyRsRgnRiCsXPGQkXrMB3 NpYo5m2BgqIWZAalY0ynBZ6kR6gV+vyouBHVBUWg= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id 6E862AEA2; Wed, 20 May 2026 12:33:28 -0400 (EDT) From: Florian Fainelli To: stable@vger.kernel.org Cc: Ian Rogers , Namhyung Kim , Adrian Hunter , Alexander Shishkin , Gaosheng Cui , Ingo Molnar , James Clark , Jiri Olsa , Kan Liang , Mark Rutland , Peter Zijlstra , Rob Herring , bpf@vger.kernel.org, Arnaldo Carvalho de Melo , Florian Fainelli , Arnaldo Carvalho de Melo , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-perf-users@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM), linux-kernel@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM), llvm@lists.linux.dev (open list:CLANG/LLVM BUILD SUPPORT), bcm-kernel-feedback-list@broadcom.com Subject: [PATCH stable 6.1 v2 2/5] perf parse-events: Make YYDEBUG dependent on doing a debug build Date: Wed, 20 May 2026 09:33:17 -0700 Message-Id: <20260520163320.3073037-3-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260520163320.3073037-1-florian.fainelli@broadcom.com> References: <20260520163320.3073037-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ian Rogers commit d4ce60190e08d84f88937019defa5e3d23409ac1 upstream YYDEBUG enables line numbers and other error helpers in the generated parse-events-bison.c. These shouldn't be generated when debugging isn't enabled. Signed-off-by: Ian Rogers Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Gaosheng Cui Cc: Ingo Molnar Cc: James Clark Cc: Jiri Olsa Cc: Kan Liang Cc: Mark Rutland Cc: Peter Zijlstra Cc: Rob Herring Cc: bpf@vger.kernel.org Link: https://lore.kernel.org/r/20230911170559.4037734-2-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Florian Fainelli --- tools/perf/util/parse-events.y | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index be8c51770051..dbc350a2c382 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -6,7 +6,9 @@ =20 %{ =20 +#ifndef NDEBUG #define YYDEBUG 1 +#endif =20 #include #include --=20 2.34.1 From nobody Sun May 24 22:33:51 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp09.broadcom.com [192.19.166.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 067F4352030; Wed, 20 May 2026 16:33:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294815; cv=none; b=V5IW+H57l4NAJW+8Zk+5ZG5zpvQqqYX/0X771GCalsKcoRRyc4hV7OuPqMinC43dKA23E2ydBmUWs6eUQDIsgyUoPMUXIx7sQCHKwKHFglwUDSA5fYyxW95S378rgWD3Z/yE+s8zHXfQ5xgiQCQ6U1J4P9YgxIS3AAl3QLAi5EY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294815; c=relaxed/simple; bh=/M3cV2UWid8oUuWvgiBvfarkey7ATrSQ62oLTSRsZ4A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=P+7GHFRBcY5mSBTVVaZiZFzUfyR7kpg8yZc3DyUfP9QiA7eJ3rDcTgwKRsTBt5jVvVcN8qdEaEDRh30J8XO+wsSwhopbnTBNHAIBd0oRQmaDBtKEv1htV1IR8TTYucSSIK4BofGcZOd23jv4q+KWsfYdgsTrbcOuyvGA1VCxXCs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=JfZ66YwB; arc=none smtp.client-ip=192.19.166.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="JfZ66YwB" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 06BE3C001AC3; Wed, 20 May 2026 09:33:32 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 06BE3C001AC3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1779294812; bh=/M3cV2UWid8oUuWvgiBvfarkey7ATrSQ62oLTSRsZ4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JfZ66YwB9ubvi9+F8T9B38tq73ayY5O9En0aDeFNIPZ6mTBp0Gk8kAi8ixsR5aCMa IyZbthN6DHYx3urhDnbOdnpMacDFL7ZkRT8Z3Fhj9UKmcCPAj1F3864++kAcEWqqXK plFaVUBdRgRrvALmczAszSwGRNETVM2DlsZ+b5dk= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id 2D5BCAEA3; Wed, 20 May 2026 12:33:30 -0400 (EDT) From: Florian Fainelli To: stable@vger.kernel.org Cc: Ian Rogers , Adrian Hunter , Alexander Shishkin , Andrii Nakryiko , Eduard Zingerman , Gaosheng Cui , Ingo Molnar , Jiri Olsa , Kan Liang , Mark Rutland , Namhyung Kim , Nathan Chancellor , Nick Desaulniers , Peter Zijlstra , Rob Herring , Tom Rix , bpf@vger.kernel.org, llvm@lists.linux.dev, Arnaldo Carvalho de Melo , Florian Fainelli , Arnaldo Carvalho de Melo , linux-perf-users@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM), linux-kernel@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM), bcm-kernel-feedback-list@broadcom.com Subject: [PATCH stable 6.1 v2 3/5] perf build: Disable fewer bison warnings Date: Wed, 20 May 2026 09:33:18 -0700 Message-Id: <20260520163320.3073037-4-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260520163320.3073037-1-florian.fainelli@broadcom.com> References: <20260520163320.3073037-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ian Rogers commit ddc8e4c966923ad1137790817157c8a5f0301aec upstream If bison is version 3.8.2, reduce the number of bison C warnings disabled. Earlier bison versions have all C warnings disabled. Avoid implicit declarations of yylex by adding the declaration in the C file. A header can't be included as a circular dependency would occur due to the lexer using the bison defined tokens. Committer notes: Some recent versions of gcc and clang (noticed on Alpine Linux 3.17, edge, clearlinux, fedora 37, etc. Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andrii Nakryiko Cc: Eduard Zingerman Cc: Gaosheng Cui Cc: Ingo Molnar Cc: Jiri Olsa Cc: Kan Liang Cc: Mark Rutland Cc: Namhyung Kim Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Peter Zijlstra Cc: Rob Herring Cc: Tom Rix Cc: bpf@vger.kernel.org Cc: llvm@lists.linux.dev Link: https://lore.kernel.org/r/20230728064917.767761-6-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo [florian: Remove non-existent tools/perf/util/bpf-filter.y in 6.1.y] Signed-off-by: Florian Fainelli Change-Id: I62327ddbe816008197053a9234a92d9c253a2c5d --- tools/perf/util/Build | 12 ++++++++---- tools/perf/util/expr.y | 4 +++- tools/perf/util/parse-events.y | 1 + tools/perf/util/pmu.y | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 2c364a9087a2..036f9780b398 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -269,10 +269,14 @@ CFLAGS_parse-events-flex.o +=3D $(flex_flags) CFLAGS_pmu-flex.o +=3D $(flex_flags) CFLAGS_expr-flex.o +=3D $(flex_flags) =20 -bison_flags :=3D -DYYENABLE_NLS=3D0 -BISON_GE_35 :=3D $(shell expr $(shell $(BISON) --version | grep bison | se= d -e 's/.\+ \([0-9]\+\).\([0-9]\+\)/\1\2/g') \>\=3D 35) -ifeq ($(BISON_GE_35),1) - bison_flags +=3D -Wno-unused-parameter -Wno-nested-externs -Wno-implicit= -function-declaration -Wno-switch-enum -Wno-unused-but-set-variable -Wno-un= known-warning-option +# Some newer clang and gcc version complain about this +# util/parse-events-bison.c:1317:9: error: variable 'parse_events_nerrs' s= et but not used [-Werror,-Wunused-but-set-variable] +# int yynerrs =3D 0; + +bison_flags :=3D -DYYENABLE_NLS=3D0 -Wno-unused-but-set-variable +BISON_GE_382 :=3D $(shell expr $(shell $(BISON) --version | grep bison | s= ed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \>\=3D 382) +ifeq ($(BISON_GE_382),1) + bison_flags +=3D -Wno-switch-enum else bison_flags +=3D -w endif diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y index 635e562350c5..b8745d564b78 100644 --- a/tools/perf/util/expr.y +++ b/tools/perf/util/expr.y @@ -7,6 +7,8 @@ #include "util/debug.h" #define IN_EXPR_Y 1 #include "expr.h" +#include "expr-bison.h" +int expr_lex(YYSTYPE * yylval_param , void *yyscanner); %} =20 %define api.pure full @@ -56,7 +58,7 @@ static void expr_error(double *final_val __maybe_unused, struct expr_parse_ctx *ctx __maybe_unused, bool compute_ids __maybe_unused, - void *scanner, + void *scanner __maybe_unused, const char *s) { pr_debug("%s\n", s); diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index dbc350a2c382..42d4414760e3 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -20,6 +20,7 @@ #include "parse-events.h" #include "parse-events-bison.h" =20 +int parse_events_lex(YYSTYPE * yylval_param, YYLTYPE * yylloc_param , void= *yyscanner); void parse_events_error(YYLTYPE *loc, void *parse_state, void *scanner, ch= ar const *msg); =20 #define ABORT_ON(val) \ diff --git a/tools/perf/util/pmu.y b/tools/perf/util/pmu.y index e675d79a0274..ae88d2d2dd6a 100644 --- a/tools/perf/util/pmu.y +++ b/tools/perf/util/pmu.y @@ -9,6 +9,9 @@ #include #include #include "pmu.h" +#include "pmu-bison.h" + +int perf_pmu_lex(void); =20 #define ABORT_ON(val) \ do { \ --=20 2.34.1 From nobody Sun May 24 22:33:51 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp11.broadcom.com [192.19.166.231]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21C263546D9; Wed, 20 May 2026 16:33:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.231 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294816; cv=none; b=fnqAzUxlQXbP3f3SyBes8GxxE3hoKw+u5Bm0hgIxWbqfBq0lg2CBQR9gRijvQHzBS9Ywa1MF0pZ4Ywh4onJQpMfeeQyKosEY957lomB489TCzucHXFpG97ITJNjOucRHmX7opWZ4HEko8BSRnKeEgAxvpu9wk9u07d9My3IkwsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294816; c=relaxed/simple; bh=2d5ScfYMkjkqAdd8jvTXB9vB35XMZJlsxvczlPl8KdY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZKDofu4wRFuChzHeXP2JEkXVPbTQGEkGTtxNjCvDL+X6l59S+Sp/f/Z1rKSYg4ayR9kOyQET9MlT2F6gF7zjOaQYgJmzatHIH8Ny0Hz3yU4N2qKexEo6iNisit8V006o/KrFG/mh9hcm9A1F6F3rOSRIKKO2ZoFwB6xuM/gmF8Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=iOZCAo/g; arc=none smtp.client-ip=192.19.166.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="iOZCAo/g" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 7AF88C00087B; Wed, 20 May 2026 09:33:33 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 7AF88C00087B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1779294813; bh=2d5ScfYMkjkqAdd8jvTXB9vB35XMZJlsxvczlPl8KdY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iOZCAo/gkmSeSDjKRnX1F2G6qp9/Ox2oOPyPZ7hvSjhff2atEnxY6inkXZcVrJAQ9 BujoDCaZF4n2zAyhc4PLRvjosLwGkplxsH+VBpZzlwkimqmgs840YShiQPvn3V2QXU V9u2HTA/VE7ATotbyM4usOM3sqrsbf+gZzk80Idc= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id EB3B7AEA2; Wed, 20 May 2026 12:33:31 -0400 (EDT) From: Florian Fainelli To: stable@vger.kernel.org Cc: Arnaldo Carvalho de Melo , Adrian Hunter , Ian Rogers , Jiri Olsa , Namhyung Kim , Florian Fainelli , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-perf-users@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM), linux-kernel@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM), bpf@vger.kernel.org (open list:BPF [MISC]), llvm@lists.linux.dev (open list:CLANG/LLVM BUILD SUPPORT), bcm-kernel-feedback-list@broadcom.com Subject: [PATCH stable 6.1 v2 4/5] tools build: Add 3-component logical version comparators Date: Wed, 20 May 2026 09:33:19 -0700 Message-Id: <20260520163320.3073037-5-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260520163320.3073037-1-florian.fainelli@broadcom.com> References: <20260520163320.3073037-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo commit a9b451509565d40a5ca3b41c39a2b758cdbc5355 upstream The next cset needs to compare if a flex version is greater or equal/less than another, but since there is no canonical, generally available way to compare versions in the command line (sort -V, yeah, but...), just use awk to canonicalize the versions like is also done in scripts/rust_is_available.sh. There was a problem spotted in linux-next where a bashism, here documents, aka the '<<<' stdin redirector, for strings to be used as the stdin for awk. Use $(shell echo | awk ...) instead. Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Florian Fainelli --- tools/scripts/utilities.mak | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/scripts/utilities.mak b/tools/scripts/utilities.mak index 172e47273b5d..d69d0345cc23 100644 --- a/tools/scripts/utilities.mak +++ b/tools/scripts/utilities.mak @@ -177,3 +177,23 @@ $(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _= ge_attempt,$(2))) endef _ge_attempt =3D $(or $(get-executable),$(call _gea_err,$(2))) _gea_err =3D $(if $(1),$(error Please set '$(1)' appropriately)) + +# version-ge3 +# +# Usage $(call version-ge3,2.6.4,$(FLEX_VERSION)) +# +# To compare if a 3 component version is greater or equal to another, firs= t use +# was to check the flex version to see if we can use compiler warnings as +# errors for one of the cases flex generates code C compilers complains ab= out. + +version-ge3 =3D $(shell echo "$(1).$(2)" | awk -F'.' '{ printf("%d\n", (10= 000000 * $$1 + 10000 * $$2 + $$3) >=3D (10000000 * $$4 + 10000 * $$5 + $$6)= ) }') + +# version-lt3 +# +# Usage $(call version-lt3,2.6.2,$(FLEX_VERSION)) +# +# To compare if a 3 component version is less thjan another, first use was= to +# check the flex version to see if we can use compiler warnings as errors = for +# one of the cases flex generates code C compilers complains about. + +version-lt3 =3D $(shell echo "$(1).$(2)" | awk -F'.' '{ printf("%d\n", (10= 000000 * $$1 + 10000 * $$2 + $$3) < (10000000 * $$4 + 10000 * $$5 + $$6)) }= ') --=20 2.34.1 From nobody Sun May 24 22:33:51 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp09.broadcom.com [192.19.166.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75FAF3E9C3D; Wed, 20 May 2026 16:33:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294817; cv=none; b=nZOTUo7WS2i+VRC7Q8STPrKTYgOdR0HtiG68/LWhZWm4GUxu5zeNtpdEIcfQm3/iCh6JYAS7jmmfhdGSSxByWyYA4PcA2m2knOswhHX5zbqY/IQjoX7cP+kI4S5ikmAcyygFOao+AYj1zJ9G+st1JThmaXNiLB2oJAUCVOoC/pQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294817; c=relaxed/simple; bh=LRw5SU3M5IXzdbYaE9mpgc3ExjOv/zYLyK1fhSBO2ns=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GJS5EyM4YsbA2ZYCgwKcI4uU3GyNRFkM5Js6pClECy3lF0ul44V8s+fMNQ5v69cXzisqeeK98K1I9lRW2l9Xe5cDuy6O3ajIpSBWeIJmluQPL/jd/u5G0s47mtYgEYfQ/odwJRyaRxKGkIlpHuQeiSfEhu8l6oJ/ajVm1Ci+P8E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=nqqFj02T; arc=none smtp.client-ip=192.19.166.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="nqqFj02T" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id ED187C001AC5; Wed, 20 May 2026 09:33:34 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com ED187C001AC5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1779294815; bh=LRw5SU3M5IXzdbYaE9mpgc3ExjOv/zYLyK1fhSBO2ns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nqqFj02TDklLjqkmTNcu2jfCkYq2fypWSoUdxZ+cz+50SIop6nCZYxk1jXht2YubV Yci8QMutQ9tErznbVSMwOSZNUmCgMQNA++gdgXE8ytpK4IcxY7JxI8bW8BoKnmfPBZ vThXxVYBvZinIwg7ze7gpFt/Kv9N5y0DHInDLJ4A= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id 671A7AEA3; Wed, 20 May 2026 12:33:33 -0400 (EDT) From: Florian Fainelli To: stable@vger.kernel.org Cc: Arnaldo Carvalho de Melo , Adrian Hunter , Ian Rogers , Jiri Olsa , Namhyung Kim , Florian Fainelli , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-perf-users@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM), linux-kernel@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM), bpf@vger.kernel.org (open list:BPF [MISC]), llvm@lists.linux.dev (open list:CLANG/LLVM BUILD SUPPORT), bcm-kernel-feedback-list@broadcom.com Subject: [PATCH stable 6.1 v2 5/5] perf build: Remove -Wno-unused-but-set-variable from the flex flags when building with clang < 13.0.0 Date: Wed, 20 May 2026 09:33:20 -0700 Message-Id: <20260520163320.3073037-6-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260520163320.3073037-1-florian.fainelli@broadcom.com> References: <20260520163320.3073037-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo clang < 13.0.0 doesn't grok -Wno-unused-but-set-variable, so just remove it to avoid: error: unknown warning option '-Wno-unused-but-set-variable'; did you mea= n '-Wno-unused-const-variable'? [-Werror,-Wunknown-warning-option] make[4]: *** [/git/perf-6.5.0-rc4/tools/build/Makefile.build:128: /tmp/bu= ild/perf/util/pmu-flex.o] Error 1 make[4]: *** Waiting for unfinished jobs.... Fixes: ddc8e4c966923ad1 ("perf build: Disable fewer bison warnings") Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Link: https://lore.kernel.org/lkml/ZNUSWr52jUnVaaa%2F@kernel.org/ Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Florian Fainelli Change-Id: I8db8a372d1e83d26fbe8beda2bcf4d1a871a2b80 --- tools/perf/util/Build | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 036f9780b398..43f74f5b96f8 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -1,3 +1,6 @@ +include $(srctree)/tools/scripts/Makefile.include +include $(srctree)/tools/scripts/utilities.mak + perf-y +=3D arm64-frame-pointer-unwind-support.o perf-y +=3D annotate.o perf-y +=3D block-info.o @@ -265,15 +268,22 @@ ifeq ($(FLEX_GE_26),1) else flex_flags :=3D -w endif -CFLAGS_parse-events-flex.o +=3D $(flex_flags) -CFLAGS_pmu-flex.o +=3D $(flex_flags) -CFLAGS_expr-flex.o +=3D $(flex_flags) =20 # Some newer clang and gcc version complain about this # util/parse-events-bison.c:1317:9: error: variable 'parse_events_nerrs' s= et but not used [-Werror,-Wunused-but-set-variable] # int yynerrs =3D 0; =20 bison_flags :=3D -DYYENABLE_NLS=3D0 -Wno-unused-but-set-variable + +# Old clangs don't grok -Wno-unused-but-set-variable, remove it +ifeq ($(CC_NO_CLANG), 0) + CLANG_VERSION :=3D $(shell $(CLANG) --version | head -1 | sed 's/.*clang= version \([[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+\).*/\1/g') + ifeq ($(call version-lt3,$(CLANG_VERSION),13.0.0),1) + bison_flags :=3D $(subst -Wno-unused-but-set-variable,,$(bison_flags)) + flex_flags :=3D $(subst -Wno-unused-but-set-variable,,$(flex_flags)) + endif +endif + BISON_GE_382 :=3D $(shell expr $(shell $(BISON) --version | grep bison | s= ed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \>\=3D 382) ifeq ($(BISON_GE_382),1) bison_flags +=3D -Wno-switch-enum @@ -286,6 +296,10 @@ ifeq ($(BISON_LT_381),1) bison_flags +=3D -DYYNOMEM=3DYYABORT endif =20 +CFLAGS_parse-events-flex.o +=3D $(flex_flags) +CFLAGS_pmu-flex.o +=3D $(flex_flags) +CFLAGS_expr-flex.o +=3D $(flex_flags) + CFLAGS_parse-events-bison.o +=3D $(bison_flags) CFLAGS_pmu-bison.o +=3D -DYYLTYPE_IS_TRIVIAL=3D0 $(bison_flags) CFLAGS_expr-bison.o +=3D -DYYLTYPE_IS_TRIVIAL=3D0 $(bison_flags) --=20 2.34.1