- Linux-stable-mirror - lists.linaro.org

[nacked] mm-thp-always-specify-disabled-vmas-as-nh-in-smaps.patch removed from -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: mm, thp: always specify disabled vmas as nh in smaps has been removed from the -mm tree. Its filename was mm-thp-always-specify-disabled-vmas-as-nh-in-smaps.patch This patch was dropped because it was nacked ------------------------------------------------------ From: David Rientjes <rientjes(a)google.com> Subject: mm, thp: always specify disabled vmas as nh in smaps 1860033237d4 ("mm: make PR_SET_THP_DISABLE immediately active") introduced a regression in that userspace cannot always determine the set of vmas where thp is disabled. Userspace relies on the "nh" flag being emitted as part of /proc/pid/smaps to determine if a vma has been disabled from being backed by hugepages. Previous to this commit, prctl(PR_SET_THP_DISABLE, 1) would cause thp to be disabled and emit "nh" as a flag for the corresponding vmas as part of /proc/pid/smaps. After the commit, thp is disabled by means of an mm flag and "nh" is not emitted. This causes smaps parsing libraries to assume a vma is enabled for thp and ends up puzzling the user on why its memory is not backed by thp. This also clears the "hg" flag to make the behavior of MADV_HUGEPAGE and PR_SET_THP_DISABLE definitive. Link: http://lkml.kernel.org/r/alpine.DEB.2.21.1809251449060.96762@chino.kir.corp… Fixes: 1860033237d4 ("mm: make PR_SET_THP_DISABLE immediately active") Signed-off-by: David Rientjes <rientjes(a)google.com> Cc: Michal Hocko <mhocko(a)kernel.org> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: Alexey Dobriyan <adobriyan(a)gmail.com> Cc: "Kirill A. Shutemov" <kirill.shutemov(a)linux.intel.com> Cc: Mike Rapoport <rppt(a)linux.ibm.com> Cc: Andrei Vagin <avagin(a)gmail.com> Cc: Cyrill Gorcunov <gorcunov(a)gmail.com> Cc: Pavel Emelyanov <xemul(a)virtuozzo.com> Cc: <stable(a)vger.kernel.org> [4.13+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- Documentation/filesystems/proc.txt | 7 ++++++- fs/proc/task_mmu.c | 14 +++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) --- a/Documentation/filesystems/proc.txt~mm-thp-always-specify-disabled-vmas-as-nh-in-smaps +++ a/Documentation/filesystems/proc.txt @@ -508,9 +508,14 @@ manner. The codes are the following: sd - soft-dirty flag mm - mixed map area hg - huge page advise flag - nh - no-huge page advise flag + nh - no-huge page advise flag [*] mg - mergable advise flag + [*] A process mapping may be advised to not be backed by transparent hugepages + by either madvise(MADV_NOHUGEPAGE) or prctl(PR_SET_THP_DISABLE). See + Documentation/admin-guide/mm/transhuge.rst for system-wide and process + mapping policies. + Note that there is no guarantee that every flag and associated mnemonic will be present in all further kernel releases. Things get changed, the flags may be vanished or the reverse -- new added. Interpretation of their meaning --- a/fs/proc/task_mmu.c~mm-thp-always-specify-disabled-vmas-as-nh-in-smaps +++ a/fs/proc/task_mmu.c @@ -653,13 +653,25 @@ static void show_smap_vma_flags(struct s #endif #endif /* CONFIG_ARCH_HAS_PKEYS */ }; + unsigned long flags = vma->vm_flags; size_t i; + /* + * Disabling thp is possible through both MADV_NOHUGEPAGE and + * PR_SET_THP_DISABLE. Both historically used VM_NOHUGEPAGE. Since + * the introduction of MMF_DISABLE_THP, however, userspace needs the + * ability to detect vmas where thp is not eligible in the same manner. + */ + if (vma->vm_mm && test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) { + flags &= ~VM_HUGEPAGE; + flags |= VM_NOHUGEPAGE; + } + seq_puts(m, "VmFlags: "); for (i = 0; i < BITS_PER_LONG; i++) { if (!mnemonics[i][0]) continue; - if (vma->vm_flags & (1UL << i)) { + if (flags & (1UL << i)) { seq_putc(m, mnemonics[i][0]); seq_putc(m, mnemonics[i][1]); seq_putc(m, ' '); _ Patches currently in -mm which might be from rientjes(a)google.com are

6 years, 8 months

1
0
0 0

[PATCH] arm64: kaslr: ensure randomized quantities are clean also when kaslr is off

by Ard Biesheuvel

Commit 1598ecda7b23 ("arm64: kaslr: ensure randomized quantities are clean to the PoC") added cache maintenance to ensure that global variables set by the kaslr init routine are not wiped clean due to cache invalidation occurring during the second round of page table creation. However, if kaslr_early_init() exits early with no randomization being applied (either due to the lack of a seed, or because the user has disabled kaslr explicitly), no cache maintenance is performed, leading to the same issue we attempted to fix earlier, as far as the module_alloc_base variable is concerned. Note that module_alloc_base cannot be initialized statically, because that would cause it to be subject to a R_AARCH64_RELATIVE relocation, causing it to be overwritten by the second round of KASLR relocation processing. Fixes: f80fb3a3d508 ("arm64: add support for kernel ASLR") Cc: <stable(a)vger.kernel.org> # v4.6+ Signed-off-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> --- arch/arm64/kernel/kaslr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c index ba6b41790fcd..b09b6f75f759 100644 --- a/arch/arm64/kernel/kaslr.c +++ b/arch/arm64/kernel/kaslr.c @@ -88,6 +88,7 @@ u64 __init kaslr_early_init(u64 dt_phys) * we end up running with module randomization disabled. */ module_alloc_base = (u64)_etext - MODULES_VSIZE; + __flush_dcache_area(&module_alloc_base, sizeof(module_alloc_base)); /* * Try to map the FDT early. If this fails, we simply bail, -- 2.20.1

