Re: [Qemu-devel] [PATCH RFC v3 1/2] hyper-v: introduce Hyper-V support infrastructure.

[Jan Kiszka <jan.kiszka@web.de>]

[-- Attachment #1: Type: text/plain, Size: 6635 bytes --]

On 2012-01-18 21:05, Jan Kiszka wrote:
> On 2011-12-18 21:48, 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 6e742c2..6245796 100644
>> --- a/Makefile.target
>> +++ b/Makefile.target
>> @@ -209,6 +209,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..4193df1 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) {
>> +                    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     <vrozenfe@redhat.com>
>> + *
>> + * 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)) {
>> +      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     <vrozenfe@redhat.com>
>> + *
>> + * 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 <asm/hyperv.h>
>> +
>> +#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 */
> 
> This doesn't build for user mode as references in cpu_x86_find_by_name
> aren't available then.

Just fold this into the patch:

diff --git a/target-i386/hyperv.h b/target-i386/hyperv.h
index 0d742f8..15467bf 100644
--- a/target-i386/hyperv.h
+++ b/target-i386/hyperv.h
@@ -24,9 +24,15 @@
 #define KVM_CPUID_SIGNATURE_NEXT                0x40000100
 #endif

+#ifndef CONFIG_USER_ONLY
 void hyperv_enable_vapic_recommended(bool val);
 void hyperv_enable_relaxed_timing(bool val);
 void hyperv_set_spinlock_retries(int val);
+#else
+static inline void hyperv_enable_vapic_recommended(bool val) { }
+static inline void hyperv_enable_relaxed_timing(bool val) { }
+static inline void hyperv_set_spinlock_retries(int val) { }
+#endif

 bool hyperv_enabled(void);
 bool hyperv_hypercall_available(void);

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]