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 X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0F14C433DB for ; Mon, 4 Jan 2021 17:39:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9088D20679 for ; Mon, 4 Jan 2021 17:39:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727702AbhADRjJ (ORCPT ); Mon, 4 Jan 2021 12:39:09 -0500 Received: from mail-bn8nam12on2071.outbound.protection.outlook.com ([40.107.237.71]:13011 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726189AbhADRjI (ORCPT ); Mon, 4 Jan 2021 12:39:08 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cSdrj2QbRrKoabUDBt3M+kE3JzBi0uuwdSpqEbAfnFh4lCetlyZKZS2Vp6CG7c9dXMLzpC/oYuFdmOvH9OBX82N/UNV2XCZfU9asUi35kghT/sGkijOrGOfoWehQVueZ+YZj0x1eRwFgeooOlwC4yeG5Fj1refLoHnNAI+Ofk6fIenmgMvZ6vCW20pI6D+6b8KkqoUtYKB4UqKohwYvkVfnxMyJYcUPwPkqCiso9XcK6FI3VNsigAj2bHriBaarAwhR7doUHcH4cN00hTb7zxeWtUWWccN2FVf9I5e75t4zIsfcwLpwNyEcd1XhjOuyGcadfEk23bJ5FuNgTzEqGrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JPTOIoITAmoV9L0NbljALB9dQd0ArdrYXICNRkqSqvY=; b=W3gsmLouvcdJqi5JpOHLcrI5pcM1XrkmTC0vu36Qgz1PvwwoBZCvce7yhsz+j4Iksn0Lm5fYro0rQjPvjuiRoOWy1zQCL025Y+SCk8GgBcJnnSx4+ot3Lxpd1gKwOqOZ9MGAkMeiRxKYFDMaY9uECe6K3eCFea7HZwSJ/bu5x2EaZdN+5EUDaxL/1KVI5Bk9rCYtv/vhIQ29uhUDjQv0E8+RObBrI4EBHC4k2aYsM9ZKff4g9eObkOyYXyZajhz1zvIRWWkPFJta9GAX3EFfP8n7yxiihNHOq6mNR63qZLILjkQwJgawSlgXZhgvo0/KnRbjxHFc6JTjDlAOvFYhjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JPTOIoITAmoV9L0NbljALB9dQd0ArdrYXICNRkqSqvY=; b=jlnQWgKskDTodON2PFU1qDpTAf6PxbBL8p+Gtzh65vi2ezEhO2mTskKHboU/dt+bJwHno6sWmroY4PU0y0olm0Vx7E5Xey3pCI1jU7SoyWskss5xwEb6zRaNBnWoFFc2Q+aS+C2ytTcrzeeR4rI/P7myTT49XCJb/kfMJDOardk= Authentication-Results: amd.com; dkim=none (message not signed) header.d=none;amd.com; dmarc=none action=none header.from=amd.com; Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR12MB1164.namprd12.prod.outlook.com (2603:10b6:3:77::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.20; Mon, 4 Jan 2021 17:38:13 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3721.024; Mon, 4 Jan 2021 17:38:13 +0000 Subject: Re: [PATCH v5 27/34] KVM: SVM: Add support for booting APs for an SEV-ES guest From: Tom Lendacky To: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org Cc: Jim Mattson , Joerg Roedel , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Borislav Petkov , Ingo Molnar , Thomas Gleixner , Brijesh Singh References: <47d11ed1c1a48ab71858fc3cde766bf67a4612d1.1607620209.git.thomas.lendacky@amd.com> <8ed48a0f-d490-d74d-d10a-968b561a4f2e@redhat.com> <2fd11067-a04c-7ce6-3fe1-79a4658bdfe7@amd.com> <620a7760-2c4b-c8b9-51e1-8008bf29221d@amd.com> Message-ID: Date: Mon, 4 Jan 2021 11:38:10 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 In-Reply-To: <620a7760-2c4b-c8b9-51e1-8008bf29221d@amd.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [67.79.209.213] X-ClientProxiedBy: SN6PR04CA0090.namprd04.prod.outlook.com (2603:10b6:805:f2::31) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from office-linux.texastahm.com (67.79.209.213) by SN6PR04CA0090.namprd04.prod.outlook.com (2603:10b6:805:f2::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.20 via Frontend Transport; Mon, 4 Jan 2021 17:38:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2fbc0898-86a2-48b7-ae14-08d8b0d782be X-MS-TrafficTypeDiagnostic: DM5PR12MB1164: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M4aaQ0PTyIq+s8iWdV2iwonHAvpxNZuaJvMvTsG5856HuKxjB+a0I5NrMLO2OqrSU/EmwMqOCW0v/FUWlXqmNNny7UQiMDUcW+vtBOyGVnFpPTZvYo5OaC1H3MRxtdbaM2ZwAhPVi5ZVzjRhgpi73EHGfABBRAzioqnSqlLhkm7L/CLsIYQEUgdFoFxvFU0m/2MH1sq8GSKATrABqXsOdq2LnLkg6jwN3zC9fHnDXN5VxmqfHHP7ndsbsC7vIEvpuTtW4NKiDB87ub42flVsEwffC2mTMvHye/Pf4tIa2runrET2q/8ntYFIIFPQC0vVdo8KKF4oBmRccWxPtTyreH1kvSmZ0Kiwjz3WGufll2SNXw2iRSQN9q9BHwo4H0NN3aS8LhoNtJ6r/hAqyYKjm3BrcKsuVO3gKDH4V7WNy4oizdFgeF4JnMAizuWr4Rr72A9yXWswiPWbnyf/tqNq0WgbEmiG8ZxJfT2SbBI97Tc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(39860400002)(346002)(366004)(376002)(396003)(8676002)(2906002)(54906003)(30864003)(316002)(478600001)(7416002)(31686004)(83380400001)(5660300002)(52116002)(6512007)(6486002)(53546011)(26005)(186003)(16526019)(86362001)(8936002)(66946007)(66556008)(6506007)(66476007)(31696002)(36756003)(2616005)(956004)(4326008)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?Z0hjUmZGNWsxZDNaNlRCWXlPK1A2K2ZnbW1lUFhhenFjeGE1RmR5ZzdnbnVY?= =?utf-8?B?a2x4cEJNeGM1aDROSFo5Qm1CRzBYWjVjajR3TGlyeEZmQnlmK1dYOGIrZEtV?= =?utf-8?B?U3lvSC9YQmlGV01hMVhWQ29CekR2MmZhVVZZMmdSSkMvYnJXWEEwdnZhQ1pk?= =?utf-8?B?dkNYMnMxMHhYODEvTzU1YmVJek1RTjlCTmk0Nis1ZDhnM2RGdit3TUZiYTc4?= =?utf-8?B?WkVwUGRGNUVMME03dUcyQlRhVE4yQmZseURoaXl5R3Q3VmZOT04yYlEvUDJW?= =?utf-8?B?aDlHZVNIRnplQjhYdWhka1djUHBuNlBSTno4NHVkTytSTkpYNlhVZ0ppMHRL?= =?utf-8?B?UHNHZmowdXp0UnhhTFkwT2x0QjlXRTM5ZXVBVXRDM0xtenJqS3lrMHBDdUJ0?= =?utf-8?B?WGZyTXZUbHh1bHdNU1I0WWZldFFta2dpZ2NvdWVQQ0hUOXl6VTFYbTdXb05k?= =?utf-8?B?YVRjUG8xcFVOVC9GZGJZVGZsTDRmWG5TVUFWcTJpb0pTMmIxdm55SFg0U2Rh?= =?utf-8?B?WGJvU1B6UzlOdEd4RFpSK01aV2h6VSsvQVFEWHN5bmxqU0hnbFhkYUJoU01q?= =?utf-8?B?Z1NaSzh6SnE5V3BYTWVmek9FR1NzUFpoVCtydnpXWXQ5cEREbjlieGFvRHN5?= =?utf-8?B?ZU5xN2JTM1pLOGlyb1Z3QXhwd1NmYkJ4blNZdm9Nclc4bERYVFVIZGVsRlpp?= =?utf-8?B?WXRHUmVONkhSc202S1FOTUEzYkN1VVdmNVB6aDZXcHNsblY4ZStIZFZFcXJX?= =?utf-8?B?NlN1RWlONU9Ndnd2dFM3bjNjem1mVDlleWFCUFhGUlhkR2hnUXUyeGs2V0xR?= =?utf-8?B?cXc1dk9GQmtHTzlxWmtlSjdndWlDUWZZUE5CNGZBSXZYbTJnOGhuNjZPQ0hj?= =?utf-8?B?SjVaMmk3NFlRdTBUTFNpSUJoSnJGME1UYkFWNXk2OSttMUtKRjg0bWliL0Ny?= =?utf-8?B?YktiRC9VSk9ZaVRoMGF2M3dHQVNISGluMWJ4enJDNE0zY0hlOW1iODhXZy9j?= =?utf-8?B?RDFBOVdXTmh3WFZKU1FtYkpxcFQvUVErTVRSRi9seklubk9POFBGT3FKSjJF?= =?utf-8?B?azMxaC9UbHppbjBXOTRkaVlWRkQ0ZVpDOUtZSDhyMFBncUYxV0VPZ0ZHUnQw?= =?utf-8?B?VjM2SzhLU1VjdW1uNkExZHdBS1d0SzF6NDlpOC8zTUQ3VVRRSXR4SUlETGlL?= =?utf-8?B?WXZyTGZmbG16ZlR1MmtYa3JlVFlIYklnSVMrUE9sc3pwazZ3RExiUHFOUC9O?= =?utf-8?B?aSt4NEFnS3ZlcFZLemJvdjNiTC9sQWE2VUxsYlB5YW9OcXE5L25RK29yVHpk?= =?utf-8?Q?+g5WCHKlrrPyOpQNIwv32oMhoX2baXzAq9?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2021 17:38:12.9297 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 2fbc0898-86a2-48b7-ae14-08d8b0d782be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XRFEhuqZfpBz++kNbfzsQZtGyRuBysqek/OUwxSCAUXKeIe2tbbbkZJP1/B7pjEn0XbY6WL4qgIeGDfj5rtE+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1164 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 12/15/20 2:25 PM, Tom Lendacky wrote: > On 12/14/20 1:46 PM, Tom Lendacky wrote: >> On 12/14/20 10:03 AM, Paolo Bonzini wrote: >>> On 10/12/20 18:10, Tom Lendacky wrote: >>>> From: Tom Lendacky >>>> >>>> + case SVM_VMGEXIT_AP_HLT_LOOP: >>>> + svm->ap_hlt_loop = true; >>> >>> This value needs to be communicated to userspace. Let's get this right >>> from the beginning and use a new KVM_MP_STATE_* value instead (perhaps >>> reuse KVM_MP_STATE_STOPPED but for x86 #define it as >>> KVM_MP_STATE_AP_HOLD_RECEIVED?). >> >> Ok, let me look into this. > > Paolo, is this something along the lines of what you were thinking, or am > I off base? I created kvm_emulate_ap_reset_hold() to keep the code > consolidated and remove the duplication, but can easily make those changes > local to sev.c. I'd also like to rename SVM_VMGEXIT_AP_HLT_LOOP to > SVM_VMGEXIT_AP_RESET_HOLD to more closely match the GHBC document, but > that can be done later (if possible, since it is already part of the uapi > include file). Paolo, a quick ping after the holidays as to whether this is the approach you were thinking. I think there are a couple of places in x86.c to update (vcpu_block() and kvm_arch_vcpu_ioctl_get_mpstate()), also. Thanks, Tom > > Thanks, > Tom > > --- > KVM: SVM: Add support for booting APs for an SEV-ES guest > > From: Tom Lendacky > > Typically under KVM, an AP is booted using the INIT-SIPI-SIPI sequence, > where the guest vCPU register state is updated and then the vCPU is VMRUN > to begin execution of the AP. For an SEV-ES guest, this won't work because > the guest register state is encrypted. > > Following the GHCB specification, the hypervisor must not alter the guest > register state, so KVM must track an AP/vCPU boot. Should the guest want > to park the AP, it must use the AP Reset Hold exit event in place of, for > example, a HLT loop. > > First AP boot (first INIT-SIPI-SIPI sequence): > Execute the AP (vCPU) as it was initialized and measured by the SEV-ES > support. It is up to the guest to transfer control of the AP to the > proper location. > > Subsequent AP boot: > KVM will expect to receive an AP Reset Hold exit event indicating that > the vCPU is being parked and will require an INIT-SIPI-SIPI sequence to > awaken it. When the AP Reset Hold exit event is received, KVM will place > the vCPU into a simulated HLT mode. Upon receiving the INIT-SIPI-SIPI > sequence, KVM will make the vCPU runnable. It is again up to the guest > to then transfer control of the AP to the proper location. > > To differentiate between an actual HLT and an AP Reset Hold, a new MP > state is introduced, KVM_MP_STATE_AP_RESET_HOLD, which the vCPU is > placed in upon receiving the AP Reset Hold exit event. Additionally, to > communicate the AP Reset Hold exit event up to userspace (if needed), a > new exit reason is introduced, KVM_EXIT_AP_RESET_HOLD. > > A new x86 ops function is introduced, vcpu_deliver_sipi_vector, in order > to accomplish AP booting. For VMX, vcpu_deliver_sipi_vector is set to the > original SIPI delivery function, kvm_vcpu_deliver_sipi_vector(). SVM adds > a new function that, for non SEV-ES guests, invokes the original SIPI > delivery function, kvm_vcpu_deliver_sipi_vector(), but for SEV-ES guests, > implements the logic above. > > Signed-off-by: Tom Lendacky > --- > arch/x86/include/asm/kvm_host.h | 3 +++ > arch/x86/kvm/lapic.c | 2 +- > arch/x86/kvm/svm/sev.c | 22 ++++++++++++++++++++++ > arch/x86/kvm/svm/svm.c | 10 ++++++++++ > arch/x86/kvm/svm/svm.h | 2 ++ > arch/x86/kvm/vmx/vmx.c | 2 ++ > arch/x86/kvm/x86.c | 20 +++++++++++++++++--- > include/uapi/linux/kvm.h | 2 ++ > 8 files changed, 59 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index 39707e72b062..23d7b203c060 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -1287,6 +1287,8 @@ struct kvm_x86_ops { > void (*migrate_timers)(struct kvm_vcpu *vcpu); > void (*msr_filter_changed)(struct kvm_vcpu *vcpu); > int (*complete_emulated_msr)(struct kvm_vcpu *vcpu, int err); > + > + void (*vcpu_deliver_sipi_vector)(struct kvm_vcpu *vcpu, u8 vector); > }; > > struct kvm_x86_nested_ops { > @@ -1468,6 +1470,7 @@ int kvm_fast_pio(struct kvm_vcpu *vcpu, int size, unsigned short port, int in); > int kvm_emulate_cpuid(struct kvm_vcpu *vcpu); > int kvm_emulate_halt(struct kvm_vcpu *vcpu); > int kvm_vcpu_halt(struct kvm_vcpu *vcpu); > +int kvm_emulate_ap_reset_hold(struct kvm_vcpu *vcpu); > int kvm_emulate_wbinvd(struct kvm_vcpu *vcpu); > > void kvm_get_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg); > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index 6a87623aa578..a2f08ed777d8 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -2898,7 +2898,7 @@ void kvm_apic_accept_events(struct kvm_vcpu *vcpu) > /* evaluate pending_events before reading the vector */ > smp_rmb(); > sipi_vector = apic->sipi_vector; > - kvm_vcpu_deliver_sipi_vector(vcpu, sipi_vector); > + kvm_x86_ops.vcpu_deliver_sipi_vector(vcpu, sipi_vector); > vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE; > } > } > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > index 8b5ef0fe4490..4045de7f8f8b 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -1561,6 +1561,7 @@ static int sev_es_validate_vmgexit(struct vcpu_svm *svm) > goto vmgexit_err; > break; > case SVM_VMGEXIT_NMI_COMPLETE: > + case SVM_VMGEXIT_AP_HLT_LOOP: > case SVM_VMGEXIT_AP_JUMP_TABLE: > case SVM_VMGEXIT_UNSUPPORTED_EVENT: > break; > @@ -1886,6 +1887,9 @@ int sev_handle_vmgexit(struct vcpu_svm *svm) > case SVM_VMGEXIT_NMI_COMPLETE: > ret = svm_invoke_exit_handler(svm, SVM_EXIT_IRET); > break; > + case SVM_VMGEXIT_AP_HLT_LOOP: > + ret = kvm_emulate_ap_reset_hold(&svm->vcpu); > + break; > case SVM_VMGEXIT_AP_JUMP_TABLE: { > struct kvm_sev_info *sev = &to_kvm_svm(svm->vcpu.kvm)->sev_info; > > @@ -2038,3 +2042,21 @@ void sev_es_vcpu_put(struct vcpu_svm *svm) > wrmsrl(host_save_user_msrs[i].index, svm->host_user_msrs[i]); > } > } > + > +void sev_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector) > +{ > + struct vcpu_svm *svm = to_svm(vcpu); > + > + /* First SIPI: Use the values as initially set by the VMM */ > + if (!svm->received_first_sipi) { > + svm->received_first_sipi = true; > + return; > + } > + > + /* > + * Subsequent SIPI: Return from an AP Reset Hold VMGEXIT, where > + * the guest will set the CS and RIP. Set SW_EXIT_INFO_2 to a > + * non-zero value. > + */ > + ghcb_set_sw_exit_info_2(svm->ghcb, 1); > +} > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index 941e5251e13f..5c37fa68ee56 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -4382,6 +4382,14 @@ static bool svm_apic_init_signal_blocked(struct kvm_vcpu *vcpu) > (vmcb_is_intercept(&svm->vmcb->control, INTERCEPT_INIT)); > } > > +static void svm_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector) > +{ > + if (!sev_es_guest(vcpu->kvm)) > + return kvm_vcpu_deliver_sipi_vector(vcpu, vector); > + > + sev_vcpu_deliver_sipi_vector(vcpu, vector); > +} > + > static void svm_vm_destroy(struct kvm *kvm) > { > avic_vm_destroy(kvm); > @@ -4524,6 +4532,8 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { > > .msr_filter_changed = svm_msr_filter_changed, > .complete_emulated_msr = svm_complete_emulated_msr, > + > + .vcpu_deliver_sipi_vector = svm_vcpu_deliver_sipi_vector, > }; > > static struct kvm_x86_init_ops svm_init_ops __initdata = { > diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h > index 5431e6335e2e..0fe874ae5498 100644 > --- a/arch/x86/kvm/svm/svm.h > +++ b/arch/x86/kvm/svm/svm.h > @@ -185,6 +185,7 @@ struct vcpu_svm { > struct vmcb_save_area *vmsa; > struct ghcb *ghcb; > struct kvm_host_map ghcb_map; > + bool received_first_sipi; > > /* SEV-ES scratch area support */ > void *ghcb_sa; > @@ -591,6 +592,7 @@ void sev_es_init_vmcb(struct vcpu_svm *svm); > void sev_es_create_vcpu(struct vcpu_svm *svm); > void sev_es_vcpu_load(struct vcpu_svm *svm, int cpu); > void sev_es_vcpu_put(struct vcpu_svm *svm); > +void sev_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector); > > /* vmenter.S */ > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index 75c9c6a0a3a4..2af05d3b0590 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -7707,6 +7707,8 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { > .msr_filter_changed = vmx_msr_filter_changed, > .complete_emulated_msr = kvm_complete_insn_gp, > .cpu_dirty_log_size = vmx_cpu_dirty_log_size, > + > + .vcpu_deliver_sipi_vector = kvm_vcpu_deliver_sipi_vector, > }; > > static __init int hardware_setup(void) > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 648c677b12e9..622612f88da7 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -7974,17 +7974,22 @@ void kvm_arch_exit(void) > kmem_cache_destroy(x86_fpu_cache); > } > > -int kvm_vcpu_halt(struct kvm_vcpu *vcpu) > +int __kvm_vcpu_halt(struct kvm_vcpu *vcpu, int state, int reason) > { > ++vcpu->stat.halt_exits; > if (lapic_in_kernel(vcpu)) { > - vcpu->arch.mp_state = KVM_MP_STATE_HALTED; > + vcpu->arch.mp_state = state; > return 1; > } else { > - vcpu->run->exit_reason = KVM_EXIT_HLT; > + vcpu->run->exit_reason = reason; > return 0; > } > } > + > +int kvm_vcpu_halt(struct kvm_vcpu *vcpu) > +{ > + return __kvm_vcpu_halt(vcpu, KVM_MP_STATE_HALTED, KVM_EXIT_HLT); > +} > EXPORT_SYMBOL_GPL(kvm_vcpu_halt); > > int kvm_emulate_halt(struct kvm_vcpu *vcpu) > @@ -7998,6 +8003,14 @@ int kvm_emulate_halt(struct kvm_vcpu *vcpu) > } > EXPORT_SYMBOL_GPL(kvm_emulate_halt); > > +int kvm_emulate_ap_reset_hold(struct kvm_vcpu *vcpu) > +{ > + int ret = kvm_skip_emulated_instruction(vcpu); > + > + return __kvm_vcpu_halt(vcpu, KVM_MP_STATE_AP_RESET_HOLD, KVM_EXIT_AP_RESET_HOLD) && ret; > +} > +EXPORT_SYMBOL_GPL(kvm_emulate_ap_reset_hold); > + > #ifdef CONFIG_X86_64 > static int kvm_pv_clock_pairing(struct kvm_vcpu *vcpu, gpa_t paddr, > unsigned long clock_type) > @@ -10150,6 +10163,7 @@ void kvm_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector) > kvm_set_segment(vcpu, &cs, VCPU_SREG_CS); > kvm_rip_write(vcpu, 0); > } > +EXPORT_SYMBOL_GPL(kvm_vcpu_deliver_sipi_vector); > > int kvm_arch_hardware_enable(void) > { > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > index 886802b8ffba..374c67875cdb 100644 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@ -251,6 +251,7 @@ struct kvm_hyperv_exit { > #define KVM_EXIT_X86_RDMSR 29 > #define KVM_EXIT_X86_WRMSR 30 > #define KVM_EXIT_DIRTY_RING_FULL 31 > +#define KVM_EXIT_AP_RESET_HOLD 32 > > /* For KVM_EXIT_INTERNAL_ERROR */ > /* Emulate instruction failed. */ > @@ -573,6 +574,7 @@ struct kvm_vapic_addr { > #define KVM_MP_STATE_CHECK_STOP 6 > #define KVM_MP_STATE_OPERATING 7 > #define KVM_MP_STATE_LOAD 8 > +#define KVM_MP_STATE_AP_RESET_HOLD 9 > > struct kvm_mp_state { > __u32 mp_state; >