From patchwork Sun Mar 10 02:05:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13588005 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 9DB493A8C3 for ; Sun, 10 Mar 2024 02:06:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710036371; cv=none; b=ZwmDk/WTwBrN5iVsdfVzDmCQVMVrHhX/xWlJJGEoubfzQ9TPxhh0XTXuIO+DJPNbcKv+4ENx29ys26cH4JmISwGx1bAsEPpxdFYiwhforKnnDOReI+Pp3X44/KlovX4ue8RKv/we81Z46ifSLpOLtNdGdpZpisZaENCWXbEB2bY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710036371; c=relaxed/simple; bh=qvu80I2tuIwczv3ewDN5Kf8bkfHfC9IP72lON4Zzmek=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=VT7NWlrOgMRRyEIYHmBjhoKmys+d3JoK8+6ZBovyl1cMqMJybg5qPeEoygb+gwjNTXUD+U/2VNVInC7xe/FJAWlrl4O3PRvxsZi/1d6qRSsPPvky6dpgiyiVYr/ubIim/lJuIGGmLgpRvPNA6THJ47sytblDDXmgQ+iSmpdTZM0= 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=hV39oof8; arc=none smtp.client-ip=209.85.219.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="hV39oof8" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc647f65573so5995155276.2 for ; Sat, 09 Mar 2024 18:06:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1710036365; x=1710641165; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=z2TI3BR52BOETJMkXQVYiCvqxjFYb61EnnuV6r2EGgU=; b=hV39oof8n6gQYhpoRdQBNKXrF9luve4Gjjy1Iibfj18oWaFulJIcW/K0a+36t6prcz c2TirRz8836CT+nuHJYaKfcP8O3elPqWrHmJdhPhrYbIebqJVgH2tC4zE2I3VeLdlg23 ihbhVIuMkt4Fo+motqOpBgLeIqMlgh6bVwkPGzIwr78rsxBOM839rKLVNIweb/bB37oC bee/hJw0Psd6q4+giekuPYhNzCCyOGVouxE66vuCTKa3h+WcMmDafItdyLDBzhIC+mvw yus2gBGtfrawoxBl/bS0bvetjFoluac4zdUvlbymAVId8gCuS3ZZ+LOeQ0GGcBYxc1wG mt4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710036365; x=1710641165; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=z2TI3BR52BOETJMkXQVYiCvqxjFYb61EnnuV6r2EGgU=; b=GXIG5uzLFE3JPqaMTa5mAx6IlF0y0LN1gZyhWubAH0FF9tp89YogjN6MNmuGmQOkmf K1p4xO+yjp5EhZ0WUilVFEGLugOB7jVlFKgnMBPepD7EzRPn55AwhJcs+GGc8deO3MOx 6bU/57CRNh4e94QTqN2bFANGKA4EwKSog+5BCKQYWTepvkmtOpfjSQ0bHGxI7EEJd3Rd q/3Q9qhvka9CeXsZYut5zFZs39U+zPMU3iotkax6RXYmeeDZuQVNrVF3p2hsspmFlIM8 Ou0cA+Va8CLsXYdwu9EUqxs22SO0PwabhCiYsua/IFfeINMlWDrUAwi5/OPr66cBC2Rp L37w== X-Forwarded-Encrypted: i=1; AJvYcCVV+RhFZuuChr4csnOgSMrKswrCmQHLYHbDbZAaYfSZ3p7noJxxJZ3EkHyKzswi09NN2TSxd0EMbpckhIejQYYmV5oHw02bWT8tkWI3Kn1Q X-Gm-Message-State: AOJu0YzrJJ6m67bsgzE/53lArVXFoC6zKKFVRRVdtpzAmmTEUSJMYBEh zWT8UYGWgOE+ybN2UJcFYMCXo3tOV5rUR61cAahXq2fOIEujXA95b/DdcTsMi+CciDktEhvJy9V ek0Zf0Q== X-Google-Smtp-Source: AGHT+IHg84e8jFIAgnoZrRiN8Pu+L19uE2B6rig+tSx4eREFwobOlwuHge4FvzAmOSQKYE9pLZGbcXyYmOgE X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:a63d:1b65:e810:3ad3]) (user=irogers job=sendgmr) by 2002:a05:6902:18c9:b0:dc6:fec4:1c26 with SMTP id ck9-20020a05690218c900b00dc6fec41c26mr897542ybb.1.1710036365375; Sat, 09 Mar 2024 18:06:05 -0800 (PST) Date: Sat, 9 Mar 2024 18:05:08 -0800 In-Reply-To: <20240310020509.647319-1-irogers@google.com> Message-Id: <20240310020509.647319-14-irogers@google.com> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240310020509.647319-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v1 13/13] tools headers: Rename noinline to __noinline From: Ian Rogers To: Arnd Bergmann , Andrii Nakryiko , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Ian Rogers , Adrian Hunter , Paolo Bonzini , Shuah Khan , Kees Cook , "Gustavo A. R. Silva" , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Andrew Morton , Liam Howlett , Miguel Ojeda , Will Deacon , Mark Brown , David Laight , "Michael S. Tsirkin" , Shunsuke Mie , Yafang Shao , Kui-Feng Lee , James Clark , Nick Forrington , Leo Yan , German Gomez , Rob Herring , John Garry , Sean Christopherson , Anup Patel , Fuad Tabba , Andrew Jones , Chao Peng , Haibo Xu , Peter Xu , Vishal Annapurve , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-hardening@vger.kernel.org, llvm@lists.linux.dev Cc: Christopher Di Bella An issue was reported with clang and llvm libc where the noinline attribute [1] was being expanded due to the #define in linux/compiler.h (now in compiler_attributes.h). The expansion caused the __attribute__ to appear twice and break the build. To avoid this conflict, rename noinline to __noinline which is more consistent with other compiler attributes. [1] https://clang.llvm.org/docs/AttributeReference.html#noinline Reported-by: Christopher Di Bella Signed-off-by: Ian Rogers Acked-by: Nick Desaulniers --- tools/include/linux/compiler_attributes.h | 4 ++-- tools/perf/arch/x86/tests/bp-modify.c | 4 ++-- tools/perf/bench/find-bit-bench.c | 2 +- tools/perf/tests/bp_account.c | 2 +- tools/perf/tests/bp_signal.c | 2 +- tools/perf/tests/bp_signal_overflow.c | 2 +- tools/perf/tests/dwarf-unwind.c | 12 ++++++------ tools/perf/tests/workloads/leafloop.c | 8 ++++---- tools/perf/tests/workloads/thloop.c | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/include/linux/compiler_attributes.h b/tools/include/linux/compiler_attributes.h index 9bfaec783e48..1ff3d85f5af3 100644 --- a/tools/include/linux/compiler_attributes.h +++ b/tools/include/linux/compiler_attributes.h @@ -267,12 +267,12 @@ # define __flatten __attribute__((flatten)) /* - * Note the missing underscores. + * Note, the kernel version is missing the underscores. * * gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-noinline-function-attribute * clang: mentioned */ -#define noinline __attribute__((__noinline__)) +#define __noinline __attribute__((__noinline__)) /* * Optional: only supported since gcc >= 8 diff --git a/tools/perf/arch/x86/tests/bp-modify.c b/tools/perf/arch/x86/tests/bp-modify.c index 0924ccd9e36d..65493ff7a76f 100644 --- a/tools/perf/arch/x86/tests/bp-modify.c +++ b/tools/perf/arch/x86/tests/bp-modify.c @@ -15,13 +15,13 @@ #include "tests/tests.h" #include "arch-tests.h" -static noinline int bp_1(void) +static __noinline int bp_1(void) { pr_debug("in %s\n", __func__); return 0; } -static noinline int bp_2(void) +static __noinline int bp_2(void) { pr_debug("in %s\n", __func__); return 0; diff --git a/tools/perf/bench/find-bit-bench.c b/tools/perf/bench/find-bit-bench.c index 7e25b0e413f6..dd97a51649bc 100644 --- a/tools/perf/bench/find-bit-bench.c +++ b/tools/perf/bench/find-bit-bench.c @@ -31,7 +31,7 @@ static const char *const bench_usage[] = { static unsigned int accumulator; static unsigned int use_of_val; -static noinline void workload(int val) +static __noinline void workload(int val) { use_of_val += val; accumulator++; diff --git a/tools/perf/tests/bp_account.c b/tools/perf/tests/bp_account.c index 6f921db33cf9..459f61752a71 100644 --- a/tools/perf/tests/bp_account.c +++ b/tools/perf/tests/bp_account.c @@ -34,7 +34,7 @@ static volatile long the_var; -static noinline int test_function(void) +static __noinline int test_function(void) { return 0; } diff --git a/tools/perf/tests/bp_signal.c b/tools/perf/tests/bp_signal.c index 1f2908f02389..484a7e7f96ee 100644 --- a/tools/perf/tests/bp_signal.c +++ b/tools/perf/tests/bp_signal.c @@ -59,7 +59,7 @@ static void __test_function(volatile long *ptr) } #endif -static noinline int test_function(void) +static __noinline int test_function(void) { __test_function(&the_var); the_var++; diff --git a/tools/perf/tests/bp_signal_overflow.c b/tools/perf/tests/bp_signal_overflow.c index 4e897c2cf26b..9436bf2973f8 100644 --- a/tools/perf/tests/bp_signal_overflow.c +++ b/tools/perf/tests/bp_signal_overflow.c @@ -30,7 +30,7 @@ static int overflows; -static noinline int test_function(void) +static __noinline int test_function(void) { return time(NULL); } diff --git a/tools/perf/tests/dwarf-unwind.c b/tools/perf/tests/dwarf-unwind.c index d01aa931fe81..a669c69a9242 100644 --- a/tools/perf/tests/dwarf-unwind.c +++ b/tools/perf/tests/dwarf-unwind.c @@ -109,7 +109,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) return strcmp((const char *) symbol, funcs[idx]); } -NO_TAIL_CALL_ATTRIBUTE noinline int test_dwarf_unwind__thread(struct thread *thread) +NO_TAIL_CALL_ATTRIBUTE __noinline int test_dwarf_unwind__thread(struct thread *thread) { struct perf_sample sample; unsigned long cnt = 0; @@ -140,7 +140,7 @@ NO_TAIL_CALL_ATTRIBUTE noinline int test_dwarf_unwind__thread(struct thread *thr static int global_unwind_retval = -INT_MAX; -NO_TAIL_CALL_ATTRIBUTE noinline int test_dwarf_unwind__compare(void *p1, void *p2) +NO_TAIL_CALL_ATTRIBUTE __noinline int test_dwarf_unwind__compare(void *p1, void *p2) { /* Any possible value should be 'thread' */ struct thread *thread = *(struct thread **)p1; @@ -159,7 +159,7 @@ NO_TAIL_CALL_ATTRIBUTE noinline int test_dwarf_unwind__compare(void *p1, void *p return p1 - p2; } -NO_TAIL_CALL_ATTRIBUTE noinline int test_dwarf_unwind__krava_3(struct thread *thread) +NO_TAIL_CALL_ATTRIBUTE __noinline int test_dwarf_unwind__krava_3(struct thread *thread) { struct thread *array[2] = {thread, thread}; void *fp = &bsearch; @@ -178,7 +178,7 @@ NO_TAIL_CALL_ATTRIBUTE noinline int test_dwarf_unwind__krava_3(struct thread *th return global_unwind_retval; } -NO_TAIL_CALL_ATTRIBUTE noinline int test_dwarf_unwind__krava_2(struct thread *thread) +NO_TAIL_CALL_ATTRIBUTE __noinline int test_dwarf_unwind__krava_2(struct thread *thread) { int ret; @@ -187,7 +187,7 @@ NO_TAIL_CALL_ATTRIBUTE noinline int test_dwarf_unwind__krava_2(struct thread *th return ret; } -NO_TAIL_CALL_ATTRIBUTE noinline int test_dwarf_unwind__krava_1(struct thread *thread) +NO_TAIL_CALL_ATTRIBUTE __noinline int test_dwarf_unwind__krava_1(struct thread *thread) { int ret; @@ -196,7 +196,7 @@ NO_TAIL_CALL_ATTRIBUTE noinline int test_dwarf_unwind__krava_1(struct thread *th return ret; } -noinline int test__dwarf_unwind(struct test_suite *test __maybe_unused, +__noinline int test__dwarf_unwind(struct test_suite *test __maybe_unused, int subtest __maybe_unused) { struct machine *machine; diff --git a/tools/perf/tests/workloads/leafloop.c b/tools/perf/tests/workloads/leafloop.c index 1bf5cc97649b..89d2cec2f461 100644 --- a/tools/perf/tests/workloads/leafloop.c +++ b/tools/perf/tests/workloads/leafloop.c @@ -4,18 +4,18 @@ #include "../tests.h" /* We want to check these symbols in perf script */ -noinline void leaf(volatile int b); -noinline void parent(volatile int b); +__noinline void leaf(volatile int b); +__noinline void parent(volatile int b); static volatile int a; -noinline void leaf(volatile int b) +__noinline void leaf(volatile int b) { for (;;) a += b; } -noinline void parent(volatile int b) +__noinline void parent(volatile int b) { leaf(b); } diff --git a/tools/perf/tests/workloads/thloop.c b/tools/perf/tests/workloads/thloop.c index 457b29f91c3e..e252efb76203 100644 --- a/tools/perf/tests/workloads/thloop.c +++ b/tools/perf/tests/workloads/thloop.c @@ -9,14 +9,14 @@ static volatile sig_atomic_t done; /* We want to check this symbol in perf report */ -noinline void test_loop(void); +__noinline void test_loop(void); static void sighandler(int sig __maybe_unused) { done = 1; } -noinline void test_loop(void) +__noinline void test_loop(void) { while (!done); }