Skip to content

Commit c0be92b

Browse files
torvaldstorvalds
committed
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "Mostly tooling fixes, but also breakpoint and x86 PMU driver fixes" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits) perf tools: Fix maps__find_symbol_by_name() tools headers uapi: Update tools's copy of linux/if_link.h tools headers uapi: Update tools's copy of linux/vhost.h tools headers uapi: Update tools's copies of kvm headers tools headers uapi: Update tools's copy of drm/drm.h tools headers uapi: Update tools's copy of asm-generic/unistd.h tools headers uapi: Update tools's copy of linux/perf_event.h perf/core: Force USER_DS when recording user stack data perf/UAPI: Clearly mark __PERF_SAMPLE_CALLCHAIN_EARLY as internal use perf/x86/intel: Add support/quirk for the MISPREDICT bit on Knights Landing CPUs perf annotate: Fix parsing aarch64 branch instructions after objdump update perf probe powerpc: Ignore SyS symbols irrespective of endianness perf event-parse: Use fixed size string for comms perf util: Fix bad memory access in trace info. perf tools: Streamline bpf examples and headers installation perf evsel: Fix potential null pointer dereference in perf_evsel__new_idx() perf arm64: Fix include path for asm-generic/unistd.h perf/hw_breakpoint: Simplify breakpoint enable in perf_event_modify_breakpoint perf/hw_breakpoint: Enable breakpoint in modify_user_hw_breakpoint perf/hw_breakpoint: Remove superfluous bp->attr.disabled = 0 ...
2 parents ca062f8 + cb48b6a commit c0be92b

File tree

28 files changed

+423
-43
lines changed

28 files changed

+423
-43
lines changed

‎arch/x86/events/intel/lbr.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,4 +1272,8 @@ void intel_pmu_lbr_init_knl(void)
12721272

12731273
x86_pmu.lbr_sel_mask = LBR_SEL_MASK;
12741274
x86_pmu.lbr_sel_map = snb_lbr_sel_map;
1275+
1276+
/* Knights Landing does have MISPREDICT bit */
1277+
if (x86_pmu.intel_cap.lbr_format == LBR_FORMAT_LIP)
1278+
x86_pmu.intel_cap.lbr_format = LBR_FORMAT_EIP_FLAGS;
12751279
}

‎include/uapi/linux/perf_event.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ enum perf_event_sample_format {
144144

145145
PERF_SAMPLE_MAX = 1U << 20, /* non-ABI */
146146

147-
__PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63,
147+
__PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */
148148
};
149149

150150
/*

‎kernel/events/core.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2867,16 +2867,11 @@ static int perf_event_modify_breakpoint(struct perf_event *bp,
28672867
_perf_event_disable(bp);
28682868

28692869
err = modify_user_hw_breakpoint_check(bp, attr, true);
2870-
if (err) {
2871-
if (!bp->attr.disabled)
2872-
_perf_event_enable(bp);
28732870

2874-
return err;
2875-
}
2876-
2877-
if (!attr->disabled)
2871+
if (!bp->attr.disabled)
28782872
_perf_event_enable(bp);
2879-
return 0;
2873+
2874+
return err;
28802875
}
28812876

28822877
static int perf_event_modify_attr(struct perf_event *event,
@@ -5948,6 +5943,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
59485943
unsigned long sp;
59495944
unsigned int rem;
59505945
u64 dyn_size;
5946+
mm_segment_t fs;
59515947

59525948
/*
59535949
* We dump:
@@ -5965,7 +5961,10 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
59655961

59665962
/* Data. */
59675963
sp = perf_user_stack_pointer(regs);
5964+
fs = get_fs();
5965+
set_fs(USER_DS);
59685966
rem = __output_copy_user(handle, (void *) sp, dump_size);
5967+
set_fs(fs);
59695968
dyn_size = dump_size - rem;
59705969

59715970
perf_output_skip(handle, rem);

