Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1653143 > unrolled thread

[PATCH v5 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set

Started byVitaly Kuznetsov <vkuznets@redhat.com>
First post2017-05-30 13:40 +0200
Last post2017-05-31 17:00 +0200
Articles 4 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH v5 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-05-30 13:40 +0200
    Re: [PATCH v5 01/10] x86/hyper-v: include hyperv/ only when  CONFIG_HYPERV is set Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-05-30 18:30 +0200
      Re: [PATCH v5 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-05-31 16:40 +0200
        Re: [PATCH v5 01/10] x86/hyper-v: include hyperv/ only when  CONFIG_HYPERV is set Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-05-31 17:00 +0200

#1653143 — [PATCH v5 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set

FromVitaly Kuznetsov <vkuznets@redhat.com>
Date2017-05-30 13:40 +0200
Subject[PATCH v5 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set
Message-ID<tMNFf-6JG-15@gated-at.bofh.it>
Code is arch/x86/hyperv/ is only needed when CONFIG_HYPERV is set, the
'basic' support and detection lives in arch/x86/kernel/cpu/mshyperv.c
which is included when CONFIG_HYPERVISOR_GUEST is set.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Acked-by: K. Y. Srinivasan <kys@microsoft.com>
Tested-by: Simon Xiao <sixiao@microsoft.com>
Tested-by: Srikanth Myakam <v-srm@microsoft.com>
---
 arch/x86/Kbuild                 |  4 +++-
 arch/x86/include/asm/mshyperv.h | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild
index 586b786..3fa0a3c 100644
--- a/arch/x86/Kbuild
+++ b/arch/x86/Kbuild
@@ -8,7 +8,9 @@ obj-$(CONFIG_KVM) += kvm/
 obj-$(CONFIG_XEN) += xen/
 
 # Hyper-V paravirtualization support
-obj-$(CONFIG_HYPERVISOR_GUEST) += hyperv/
+ifdef CONFIG_HYPERV
+obj-y += hyperv/
+endif
 
 # lguest paravirtualization support
 obj-$(CONFIG_LGUEST_GUEST) += lguest/
diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index fba1007..91acec7 100644
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -175,7 +175,15 @@ void hyperv_init(void);
 void hyperv_report_panic(struct pt_regs *regs);
 bool hv_is_hypercall_page_setup(void);
 void hyperv_cleanup(void);
-#endif
+#else /* CONFIG_HYPERV */
+static inline void hyperv_init(void) {}
+static inline bool hv_is_hypercall_page_setup(void)
+{
+	return false;
+}
+static inline hyperv_cleanup(void) {}
+#endif /* CONFIG_HYPERV */
+
 #ifdef CONFIG_HYPERV_TSCPAGE
 struct ms_hyperv_tsc_page *hv_get_tsc_page(void);
 static inline u64 hv_read_tsc_page(const struct ms_hyperv_tsc_page *tsc_pg)
-- 
2.9.4

[toc] | [next] | [standalone]

#1653358 — Re: [PATCH v5 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set

FromAndy Shevchenko <andy.shevchenko@gmail.com>
Date2017-05-30 18:30 +0200
SubjectRe: [PATCH v5 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set
Message-ID<tMSbU-1dJ-17@gated-at.bofh.it>
In reply to#1653143
On Tue, May 30, 2017 at 2:34 PM, Vitaly Kuznetsov <vkuznets@redhat.com> wrote:
> Code is arch/x86/hyperv/ is only needed when CONFIG_HYPERV is set, the
> 'basic' support and detection lives in arch/x86/kernel/cpu/mshyperv.c
> which is included when CONFIG_HYPERVISOR_GUEST is set.
>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> Acked-by: K. Y. Srinivasan <kys@microsoft.com>
> Tested-by: Simon Xiao <sixiao@microsoft.com>
> Tested-by: Srikanth Myakam <v-srm@microsoft.com>
> ---
>  arch/x86/Kbuild                 |  4 +++-
>  arch/x86/include/asm/mshyperv.h | 10 +++++++++-
>  2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild
> index 586b786..3fa0a3c 100644
> --- a/arch/x86/Kbuild
> +++ b/arch/x86/Kbuild
> @@ -8,7 +8,9 @@ obj-$(CONFIG_KVM) += kvm/
>  obj-$(CONFIG_XEN) += xen/
>
>  # Hyper-V paravirtualization support
> -obj-$(CONFIG_HYPERVISOR_GUEST) += hyperv/
> +ifdef CONFIG_HYPERV
> +obj-y += hyperv/
> +endif

Can
obj-$(CONFIG_HYPERV) += hyperv/
work for you instead?

> +#else /* CONFIG_HYPERV */
> +static inline void hyperv_init(void) {}

> +static inline bool hv_is_hypercall_page_setup(void)
> +{
> +       return false;
> +}

Can it be one line? (It's okay in this case if it goes ~83 characters,
for example)

-- 
With Best Regards,
Andy Shevchenko

[toc] | [prev] | [next] | [standalone]

#1654314

FromVitaly Kuznetsov <vkuznets@redhat.com>
Date2017-05-31 16:40 +0200
Message-ID<tNcX0-62R-7@gated-at.bofh.it>
In reply to#1653358
Andy Shevchenko <andy.shevchenko@gmail.com> writes:

> On Tue, May 30, 2017 at 2:34 PM, Vitaly Kuznetsov <vkuznets@redhat.com> wrote:
>> Code is arch/x86/hyperv/ is only needed when CONFIG_HYPERV is set, the
>> 'basic' support and detection lives in arch/x86/kernel/cpu/mshyperv.c
>> which is included when CONFIG_HYPERVISOR_GUEST is set.
>>
>> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>> Acked-by: K. Y. Srinivasan <kys@microsoft.com>
>> Tested-by: Simon Xiao <sixiao@microsoft.com>
>> Tested-by: Srikanth Myakam <v-srm@microsoft.com>
>> ---
>>  arch/x86/Kbuild                 |  4 +++-
>>  arch/x86/include/asm/mshyperv.h | 10 +++++++++-
>>  2 files changed, 12 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild
>> index 586b786..3fa0a3c 100644
>> --- a/arch/x86/Kbuild
>> +++ b/arch/x86/Kbuild
>> @@ -8,7 +8,9 @@ obj-$(CONFIG_KVM) += kvm/
>>  obj-$(CONFIG_XEN) += xen/
>>
>>  # Hyper-V paravirtualization support
>> -obj-$(CONFIG_HYPERVISOR_GUEST) += hyperv/
>> +ifdef CONFIG_HYPERV
>> +obj-y += hyperv/
>> +endif
>
> Can
> obj-$(CONFIG_HYPERV) += hyperv/
> work for you instead?
>

CONFIG_HYPERV can be set to "m" but we want to include the contents of
hyperv/ in vmlinux, not in vmbus module.

>> +#else /* CONFIG_HYPERV */
>> +static inline void hyperv_init(void) {}
>
>> +static inline bool hv_is_hypercall_page_setup(void)
>> +{
>> +       return false;
>> +}
>
> Can it be one line? (It's okay in this case if it goes ~83 characters,
> for example)

Sure, I'm just trying to avoid such things as later people come with
'fix checkpatch.pl warning' patches.

-- 
  Vitaly

[toc] | [prev] | [next] | [standalone]

#1654325 — Re: [PATCH v5 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set

FromAndy Shevchenko <andy.shevchenko@gmail.com>
Date2017-05-31 17:00 +0200
SubjectRe: [PATCH v5 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set
Message-ID<tNdgl-6b3-9@gated-at.bofh.it>
In reply to#1654314
On Wed, May 31, 2017 at 5:37 PM, Vitaly Kuznetsov <vkuznets@redhat.com> wrote:

>>>  # Hyper-V paravirtualization support
>>> -obj-$(CONFIG_HYPERVISOR_GUEST) += hyperv/
>>> +ifdef CONFIG_HYPERV
>>> +obj-y += hyperv/
>>> +endif
>>
>> Can
>> obj-$(CONFIG_HYPERV) += hyperv/
>> work for you instead?
>>
>
> CONFIG_HYPERV can be set to "m" but we want to include the contents of
> hyperv/ in vmlinux, not in vmbus module.

obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/

should do the trick.

-- 
With Best Regards,
Andy Shevchenko

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web