diff options
| author | Andrew Cooper <andrew.cooper3@citrix.com> | 2013-08-07 16:48:56 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-08-07 16:48:56 +0200 |
| commit | b20db11e11897d0a65f07d299ab185c984d93ba3 (patch) | |
| tree | b302abc29175f9af82cabd62e77dfc45855b689e | |
| parent | ee38571a76e03840d400fc2b2859d92f3f657fd7 (diff) | |
| download | xen-b20db11e11897d0a65f07d299ab185c984d93ba3.tar.gz xen-b20db11e11897d0a65f07d299ab185c984d93ba3.tar.bz2 xen-b20db11e11897d0a65f07d299ab185c984d93ba3.zip | |
x86/mm: Ensure useful progress in alloc_l2_table()
While debugging the issue which turned out to be XSA-58, a printk in this loop
showed that it was quite easy to never make useful progress, because of
consistently failing the preemption check.
One single l2 entry is a reasonable amount of work to do, even if an action is
pending, and also assures forwards progress across repeat continuations.
Tweak the continuation criteria to fail on the first iteration of the loop.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
master commit: d3a55d7d9bb518efe08143d050deff9f4ee80ec1
master date: 2013-07-04 10:33:18 +0200
| -rw-r--r-- | xen/arch/x86/mm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 77dcafc261..f151dec2b2 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1278,7 +1278,8 @@ static int alloc_l2_table(struct page_info *page, unsigned long type, for ( i = page->nr_validated_ptes; i < L2_PAGETABLE_ENTRIES; i++ ) { - if ( preemptible && i && hypercall_preempt_check() ) + if ( preemptible && i > page->nr_validated_ptes + && hypercall_preempt_check() ) { page->nr_validated_ptes = i; rc = -EAGAIN; |