# git rev-parse -q --verify babf0bb978e3c9fce6c4eba6b744c8754fd43d8e^{commit} babf0bb978e3c9fce6c4eba6b744c8754fd43d8e already have revision, skipping fetch # git checkout -q -f -B kisskb babf0bb978e3c9fce6c4eba6b744c8754fd43d8e # git clean -qxdf # < git log -1 # commit babf0bb978e3c9fce6c4eba6b744c8754fd43d8e # Merge: e375780b631a efd409a4329f # Author: Linus Torvalds # Date: Wed May 25 19:34:40 2022 -0700 # # Merge tag 'xfs-5.19-for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux # # Pull xfs updates from Dave Chinner: # "This is a big update with lots of new code. The summary below them # all, so I'll just touch on teh higlights. The two main new features # are Large Extent Counts and Logged Attribute Replay - these are two # new foundational features that we are building more complex future # features on top of. # # For upcoming functionality, we need to be able to store hundreds of # millions of xattrs per inode. The Large Extent Count feature removes # the limits that prevent this scale of xattr storage, and while we were # modifying the on disk extent count format we also increased the number # of data extents we support per inode from 2^32 to 2^47. # # We also need to be able to modify xattrs as part of larger atomic # transactions rather than as standalone transactions. The Logged # Attribute Replay feature introduces the infrastructure that allows us # to use intents to record the attribute modifications in the journal # before we start them, hence allowing other atomic transactions to log # attribute modification intents and then defer the actual modification # to later. If we then crash, log recovery then guarantees that the # attribute is replayed in the context of the atomic transaction that # logged the intent. # # A significant chunk of the commits in this merge are for the base # attribute replay functionality along with fixes, improvements and # cleanups related to this new functioanlity. Allison deserves a big # round of thanks for her ongoing work to get this functionality into # XFS. # # There are also many other smaller changes and improvements, so overall # this is one of the bigger XFS merge requests in some time. # # I will be following up next week with another smaller pull request - # we already have another round of fixes and improvements to the logged # attribute replay functionality just about ready to go. They'll soak # and test over the next week, and I'll send a pull request for them # near the end of the merge window. # # Summary: # # - support for printk message indexing. # # - large extent counts to provide support for up to 2^47 data extents # and 2^32 attribute extents, allowing us to scale beyond 4 billion # data extents to billions of xattrs per inode. # # - conversion of various flags fields to be consistently declared as # unsigned bit fields. # # - improvements to realtime extent accounting and converts them to # per-cpu counters to match all the other block and inode accounting. # # - reworks core log formatting code to reduce iterations, have a # shorter, cleaner fast path and generally be easier to understand # and maintain. # # - improvements to rmap btree searches that reduce overhead by up to # 30% resulting in xfs_scrub runtime reductions of 15%. # # - improvements to reflink that remove the size limitations in # remapping operations and greatly reduce the size of transaction # reservations. # # - reworks the minimum log size calculations to allow us to change # transaction reservations without changing the minimum supported log # size. # # - removal of quota warning support as it has never been used on # Linux. # # - intent whiteouts to allow us to cancel intents that are completed # entirely in memory rather than having use CPU and disk bandwidth # formatting and writing them into the journal when it is not # necessary. This makes rmap, reflink and extent freeing slightly # more efficient, but provides massive improvements for.... # # - Logged Attribute Replay feature support. This is a fundamental # change to the way we modify attributes, laying the foundation for # future integration of attribute modifications as part of other # atomic transactional operations the filesystem performs. # # - Lots of cleanups and fixes for the logged attribute replay # functionality" # # * tag 'xfs-5.19-for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (124 commits) # xfs: can't use kmem_zalloc() for attribute buffers # xfs: detect empty attr leaf blocks in xfs_attr3_leaf_verify # xfs: ATTR_REPLACE algorithm with LARP enabled needs rework # xfs: use XFS_DA_OP flags in deferred attr ops # xfs: remove xfs_attri_remove_iter # xfs: switch attr remove to xfs_attri_set_iter # xfs: introduce attr remove initial states into xfs_attr_set_iter # xfs: xfs_attr_set_iter() does not need to return EAGAIN # xfs: clean up final attr removal in xfs_attr_set_iter # xfs: remote xattr removal in xfs_attr_set_iter() is conditional # xfs: XFS_DAS_LEAF_REPLACE state only needed if !LARP # xfs: split remote attr setting out from replace path # xfs: consolidate leaf/node states in xfs_attr_set_iter # xfs: kill XFS_DAC_LEAF_ADDNAME_INIT # xfs: separate out initial attr_set states # xfs: don't set quota warning values # xfs: remove warning counters from struct xfs_dquot_res # xfs: remove quota warning limit from struct xfs_quota_limits # xfs: rework deferred attribute operation setup # xfs: make xattri_leaf_bp more useful # ... # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 babf0bb978e3c9fce6c4eba6b744c8754fd43d8e # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12533:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12538:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12540:warning: override: reassigning to symbol UML_NET_SLIP .config:12543:warning: override: reassigning to symbol UML_NET_MCAST .config:12545:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:26: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:103:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1620:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1624:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:292: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c: In function 'qib_unordered_wc': /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:22: error: 'struct cpuinfo_um' has no member named 'x86_vendor' return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: error: 'X86_VENDOR_AMD' undeclared (first use in this function) return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:150:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:292: drivers/infiniband/hw/qib/qib_wc_x86_64.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/infiniband/hw/qib] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/infiniband/hw] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/infiniband] Error 2 make[2]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:555: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1835: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:08:59.267605