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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 2FE90C433DB for ; Wed, 10 Mar 2021 13:15:17 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 674B964FBC for ; Wed, 10 Mar 2021 13:15:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 674B964FBC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJygF-000113-Cr for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 08:15:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJyfC-00004x-Nu for qemu-devel@nongnu.org; Wed, 10 Mar 2021 08:14:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56006) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lJyf6-0007YH-Nj for qemu-devel@nongnu.org; Wed, 10 Mar 2021 08:14:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615382044; 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: in-reply-to:in-reply-to:references:references; bh=ClPMmDn1r1tvHVuc3T1MsX7s1mRwCDCHu/jgRovzGjQ=; b=R+pVkrs8B9ceph8kirN9pUAbpvc/xv3EdVUUdsV/XckWtaVe8ETX5qy6ooun+sthqxRJ4m 52EzLLBvWK5VTKNZtRsRPILQ/OuBRFWSB92Uh3Ti6ocU8Z+yjYz9bSZWXi+48gXlAts9pI G8btYb/n60ZMW5d5ZX928x5S9qi0tmA= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-87-Za3sKDMNOCO3aoyhliau4g-1; Wed, 10 Mar 2021 08:14:01 -0500 X-MC-Unique: Za3sKDMNOCO3aoyhliau4g-1 Received: by mail-ed1-f69.google.com with SMTP id r19so7913403edv.3 for ; Wed, 10 Mar 2021 05:14:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=ClPMmDn1r1tvHVuc3T1MsX7s1mRwCDCHu/jgRovzGjQ=; b=k4Kw61532tavYruTFXDeEnouQUb45Le3ELOBv/pmqd+45Ox3w9N39Kt4iEics6btxJ Sw94+X9kFqDAZNsrSkKPofcoQ1WBva2wneeZdaa4VnVzBTGqoLjLNqHyd/B/n6+ban/b 024jrHWBIItt7ZT1XUkv5YqVOkQe1MttEKgRbgsbgpjEgnB/PBi+RygAGcCEXy6lq1DJ 0iNoKPmYV6bYmKxoJZXVqxOglIhRMonacFJk7rnKmN5IPY2qeO7BBugtuYUYzmYspG41 EtRLp1gE+2QF7Fyq6VHIAC5uCSetMRo0SyLFc/zCbItUPF9rXINgTw7Oo7jneaT9M3bt foGw== X-Gm-Message-State: AOAM531bimjGfWWxH4l/O3M1I9ErQftCiHfWgaOgYJVqY9ZZXTsPcLfi 433CKh7agI9AayXKxyVnHFP7g8Nll3iuskweLqvTPbQhe+EBXtEgXhYeowUW7ZNd3GjwN0DJ8ry ApCdWTcnCRufsyYI= X-Received: by 2002:a17:907:1692:: with SMTP id hc18mr3578939ejc.265.1615382040295; Wed, 10 Mar 2021 05:14:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJxUbypr8J2VHgxpuhoZ6yU3287JbnqUHEYMVJpjbC5dhOHL0aO6TmAvhdKonCfbF6AhrwaWYA== X-Received: by 2002:a17:907:1692:: with SMTP id hc18mr3578919ejc.265.1615382040081; Wed, 10 Mar 2021 05:14:00 -0800 (PST) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id i10sm9936607ejv.106.2021.03.10.05.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 05:13:59 -0800 (PST) From: Vitaly Kuznetsov To: Claudio Fontana , qemu-devel@nongnu.org Subject: Re: [PATCH 1/5] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn() In-Reply-To: <22cf2456-433e-b39f-aca5-2a260b4a8ad7@suse.de> References: <20201119103221.1665171-1-vkuznets@redhat.com> <20201119103221.1665171-2-vkuznets@redhat.com> <87v99z9qto.fsf@vitty.brq.redhat.com> <22cf2456-433e-b39f-aca5-2a260b4a8ad7@suse.de> Date: Wed, 10 Mar 2021 14:13:59 +0100 Message-ID: <87sg539mnc.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vkuznets@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=216.205.24.124; envelope-from=vkuznets@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Marcelo Tosatti , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Claudio Fontana writes: > On 3/10/21 12:43 PM, Vitaly Kuznetsov wrote: >> Claudio Fontana writes: >> >>> On 11/19/20 11:32 AM, Vitaly Kuznetsov wrote: >>>> As a preparation to expanding Hyper-V CPU features early, move >>>> hyperv_vendor_id initialization to x86_cpu_realizefn(). Introduce >>>> x86_cpu_hyperv_realize() to not not pollute x86_cpu_realizefn() >>>> itself. >>>> >>>> Signed-off-by: Vitaly Kuznetsov >>> >>> >>> Hi Vitaly, >>> >>> If building for TCG-only, does the x86_cpu_hyperv_realize function and other hyperv related functions >>> make sense to keep in the build? >>> >>> Now that we have per-accelerator subdirs in target/i386, should the hyperv code be moved over? >>> >> >> Hi Claudio, >> >> I'm not exactly sure. On one hand, we only implement Hyper-V emulation >> with KVM now. > > > Hi Vitaly, > > >> On the other hand Hyper-V specific CPU options are >> available even without it (and as Igor feels strongly against >> introducing custom option parsers, I don't see how we can forbid to use >> them without KVM). x86_cpu_hyperv_realize() is the bare minimum which is >> only needed to set our internal Hyper-V related data in a sane way, >> e.g. set the default to 'cpu->hyperv_vendor_id'. The actual enablement >> code is in target/i386/kvm.c already. Do you see anything besides >> x86_cpu_hyperv_realize() which we could move there? > > Currently I don't, > I see a lot of PROPs (hyperv_features), but I assume those are the ones you mention cannot be moved right? > Right, not without introducing a custom parser checking if KVM is in use. > >> Could you please >> take a look at v5 >> (https://mail.gnu.org/archive/html/qemu-devel/2021-03/msg00158.html)? > > > I took a look at the series you pointed me to, and it seems it is all pretty much kvm/ work to me. > > Which hypervisors do you think would theoretically make sense when looking at hyperv emulation in the future? > In theory, I don't see why we can't emulate hyper-v in TCG, I'm just not sure how practical that would be). There was a Windows Hypervisor Platform accelerator (whpx) which uses genuine Hyper-V and can use Hyper-V enlightenment option to set guest visible CPUIDs but honestly I don't know much about whpx. > Looking at the current code and your patches, in the series you link to, > I'd be tempted to suggest moving the hyperv realize function inside > kvm_cpu_realizefn in kvm/kvm-cpu.c . No problem, I wouldn't be against that. I'm waiting for some feedback on v5 and if I am to do v6 I'll include that. In case I got luck and v5 is to get merged, I can send a follow-up patch. > > Ciao, > > Claudio > > > >> >> Thanks! >> >> >>> Thanks, >>> >>> Claudio >>> >>> >>>> --- >>>> target/i386/cpu.c | 23 ++++++++++++++++++++++- >>>> target/i386/cpu.h | 3 ++- >>>> target/i386/kvm.c | 25 ++++++++++--------------- >>>> 3 files changed, 34 insertions(+), 17 deletions(-) >>>> >>>> diff --git a/target/i386/cpu.c b/target/i386/cpu.c >>>> index 5a8c96072e41..2a6885753378 100644 >>>> --- a/target/i386/cpu.c >>>> +++ b/target/i386/cpu.c >>>> @@ -6509,6 +6509,25 @@ static void x86_cpu_filter_features(X86CPU *cpu, bool verbose) >>>> } >>>> } >>>> >>>> +static void x86_cpu_hyperv_realize(X86CPU *cpu) >>>> +{ >>>> + size_t len; >>>> + >>>> + /* Hyper-V vendor id */ >>>> + if (!cpu->hyperv_vendor) { >>>> + memcpy(cpu->hyperv_vendor_id, "Microsoft Hv", 12); >>>> + } else { >>>> + len = strlen(cpu->hyperv_vendor); >>>> + >>>> + if (len > 12) { >>>> + warn_report("hv-vendor-id truncated to 12 characters"); >>>> + len = 12; >>>> + } >>>> + memset(cpu->hyperv_vendor_id, 0, 12); >>>> + memcpy(cpu->hyperv_vendor_id, cpu->hyperv_vendor, len); >>>> + } >>>> +} >>>> + >>>> static void x86_cpu_realizefn(DeviceState *dev, Error **errp) >>>> { >>>> CPUState *cs = CPU(dev); >>>> @@ -6680,6 +6699,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) >>>> env->cache_info_amd.l3_cache = &legacy_l3_cache; >>>> } >>>> >>>> + /* Process Hyper-V enlightenments */ >>>> + x86_cpu_hyperv_realize(cpu); >>>> >>>> cpu_exec_realizefn(cs, &local_err); >>>> if (local_err != NULL) { >>>> @@ -7198,7 +7219,7 @@ static Property x86_cpu_properties[] = { >>>> DEFINE_PROP_UINT32("min-xlevel2", X86CPU, env.cpuid_min_xlevel2, 0), >>>> DEFINE_PROP_UINT64("ucode-rev", X86CPU, ucode_rev, 0), >>>> DEFINE_PROP_BOOL("full-cpuid-auto-level", X86CPU, full_cpuid_auto_level, true), >>>> - DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id), >>>> + DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor), >>>> DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true), >>>> DEFINE_PROP_BOOL("lmce", X86CPU, enable_lmce, false), >>>> DEFINE_PROP_BOOL("l3-cache", X86CPU, enable_l3_cache, true), >>>> diff --git a/target/i386/cpu.h b/target/i386/cpu.h >>>> index 88e8586f8fb4..be640bf45c29 100644 >>>> --- a/target/i386/cpu.h >>>> +++ b/target/i386/cpu.h >>>> @@ -1655,11 +1655,12 @@ struct X86CPU { >>>> uint64_t ucode_rev; >>>> >>>> uint32_t hyperv_spinlock_attempts; >>>> - char *hyperv_vendor_id; >>>> + char *hyperv_vendor; >>>> bool hyperv_synic_kvm_only; >>>> uint64_t hyperv_features; >>>> bool hyperv_passthrough; >>>> OnOffAuto hyperv_no_nonarch_cs; >>>> + uint32_t hyperv_vendor_id[3]; >>>> >>>> bool check_cpuid; >>>> bool enforce_cpuid; >>>> diff --git a/target/i386/kvm.c b/target/i386/kvm.c >>>> index a2934dda027c..788a2cf2ec51 100644 >>>> --- a/target/i386/kvm.c >>>> +++ b/target/i386/kvm.c >>>> @@ -1205,6 +1205,13 @@ static int hyperv_handle_properties(CPUState *cs, >>>> memcpy(cpuid_ent, &cpuid->entries[0], >>>> cpuid->nent * sizeof(cpuid->entries[0])); >>>> >>>> + c = cpuid_find_entry(cpuid, HV_CPUID_VENDOR_AND_MAX_FUNCTIONS, 0); >>>> + if (c) { >>>> + cpu->hyperv_vendor_id[0] = c->ebx; >>>> + cpu->hyperv_vendor_id[1] = c->ecx; >>>> + cpu->hyperv_vendor_id[2] = c->edx; >>>> + } >>>> + >>>> c = cpuid_find_entry(cpuid, HV_CPUID_FEATURES, 0); >>>> if (c) { >>>> env->features[FEAT_HYPERV_EAX] = c->eax; >>>> @@ -1279,23 +1286,11 @@ static int hyperv_handle_properties(CPUState *cs, >>>> >>>> c = &cpuid_ent[cpuid_i++]; >>>> c->function = HV_CPUID_VENDOR_AND_MAX_FUNCTIONS; >>>> - if (!cpu->hyperv_vendor_id) { >>>> - memcpy(signature, "Microsoft Hv", 12); >>>> - } else { >>>> - size_t len = strlen(cpu->hyperv_vendor_id); >>>> - >>>> - if (len > 12) { >>>> - error_report("hv-vendor-id truncated to 12 characters"); >>>> - len = 12; >>>> - } >>>> - memset(signature, 0, 12); >>>> - memcpy(signature, cpu->hyperv_vendor_id, len); >>>> - } >>>> c->eax = hyperv_feat_enabled(cpu, HYPERV_FEAT_EVMCS) ? >>>> HV_CPUID_NESTED_FEATURES : HV_CPUID_IMPLEMENT_LIMITS; >>>> - c->ebx = signature[0]; >>>> - c->ecx = signature[1]; >>>> - c->edx = signature[2]; >>>> + c->ebx = cpu->hyperv_vendor_id[0]; >>>> + c->ecx = cpu->hyperv_vendor_id[1]; >>>> + c->edx = cpu->hyperv_vendor_id[2]; >>>> >>>> c = &cpuid_ent[cpuid_i++]; >>>> c->function = HV_CPUID_INTERFACE; >>>> >>> >> > -- Vitaly