Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Liam Howlett <liam.howlett@oracle.com>
To:     "linux-perf-users@vger.kernel.org" <linux-perf-users@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "llvm@lists.linux.dev" <llvm@lists.linux.dev>,
        "linux-sparse@vger.kernel.org" <linux-sparse@vger.kernel.org>
CC:     Liam Howlett <liam.howlett@oracle.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Miguel Ojeda <ojeda@kernel.org>,
        Rasmus Villemoes <linux@rasmusvillemoes.dk>,
        Arnaldo Carvalho de Melo <acme@redhat.com>,
        Nathan Chancellor <nathan@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Tom Rix <trix@redhat.com>
Subject: [PATCH] tools: Rename __fallthrough to fallthrough
Thread-Topic: [PATCH] tools: Rename __fallthrough to fallthrough
Thread-Index: AQHZAOWdKjCxagHIX0qde3eKVLF0eA==
Date:   Fri, 25 Nov 2022 15:50:16 +0000
Message-ID: <20221125154947.2163498-1-Liam.Howlett@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?H8aU0gsnw9AZ/tu6T5fXrqCW8EClF3m/YGs1hRau33OQ+PwHRD73Bipzcp?=
 =?iso-8859-1?Q?vcEhUCV1pPkCGZ0YTU+KjeP+2QqM0MSU9PyEW3jV0QI3n/KeYjFkLAXvrH?=
 =?iso-8859-1?Q?C7sogCs4bPG/uQCv33wLouTwMbr4g/Ug2xC7Y11wO5iu4pG+KoocKjmRs6?=
 =?iso-8859-1?Q?ytYgT7Pzz9lOhxj2LNA80RZoq4ObCCoyq+NSa7d/CAbquQ9T5wh/Ho+z4X?=
 =?iso-8859-1?Q?8L5De0J8p3dCbPT8945Jh904b93eKgdXMEAJgjmxDBLNIqAI5puljymw5E?=
 =?iso-8859-1?Q?eboGwmbQ5yTGslwxL0PojXErAMAfVhkTYjBbtUV2LJ7BVK31Am76dhogAN?=
 =?iso-8859-1?Q?3EPVDuAqDknnlCOpwU+FIKBtYRxR1OgGr5WJJcCxE0+a6b27rMrKJ/DewK?=
 =?iso-8859-1?Q?CQu+LyhESfxjy9F7Hg6ASY33jNWy99CuD07L/5eMPENPPEZF7+3We6U5lK?=
 =?iso-8859-1?Q?bIO+F2Ki0UNXFzwS9MXPGCvvyKtUHbz11qcZHeHtgTTgtgtqZoHHgoY7Pr?=
 =?iso-8859-1?Q?7p78grND0KkprD5y3mlwHwSyhkZ2MZDndCkEu3Swkg+QgjdlJkDXYP/Hav?=
 =?iso-8859-1?Q?XpL1BGHAeWl/sPT5d4QIkMFWS4HlMVuemU3L84+946LHU61KuP1vX/sj3Z?=
 =?iso-8859-1?Q?/gQlfH59uvnts3wHhlDBp25evt1B2MMYrvMsTNr6Ie5U9FX8+e2O2pXr6n?=
 =?iso-8859-1?Q?U5awCu+wOnkgN4SL+xG8Lfh3M4A33NzITqeAt/KUM8+5wsF1jVVHrPUfEp?=
 =?iso-8859-1?Q?c2VKE/AqVeSsLv/8DS0jELSRa0vvQFeNkccPMQv7cJ6lzhjfFWLj9q4qM4?=
 =?iso-8859-1?Q?qdVb4hganb+BS27rJqRAlwt6jK3IvM4zNNlrZa4lAc+/H8oHwSKHzz2L5x?=
 =?iso-8859-1?Q?HoVWf7YTpWb8jpFmQwYFXfXxrO6tanAdD+g4d6kR16ciB/G/aJPzkpEIy3?=
 =?iso-8859-1?Q?styF+s6uYxUHIxN60jcp/FYX4kR/TYNcRHOgjgeE7UY4lqZUO/SNL60v9F?=
 =?iso-8859-1?Q?+7lNLOcghxW2O/RV0KSTWrn5ou2a4E8tl3T+p0GhCTJ+Z7ML4OEB0iiu2c?=
 =?iso-8859-1?Q?jChbGmj2azFj9/PsGqV5lTSTanXGUEN844C/pLVr4oeq9BuljlFECfpR06?=
 =?iso-8859-1?Q?/3dVHnBvK0yDhQqti73VlScC2QUgO0uW8n/fdsL2P8q/gQEKQ41hLUsYlS?=
 =?iso-8859-1?Q?AzEsHlXs+Bj7wipaN2b3o0NGWDkLkteLe1UjvffqKTPIxT78Tga4/sCLV/?=
 =?iso-8859-1?Q?TbJBLbp2v8dfMtVS1RP5lrgJOXRz7rAb//IBpLmDBfVZkvJtNV6xf78Mws?=
 =?iso-8859-1?Q?ROfW0IPPL5hj1F5fjlgLSG8H+fd52d2bM4RTBFEyPiqprqmQ2Sp/8QLgdz?=
 =?iso-8859-1?Q?BVWlrisjay3Im86w0HmKdirTpbObe9vfiIQvgMDIcdfbjsBRzmG2Fg+XWu?=
 =?iso-8859-1?Q?R39+DX7upucC3PBK4LkIUWN641A5lC/xA9CvcXUQgpzzeoJPaY0j9kMRwd?=
 =?iso-8859-1?Q?0lTcq7XKOsxeKdNpzPpDgNM83r5tFw0B4fFKxEx8aFeQGAp5eIhhnvDnJJ?=
 =?iso-8859-1?Q?ZIybHSCW0btd2dg1LfcnDFlPipuXWDjareUNul1sfFPwkitYExvfZMjs4e?=
 =?iso-8859-1?Q?jkXD0pdanhPAqFAUL4z0Si7WJY2ywg4zJbA7oBL1AFtCjE7vmMvnDUGg?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?iso-8859-1?Q?KTl9s5IIayzCD2e/3c0kTy6pw3E3iCn+19PReLg0/wfCEhthDIEg6CDn7a?=
 =?iso-8859-1?Q?hUCivVB7lgLOfTpzXy+OebvWh1e4kPKh3qdpt0iGxl8HmvVl8sbZ8s0Ac3?=
 =?iso-8859-1?Q?+X91yJNNapEtfPEVj3KcREVab3KxEaOkVqVhB9vTs4zSk4yCWVLn0iDzJp?=
 =?iso-8859-1?Q?vKrD2ApILXbakSXkFTJjCLVluFGIwqWLc/EIh2U5dJXPF/J8H3INU5ctGv?=
 =?iso-8859-1?Q?9USRvPvu7E3aQ9/TQenxs/NwUlH5z+iw/dAvAgxyiCgJd+Fr/DPlp4cf3Z?=
 =?iso-8859-1?Q?dUzHGlVpYfLdAaO4qFv4vHqGOADivBmjWts7XmMhZl1JDHbn/0dQN5J1r7?=
 =?iso-8859-1?Q?Bm0Fcu6vSwmW2PzXwWguglf4X7DhBIys0z2kN6J8R1n6nniabT3HeLbK07?=
 =?iso-8859-1?Q?mUuxYkt7ssQYohQDUVSdb9ec/PkaIj1ZtQuChcXyhOk+0iiKir5DtTvBeg?=
 =?iso-8859-1?Q?aU4Jx6RMk2GAPDHb/QdNzOe76cUGvwtxFQVMpAAk61V2m/UVlmJoA1O7n2?=
 =?iso-8859-1?Q?TF2KjA0JF5WbZ5qo+gLfXnMn3eeZOxSJ3VNje2g+nyCfzl3Ovuqc0hfA0F?=
 =?iso-8859-1?Q?eKF6BBDCoMl4x8a5BD2n873MLDINxAboLIdxbpPLHuug11BWrGfwzr5o7q?=
 =?iso-8859-1?Q?iOzJAi/MyjdtRfclHH37lNWAVSe8Pvda8zlyDPleEVxH5JsuN1ZJAIsmTo?=
 =?iso-8859-1?Q?MnGE4lxhevVGS+5+7hSXlvINqnILq4f/M5r6oZVzLh4LQlDr6E/iaeTj2Z?=
 =?iso-8859-1?Q?AYkCH82gsLymShoxt9k1YbgjQKaDUBC1b9Pfp+3E+JixSd435EgOPA5G+H?=
 =?iso-8859-1?Q?uRg572CSv5bM4pUa25iJzR0heRek9/qDNv0NVRkoh5J78M3beKJKhaSgqc?=
 =?iso-8859-1?Q?VKpwJZeVvKyTRbtefL9M5h1k0pYI7pPYDSo9GiT9XnSjpmxHoA1XAoatyC?=
 =?iso-8859-1?Q?1ANaKo0gZscwIMISq6fJ7D3RDXJmi/Cptcppo94bM8Juekt4zf5FL6TE13?=
 =?iso-8859-1?Q?MNc5NOp7ctE4JZJHKc/mvyuJbN/D//Ray0LhTn/bXG/rtT6m9SETCAL3hT?=
 =?iso-8859-1?Q?7BIZJXjVIbiN1zmYZ62JZTrhF7Mss/IP+iRLlcBD/UkX8ta5KXgY0A3Fig?=
 =?iso-8859-1?Q?au7c+zGDl4LXDinLhw2EaRbeSGk04aMCpDKgVfyAl6/Vkh4rIMbBXGgDYQ?=
 =?iso-8859-1?Q?mbrlN4ve8MoZE9J9erFBPh/a5WK5ozDYKlc=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8d683d13-f1fa-49f5-a729-08dacefcbf93
