Skip to contentSkip to conversation

kvm: Add missing include and EXPORT_SYMBOL_GPL

PATCH In review Sedat Dilek 2 participants 3 messages Jan 23, 2013

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

PATCH 1/1 kvm: Add missing include and EXPORT_SYMBOL_GPL

When CONFIG_KVM=m my build with 3.8-rc4-nohz3 breaks like this:

ERROR: "guest_enter" [arch/x86/kvm/kvm.ko] undefined!
ERROR: "guest_exit" [arch/x86/kvm/kvm.ko] undefined!

Fix this by removing the CONFIG_KVM ifdefs and adding missing EXPORT_SYMBOL_GPL for:
+ guest_enter() and guest_exit()
+ vtime_guest_enter() and vtime_guest_exit()

Also add a missing include:
+ Add <linux/export.h> to kernel/context_tracking.c

This issue was introduced with commit 8eebafe9be58 ("kvm: Prepare to add generic guest entry/exit callbacks").

With some help of funny "i™"X86 hackerz!

Tested on a Ubuntu/precise AMD64 with 'CONFIG_KVM=m'.

[ vUNKNOWN: Without the magic "i" hack. -dileks ] [ vUNKNOWN+1: Remove vtime.h from kvm_host.h. -dileks ]

---
 kernel/context_tracking.c | 7 +++----
 kernel/sched/cputime.c    | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)
kernel/context_tracking.c +3 -4
index bbb2c2c..8802a66 100644
@@ -19,7 +19,7 @@
 #include <linux/rcupdate.h>
 #include <linux/sched.h>
 #include <linux/hardirq.h>
-
+#include <linux/export.h>
 
 DEFINE_PER_CPU(struct context_tracking, context_tracking) = {
 #ifdef CONFIG_CONTEXT_TRACKING_FORCE
@@ -103,7 +103,6 @@ void user_exit(void)
 	local_irq_restore(flags);
 }
 
-#ifdef CONFIG_KVM
 void guest_enter(void)
 {
 	if (vtime_accounting_enabled())
@@ -111,6 +110,7 @@ void guest_enter(void)
 	else
 		__guest_enter();
 }
+EXPORT_SYMBOL_GPL(guest_enter);
 
 void guest_exit(void)
 {
@@ -119,8 +119,7 @@ void guest_exit(void)
 	else
 		__guest_exit();
 }
-#endif
-
+EXPORT_SYMBOL_GPL(guest_exit);
 
 /**
  * context_tracking_task_switch - context switch the syscall callbacks
kernel/sched/cputime.c +2 -2
index 5500a81..dc66cba 100644
@@ -677,7 +677,6 @@ void vtime_user_enter(struct task_struct *tsk)
 	write_sequnlock(&tsk->vtime_seqlock);
 }
 
-#ifdef CONFIG_KVM
 void vtime_guest_enter(struct task_struct *tsk)
 {
 	write_seqlock(&tsk->vtime_seqlock);
@@ -685,6 +684,7 @@ void vtime_guest_enter(struct task_struct *tsk)
 	current->flags |= PF_VCPU;
 	write_sequnlock(&tsk->vtime_seqlock);
 }
+EXPORT_SYMBOL_GPL(vtime_guest_enter);
 
 void vtime_guest_exit(struct task_struct *tsk)
 {
@@ -693,7 +693,7 @@ void vtime_guest_exit(struct task_struct *tsk)
 	current->flags &= ~PF_VCPU;
 	write_sequnlock(&tsk->vtime_seqlock);
 }
-#endif
+EXPORT_SYMBOL_GPL(vtime_guest_exit);
 
 void vtime_account_idle(struct task_struct *tsk)
 {
Signature · 1 line
1.8.1.1
#1 lore raw

2013/1/23 Sedat Dilek <[email protected]>:

Quoted 16 lines

When CONFIG_KVM=m my build with 3.8-rc4-nohz3 breaks like this:

ERROR: "guest_enter" [arch/x86/kvm/kvm.ko] undefined!
ERROR: "guest_exit" [arch/x86/kvm/kvm.ko] undefined!

Fix this by removing the CONFIG_KVM ifdefs and adding missing EXPORT_SYMBOL_GPL for:
+ guest_enter() and guest_exit()
+ vtime_guest_enter() and vtime_guest_exit()

Also add a missing include:
+ Add <linux/export.h> to kernel/context_tracking.c

This issue was introduced with commit 8eebafe9be58 ("kvm: Prepare to add generic guest entry/exit callbacks").

Quoted 8 lines

With some help of funny "i™"X86 hackerz!

Tested on a Ubuntu/precise AMD64 with 'CONFIG_KVM=m'.

[ vUNKNOWN: Without the magic "i" hack. -dileks ] [ vUNKNOWN+1: Remove vtime.h from kvm_host.h. -dileks ]

Thanks you!

I hope you don't mind if I fold this patch into 8eebafe9be58. If I apply your patch separately, my patch would break the bisection. But I'll add your signed-off and the appropriate co-authorship credits.

#2 lore raw
Quoted 24 lines · Frederic Weisbecker

2013/1/23 Sedat Dilek <[email protected]>:

Quoted 23 lines

When CONFIG_KVM=m my build with 3.8-rc4-nohz3 breaks like this:

ERROR: "guest_enter" [arch/x86/kvm/kvm.ko] undefined!
ERROR: "guest_exit" [arch/x86/kvm/kvm.ko] undefined!

Fix this by removing the CONFIG_KVM ifdefs and adding missing EXPORT_SYMBOL_GPL for:
+ guest_enter() and guest_exit()
+ vtime_guest_enter() and vtime_guest_exit()

Also add a missing include:
+ Add <linux/export.h> to kernel/context_tracking.c

This issue was introduced with commit 8eebafe9be58 ("kvm: Prepare to add generic guest entry/exit callbacks").

With some help of funny "i™"X86 hackerz!

Tested on a Ubuntu/precise AMD64 with 'CONFIG_KVM=m'.

[ vUNKNOWN: Without the magic "i" hack. -dileks ] [ vUNKNOWN+1: Remove vtime.h from kvm_host.h. -dileks ]

Quoted 7 lines
Quoted 1 line

Thanks you!

I hope you don't mind if I fold this patch into 8eebafe9be58. If I apply your patch separately, my patch would break the bisection. But I'll add your signed-off and the appropriate co-authorship credits.

That sounds reasonable! Thanks for the vital help... Enjoyed it :-).

- Sedat -