mirror of
https://github.com/torvalds/linux.git
synced 2026-04-28 11:32:28 -04:00
GCC 16 has changed the semantics of -Wunused-but-set-variable, as well
as introducing new options -Wunused-but-set-variable={0,1,2,3} to
adjust the level of support.
One of the changes is that GCC now treats 'sum += 1' and 'sum++' as
non-usage, whereas clang (and GCC < 16) considers the first as usage
and the second as non-usage, which is sort of inconsistent.
The GCC 16 -Wunused-but-set-variable=2 option implements the previous
semantics of -Wunused-but-set-variable, but since it is a new option,
it cannot be used unconditionally for forward-compatibility, just for
backwards-compatibility.
So this patch adds pragmas to the two self-tests impacted by this,
progs/free_timer.c and progs/rcu_read_lock.c, to make gcc to ignore
-Wunused-but-set-variable warnings when compiling them with GCC > 15.
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=44677#c25 for details
on why this regression got introduced in GCC upstream.
Signed-off-by: Jose E. Marchesi <jose.marchesi@oracle.com>
Cc: david.faust@oracle.com
Cc: cupertino.miranda@oracle.com
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Yonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/r/20260106173650.18191-2-jose.marchesi@oracle.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
82 lines
1.8 KiB
C
82 lines
1.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* Copyright (C) 2025. Huawei Technologies Co., Ltd */
|
|
#include <linux/bpf.h>
|
|
#include <time.h>
|
|
#include <bpf/bpf_tracing.h>
|
|
#include <bpf/bpf_helpers.h>
|
|
|
|
#define MAX_ENTRIES 8
|
|
|
|
/* clang considers 'sum += 1' as usage but 'sum++' as non-usage. GCC
|
|
* is more consistent and considers both 'sum += 1' and 'sum++' as
|
|
* non-usage. This triggers warnings in the functions below.
|
|
*
|
|
* Starting with GCC 16 -Wunused-but-set-variable=2 can be used to
|
|
* mimic clang's behavior. */
|
|
#if !defined(__clang__) && __GNUC__ > 15
|
|
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
|
|
#endif
|
|
|
|
struct map_value {
|
|
struct bpf_timer timer;
|
|
};
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_HASH);
|
|
__type(key, int);
|
|
__type(value, struct map_value);
|
|
__uint(max_entries, MAX_ENTRIES);
|
|
} map SEC(".maps");
|
|
|
|
static int timer_cb(void *map, void *key, struct map_value *value)
|
|
{
|
|
volatile int sum = 0;
|
|
int i;
|
|
|
|
bpf_for(i, 0, 1024 * 1024) sum += i;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int start_cb(int key)
|
|
{
|
|
struct map_value *value;
|
|
|
|
value = bpf_map_lookup_elem(&map, (void *)&key);
|
|
if (!value)
|
|
return 0;
|
|
|
|
bpf_timer_init(&value->timer, &map, CLOCK_MONOTONIC);
|
|
bpf_timer_set_callback(&value->timer, timer_cb);
|
|
/* Hope 100us will be enough to wake-up and run the overwrite thread */
|
|
bpf_timer_start(&value->timer, 100000, BPF_F_TIMER_CPU_PIN);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int overwrite_cb(int key)
|
|
{
|
|
struct map_value zero = {};
|
|
|
|
/* Free the timer which may run on other CPU */
|
|
bpf_map_update_elem(&map, (void *)&key, &zero, BPF_ANY);
|
|
|
|
return 0;
|
|
}
|
|
|
|
SEC("syscall")
|
|
int BPF_PROG(start_timer)
|
|
{
|
|
bpf_loop(MAX_ENTRIES, start_cb, NULL, 0);
|
|
return 0;
|
|
}
|
|
|
|
SEC("syscall")
|
|
int BPF_PROG(overwrite_timer)
|
|
{
|
|
bpf_loop(MAX_ENTRIES, overwrite_cb, NULL, 0);
|
|
return 0;
|
|
}
|
|
|
|
char _license[] SEC("license") = "GPL";
|