From: Vishal Annapurve <vannapurve@google.com>
To: x86@kernel.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org
Cc: pbonzini@redhat.com, vkuznets@redhat.com, wanpengli@tencent.com,
jmattson@google.com, joro@8bytes.org, tglx@linutronix.de,
mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com,
hpa@zytor.com, shuah@kernel.org, yang.zhong@intel.com,
drjones@redhat.com, ricarkol@google.com, aaronlewis@google.com,
wei.w.wang@intel.com, kirill.shutemov@linux.intel.com,
corbet@lwn.net, hughd@google.com, jlayton@kernel.org,
bfields@fieldses.org, akpm@linux-foundation.org,
chao.p.peng@linux.intel.com, yu.c.zhang@linux.intel.com,
jun.nakajima@intel.com, dave.hansen@intel.com,
michael.roth@amd.com, qperret@google.com, steven.price@arm.com,
ak@linux.intel.com, david@redhat.com, luto@kernel.org,
vbabka@suse.cz, marcorr@google.com, erdemaktas@google.com,
pgonda@google.com, nikunj@amd.com, seanjc@google.com,
diviness@google.com, maz@kernel.org, dmatlack@google.com,
axelrasmussen@google.com, maciej.szmigiero@oracle.com,
mizhang@google.com, bgardon@google.com,
Vishal Annapurve <vannapurve@google.com>
Subject: [RFC V2 PATCH 4/8] selftests: kvm: sev: Support memslots with private memory
Date: Tue, 30 Aug 2022 22:42:55 +0000 [thread overview]
Message-ID: <20220830224259.412342-5-vannapurve@google.com> (raw)
In-Reply-To: <20220830224259.412342-1-vannapurve@google.com>
Introduce an additional helper API to create a SEV VM with private
memory memslots.
Signed-off-by: Vishal Annapurve <vannapurve@google.com>
---
tools/testing/selftests/kvm/include/x86_64/sev.h | 2 ++
tools/testing/selftests/kvm/lib/x86_64/sev.c | 15 ++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/kvm/include/x86_64/sev.h b/tools/testing/selftests/kvm/include/x86_64/sev.h
index b6552ea1c716..628801707917 100644
--- a/tools/testing/selftests/kvm/include/x86_64/sev.h
+++ b/tools/testing/selftests/kvm/include/x86_64/sev.h
@@ -38,6 +38,8 @@ void kvm_sev_ioctl(struct sev_vm *sev, int cmd, void *data);
struct kvm_vm *sev_get_vm(struct sev_vm *sev);
uint8_t sev_get_enc_bit(struct sev_vm *sev);
+struct sev_vm *sev_vm_create_with_flags(uint32_t policy, uint64_t npages,
+ uint32_t memslot_flags);
struct sev_vm *sev_vm_create(uint32_t policy, uint64_t npages);
void sev_vm_free(struct sev_vm *sev);
void sev_vm_launch(struct sev_vm *sev);
diff --git a/tools/testing/selftests/kvm/lib/x86_64/sev.c b/tools/testing/selftests/kvm/lib/x86_64/sev.c
index 44b5ce5cd8db..6a329ea17f9f 100644
--- a/tools/testing/selftests/kvm/lib/x86_64/sev.c
+++ b/tools/testing/selftests/kvm/lib/x86_64/sev.c
@@ -171,7 +171,8 @@ void sev_vm_free(struct sev_vm *sev)
free(sev);
}
-struct sev_vm *sev_vm_create(uint32_t policy, uint64_t npages)
+struct sev_vm *sev_vm_create_with_flags(uint32_t policy, uint64_t npages,
+ uint32_t memslot_flags)
{
struct sev_vm *sev;
struct kvm_vm *vm;
@@ -188,9 +189,12 @@ struct sev_vm *sev_vm_create(uint32_t policy, uint64_t npages)
vm->vpages_mapped = sparsebit_alloc();
vm_set_memory_encryption(vm, true, true, sev->enc_bit);
pr_info("SEV cbit: %d\n", sev->enc_bit);
- vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, 0, 0, npages, 0);
- sev_register_user_region(sev, addr_gpa2hva(vm, 0),
+ vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, 0, 0, npages,
+ memslot_flags);
+ if (!(memslot_flags & KVM_MEM_PRIVATE)) {
+ sev_register_user_region(sev, addr_gpa2hva(vm, 0),
npages * vm->page_size);
+ }
pr_info("SEV guest created, policy: 0x%x, size: %lu KB\n",
sev->sev_policy, npages * vm->page_size / 1024);
@@ -198,6 +202,11 @@ struct sev_vm *sev_vm_create(uint32_t policy, uint64_t npages)
return sev;
}
+struct sev_vm *sev_vm_create(uint32_t policy, uint64_t npages)
+{
+ return sev_vm_create_with_flags(policy, npages, 0);
+}
+
void sev_vm_launch(struct sev_vm *sev)
{
struct kvm_sev_launch_start ksev_launch_start = {0};
--
2.37.2.672.g94769d06f0-goog
next prev parent reply other threads:[~2022-08-30 22:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 22:42 [RFC V2 PATCH 0/8] selftests: KVM: SEV: selftests for fd-based private memory Vishal Annapurve
2022-08-30 22:42 ` [RFC V2 PATCH 1/8] selftests: kvm: x86_64: Add support for pagetable tracking Vishal Annapurve
2022-08-30 22:42 ` [RFC V2 PATCH 2/8] kvm: Add HVA range operator Vishal Annapurve
2022-08-30 22:42 ` [RFC V2 PATCH 3/8] arch: x86: sev: Populate private memory fd during LAUNCH_UPDATE_DATA Vishal Annapurve
2022-08-30 22:42 ` Vishal Annapurve [this message]
2022-08-30 22:42 ` [RFC V2 PATCH 5/8] selftests: kvm: Update usage of private mem lib for SEV VMs Vishal Annapurve
2022-08-30 22:42 ` [RFC V2 PATCH 6/8] selftests: kvm: Support executing SEV VMs with private memory Vishal Annapurve
2022-08-30 22:42 ` [RFC V2 PATCH 7/8] selftests: kvm: Refactor testing logic for " Vishal Annapurve
2022-08-30 22:42 ` [RFC V2 PATCH 8/8] selftests: kvm: Add private memory test for SEV VMs Vishal Annapurve
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=20220830224259.412342-5-vannapurve@google.com \
--to=vannapurve@google.com \
--cc=aaronlewis@google.com \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=axelrasmussen@google.com \
--cc=bfields@fieldses.org \
--cc=bgardon@google.com \
--cc=bp@alien8.de \
--cc=chao.p.peng@linux.intel.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=diviness@google.com \
--cc=dmatlack@google.com \
--cc=drjones@redhat.com \
--cc=erdemaktas@google.com \
--cc=hpa@zytor.com \
--cc=hughd@google.com \
--cc=jlayton@kernel.org \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=jun.nakajima@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=luto@kernel.org \
--cc=maciej.szmigiero@oracle.com \
--cc=marcorr@google.com \
--cc=maz@kernel.org \
--cc=michael.roth@amd.com \
--cc=mingo@redhat.com \
--cc=mizhang@google.com \
--cc=nikunj@amd.com \
--cc=pbonzini@redhat.com \
--cc=pgonda@google.com \
--cc=qperret@google.com \
--cc=ricarkol@google.com \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=steven.price@arm.com \
--cc=tglx@linutronix.de \
--cc=vbabka@suse.cz \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=wei.w.wang@intel.com \
--cc=x86@kernel.org \
--cc=yang.zhong@intel.com \
--cc=yu.c.zhang@linux.intel.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;
as well as URLs for NNTP newsgroup(s).