[1/2,BIONIC] Revert "UBUNTU: SAUCE: Fix non-prefaulted page deadlock (LP: #1754584)"

Message ID	20180328101925.13457-2-colin.king@canonical.com
State	New
Headers	show Return-Path: <kernel-team-bounces@lists.ubuntu.com> From: Colin King <colin.king@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][BIONIC] Revert "UBUNTU: SAUCE: Fix non-prefaulted page deadlock (LP: #1754584)" Date: Wed, 28 Mar 2018 11:19:24 +0100 Message-Id: <20180328101925.13457-2-colin.king@canonical.com> In-Reply-To: <20180328101925.13457-1-colin.king@canonical.com> References: <20180328101925.13457-1-colin.king@canonical.com> Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com>
Series	Fix non-prefaulted page deadlock \| expand [0/2,BIONIC] Fix non-prefaulted page deadlock [1/2,BIONIC] Revert "UBUNTU: SAUCE: Fix non-prefaulted page deadlock (LP: #1754584)" [2/2,BIONIC] UBUNTU: SAUCE: Fix non-prefaulted page deadlock (LP: #1754584)

diff --git a/zfs/META b/zfs/META index 049b610..67f3b42 100644 --- a/zfs/META +++ b/zfs/META @@ -2,7 +2,7 @@ Meta: 1 Name: zfs Branch: 1.0 Version: 0.7.5 -Release: 1ubuntu11 +Release: 1ubuntu8 Release-Tags: relext License: CDDL Author: OpenZFS on Linux diff --git a/zfs/Makefile.in b/zfs/Makefile.in index ed2c430..9dd300b 100644 --- a/zfs/Makefile.in +++ b/zfs/Makefile.in @@ -195,7 +195,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libattr.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ @@ -427,7 +426,6 @@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBAIO = @LIBAIO@ LIBATTR = @LIBATTR@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ diff --git a/zfs/aclocal.m4 b/zfs/aclocal.m4 index 7d89c6e..84d98a9 100644 --- a/zfs/aclocal.m4 +++ b/zfs/aclocal.m4 @@ -1303,7 +1303,6 @@ m4_include([config/mount-helper.m4]) m4_include([config/toolchain-simd.m4]) m4_include([config/user-dracut.m4]) m4_include([config/user-frame-larger-than.m4]) -m4_include([config/user-libaio.m4]) m4_include([config/user-libattr.m4]) m4_include([config/user-libblkid.m4]) m4_include([config/user-libtirpc.m4]) diff --git a/zfs/config/user-libaio.m4 b/zfs/config/user-libaio.m4 deleted file mode 100644 index d7a7cb5..0000000 --- a/zfs/config/user-libaio.m4 +++ /dev/null @@ -1,14 +0,0 @@ -dnl # -dnl # Check for libaio - only used for libaiot test cases. -dnl # -AC_DEFUN([ZFS_AC_CONFIG_USER_LIBAIO], [ - LIBAIO= - - AC_CHECK_HEADER([libaio.h], [ - user_libaio=yes - AC_SUBST([LIBAIO], ["-laio"]) - AC_DEFINE([HAVE_LIBAIO], 1, [Define if you have libaio]) - ], [ - user_libaio=no - ]) -]) diff --git a/zfs/config/user.m4 b/zfs/config/user.m4 index 941fcf0..2b033f5 100644 --- a/zfs/config/user.m4 +++ b/zfs/config/user.m4 @@ -13,7 +13,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ ZFS_AC_CONFIG_USER_LIBTIRPC ZFS_AC_CONFIG_USER_LIBBLKID ZFS_AC_CONFIG_USER_LIBATTR - ZFS_AC_CONFIG_USER_LIBAIO ZFS_AC_CONFIG_USER_LIBUDEV ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN ZFS_AC_CONFIG_USER_RUNSTATEDIR diff --git a/zfs/config/zfs-build.m4 b/zfs/config/zfs-build.m4 index 1224682..7651dc2 100644 --- a/zfs/config/zfs-build.m4 +++ b/zfs/config/zfs-build.m4 @@ -79,11 +79,11 @@ AC_DEFUN([ZFS_AC_CONFIG], [ AM_CONDITIONAL([CONFIG_KERNEL], [test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all] && [test "x$enable_linux_builtin" != xyes ]) + AM_CONDITIONAL([WANT_DEVNAME2DEVID], + [test "x$user_libudev" = xyes ]) AM_CONDITIONAL([CONFIG_QAT], [test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all] && [test "x$qatsrc" != x ]) - AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ]) - AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ]) ]) dnl # diff --git a/zfs/configure b/zfs/configure index ea023e8..aebe4bb 100755 --- a/zfs/configure +++ b/zfs/configure @@ -635,12 +635,10 @@ LIBOBJS DEBUG_ZFS DEBUG_STACKFLAGS DEBUG_CFLAGS -WANT_MMAP_LIBAIO_FALSE -WANT_MMAP_LIBAIO_TRUE -WANT_DEVNAME2DEVID_FALSE -WANT_DEVNAME2DEVID_TRUE CONFIG_QAT_FALSE CONFIG_QAT_TRUE +WANT_DEVNAME2DEVID_FALSE +WANT_DEVNAME2DEVID_TRUE CONFIG_KERNEL_FALSE CONFIG_KERNEL_TRUE CONFIG_USER_FALSE @@ -650,7 +648,6 @@ ZONENAME NO_FORMAT_TRUNCATION FRAME_LARGER_THAN LIBUDEV -LIBAIO LIBATTR LIBBLKID LIBTIRPC_CFLAGS @@ -26911,27 +26908,6 @@ $as_echo "#define HAVE_LIBATTR 1" >>confdefs.h - LIBAIO= - - ac_fn_c_check_header_mongrel "$LINENO" "libaio.h" "ac_cv_header_libaio_h" "$ac_includes_default" -if test "x$ac_cv_header_libaio_h" = xyes; then : - - user_libaio=yes - LIBAIO="-laio" - - -$as_echo "#define HAVE_LIBAIO 1" >>confdefs.h - - -else - - user_libaio=no - -fi - - - - LIBUDEV= ac_fn_c_check_header_mongrel "$LINENO" "libudev.h" "ac_cv_header_libudev_h" "$ac_includes_default" @@ -27960,27 +27936,6 @@ $as_echo "#define HAVE_LIBATTR 1" >>confdefs.h - LIBAIO= - - ac_fn_c_check_header_mongrel "$LINENO" "libaio.h" "ac_cv_header_libaio_h" "$ac_includes_default" -if test "x$ac_cv_header_libaio_h" = xyes; then : - - user_libaio=yes - LIBAIO="-laio" - - -$as_echo "#define HAVE_LIBAIO 1" >>confdefs.h - - -else - - user_libaio=no - -fi - - - - LIBUDEV= ac_fn_c_check_header_mongrel "$LINENO" "libudev.h" "ac_cv_header_libudev_h" "$ac_includes_default" @@ -40959,15 +40914,6 @@ else CONFIG_KERNEL_FALSE= fi - if test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all && - test "x$qatsrc" != x ; then - CONFIG_QAT_TRUE= - CONFIG_QAT_FALSE='#' -else - CONFIG_QAT_TRUE='#' - CONFIG_QAT_FALSE= -fi - if test "x$user_libudev" = xyes ; then WANT_DEVNAME2DEVID_TRUE= WANT_DEVNAME2DEVID_FALSE='#' @@ -40976,12 +40922,13 @@ else WANT_DEVNAME2DEVID_FALSE= fi - if test "x$user_libaio" = xyes ; then - WANT_MMAP_LIBAIO_TRUE= - WANT_MMAP_LIBAIO_FALSE='#' + if test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all && + test "x$qatsrc" != x ; then + CONFIG_QAT_TRUE= + CONFIG_QAT_FALSE='#' else - WANT_MMAP_LIBAIO_TRUE='#' - WANT_MMAP_LIBAIO_FALSE= + CONFIG_QAT_TRUE='#' + CONFIG_QAT_FALSE= fi @@ -41189,16 +41136,12 @@ if test -z "${CONFIG_KERNEL_TRUE}" && test -z "${CONFIG_KERNEL_FALSE}"; then as_fn_error $? "conditional \"CONFIG_KERNEL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${CONFIG_QAT_TRUE}" && test -z "${CONFIG_QAT_FALSE}"; then - as_fn_error $? "conditional \"CONFIG_QAT\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${WANT_DEVNAME2DEVID_TRUE}" && test -z "${WANT_DEVNAME2DEVID_FALSE}"; then as_fn_error $? "conditional \"WANT_DEVNAME2DEVID\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WANT_MMAP_LIBAIO_TRUE}" && test -z "${WANT_MMAP_LIBAIO_FALSE}"; then - as_fn_error $? "conditional \"WANT_MMAP_LIBAIO\" was never defined. +if test -z "${CONFIG_QAT_TRUE}" && test -z "${CONFIG_QAT_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_QAT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi diff --git a/zfs/include/Makefile.in b/zfs/include/Makefile.in index acd99dc..ae748a9 100644 --- a/zfs/include/Makefile.in +++ b/zfs/include/Makefile.in @@ -187,7 +187,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libattr.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ @@ -401,7 +400,6 @@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBAIO = @LIBAIO@ LIBATTR = @LIBATTR@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ diff --git a/zfs/include/linux/Makefile.in b/zfs/include/linux/Makefile.in index 1002d83..0f6c8c3 100644 --- a/zfs/include/linux/Makefile.in +++ b/zfs/include/linux/Makefile.in @@ -187,7 +187,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libattr.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ @@ -346,7 +345,6 @@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBAIO = @LIBAIO@ LIBATTR = @LIBATTR@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ diff --git a/zfs/include/sys/Makefile.in b/zfs/include/sys/Makefile.in index c24010a..25d1f71 100644 --- a/zfs/include/sys/Makefile.in +++ b/zfs/include/sys/Makefile.in @@ -187,7 +187,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libattr.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ @@ -607,7 +606,6 @@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBAIO = @LIBAIO@ LIBATTR = @LIBATTR@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ diff --git a/zfs/include/sys/crypto/Makefile.in b/zfs/include/sys/crypto/Makefile.in index 79a03c5..fa2f570 100644 --- a/zfs/include/sys/crypto/Makefile.in +++ b/zfs/include/sys/crypto/Makefile.in @@ -187,7 +187,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libattr.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ @@ -343,7 +342,6 @@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBAIO = @LIBAIO@ LIBATTR = @LIBATTR@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ diff --git a/zfs/include/sys/fm/Makefile.in b/zfs/include/sys/fm/Makefile.in index a73b969..85019a1 100644 --- a/zfs/include/sys/fm/Makefile.in +++ b/zfs/include/sys/fm/Makefile.in @@ -187,7 +187,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libattr.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ @@ -383,7 +382,6 @@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBAIO = @LIBAIO@ LIBATTR = @LIBATTR@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ diff --git a/zfs/include/sys/fm/fs/Makefile.in b/zfs/include/sys/fm/fs/Makefile.in index 03e3298..42a85e5 100644 --- a/zfs/include/sys/fm/fs/Makefile.in +++ b/zfs/include/sys/fm/fs/Makefile.in @@ -187,7 +187,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libattr.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ @@ -339,7 +338,6 @@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBAIO = @LIBAIO@ LIBATTR = @LIBATTR@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ diff --git a/zfs/include/sys/fs/Makefile.in b/zfs/include/sys/fs/Makefile.in index 8ea51c9..d22d5fc 100644 --- a/zfs/include/sys/fs/Makefile.in +++ b/zfs/include/sys/fs/Makefile.in @@ -187,7 +187,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libattr.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ @@ -339,7 +338,6 @@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBAIO = @LIBAIO@ LIBATTR = @LIBATTR@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ diff --git a/zfs/include/sys/sysevent/Makefile.in b/zfs/include/sys/sysevent/Makefile.in index 2a9b504..12c0912 100644 --- a/zfs/include/sys/sysevent/Makefile.in +++ b/zfs/include/sys/sysevent/Makefile.in @@ -187,7 +187,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/always-arch.m4 \ $(top_srcdir)/config/toolchain-simd.m4 \ $(top_srcdir)/config/user-dracut.m4 \ $(top_srcdir)/config/user-frame-larger-than.m4 \ - $(top_srcdir)/config/user-libaio.m4 \ $(top_srcdir)/config/user-libattr.m4 \ $(top_srcdir)/config/user-libblkid.m4 \ $(top_srcdir)/config/user-libtirpc.m4 \ @@ -343,7 +342,6 @@ KERNELCPPFLAGS = @KERNELCPPFLAGS@ KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBAIO = @LIBAIO@ LIBATTR = @LIBATTR@ LIBBLKID = @LIBBLKID@ LIBOBJS = @LIBOBJS@ diff --git a/zfs/include/sys/uio_impl.h b/zfs/include/sys/uio_impl.h index 01ca723..37e283d 100644 --- a/zfs/include/sys/uio_impl.h +++ b/zfs/include/sys/uio_impl.h @@ -42,7 +42,7 @@ #include <sys/uio.h> extern int uiomove(void *, size_t, enum uio_rw, uio_t *); -extern int uio_prefaultpages(ssize_t, enum uio_rw, uio_t *); +extern void uio_prefaultpages(ssize_t, uio_t *); extern int uiocopy(void *, size_t, enum uio_rw, uio_t *, size_t *); extern void uioskip(uio_t *, size_t); diff --git a/zfs/module/zcommon/zfs_uio.c b/zfs/module/zcommon/zfs_uio.c index 0001f95..7b4175b 100644 --- a/zfs/module/zcommon/zfs_uio.c +++ b/zfs/module/zcommon/zfs_uio.c @@ -148,51 +148,64 @@ uiomove(void *p, size_t n, enum uio_rw rw, struct uio *uio) } EXPORT_SYMBOL(uiomove); +#define fuword8(uptr, vptr) get_user((*vptr), (uptr)) + /* - * Fault in the user space pages specified by the uio structure. Note that - * when faulting in pages with UIO_READ they may have zeros written to them - * which is OK because we know they'll be overwritten. + * Fault in the pages of the first n bytes specified by the uio structure. + * 1 byte in each page is touched and the uio struct is unmodified. Any + * error will terminate the process as this is only a best attempt to get + * the pages resident. */ -int -uio_prefaultpages(ssize_t n, enum uio_rw rw, struct uio *uio) +void +uio_prefaultpages(ssize_t n, struct uio *uio) { - const struct iovec *iov = uio->uio_iov; - size_t skip = uio->uio_skip; - int iovcnt = uio->uio_iovcnt; - uio_seg_t seg = uio->uio_segflg; - char __user *p; - ulong_t cnt; - int error; + const struct iovec *iov; + ulong_t cnt, incr; + caddr_t p; + uint8_t tmp; + int iovcnt; + size_t skip; - /* No need to fault in kernel pages */ - if (seg == UIO_SYSSPACE || seg == UIO_BVEC) - return (0); + /* no need to fault in kernel pages */ + switch (uio->uio_segflg) { + case UIO_SYSSPACE: + case UIO_BVEC: + return; + case UIO_USERSPACE: + case UIO_USERISPACE: + break; + default: + ASSERT(0); + } - ASSERT(seg == UIO_USERSPACE || seg == UIO_USERISPACE); + iov = uio->uio_iov; + iovcnt = uio->uio_iovcnt; + skip = uio->uio_skip; - while ((n > 0) && (iovcnt > 0)) { + for (; n > 0 && iovcnt > 0; iov++, iovcnt--, skip = 0) { cnt = MIN(iov->iov_len - skip, n); + /* empty iov */ + if (cnt == 0) + continue; + n -= cnt; + /* + * touch each page in this segment. + */ p = iov->iov_base + skip; - - if (rw == UIO_READ) - error = -fault_in_pages_writeable(p, cnt); - else - error = -fault_in_pages_readable(p, cnt); - - if (error) - return (error); - - skip += cnt; - if (skip == iov->iov_len) { - skip = 0; - iov++; - iovcnt--; + while (cnt) { + if (fuword8((uint8_t *)p, &tmp)) + return; + incr = MIN(cnt, PAGESIZE); + p += incr; + cnt -= incr; } - - n -= cnt; + /* + * touch the last byte in case it straddles a page. + */ + p--; + if (fuword8((uint8_t *)p, &tmp)) + return; } - - return (0); } EXPORT_SYMBOL(uio_prefaultpages); diff --git a/zfs/module/zfs/zfs_vnops.c b/zfs/module/zfs/zfs_vnops.c index 9338bb0..6a1dab5 100644 --- a/zfs/module/zfs/zfs_vnops.c +++ b/zfs/module/zfs/zfs_vnops.c @@ -390,10 +390,6 @@ mappedread(struct inode *ip, int nbytes, uio_t *uio) int error = 0; void *pb; - error = uio_prefaultpages(nbytes, UIO_READ, uio); - if (error) - return (error); - start = uio->uio_loffset; off = start & (PAGE_SIZE-1); for (start &= PAGE_MASK; len > 0; start += PAGE_SIZE) { @@ -679,7 +675,7 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) xuio = (xuio_t *)uio; else #endif - uio_prefaultpages(MIN(n, max_blksz), UIO_WRITE, uio); + uio_prefaultpages(MIN(n, max_blksz), uio); /* * If in append mode, set the io offset pointer to eof. @@ -925,7 +921,7 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) n -= nbytes; if (!xuio && n > 0) - uio_prefaultpages(MIN(n, max_blksz), UIO_WRITE, uio); + uio_prefaultpages(MIN(n, max_blksz), uio); } zfs_inode_update(zp); diff --git a/zfs/zfs_config.h.in b/zfs/zfs_config.h.in index a87d6ac..ac41b5a 100644 --- a/zfs/zfs_config.h.in +++ b/zfs/zfs_config.h.in @@ -312,9 +312,6 @@ /* kernel has large stacks */ #undef HAVE_LARGE_STACKS -/* Define if you have libaio */ -#undef HAVE_LIBAIO - /* Define if you have libattr */ #undef HAVE_LIBATTR

[1/2,BIONIC] Revert "UBUNTU: SAUCE: Fix non-prefaulted page deadlock (LP: #1754584)"

Commit Message

Patch