QubesOS/qubes-linux-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix deadlock on /proc/xen/xenbus, enable CONFIG_FHANDLE needed by udevd

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-03-21 04:08:45 +01:00
parent 7905b0b2ba
commit 18ac9d8779
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config-pvops
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 3.18.7 Kernel Configuration # Linux/x86 3.18.9 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -72,7 +72,7 @@ CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_FHANDLE is not set CONFIG_FHANDLE=y
# CONFIG_USELIB is not set # CONFIG_USELIB is not set
CONFIG_AUDIT=y CONFIG_AUDIT=y
CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_HAVE_ARCH_AUDITSYSCALL=y
@ -6324,7 +6324,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_ASSERT is not set # CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=m CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y CONFIG_DNOTIFY=y

34
patches.xen/0001-xen-fix-deadlock-on-proc-xen-xenbus-access.patch Normal file
View File

@ -0,0 +1,34 @@
From 4e3eb4f6782da3f326879622e28a5efd3a1d26bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Fri, 20 Mar 2015 05:08:13 +0100
Subject: [PATCH] xen: fix deadlock on /proc/xen/xenbus access
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Invisible Things Lab
Cc: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Details here:
http://lists.xenproject.org/archives/html/xen-devel/2015-03/msg02501.html
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
---
drivers/xen/xenbus/xenbus_dev_frontend.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index 9433e46..3d333b13 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -535,6 +535,7 @@ static int xenbus_file_open(struct inode *inode, struct file *filp)
return -ENOENT;
nonseekable_open(inode, filp);
+ filp->f_mode &= ~FMODE_ATOMIC_POS;
u = kzalloc(sizeof(*u), GFP_KERNEL);
if (u == NULL)
--
2.1.0

1
series-pvops.conf
View File

@ -1,6 +1,7 @@
patches.rpmify/makefile-after_link.patch patches.rpmify/makefile-after_link.patch
patches.xen/0001-Revert-xen-xenbus-Avoid-synchronous-wait-on-XenBus-s.patch patches.xen/0001-Revert-xen-xenbus-Avoid-synchronous-wait-on-XenBus-s.patch
patches.xen/0001-xen-fix-deadlock-on-proc-xen-xenbus-access.patch
# Additional features # Additional features
#patches.xen/pvops-0100-usb-xen-pvusb-driver.patch #patches.xen/pvops-0100-usb-xen-pvusb-driver.patch