Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'perf-tools-fixes-for-v5.18-2022-05-14' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
Pull perf tools fixes from Arnaldo Carvalho de Melo:
- Fix two NDEBUG warnings in 'perf bench numa'
- Fix ARM coresight `perf test` failure
- Sync linux/kvm.h with the kernel sources
- Add James and Mike as Arm64 performance events reviewers
* tag 'perf-tools-fixes-for-v5.18-2022-05-14' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
MAINTAINERS: Add James and Mike as Arm64 performance events reviewers
tools headers UAPI: Sync linux/kvm.h with the kernel sources
perf tests: Fix coresight `perf test` failure.
perf bench: Fix two numa NDEBUG warnings
+13
-3
+2
-1
MAINTAINERS
+2
-1
MAINTAINERS
···
15477
15477
PERFORMANCE EVENTS TOOLING ARM64
15478
15478
R: John Garry <john.garry@huawei.com>
15479
15479
R: Will Deacon <will@kernel.org>
15480
-
R: Mathieu Poirier <mathieu.poirier@linaro.org>
15480
+
R: James Clark <james.clark@arm.com>
15481
+
R: Mike Leach <mike.leach@linaro.org>
15481
15482
R: Leo Yan <leo.yan@linaro.org>
15482
15483
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
15483
15484
S: Supported
+9
-1
tools/include/uapi/linux/kvm.h
+9
-1
tools/include/uapi/linux/kvm.h
···
445
445
#define KVM_SYSTEM_EVENT_RESET 2
446
446
#define KVM_SYSTEM_EVENT_CRASH 3
447
447
__u32 type;
448
-
__u64 flags;
448
+
__u32 ndata;
449
+
union {
450
+
#ifndef __KERNEL__
451
+
__u64 flags;
452
+
#endif
453
+
__u64 data[16];
454
+
};
449
455
} system_event;
450
456
/* KVM_EXIT_S390_STSI */
451
457
struct {
···
1150
1144
#define KVM_CAP_S390_MEM_OP_EXTENSION 211
1151
1145
#define KVM_CAP_PMU_CAPABILITY 212
1152
1146
#define KVM_CAP_DISABLE_QUIRKS2 213
1147
+
/* #define KVM_CAP_VM_TSC_CONTROL 214 */
1148
+
#define KVM_CAP_SYSTEM_EVENT_DATA 215
1153
1149
1154
1150
#ifdef KVM_CAP_IRQ_ROUTING
1155
1151
+2
tools/perf/bench/numa.c
+2
tools/perf/bench/numa.c
···
311
311
312
312
/* BUG_ON due to failure in allocation of orig_mask/mask */
313
313
BUG_ON(-1);
314
+
return NULL;
314
315
}
315
316
316
317
static cpu_set_t *bind_to_node(int target_node)
···
365
364
366
365
/* BUG_ON due to failure in allocation of orig_mask/mask */
367
366
BUG_ON(-1);
367
+
return NULL;
368
368
}
369
369
370
370
static void bind_to_cpumask(cpu_set_t *mask)