Compare commits
3 Commits
cabb465d41
...
afa7541760
| Author | SHA1 | Date | |
|---|---|---|---|
 Stoiko Ivanov
|
afa7541760 | ||
|
Stoiko Ivanov
|
f3341ff73f | ||
|
Stoiko Ivanov
|
50ad4ffe78 |
@@ -1,3 +1,9 @@
|
||||
zfs-linux (0.7.9-pve2~bpo9) unstable; urgency=medium
|
||||
|
||||
* Cherry-pick fix for zpl_mount deadlock
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 12 Jul 2018 12:37:50 +0200
|
||||
|
||||
zfs-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
|
||||
|
||||
* update ZFS to 0.7.9
|
||||
|
||||
+1
-1
Submodule zfs-debian updated: 6f627d8999...b444ee6627
@@ -1,102 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Russo <antonio.e.russo@gmail.com>
|
||||
Date: Fri, 18 May 2018 18:04:51 -0400
|
||||
Subject: [PATCH] Expand zfs-test and add Breaks/Conflicts
|
||||
|
||||
---
|
||||
debian/control | 4 ++--
|
||||
debian/control.in | 4 ++--
|
||||
debian/tests/control | 2 +-
|
||||
debian/zfs-test.install | 6 +++++-
|
||||
debian/zfsutils-linux.install | 5 +----
|
||||
5 files changed, 11 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 9e4f8fa7..8d85529c 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -180,8 +180,8 @@ Depends: acl,
|
||||
zfsutils-linux (>=${binary:Version}),
|
||||
${misc:Depends},
|
||||
${shlibs:Depends}
|
||||
-Breaks: zfsutils-linux (<= 0.6.5.11-1)
|
||||
-Replaces: zfsutils-linux (<= 0.6.5.11-1)
|
||||
+Breaks: zfsutils-linux (<= 0.7.9-2)
|
||||
+Replaces: zfsutils-linux (<= 0.7.9-2)
|
||||
Conflicts: zutils
|
||||
Description: OpenZFS test infrastructure an support scripts
|
||||
The Z file system is a pooled filesystem designed for maximum data
|
||||
diff --git a/debian/control.in b/debian/control.in
|
||||
index e193f017..9970875e 100644
|
||||
--- a/debian/control.in
|
||||
+++ b/debian/control.in
|
||||
@@ -180,8 +180,8 @@ Depends: acl,
|
||||
zfsutils-linux (>=${binary:Version}),
|
||||
${misc:Depends},
|
||||
${shlibs:Depends}
|
||||
-Breaks: zfsutils-linux (<= 0.6.5.11-1)
|
||||
-Replaces: zfsutils-linux (<= 0.6.5.11-1)
|
||||
+Breaks: zfsutils-linux (<= 0.7.9-2)
|
||||
+Replaces: zfsutils-linux (<= 0.7.9-2)
|
||||
Conflicts: zutils
|
||||
Description: OpenZFS test infrastructure an support scripts
|
||||
The Z file system is a pooled filesystem designed for maximum data
|
||||
diff --git a/debian/tests/control b/debian/tests/control
|
||||
index 3d704bac..d03b365b 100644
|
||||
--- a/debian/tests/control
|
||||
+++ b/debian/tests/control
|
||||
@@ -1,3 +1,3 @@
|
||||
Tests: kernel-smoke-test
|
||||
Restrictions: needs-root
|
||||
-Depends: zfsutils-linux, zfs-zed, zfs-initramfs, zfs-dkms
|
||||
+Depends: zfsutils-linux, zfs-zed, zfs-initramfs, zfs-dkms, zfs-test
|
||||
diff --git a/debian/zfs-test.install b/debian/zfs-test.install
|
||||
index 225d51fc..ec850df8 100644
|
||||
--- a/debian/zfs-test.install
|
||||
+++ b/debian/zfs-test.install
|
||||
@@ -1,8 +1,12 @@
|
||||
+sbin/zinject
|
||||
+sbin/zpios
|
||||
sbin/ztest
|
||||
usr/bin/raidz_test
|
||||
-usr/share/man/man1/ztest.1
|
||||
usr/share/man/man1/raidz_test.1
|
||||
usr/share/man/man1/test-runner.1
|
||||
+usr/share/man/man1/zpios.1
|
||||
+usr/share/man/man1/ztest.1
|
||||
+usr/share/man/man8/zinject.8
|
||||
usr/share/zfs/common.sh
|
||||
usr/share/zfs/common.sh
|
||||
usr/share/zfs/common.sh
|
||||
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
|
||||
index 238e00a2..18016822 100644
|
||||
--- a/debian/zfsutils-linux.install
|
||||
+++ b/debian/zfsutils-linux.install
|
||||
@@ -15,8 +15,6 @@ sbin/mount.zfs
|
||||
sbin/zdb
|
||||
sbin/zfs
|
||||
sbin/zhack
|
||||
-sbin/zinject
|
||||
-sbin/zpios
|
||||
sbin/zpool
|
||||
sbin/zstreamdump
|
||||
usr/bin/zgenhostid
|
||||
@@ -25,7 +23,7 @@ usr/lib/zfs-linux/zpool.d/
|
||||
usr/sbin/arc_summary
|
||||
usr/sbin/arcstat
|
||||
usr/sbin/dbufstat
|
||||
-usr/share/man/man1/
|
||||
+usr/share/man/man1/zhack.1
|
||||
usr/share/man/man5/
|
||||
usr/share/man/man8/fsck.zfs.8
|
||||
usr/share/man/man8/mount.zfs.8
|
||||
@@ -33,6 +31,5 @@ usr/share/man/man8/vdev_id.8
|
||||
usr/share/man/man8/zdb.8
|
||||
usr/share/man/man8/zfs.8
|
||||
usr/share/man/man8/zgenhostid.8
|
||||
-usr/share/man/man8/zinject.8
|
||||
usr/share/man/man8/zpool.8
|
||||
usr/share/man/man8/zstreamdump.8
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Brian Behlendorf <behlendorf1@llnl.gov>
|
||||
Date: Wed, 11 Jul 2018 15:49:10 -0700
|
||||
Subject: [PATCH] Fix zpl_mount() deadlock
|
||||
|
||||
Commit 93b43af10 inadvertently introduced the following scenario which
|
||||
can result in a deadlock. This issue was most easily reproduced by
|
||||
LXD containers using a ZFS storage backend but should be reproducible
|
||||
under any workload which is frequently mounting and unmounting.
|
||||
|
||||
-- THREAD A --
|
||||
spa_sync()
|
||||
spa_sync_upgrades()
|
||||
rrw_enter(&dp->dp_config_rwlock, RW_WRITER, FTAG); <- Waiting on B
|
||||
|
||||
-- THREAD B --
|
||||
mount_fs()
|
||||
zpl_mount()
|
||||
zpl_mount_impl()
|
||||
dmu_objset_hold()
|
||||
dmu_objset_hold_flags()
|
||||
dsl_pool_hold()
|
||||
dsl_pool_config_enter()
|
||||
rrw_enter(&dp->dp_config_rwlock, RW_READER, tag);
|
||||
sget()
|
||||
sget_userns()
|
||||
grab_super()
|
||||
down_write(&s->s_umount); <- Waiting on C
|
||||
|
||||
-- THREAD C --
|
||||
cleanup_mnt()
|
||||
deactivate_super()
|
||||
down_write(&s->s_umount);
|
||||
deactivate_locked_super()
|
||||
zpl_kill_sb()
|
||||
kill_anon_super()
|
||||
generic_shutdown_super()
|
||||
sync_filesystem()
|
||||
zpl_sync_fs()
|
||||
zfs_sync()
|
||||
zil_commit()
|
||||
txg_wait_synced() <- Waiting on A
|
||||
|
||||
Reviewed by: Alek Pinchuk <apinchuk@datto.com>
|
||||
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
|
||||
Closes #7598
|
||||
Closes #7659
|
||||
Closes #7691
|
||||
Closes #7693
|
||||
|
||||
(Cherry-picked from ac09630d8b0bf6c92084a30fdaefd03fd0adbdc1)
|
||||
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
||||
---
|
||||
include/sys/zfs_vfsops.h | 1 +
|
||||
module/zfs/zpl_super.c | 11 ++++++++++-
|
||||
2 files changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/sys/zfs_vfsops.h b/include/sys/zfs_vfsops.h
|
||||
index 2326da42..927153b2 100644
|
||||
--- a/include/sys/zfs_vfsops.h
|
||||
+++ b/include/sys/zfs_vfsops.h
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <sys/zil.h>
|
||||
#include <sys/sa.h>
|
||||
#include <sys/rrwlock.h>
|
||||
+#include <sys/dsl_dataset.h>
|
||||
#include <sys/zfs_ioctl.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c
|
||||
index fc10271b..5c426b0a 100644
|
||||
--- a/module/zfs/zpl_super.c
|
||||
+++ b/module/zfs/zpl_super.c
|
||||
@@ -271,8 +271,17 @@ zpl_mount_impl(struct file_system_type *fs_type, int flags, zfs_mnt_t *zm)
|
||||
if (err)
|
||||
return (ERR_PTR(-err));
|
||||
|
||||
+ /*
|
||||
+ * The dsl pool lock must be released prior to calling sget().
|
||||
+ * It is possible sget() may block on the lock in grab_super()
|
||||
+ * while deactivate_super() holds that same lock and waits for
|
||||
+ * a txg sync. If the dsl_pool lock is held over over sget()
|
||||
+ * this can prevent the pool sync and cause a deadlock.
|
||||
+ */
|
||||
+ dsl_pool_rele(dmu_objset_pool(os), FTAG);
|
||||
s = zpl_sget(fs_type, zpl_test_super, set_anon_super, flags, os);
|
||||
- dmu_objset_rele(os, FTAG);
|
||||
+ dsl_dataset_rele(dmu_objset_ds(os), FTAG);
|
||||
+
|
||||
if (IS_ERR(s))
|
||||
return (ERR_CAST(s));
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
0001-remove-DKMS-modules-and-dracut-build.patch
|
||||
0002-import-with-d-dev-disk-by-id-in-scan-service.patch
|
||||
0003-always-load-ZFS-module-on-boot.patch
|
||||
0004-Expand-zfs-test-and-add-Breaks-Conflicts.patch
|
||||
0004-Fix-zpl_mount-deadlock.patch
|
||||
|
||||
Reference in New Issue
Block a user