# git rev-parse -q --verify 2923b27e54242acf27fd16b299e102117c82f52f^{commit} 2923b27e54242acf27fd16b299e102117c82f52f already have revision, skipping fetch # git checkout -q -f -B kisskb 2923b27e54242acf27fd16b299e102117c82f52f # git clean -qxdf # < git log -1 # commit 2923b27e54242acf27fd16b299e102117c82f52f # Merge: 828bf6e904eb c953cc987ab8 # Author: Linus Torvalds # Date: Sat Aug 25 18:43:59 2018 -0700 # # Merge tag 'libnvdimm-for-4.19_dax-memory-failure' of gitolite.kernel.org:pub/scm/linux/kernel/git/nvdimm/nvdimm # # Pull libnvdimm memory-failure update from Dave Jiang: # "As it stands, memory_failure() gets thoroughly confused by dev_pagemap # backed mappings. The recovery code has specific enabling for several # possible page states and needs new enabling to handle poison in dax # mappings. # # In order to support reliable reverse mapping of user space addresses: # # 1/ Add new locking in the memory_failure() rmap path to prevent races # that would typically be handled by the page lock. # # 2/ Since dev_pagemap pages are hidden from the page allocator and the # "compound page" accounting machinery, add a mechanism to determine # the size of the mapping that encompasses a given poisoned pfn. # # 3/ Given pmem errors can be repaired, change the speculatively # accessed poison protection, mce_unmap_kpfn(), to be reversible and # otherwise allow ongoing access from the kernel. # # A side effect of this enabling is that MADV_HWPOISON becomes usable # for dax mappings, however the primary motivation is to allow the # system to survive userspace consumption of hardware-poison via dax. # Specifically the current behavior is: # # mce: Uncorrected hardware memory error in user-access at af34214200 # {1}[Hardware Error]: It has been corrected by h/w and requires no further action # mce: [Hardware Error]: Machine check events logged # {1}[Hardware Error]: event severity: corrected # Memory failure: 0xaf34214: reserved kernel page still referenced by 1 users # [..] # Memory failure: 0xaf34214: recovery action for reserved kernel page: Failed # mce: Memory error not recovered # # # ...and with these changes: # # Injecting memory failure for pfn 0x20cb00 at process virtual address 0x7f763dd00000 # Memory failure: 0x20cb00: Killing dax-pmd:5421 due to hardware memory corruption # Memory failure: 0x20cb00: recovery action for dax page: Recovered # # Given all the cross dependencies I propose taking this through # nvdimm.git with acks from Naoya, x86/core, x86/RAS, and of course dax # folks" # # * tag 'libnvdimm-for-4.19_dax-memory-failure' of gitolite.kernel.org:pub/scm/linux/kernel/git/nvdimm/nvdimm: # libnvdimm, pmem: Restore page attributes when clearing errors # x86/memory_failure: Introduce {set, clear}_mce_nospec() # x86/mm/pat: Prepare {reserve, free}_memtype() for "decoy" addresses # mm, memory_failure: Teach memory_failure() about dev_pagemap pages # filesystem-dax: Introduce dax_lock_mapping_entry() # mm, memory_failure: Collect mapping size in collect_procs() # mm, madvise_inject_error: Let memory_failure() optionally take a page reference # mm, dev_pagemap: Do not clear ->mapping on final put # mm, madvise_inject_error: Disable MADV_SOFT_OFFLINE for ZONE_DEVICE pages # filesystem-dax: Set page->index # device-dax: Set page->index # device-dax: Enable page_mapping() # device-dax: Convert to vmf_insert_mixed and vm_fault_t # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa64-linux/bin/hppa64-linux-gcc --version # < git log --format=%s --max-count=1 2923b27e54242acf27fd16b299e102117c82f52f # < make -s -j 120 ARCH=parisc O=/kisskb/build/linus_a500_defconfig_parisc64 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa64-linux/bin/hppa64-linux- a500_defconfig # make -s -j 120 ARCH=parisc O=/kisskb/build/linus_a500_defconfig_parisc64 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa64-linux/bin/hppa64-linux- :1335:2: warning: #warning syscall rseq not implemented [-Wcpp] /kisskb/src/fs/ext4/super.c: In function '__save_error_info': /kisskb/src/fs/ext4/super.c:344:2: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation] strncpy(es->s_last_error_func, func, sizeof(es->s_last_error_func)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/fs/ext4/super.c:349:3: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation] strncpy(es->s_first_error_func, func, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sizeof(es->s_first_error_func)); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/parisc/include/asm/atomic.h:10, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/arch/parisc/include/asm/bitops.h:13, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/drivers/scsi/scsi_debug.c:23: /kisskb/src/drivers/scsi/scsi_debug.c: In function 'resp_start_stop': /kisskb/src/arch/parisc/include/asm/cmpxchg.h:48:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))) /kisskb/src/arch/parisc/include/asm/atomic.h:78:30: note: in expansion of macro 'xchg' #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) ^~~~ /kisskb/src/drivers/scsi/scsi_debug.c:1624:2: note: in expansion of macro 'atomic_xchg' atomic_xchg(&devip->stopped, stop); ^~~~~~~~~~~ In function '__xfs_xattr_put_listent', inlined from 'xfs_xattr_put_listent' at /kisskb/src/fs/xfs/xfs_xattr.c:204:2: /kisskb/src/fs/xfs/xfs_xattr.c:142:2: warning: 'strncpy' output may be truncated copying between 5 and 9 bytes from a string of length 9 [-Wstringop-truncation] strncpy(offset, prefix, prefix_len); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/scripts/unifdef.c: In function 'Mpass': /kisskb/src/scripts/unifdef.c:453:28: warning: 'strncpy' output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation] static void Mpass (void) { strncpy(keyword, "if ", 4); Pelif(); } ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_a500_defconfig_parisc64 # Build took: 0:00:35.081456