2018-02-20 07:41:01

by KarimAllah Ahmed

[permalink] [raw]
Subject: [PATCH] X86/UAPI: Use __u64 instead of u64 in hyperv.h

... since u64 has a hidden header dependency that was not there before
using it (i.e. it breaks our VMM build). Also, __u64 is the right way to
expose the data type through UAPI.

Fixes: 93286261 ("x86/hyperv: Reenlightenment notifications support")
Signed-off-by: KarimAllah Ahmed <[email protected]>
Cc: K. Y. Srinivasan <[email protected]>
Cc: Haiyang Zhang <[email protected]>
Cc: Stephen Hemminger <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
arch/x86/include/uapi/asm/hyperv.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h
index 197c2e6..0994143 100644
--- a/arch/x86/include/uapi/asm/hyperv.h
+++ b/arch/x86/include/uapi/asm/hyperv.h
@@ -241,24 +241,24 @@
#define HV_X64_MSR_REENLIGHTENMENT_CONTROL 0x40000106

struct hv_reenlightenment_control {
- u64 vector:8;
- u64 reserved1:8;
- u64 enabled:1;
- u64 reserved2:15;
- u64 target_vp:32;
+ __u64 vector:8;
+ __u64 reserved1:8;
+ __u64 enabled:1;
+ __u64 reserved2:15;
+ __u64 target_vp:32;
};

#define HV_X64_MSR_TSC_EMULATION_CONTROL 0x40000107
#define HV_X64_MSR_TSC_EMULATION_STATUS 0x40000108

struct hv_tsc_emulation_control {
- u64 enabled:1;
- u64 reserved:63;
+ __u64 enabled:1;
+ __u64 reserved:63;
};

struct hv_tsc_emulation_status {
- u64 inprogress:1;
- u64 reserved:63;
+ __u64 inprogress:1;
+ __u64 reserved:63;
};

#define HV_X64_MSR_HYPERCALL_ENABLE 0x00000001
--
2.7.4



Subject: [tip:x86/urgent] x86/headers/UAPI: Use __u64 instead of u64 in <uapi/asm/hyperv.h>

Commit-ID: 894266466aa74a226e58e23975118ff6231dd2e4
Gitweb: https://git.kernel.org/tip/894266466aa74a226e58e23975118ff6231dd2e4
Author: KarimAllah Ahmed <[email protected]>
AuthorDate: Tue, 20 Feb 2018 08:39:51 +0100
Committer: Ingo Molnar <[email protected]>
CommitDate: Tue, 20 Feb 2018 08:54:47 +0100

x86/headers/UAPI: Use __u64 instead of u64 in <uapi/asm/hyperv.h>

... since u64 has a hidden header dependency that was not there before
using it (i.e. it breaks our VMM build).

Also, __u64 is the right way to expose data types through UAPI.

Signed-off-by: KarimAllah Ahmed <[email protected]>
Acked-by: Thomas Gleixner <[email protected]>
Cc: Haiyang Zhang <[email protected]>
Cc: K. Y. Srinivasan <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephen Hemminger <[email protected]>
Cc: [email protected]
Fixes: 93286261 ("x86/hyperv: Reenlightenment notifications support")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/include/uapi/asm/hyperv.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h
index 197c2e6..0994143 100644
--- a/arch/x86/include/uapi/asm/hyperv.h
+++ b/arch/x86/include/uapi/asm/hyperv.h
@@ -241,24 +241,24 @@
#define HV_X64_MSR_REENLIGHTENMENT_CONTROL 0x40000106

struct hv_reenlightenment_control {
- u64 vector:8;
- u64 reserved1:8;
- u64 enabled:1;
- u64 reserved2:15;
- u64 target_vp:32;
+ __u64 vector:8;
+ __u64 reserved1:8;
+ __u64 enabled:1;
+ __u64 reserved2:15;
+ __u64 target_vp:32;
};

#define HV_X64_MSR_TSC_EMULATION_CONTROL 0x40000107
#define HV_X64_MSR_TSC_EMULATION_STATUS 0x40000108

struct hv_tsc_emulation_control {
- u64 enabled:1;
- u64 reserved:63;
+ __u64 enabled:1;
+ __u64 reserved:63;
};

struct hv_tsc_emulation_status {
- u64 inprogress:1;
- u64 reserved:63;
+ __u64 inprogress:1;
+ __u64 reserved:63;
};

#define HV_X64_MSR_HYPERCALL_ENABLE 0x00000001

2018-02-20 16:50:23

by KY Srinivasan

[permalink] [raw]
Subject: RE: [PATCH] X86/UAPI: Use __u64 instead of u64 in hyperv.h



> -----Original Message-----
> From: KarimAllah Ahmed <[email protected]>
> Sent: Monday, February 19, 2018 11:40 PM
> To: [email protected]; [email protected];
> [email protected]
> Cc: KarimAllah Ahmed <[email protected]>; KY Srinivasan
> <[email protected]>; Haiyang Zhang <[email protected]>; Stephen
> Hemminger <[email protected]>; Thomas Gleixner
> <[email protected]>; Ingo Molnar <[email protected]>; H . Peter Anvin
> <[email protected]>
> Subject: [PATCH] X86/UAPI: Use __u64 instead of u64 in hyperv.h
>
> ... since u64 has a hidden header dependency that was not there before
> using it (i.e. it breaks our VMM build). Also, __u64 is the right way to
> expose the data type through UAPI.
>
> Fixes: 93286261 ("x86/hyperv: Reenlightenment notifications support")
> Signed-off-by: KarimAllah Ahmed <[email protected]>
> Cc: K. Y. Srinivasan <[email protected]>
> Cc: Haiyang Zhang <[email protected]>
> Cc: Stephen Hemminger <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: H. Peter Anvin <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]

Acked-by: K. Y. Srinivasan <[email protected]>
> ---
> arch/x86/include/uapi/asm/hyperv.h | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/include/uapi/asm/hyperv.h
> b/arch/x86/include/uapi/asm/hyperv.h
> index 197c2e6..0994143 100644
> --- a/arch/x86/include/uapi/asm/hyperv.h
> +++ b/arch/x86/include/uapi/asm/hyperv.h
> @@ -241,24 +241,24 @@
> #define HV_X64_MSR_REENLIGHTENMENT_CONTROL 0x40000106
>
> struct hv_reenlightenment_control {
> - u64 vector:8;
> - u64 reserved1:8;
> - u64 enabled:1;
> - u64 reserved2:15;
> - u64 target_vp:32;
> + __u64 vector:8;
> + __u64 reserved1:8;
> + __u64 enabled:1;
> + __u64 reserved2:15;
> + __u64 target_vp:32;
> };
>
> #define HV_X64_MSR_TSC_EMULATION_CONTROL 0x40000107
> #define HV_X64_MSR_TSC_EMULATION_STATUS 0x40000108
>
> struct hv_tsc_emulation_control {
> - u64 enabled:1;
> - u64 reserved:63;
> + __u64 enabled:1;
> + __u64 reserved:63;
> };
>
> struct hv_tsc_emulation_status {
> - u64 inprogress:1;
> - u64 reserved:63;
> + __u64 inprogress:1;
> + __u64 reserved:63;
> };
>
> #define HV_X64_MSR_HYPERCALL_ENABLE 0x00000001
> --
> 2.7.4