‎kernel/events/hw_breakpoint.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,8 @@ modify_user_hw_breakpoint_check(struct perf_event *bp, struct perf_event_attr *a
509509
*/
510510
int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr)
511511
{
512+
int err;
513+
512514
/*
513515
* modify_user_hw_breakpoint can be invoked with IRQs disabled and hence it
514516
* will not be possible to raise IPIs that invoke __perf_event_disable.
@@ -520,15 +522,12 @@ int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *att
520522
else
521523
perf_event_disable(bp);
522524

523-
if (!attr->disabled) {
524-
int err = modify_user_hw_breakpoint_check(bp, attr, false);
525+
err = modify_user_hw_breakpoint_check(bp, attr, false);
525526

526-
if (err)
527-
return err;
527+
if (!bp->attr.disabled)
528528
perf_event_enable(bp);
529-
bp->attr.disabled = 0;
530-
}
531-
return 0;
529+
530+
return err;
532531
}
533532
EXPORT_SYMBOL_GPL(modify_user_hw_breakpoint);
534533

‎tools/arch/arm/include/uapi/asm/kvm.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#define __KVM_HAVE_GUEST_DEBUG
2828
#define __KVM_HAVE_IRQ_LINE
2929
#define __KVM_HAVE_READONLY_MEM
30+
#define __KVM_HAVE_VCPU_EVENTS
3031

3132
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
3233

@@ -125,6 +126,18 @@ struct kvm_sync_regs {
125126
struct kvm_arch_memory_slot {
126127
};
127128

129+
/* for KVM_GET/SET_VCPU_EVENTS */
130+
struct kvm_vcpu_events {
131+
struct {
132+
__u8 serror_pending;
133+
__u8 serror_has_esr;
134+
/* Align it to 8 bytes */
135+
__u8 pad[6];
136+
__u64 serror_esr;
137+
} exception;
138+
__u32 reserved[12];
139+
};
140+
128141
/* If you need to interpret the index values, here is the key: */
129142
#define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000
130143
#define KVM_REG_ARM_COPROC_SHIFT 16

‎tools/arch/arm64/include/uapi/asm/kvm.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#define __KVM_HAVE_GUEST_DEBUG
4040
#define __KVM_HAVE_IRQ_LINE
4141
#define __KVM_HAVE_READONLY_MEM
42+
#define __KVM_HAVE_VCPU_EVENTS
4243

4344
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
4445

@@ -154,6 +155,18 @@ struct kvm_sync_regs {
154155
struct kvm_arch_memory_slot {
155156
};
156157

158+
/* for KVM_GET/SET_VCPU_EVENTS */
159+
struct kvm_vcpu_events {
160+
struct {
161+
__u8 serror_pending;
162+
__u8 serror_has_esr;
163+
/* Align it to 8 bytes */
164+
__u8 pad[6];
165+
__u64 serror_esr;
166+
} exception;
167+
__u32 reserved[12];
168+
};
169+
157170
/* If you need to interpret the index values, here is the key: */
158171
#define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000
159172
#define KVM_REG_ARM_COPROC_SHIFT 16

‎tools/arch/s390/include/uapi/asm/kvm.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/*
55
* KVM s390 specific structures and definitions
66
*
7-
* Copyright IBM Corp. 2008
7+
* Copyright IBM Corp. 2008, 2018
88
*
99
* Author(s): Carsten Otte <[email protected]>
1010
* Christian Borntraeger <[email protected]>
@@ -225,6 +225,7 @@ struct kvm_guest_debug_arch {
225225
#define KVM_SYNC_FPRS (1UL << 8)
226226
#define KVM_SYNC_GSCB (1UL << 9)
227227
#define KVM_SYNC_BPBC (1UL << 10)
228+
#define KVM_SYNC_ETOKEN (1UL << 11)
228229
/* length and alignment of the sdnx as a power of two */
229230
#define SDNXC 8
230231
#define SDNXL (1UL << SDNXC)
@@ -258,6 +259,8 @@ struct kvm_sync_regs {
258259
struct {
259260
__u64 reserved1[2];
260261
__u64 gscb[4];
262+
__u64 etoken;
263+
__u64 etoken_extension;
261264
};
262265
};
263266
};

‎tools/arch/x86/include/uapi/asm/kvm.h

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,4 +378,41 @@ struct kvm_sync_regs {
378378
#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0)
379379
#define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1)
380380

381+
#define KVM_STATE_NESTED_GUEST_MODE 0x00000001
382+
#define KVM_STATE_NESTED_RUN_PENDING 0x00000002
383+
384+
#define KVM_STATE_NESTED_SMM_GUEST_MODE 0x00000001
385+
#define KVM_STATE_NESTED_SMM_VMXON 0x00000002
386+
387+
struct kvm_vmx_nested_state {
388+
__u64 vmxon_pa;
389+
__u64 vmcs_pa;
390+
391+
struct {
392+
__u16 flags;
393+
} smm;
394+
};
395+
396+
/* for KVM_CAP_NESTED_STATE */
397+
struct kvm_nested_state {
398+
/* KVM_STATE_* flags */
399+
__u16 flags;
400+
401+
/* 0 for VMX, 1 for SVM. */
402+
__u16 format;
403+
404+
/* 128 for SVM, 128 + VMCS size for VMX. */
405+
__u32 size;
406+
407+
union {
408+
/* VMXON, VMCS */
409+
struct kvm_vmx_nested_state vmx;
410+
411+
/* Pad the header to 128 bytes. */
412+
__u8 pad[120];
413+
};
414+
415+
__u8 data[0];
416+
};
417+
381418
#endif /* _ASM_X86_KVM_H */

‎tools/include/uapi/asm-generic/unistd.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,9 +734,11 @@ __SYSCALL(__NR_pkey_free, sys_pkey_free)
734734
__SYSCALL(__NR_statx, sys_statx)
735735
#define __NR_io_pgetevents 292
736736
__SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents)
737+
#define __NR_rseq 293
738+
__SYSCALL(__NR_rseq, sys_rseq)
737739

738740
#undef __NR_syscalls
739-
#define __NR_syscalls 293
741+
#define __NR_syscalls 294
740742

741743
/*
742744
* 32 bit systems traditionally used different

‎tools/include/uapi/drm/drm.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,15 @@ struct drm_get_cap {
687687
*/
688688
#define DRM_CLIENT_CAP_ASPECT_RATIO 4
689689

690+
/**
691+
* DRM_CLIENT_CAP_WRITEBACK_CONNECTORS
692+
*
693+
* If set to 1, the DRM core will expose special connectors to be used for
694+
* writing back to memory the scene setup in the commit. Depends on client
695+
* also supporting DRM_CLIENT_CAP_ATOMIC
696+
*/
697+
#define DRM_CLIENT_CAP_WRITEBACK_CONNECTORS 5
698+
690699
/** DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */
691700
struct drm_set_client_cap {
692701
__u64 capability;

‎tools/include/uapi/linux/if_link.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ enum {
164164
IFLA_CARRIER_UP_COUNT,
165165
IFLA_CARRIER_DOWN_COUNT,
166166
IFLA_NEW_IFINDEX,
167+
IFLA_MIN_MTU,
168+
IFLA_MAX_MTU,
167169
__IFLA_MAX
168170
};
169171

@@ -334,6 +336,7 @@ enum {
334336
IFLA_BRPORT_GROUP_FWD_MASK,
335337
IFLA_BRPORT_NEIGH_SUPPRESS,
336338
IFLA_BRPORT_ISOLATED,
339+
IFLA_BRPORT_BACKUP_PORT,
337340
__IFLA_BRPORT_MAX
338341
};
339342
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -459,6 +462,16 @@ enum {
459462

460463
#define IFLA_MACSEC_MAX (__IFLA_MACSEC_MAX - 1)
461464

465+
/* XFRM section */
466+
enum {
467+
IFLA_XFRM_UNSPEC,
468+
IFLA_XFRM_LINK,
469+
IFLA_XFRM_IF_ID,
470+
__IFLA_XFRM_MAX
471+
};
472+
473+
#define IFLA_XFRM_MAX (__IFLA_XFRM_MAX - 1)
474+
462475
enum macsec_validation_type {
463476
MACSEC_VALIDATE_DISABLED = 0,
464477
MACSEC_VALIDATE_CHECK = 1,
@@ -920,6 +933,7 @@ enum {
920933
XDP_ATTACHED_DRV,
921934
XDP_ATTACHED_SKB,
922935
XDP_ATTACHED_HW,
936+
XDP_ATTACHED_MULTI,
923937
};
924938

925939
enum {
@@ -928,6 +942,9 @@ enum {
928942
IFLA_XDP_ATTACHED,
929943
IFLA_XDP_FLAGS,
930944
IFLA_XDP_PROG_ID,
945+
IFLA_XDP_DRV_PROG_ID,
946+
IFLA_XDP_SKB_PROG_ID,
947+
IFLA_XDP_HW_PROG_ID,
931948
__IFLA_XDP_MAX,
932949
};
933950

‎tools/include/uapi/linux/kvm.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,9 @@ struct kvm_ppc_resize_hpt {
949949
#define KVM_CAP_GET_MSR_FEATURES 153
950950
#define KVM_CAP_HYPERV_EVENTFD 154
951951
#define KVM_CAP_HYPERV_TLBFLUSH 155
952+
#define KVM_CAP_S390_HPAGE_1M 156
953+
#define KVM_CAP_NESTED_STATE 157
954+
#define KVM_CAP_ARM_INJECT_SERROR_ESR 158
952955

953956
#ifdef KVM_CAP_IRQ_ROUTING
954957

@@ -1391,6 +1394,9 @@ struct kvm_enc_region {
13911394
/* Available with KVM_CAP_HYPERV_EVENTFD */
13921395
#define KVM_HYPERV_EVENTFD _IOW(KVMIO, 0xbd, struct kvm_hyperv_eventfd)
13931396

1397+
/* Available with KVM_CAP_NESTED_STATE */
1398+
#define KVM_GET_NESTED_STATE _IOWR(KVMIO, 0xbe, struct kvm_nested_state)
1399+
#define KVM_SET_NESTED_STATE _IOW(KVMIO, 0xbf, struct kvm_nested_state)
13941400

13951401
/* Secure Encrypted Virtualization command */
13961402
enum sev_cmd_id {

‎tools/include/uapi/linux/perf_event.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ enum perf_event_sample_format {
144144

145145
PERF_SAMPLE_MAX = 1U << 20, /* non-ABI */
146146

147-
__PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63,
147+
__PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */
148148
};
149149

150150
/*

‎tools/include/uapi/linux/vhost.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ struct vhost_iotlb_msg {
6565
};
6666

6767
#define VHOST_IOTLB_MSG 0x1
68+
#define VHOST_IOTLB_MSG_V2 0x2
6869

6970
struct vhost_msg {
7071
int type;
@@ -74,6 +75,15 @@ struct vhost_msg {
7475
};
7576
};
7677

78+
struct vhost_msg_v2 {
79+
__u32 type;
80+
__u32 reserved;
81+
union {
82+
struct vhost_iotlb_msg iotlb;
83+
__u8 padding[64];
84+
};
85+
};
86+
7787
struct vhost_memory_region {
7888
__u64 guest_phys_addr;
7989
__u64 memory_size; /* bytes */
@@ -160,6 +170,14 @@ struct vhost_memory {
160170
#define VHOST_GET_VRING_BUSYLOOP_TIMEOUT _IOW(VHOST_VIRTIO, 0x24, \
161171
struct vhost_vring_state)
162172

173+
/* Set or get vhost backend capability */
174+
175+
/* Use message type V2 */
176+
#define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1
177+
178+
#define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64)
179+
#define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64)
180+
163181
/* VHOST_NET specific defines */
164182

165183
/* Attach virtio net ring to a raw socket, or tap device.

‎tools/perf/Makefile.perf

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -777,14 +777,12 @@ endif
777777
$(call QUIET_INSTALL, libexec) \
778778
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
779779
ifndef NO_LIBBPF
780-
$(call QUIET_INSTALL, lib) \
781-
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf'
782-
$(call QUIET_INSTALL, include/bpf) \
783-
$(INSTALL) include/bpf/*.h '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf'
784-
$(call QUIET_INSTALL, lib) \
785-
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_examples_instdir_SQ)/bpf'
786-
$(call QUIET_INSTALL, examples/bpf) \
787-
$(INSTALL) examples/bpf/*.c '$(DESTDIR_SQ)$(perf_examples_instdir_SQ)/bpf'
780+
$(call QUIET_INSTALL, bpf-headers) \
781+
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf'; \
782+
$(INSTALL) include/bpf/*.h -t '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf'
783+
$(call QUIET_INSTALL, bpf-examples) \
784+
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_examples_instdir_SQ)/bpf'; \
785+
$(INSTALL) examples/bpf/*.c -t '$(DESTDIR_SQ)$(perf_examples_instdir_SQ)/bpf'
788786
endif
789787
$(call QUIET_INSTALL, perf-archive) \
790788
$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

‎tools/perf/arch/arm64/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
1111

1212
out := $(OUTPUT)arch/arm64/include/generated/asm
1313
header := $(out)/syscalls.c
14-
sysdef := $(srctree)/tools/include/uapi/asm-generic/unistd.h
14+
incpath := $(srctree)/tools
15+
sysdef := $(srctree)/tools/arch/arm64/include/uapi/asm/unistd.h
1516
sysprf := $(srctree)/tools/perf/arch/arm64/entry/syscalls/
1617
systbl := $(sysprf)/mksyscalltbl
1718

1819
# Create output directory if not already present
1920
_dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)')
2021

2122
$(header): $(sysdef) $(systbl)
22-
$(Q)$(SHELL) '$(systbl)' '$(CC)' '$(HOSTCC)' $(sysdef) > $@
23+
$(Q)$(SHELL) '$(systbl)' '$(CC)' '$(HOSTCC)' $(incpath) $(sysdef) > $@
2324

2425
clean::
2526
$(call QUIET_CLEAN, arm64) $(RM) $(header)

0 commit comments

Comments
 (0)