# 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/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux-gcc --version # < git log --format=%s --max-count=1 2923b27e54242acf27fd16b299e102117c82f52f # < make -s -j 48 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- allmodconfig drivers/staging/mt7621-dts/Kconfig:4:warning: 'BUILTIN_DTB' has wrong type. 'select' only accept arguments of bool and tristate type # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # yes \n | make -s -j 48 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- oldconfig yes: standard output: Broken pipe # make -s -j 48 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- drivers/staging/mt7621-dts/Kconfig:4:warning: 'BUILTIN_DTB' has wrong type. 'select' only accept arguments of bool and tristate type :1332:2: warning: #warning syscall io_pgetevents not implemented [-Wcpp] :1335:2: warning: #warning syscall rseq not implemented [-Wcpp] /kisskb/src/arch/xtensa/kernel/pci.c:45:32: warning: 'pci_ctrl_tail' defined but not used [-Wunused-variable] static struct pci_controller **pci_ctrl_tail = &pci_ctrl_head; ^ /kisskb/src/kernel/sched/core.c: In function 'update_rq_clock_task': /kisskb/src/kernel/sched/core.c:139:6: warning: unused variable 'steal' [-Wunused-variable] s64 steal = 0, irq_delta = 0; ^ /kisskb/src/drivers/bluetooth/hci_h5.c:920:22: warning: 'rtl_vnd' defined but not used [-Wunused-variable] static struct h5_vnd rtl_vnd = { ^ In file included from /kisskb/src/arch/xtensa/include/asm/atomic.h:21:0, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/asm-generic/bitops/atomic.h:5, from /kisskb/src/arch/xtensa/include/asm/bitops.h:222, 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/wait.h:7, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ocfs2/file.c:27: /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/arch/xtensa/include/asm/cmpxchg.h:139:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/fs/ocfs2/file.c:2386:3: note: in expansion of macro 'xchg' xchg(&iocb->ki_complete, saved_ki_complete); ^ /kisskb/src/drivers/char/tpm/tpm2-cmd.c: In function 'tpm2_unseal_trusted': /kisskb/src/drivers/char/tpm/tpm2-cmd.c:676:2: warning: 'blob_handle' may be used uninitialized in this function [-Wmaybe-uninitialized] tpm2_flush_context_cmd(chip, blob_handle, TPM_TRANSMIT_UNLOCKED); ^ /kisskb/src/drivers/input/joystick/analog.c:172:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ /kisskb/src/lib/test_kasan.c: In function 'use_after_scope_test': /kisskb/src/lib/test_kasan.c:504:1: warning: the frame size of 1040 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /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 [-Wmaybe-uninitialized] if (ret == -EOPNOTSUPP) ^ /kisskb/src/drivers/net/usb/rtl8150.c:30:0: warning: "RSR" redefined #define RSR 0x0133 ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/asm-generic/bug.h:18, from ./arch/xtensa/include/generated/asm/bug.h:1, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/signal.h:5, from /kisskb/src/drivers/net/usb/rtl8150.c:9: /kisskb/src/arch/xtensa/include/asm/processor.h:220:0: note: this is the location of the previous definition #define RSR(v,sr) __asm__ __volatile__ ("rsr %0,"__stringify(sr) : "=a"(v)); ^ In file included from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:64:0, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_fw.c:40: /kisskb/src/drivers/scsi/sym53c8xx_2/sym_defs.h:109:0: warning: "WSR" redefined #define WSR 0x01 /* sta: wide scsi received [W]*/ ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, 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/wait.h:7, from /kisskb/src/include/linux/completion.h:12, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:43, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_fw.c:40: /kisskb/src/arch/xtensa/include/asm/processor.h:219:0: note: this is the location of the previous definition #define WSR(v,sr) __asm__ __volatile__ ("wsr %0,"__stringify(sr) :: "a"(v)); ^ In file included from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:64:0, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.c:50: /kisskb/src/drivers/scsi/sym53c8xx_2/sym_defs.h:109:0: warning: "WSR" redefined #define WSR 0x01 /* sta: wide scsi received [W]*/ ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, 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/sym53c8xx_2/sym_glue.c:42: /kisskb/src/arch/xtensa/include/asm/processor.h:219:0: note: this is the location of the previous definition #define WSR(v,sr) __asm__ __volatile__ ("wsr %0,"__stringify(sr) :: "a"(v)); ^ In file included from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:64:0, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_nvram.c:40: /kisskb/src/drivers/scsi/sym53c8xx_2/sym_defs.h:109:0: warning: "WSR" redefined #define WSR 0x01 /* sta: wide scsi received [W]*/ ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, 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/wait.h:7, from /kisskb/src/include/linux/completion.h:12, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:43, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_nvram.c:40: /kisskb/src/arch/xtensa/include/asm/processor.h:219:0: note: this is the location of the previous definition #define WSR(v,sr) __asm__ __volatile__ ("wsr %0,"__stringify(sr) :: "a"(v)); ^ In file included from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:64:0, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_hipd.c:44: /kisskb/src/drivers/scsi/sym53c8xx_2/sym_defs.h:109:0: warning: "WSR" redefined #define WSR 0x01 /* sta: wide scsi received [W]*/ ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/asm-generic/bug.h:18, from ./arch/xtensa/include/generated/asm/bug.h:1, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/mmdebug.h:5, from /kisskb/src/include/linux/gfp.h:5, from /kisskb/src/include/linux/slab.h:15, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_hipd.c:41: /kisskb/src/arch/xtensa/include/asm/processor.h:219:0: note: this is the location of the previous definition #define WSR(v,sr) __asm__ __volatile__ ("wsr %0,"__stringify(sr) :: "a"(v)); ^ In file included from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:64:0, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_malloc.c:40: /kisskb/src/drivers/scsi/sym53c8xx_2/sym_defs.h:109:0: warning: "WSR" redefined #define WSR 0x01 /* sta: wide scsi received [W]*/ ^ In file included from /kisskb/src/arch/xtensa/include/asm/bitops.h:22:0, 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/wait.h:7, from /kisskb/src/include/linux/completion.h:12, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_glue.h:43, from /kisskb/src/drivers/scsi/sym53c8xx_2/sym_malloc.c:40: /kisskb/src/arch/xtensa/include/asm/processor.h:219:0: note: this is the location of the previous definition #define WSR(v,sr) __asm__ __volatile__ ("wsr %0,"__stringify(sr) :: "a"(v)); ^ /kisskb/src/drivers/net/ethernet/microchip/lan743x_main.c:2964:12: warning: 'lan743x_pm_suspend' defined but not used [-Wunused-function] static int lan743x_pm_suspend(struct device *dev) ^ /kisskb/src/drivers/net/ethernet/microchip/lan743x_main.c:2987:12: warning: 'lan743x_pm_resume' defined but not used [-Wunused-function] static int lan743x_pm_resume(struct device *dev) ^ In file included from /kisskb/src/arch/xtensa/include/asm/atomic.h:21:0, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/asm-generic/bitops/atomic.h:5, from /kisskb/src/arch/xtensa/include/asm/bitops.h:222, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:11: /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c: In function 'ixgbevf_xdp_setup': /kisskb/src/arch/xtensa/include/asm/cmpxchg.h:139:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:4448:4: note: in expansion of macro 'xchg' xchg(&adapter->rx_ring[i]->xdp_prog, adapter->xdp_prog); ^ /kisskb/src/drivers/usb/dwc3/dwc3-of-simple.c:213:12: warning: 'dwc3_of_simple_suspend' defined but not used [-Wunused-function] static int dwc3_of_simple_suspend(struct device *dev) ^ /kisskb/src/drivers/usb/dwc3/dwc3-of-simple.c:223:12: warning: 'dwc3_of_simple_resume' defined but not used [-Wunused-function] static int dwc3_of_simple_resume(struct device *dev) ^ /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(); } ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ./usr/include/asm/setup.h:17: userspace cannot reference function or variable defined in the kernel Completed OK # rm -rf /kisskb/build/linus_xtensa-allmodconfig_xtensa # Build took: 0:12:35.533230