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 DFEB2C4345F for ; Fri, 19 Apr 2024 11:58:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 75C976B0093; Fri, 19 Apr 2024 07:58:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 70E4E6B0095; Fri, 19 Apr 2024 07:58:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5ADF36B0096; Fri, 19 Apr 2024 07:58:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 39BFD6B0093 for ; Fri, 19 Apr 2024 07:58:25 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B42421C0B83 for ; Fri, 19 Apr 2024 11:58:24 +0000 (UTC) X-FDA: 82026133728.05.1209377 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf02.hostedemail.com (Postfix) with ESMTP id B344B80008 for ; Fri, 19 Apr 2024 11:58:22 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Xdt2xboE; spf=pass (imf02.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713527902; a=rsa-sha256; cv=none; b=cIOmighQerEPzYHsO0RtX95No2Z/N4fQUPd4P992fBhtXB/JUe/hAxe0btQpFeENLbaPAm pATWNKcrl3t/AxpzlKEtilkafI8+lmzCvRGRhB8zNgpVS3GOmLKzcuiqsfsoBo+xdKflo8 UwCZmnVZSzyn5NASNnsyIPqEBdJhhDU= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Xdt2xboE; spf=pass (imf02.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.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=1713527902; 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=CwxWxYK6yFiOYVQyI4AiRXsN6yKGGl+jXN1TxSL+A3k=; b=qWD446C5MteumABTsxKouH3lsBZZnAV8eCgh0ZSzr7C3mVAg1ty1WOD5z1qfzHn7EHryCK 9Vr059KWip5/J8/wcwmAbO7sICLmvE69CcC2EoA0fEE0ioSrliFd5DBOd3k1RZJ276Aw4i O7AWZ//k5oxsusSTl1qfdJ8QbDLWn3E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713527902; 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; bh=CwxWxYK6yFiOYVQyI4AiRXsN6yKGGl+jXN1TxSL+A3k=; b=Xdt2xboEkSlSfrgTt+K0xHvQkemxaTVbna6s7Ne4POk21y3cwQIM+eBaTGTjBy/Kq1AZJA 20DsHL/8pnJww8RKcWRvbcDdIszs6KAGgxVzE6UcKOp7tlzW5nt/j2+Ou+LMbVlglgIGJV R816IploLTmTqxhdkZcMSHsLljb/lSE= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-83-tgYg8FFgMTeItMjPMZ2UWA-1; Fri, 19 Apr 2024 07:58:20 -0400 X-MC-Unique: tgYg8FFgMTeItMjPMZ2UWA-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3479b511725so1358782f8f.3 for ; Fri, 19 Apr 2024 04:58:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713527899; x=1714132699; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CwxWxYK6yFiOYVQyI4AiRXsN6yKGGl+jXN1TxSL+A3k=; b=udZ2oLqmpF2UTkVh6F5HUiRiElxSpfJ7c3D30t1DlrWlIW7IH4Cs/o4FLHZdF307Cn 5FclodGILFs0k2gLPt4y4OnN5U9DxNIb46k76r8lfMjanoD5InAuC+tw6ZgbQS9T8jtp kZz839FFouN14olFi5wofwSsEjWhjLqcDBgfcmdMMcpLzABhSPPV6LfV6jCu5f0kR0bk 1Qz1XqCi6WU34TVv1jPk070oiAsM1Klbhn5Hb+M+Doga+QQE1HLwqGHvAJwNlmXQwEVl 4ISddsIYd+4+PnjcxrX6QRPYvWpWLzMcEXNlisMuld9ccXQE/dFfwYSWj4Xg+tFZxuN3 0D7A== X-Forwarded-Encrypted: i=1; AJvYcCV4FJGd0sx1/NXt37vDZTuvrAmVvEXl8YVWpnRGyibicKA/6jvAiZHNs9t3xuPN//iD+F3rv/dL6B3oy46+ZfS6FBI= X-Gm-Message-State: AOJu0YwanhYnNMzgJFgBxzdeuEV2K4s2Bam/CkW9qkh1/eZDVAN4uHXJ gZIwp9vN/s9MppBkOhYtrOj5b6ZXWMQSyLDHLLSffECmLOeLyzfnBrXPSP12Oe0t1gwuf5EhYEi EzpxejDadXhQGtX2dQqM2X/YHz1BH3lYJLc3aggCNMPb2IvFxYDLuRy6GHkAvMJgEmKhSt5yQsV jAoh6BE6u5Hf8206Wj9HAVY1k= X-Received: by 2002:a5d:50d1:0:b0:33d:b376:8a07 with SMTP id f17-20020a5d50d1000000b0033db3768a07mr1167232wrt.8.1713527899434; Fri, 19 Apr 2024 04:58:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHM7xQDK90cgpkqMe8qHCL2Dpb0GVAovL4zmOZ8Y/f+iUHPX7N3URgMIDSP1Agr9DUXYvSVNpPPSl3w69ic80Y= X-Received: by 2002:a5d:50d1:0:b0:33d:b376:8a07 with SMTP id f17-20020a5d50d1000000b0033db3768a07mr1167205wrt.8.1713527899035; Fri, 19 Apr 2024 04:58:19 -0700 (PDT) MIME-Version: 1.0 References: <20240418194133.1452059-1-michael.roth@amd.com> <20240418194133.1452059-9-michael.roth@amd.com> In-Reply-To: <20240418194133.1452059-9-michael.roth@amd.com> From: Paolo Bonzini Date: Fri, 19 Apr 2024 13:58:07 +0200 Message-ID: Subject: Re: [PATCH v13 08/26] KVM: SEV: Add initial SEV-SNP support To: Michael Roth Cc: kvm@vger.kernel.org, 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: B344B80008 X-Stat-Signature: 4c4s6kh7g16s85pyjk4971yumjwdc3dw X-Rspam-User: X-HE-Tag: 1713527902-700065 X-HE-Meta: U2FsdGVkX1/JsrkUijIdO0/2arCOrcQKinRx7uVRC7a7/1zlRIfLRuRt4fOgBvnieqGsI7gTW0uC/e+v5QKYXjwzKX0V5nUrdug595jH2H/CprJrZZWZkWY9busFGC4bKgUrClfWkznjae7HBdFtI65VxP/e+bPsizssZ1iGjVtZuBoIwyzk2Ya3e/w1PpHrRgs7YDibdz3OM5MPEQ6ni4z8NIGe0SzN6+6MOSPMDxFxAy/kvaUxyERnzR2WdHREkLRfvLY8YHGqWV9xECXVipayy7J/bwG5+kno3WKWyt24eqHrK0Tu/Rx8AP23Nymso0aESOnN+Q++2ER62/UL6Jad50uTtx6SjoSQQmf754CxfueX6qa9SDmASK4kA4INHDTImbLh1rB7WkMoaZUrRRFLNfbmf7v6ybbE7I4OUSiczEpmvLxbo6KOPhA6gPle32bv9Gh7NnnxbEmSyYr+10106N17ayohg2SrhvIaNq93Ds+nVwPOtAjQ+e9wFGz9CTyYNtUDZfCVZLLJ/C33BNB9pdV5TyE/j1kugJGnVs5yD3J+vMhBrc4OQs0OIiYnH8Ug72hCXZTqqfD2Euhx1wNFLDQz1yIFIA3wsuR3rLNyWqe8b4GWoEqRE/yi4ip3H1SmN3iwdWo2kjUSkHgpB6YIXO6Yklkcgd0mXvvZs/rQM2efK2sghekzXS0CbnkInguzpRnNoB1mW4ovEm8Reer7lqolHqCSYKRsQzqrmtAu8Y1py4bak+7N6pIuSXUtkfGiIJr8/Y26InLwsLiPifr+NdGQfB5svHoI2a17pN9gzQwySwfbHtx5UATA/nNKH4TW0mLlkhzobildaGYa7e/S29nvA6ZYFnqPywjsIM5YEiSC54g3yb060wTuTCMuiSvNKxFJx8senw+2J10yTZaklVQsT55JrWodn3cUnvcouVzXu9jI4h1N0EzMwsp5fxNnxmTpenKf0RWtoHT cmGKz9gO JP8IxG+hW2pmKMFe3wzwXEK1fWNLiusJqIrqnVJ5lQ0GDM1XJw9ZU9andZFx0BDgobK+1FPdfBXbvYYVVQyOLEZnZw/WF8PT1EdkR2RKAKSPpYr3e+KkRM7Aq1H6LszvbgJCjndaTgbUHQPnD2Gr131gCYtCTUDOzFZRGKfJDJZpJLmgzN5GZdftTtwK30yPJSQzsr+l0xLwAYhMf0y91BHedzvludAdyZpbL+LnJKeBBGgvWhGtq6e/bwjiUN5MV514GHJptJhStiOq+Kg2oMhVQLiPz/KDgO5HlAA+LEt4FA8DO47F1uya3uHS/6J36PDeu 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 Thu, Apr 18, 2024 at 9:51=E2=80=AFPM Michael Roth = wrote: > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index 535018f152a3..d31404953bf1 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -4899,7 +4899,8 @@ static int svm_vm_init(struct kvm *kvm) > > if (type !=3D KVM_X86_DEFAULT_VM && > type !=3D KVM_X86_SW_PROTECTED_VM) { > - kvm->arch.has_protected_state =3D (type =3D=3D KVM_X86_SE= V_ES_VM); > + kvm->arch.has_protected_state =3D > + (type =3D=3D KVM_X86_SEV_ES_VM || type =3D=3D KVM= _X86_SNP_VM); I'd rather set has_private_mem here too, rather than in x86.c Also this patch is the place to have diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index d31404953bf1..6209f70ab11a 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2056,6 +2056,9 @@ static int npf_interception(struct kvm_vcpu *vcpu) if (WARN_ON_ONCE(error_code & PFERR_SYNTHETIC_MASK)) error_code &=3D ~PFERR_SYNTHETIC_MASK; + if (sev_snp_guest(vcpu) && (error_code & PFERR_GUEST_ENC_MASK)) + error_code |=3D PFERR_PRIVATE_ACCESS; + trace_kvm_page_fault(vcpu, fault_address, error_code); return kvm_mmu_page_fault(vcpu, fault_address, error_code, static_cpu_has(X86_FEATURE_DECODEASSISTS) ? for the final shape of the MMU changes. Paolo > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 83b8260443a3..9923921904a2 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -12598,7 +12598,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned lo= ng type) > > kvm->arch.vm_type =3D type; > kvm->arch.has_private_mem =3D > - (type =3D=3D KVM_X86_SW_PROTECTED_VM); > + (type =3D=3D KVM_X86_SW_PROTECTED_VM || type =3D=3D KVM_X= 86_SNP_VM); > > ret =3D kvm_page_track_init(kvm); > if (ret) > -- > 2.25.1 >