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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6EEEBC47071 for ; Thu, 16 Nov 2023 06:22:48 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3Vli-0002KY-Vb; Thu, 16 Nov 2023 01:22:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3Vlg-0002K7-Nm for qemu-devel@nongnu.org; Thu, 16 Nov 2023 01:22:24 -0500 Received: from mgamail.intel.com ([134.134.136.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3Vld-00072d-Hi for qemu-devel@nongnu.org; Thu, 16 Nov 2023 01:22:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700115741; x=1731651741; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=gChZ8kXGSnsMJ49nAHlrxMAXv6e+y+3woeR6B7wkO4Q=; b=e29Oyit2uaH8COzQBWzKQbfPk1DhhDoeTEVEAuO5P/eQ0PgpfWHk1X6+ SiwmrX82Cni1+/S4c5YsS0nNa8C6jb6Laj1BEQjk9os91Vb/g8kl+o6uI Z1plEXYpOfA8HKClI64r/BA6wIKEi5i13p97tukXos92i7nii/Ukg9p6t kCSiQbY/IG2xtRHShWLAT2qB5WEmHwnnPa03vVbdF1c3HxWlZrKMkT2W9 xSxqIMVMJICt62nR8hgRqCBcKL5xk4luiycXekpccjg43E5LuAah0ThiL 0NF8hUUJ3JaJSuvx4kYOpDkBUy6Du6nAoRhCFpRWgMiJZcN07Gaj8J50J g==; X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="381420406" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="381420406" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 22:22:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="765209370" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="765209370" Received: from xiaoyaol-hp-g830.ccr.corp.intel.com (HELO [10.93.6.77]) ([10.93.6.77]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2023 22:22:11 -0800 Message-ID: Date: Thu, 16 Nov 2023 14:22:08 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 14/70] target/i386: Implement mc->kvm_type() to get VM type Content-Language: en-US To: =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= Cc: Paolo Bonzini , David Hildenbrand , Igor Mammedov , "Michael S . Tsirkin" , Marcel Apfelbaum , Richard Henderson , Peter Xu , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , Cornelia Huck , Eric Blake , Markus Armbruster , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Michael Roth , Sean Christopherson , Claudio Fontana , Gerd Hoffmann , Isaku Yamahata , Chenyi Qiang References: <20231115071519.2864957-1-xiaoyao.li@intel.com> <20231115071519.2864957-15-xiaoyao.li@intel.com> From: Xiaoyao Li In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=134.134.136.20; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.099, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.999, HK_RANDOM_FROM=0.999, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 11/15/2023 6:49 PM, Daniel P. Berrangé wrote: > On Wed, Nov 15, 2023 at 02:14:23AM -0500, Xiaoyao Li wrote: >> Implement mc->kvm_type() for i386 machines. It provides a way for user >> to create SW_PROTECTE_VM. > > Small typo there missing final 'D' in 'PROTECTED' Thanks for catching it. I find the "PROTECTED_VM" part is the leftover of previous series. Since this version drop the "protected-vm" part, it should be fall back the earlier version like https://lore.kernel.org/qemu-devel/20220802074750.2581308-4-xiaoyao.li@intel.com/ I will merge next patch into this one, in next version. >> >> Also store the vm_type in machinestate to other code to query what the >> VM type is. >> >> Signed-off-by: Xiaoyao Li >> --- >> hw/i386/x86.c | 12 ++++++++++++ >> include/hw/i386/x86.h | 1 + >> target/i386/kvm/kvm.c | 25 +++++++++++++++++++++++++ >> target/i386/kvm/kvm_i386.h | 1 + >> 4 files changed, 39 insertions(+) >> >> diff --git a/hw/i386/x86.c b/hw/i386/x86.c >> index b3d054889bba..55678279bf3b 100644 >> --- a/hw/i386/x86.c >> +++ b/hw/i386/x86.c >> @@ -1377,6 +1377,17 @@ static void machine_set_sgx_epc(Object *obj, Visitor *v, const char *name, >> qapi_free_SgxEPCList(list); >> } >> >> +static int x86_kvm_type(MachineState *ms, const char *vm_type) >> +{ >> + X86MachineState *x86ms = X86_MACHINE(ms); >> + int kvm_type; >> + >> + kvm_type = kvm_get_vm_type(ms, vm_type); >> + x86ms->vm_type = kvm_type; >> + >> + return kvm_type; >> +} >> + >> static void x86_machine_initfn(Object *obj) >> { >> X86MachineState *x86ms = X86_MACHINE(obj); >> @@ -1401,6 +1412,7 @@ static void x86_machine_class_init(ObjectClass *oc, void *data) >> mc->cpu_index_to_instance_props = x86_cpu_index_to_props; >> mc->get_default_cpu_node_id = x86_get_default_cpu_node_id; >> mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids; >> + mc->kvm_type = x86_kvm_type; >> x86mc->save_tsc_khz = true; >> x86mc->fwcfg_dma_enabled = true; >> nc->nmi_monitor_handler = x86_nmi; >> diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h >> index da19ae15463a..ab1d38569019 100644 >> --- a/include/hw/i386/x86.h >> +++ b/include/hw/i386/x86.h >> @@ -41,6 +41,7 @@ struct X86MachineState { >> MachineState parent; >> >> /*< public >*/ >> + unsigned int vm_type; >> >> /* Pointers to devices and objects: */ >> ISADevice *rtc; >> diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c >> index b4b9ce89842f..2e47fda25f95 100644 >> --- a/target/i386/kvm/kvm.c >> +++ b/target/i386/kvm/kvm.c >> @@ -161,6 +161,31 @@ static KVMMSRHandlers msr_handlers[KVM_MSR_FILTER_MAX_RANGES]; >> static RateLimit bus_lock_ratelimit_ctrl; >> static int kvm_get_one_msr(X86CPU *cpu, int index, uint64_t *value); >> >> +static const char* vm_type_name[] = { > > nitpick 'char *vm_type_name[]', is normal style will fix it. Thanks! >> + [KVM_X86_DEFAULT_VM] = "default", >> + [KVM_X86_SW_PROTECTED_VM] = "sw-protected-vm", >> +}; >> + >> +int kvm_get_vm_type(MachineState *ms, const char *vm_type) >> +{ >> + int kvm_type = KVM_X86_DEFAULT_VM; >> + >> + /* >> + * old KVM doesn't support KVM_CAP_VM_TYPES and KVM_X86_DEFAULT_VM >> + * is always supported >> + */ >> + if (kvm_type == KVM_X86_DEFAULT_VM) { >> + return kvm_type; >> + } >> + >> + if (!(kvm_check_extension(KVM_STATE(ms->accelerator), KVM_CAP_VM_TYPES) & BIT(kvm_type))) { >> + error_report("vm-type %s not supported by KVM", vm_type_name[kvm_type]); >> + exit(1); >> + } >> + >> + return kvm_type; >> +} >> + >> bool kvm_has_smm(void) >> { >> return kvm_vm_check_extension(kvm_state, KVM_CAP_X86_SMM); >> diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h >> index 30fedcffea3e..55fb25fa8e2e 100644 >> --- a/target/i386/kvm/kvm_i386.h >> +++ b/target/i386/kvm/kvm_i386.h >> @@ -37,6 +37,7 @@ bool kvm_hv_vpindex_settable(void); >> bool kvm_enable_sgx_provisioning(KVMState *s); >> bool kvm_hyperv_expand_features(X86CPU *cpu, Error **errp); >> >> +int kvm_get_vm_type(MachineState *ms, const char *vm_type); >> void kvm_arch_reset_vcpu(X86CPU *cs); >> void kvm_arch_after_reset_vcpu(X86CPU *cpu); >> void kvm_arch_do_init_vcpu(X86CPU *cs); >> -- >> 2.34.1 >> > > With regards, > Daniel