X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Nov 2022 15:50:16.7239
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 9bj9YD6/5B5sBBJpSBVZDGkkxvgNAyAuxg6q7PF9U/ry0xRJv8gkIbGKsTKWCGzh+3jZnpZpMUiY13NNnY8I5g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR10MB5827
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-11-25_07,2022-11-25_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 phishscore=0
 adultscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000
 definitions=main-2211250124
X-Proofpoint-ORIG-GUID: LhRgk31jUpRjtolzSMN5IWTSs-A-cffT
X-Proofpoint-GUID: LhRgk31jUpRjtolzSMN5IWTSs-A-cffT
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Rename the fallthrough attribute to better align with the kernel
version.  Copy the definition from include/linux/compiler_attributes.h
including the #else clause.  Adding the #else clause allows the tools
compiler.h header to drop the check for a definition entirely and keeps
both definitions together.

Change any __fallthrough statements to fallthrough anywhere it was used
within perf.

This allows other tools to use the same key word as the kernel.

Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Tom Rix <trix@redhat.com>
Signed-off-by: Liam Howlett <Liam.Howlett@oracle.com>
---
 tools/include/linux/compiler-gcc.h                      | 6 ++++--
 tools/include/linux/compiler.h                          | 4 ----
 tools/perf/builtin-probe.c                              | 2 +-
 tools/perf/builtin-stat.c                               | 2 +-
 tools/perf/builtin-top.c                                | 2 +-
 tools/perf/util/callchain.c                             | 4 ++--
 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c     | 6 +++---
 tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c | 2 +-
 tools/perf/util/ordered-events.c                        | 2 +-
 tools/perf/util/strfilter.c                             | 2 +-
 tools/perf/util/string.c                                | 2 +-
 11 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/tools/include/linux/compiler-gcc.h b/tools/include/linux/compi=
