047483513a
xen-4.6.0-testing-src.tar.bz2 mini-os.tar.bz2 blktap2-no-uninit.patch stubdom-have-iovec.patch - Renamed xsa149.patch to CVE-2015-7969-xsa149.patch - Dropped patches now contained in tarball or unnecessary xen-4.5.2-testing-src.tar.bz2 54c2553c-grant-table-use-uint16_t-consistently-for-offset-and-length.patch 54ca33bc-grant-table-refactor-grant-copy-to-reduce-duplicate-code.patch 54ca340e-grant-table-defer-releasing-pages-acquired-in-a-grant-copy.patch 54f4985f-libxl-fix-libvirtd-double-free.patch 55103616-vm-assist-prepare-for-discontiguous-used-bit-numbers.patch 551ac326-xentop-add-support-for-qdisk.patch 552d0fd2-x86-hvm-don-t-include-asm-spinlock-h.patch 552d0fe8-x86-mtrr-include-asm-atomic.h.patch 552d293b-x86-vMSI-X-honor-all-mask-requests.patch 552d2966-x86-vMSI-X-add-valid-bits-for-read-acceleration.patch 5537a4d8-libxl-use-DEBUG-log-level-instead-of-INFO.patch 5548e903-domctl-don-t-truncate-XEN_DOMCTL_max_mem-requests.patch 5548e95d-x86-allow-to-suppress-M2P-user-mode-exposure.patch 554c7aee-x86-provide-arch_fetch_and_add.patch 554c7b00-arm-provide-arch_fetch_and_add.patch 554cc211-libxl-add-qxl.patch 55534b0a-x86-provide-add_sized.patch 55534b25-arm-provide-add_sized.patch 5555a4f8-use-ticket-locks-for-spin-locks.patch 5555a5b9-x86-arm-remove-asm-spinlock-h.patch 5555a8ec-introduce-non-contiguous-allocation.patch 556d973f-unmodified-drivers-tolerate-IRQF_DISABLED-being-undefined.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=387
79 lines
2.1 KiB
Diff
79 lines
2.1 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.6.0-testing/tools/libxc/xc_suspend.c
|
|
===================================================================
|
|
--- xen-4.6.0-testing.orig/tools/libxc/xc_suspend.c
|
|
+++ xen-4.6.0-testing/tools/libxc/xc_suspend.c
|
|
@@ -18,6 +18,10 @@
|
|
|
|
#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 XEN_RUN_DIR "/suspend-evtchn-%d.lock"
|
|
|
|
@@ -33,6 +37,37 @@
|
|
|
|
#define SUSPEND_FILE_BUFLEN (sizeof(SUSPEND_LOCK_FILE) + 10)
|
|
|
|
+/* 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 void get_suspend_file(char buf[], int domid)
|
|
{
|
|
snprintf(buf, SUSPEND_FILE_BUFLEN, SUSPEND_LOCK_FILE, domid);
|
|
@@ -46,6 +81,7 @@ static int lock_suspend_event(xc_interfa
|
|
struct flock fl;
|
|
|
|
get_suspend_file(suspend_file, domid);
|
|
+ clean_obsolete_lock(domid);
|
|
|
|
*lockfd = -1;
|
|
|
|
@@ -95,6 +131,8 @@ static int lock_suspend_event(xc_interfa
|
|
if (fd >= 0)
|
|
close(fd);
|
|
|
|
+ unlink(suspend_file);
|
|
+
|
|
return -1;
|
|
}
|
|
|