6 years, 8 months

2
2
0 0

stable-rc/linux-4.19.y build: 202 builds: 5 failed, 197 passed, 8 errors, 54 warnings (v4.19.18-104-gd0a51a4dd99a)

by kernelci.org bot

stable-rc/linux-4.19.y build: 202 builds: 5 failed, 197 passed, 8 errors, 54 warnings (v4.19.18-104-gd0a51a4dd99a) Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.19.y/kernel/v4.19.18-10… Tree: stable-rc Branch: linux-4.19.y Git Describe: v4.19.18-104-gd0a51a4dd99a Git Commit: d0a51a4dd99af17e1f6a0d3758b9c2a7a6c0014a Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Built: 7 unique architectures Build Failures Detected: mips: mips-linux-gnu-gcc (Debian 7.4.0-1) 7.4.0 decstation_defconfig: FAIL ip27_defconfig: FAIL ip28_defconfig: FAIL jmr3927_defconfig: FAIL malta_kvm_guest_defconfig: FAIL Errors and Warnings Detected: arc: arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2017.09) 7.1.1 20170710 allnoconfig: 1 warning axs103_defconfig: 5 warnings axs103_smp_defconfig: 5 warnings haps_hs_defconfig: 3 warnings haps_hs_smp_defconfig: 3 warnings hsdk_defconfig: 5 warnings nsim_hs_smp_defconfig: 3 warnings nsimosci_hs_defconfig: 5 warnings nsimosci_hs_smp_defconfig: 5 warnings tinyconfig: 1 warning vdk_hs38_defconfig: 6 warnings vdk_hs38_smp_defconfig: 6 warnings mips: mips-linux-gnu-gcc (Debian 7.4.0-1) 7.4.0 decstation_defconfig: 4 errors jmr3927_defconfig: 4 errors lemote2f_defconfig: 1 warning loongson3_defconfig: 2 warnings malta_qemu_32r6_defconfig: 1 warning nlm_xlp_defconfig: 1 warning x86_64: gcc (Debian 7.4.0-2) 7.4.0 tinyconfig: 1 warning Errors summary: 4 cc1: error: '-march=r3900' requires '-mfp32' 4 cc1: error: '-march=r3000' requires '-mfp32' Warnings summary: 24 arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] 12 include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast 10 net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] 3 net/core/rtnetlink.c:3156:1: warning: the frame size of 1312 bytes is larger than 1024 bytes [-Wframe-larger-than=] 2 arch/arc/kernel/unwind.c:188:14: warning: 'unw_hdr_alloc' defined but not used [-Wunused-function] 1 {standard input}:131: Warning: macro instruction expanded into multiple instructions 1 arch/mips/configs/loongson3_defconfig:55:warning: symbol value 'm' invalid for HOTPLUG_PCI_SHPC 1 .config:1005:warning: override: UNWINDER_GUESS changes choice state ================================================================================ Detailed per-defconfig build reports: -------------------------------------------------------------------------------- acs5k_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- acs5k_tiny_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (i386) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (x86_64) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (arm64) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (arc) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast -------------------------------------------------------------------------------- allnoconfig (riscv) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- am200epdkit_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ar7_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- aspeed_g4_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- aspeed_g5_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- assabet_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- at91_dt_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ath25_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ath79_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- axm55xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- axs103_defconfig (arc) — PASS, 0 errors, 5 warnings, 0 section mismatches Warnings: include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] -------------------------------------------------------------------------------- axs103_smp_defconfig (arc) — PASS, 0 errors, 5 warnings, 0 section mismatches Warnings: include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] -------------------------------------------------------------------------------- badge4_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- bcm2835_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- bcm47xx_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- bcm63xx_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- bigsur_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- bmips_be_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- bmips_stb_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- capcella_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- cavium_octeon_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- cerfcube_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ci20_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- clps711x_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- cm_x2xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- cm_x300_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- cns3420vb_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- cobalt_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- colibri_pxa270_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- colibri_pxa300_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- collie_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- corgi_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- davinci_all_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- db1xxx_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- decstation_defconfig (mips) — FAIL, 4 errors, 0 warnings, 0 section mismatches Errors: cc1: error: '-march=r3000' requires '-mfp32' cc1: error: '-march=r3000' requires '-mfp32' cc1: error: '-march=r3000' requires '-mfp32' cc1: error: '-march=r3000' requires '-mfp32' -------------------------------------------------------------------------------- defconfig (riscv) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig (arm64) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- dove_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- e55_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ebsa110_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- efm32_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- em_x270_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ep93xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- eseries_pxa_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- exynos_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ezx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- footbridge_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- fuloong2e_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- gcw0_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- gemini_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- gpr_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- h3600_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- h5000_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- hackkit_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- haps_hs_defconfig (arc) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] -------------------------------------------------------------------------------- haps_hs_smp_defconfig (arc) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] -------------------------------------------------------------------------------- hisi_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- hsdk_defconfig (arc) — PASS, 0 errors, 5 warnings, 0 section mismatches Warnings: include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] -------------------------------------------------------------------------------- imote2_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- imx_v4_v5_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- imx_v6_v7_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- integrator_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- iop13xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- iop32x_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- iop33x_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ip22_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ip27_defconfig (mips) — FAIL, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ip28_defconfig (mips) — FAIL, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ip32_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ixp4xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- jazz_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- jmr3927_defconfig (mips) — FAIL, 4 errors, 0 warnings, 0 section mismatches Errors: cc1: error: '-march=r3900' requires '-mfp32' cc1: error: '-march=r3900' requires '-mfp32' cc1: error: '-march=r3900' requires '-mfp32' cc1: error: '-march=r3900' requires '-mfp32' -------------------------------------------------------------------------------- jornada720_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- keystone_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ks8695_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- lart_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- lasat_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- lemote2f_defconfig (mips) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: net/core/rtnetlink.c:3156:1: warning: the frame size of 1312 bytes is larger than 1024 bytes [-Wframe-larger-than=] -------------------------------------------------------------------------------- loongson1b_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- loongson1c_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- loongson3_defconfig (mips) — PASS, 0 errors, 2 warnings, 0 section mismatches Warnings: arch/mips/configs/loongson3_defconfig:55:warning: symbol value 'm' invalid for HOTPLUG_PCI_SHPC net/core/rtnetlink.c:3156:1: warning: the frame size of 1312 bytes is larger than 1024 bytes [-Wframe-larger-than=] -------------------------------------------------------------------------------- lpc18xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- lpc32xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- lpd270_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- lubbock_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- magician_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mainstone_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- malta_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- malta_kvm_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- malta_kvm_guest_defconfig (mips) — FAIL, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- malta_qemu_32r6_defconfig (mips) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: {standard input}:131: Warning: macro instruction expanded into multiple instructions -------------------------------------------------------------------------------- maltaaprp_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- maltasmvp_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- maltasmvp_eva_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- maltaup_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- maltaup_xpa_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- markeins_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mini2440_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mips_paravirt_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mmp2_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- moxart_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mpc30x_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mps2_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- msp71xx_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mtx1_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v4t_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v5_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v7_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mv78xx0_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mvebu_v5_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mvebu_v7_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mxs_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- neponset_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- netwinder_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- netx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nhk8815_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nlm_xlp_defconfig (mips) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: net/core/rtnetlink.c:3156:1: warning: the frame size of 1312 bytes is larger than 1024 bytes [-Wframe-larger-than=] -------------------------------------------------------------------------------- nlm_xlr_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nsim_hs_smp_defconfig (arc) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] -------------------------------------------------------------------------------- nsimosci_hs_defconfig (arc) — PASS, 0 errors, 5 warnings, 0 section mismatches Warnings: include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] -------------------------------------------------------------------------------- nsimosci_hs_smp_defconfig (arc) — PASS, 0 errors, 5 warnings, 0 section mismatches Warnings: include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] -------------------------------------------------------------------------------- nuc910_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nuc950_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nuc960_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- omap1_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- omap2plus_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- omega2p_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- orion5x_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- oxnas_v6_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- palmz72_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pcm027_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pic32mzda_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pistachio_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pleb_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pnx8335_stb225_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- prima2_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pxa168_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pxa255-idp_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pxa3xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pxa910_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pxa_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- qcom_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- qi_lb60_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- raumfeld_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- rb532_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- rbtx49xx_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- realview_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- rm200_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- rpc_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- rt305x_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- s3c2410_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- s3c6400_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- s5pv210_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- sama5_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- sb1250_swarm_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- shannon_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- shmobile_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- simpad_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- socfpga_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- spear13xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- spear3xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- spear6xx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- spitz_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- stm32_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- sunxi_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tango4_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tb0219_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tb0226_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tb0287_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tct_hammer_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tegra_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (arm64) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (x86_64) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: .config:1005:warning: override: UNWINDER_GUESS changes choice state -------------------------------------------------------------------------------- tinyconfig (i386) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (arc) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast -------------------------------------------------------------------------------- tinyconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (riscv) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- trizeps4_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- u300_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- u8500_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- vdk_hs38_defconfig (arc) — PASS, 0 errors, 6 warnings, 0 section mismatches Warnings: arch/arc/kernel/unwind.c:188:14: warning: 'unw_hdr_alloc' defined but not used [-Wunused-function] include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] -------------------------------------------------------------------------------- vdk_hs38_smp_defconfig (arc) — PASS, 0 errors, 6 warnings, 0 section mismatches Warnings: arch/arc/kernel/unwind.c:188:14: warning: 'unw_hdr_alloc' defined but not used [-Wunused-function] include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] -------------------------------------------------------------------------------- versatile_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- vexpress_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- vf610m4_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- viper_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- vocore2_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- vt8500_v6_v7_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- workpad_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- xcep_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- xway_defconfig (mips) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- zeus_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- zx_defconfig (arm) — PASS, 0 errors, 0 warnings, 0 section mismatches --- For more info write to <info(a)kernelci.org>

