From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Kan Liang <kan.liang@linux.intel.com>,
Dapeng Mi <dapeng1.mi@linux.intel.com>,
Jim Mattson <jmattson@google.com>,
Jinrong Liang <cloudliang@tencent.com>,
Aaron Lewis <aaronlewis@google.com>,
Like Xu <likexu@tencent.com>
Subject: [PATCH v8 24/26] KVM: selftests: Add a forced emulation variation of KVM_ASM_SAFE()
Date: Thu, 9 Nov 2023 18:13:04 -0800 [thread overview]
Message-ID: <20231110021306.1269082-25-seanjc@google.com> (raw)
In-Reply-To: <20231110021306.1269082-1-seanjc@google.com>
Add KVM_ASM_SAFE_FEP() to allow forcing emulation on an instruction that
might fault. Note, KVM skips RIP past the FEP prefix before injecting an
exception, i.e. the fixup needs to be on the instruction itself. Do not
check for FEP support, that is firmly the responsibility of whatever code
wants to use KVM_ASM_SAFE_FEP().
Sadly, chaining variadic arguments that contain commas doesn't work, thus
the unfortunate amount of copy+paste.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
.../selftests/kvm/include/x86_64/processor.h | 30 +++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h
index e5c383bd313b..e83b136ca15b 100644
--- a/tools/testing/selftests/kvm/include/x86_64/processor.h
+++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
@@ -1153,16 +1153,19 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector,
* r9 = exception vector (non-zero)
* r10 = error code
*/
-#define KVM_ASM_SAFE(insn) \
+#define __KVM_ASM_SAFE(insn, fep) \
"mov $" __stringify(KVM_EXCEPTION_MAGIC) ", %%r9\n\t" \
"lea 1f(%%rip), %%r10\n\t" \
"lea 2f(%%rip), %%r11\n\t" \
- "1: " insn "\n\t" \
+ fep "1: " insn "\n\t" \
"xor %%r9, %%r9\n\t" \
"2:\n\t" \
"mov %%r9b, %[vector]\n\t" \
"mov %%r10, %[error_code]\n\t"
+#define KVM_ASM_SAFE(insn) __KVM_ASM_SAFE(insn, "")
+#define KVM_ASM_SAFE_FEP(insn) __KVM_ASM_SAFE(insn, KVM_FEP)
+
#define KVM_ASM_SAFE_OUTPUTS(v, ec) [vector] "=qm"(v), [error_code] "=rm"(ec)
#define KVM_ASM_SAFE_CLOBBERS "r9", "r10", "r11"
@@ -1189,6 +1192,29 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector,
vector; \
})
+#define kvm_asm_safe_fep(insn, inputs...) \
+({ \
+ uint64_t ign_error_code; \
+ uint8_t vector; \
+ \
+ asm volatile(KVM_ASM_SAFE(insn) \
+ : KVM_ASM_SAFE_OUTPUTS(vector, ign_error_code) \
+ : inputs \
+ : KVM_ASM_SAFE_CLOBBERS); \
+ vector; \
+})
+
+#define kvm_asm_safe_ec_fep(insn, error_code, inputs...) \
+({ \
+ uint8_t vector; \
+ \
+ asm volatile(KVM_ASM_SAFE_FEP(insn) \
+ : KVM_ASM_SAFE_OUTPUTS(vector, error_code) \
+ : inputs \
+ : KVM_ASM_SAFE_CLOBBERS); \
+ vector; \
+})
+
static inline uint8_t rdmsr_safe(uint32_t msr, uint64_t *val)
{
uint64_t error_code;
--
2.42.0.869.gea05f2083d-goog
next prev parent reply other threads:[~2023-11-10 2:14 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-10 2:12 [PATCH v8 00/26] KVM: x86/pmu: selftests: Fixes and new tests Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 01/26] KVM: x86/pmu: Always treat Fixed counters as available when supported Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 02/26] KVM: x86/pmu: Allow programming events that match unsupported arch events Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 03/26] KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural encodings Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 04/26] KVM: x86/pmu: Setup fixed counters' eventsel during PMU initialization Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 05/26] KVM: x86/pmu: Get eventsel for fixed counters from perf Sean Christopherson
2023-11-10 13:48 ` Liang, Kan
2023-11-10 2:12 ` [PATCH v8 06/26] KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMD Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 07/26] KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUs Sean Christopherson
2023-11-10 3:22 ` Mi, Dapeng
2023-11-10 14:51 ` Sean Christopherson
2023-11-13 1:24 ` Mi, Dapeng
2023-11-10 2:12 ` [PATCH v8 08/26] KVM: x86/pmu: Disallow "fast" RDPMC for architectural " Sean Christopherson
2023-11-10 6:07 ` Mi, Dapeng
2023-11-10 23:32 ` Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 09/26] KVM: selftests: Add vcpu_set_cpuid_property() to set properties Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 10/26] KVM: selftests: Drop the "name" param from KVM_X86_PMU_FEATURE() Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 11/26] KVM: selftests: Extend {kvm,this}_pmu_has() to support fixed counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 12/26] KVM: selftests: Add pmu.h and lib/pmu.c for common PMU assets Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 13/26] KVM: selftests: Test Intel PMU architectural events on gp counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 14/26] KVM: selftests: Test Intel PMU architectural events on fixed counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 15/26] KVM: selftests: Test consistency of CPUID with num of gp counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 16/26] KVM: selftests: Test consistency of CPUID with num of fixed counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 17/26] KVM: selftests: Add functional test for Intel's fixed PMU counters Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 18/26] KVM: selftests: Expand PMU counters test to verify LLC events Sean Christopherson
2023-11-10 2:12 ` [PATCH v8 19/26] KVM: selftests: Add a helper to query if the PMU module param is enabled Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 20/26] KVM: selftests: Add helpers to read integer module params Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 21/26] KVM: selftests: Query module param to detect FEP in MSR filtering test Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 22/26] KVM: selftests: Move KVM_FEP macro into common library header Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 23/26] KVM: selftests: Test PMC virtualization with forced emulation Sean Christopherson
2023-11-10 2:13 ` Sean Christopherson [this message]
2023-11-10 2:13 ` [PATCH v8 25/26] KVM: selftests: Add helpers for safe and safe+forced RDMSR, RDPMC, and XGETBV Sean Christopherson
2023-11-10 2:13 ` [PATCH v8 26/26] KVM: selftests: Extend PMU counters test to validate RDPMC after WRMSR Sean Christopherson
2023-11-13 11:41 ` Jinrong Liang
2023-11-13 13:40 ` Sean Christopherson
2023-11-14 3:07 ` Jinrong Liang
2023-11-10 2:52 ` [PATCH v8 00/26] KVM: x86/pmu: selftests: Fixes and new tests Jinrong Liang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231110021306.1269082-25-seanjc@google.com \
--to=seanjc@google.com \
--cc=aaronlewis@google.com \
--cc=cloudliang@tencent.com \
--cc=dapeng1.mi@linux.intel.com \
--cc=jmattson@google.com \
--cc=kan.liang@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=likexu@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox