# git rev-parse -q --verify 9f7b640f001f9781e0803fb60e7b3e7f2f1a1757^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify 9f7b640f001f9781e0803fb60e7b3e7f2f1a1757^{commit} 9f7b640f001f9781e0803fb60e7b3e7f2f1a1757 # git checkout -q -f -B kisskb 9f7b640f001f9781e0803fb60e7b3e7f2f1a1757 # git clean -qxdf # < git log -1 # commit 9f7b640f001f9781e0803fb60e7b3e7f2f1a1757 # Merge: e4aa67b02316 1effb72a8179 # Author: Linus Torvalds # Date: Fri Jul 2 14:30:27 2021 -0700 # # Merge tag 'xfs-5.14-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux # # Pull xfs updates from Darrick Wong: # "Most of the work this cycle has been on refactoring various parts of # the codebase. The biggest non-cleanup changes are (1) reducing the # number of cache flushes sent when writing the log; (2) a substantial # number of log recovery fixes; and (3) I started accepting pull # requests from contributors if the commits in their branches match # what's been sent to the list. # # For a week or so I /had/ staged a major cleanup of the logging code # from Dave Chinner, but it exposed so many lurking bugs in other parts # of the logging and log recovery code that I decided to defer that # patchset until we can address those latent bugs. # # Larger cleanups this time include walking the incore inode cache (me) # and rework of the extended attribute code (Allison) to prepare it for # adding logged xattr updates (and directory tree parent pointers) in # future releases. # # Summary: # # - Refactor the buffer cache to use bulk page allocation # # - Convert agnumber-based AG iteration to walk per-AG structures # # - Clean up some unit conversions and other code warts # # - Reduce spinlock contention in the directio fastpath # # - Collapse all the inode cache walks into a single function # # - Remove indirect function calls from the inode cache walk code # # - Dramatically reduce the number of cache flushes sent when writing # log buffers # # - Preserve inode sickness reports for longer # # - Rename xfs_eofblocks since it controls inode cache walks # # - Refactor the extended attribute code to prepare it for the addition # of log intent items to make xattrs fully transactional # # - A few fixes to earlier large patchsets # # - Log recovery fixes so that we don't accidentally mark the log clean # when log intent recovery fails # # - Fix some latent SOB errors # # - Clean up shutdown messages that get logged to dmesg # # - Fix a regression in the online shrink code # # - Fix a UAF in the buffer logging code if the fs goes offline # # - Fix uninitialized error variables # # - Fix a UAF in the CIL when commited log item callbacks race with a # shutdown # # - Fix a bug where the CIL could hang trying to push part of the log # ring buffer that hasn't been filled yet" # # * tag 'xfs-5.14-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (102 commits) # xfs: don't wait on future iclogs when pushing the CIL # xfs: Fix a CIL UAF by getting get rid of the iclog callback lock # xfs: remove callback dequeue loop from xlog_state_do_iclog_callbacks # xfs: don't nest icloglock inside ic_callback_lock # xfs: Initialize error in xfs_attr_remove_iter # xfs: fix endianness issue in xfs_ag_shrink_space # xfs: remove dead stale buf unpin handling code # xfs: hold buffer across unpin and potential shutdown processing # xfs: force the log offline when log intent item recovery fails # xfs: fix log intent recovery ENOSPC shutdowns when inactivating inodes # xfs: shorten the shutdown messages to a single line # xfs: print name of function causing fs shutdown instead of hex pointer # xfs: fix type mismatches in the inode reclaim functions # xfs: separate primary inode selection criteria in xfs_iget_cache_hit # xfs: refactor the inode recycling code # xfs: add iclog state trace events # xfs: xfs_log_force_lsn isn't passed a LSN # xfs: Fix CIL throttle hang when CIL space used going backwards # xfs: journal IO cache flush reductions # xfs: remove need_start_rec parameter from xlog_write() # ... # < /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 9f7b640f001f9781e0803fb60e7b3e7f2f1a1757 # < make -s -j 24 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- randconfig # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # < make -s -j 24 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- help # make -s -j 24 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- olddefconfig .config:4581:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD # make -s -j 24 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- /kisskb/src/arch/arm64/Makefile:25: ld does not support --fix-cortex-a53-843419; kernel may be susceptible to erratum /kisskb/src/arch/arm64/Makefile:25: ld does not support --fix-cortex-a53-843419; kernel may be susceptible to erratum In file included from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/tm.h:27, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/gcc-plugin.h:31, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/plugin.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:9, from /kisskb/src/scripts/gcc-plugins/latent_entropy_plugin.c:78: /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/config/elfos.h:102:21: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ ^ /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/config/elfos.h:170:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/tm.h:27, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/gcc-plugin.h:31, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/plugin.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:9, from /kisskb/src/scripts/gcc-plugins/sancov_plugin.c:22: /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/config/elfos.h:102:21: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ ^ /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/config/elfos.h:170:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/tm.h:44, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/gcc-plugin.h:31, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/plugin.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:9, from /kisskb/src/scripts/gcc-plugins/latent_entropy_plugin.c:78: /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/defaults.h:126:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/tm.h:44, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/gcc-plugin.h:31, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/plugin.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:9, from /kisskb/src/scripts/gcc-plugins/sancov_plugin.c:22: /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/defaults.h:126:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ cc1plus: warning: unrecognized command line option '-Wno-format-diag' cc1plus: warning: unrecognized command line option '-Wno-format-diag' Completed OK # rm -rf /kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 # Build took: 0:03:47.821967