From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC1A4C3ABD8 for ; Wed, 14 May 2025 23:46:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B6936B009E; Wed, 14 May 2025 19:44:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 53DEA6B00AE; Wed, 14 May 2025 19:44:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B7A86B00E7; Wed, 14 May 2025 19:44:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 18F0B6B009E for ; Wed, 14 May 2025 19:44:12 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 60D07BEC18 for ; Wed, 14 May 2025 23:44:13 +0000 (UTC) X-FDA: 83443144386.15.B59C350 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf04.hostedemail.com (Postfix) with ESMTP id 994D840004 for ; Wed, 14 May 2025 23:44:11 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tfI2gwZS; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3yiolaAsKCPsdfnhuoh1wqjjrrjoh.frpolqx0-ppnydfn.ruj@flex--ackerleytng.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3yiolaAsKCPsdfnhuoh1wqjjrrjoh.frpolqx0-ppnydfn.ruj@flex--ackerleytng.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747266251; a=rsa-sha256; cv=none; b=g4GMR/qg8y7FLiZBERJadc2LOyQLBbC0YDEvXLroqQamKnXM4O02wnwj0b3eyjDJ4A2MuH Lw5ZCph1wQqMJc1IygtGZH4wLdQtpIhUIiZdBE89caaEuMiiyDrlQL9e4C8hpMyqwm/pTs Mw9DcSwEegMWhOFPYmjKTJZ+se6v9wQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tfI2gwZS; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3yiolaAsKCPsdfnhuoh1wqjjrrjoh.frpolqx0-ppnydfn.ruj@flex--ackerleytng.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3yiolaAsKCPsdfnhuoh1wqjjrrjoh.frpolqx0-ppnydfn.ruj@flex--ackerleytng.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747266251; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yoLxnUTPsoaNLqVdaJcroJKZWfS4rkiGi/yftlVoHwU=; b=VEpu1jKpXtWA+D3AIRnL1sLBOwxhrWLSedgRlw9escbzbhwN3ez08zJlVsv/HwxLg7q43p Le7dt0FUS9BpoEm7ukdead4iDUWIg2HqG3BqbrkBEG+l0l0r0c9JhzpVhTCh7Ph/0BPiG7 zSrPw3ZQ54lJMb61bKnw8PYLUUtI69U= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-22e7e097ef7so2302725ad.2 for ; Wed, 14 May 2025 16:44:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747266250; x=1747871050; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=yoLxnUTPsoaNLqVdaJcroJKZWfS4rkiGi/yftlVoHwU=; b=tfI2gwZSwzROR5aXGKJ5KFVVXX3vFCJZ3lJCJkaO5h4KTZBF2dNNltE+vbdaCp46Be LWgbZOzf1oW9Mn9He6bSMfxPcf2A5Q41vJbTaDycBb9AyaDKexxSdz2cxHWd8xBAwC84 nUwPbPIUC9dOs9+F9LbQNQyjFQN64D5lRIp8nE2SSkG4QEecIhpXXfF0fJyHl2Nx0WgZ Fx3i5J98ht7P61x14Oa6IzJja9FPe42FYYXw5UMUr8BEH0P1AUrJlNYxzd8KZnqY3CCO zY01nQ5ube3fQfD8q8loyuCRv4g7k1NcT0MkaMrZkIIlC6NEs2DBkBQ7N6/JOakQTTwv 10KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266250; x=1747871050; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yoLxnUTPsoaNLqVdaJcroJKZWfS4rkiGi/yftlVoHwU=; b=fEkvrZkXbOb7HB6keh+Axa544k1XGFJCLvI/h5LtRKkwsrNqhXNhyhMTFWqZmQZFGD qtdKojdDb3wxpKA3WrX1UkvA3Dr7LLamzf8SjhvTdk49Q70wBvvj5adWALT3hYB5nlTU PuS94xuqLURuaCQ2QNAUJT26A/T59TTV+zzdB10xgCYf0rMEuPrC2k7S5BJa7whxK78L jyJtG2HCCfpAx0qtAkkd1uVSB8jyghhzlc68RYypRlTvchFe2sM+Mbw1PxFF8oi3HtCf robrUjqBKgKN4ryJrkLGzKyzqx5aS9zZkuucFcGEfi0tFfjDhQoJlwYv1csPM6AhNcsB w4/Q== X-Forwarded-Encrypted: i=1; AJvYcCWOCWARvhh/8H+/CdrtzUyg2r0dI/e+l00BBUBwmnyXS5iHXu2sMY8VUsEzc4+mK3hvQMKwM1o40Q==@kvack.org X-Gm-Message-State: AOJu0YxXuwn4ENjqBegIWgGd5ABtZw8m9d3gJm6yxQ0MDwwHDs1dkePq 5aH/8ktVqS02NUPSSZF03k5y51GimY8GkzPkWVcN9Um2k5OGmXJGot3bglvkTxMq+qeGbsnZQZz kwYGUDMt+UYt0TfnYIcTeVw== X-Google-Smtp-Source: AGHT+IHZbq2m2KZ1WT28Acy6uWBe7uvmxINNxxXuS4/4XNP8bRQlXVNAWhWbDMLmHfKnKz0cepkUgU78XTTuk1uhxw== X-Received: from pgg17.prod.google.com ([2002:a05:6a02:4d91:b0:b1f:fba5:9aad]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ce04:b0:22c:3294:f038 with SMTP id d9443c01a7336-231b5e3cf88mr5286885ad.18.1747266250517; Wed, 14 May 2025 16:44:10 -0700 (PDT) Date: Wed, 14 May 2025 16:42:26 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: Subject: [RFC PATCH v2 47/51] KVM: selftests: Support various types of backing sources for private memory From: Ackerley Tng To: kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-fsdevel@vger.kernel.org Cc: ackerleytng@google.com, aik@amd.com, ajones@ventanamicro.com, akpm@linux-foundation.org, amoorthy@google.com, anthony.yznaga@oracle.com, anup@brainfault.org, aou@eecs.berkeley.edu, bfoster@redhat.com, binbin.wu@linux.intel.com, brauner@kernel.org, catalin.marinas@arm.com, chao.p.peng@intel.com, chenhuacai@kernel.org, dave.hansen@intel.com, david@redhat.com, dmatlack@google.com, dwmw@amazon.co.uk, erdemaktas@google.com, fan.du@intel.com, fvdl@google.com, graf@amazon.com, haibo1.xu@intel.com, hch@infradead.org, hughd@google.com, ira.weiny@intel.com, isaku.yamahata@intel.com, jack@suse.cz, james.morse@arm.com, jarkko@kernel.org, jgg@ziepe.ca, jgowans@amazon.com, jhubbard@nvidia.com, jroedel@suse.de, jthoughton@google.com, jun.miao@intel.com, kai.huang@intel.com, keirf@google.com, kent.overstreet@linux.dev, kirill.shutemov@intel.com, liam.merwick@oracle.com, maciej.wieczor-retman@intel.com, mail@maciej.szmigiero.name, maz@kernel.org, mic@digikod.net, michael.roth@amd.com, mpe@ellerman.id.au, muchun.song@linux.dev, nikunj@amd.com, nsaenz@amazon.es, oliver.upton@linux.dev, palmer@dabbelt.com, pankaj.gupta@amd.com, paul.walmsley@sifive.com, pbonzini@redhat.com, pdurrant@amazon.co.uk, peterx@redhat.com, pgonda@google.com, pvorel@suse.cz, qperret@google.com, quic_cvanscha@quicinc.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, quic_svaddagi@quicinc.com, quic_tsoni@quicinc.com, richard.weiyang@gmail.com, rick.p.edgecombe@intel.com, rientjes@google.com, roypat@amazon.co.uk, rppt@kernel.org, seanjc@google.com, shuah@kernel.org, steven.price@arm.com, steven.sistare@oracle.com, suzuki.poulose@arm.com, tabba@google.com, thomas.lendacky@amd.com, usama.arif@bytedance.com, vannapurve@google.com, vbabka@suse.cz, viro@zeniv.linux.org.uk, vkuznets@redhat.com, wei.w.wang@intel.com, will@kernel.org, willy@infradead.org, xiaoyao.li@intel.com, yan.y.zhao@intel.com, yilun.xu@intel.com, yuzenghui@huawei.com, zhiquan1.li@intel.com Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: c73xxt83jjmfn6147gc9zxqhzfbpug7h X-Rspam-User: X-Rspamd-Queue-Id: 994D840004 X-Rspamd-Server: rspam06 X-HE-Tag: 1747266251-566021 X-HE-Meta: U2FsdGVkX19IRkcnAD5PA7mI6NwCtVhOSkadW4ZiOOLYqlGwMvt/nybLriWP0VZMJTgxINpPXwoD20pJcmrQoxl+IxU2ZZ+WFuS8ElvrDKC7X9Ov1B53+2oy2BvH1A2JnH/Pai7ykrVwGsQxRC3F3usm2ToA/jytMU0qoH4vsnA1tbYWzgyBkRNkfEnFM3XGvAzrhunBClYvz/vwzHmKsbk6zOaxJPoGCpMPbfyiI30fZ44RaU6g6KK2J1k4xXg05p7tZ7wosVi1Id8f6eaIC4ayqqfIkppOwje2wZwFhBKso0VwTzKxYAwG4hOWsQBKXI8s42Zxznto5WGVT2AfYcxDRpvqLeDYsbShHusXAE/DIVm6qc96gAsY3/m+pFKNd56dU1urDSQQSsig7VxUOG+Xs89jiUlTpiBDVPq6Zk+x0VhAK6GldgBSHn7/g+3e7H/ZB+S0MCd9IoxCvRtOF7yrAkUKqeas580o2sIcSFn0wxYiKtUagyOtJtQ3tJpviOJ15ae7L6zFo85N+tO2oeCCb9sdbKpbVXFxSLp0aRwM0Y+HBtbE2mQYF8pqc1whZAa8IjUhIhUCzeS9Wyp6r2PBx8EjdnL1P4CHVObXuwA+ZKNqsIUFYo6OaOO2yLfWs1ZE0BzrG0XLhrDQHrm9UTQASMwmiYv31ZDFBCz3WCBS+ZdL3+MQDoHycVWkneqcUkcWwfgeO4RUn1g8OrhnQyBrA50G4nUE2M4d6EKXOkWoqupXz4CaAC4npFEgOUsiF3Abw4RALeXNPUPGs3XD2X+qvxmk/ozUnhLYrwjB41p7LnruPDPbYWdzWIE8hZOHqMlamA82tvDLaEPI0gXlN3HC0hVLE7PDln+Zq4Q1IXmUhwrr5+oIn3CirWXO3oFh0FLDtzVCbrIfHZbJ1rodTtNqDOeINBj35+lUi7iLFPCYvKLrPu1XcXyVABNVarrS4QcXqEuRddGbZn9YuJA m19bzn6k EDY/mA8xN4YeYrH3Cnr/tgHj6jxPx2kEQKCPQ0MSZTA1c4LbPV5uKqdJMgbe168ePdnKSU8/3gRDheiiOsFWXqoIBbv1YWMFqBWkBIVbWHdA3es/Ohzg+lTy6I7Ijk0bsb71X6t18Y44yU0RaPP28JqMlT2sZF7g5agwNUutPrjc4/istAlhEK5kC1ZOctGG0bLZ4MZ1r1+wOSmojYraLcI8ym/0F6DO+jxGH9vpxnZjKOleXsoG0GI0kf9IZJSM2crhCeMfSMZxnHm5k4900c/wU6bEiShMhBcxiMV4zxX6TAiTZSyfDCgJkt74YeYyvAirwTh7+tYYWI8EZsb4h4eGwd4MU/joCQQmtEdpRAYAm7IlsHydTjYaD/Tuv3ZVh4C0AdWke+v/2SX8TylLNZfpdBlEWi/X4VREWtof7Wy01Qftzp/s2pIEYlLCaNL/D4XNa2VtyUbcktwcra2xdO9SknSDoyxZh3mpZ2OtFJsk7kBm2Nhof2p4EblxqIEomsoqsiN37HX3AQlkI00olaTvDMyLgD3W2qSvyHcCJx3GBQnx97O0a6dSvD7vWjLE7XlCizafM7rAH3MAy2OdvhsjX927ds8NuFUI/jbHvpOWIuJ6d5LDE0E7j8MAcCYwFGzCTu0mcL8ut9FawtrEbhkN7fA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 --- .../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 #include #include "linux/kernel.h" +#include +#include #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