From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH 1/2] [PATCH RFC v2 1/2] hyper-v: introduce Hyper-V support infrastructure. Date: Thu, 01 Dec 2011 15:50:56 +0100 Message-ID: <4ED79450.5090508@siemens.com> References: <1319384389-1389-1-git-send-email-vrozenfe@redhat.com> <1319384389-1389-2-git-send-email-vrozenfe@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, Avi Kivity , qemu-devel@nongnu.org, Paolo Bonzini , Kevin Wolf To: Vadim Rozenfeld Return-path: Received: from david.siemens.de ([192.35.17.14]:16840 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754754Ab1LAOvF (ORCPT ); Thu, 1 Dec 2011 09:51:05 -0500 In-Reply-To: <1319384389-1389-2-git-send-email-vrozenfe@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 2011-10-23 17:39, Vadim Rozenfeld wrote: > --- > Makefile.target | 2 + > target-i386/cpuid.c | 14 ++++++++++ > target-i386/hyperv.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ > target-i386/hyperv.h | 37 ++++++++++++++++++++++++++++ > 4 files changed, 118 insertions(+), 0 deletions(-) > create mode 100644 target-i386/hyperv.c > create mode 100644 target-i386/hyperv.h > > diff --git a/Makefile.target b/Makefile.target > index 325f26e..446fabc 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -202,6 +202,8 @@ obj-$(CONFIG_NO_KVM) += kvm-stub.o > obj-y += memory.o > LIBS+=-lz > > +obj-i386-y +=hyperv.o > + > QEMU_CFLAGS += $(VNC_TLS_CFLAGS) > QEMU_CFLAGS += $(VNC_SASL_CFLAGS) > QEMU_CFLAGS += $(VNC_JPEG_CFLAGS) > diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c > index 1e8bcff..261c168 100644 > --- a/target-i386/cpuid.c > +++ b/target-i386/cpuid.c > @@ -27,6 +27,8 @@ > #include "qemu-option.h" > #include "qemu-config.h" > > +#include "hyperv.h" > + > /* feature flags taken from "Intel Processor Identification and the CPUID > * Instruction" and AMD's "CPUID Specification". In cases of disagreement > * between feature naming conventions, aliases may be added. > @@ -716,6 +718,14 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) > goto error; > } > x86_cpu_def->tsc_khz = tsc_freq / 1000; > + } else if (!strcmp(featurestr, "hv_spinlocks")) { > + char *err; > + numvalue = strtoul(val, &err, 0); > + if (!*val || *err) { Indention is off here. > + fprintf(stderr, "bad numerical value %s\n", val); > + goto error; > + } > + hyperv_set_spinlock_retries(numvalue); > } else { > fprintf(stderr, "unrecognized feature %s\n", featurestr); > goto error; > @@ -724,6 +734,10 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) > check_cpuid = 1; > } else if (!strcmp(featurestr, "enforce")) { > check_cpuid = enforce_cpuid = 1; > + } else if (!strcmp(featurestr, "hv_relaxed")) { > + hyperv_enable_relaxed_timing(true); > + } else if (!strcmp(featurestr, "hv_vapic")) { > + hyperv_enable_vapic_recommended(true); > } else { > fprintf(stderr, "feature string `%s' not in format (+feature|-feature|feature=xyz)\n", featurestr); > goto error; > diff --git a/target-i386/hyperv.c b/target-i386/hyperv.c > new file mode 100644 > index 0000000..b2e57ad > --- /dev/null > +++ b/target-i386/hyperv.c > @@ -0,0 +1,65 @@ > +/* > + * QEMU Hyper-V support > + * > + * Copyright Red Hat, Inc. 2011 > + * > + * Author: Vadim Rozenfeld > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + */ > + > +#include "hyperv.h" > + > +static bool hyperv_vapic; > +static bool hyperv_relaxed_timing; > +static int hyperv_spinlock_attempts = HYPERV_SPINLOCK_NEVER_RETRY; > + > +void hyperv_enable_vapic_recommended(bool val) > +{ > + hyperv_vapic = val; > +} > + > +void hyperv_enable_relaxed_timing(bool val) > +{ > + hyperv_relaxed_timing = val; > +} > + > +void hyperv_set_spinlock_retries(int val) > +{ > + hyperv_spinlock_attempts = val; > + if (hyperv_spinlock_attempts < 0xFFF) { > + hyperv_spinlock_attempts = 0xFFF; > + } > +} > + > +bool hyperv_enabled(void) > +{ > + return hyperv_hypercall_available() || hyperv_relaxed_timing_enabled(); > +} > + > +bool hyperv_hypercall_available(void) > +{ > + if (hyperv_vapic || > + (hyperv_spinlock_attempts != HYPERV_SPINLOCK_NEVER_RETRY)) { [ minor: braces arount the second condition aren't needed. ] > + return true; > + } > + return false; > +} > + > +bool hyperv_vapic_recommended(void) > +{ > + return hyperv_vapic; > +} > + > +bool hyperv_relaxed_timing_enabled(void) > +{ > + return hyperv_relaxed_timing; > +} > + > +int hyperv_get_spinlock_retries(void) > +{ > + return hyperv_spinlock_attempts; > +} > + > diff --git a/target-i386/hyperv.h b/target-i386/hyperv.h > new file mode 100644 > index 0000000..0d742f8 > --- /dev/null > +++ b/target-i386/hyperv.h > @@ -0,0 +1,37 @@ > +/* > + * QEMU Hyper-V support > + * > + * Copyright Red Hat, Inc. 2011 > + * > + * Author: Vadim Rozenfeld > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + */ > + > +#ifndef QEMU_HW_HYPERV_H > +#define QEMU_HW_HYPERV_H 1 > + > +#include "qemu-common.h" > +#include > + > +#ifndef HYPERV_SPINLOCK_NEVER_RETRY > +#define HYPERV_SPINLOCK_NEVER_RETRY 0xFFFFFFFF > +#endif > + > +#ifndef KVM_CPUID_SIGNATURE_NEXT > +#define KVM_CPUID_SIGNATURE_NEXT 0x40000100 > +#endif > + > +void hyperv_enable_vapic_recommended(bool val); > +void hyperv_enable_relaxed_timing(bool val); > +void hyperv_set_spinlock_retries(int val); > + > +bool hyperv_enabled(void); > +bool hyperv_hypercall_available(void); > +bool hyperv_vapic_recommended(void); > +bool hyperv_relaxed_timing_enabled(void); > +int hyperv_get_spinlock_retries(void); > + > +#endif /* QEMU_HW_HYPERV_H */ Looks good to me otherwise. Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux