Merge branch 'perf/urgent' into perf/core, to pick up fixes (aa7a7b72) · Commits · 戴 / test

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;
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -5619,7 +5619,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 */

+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

+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

+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