ac6e56e6d7
23900-xzalloc.patch 24144-cpufreq-turbo-crash.patch 24148-shadow-pgt-dying-op-performance.patch 24155-x86-ioapic-EOI-after-migration.patch 24156-x86-ioapic-shared-vectors.patch 24157-x86-xstate-init.patch 24168-x86-vioapic-clear-remote_irr.patch - submit fixes for bnc#649209 and bnc#711892 xl-create-pv-with-qcow2-img.patch update suspend_evtchn_lock.patch - Update trace.c, merge patches from upstream 23050-xentrace_dynamic_tracebuffer_allocation.patch 23091-xentrace_fix_t_info_pages_calculation..patch 23092-xentrace_print_calculated_numbers_in_calculate_tbuf_size.patch 23093-xentrace_remove_gdprintk_usage_since_they_are_not_in_guest_context.patch 23094-xentrace_update_comments.patch 23095-xentrace_use_consistent_printk_prefix.patch 23128-xentrace_correct_formula_to_calculate_t_info_pages.patch 23129-xentrace_remove_unneeded_debug_printk.patch 23173-xentrace_Move_register_cpu_notifier_call_into_boot-time_init..patch 23239-xentrace_correct_overflow_check_for_number_of_per-cpu_trace_pages.patch 23308-xentrace_Move_the_global_variable_t_info_first_offset_into_calculate_tbuf_size.patch 23309-xentrace_Mark_data_size___read_mostly_because_its_only_written_once.patch 23310-xentrace_Remove_unneeded_cast_when_assigning_pointer_value_to_dst.patch 23404-xentrace_reduce_trace_buffer_size_to_something_mfn_offset_can_reach.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=160
85 lines
2.3 KiB
Diff
85 lines
2.3 KiB
Diff
Fix problems that suspend eventchannel lock file might be obselete for some reason
|
|
like segment fault or other abnormal exit, and once obselete lock file exists,
|
|
it might affact latter save process.
|
|
Have discussed with upstream, for some reason not accepted.
|
|
http://xen.1045712.n5.nabble.com/Re-PATCH-improve-suspend-evtchn-lock-processing-td3395229.html
|
|
|
|
Signed-off-by: Chunyan Liu <cyliu@suse.com>
|
|
|
|
Index: xen-4.1.2-testing/tools/libxc/xc_suspend.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/libxc/xc_suspend.c
|
|
+++ xen-4.1.2-testing/tools/libxc/xc_suspend.c
|
|
@@ -16,8 +16,43 @@
|
|
|
|
#include "xc_private.h"
|
|
#include "xenguest.h"
|
|
+#include <signal.h>
|
|
+#ifdef __MINIOS__
|
|
+extern int kill (__pid_t __pid, int __sig);
|
|
+#endif
|
|
|
|
#define SUSPEND_LOCK_FILE "/var/lib/xen/suspend_evtchn"
|
|
+/* cleanup obsolete suspend lock file which is unlinked for any reason,
|
|
+so that current process can get lock */
|
|
+static void clean_obsolete_lock(int domid)
|
|
+{
|
|
+ int fd, pid, n;
|
|
+ char buf[128];
|
|
+ char suspend_file[256];
|
|
+
|
|
+ snprintf(suspend_file, sizeof(suspend_file), "%s_%d_lock.d",
|
|
+ SUSPEND_LOCK_FILE, domid);
|
|
+ fd = open(suspend_file, O_RDWR);
|
|
+
|
|
+ if (fd < 0)
|
|
+ return;
|
|
+
|
|
+ n = read(fd, buf, 127);
|
|
+
|
|
+ close(fd);
|
|
+
|
|
+ if (n > 0)
|
|
+ {
|
|
+ sscanf(buf, "%d", &pid);
|
|
+ /* pid does not exist, this lock file is obsolete, just delete it */
|
|
+ if ( kill(pid,0) )
|
|
+ {
|
|
+ unlink(suspend_file);
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
static int lock_suspend_event(xc_interface *xch, int domid)
|
|
{
|
|
int fd, rc;
|
|
@@ -27,6 +62,7 @@ static int lock_suspend_event(xc_interfa
|
|
|
|
snprintf(suspend_file, sizeof(suspend_file), "%s_%d_lock.d",
|
|
SUSPEND_LOCK_FILE, domid);
|
|
+ clean_obsolete_lock(domid);
|
|
mask = umask(022);
|
|
fd = open(suspend_file, O_CREAT | O_EXCL | O_RDWR, 0666);
|
|
if (fd < 0)
|
|
@@ -41,6 +77,9 @@ static int lock_suspend_event(xc_interfa
|
|
rc = write_exact(fd, buf, strlen(buf));
|
|
close(fd);
|
|
|
|
+ if(rc)
|
|
+ unlink(suspend_file);
|
|
+
|
|
return rc;
|
|
}
|
|
|
|
@@ -127,8 +166,7 @@ int xc_suspend_evtchn_init(xc_interface
|
|
return suspend_evtchn;
|
|
|
|
cleanup:
|
|
- if (suspend_evtchn != -1)
|
|
- xc_suspend_evtchn_release(xch, xce, domid, suspend_evtchn);
|
|
+ xc_suspend_evtchn_release(xch, xce, domid, suspend_evtchn);
|
|
|
|
return -1;
|
|
}
|