# git rev-parse -q --verify 2923b27e54242acf27fd16b299e102117c82f52f^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master error: The last gc run reported the following. Please correct the root cause and remove .git/gc.log. Automatic cleanup will not be performed until the file is removed. warning: There are too many unreachable loose objects; run 'git prune' to remove them. # git rev-parse -q --verify 2923b27e54242acf27fd16b299e102117c82f52f^{commit} 2923b27e54242acf27fd16b299e102117c82f52f # 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/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi-gcc --version # < git log --format=%s --max-count=1 2923b27e54242acf27fd16b299e102117c82f52f # < make -s -j 48 ARCH=arm O=/kisskb/build/linus_orion5x_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- orion5x_defconfig # make -s -j 48 ARCH=arm O=/kisskb/build/linus_orion5x_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- :1332:2: warning: #warning syscall io_pgetevents not implemented [-Wcpp] /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:186:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/rcu/srcutree.c: In function 'init_srcu_struct_fields': /kisskb/src/kernel/rcu/srcutree.c:129:33: warning: 'levelspread[]' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/rcu/srcutree.c:96:6: note: 'levelspread[]' was declared here /kisskb/src/drivers/base/regmap/regmap.c: In function 'regmap_raw_read': /kisskb/src/drivers/base/regmap/regmap.c:2511:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function '_regmap_raw_write': /kisskb/src/drivers/base/regmap/regmap.c:1833:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/i2c/i2c-core-base.c: In function 'i2c_generic_scl_recovery': /kisskb/src/drivers/i2c/i2c-core-base.c:235:5: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:341:21: note: 'pdeo' was declared here /kisskb/src/fs/udf/unicode.c: In function 'udf_name_conv_char': /kisskb/src/fs/udf/unicode.c:132:8: warning: 'c' may be used uninitialized in this function [-Wuninitialized] Completed OK # rm -rf /kisskb/build/linus_orion5x_defconfig_arm # Build took: 0:00:58.644373