# 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/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 120 ARCH=arm O=/kisskb/build/linus_bcm2835_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- bcm2835_defconfig # make -s -j 120 ARCH=arm O=/kisskb/build/linus_bcm2835_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/arch/arm/kernel/patch.c: In function '__patch_text_real': /kisskb/src/arch/arm/include/asm/irqflags.h:171:2: warning: 'flags' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/arch/arm/kernel/patch.c:61:16: note: 'flags' was declared here /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/ipc/shm.c: In function 'ksys_shmdt': /kisskb/src/ipc/shm.c:1685:59: warning: 'file' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/mpi/mpicoder.c: In function 'mpi_read_raw_from_sgl': /kisskb/src/lib/mpi/mpicoder.c:336:12: warning: 'buff' 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/lib/rhashtable.c: In function 'rht_deferred_worker': /kisskb/src/lib/rhashtable.c:265:2: warning: 'next' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/rhashtable.c:230:28: note: 'next' was declared here /kisskb/src/net/core/gen_stats.c: In function '__gnet_stats_copy_basic': /kisskb/src/net/core/gen_stats.c:161:19: warning: 'seq' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/dma-buf/reservation.c: In function 'reservation_object_add_shared_fence': /kisskb/src/drivers/dma-buf/reservation.c:208:36: warning: 'k' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/dma-buf/reservation.c:161:17: note: 'k' was declared here /kisskb/src/mm/ksm.c: In function '__stable_node_chain': /kisskb/src/mm/ksm.c:1395:15: warning: 'found_rmap_hlist_len' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/mm/ksm.c:1367:6: note: 'found_rmap_hlist_len' was declared here /kisskb/src/drivers/gpio/gpiolib-of.c: In function 'of_gpiochip_add': /kisskb/src/drivers/gpio/gpiolib-of.c:390:8: warning: 'dflags' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpio/gpiolib-of.c:376:19: note: 'dflags' was declared here /kisskb/src/drivers/gpio/gpiolib-of.c:390:8: warning: 'lflags' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpio/gpiolib-of.c:375:25: note: 'lflags' was declared here /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/drivers/gpu/drm/drm_dp_mst_topology.c: In function 'drm_dp_sideband_msg_build': /kisskb/src/drivers/gpu/drm/drm_dp_mst_topology.c:364:23: warning: 'hdrlen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/core/dev.c: In function 'validate_xmit_skb_list': /kisskb/src/net/core/dev.c:3344:15: warning: 'tail' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpu/drm/drm_atomic.c: In function 'drm_atomic_check_only': /kisskb/src/drivers/gpu/drm/drm_atomic.c:760:38: warning: 'crtc_state' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpu/drm/drm_atomic.c:744:25: note: 'crtc_state' was declared here /kisskb/src/net/mac80211/mlme.c: In function 'ieee80211_rx_mgmt_beacon': /kisskb/src/net/mac80211/mlme.c:1448:3: warning: 'pwr_level_cisco' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/mac80211/mlme.c:1405:6: note: 'pwr_level_cisco' was declared here Completed OK # rm -rf /kisskb/build/linus_bcm2835_defconfig_arm # Build took: 0:00:40.593327