800917b5a2
- Update to Xen 4.1.2_rc2 c/s 23152 - bnc#716695 - domUs using tap devices will not start updated multi-xvdp.patch - Upstream patches from Jan 23803-intel-pmu-models.patch 23800-x86_64-guest-addr-range.patch 23795-intel-ich10-quirk.patch 23804-x86-IPI-counts.patch - bnc#706106 - Inconsistent reporting of VM names during migration xend-migration-domname-fix.patch - bnc#712823 - L3:Xen guest does not start reliable when rebooted xend-vcpu-affinity-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=143
53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
xenpaging: correct dropping pages to avoid full ring buffer
|
|
|
|
Doing a one-way channel from Xen to xenpaging is not possible with the
|
|
current ring buffer implementation. xenpaging uses the mem_event ring
|
|
buffer, which expects request/response pairs to make progress. The
|
|
previous patch, which tried to establish a one-way communication from
|
|
Xen to xenpaging, stalled the guest once the buffer was filled up with
|
|
requests. Correct page-dropping by taking the slow path and let
|
|
p2m_mem_paging_resume() consume the response from xenpaging. This makes
|
|
room for yet another request/response pair and avoids hanging guests.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
|
tools/xenpaging/xenpaging.c | 22 +++++++++++-----------
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
Index: xen-4.1.2-testing/tools/xenpaging/xenpaging.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/xenpaging/xenpaging.c
|
|
+++ xen-4.1.2-testing/tools/xenpaging/xenpaging.c
|
|
@@ -653,19 +653,19 @@ int main(int argc, char *argv[])
|
|
ERROR("Error populating page");
|
|
goto out;
|
|
}
|
|
+ }
|
|
|
|
- /* Prepare the response */
|
|
- rsp.gfn = req.gfn;
|
|
- rsp.p2mt = req.p2mt;
|
|
- rsp.vcpu_id = req.vcpu_id;
|
|
- rsp.flags = req.flags;
|
|
+ /* Prepare the response */
|
|
+ rsp.gfn = req.gfn;
|
|
+ rsp.p2mt = req.p2mt;
|
|
+ rsp.vcpu_id = req.vcpu_id;
|
|
+ rsp.flags = req.flags;
|
|
|
|
- rc = xenpaging_resume_page(paging, &rsp, 1);
|
|
- if ( rc != 0 )
|
|
- {
|
|
- ERROR("Error resuming page");
|
|
- goto out;
|
|
- }
|
|
+ rc = xenpaging_resume_page(paging, &rsp, 1);
|
|
+ if ( rc != 0 )
|
|
+ {
|
|
+ ERROR("Error resuming page");
|
|
+ goto out;
|
|
}
|
|
|
|
/* Evict a new page to replace the one we just paged in */
|