Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
selftests: kvm: extract common functionality out of smm_test.c
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+45
-25
+17
tools/testing/selftests/kvm/include/x86/smm.h
+17
tools/testing/selftests/kvm/include/x86/smm.h
···
1
+
// SPDX-License-Identifier: GPL-2.0-only
2
+
#ifndef SELFTEST_KVM_SMM_H
3
+
#define SELFTEST_KVM_SMM_H
4
+
5
+
#include "kvm_util.h"
6
+
7
+
#define SMRAM_SIZE 65536
8
+
#define SMRAM_MEMSLOT ((1 << 16) | 1)
9
+
#define SMRAM_PAGES (SMRAM_SIZE / PAGE_SIZE)
10
+
11
+
void setup_smram(struct kvm_vm *vm, struct kvm_vcpu *vcpu,
12
+
uint64_t smram_gpa,
13
+
const void *smi_handler, size_t handler_size);
14
+
15
+
void inject_smi(struct kvm_vcpu *vcpu);
16
+
17
+
#endif /* SELFTEST_KVM_SMM_H */
+26
tools/testing/selftests/kvm/lib/x86/processor.c
+26
tools/testing/selftests/kvm/lib/x86/processor.c
···
8
8
#include "kvm_util.h"
9
9
#include "pmu.h"
10
10
#include "processor.h"
11
+
#include "smm.h"
11
12
#include "svm_util.h"
12
13
#include "sev.h"
13
14
#include "vmx.h"
···
1444
1443
bool kvm_arch_has_default_irqchip(void)
1445
1444
{
1446
1445
return true;
1446
+
}
1447
+
1448
+
void setup_smram(struct kvm_vm *vm, struct kvm_vcpu *vcpu,
1449
+
uint64_t smram_gpa,
1450
+
const void *smi_handler, size_t handler_size)
1451
+
{
1452
+
vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, smram_gpa,
1453
+
SMRAM_MEMSLOT, SMRAM_PAGES, 0);
1454
+
TEST_ASSERT(vm_phy_pages_alloc(vm, SMRAM_PAGES, smram_gpa,
1455
+
SMRAM_MEMSLOT) == smram_gpa,
1456
+
"Could not allocate guest physical addresses for SMRAM");
1457
+
1458
+
memset(addr_gpa2hva(vm, smram_gpa), 0x0, SMRAM_SIZE);
1459
+
memcpy(addr_gpa2hva(vm, smram_gpa) + 0x8000, smi_handler, handler_size);
1460
+
vcpu_set_msr(vcpu, MSR_IA32_SMBASE, smram_gpa);
1461
+
}
1462
+
1463
+
void inject_smi(struct kvm_vcpu *vcpu)
1464
+
{
1465
+
struct kvm_vcpu_events events;
1466
+
1467
+
vcpu_events_get(vcpu, &events);
1468
+
events.smi.pending = 1;
1469
+
events.flags |= KVM_VCPUEVENT_VALID_SMM;
1470
+
vcpu_events_set(vcpu, &events);
1447
1471
}
+2
-25
tools/testing/selftests/kvm/x86/smm_test.c
+2
-25
tools/testing/selftests/kvm/x86/smm_test.c
···
14
14
#include "test_util.h"
15
15
16
16
#include "kvm_util.h"
17
+
#include "smm.h"
17
18
18
19
#include "vmx.h"
19
20
#include "svm_util.h"
20
21
21
-
#define SMRAM_SIZE 65536
22
-
#define SMRAM_MEMSLOT ((1 << 16) | 1)
23
-
#define SMRAM_PAGES (SMRAM_SIZE / PAGE_SIZE)
24
22
#define SMRAM_GPA 0x1000000
25
23
#define SMRAM_STAGE 0xfe
26
24
···
111
113
sync_with_host(DONE);
112
114
}
113
115
114
-
void inject_smi(struct kvm_vcpu *vcpu)
115
-
{
116
-
struct kvm_vcpu_events events;
117
-
118
-
vcpu_events_get(vcpu, &events);
119
-
120
-
events.smi.pending = 1;
121
-
events.flags |= KVM_VCPUEVENT_VALID_SMM;
122
-
123
-
vcpu_events_set(vcpu, &events);
124
-
}
125
-
126
116
int main(int argc, char *argv[])
127
117
{
128
118
vm_vaddr_t nested_gva = 0;
···
126
140
/* Create VM */
127
141
vm = vm_create_with_one_vcpu(&vcpu, guest_code);
128
142
129
-
vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, SMRAM_GPA,
130
-
SMRAM_MEMSLOT, SMRAM_PAGES, 0);
131
-
TEST_ASSERT(vm_phy_pages_alloc(vm, SMRAM_PAGES, SMRAM_GPA, SMRAM_MEMSLOT)
132
-
== SMRAM_GPA, "could not allocate guest physical addresses?");
133
-
134
-
memset(addr_gpa2hva(vm, SMRAM_GPA), 0x0, SMRAM_SIZE);
135
-
memcpy(addr_gpa2hva(vm, SMRAM_GPA) + 0x8000, smi_handler,
136
-
sizeof(smi_handler));
137
-
138
-
vcpu_set_msr(vcpu, MSR_IA32_SMBASE, SMRAM_GPA);
143
+
setup_smram(vm, vcpu, SMRAM_GPA, smi_handler, sizeof(smi_handler));
139
144
140
145
if (kvm_has_cap(KVM_CAP_NESTED_STATE)) {
141
146
if (kvm_cpu_has(X86_FEATURE_SVM))