Adds support for various type of backing sources for private
memory (in the sense of confidential computing), similar to the
backing sources available for shared memory.
Change-Id: I683b48c90d74f8cb99e416d26c8fb98331df0bab
Signed-off-by: Ackerley Tng <ackerleytng@xxxxxxxxxx>
---
.../testing/selftests/kvm/include/test_util.h | 18 ++++-
tools/testing/selftests/kvm/lib/test_util.c | 77 +++++++++++++++++++
2 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testing/selftests/kvm/include/test_util.h
index b4a03784ac4f..bfd9d9a897e3 100644
--- a/tools/testing/selftests/kvm/include/test_util.h
+++ b/tools/testing/selftests/kvm/include/test_util.h
@@ -139,9 +139,19 @@ enum vm_mem_backing_src_type {
struct vm_mem_backing_src_alias {
const char *name;
- uint32_t flag;
+ uint64_t flag;
};
+enum vm_private_mem_backing_src_type {
+ VM_PRIVATE_MEM_SRC_GUEST_MEM, /* Use default page size */
+ VM_PRIVATE_MEM_SRC_HUGETLB, /* Use kernel default page size for hugetlb pages */
+ VM_PRIVATE_MEM_SRC_HUGETLB_2MB,
+ VM_PRIVATE_MEM_SRC_HUGETLB_1GB,
+ NUM_PRIVATE_MEM_SRC_TYPES,
+};
+
+#define DEFAULT_VM_PRIVATE_MEM_SRC VM_PRIVATE_MEM_SRC_GUEST_MEM
+
#define MIN_RUN_DELAY_NS 200000UL
bool thp_configured(void);
@@ -154,6 +164,12 @@ int get_backing_src_madvise_advice(uint32_t i);
bool is_backing_src_hugetlb(uint32_t i);
void backing_src_help(const char *flag);
enum vm_mem_backing_src_type parse_backing_src_type(const char *type_name);
+
+void private_mem_backing_src_help(const char *flag);
+enum vm_private_mem_backing_src_type parse_private_mem_backing_src_type(const char *type_name);
+const struct vm_mem_backing_src_alias *vm_private_mem_backing_src_alias(uint32_t i);
+size_t get_private_mem_backing_src_pagesz(uint32_t i);
+
long get_run_delay(void);
/*
diff --git a/tools/testing/selftests/kvm/lib/test_util.c b/tools/testing/selftests/kvm/lib/test_util.c
index 24dc90693afd..8c4d6ec44c41 100644
--- a/tools/testing/selftests/kvm/lib/test_util.c
+++ b/tools/testing/selftests/kvm/lib/test_util.c
@@ -15,6 +15,8 @@
#include <sys/syscall.h>
#include <linux/mman.h>
#include "linux/kernel.h"
+#include <linux/kvm.h>
+#include <linux/guestmem.h>
#include "test_util.h"
@@ -288,6 +290,34 @@ const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias(uint32_t i)
return &aliases[i];
}
+const struct vm_mem_backing_src_alias *vm_private_mem_backing_src_alias(uint32_t i)
+{
+ static const struct vm_mem_backing_src_alias aliases[] = {
+ [VM_PRIVATE_MEM_SRC_GUEST_MEM] = {
+ .name = "private_mem_guest_mem",
+ .flag = 0,
+ },
+ [VM_PRIVATE_MEM_SRC_HUGETLB] = {
+ .name = "private_mem_hugetlb",
+ .flag = GUEST_MEMFD_FLAG_HUGETLB,
+ },
+ [VM_PRIVATE_MEM_SRC_HUGETLB_2MB] = {
+ .name = "private_mem_hugetlb_2mb",
+ .flag = GUEST_MEMFD_FLAG_HUGETLB | GUESTMEM_HUGETLB_FLAG_2MB,
+ },
+ [VM_PRIVATE_MEM_SRC_HUGETLB_1GB] = {
+ .name = "private_mem_hugetlb_1gb",
+ .flag = GUEST_MEMFD_FLAG_HUGETLB | GUESTMEM_HUGETLB_FLAG_1GB,
+ },
+ };
+ _Static_assert(ARRAY_SIZE(aliases) == NUM_PRIVATE_MEM_SRC_TYPES,
+ "Missing new backing private mem src types?");
+
+ TEST_ASSERT(i < NUM_PRIVATE_MEM_SRC_TYPES, "Private mem backing src type ID %d too big", i);
+
+ return &aliases[i];
+}
+
#define MAP_HUGE_PAGE_SIZE(x) (1ULL << ((x >> MAP_HUGE_SHIFT) & MAP_HUGE_MASK))
size_t get_backing_src_pagesz(uint32_t i)
@@ -333,6 +363,22 @@ int get_backing_src_madvise_advice(uint32_t i)
}
}
+size_t get_private_mem_backing_src_pagesz(uint32_t i)
+{
+ switch (i) {
+ case VM_PRIVATE_MEM_SRC_GUEST_MEM:
+ return getpagesize();
+ case VM_PRIVATE_MEM_SRC_HUGETLB:
+ return get_def_hugetlb_pagesz();
+ default: {
+ uint64_t flag = vm_private_mem_backing_src_alias(i)->flag;
+
+ return 1UL << ((flag >> GUESTMEM_HUGETLB_FLAG_SHIFT) &
+ GUESTMEM_HUGETLB_FLAG_MASK);
+ }
+ }
+}
+
bool is_backing_src_hugetlb(uint32_t i)
{
return !!(vm_mem_backing_src_alias(i)->flag & MAP_HUGETLB);
@@ -369,6 +415,37 @@ enum vm_mem_backing_src_type parse_backing_src_type(const char *type_name)
return -1;
}
+static void print_available_private_mem_backing_src_types(const char *prefix)
+{
+ int i;
+
+ printf("%sAvailable private mem backing src types:\n", prefix);
+
+ for (i = 0; i < NUM_PRIVATE_MEM_SRC_TYPES; i++)
+ printf("%s %s\n", prefix, vm_private_mem_backing_src_alias(i)->name);
+}
+
+void private_mem_backing_src_help(const char *flag)
+{
+ printf(" %s: specify the type of memory that should be used to\n"
+ " back guest private memory. (default: %s)\n",
+ flag, vm_private_mem_backing_src_alias(DEFAULT_VM_PRIVATE_MEM_SRC)->name);
+ print_available_private_mem_backing_src_types(" ");
+}
+
+enum vm_private_mem_backing_src_type parse_private_mem_backing_src_type(const char *type_name)
+{
+ int i;
+
+ for (i = 0; i < NUM_PRIVATE_MEM_SRC_TYPES; i++)
+ if (!strcmp(type_name, vm_private_mem_backing_src_alias(i)->name))
+ return i;
+
+ print_available_private_mem_backing_src_types("");
+ TEST_FAIL("Unknown private mem backing src type: %s", type_name);
+ return -1;
+}
+
long get_run_delay(void)
{
char path[64];
--
2.49.0.1045.g170613ef41-goog
