Commit a8a31fdc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Thomas Gleixner:
 "A set of perf fixes:

  kernel:

   - Unbreak the tracking of auxiliary buffer allocations which got
     imbalanced causing recource limit failures.

   - Fix the fallout of splitting of ToPA entries which missed to shift
     the base entry PA correctly.

   - Use the correct context to lookup the AUX event when unmapping the
     associated AUX buffer so the event can be stopped and the buffer
     reference dropped.

  tools:

   - Fix buildiid-cache mode setting in copyfile_mode_ns() when copying
     /proc/kcore

   - Fix freeing id arrays in the event list so the correct event is
     closed.

   - Sync sched.h anc kvm.h headers with the kernel sources.

   - Link jvmti against tools/lib/ctype.o to have weak strlcpy().

   - Fix multiple memory and file descriptor leaks, found by coverity in
     perf annotate.

   - Fix leaks in error handling paths in 'perf c2c', 'perf kmem', found
     by a static analysis tool"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/aux: Fix AUX output stopping
  perf/aux: Fix tracking of auxiliary trace buffer allocation
  perf/x86/intel/pt: Fix base for single entry topa
  perf kmem: Fix memory leak in compact_gfp_flags()
  tools headers UAPI: Sync sched.h with the kernel
  tools headers kvm: Sync kvm.h headers with the kernel sources
  tools headers kvm: Sync kvm headers with the kernel sources
  tools headers kvm: Sync kvm headers with the kernel sources
  perf c2c: Fix memory leak in build_cl_output()
  perf tools: Fix mode setting in copyfile_mode_ns()
  perf annotate: Fix multiple memory and file descriptor leaks
  perf tools: Fix resource leak of closedir() on the error paths
  perf evlist: Fix fix for freed id arrays
  perf jvmti: Link against tools/lib/ctype.h to have weak strlcpy()
parents 1e1ac1cb f3a519e4

arch/x86/events/intel/pt.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static struct topa *topa_alloc(int cpu, gfp_t gfp) 
	 * link as the 2nd entry in the table

	 */

	if (!intel_pt_validate_hw_cap(PT_CAP_topa_multiple_entries)) {

		TOPA_ENTRY(&tp->topa, 1)->base = page_to_phys(p);

		TOPA_ENTRY(&tp->topa, 1)->base = page_to_phys(p) >> TOPA_SHIFT;

		TOPA_ENTRY(&tp->topa, 1)->end = 1;

	}

kernel/events/core.c

+5 −3
Original line number Diff line number Diff line
@@ -5607,7 +5607,9 @@ static void perf_mmap_close(struct vm_area_struct *vma) 
		perf_pmu_output_stop(event);



		/* now it's safe to free the pages */

		if (!rb->aux_mmap_locked)

			atomic_long_sub(rb->aux_nr_pages, &mmap_user->locked_vm);

		else

			atomic64_sub(rb->aux_mmap_locked, &vma->vm_mm->pinned_vm);



		/* this has to be the last one */
@@ -6947,7 +6949,7 @@ static void __perf_event_output_stop(struct perf_event *event, void *data) 
static int __perf_pmu_output_stop(void *info)

{

	struct perf_event *event = info;

	struct pmu *pmu = event->pmu;

	struct pmu *pmu = event->ctx->pmu;

	struct perf_cpu_context *cpuctx = this_cpu_ptr(pmu->pmu_cpu_context);

	struct remote_output ro = {

		.rb	= event->rb,

tools/arch/x86/include/uapi/asm/svm.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
#define SVM_EXIT_MWAIT         0x08b

#define SVM_EXIT_MWAIT_COND    0x08c

#define SVM_EXIT_XSETBV        0x08d

#define SVM_EXIT_RDPRU         0x08e

#define SVM_EXIT_NPF           0x400

#define SVM_EXIT_AVIC_INCOMPLETE_IPI		0x401

#define SVM_EXIT_AVIC_UNACCELERATED_ACCESS	0x402

tools/arch/x86/include/uapi/asm/vmx.h

+5 −1
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ 
#define EXIT_REASON_PML_FULL            62

#define EXIT_REASON_XSAVES              63

#define EXIT_REASON_XRSTORS             64

#define EXIT_REASON_UMWAIT              67

#define EXIT_REASON_TPAUSE              68



#define VMX_EXIT_REASONS \

	{ EXIT_REASON_EXCEPTION_NMI,         "EXCEPTION_NMI" }, \
@@ -144,7 +146,9 @@ 
	{ EXIT_REASON_RDSEED,                "RDSEED" }, \

	{ EXIT_REASON_PML_FULL,              "PML_FULL" }, \

	{ EXIT_REASON_XSAVES,                "XSAVES" }, \

	{ EXIT_REASON_XRSTORS,               "XRSTORS" }

	{ EXIT_REASON_XRSTORS,               "XRSTORS" }, \

	{ EXIT_REASON_UMWAIT,                "UMWAIT" }, \

	{ EXIT_REASON_TPAUSE,                "TPAUSE" }



#define VMX_ABORT_SAVE_GUEST_MSR_FAIL        1

#define VMX_ABORT_LOAD_HOST_PDPTE_FAIL       2

tools/include/uapi/linux/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -999,6 +999,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_ARM_PTRAUTH_GENERIC 172

#define KVM_CAP_PMU_EVENT_FILTER 173

#define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174

#define KVM_CAP_HYPERV_DIRECT_TLBFLUSH 175



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1145,6 +1146,7 @@ struct kvm_dirty_tlb { 
#define KVM_REG_S390		0x5000000000000000ULL

#define KVM_REG_ARM64		0x6000000000000000ULL

#define KVM_REG_MIPS		0x7000000000000000ULL

#define KVM_REG_RISCV		0x8000000000000000ULL



#define KVM_REG_SIZE_SHIFT	52

#define KVM_REG_SIZE_MASK	0x00f0000000000000ULL

CRA Git | Maintained and supported by SUSTech CRA and CCSE