ler-gcc.h
index 8816f06fc6c7..62e7c901ac28 100644
--- a/tools/include/linux/compiler-gcc.h
+++ b/tools/include/linux/compiler-gcc.h
@@ -12,8 +12,10 @@
 		     + __GNUC_PATCHLEVEL__)
 #endif
=20
-#if GCC_VERSION >=3D 70000 && !defined(__CHECKER__)
-# define __fallthrough __attribute__ ((fallthrough))
+#if __has_attribute(__fallthrough__)
+# define fallthrough                    __attribute__((__fallthrough__))
+#else
+# define fallthrough                    do {} while (0)  /* fallthrough */
 #endif
=20
 #if __has_attribute(__error__)
diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.=
h
index 90ba44a99199..9d36c8ce1fe7 100644
--- a/tools/include/linux/compiler.h
+++ b/tools/include/linux/compiler.h
@@ -186,10 +186,6 @@ static __always_inline void __write_once_size(volatile=
 void *p, void *res, int s
 })
=20
=20
-#ifndef __fallthrough
-# define __fallthrough
-#endif
-
 /* Indirect macros required for expanded argument pasting, eg. __LINE__. *=
/
 #define ___PASTE(a, b) a##b
 #define __PASTE(a, b) ___PASTE(a, b)
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index f62298f5db3b..8539843d1909 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -706,7 +706,7 @@ __cmd_probe(int argc, const char **argv)
 			pr_err("  Error: --bootconfig doesn't support uprobes.\n");
 			return -EINVAL;
 		}
-		__fallthrough;
+		fallthrough;
 	case 'a':
=20
 		/* Ensure the last given target is used */
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 265b05157972..19b0278d496c 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -616,7 +616,7 @@ static void process_evlist(struct evlist *evlist, unsig=
ned int interval)
 	if (evlist__ctlfd_process(evlist, &cmd) > 0) {
 		switch (cmd) {
 		case EVLIST_CTL_CMD_ENABLE:
-			__fallthrough;
+			fallthrough;
 		case EVLIST_CTL_CMD_DISABLE:
 			if (interval)
 				process_interval();
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 4b3ff7687236..cfe1cde35528 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -707,7 +707,7 @@ static void *display_thread(void *arg)
 		case -1:
 			if (errno =3D=3D EINTR)
 				continue;
-			__fallthrough;
+			fallthrough;
 		default:
 			c =3D getc(stdin);
 			tcsetattr(0, TCSAFLUSH, &save);
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index a093a15f048f..588f86a84eaa 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -724,7 +724,7 @@ static enum match_result match_chain(struct callchain_c=
ursor_node *node,
 		if (match !=3D MATCH_ERROR)
 			break;
 		/* otherwise fall-back to symbol-based comparison below */
-		__fallthrough;
+		fallthrough;
 	case CCKEY_FUNCTION:
 		if (node->ms.sym && cnode->ms.sym) {
 			/*
@@ -745,7 +745,7 @@ static enum match_result match_chain(struct callchain_c=
ursor_node *node,
 			}
 		}
 		/* otherwise fall-back to IP-based comparison below */
-		__fallthrough;
+		fallthrough;
 	case CCKEY_ADDRESS:
 	default:
 		match =3D match_chain_dso_addresses(cnode->ms.map, cnode->ip, node->ms.m=
ap, node->ip);
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/pe=
rf/util/intel-pt-decoder/intel-pt-decoder.c
index 0ac860c8dd2b..57dea8074777 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -3544,7 +3544,7 @@ static int intel_pt_walk_psb(struct intel_pt_decoder =
*decoder)
 		switch (decoder->packet.type) {
 		case INTEL_PT_TIP_PGD:
 			decoder->continuous_period =3D false;
-			__fallthrough;
+			fallthrough;
 		case INTEL_PT_TIP_PGE:
 		case INTEL_PT_TIP:
 		case INTEL_PT_PTWRITE:
@@ -3614,7 +3614,7 @@ static int intel_pt_walk_psb(struct intel_pt_decoder =
*decoder)
 			decoder->pge =3D false;
 			decoder->continuous_period =3D false;
 			intel_pt_clear_tx_flags(decoder);
-			__fallthrough;
+			fallthrough;
=20
 		case INTEL_PT_TNT:
 			decoder->have_tma =3D false;
@@ -3978,7 +3978,7 @@ const struct intel_pt_state *intel_pt_decode(struct i=
ntel_pt_decoder *decoder)
 			decoder->have_last_ip =3D false;
 			decoder->last_ip =3D 0;
 			decoder->ip =3D 0;
-			__fallthrough;
+			fallthrough;
 		case INTEL_PT_STATE_ERR_RESYNC:
 			err =3D intel_pt_sync_ip(decoder);
 			break;
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c b/tool=
s/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
index 18f97f43e01a..af9710622a1f 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
@@ -730,7 +730,7 @@ int intel_pt_pkt_desc(const struct intel_pt_pkt *packet=
, char *buf,
 	case INTEL_PT_FUP:
 		if (!(packet->count))
 			return snprintf(buf, buf_len, "%s no ip", name);
-		__fallthrough;
+		fallthrough;
 	case INTEL_PT_CYC:
 	case INTEL_PT_VMCS:
 	case INTEL_PT_MTC:
diff --git a/tools/perf/util/ordered-events.c b/tools/perf/util/ordered-eve=
nts.c
index b887dfeea673..8c62611f10aa 100644
--- a/tools/perf/util/ordered-events.c
+++ b/tools/perf/util/ordered-events.c
@@ -284,7 +284,7 @@ static int __ordered_events__flush(struct ordered_event=
s *oe, enum oe_flush how,
 	switch (how) {
 	case OE_FLUSH__FINAL:
 		show_progress =3D true;
-		__fallthrough;
+		fallthrough;
 	case OE_FLUSH__TOP:
 		oe->next_flush =3D ULLONG_MAX;
 		break;
diff --git a/tools/perf/util/strfilter.c b/tools/perf/util/strfilter.c
index 78aa4c3b990d..02807b9d4122 100644
--- a/tools/perf/util/strfilter.c
+++ b/tools/perf/util/strfilter.c
@@ -274,7 +274,7 @@ static int strfilter_node__sprint(struct strfilter_node=
 *node, char *buf)
 		len =3D strfilter_node__sprint_pt(node->l, buf);
 		if (len < 0)
 			return len;
-		__fallthrough;
+		fallthrough;
 	case '!':
 		if (buf) {
 			*(buf + len++) =3D *node->p;
diff --git a/tools/perf/util/string.c b/tools/perf/util/string.c
index 4f12a96f33cc..cf05b0b56c57 100644
--- a/tools/perf/util/string.c
+++ b/tools/perf/util/string.c
@@ -35,7 +35,7 @@ s64 perf_atoll(const char *str)
 			if (*p)
 				goto out_err;
=20
-			__fallthrough;
+			fallthrough;
 		case '\0':
 			return length;
 		default:
--=20
2.35.1