Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
d686a547
Commit
d686a547
authored
Jan 06, 2013
by
Alexander Graf
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit 'origin/master' into kvm-ppc-3.8
parents
d591390d
18eb54cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
arch/x86/kernel/kvm.c
arch/x86/kernel/kvm.c
+10
-2
No files found.
arch/x86/kernel/kvm.c
View file @
d686a547
...
...
@@ -43,6 +43,7 @@
#include <asm/apicdef.h>
#include <asm/hypervisor.h>
#include <asm/kvm_guest.h>
#include <asm/context_tracking.h>
static
int
kvmapf
=
1
;
...
...
@@ -121,6 +122,8 @@ void kvm_async_pf_task_wait(u32 token)
struct
kvm_task_sleep_node
n
,
*
e
;
DEFINE_WAIT
(
wait
);
rcu_irq_enter
();
spin_lock
(
&
b
->
lock
);
e
=
_find_apf_task
(
b
,
token
);
if
(
e
)
{
...
...
@@ -128,6 +131,8 @@ void kvm_async_pf_task_wait(u32 token)
hlist_del
(
&
e
->
link
);
kfree
(
e
);
spin_unlock
(
&
b
->
lock
);
rcu_irq_exit
();
return
;
}
...
...
@@ -152,13 +157,16 @@ void kvm_async_pf_task_wait(u32 token)
/*
* We cannot reschedule. So halt.
*/
rcu_irq_exit
();
native_safe_halt
();
rcu_irq_enter
();
local_irq_disable
();
}
}
if
(
!
n
.
halted
)
finish_wait
(
&
n
.
wq
,
&
wait
);
rcu_irq_exit
();
return
;
}
EXPORT_SYMBOL_GPL
(
kvm_async_pf_task_wait
);
...
...
@@ -252,10 +260,10 @@ do_async_page_fault(struct pt_regs *regs, unsigned long error_code)
break
;
case
KVM_PV_REASON_PAGE_NOT_PRESENT
:
/* page is swapped out by the host. */
rcu_irq_enter
(
);
exception_enter
(
regs
);
exit_idle
();
kvm_async_pf_task_wait
((
u32
)
read_cr2
());
rcu_irq_exit
(
);
exception_exit
(
regs
);
break
;
case
KVM_PV_REASON_PAGE_READY
:
rcu_irq_enter
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment