Skip to contentSkip to conversation

KVM: VMX: Fix header file dependency of asm/vmx.h

PATCH Applied Jim Mattson 3 participants 7 messages Feb 25, 2022 – May 19, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KVM: VMX: Fix header file dependency of asm/vmx.h

From: Jacob Xu <[email protected]>

Include a definition of WARN_ON_ONCE() before using it.

Fixes bb1fcc70d98f ("KVM: nVMX: Allow L1 to use 5-level page walks for nested EPT")
Cc Sean Christopherson <[email protected]>
[reworded commit message; changed <asm/bug.h> to <linux/bug.h>]
---
 arch/x86/include/asm/vmx.h | 1 +
 1 file changed, 1 insertion(+)
arch/x86/include/asm/vmx.h +1 -0
index 0ffaa3156a4e..447b97296400 100644
@@ -14,6 +14,7 @@
 
 #include <linux/bitops.h>
 #include <linux/types.h>
+#include <linux/bug.h>
 #include <uapi/asm/vmx.h>
 #include <asm/vmxfeatures.h>
 
Signature · 1 line
2.35.1.574.g5d30c73bfb-goog
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Jim Mattson

From: Jacob Xu <[email protected]>

Include a definition of WARN_ON_ONCE() before using it.

Fixes bb1fcc70d98f ("KVM: nVMX: Allow L1 to use 5-level page walks for nested EPT")
Cc Sean Christopherson <[email protected]>
[reworded commit message; changed <asm/bug.h> to <linux/bug.h>]
---
 arch/x86/include/asm/vmx.h | 1 +
 1 file changed, 1 insertion(+)
arch/x86/include/asm/vmx.h +0 -0
index 0ffaa3156a4e..447b97296400 100644

arch/x86/include/asm/vmx.h line 17

Quoted 4 lines
arch/x86/include/asm/vmx.h +1 -0
@@ -14,6 +14,7 @@
 
 #include <linux/bitops.h>
 #include <linux/types.h>
+#include <linux/bug.h>

Paolo, any chance you want to put these in alphabetical order when applying? :-)

Quoted 6 lines
arch/x86/include/asm/vmx.h +0 -0
 #include <uapi/asm/vmx.h>
 #include <asm/vmxfeatures.h>
 
Signature · 1 line
2.35.1.574.g5d30c73bfb-goog
#2 lore raw
Quoted 1 line · Sean Christopherson

Paolo, any chance you want to put these in alphabetical order when applying? :-)

Alphabetical?!? Not reverse fir tree?

#3 lore raw
Quoted 6 lines · Jim Mattson
Quoted 1 line · Sean Christopherson

Paolo, any chance you want to put these in alphabetical order when applying? :-)

Alphabetical?!? Not reverse fir tree?

Any order is fine with me, actually.

#4 lore raw
In reply to Sean Christopherson
Quoted 21 lines · Sean Christopherson
Quoted 19 lines · Jim Mattson

From: Jacob Xu <[email protected]>

Include a definition of WARN_ON_ONCE() before using it.

Fixes bb1fcc70d98f ("KVM: nVMX: Allow L1 to use 5-level page walks for nested EPT")
Cc Sean Christopherson <[email protected]>
[reworded commit message; changed <asm/bug.h> to <linux/bug.h>]
---
 arch/x86/include/asm/vmx.h | 1 +
 1 file changed, 1 insertion(+)
arch/x86/include/asm/vmx.h +0 -0
index 0ffaa3156a4e..447b97296400 100644
@@ -14,6 +14,7 @@
 
Quoted 11 lines

arch/x86/include/asm/vmx.h line 17

Quoted 3 lines
arch/x86/include/asm/vmx.h +1 -0
 #include <linux/bitops.h>
 #include <linux/types.h>
+#include <linux/bug.h>

Paolo, any chance you want to put these in alphabetical order when applying? :-)

Quoted 3 lines
arch/x86/include/asm/vmx.h +0 -0
 #include <uapi/asm/vmx.h>
 #include <asm/vmxfeatures.h>
 

Ping.

#5 lore raw
Quoted 28 lines · Jim Mattson
Quoted 27 lines · Sean Christopherson
Quoted 18 lines · Jim Mattson

From: Jacob Xu <[email protected]>

Include a definition of WARN_ON_ONCE() before using it.

Fixes bb1fcc70d98f ("KVM: nVMX: Allow L1 to use 5-level page walks for nested EPT")
Cc Sean Christopherson <[email protected]>
[reworded commit message; changed <asm/bug.h> to <linux/bug.h>]
---
 arch/x86/include/asm/vmx.h | 1 +
 1 file changed, 1 insertion(+)
arch/x86/include/asm/vmx.h +0 -0
index 0ffaa3156a4e..447b97296400 100644

arch/x86/include/asm/vmx.h line 17

Quoted 4 lines
arch/x86/include/asm/vmx.h +1 -0
@@ -14,6 +14,7 @@
 
 #include <linux/bitops.h>
 #include <linux/types.h>
+#include <linux/bug.h>

Paolo, any chance you want to put these in alphabetical order when applying? :-)

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
arch/x86/include/asm/vmx.h +0 -0
 #include <uapi/asm/vmx.h>
 #include <asm/vmxfeatures.h>
 

Ping.

I'll grab this for 6.5 unless Paolo beats me to the punch.

maintainer Applied
#6 lore raw
In reply to Jim Mattson
Quoted 18 lines · Jim Mattson

From: Jacob Xu <[email protected]>

Include a definition of WARN_ON_ONCE() before using it.

Fixes bb1fcc70d98f ("KVM: nVMX: Allow L1 to use 5-level page walks for nested EPT")
Cc Sean Christopherson <[email protected]>
[reworded commit message; changed <asm/bug.h> to <linux/bug.h>]
---
  arch/x86/include/asm/vmx.h | 1 +
  1 file changed, 1 insertion(+)
arch/x86/include/asm/vmx.h +0 -0
index 0ffaa3156a4e..447b97296400 100644

arch/x86/include/asm/vmx.h line 20

Quoted 7 lines
arch/x86/include/asm/vmx.h +1 -0
@@ -14,6 +14,7 @@
 
  #include <linux/bitops.h>
  #include <linux/types.h>
+#include <linux/bug.h>
  #include <uapi/asm/vmx.h>
  #include <asm/vmxfeatures.h>
 

Queued, thanks.

Paolo