From 9ad2b11648e9fdf0a31819ad76ecb4dd1a4b3788 Mon Sep 17 00:00:00 2001 From: Archzfs Buildbot <34833957+archzfs-bot@users.noreply.github.com> Date: Fri, 27 Jul 2018 16:30:39 +0000 Subject: [PATCH] Semi-automated update for zfs 0.7.9 --- .SRCINFO | 4 +- PKGBUILD | 14 +-- upstream-ac09630-Fix-zpl_mount-deadlock.patch | 89 +++++++++++++++++++ 3 files changed, 101 insertions(+), 6 deletions(-) create mode 100644 upstream-ac09630-Fix-zpl_mount-deadlock.patch diff --git a/.SRCINFO b/.SRCINFO index 5e968a0..42f78e5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 0.7.9 - pkgrel = 1 + pkgrel = 2 url = http://zfsonlinux.org/ arch = x86_64 groups = archzfs-dkms @@ -36,7 +36,9 @@ pkgbase = zfs-dkms conflicts = zfs-linux-zen-headers conflicts = zfs-linux-zen-git-headers source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz + source = upstream-ac09630-Fix-zpl_mount-deadlock.patch sha256sums = f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a + sha256sums = 1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8 pkgname = zfs-dkms diff --git a/PKGBUILD b/PKGBUILD index 471fb64..90b98f7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,25 +1,29 @@ -# Maintainer: Jesus Alvarez +# Maintainer: Jan Houben +# Contributor: Jesus Alvarez # # This PKGBUILD was generated by the archzfs build scripts located at # # http://github.com/archzfs/archzfs # -# pkgname="zfs-dkms" pkgdesc="Kernel modules for the Zettabyte File System." pkgver=0.7.9 -pkgrel=1 +pkgrel=2 makedepends=() arch=("x86_64") url="http://zfsonlinux.org/" -source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz") -sha256sums=("f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a") +source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz" "upstream-ac09630-Fix-zpl_mount-deadlock.patch") +sha256sums=("f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a" "1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8") license=("CDDL") depends=('spl-dkms' "zfs-utils-common=0.7.9" "lsb-release") provides=("zfs") groups=("archzfs-dkms") conflicts=('zfs-dkms-git' 'zfs-archiso-linux' 'zfs-archiso-linux-git' 'zfs-linux-hardened' 'zfs-linux-hardened-git' 'zfs-linux-lts' 'zfs-linux-lts-git' 'zfs-linux' 'zfs-linux-git' 'zfs-linux-vfio' 'zfs-linux-vfio-git' 'zfs-linux-zen' 'zfs-linux-zen-git' 'zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' ) +prepare() { + cd "${srcdir}/zfs-0.7.9" + patch -Np1 -i ${srcdir}/upstream-ac09630-Fix-zpl_mount-deadlock.patch +} build() { cd "${srcdir}/zfs-0.7.9" diff --git a/upstream-ac09630-Fix-zpl_mount-deadlock.patch b/upstream-ac09630-Fix-zpl_mount-deadlock.patch new file mode 100644 index 0000000..082964c --- /dev/null +++ b/upstream-ac09630-Fix-zpl_mount-deadlock.patch @@ -0,0 +1,89 @@ +From ac09630d8b0bf6c92084a30fdaefd03fd0adbdc1 Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf +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 +Signed-off-by: Brian Behlendorf +Closes #7598 +Closes #7659 +Closes #7691 +Closes #7693 +--- + 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 febfdff97f2..31c9c6d7f74 100644 +--- a/include/sys/zfs_vfsops.h ++++ b/include/sys/zfs_vfsops.h +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + + #ifdef __cplusplus +diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c +index fc10271b787..5c426b0a9fb 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)); +