mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-03-03 18:28:01 +01:00
1c85c94b37
Namhyung Kim reported:
I've updated the perf-tools-next to v6.16-rc1 and found a build error
like below on alpine linux 3.18.
In file included from bench/futex.c:6:
/usr/include/sys/prctl.h:88:8: error: redefinition of 'struct prctl_mm_map'
88 | struct prctl_mm_map {
| ^~~~~~~~~~~~
In file included from bench/futex.c:5:
/linux/tools/include/uapi/linux/prctl.h:134:8: note: originally defined here
134 | struct prctl_mm_map {
| ^~~~~~~~~~~~
make[4]: *** [/linux/tools/build/Makefile.build:86: /build/bench/futex.o] Error 1
git bisect says it's the first commit introduced the failure.
So both /usr/include/sys/prctl.h and /linux/tools/include/uapi/linux/prctl.h
provide struct prctl_mm_map but their include guard must be different.
/usr/include/sys/prctl.h provided by glibc contains the
prctl() declaration. It includes also linux/prctl.h.
The /usr/include/sys/prctl.h on alpine linux is different. This is
probably coming from musl. It contains the PR_* definition and the
prctl() declaration. So it clashes here because now the one struct is
available twice.
The man page for prctl(2) says:
| #include <linux/prctl.h> /* Definition of PR_* constants */
| #include <sys/prctl.h>
so musl doesn't follow this.
So don't include linux/prctl.h explicitely and add some new defines
needed if they aren't available.
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reported-by: Namhyung Kim <namhyung@kernel.org>
Closes: https://lore.kernel.org/r/20250611092542.F4ooE2FL@linutronix.de
Link: https://www.openwall.com/lists/musl/2025/06/12/11
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
75 lines
2.1 KiB
C
75 lines
2.1 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <err.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <sys/prctl.h>
|
|
|
|
#include "futex.h"
|
|
|
|
#ifndef PR_FUTEX_HASH
|
|
#define PR_FUTEX_HASH 78
|
|
# define PR_FUTEX_HASH_SET_SLOTS 1
|
|
# define FH_FLAG_IMMUTABLE (1ULL << 0)
|
|
# define PR_FUTEX_HASH_GET_SLOTS 2
|
|
# define PR_FUTEX_HASH_GET_IMMUTABLE 3
|
|
#endif // PR_FUTEX_HASH
|
|
|
|
void futex_set_nbuckets_param(struct bench_futex_parameters *params)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
if (params->nbuckets < 0)
|
|
return;
|
|
|
|
flags = params->buckets_immutable ? FH_FLAG_IMMUTABLE : 0;
|
|
ret = prctl(PR_FUTEX_HASH, PR_FUTEX_HASH_SET_SLOTS, params->nbuckets, flags);
|
|
if (ret) {
|
|
printf("Requesting %d hash buckets failed: %d/%m\n",
|
|
params->nbuckets, ret);
|
|
err(EXIT_FAILURE, "prctl(PR_FUTEX_HASH)");
|
|
}
|
|
}
|
|
|
|
void futex_print_nbuckets(struct bench_futex_parameters *params)
|
|
{
|
|
char *futex_hash_mode;
|
|
int ret;
|
|
|
|
ret = prctl(PR_FUTEX_HASH, PR_FUTEX_HASH_GET_SLOTS);
|
|
if (params->nbuckets >= 0) {
|
|
if (ret != params->nbuckets) {
|
|
if (ret < 0) {
|
|
printf("Can't query number of buckets: %m\n");
|
|
err(EXIT_FAILURE, "prctl(PR_FUTEX_HASH)");
|
|
}
|
|
printf("Requested number of hash buckets does not currently used.\n");
|
|
printf("Requested: %d in usage: %d\n", params->nbuckets, ret);
|
|
err(EXIT_FAILURE, "prctl(PR_FUTEX_HASH)");
|
|
}
|
|
if (params->nbuckets == 0) {
|
|
ret = asprintf(&futex_hash_mode, "Futex hashing: global hash");
|
|
} else {
|
|
ret = prctl(PR_FUTEX_HASH, PR_FUTEX_HASH_GET_IMMUTABLE);
|
|
if (ret < 0) {
|
|
printf("Can't check if the hash is immutable: %m\n");
|
|
err(EXIT_FAILURE, "prctl(PR_FUTEX_HASH)");
|
|
}
|
|
ret = asprintf(&futex_hash_mode, "Futex hashing: %d hash buckets %s",
|
|
params->nbuckets,
|
|
ret == 1 ? "(immutable)" : "");
|
|
}
|
|
} else {
|
|
if (ret <= 0) {
|
|
ret = asprintf(&futex_hash_mode, "Futex hashing: global hash");
|
|
} else {
|
|
ret = asprintf(&futex_hash_mode, "Futex hashing: auto resized to %d buckets",
|
|
ret);
|
|
}
|
|
}
|
|
if (ret < 0)
|
|
err(EXIT_FAILURE, "ENOMEM, futex_hash_mode");
|
|
printf("%s\n", futex_hash_mode);
|
|
free(futex_hash_mode);
|
|
}
|