From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 6 Sep 2021 10:34:11 +0000 (-0400)
Subject: Merge tag 'kvmarm-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmar... 
X-Git-Tag: v5.15~336^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e99314a340d27efafab3b7ea226beb239162cd46;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'kvmarm-5.15' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 updates for 5.15

- Page ownership tracking between host EL1 and EL2

- Rely on userspace page tables to create large stage-2 mappings

- Fix incompatibility between pKVM and kmemleak

- Fix the PMU reset state, and improve the performance of the virtual PMU

- Move over to the generic KVM entry code

- Address PSCI reset issues w.r.t. save/restore

- Preliminary rework for the upcoming pKVM fixed feature

- A bunch of MM cleanups

- a vGIC fix for timer spurious interrupts

- Various cleanups
---

e99314a340d27efafab3b7ea226beb239162cd46
diff --cc arch/arm64/kvm/guest.c
index 5188184,fc86d4f..5ce26be
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@@ -48,8 -50,11 +48,9 @@@ const struct _kvm_stats_desc kvm_vcpu_s
  	STATS_DESC_COUNTER(VCPU, wfi_exit_stat),
  	STATS_DESC_COUNTER(VCPU, mmio_exit_user),
  	STATS_DESC_COUNTER(VCPU, mmio_exit_kernel),
+ 	STATS_DESC_COUNTER(VCPU, signal_exits),
  	STATS_DESC_COUNTER(VCPU, exits)
  };
 -static_assert(ARRAY_SIZE(kvm_vcpu_stats_desc) ==
 -		sizeof(struct kvm_vcpu_stat) / sizeof(u64));
  
  const struct kvm_stats_header kvm_vcpu_stats_header = {
  	.name_size = KVM_STATS_NAME_SIZE,