From patchwork Tue Feb 11 12:11:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13969540 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 533B3C021A5 for ; Tue, 11 Feb 2025 12:11:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4107F28000A; Tue, 11 Feb 2025 07:11:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 397FC280004; Tue, 11 Feb 2025 07:11:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1EAD728000A; Tue, 11 Feb 2025 07:11:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id F06F7280004 for ; Tue, 11 Feb 2025 07:11:52 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 013858162E for ; Tue, 11 Feb 2025 12:11:51 +0000 (UTC) X-FDA: 83107550064.24.E4763E7 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf09.hostedemail.com (Postfix) with ESMTP id 23AB8140011 for ; Tue, 11 Feb 2025 12:11:49 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=iXk65GHb; spf=pass (imf09.hostedemail.com: domain of 3hD6rZwUKCPEmTUUTZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3hD6rZwUKCPEmTUUTZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739275910; 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=IJ2HgreXKQ9guyRW6q6qFyEzZtqTgMKMejRNrHWMuW4=; b=4NqZH3smcbjcwWuo0qaS/gjn2T+LM3VgF2cmVV9AJGSRcKxi/6eyr2IR899lWvgMIuMNQP PFtSFWqLoAM6Kbgi+r96/TLZFgk8ayYfY1EICbn6KQbfY+ytCe5eWlJWYRLA5sCVdlSnIv cut8mdAbLtMSdF35RQavd7IqutH1518= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739275910; a=rsa-sha256; cv=none; b=ycq/LL7MZKGijd/8jyQRrOxsX5rdog/MnHA4pE0+Zeozc2hCee7MGQ2xpz6GNIWgyCkM7i 0bnsKvkhoUDxyxKw/svGfmk6dUE/RW+dFPCdwKxo9cy3+Zf2epwe5ze+RK0VN9PtyWoT5o gRKK7WNjmbYPiqWDc0uAAeVjsmguJO0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=iXk65GHb; spf=pass (imf09.hostedemail.com: domain of 3hD6rZwUKCPEmTUUTZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3hD6rZwUKCPEmTUUTZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4395586f952so1991295e9.2 for ; Tue, 11 Feb 2025 04:11:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739275909; x=1739880709; 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=IJ2HgreXKQ9guyRW6q6qFyEzZtqTgMKMejRNrHWMuW4=; b=iXk65GHbSbICzzOEbVyYeUgyjHvlOu3k7YxcPueag5d6PuNDJhcYvaKWd9hSGXBzqh Wo20kXBOoMT6NF2v1CebYr25wpYtTx1xFyB7/kf4fCgHllGY7csxXmfrXHGZoqxeqWTC MG7FDp9xwhOc8myyHejhjqZOfr1X9K29mqH6PFbl+cAoOksGPVchnUb6WZXcq5GOuAfo qfcy3JHXMdtG9xqIAfy5VC5gNc2Nz2YVE20s++trhEN+ZQLpVSHJk5MlM1eWAGIMJvsT m0WYqfl73W9FhPinWrl84C3Pj31/CzaFgXxubJxd5oegzoLeocjfjbqRBUaO7CnRoiUx O1lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739275909; x=1739880709; 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=IJ2HgreXKQ9guyRW6q6qFyEzZtqTgMKMejRNrHWMuW4=; b=L8h1j7QJcXdCzIyh4vLY0FFGP9xFcIYAbiC3W9Yskg8Dd4ZpomYL3xI/DlZVlFyjpn RC8nkHwO96C2Aj+P/oc3k3CtAhT/oZW/SD5Szi/neO5WzOQWfQDtoE5xU1YeYha7YrFY /WSm7FohD+zAakGmn007KAFZZ07BdPDUmslqnSTJuENk+Bp85HJg8bn/rFFqwokaaIs8 Y1SQ1b3q2lBerthkAHm0idjl0iWSmrGYCvbfidoSpZTI4+tCEmW8wj2/69aw3kQx2mmP sacYeukKepnaK1UEDrFHc9Mhis0a/HPLFvG3d+qjrzO9cnJfTFa55vMKe4pG8RtGuNMS 4uvg== X-Forwarded-Encrypted: i=1; AJvYcCUoJDb8vJSYiaFZ6OVcmzVgh8LPGRvZZi/OidjLT40RDzHG4xsLvVofKNkLTCl8vs3h4OClwLdx0A==@kvack.org X-Gm-Message-State: AOJu0Yw2MCh2PM3P0F89BZhmBl+zz322xNeDINJRZAsjJZVw3YcgvP0C 5M+jBEecE4OBFiii2rVlFo359EyG1sFdk0TQ/UZbU2OSbYy3pIIunfazvGN9L2DBJJFE7q2oig= = X-Google-Smtp-Source: AGHT+IEj4XD0sGiUgxvZj8X1oAi0zbv38fYpf93jNGmxC+Jnpk8S/pLCTD5RS0c/7wEygEIr3cX4yUmedQ== X-Received: from wmbeq3.prod.google.com ([2002:a05:600c:8483:b0:436:1796:9989]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a0a:b0:434:a525:7257 with SMTP id 5b1f17b1804b1-439249abea0mr120725365e9.21.1739275908711; Tue, 11 Feb 2025 04:11:48 -0800 (PST) Date: Tue, 11 Feb 2025 12:11:25 +0000 In-Reply-To: <20250211121128.703390-1-tabba@google.com> Mime-Version: 1.0 References: <20250211121128.703390-1-tabba@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250211121128.703390-10-tabba@google.com> Subject: [PATCH v3 09/11] KVM: arm64: Introduce KVM_VM_TYPE_ARM_SW_PROTECTED machine type From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org Cc: pbonzini@redhat.com, chenhuacai@kernel.org, mpe@ellerman.id.au, anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, seanjc@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, willy@infradead.org, akpm@linux-foundation.org, xiaoyao.li@intel.com, yilun.xu@intel.com, chao.p.peng@linux.intel.com, jarkko@kernel.org, amoorthy@google.com, dmatlack@google.com, yu.c.zhang@linux.intel.com, isaku.yamahata@intel.com, mic@digikod.net, vbabka@suse.cz, vannapurve@google.com, ackerleytng@google.com, mail@maciej.szmigiero.name, david@redhat.com, michael.roth@amd.com, wei.w.wang@intel.com, liam.merwick@oracle.com, isaku.yamahata@gmail.com, kirill.shutemov@linux.intel.com, suzuki.poulose@arm.com, steven.price@arm.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_tsoni@quicinc.com, quic_svaddagi@quicinc.com, quic_cvanscha@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, catalin.marinas@arm.com, james.morse@arm.com, yuzenghui@huawei.com, oliver.upton@linux.dev, maz@kernel.org, will@kernel.org, qperret@google.com, keirf@google.com, roypat@amazon.co.uk, shuah@kernel.org, hch@infradead.org, jgg@nvidia.com, rientjes@google.com, jhubbard@nvidia.com, fvdl@google.com, hughd@google.com, jthoughton@google.com, tabba@google.com X-Rspam-User: X-Rspamd-Queue-Id: 23AB8140011 X-Rspamd-Server: rspam07 X-Stat-Signature: toe98ksdw88fjuxzxqsjq6cdkahb4gtg X-HE-Tag: 1739275909-119498 X-HE-Meta: U2FsdGVkX1+Lb++PKZH4rDhcu6D+cBBx7jwDtMuAtTOjsLns4uTYlo6t+KSogq86thBRZLDNXGqj/P2L38oseUlnTOUSQfq1MfYTqgvvZUr4EKbXKEUFTd0g8m3jq11lPYnYQAPdmvN5GUrUOLsX0BNv4xYwPvF0YvI2FEoufu/h4UhowAEe6rc4UaIBs+JfGQaVSbuzxx0DIVHCsaI5RaYY4kVeVK3Cw/yiG/ARo6KYcJXxyI/mt5Not8W7oPEmRn0ptrz+mVEoNhuviiBHlCdVyL+x8DKvVyODzvzF+ADeyb9X4IF1v/gB1ilrHGz3t3Fme1S5Kqm9CM9mk94x6rEhUGWK74dwYV6/A+LVLwwKdXMyxWXJDjPgANK/bvzZ+fC1RQJOHvW4R5+OIN502+Tx4wEe8VOuUR9VmdoH8sKdkFLIsd4hRwFnsJhQEwNNTQMX5kB0mL8yFYshPWjn+DnjUdqWc9ERCe8YrhlADkUSfBOjXlxXFh/0HVDIHujrafj9SK1yAsweoEZ+IH93OyVSQYUmVETvaQnp/Nz3HV7Nj8SciQTHOaPslMGpDcvV3LwueQmHTJS/NFXcQD2bnK6y9W7UwV1yl5vTszWYQIJMwsbdqPqlnkUTX6UjxKzjt46wue91VT99W/DjwFwz+Yms4RCCSDDxCfaQmqwo2ycV7r7qvG2s3KBc2fvnTK+WF5aAQ4ahJ/bdWzLCSxWdMAm1nl+PgF7jA/s5UuPxX784iQ3vlLA0MhsP7GhKGg4tCt8VqFKaPjSFIV09Lof5cIdh6ey0hfUz0Cf6MEGDKzvXdwXCfzTAb5oNAKc4I17piDXMNEJrKg9FDYxgXT466wibI73w1/DdmLdT0lkyDfg3RivdKN5KWysykSberVHbxMfpPUCsEqy/XwNRi5TUIicadPMQz+IX+0RpDfFBXq6W0NkL6K+ICVQWE/5J6Da90fi2FR5EgZOthNFqUgt x/mEGXGN abol0QUv72IzZi5IsvKvuDxGPQwCIVHXU9FpsFVfKkJVYHVwFBDMX42A1vNjtYXFIv7BxZ0qU76iaIGohmIXs8tdHpOQotS8FyPUKPV9iCMebyvBEBU24903pVPRln0zqVRaZT8GRIhqlJjywXFNT9gdDnRAPn9rAXsxS8fcextWzwxUxzH6QSV8ZGECzoGPRnHUHx3lYgzckn8BRzQrm1v7K/cBcAoNUKXq5Dz1hgP/h3l+S6UtLQ5TmeyRO5Z+nICV4n1FczhhEa5oKcb7eHlvLf9kBEMrYDo+LWtVXdmKvovJgrs0LFkZ4Fk21e35fFE0wo6Wl/SjaGFF1gQN45jRvFBa32Q8HkdjX9KKwY9csdHhraf1PotnBGgAiiNUWWnHnL9HPCFyPLFpYA2DXwYyO4XtJx5+O3FW0k38/5s1+8fHLB0UKNLRBcYHjbM9x4QMMJAsCW+pPho2KaD/CujSR3Tqb+1EwIPRGwflGrZ7USWKlHq5EuvtRiHoIbzd5GxBXaWr8u2C7gUMg/34PDpHcFcBHlW8MXFoQeQucOzqnlOUSLwId0yWwEy9bGU0uk8im1shQ9Ve1ocmmajIkDqGZ9zPvViQct4DUV2+2QRuh41yywPO1/yCLrowpPUWNmMSL6XEjRdUvw0+QywKM6i67XQ== 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: Introduce a new virtual machine type, KVM_VM_TYPE_ARM_SW_PROTECTED, to serve as a development and testing vehicle for Confidential (CoCo) VMs, similar to the x86 KVM_X86_SW_PROTECTED_VM type. Initially, this is used to test guest_memfd without needing any underlying protection. Similar to the x86 type, this is currently only for development and testing. Do not use KVM_VM_TYPE_ARM_SW_PROTECTED for "real" VMs, and especially not in production. The behavior and effective ABI for software-protected VMs is unstable. Signed-off-by: Fuad Tabba --- Documentation/virt/kvm/api.rst | 5 +++++ arch/arm64/include/asm/kvm_host.h | 10 ++++++++++ arch/arm64/kvm/arm.c | 5 +++++ arch/arm64/kvm/mmu.c | 3 --- include/uapi/linux/kvm.h | 6 ++++++ 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index 2b52eb77e29c..0fccee4feee7 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -214,6 +214,11 @@ exposed by the guest CPUs in ID_AA64MMFR0_EL1[PARange]. It only affects size of the address translated by the stage2 level (guest physical to host physical address translations). +KVM_VM_TYPE_ARM_SW_PROTECTED is currently only for development and testing of +confidential VMs without having underlying support. Do not use +KVM_VM_TYPE_ARM_SW_PROTECTED for "real" VMs, and especially not in production. +The behavior and effective ABI for software-protected VMs is unstable. + 4.3 KVM_GET_MSR_INDEX_LIST, KVM_GET_MSR_FEATURE_INDEX_LIST ---------------------------------------------------------- diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 7cfa024de4e3..a4276d56f54d 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -383,6 +383,8 @@ struct kvm_arch { * the associated pKVM instance in the hypervisor. */ struct kvm_protected_vm pkvm; + + unsigned long vm_type; }; struct kvm_vcpu_fault_info { @@ -1555,4 +1557,12 @@ void kvm_set_vm_id_reg(struct kvm *kvm, u32 reg, u64 val); #define kvm_has_s1poe(k) \ (kvm_has_feat((k), ID_AA64MMFR3_EL1, S1POE, IMP)) +#define kvm_arch_has_private_mem(kvm) \ + (IS_ENABLED(CONFIG_KVM_PRIVATE_MEM) && \ + ((kvm)->arch.vm_type & KVM_VM_TYPE_ARM_SW_PROTECTED)) + +#define kvm_arch_gmem_supports_shared_mem(kvm) \ + (IS_ENABLED(CONFIG_KVM_GMEM_SHARED_MEM) && \ + ((kvm)->arch.vm_type & KVM_VM_TYPE_ARM_SW_PROTECTED)) + #endif /* __ARM64_KVM_HOST_H__ */ diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 071a7d75be68..a2066db52ada 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -146,6 +146,9 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) { int ret; + if (type & ~KVM_VM_TYPE_MASK) + return -EINVAL; + mutex_init(&kvm->arch.config_lock); #ifdef CONFIG_LOCKDEP @@ -187,6 +190,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) bitmap_zero(kvm->arch.vcpu_features, KVM_VCPU_MAX_FEATURES); + kvm->arch.vm_type = type; + return 0; err_free_cpumask: diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 305060518766..b89649d31127 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -882,9 +882,6 @@ static int kvm_init_ipa_range(struct kvm_s2_mmu *mmu, unsigned long type) u64 mmfr0, mmfr1; u32 phys_shift; - if (type & ~KVM_VM_TYPE_ARM_IPA_SIZE_MASK) - return -EINVAL; - phys_shift = KVM_VM_TYPE_ARM_IPA_SIZE(type); if (is_protected_kvm_enabled()) { phys_shift = kvm_ipa_limit; diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 117937a895da..f155d3781e08 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -652,6 +652,12 @@ struct kvm_enable_cap { #define KVM_VM_TYPE_ARM_IPA_SIZE_MASK 0xffULL #define KVM_VM_TYPE_ARM_IPA_SIZE(x) \ ((x) & KVM_VM_TYPE_ARM_IPA_SIZE_MASK) + +#define KVM_VM_TYPE_ARM_SW_PROTECTED (1UL << 9) + +#define KVM_VM_TYPE_MASK (KVM_VM_TYPE_ARM_IPA_SIZE_MASK | \ + KVM_VM_TYPE_ARM_SW_PROTECTED) + /* * ioctls for /dev/kvm fds: */