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 DD1D2CD1288 for ; Sat, 30 Mar 2024 19:58:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 67B166B007B; Sat, 30 Mar 2024 15:58:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 602386B0083; Sat, 30 Mar 2024 15:58:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 455186B0085; Sat, 30 Mar 2024 15:58:55 -0400 (EDT) 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 22DEC6B007B for ; Sat, 30 Mar 2024 15:58:55 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D85E14020F for ; Sat, 30 Mar 2024 19:58:54 +0000 (UTC) X-FDA: 81954768588.04.38C54CB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 798BC40011 for ; Sat, 30 Mar 2024 19:58:52 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=RP0etF69; spf=pass (imf04.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711828732; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YCminwhNWaoRY7+GIgboB+tGovxzzkyeTmQzRWRZumA=; b=v+8kf+wxUPgh/WNHjclOxXSme/RrMK10mOlOx+7vGldWHdnqVKEnAuYkxERoAT8I7OrnQS 3+EbB1iE3nR5Rsh0GR5ZxL+2ZY5ggS0gDeLfgW6Ooz/YbSv5lZ8W3jIUWIjT+TdmiRpKCK e8Z//okHSdDY6AGyibDnizpTdfkaDp0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711828732; a=rsa-sha256; cv=none; b=Hfy26wQ2HyOSlAEFT92c2OmSye1j8zpYVPIPTiEAvXKfECjLEDB6oSonOEkOMVRBPParCm EZsZ9yiN025vx5YGY0QWjeZ2YCQZ0HcAduwiWI2TyuINkDUpMYhL2r69OGVuX36rzQmNU+ rs212XA3xGxXnHTD8pq9sS2V3lF7Eyw= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=RP0etF69; spf=pass (imf04.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711828731; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=YCminwhNWaoRY7+GIgboB+tGovxzzkyeTmQzRWRZumA=; b=RP0etF69FeQffqzIgMHa3QNuRI8h/hLgHiOsZnbgRkZThsQZSQ/6SgkKNp/DV3kd+uViKx Ey1aCEc79wNr/mk1sq3t9cHbjh4jwaAiLFafHxKrCZJ2lJ+Lwo7odODAKtuL/oBIE1Ljys y0bT0yRbj1KK9sSgxaREHG0k4KC8QNE= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-470-qBSr5gFDOCez6B1IYuaHvg-1; Sat, 30 Mar 2024 15:58:48 -0400 X-MC-Unique: qBSr5gFDOCez6B1IYuaHvg-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a4e4a0dcee5so52013566b.1 for ; Sat, 30 Mar 2024 12:58:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711828727; x=1712433527; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YCminwhNWaoRY7+GIgboB+tGovxzzkyeTmQzRWRZumA=; b=JdcnWizyWTWQ+8Cj4vU36hZc42y+QX1QCSgYaKPKq6osS5XkMyq4huU20vRUQCUW33 bO9W5yB0ouq33dctRqXAYfjCvaa9dHEsKI6pRe+mBS35QAgBp0cnc24h0ULQqsrAqTZ6 RdPMV9okdJlnfMIRvBXqJYeG9fnQcVzczuCFXQIHm+BSewNEW2FkvDBqKpIck6AibQ39 /Xrjp39T1TPphplDDjuGKzAnV8QggZOsj0wIf75UuZUp7alKx1J69kX3TPzsismlHvqB HfgeqaO6Ikqfy3GEByXxXUjBwaBMAEl7862L55Egqvaote+FnyleoePO0ZciN2PljrRw xsZA== X-Forwarded-Encrypted: i=1; AJvYcCXbJ381QF9CwAk6zMzOr/lmHW+7Y4HTRVEMzioaWgcRipIWHqwv9Q3bpPYAILkxuEZYVRAb3HkTjtdO8WWynvJsdVU= X-Gm-Message-State: AOJu0YxTaRoUUbG/MFrYFtWJ+j/49W2jHUlXjPT0DDpCfjhj44iOTb2v 7h6pKizwPN96smVwk6URh0QnMRlnC/7tuLqG4IqgJcHpHHv0U/pe92xSxGLUGS84Mh80iBeIdbM qE8VidjAoWJPswEsU6EcgtAsJ0zzl4L0TKQGtWKfoN0tT46QA X-Received: by 2002:a17:906:1c4a:b0:a4e:42f3:3c87 with SMTP id l10-20020a1709061c4a00b00a4e42f33c87mr2570760ejg.60.1711828726980; Sat, 30 Mar 2024 12:58:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHy+R3udwrEk7qE8kYGBy3X2m7ot4CCo2QHYfwudjqdFowZGSCCNoO42aevE6XNUz55Zs9VnA== X-Received: by 2002:a17:906:1c4a:b0:a4e:42f3:3c87 with SMTP id l10-20020a1709061c4a00b00a4e42f33c87mr2570749ejg.60.1711828726490; Sat, 30 Mar 2024 12:58:46 -0700 (PDT) Received: from [192.168.10.4] ([151.95.49.219]) by smtp.googlemail.com with ESMTPSA id wk8-20020a170907054800b00a4e2d7dd2d8sm2617304ejb.182.2024.03.30.12.58.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 Mar 2024 12:58:45 -0700 (PDT) Message-ID: <1296cfd8-3986-4c2f-be94-771ae3fb84f2@redhat.com> Date: Sat, 30 Mar 2024 20:58:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v12 09/29] KVM: SEV: Add initial SEV-SNP support To: Michael Roth , kvm@vger.kernel.org Cc: linux-coco@lists.linux.dev, linux-mm@kvack.org, linux-crypto@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, jroedel@suse.de, thomas.lendacky@amd.com, hpa@zytor.com, ardb@kernel.org, seanjc@google.com, vkuznets@redhat.com, jmattson@google.com, luto@kernel.org, dave.hansen@linux.intel.com, slp@redhat.com, pgonda@google.com, peterz@infradead.org, srinivas.pandruvada@linux.intel.com, rientjes@google.com, dovmurik@linux.ibm.com, tobin@ibm.com, bp@alien8.de, vbabka@suse.cz, kirill@shutemov.name, ak@linux.intel.com, tony.luck@intel.com, sathyanarayanan.kuppuswamy@linux.intel.com, alpergun@google.com, jarkko@kernel.org, ashish.kalra@amd.com, nikunj.dadhania@amd.com, pankaj.gupta@amd.com, liam.merwick@oracle.com, Brijesh Singh References: <20240329225835.400662-1-michael.roth@amd.com> <20240329225835.400662-10-michael.roth@amd.com> From: Paolo Bonzini Autocrypt: addr=pbonzini@redhat.com; keydata= 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 In-Reply-To: <20240329225835.400662-10-michael.roth@amd.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 798BC40011 X-Rspam-User: X-Stat-Signature: 7x3jbh5qi83369h694ytqq7wd4trt77a X-Rspamd-Server: rspam03 X-HE-Tag: 1711828732-372307 X-HE-Meta: U2FsdGVkX1+SxDKgZws10qR0SgJcwAO1XLYJVDgCcElhxFyf8j5cn9IZyCmOf9jMCMHb44OWmm1rwG5gp67HnCxsfwAJ72TpeDDCgn5EOo38oTScaRwCXIMR0217+brb1XNF/5jt2MYp9Huv+T1GW1p5dtY/9V36Z9YkhJ43ZIMRmpOEHi/jHAN/ZjtbM4pszuGQMFd08F5MWkITaSshA0wx6y55CdFp8jdPoAN8/95Ys5xdp6cXGErkYuA3xvoKoDoTjy4f54ISaBJeUV2jrLpCOfyEy5m5gGplYTdXURjCsGHJpCuoQ3+dVYsSROq7YUC9ITv6meT4YJC+Z5g9lkXR+WNUWeovG67jn7TKHP8x96zKGOX+i03QimIZM2TASO87fAKtv62akHIp3DPH64//wzfKWjpnRk+2c4LB935yzPx9Q7TQWQpw6B9qCHEJZI/DW2ksI/jV1Kx73PFnqfA8N/43oFCf1IzqEzsSXsxVHFwwssqY249/OLaUSvprDrVQd+4+VRJcs7iDno5RJohGKFDGKIPN74aYHqEninm0Tnj5GOf51ni7c+QHnt9+fxexwnbxwwI4I0IV4Yn7Lsj/0IwMXq/dc6X/aL6zA2wyG28G+xr1zaA9G/mKY8cmPp/VJgxvqAiNIevxgh55usMaGPcgrHXdC7EyUx7SbRCvTiPFS6F/vRR+cnW/I82fBD+ggwJDs21MNFUMohe1IGCp/D1XyKpoPG0VGP/P3nWeQH6JGKrlAzRFh33C114pTaD4+3mePkO0iJ+R1HsC7TfdIdCmlmlmJMLmek//ScvKgI5utrU8hP6lfUWhGofRxbXfZXFkeAuaE4udZqu4MMr6rrst6PFCD9DKXmfGz4UsyKUhMJJ1e4lk80PVDGofaO0Fv78am7musItB7JKUKybD4sbn+tcGhf7KhwbC15XzBp+YJHtvBE7uKyZId25thSVnl51qXNazxna2Ubr 06IYaFjK GPYlpVvlYn8u7qfUadCO8Bj1EFV/McKVrmWvJL2eM96XWwCm4Y+XyEYG5sAWpFW5LPnJb8MD7xF0vgiEW3Xew7N2Yf4m9wMqkVFKRiLamo/ZQ6P/ny2aL8/wo7vWc6V4H1mv2O6QjvRdPoBDeXg5vcCFhwjUT3By7TLoVt2w7BzIj/tqmScgG6Tszs2bx5doj1jY68GGMBgkkrbbzVo3DNk6qZygoIthpm2WT+jnpOrL7PYMe7nslCTYRMc5BcoQErGIcLR9kNUuMYzKMCNxD9c4Jyyfqq28LAjFmHnjndKGHi1zGSFpANky3ikzVpJudxX8arLCzkYsEYjozHQpSEGbQVR5LYktv1v554C/s3wPoa8PZX69AtIkmDmbc/6L+8oX9fJJk5nTp/wUkXh6L6pSSVIZ+N1D+Tt+cqY1hw4rEU+Rpu3mzE2lqrJ7hVOYL158TbqEm3ztzYXmGwzGH3QhqWLVaG7BjcVd2iF50bVhnrTLHUToAjVEyqxua2Tq0YrxQ 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: On 3/29/24 23:58, Michael Roth wrote: > SEV-SNP builds upon existing SEV and SEV-ES functionality while adding > new hardware-based security protection. SEV-SNP adds strong memory > encryption and integrity protection to help prevent malicious > hypervisor-based attacks such as data replay, memory re-mapping, and > more, to create an isolated execution environment. > > Define a new KVM_X86_SNP_VM type which makes use of these capabilities > and extend the KVM_SEV_INIT2 ioctl to support it. Also add a basic > helper to check whether SNP is enabled. > > Signed-off-by: Brijesh Singh > Signed-off-by: Ashish Kalra > [mdr: commit fixups, use similar ASID reporting as with SEV/SEV-ES] > Signed-off-by: Michael Roth > --- > arch/x86/include/asm/svm.h | 3 ++- > arch/x86/include/uapi/asm/kvm.h | 1 + > arch/x86/kvm/svm/sev.c | 21 ++++++++++++++++++++- > arch/x86/kvm/svm/svm.c | 3 ++- > arch/x86/kvm/svm/svm.h | 12 ++++++++++++ > arch/x86/kvm/x86.c | 2 +- > 6 files changed, 38 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h > index 728c98175b9c..544a43c1cf11 100644 > --- a/arch/x86/include/asm/svm.h > +++ b/arch/x86/include/asm/svm.h > @@ -285,7 +285,8 @@ static_assert((X2AVIC_MAX_PHYSICAL_ID & AVIC_PHYSICAL_MAX_INDEX_MASK) == X2AVIC_ > > #define AVIC_HPA_MASK ~((0xFFFULL << 52) | 0xFFF) > > -#define SVM_SEV_FEAT_DEBUG_SWAP BIT(5) > +#define SVM_SEV_FEAT_SNP_ACTIVE BIT(0) > +#define SVM_SEV_FEAT_DEBUG_SWAP BIT(5) > > struct vmcb_seg { > u16 selector; > diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h > index 51b13080ed4b..725b75cfe9ff 100644 > --- a/arch/x86/include/uapi/asm/kvm.h > +++ b/arch/x86/include/uapi/asm/kvm.h > @@ -868,5 +868,6 @@ struct kvm_hyperv_eventfd { > #define KVM_X86_SW_PROTECTED_VM 1 > #define KVM_X86_SEV_VM 2 > #define KVM_X86_SEV_ES_VM 3 > +#define KVM_X86_SNP_VM 4 > > #endif /* _ASM_X86_KVM_H */ > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > index 1e65f5634ad3..3d9771163562 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -46,6 +46,9 @@ module_param_named(sev, sev_enabled, bool, 0444); > static bool sev_es_enabled = true; > module_param_named(sev_es, sev_es_enabled, bool, 0444); > > +/* enable/disable SEV-SNP support */ > +static bool sev_snp_enabled; > + > /* enable/disable SEV-ES DebugSwap support */ > static bool sev_es_debug_swap_enabled = true; > module_param_named(debug_swap, sev_es_debug_swap_enabled, bool, 0444); > @@ -275,6 +278,9 @@ static int __sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp, > sev->es_active = es_active; > sev->vmsa_features = data->vmsa_features; > > + if (vm_type == KVM_X86_SNP_VM) > + sev->vmsa_features |= SVM_SEV_FEAT_SNP_ACTIVE; > + > ret = sev_asid_new(sev); > if (ret) > goto e_no_asid; > @@ -326,7 +332,8 @@ static int sev_guest_init2(struct kvm *kvm, struct kvm_sev_cmd *argp) > return -EINVAL; > > if (kvm->arch.vm_type != KVM_X86_SEV_VM && > - kvm->arch.vm_type != KVM_X86_SEV_ES_VM) > + kvm->arch.vm_type != KVM_X86_SEV_ES_VM && > + kvm->arch.vm_type != KVM_X86_SNP_VM) > return -EINVAL; > > if (copy_from_user(&data, u64_to_user_ptr(argp->data), sizeof(data))) > @@ -2297,11 +2304,16 @@ void __init sev_set_cpu_caps(void) > kvm_cpu_cap_set(X86_FEATURE_SEV_ES); > kvm_caps.supported_vm_types |= BIT(KVM_X86_SEV_ES_VM); > } > + if (sev_snp_enabled) { > + kvm_cpu_cap_set(X86_FEATURE_SEV_SNP); > + kvm_caps.supported_vm_types |= BIT(KVM_X86_SNP_VM); > + } > } > > void __init sev_hardware_setup(void) > { > unsigned int eax, ebx, ecx, edx, sev_asid_count, sev_es_asid_count; > + bool sev_snp_supported = false; > bool sev_es_supported = false; > bool sev_supported = false; > > @@ -2382,6 +2394,7 @@ void __init sev_hardware_setup(void) > sev_es_asid_count = min_sev_asid - 1; > WARN_ON_ONCE(misc_cg_set_capacity(MISC_CG_RES_SEV_ES, sev_es_asid_count)); > sev_es_supported = true; > + sev_snp_supported = sev_snp_enabled && cc_platform_has(CC_ATTR_HOST_SEV_SNP); > > out: > if (boot_cpu_has(X86_FEATURE_SEV)) > @@ -2394,9 +2407,15 @@ void __init sev_hardware_setup(void) > pr_info("SEV-ES %s (ASIDs %u - %u)\n", > sev_es_supported ? "enabled" : "disabled", > min_sev_asid > 1 ? 1 : 0, min_sev_asid - 1); > + if (boot_cpu_has(X86_FEATURE_SEV_SNP)) > + pr_info("SEV-SNP %s (ASIDs %u - %u)\n", > + sev_snp_supported ? "enabled" : "disabled", > + min_sev_asid > 1 ? 1 : 0, min_sev_asid - 1); > > sev_enabled = sev_supported; > sev_es_enabled = sev_es_supported; > + sev_snp_enabled = sev_snp_supported; > + > if (!sev_es_enabled || !cpu_feature_enabled(X86_FEATURE_DEBUG_SWAP) || > !cpu_feature_enabled(X86_FEATURE_NO_NESTED_DATA_BP)) > sev_es_debug_swap_enabled = false; > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index 0f3b59da0d4a..2c162f6a1d78 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -4890,7 +4890,8 @@ static int svm_vm_init(struct kvm *kvm) > > if (type != KVM_X86_DEFAULT_VM && > type != KVM_X86_SW_PROTECTED_VM) { > - kvm->arch.has_protected_state = (type == KVM_X86_SEV_ES_VM); > + kvm->arch.has_protected_state = > + (type == KVM_X86_SEV_ES_VM || type == KVM_X86_SNP_VM); > to_kvm_sev_info(kvm)->need_init = true; > } > > diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h > index 157eb3f65269..4a01a81dd9b9 100644 > --- a/arch/x86/kvm/svm/svm.h > +++ b/arch/x86/kvm/svm/svm.h > @@ -348,6 +348,18 @@ static __always_inline bool sev_es_guest(struct kvm *kvm) > #endif > } > > +static __always_inline bool sev_snp_guest(struct kvm *kvm) > +{ > +#ifdef CONFIG_KVM_AMD_SEV > + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; > + > + return (sev->vmsa_features & SVM_SEV_FEAT_SNP_ACTIVE) && > + !WARN_ON_ONCE(!sev_es_guest(kvm)); > +#else > + return false; > +#endif > +} > + > static inline void vmcb_mark_all_dirty(struct vmcb *vmcb) > { > vmcb->control.clean = 0; > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 64eda7949f09..f85735b6235d 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -12603,7 +12603,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) > > kvm->arch.vm_type = type; > kvm->arch.has_private_mem = > - (type == KVM_X86_SW_PROTECTED_VM); > + (type == KVM_X86_SW_PROTECTED_VM || type == KVM_X86_SNP_VM); > > ret = kvm_page_track_init(kvm); > if (ret) Reviewed-by: Paolo Bonzini Paolo