6 years, 8 months

1
0
0 0

[PATCH v10 08/17] tpm: call tpm2_flush_space() on error in tpm_try_transmit()

by Jarkko Sakkinen

Always call tpm2_flush_space() on failure in tpm_try_transmit() so that the volatile memory of the TPM gets cleared. If /dev/tpm0 does not have sufficient permissions (usually it has), this could lead to the leakage of TPM objects. Through /dev/tpmrm0 this issue does not raise any new security concerns. Cc: James Bottomley <James.Bottomley(a)HansenPartnership.com> Cc: stable(a)vger.kernel.org Fixes: 745b361e989a ("tpm:tpm: infrastructure for TPM spaces") Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> Tested-by: Stefan Berger <stefanb(a)linux.ibm.com> --- drivers/char/tpm/tpm-interface.c | 29 ++++++++++++----------------- drivers/char/tpm/tpm.h | 1 + drivers/char/tpm/tpm2-space.c | 2 +- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 689d07e67643..2c409d19a9b9 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -220,14 +220,14 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, struct tpm_space *space, rc = tpm2_prepare_space(chip, space, ordinal, buf); if (rc) - goto out; + goto out_idle; rc = chip->ops->send(chip, buf, count); if (rc < 0) { if (rc != -EPIPE) dev_err(&chip->dev, "%s: tpm_send: error %d\n", __func__, rc); - goto out; + goto out_space; } if (chip->flags & TPM_CHIP_FLAG_IRQ) @@ -243,7 +243,7 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, struct tpm_space *space, if (chip->ops->req_canceled(chip, status)) { dev_err(&chip->dev, "Operation Canceled\n"); rc = -ECANCELED; - goto out; + goto out_space; } tpm_msleep(TPM_TIMEOUT_POLL); @@ -253,28 +253,23 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, struct tpm_space *space, chip->ops->cancel(chip); dev_err(&chip->dev, "Operation Timed out\n"); rc = -ETIME; - goto out; + goto out_space; out_recv: len = chip->ops->recv(chip, buf, bufsiz); if (len < 0) { rc = len; - dev_err(&chip->dev, - "tpm_transmit: tpm_recv: error %d\n", rc); - goto out; - } else if (len < TPM_HEADER_SIZE) { + dev_err(&chip->dev, "tpm_transmit: tpm_recv: error %d\n", rc); + } else if (len < TPM_HEADER_SIZE || len != be32_to_cpu(header->length)) rc = -EFAULT; - goto out; - } - if (len != be32_to_cpu(header->length)) { - rc = -EFAULT; - goto out; - } - - rc = tpm2_commit_space(chip, space, ordinal, buf, &len); +out_space: + if (rc) + tpm2_flush_space(chip); + else + rc = tpm2_commit_space(chip, space, ordinal, buf, &len); -out: +out_idle: /* may fail but do not override previous error value in rc */ tpm_go_idle(chip, flags); diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 1454ef19d2f4..6eb67ccad2a3 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -576,6 +576,7 @@ int tpm2_probe(struct tpm_chip *chip); int tpm2_find_cc(struct tpm_chip *chip, u32 cc); int tpm2_init_space(struct tpm_space *space); void tpm2_del_space(struct tpm_chip *chip, struct tpm_space *space); +void tpm2_flush_space(struct tpm_chip *chip); int tpm2_prepare_space(struct tpm_chip *chip, struct tpm_space *space, u32 cc, u8 *cmd); int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space, diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c index 39cb3915771e..5d6487575074 100644 --- a/drivers/char/tpm/tpm2-space.c +++ b/drivers/char/tpm/tpm2-space.c @@ -162,7 +162,7 @@ static int tpm2_save_context(struct tpm_chip *chip, u32 handle, u8 *buf, return 0; } -static void tpm2_flush_space(struct tpm_chip *chip) +void tpm2_flush_space(struct tpm_chip *chip) { struct tpm_space *space = &chip->work_space; int i; -- 2.19.1

6 years, 8 months

2
4
0 0

+ mm-hwpoison-use-do_send_sig_info-instead-of-force_sig-re-pmem-error-handling-forces-sigkill-causes-kernel-panic.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: mm: hwpoison: use do_send_sig_info() instead of force_sig() has been added to the -mm tree. Its filename is mm-hwpoison-use-do_send_sig_info-instead-of-force_sig-re-pmem-error-handling-forces-sigkill-causes-kernel-panic.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-hwpoison-use-do_send_sig_info-i… and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-hwpoison-use-do_send_sig_info-i… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com> Subject: mm: hwpoison: use do_send_sig_info() instead of force_sig() Currently memory_failure() is racy against process's exiting, which results in kernel crash by null pointer dereference. The root cause is that memory_failure() uses force_sig() to forcibly kill asynchronous (meaning not in the current context) processes. As discussed in thread https://lkml.org/lkml/2010/6/8/236 years ago for OOM fixes, this is not a right thing to do. OOM solves this issue by using do_send_sig_info() as done in commit d2d393099de2 ("signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig()"), so this patch is suggesting to do the same for hwpoison. do_send_sig_info() properly accesses to siglock with lock_task_sighand(), so is free from the reported race. I confirmed that the reported bug reproduces with inserting some delay in kill_procs(), and it never reproduces with this patch. Note that memory_failure() can send another type of signal using force_sig_mceerr(), and the reported race shouldn't happen on it because force_sig_mceerr() is called only for synchronous processes (i.e. BUS_MCEERR_AR happens only when some process accesses to the corrupted memory.) Link: http://lkml.kernel.org/r/20190116093046.GA29835@hori1.linux.bs1.fc.nec.co.jp Signed-off-by: Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com> Reported-by: Jane Chu <jane.chu(a)oracle.com> Reviewed-by: Dan Williams <dan.j.williams(a)intel.com> Reviewed-by: William Kucharski <william.kucharski(a)oracle.com> Cc: Oleg Nesterov <oleg(a)redhat.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/memory-failure.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/mm/memory-failure.c~mm-hwpoison-use-do_send_sig_info-instead-of-force_sig-re-pmem-error-handling-forces-sigkill-causes-kernel-panic +++ a/mm/memory-failure.c @@ -372,7 +372,8 @@ static void kill_procs(struct list_head if (fail || tk->addr_valid == 0) { pr_err("Memory failure: %#lx: forcibly killing %s:%d because of failure to unmap corrupted page\n", pfn, tk->tsk->comm, tk->tsk->pid); - force_sig(SIGKILL, tk->tsk); + do_send_sig_info(SIGKILL, SEND_SIG_PRIV, + tk->tsk, PIDTYPE_PID); } /* _ Patches currently in -mm which might be from n-horiguchi(a)ah.jp.nec.com are mm-hwpoison-use-do_send_sig_info-instead-of-force_sig-re-pmem-error-handling-forces-sigkill-causes-kernel-panic.patch

6 years, 8 months

1
0
0 0

stable-rc/linux-4.19.y boot: 115 boots: 106 failed, 5 passed with 4 offline (v4.19.18-105-gfcf041425278)

by kernelci.org bot

stable-rc/linux-4.19.y boot: 115 boots: 106 failed, 5 passed with 4 offline (v4.19.18-105-gfcf041425278) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.19.y/kernel/v4.1… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.19.y/kernel/v4.19.18-10… Tree: stable-rc Branch: linux-4.19.y Git Describe: v4.19.18-105-gfcf041425278 Git Commit: fcf041425278137b16b9483fefee7c3efe338b74 Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 63 unique boards, 23 SoC families, 12 builds out of 201 Boot Regressions Detected: arm: bcm2835_defconfig: bcm2835-rpi-b: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) bcm2836-rpi-2-b: lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) bcm2837-rpi-3-b: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) davinci_all_defconfig: da850-lcdk: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) dm365evm,legacy: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) exynos_defconfig: exynos5250-arndale: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) exynos5250-snow: lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) exynos5420-arndale-octa: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) exynos5422-odroidxu3: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) imx_v6_v7_defconfig: imx6dl-wandboard_dual: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) imx6dl-wandboard_solo: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) imx6q-wandboard: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) imx7s-warp: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) vf610-colibri-eval-v3: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) multi_v7_defconfig: alpine-db: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) am335x-boneblack: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-collabora: failing since 1 day (last pass: v4.19.17-107-g3784655a0f02 - first fail: v4.19.18-104-g9e8345ab20e5) armada-xp-openblocks-ax3-4: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) at91-sama5d4_xplained: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) exynos5250-arndale: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) exynos5250-snow: lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) exynos5420-arndale-octa: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) exynos5422-odroidxu3: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) imx6dl-wandboard_dual: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) imx6dl-wandboard_solo: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) imx6q-sabrelite: lab-baylibre: failing since 1 day (last pass: v4.19.15-51-g3fd0fa89eb9f - first fail: v4.19.18-104-g9e8345ab20e5) imx6q-wandboard: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) imx7s-warp: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) meson8b-odroidc1: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) omap4-panda: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) qcom-apq8064-cm-qs600: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) qcom-apq8064-ifc6410: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) qemu: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-mhart: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) socfpga_cyclone5_de0_sockit: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) stih410-b2120: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sun4i-a10-cubieboard: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sun7i-a20-bananapi: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sun7i-a20-cubietruck: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-gd4ca65af2caa) sun8i-h2-plus-libretech-all-h3-cc: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sun8i-h3-libretech-all-h3-cc: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) tegra124-jetson-tk1: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-mhart: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) tegra124-nyan-big: lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) tegra30-beaver: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) vf610-colibri-eval-v3: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) zynq-zc702: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) mvebu_v7_defconfig: armada-xp-openblocks-ax3-4: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) omap2plus_defconfig: am335x-boneblack: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) omap3-beagle: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-gd4ca65af2caa) omap4-panda: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) qcom_defconfig: qcom-apq8064-cm-qs600: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) qcom-apq8064-ifc6410: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sama5_defconfig: at91-sama5d4_xplained: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sunxi_defconfig: sun4i-a10-cubieboard: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sun5i-r8-chip: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sun7i-a20-bananapi: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sun7i-a20-cubietruck: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sun8i-h2-plus-libretech-all-h3-cc: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sun8i-h3-libretech-all-h3-cc: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) tegra_defconfig: tegra124-jetson-tk1: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-mhart: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) tegra124-nyan-big: lab-collabora: failing since 3 days (last pass: v4.19.17-107-g3784655a0f02 - first fail: v4.19.18) tegra30-beaver: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) arm64: defconfig: hip07-d05: lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) juno-r2: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) meson-axg-s400: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) meson-gxbb-nanopi-k2: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) meson-gxbb-odroidc2: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) meson-gxbb-p200: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) meson-gxl-s905d-p230: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) meson-gxl-s905x-khadas-vim: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-baylibre-seattle: failing since 8 days (last pass: v4.19.16 - first fail: v4.19.16-100-ge43bc298813d) meson-gxl-s905x-libretech-cc: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) meson-gxl-s905x-nexbox-a95x: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) meson-gxl-s905x-p212: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) meson-gxm-nexbox-a1: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) mt7622-rfb1: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) qemu: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) lab-mhart: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) r8a7796-m3ulcb: lab-baylibre: failing since 1 day (last pass: v4.19.16 - first fail: v4.19.18-104-g9e8345ab20e5) lab-collabora: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) rk3399-firefly: lab-baylibre-seattle: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) rk3399-puma-haikou: lab-theobroma-systems: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) sun50i-h5-libretech-all-h3-cc: lab-baylibre: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) synquacer-acpi: lab-mhart: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) synquacer-dtb: lab-mhart: failing since 1 day (last pass: v4.19.18 - first fail: v4.19.18-104-g9e8345ab20e5) Boot Failures Detected: arm64: defconfig hip07-d05: 1 failed lab juno-r2: 1 failed lab meson-axg-s400: 1 failed lab meson-gxbb-nanopi-k2: 1 failed lab meson-gxbb-odroidc2: 1 failed lab meson-gxbb-p200: 1 failed lab meson-gxl-s905d-p230: 1 failed lab meson-gxl-s905x-khadas-vim: 2 failed labs meson-gxl-s905x-libretech-cc: 2 failed labs meson-gxl-s905x-nexbox-a95x: 1 failed lab meson-gxl-s905x-p212: 1 failed lab meson-gxm-nexbox-a1: 1 failed lab mt7622-rfb1: 1 failed lab qemu: 3 failed labs r8a7796-m3ulcb: 2 failed labs rk3399-firefly: 1 failed lab rk3399-gru-kevin: 1 failed lab rk3399-puma-haikou: 1 failed lab sun50i-h5-libretech-all-h3-cc: 1 failed lab synquacer-acpi: 1 failed lab synquacer-dtb: 1 failed lab arm: tegra_defconfig tegra124-jetson-tk1: 4 failed labs tegra124-nyan-big: 1 failed lab tegra30-beaver: 1 failed lab sunxi_defconfig sun4i-a10-cubieboard: 1 failed lab sun5i-r8-chip: 1 failed lab sun7i-a20-bananapi: 1 failed lab sun7i-a20-cubietruck: 1 failed lab sun8i-h2-plus-libretech-all-h3-cc: 1 failed lab sun8i-h3-libretech-all-h3-cc: 1 failed lab exynos_defconfig exynos5250-arndale: 1 failed lab exynos5250-snow: 1 failed lab exynos5420-arndale-octa: 1 failed lab exynos5422-odroidxu3: 2 failed labs exynos5800-peach-pi: 1 failed lab bcm2835_defconfig bcm2835-rpi-b: 1 failed lab bcm2836-rpi-2-b: 1 failed lab bcm2837-rpi-3-b: 1 failed lab qcom_defconfig qcom-apq8064-cm-qs600: 1 failed lab qcom-apq8064-ifc6410: 1 failed lab davinci_all_defconfig da850-lcdk: 1 failed lab dm365evm,legacy: 1 failed lab sama5_defconfig at91-sama5d4_xplained: 1 failed lab mvebu_v7_defconfig armada-xp-openblocks-ax3-4: 1 failed lab imx_v6_v7_defconfig imx6dl-wandboard_dual: 1 failed lab imx6dl-wandboard_solo: 1 failed lab imx6q-wandboard: 1 failed lab imx7s-warp: 1 failed lab vf610-colibri-eval-v3: 1 failed lab omap2plus_defconfig am335x-boneblack: 2 failed labs omap3-beagle: 1 failed lab omap4-panda: 2 failed labs multi_v7_defconfig alpine-db: 1 failed lab am335x-boneblack: 2 failed labs armada-xp-openblocks-ax3-4: 1 failed lab at91-sama5d4_xplained: 1 failed lab exynos5250-arndale: 1 failed lab exynos5250-snow: 1 failed lab exynos5420-arndale-octa: 1 failed lab exynos5422-odroidxu3: 2 failed labs exynos5800-peach-pi: 1 failed lab imx6dl-wandboard_dual: 1 failed lab imx6dl-wandboard_solo: 1 failed lab imx6q-sabrelite: 2 failed labs imx6q-wandboard: 1 failed lab imx7s-warp: 1 failed lab meson8b-odroidc1: 2 failed labs omap4-panda: 2 failed labs qcom-apq8064-cm-qs600: 1 failed lab qcom-apq8064-ifc6410: 1 failed lab qemu: 3 failed labs rk3288-rock2-square: 1 failed lab rk3288-veyron-jaq: 1 failed lab socfpga_cyclone5_de0_sockit: 1 failed lab stih410-b2120: 1 failed lab sun4i-a10-cubieboard: 1 failed lab sun7i-a20-bananapi: 1 failed lab sun7i-a20-cubietruck: 1 failed lab sun8i-h2-plus-libretech-all-h3-cc: 1 failed lab sun8i-h3-libretech-all-h3-cc: 1 failed lab tegra124-jetson-tk1: 4 failed labs tegra124-nyan-big: 1 failed lab tegra30-beaver: 1 failed lab vf610-colibri-eval-v3: 1 failed lab zynq-zc702: 1 failed lab Offline Platforms: arm64: defconfig: apq8016-sbc: 1 offline lab sun50i-a64-pine64-plus: 1 offline lab arm: multi_v7_defconfig: exynos5800-peach-pi: 1 offline lab exynos_defconfig: exynos5800-peach-pi: 1 offline lab --- For more info write to <info(a)kernelci.org>

6 years, 8 months

1
0
0 0

stable-rc/linux-4.20.y boot: 117 boots: 1 failed, 114 passed with 2 offline (v4.20.5-119-gef18d4260339)

by kernelci.org bot

stable-rc/linux-4.20.y boot: 117 boots: 1 failed, 114 passed with 2 offline (v4.20.5-119-gef18d4260339) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.20.y/kernel/v4.2… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.20.y/kernel/v4.20.5-119… Tree: stable-rc Branch: linux-4.20.y Git Describe: v4.20.5-119-gef18d4260339 Git Commit: ef18d4260339bf79aa387199f912d366aa7e4b93 Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 65 unique boards, 23 SoC families, 13 builds out of 202 Boot Failure Detected: arm64: defconfig mt7622-rfb1: 1 failed lab Offline Platforms: arm: multi_v7_defconfig: exynos5800-peach-pi: 1 offline lab exynos_defconfig: exynos5800-peach-pi: 1 offline lab --- For more info write to <info(a)kernelci.org>

6 years, 8 months

1
0
0 0

FAILED: patch "[PATCH] CIFS: Do not reconnect TCP session in add_credits()" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ef68e831840c40c7d01b328b3c0f5d8c4796c232 Mon Sep 17 00:00:00 2001 From: Pavel Shilovsky <pshilov(a)microsoft.com> Date: Fri, 18 Jan 2019 17:25:36 -0800 Subject: [PATCH] CIFS: Do not reconnect TCP session in add_credits() When executing add_credits() we currently call cifs_reconnect() if the number of credits is zero and there are no requests in flight. In this case we may call cifs_reconnect() recursively twice and cause memory corruption given the following sequence of functions: mid1.callback() -> add_credits() -> cifs_reconnect() -> -> mid2.callback() -> add_credits() -> cifs_reconnect(). Fix this by avoiding to call cifs_reconnect() in add_credits() and checking for zero credits in the demultiplex thread. Cc: <stable(a)vger.kernel.org> Signed-off-by: Pavel Shilovsky <pshilov(a)microsoft.com> Reviewed-by: Ronnie Sahlberg <lsahlber(a)redhat.com> Signed-off-by: Steve French <stfrench(a)microsoft.com> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 683310f26171..8463c940e0e5 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -720,6 +720,21 @@ server_unresponsive(struct TCP_Server_Info *server) return false; } +static inline bool +zero_credits(struct TCP_Server_Info *server) +{ + int val; + + spin_lock(&server->req_lock); + val = server->credits + server->echo_credits + server->oplock_credits; + if (server->in_flight == 0 && val == 0) { + spin_unlock(&server->req_lock); + return true; + } + spin_unlock(&server->req_lock); + return false; +} + static int cifs_readv_from_socket(struct TCP_Server_Info *server, struct msghdr *smb_msg) { @@ -732,6 +747,12 @@ cifs_readv_from_socket(struct TCP_Server_Info *server, struct msghdr *smb_msg) for (total_read = 0; msg_data_left(smb_msg); total_read += length) { try_to_freeze(); + /* reconnect if no credits and no requests in flight */ + if (zero_credits(server)) { + cifs_reconnect(server); + return -ECONNABORTED; + } + if (server_unresponsive(server)) return -ECONNABORTED; if (cifs_rdma_enabled(server) && server->smbd_conn) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 1d3ce127b02e..fa8d2e1076c8 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -34,6 +34,7 @@ #include "cifs_ioctl.h" #include "smbdirect.h" +/* Change credits for different ops and return the total number of credits */ static int change_conf(struct TCP_Server_Info *server) { @@ -41,17 +42,15 @@ change_conf(struct TCP_Server_Info *server) server->oplock_credits = server->echo_credits = 0; switch (server->credits) { case 0: - return -1; + return 0; case 1: server->echoes = false; server->oplocks = false; - cifs_dbg(VFS, "disabling echoes and oplocks\n"); break; case 2: server->echoes = true; server->oplocks = false; server->echo_credits = 1; - cifs_dbg(FYI, "disabling oplocks\n"); break; default: server->echoes = true; @@ -64,14 +63,15 @@ change_conf(struct TCP_Server_Info *server) server->echo_credits = 1; } server->credits -= server->echo_credits + server->oplock_credits; - return 0; + return server->credits + server->echo_credits + server->oplock_credits; } static void smb2_add_credits(struct TCP_Server_Info *server, const unsigned int add, const int optype) { - int *val, rc = 0; + int *val, rc = -1; + spin_lock(&server->req_lock); val = server->ops->get_credits_field(server, optype); @@ -101,8 +101,26 @@ smb2_add_credits(struct TCP_Server_Info *server, const unsigned int add, } spin_unlock(&server->req_lock); wake_up(&server->request_q); - if (rc) - cifs_reconnect(server); + + if (server->tcpStatus == CifsNeedReconnect) + return; + + switch (rc) { + case -1: + /* change_conf hasn't been executed */ + break; + case 0: + cifs_dbg(VFS, "Possible client or server bug - zero credits\n"); + break; + case 1: + cifs_dbg(VFS, "disabling echoes and oplocks\n"); + break; + case 2: + cifs_dbg(FYI, "disabling oplocks\n"); + break; + default: + cifs_dbg(FYI, "add %u credits total=%d\n", add, rc); + } } static void

6 years, 8 months

1
0
0 0

[PATCH v3 1/3] drm/i915: Block fbdev HPD processing during suspend

by Lyude Paul

When resuming, we check whether or not any previously connected MST topologies are still present and if so, attempt to resume them. If this fails, we disable said MST topologies and fire off a hotplug event so that userspace knows to reprobe. However, sending a hotplug event involves calling drm_fb_helper_hotplug_event(), which in turn results in fbcon doing a connector reprobe in the caller's thread - something we can't do at the point in which i915 calls drm_dp_mst_topology_mgr_resume() since hotplugging hasn't been fully initialized yet. This currently causes some rather subtle but fatal issues. For example, on my T480s the laptop dock connected to it usually disappears during a suspend cycle, and comes back up a short while after the system has been resumed. This guarantees pretty much every suspend and resume cycle, drm_dp_mst_topology_mgr_set_mst(mgr, false); will be caused and in turn, a connector hotplug will occur. Now it's Rute Goldberg time: when the connector hotplug occurs, i915 reprobes /all/ of the connectors, including eDP. However, eDP probing requires that we power on the panel VDD which in turn, grabs a wakeref to the appropriate power domain on the GPU (on my T480s, this is the PORT_DDI_A_IO domain). This is where things start breaking, since this all happens before intel_power_domains_enable() is called we end up leaking the wakeref that was acquired and never releasing it later. Come next suspend/resume cycle, this causes us to fail to shut down the GPU properly, which causes it not to resume properly and die a horrible complicated death. (as a note: this only happens when there's both an eDP panel and MST topology connected which is removed mid-suspend. One or the other seems to always be OK). We could try to fix the VDD wakeref leak, but this doesn't seem like it's worth it at all since we aren't able to handle hotplug detection while resuming anyway. So, let's go with a more robust solution inspired by nouveau: block fbdev from handling hotplug events until we resume fbdev. This allows us to still send sysfs hotplug events to be handled later by user space while we're resuming, while also preventing us from actually processing any hotplug events we receive until it's safe. This fixes the wakeref leak observed on the T480s and as such, also fixes suspend/resume with MST topologies connected on this machine. Changes since v2: * Don't call drm_fb_helper_hotplug_event() under lock, do it after lock (Chris Wilson) * Don't call drm_fb_helper_hotplug_event() in intel_fbdev_output_poll_changed() under lock (Chris Wilson) * Always set ifbdev->hpd_waiting (Chris Wilson) Signed-off-by: Lyude Paul <lyude(a)redhat.com> Fixes: 0e32b39ceed6 ("drm/i915: add DP 1.2 MST support (v0.7)") Cc: Todd Previte <tprevite(a)gmail.com> Cc: Dave Airlie <airlied(a)redhat.com> Cc: Jani Nikula <jani.nikula(a)linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Cc: Imre Deak <imre.deak(a)intel.com> Cc: intel-gfx(a)lists.freedesktop.org Cc: <stable(a)vger.kernel.org> # v3.17+ --- drivers/gpu/drm/i915/intel_drv.h | 10 +++++++++ drivers/gpu/drm/i915/intel_fbdev.c | 33 +++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 90ba5436370e..9ec3d00fbd19 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -213,6 +213,16 @@ struct intel_fbdev { unsigned long vma_flags; async_cookie_t cookie; int preferred_bpp; + + /* Whether or not fbdev hpd processing is temporarily suspended */ + bool hpd_suspended : 1; + /* Set when a hotplug was received while HPD processing was + * suspended + */ + bool hpd_waiting : 1; + + /* Protects hpd_suspended */ + struct mutex hpd_lock; }; struct intel_encoder { diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 8cf3efe88f02..376ffe842e26 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -681,6 +681,7 @@ int intel_fbdev_init(struct drm_device *dev) if (ifbdev == NULL) return -ENOMEM; + mutex_init(&ifbdev->hpd_lock); drm_fb_helper_prepare(dev, &ifbdev->helper, &intel_fb_helper_funcs); if (!intel_fbdev_init_bios(dev, ifbdev)) @@ -754,6 +755,26 @@ void intel_fbdev_fini(struct drm_i915_private *dev_priv) intel_fbdev_destroy(ifbdev); } +/* Suspends/resumes fbdev processing of incoming HPD events. When resuming HPD + * processing, fbdev will perform a full connector reprobe if a hotplug event + * was received while HPD was suspended. + */ +static void intel_fbdev_hpd_set_suspend(struct intel_fbdev *ifbdev, int state) +{ + bool send_hpd = false; + + mutex_lock(&ifbdev->hpd_lock); + ifbdev->hpd_suspended = state == FBINFO_STATE_SUSPENDED; + send_hpd = !ifbdev->hpd_suspended && ifbdev->hpd_waiting; + ifbdev->hpd_waiting = false; + mutex_unlock(&ifbdev->hpd_lock); + + if (send_hpd) { + DRM_DEBUG_KMS("Handling delayed fbcon HPD event\n"); + drm_fb_helper_hotplug_event(&ifbdev->helper); + } +} + void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous) { struct drm_i915_private *dev_priv = to_i915(dev); @@ -775,6 +796,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous */ if (state != FBINFO_STATE_RUNNING) flush_work(&dev_priv->fbdev_suspend_work); + console_lock(); } else { /* @@ -802,17 +824,26 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous drm_fb_helper_set_suspend(&ifbdev->helper, state); console_unlock(); + + intel_fbdev_hpd_set_suspend(ifbdev, state); } void intel_fbdev_output_poll_changed(struct drm_device *dev) { struct intel_fbdev *ifbdev = to_i915(dev)->fbdev; + bool send_hpd; if (!ifbdev) return; intel_fbdev_sync(ifbdev); - if (ifbdev->vma || ifbdev->helper.deferred_setup) + + mutex_lock(&ifbdev->hpd_lock); + send_hpd = !ifbdev->hpd_suspended; + ifbdev->hpd_waiting = true; + mutex_unlock(&ifbdev->hpd_lock); + + if (send_hpd && (ifbdev->vma || ifbdev->helper.deferred_setup)) drm_fb_helper_hotplug_event(&ifbdev->helper); } -- 2.20.1

6 years, 8 months

2
1
0 0

stable-rc/linux-4.9.y boot: 96 boots: 0 failed, 94 passed with 2 offline (v4.9.153-44-g5c2f7073d8b3)

by kernelci.org bot

stable-rc/linux-4.9.y boot: 96 boots: 0 failed, 94 passed with 2 offline (v4.9.153-44-g5c2f7073d8b3) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.9.y/kernel/v4.9.… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.9.y/kernel/v4.9.153-44-… Tree: stable-rc Branch: linux-4.9.y Git Describe: v4.9.153-44-g5c2f7073d8b3 Git Commit: 5c2f7073d8b3351b1555e85fbeec808c3bf5f628 Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 48 unique boards, 21 SoC families, 12 builds out of 193 Offline Platforms: arm: multi_v7_defconfig: exynos5800-peach-pi: 1 offline lab exynos_defconfig: exynos5800-peach-pi: 1 offline lab --- For more info write to <info(a)kernelci.org>

6 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror