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

[Linux-stable-mirror] patch "USB: cdc-acm: Do not log urb submission errors on disconnect" added to usb-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: cdc-acm: Do not log urb submission errors on disconnect to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From f0386c083c2ce85284dc0b419d7b89c8e567c09f Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede(a)redhat.com> Date: Sun, 14 Jan 2018 16:09:00 +0100 Subject: USB: cdc-acm: Do not log urb submission errors on disconnect When disconnected sometimes the cdc-acm driver logs errors like these: [20278.039417] cdc_acm 2-2:2.1: urb 9 failed submission with -19 [20278.042924] cdc_acm 2-2:2.1: urb 10 failed submission with -19 [20278.046449] cdc_acm 2-2:2.1: urb 11 failed submission with -19 [20278.049920] cdc_acm 2-2:2.1: urb 12 failed submission with -19 [20278.053442] cdc_acm 2-2:2.1: urb 13 failed submission with -19 [20278.056915] cdc_acm 2-2:2.1: urb 14 failed submission with -19 [20278.060418] cdc_acm 2-2:2.1: urb 15 failed submission with -19 Silence these by not logging errors when the result is -ENODEV. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Acked-by: Oliver Neukum <oneukum(a)suse.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/class/cdc-acm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 8e0636c963a7..6c64ab6e80fa 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -425,7 +425,7 @@ static int acm_submit_read_urb(struct acm *acm, int index, gfp_t mem_flags) res = usb_submit_urb(acm->read_urbs[index], mem_flags); if (res) { - if (res != -EPERM) { + if (res != -EPERM && res != -ENODEV) { dev_err(&acm->data->dev, "urb %d failed submission with %d\n", index, res); -- 2.15.1

7 years, 1 month

1
0
0 0

[Linux-stable-mirror] [PATCH] arm: ensure symbol is a thumb symbol in new binutils

by Jason A. Donenfeld

On older versions of binutils, \sym points to an aligned address. On newer versions of binutils, \sym sometimes points to the unaligned thumb address in mysterious and buggy circumstances. In order to homogenize this behavior, rather than adding 1, we simply OR in 1, so that already unaligned instructions don't change. This fix is required for a pedestrian THUMB2_KERNEL to boot without crashing when built with non-old binutils. While it works, the downside is that we have to add an `orr` instruction to a fast path. The assembler can't do this at assemble time via "|1" because "invalid operands (.text and *ABS* sections) for `|'", so we're forced to do this. A better solution would be to have consistent binutils behavior, or to have some kind of \sym feature detection that won't turn into a maze of version comparisons. However, it's at the moment unclear how to achieve this. The rest of this commit message contains all of the relevant information. My tests concerned these versions: broken: GNU ld (Gentoo 2.29.1 p3) 2.29.1 working: GNU ld (GNU Binutils for Ubuntu) 2.26.1 These produced the following code: --- broken 2017-11-21 17:44:14.523416082 +0100 +++ working 2017-11-21 17:44:44.548461234 +0100 @@ -133,7 +133,7 @@ 160: f01a 0ff0 tst.w sl, #240 ; 0xf0 164: d111 bne.n 18a <__sys_trace> 166: f5b7 7fc8 cmp.w r7, #400 ; 0x190 - 16a: f2af 1e6a subw lr, pc, #362 ; 0x16a + 16a: f2af 1e6b subw lr, pc, #363 ; 0x16b 16e: bf38 it cc 170: f858 f027 ldrcc.w pc, [r8, r7, lsl #2] 174: a902 add r1, sp, #8 The differing instruction corresponds with this actual line in arch/arm/kernel/entry-common.S: badr lr, ret_fast_syscall @ return address Running the broken kernel results in a runtime OOPS with: PC is at ret_fast_syscall+0x4/0x52 LR is at ret_fast_syscall+0x2/0x52 The disassembly of that function for the crashing kernel is: .text:00000000 ret_fast_syscall ; CODE XREF: sys_syscall+1C↓j .text:00000000 CPSID I ; jumptable 00000840 cases 15,18-376 .text:00000002 .text:00000002 loc_2 ; DATA XREF: sys_syscall-6BA↓o .text:00000002 LDR.W R2, [R9,#8] .text:00000006 CMP.W R2, #0xBF000000 Signed-off-by: Jason A. Donenfeld <Jason(a)zx2c4.com> Cc: stable(a)vger.kernel.org --- arch/arm/include/asm/assembler.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index ad301f107dd2..c62a3b6b0a3e 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -194,10 +194,9 @@ */ .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo .macro badr\c, rd, sym -#ifdef CONFIG_THUMB2_KERNEL - adr\c \rd, \sym + 1 -#else adr\c \rd, \sym +#ifdef CONFIG_THUMB2_KERNEL + orr\c \rd, \rd, 1 #endif .endm .endr -- 2.15.0

7 years, 1 month

5
12
0 0

Re: [Linux-stable-mirror] Linux 4.14.10

by François Valenduc

No solution found to the permissions on tools/objtool/sync-check.sh ? git or patch is not smart enough for that ? It's obviously extremely easy to solve the problem, but I find that rather strange. François Valenduc Le 29/12/17 à 18:10, Greg KH a écrit : > I'm announcing the release of the 4.14.10 kernel. > > All users of the 4.14 kernel series must upgrade. > > The updated 4.14.y git tree can be found at: > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y > and can be browsed at the normal kernel.org git web browser: > http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary > > thanks, > > greg k-h > > ------------ > > Documentation/x86/x86_64/mm.txt | 24 > Makefile | 2 > arch/arm64/kvm/hyp/debug-sr.c | 3 > arch/parisc/boot/compressed/misc.c | 4 > arch/parisc/kernel/entry.S | 12 > arch/parisc/kernel/hpmc.S | 1 > arch/powerpc/include/asm/mmu_context.h | 5 > arch/powerpc/kvm/book3s_xive.c | 7 > arch/powerpc/perf/core-book3s.c | 8 > arch/um/include/asm/mmu_context.h | 3 > arch/unicore32/include/asm/mmu_context.h | 5 > arch/x86/Kconfig | 3 > arch/x86/entry/entry_32.S | 12 > arch/x86/entry/entry_64.S | 4 > arch/x86/entry/vsyscall/vsyscall_64.c | 38 > arch/x86/include/asm/cpu_entry_area.h | 68 + > arch/x86/include/asm/desc.h | 1 > arch/x86/include/asm/espfix.h | 7 > arch/x86/include/asm/fixmap.h | 71 - > arch/x86/include/asm/inat.h | 10 > arch/x86/include/asm/invpcid.h | 53 > arch/x86/include/asm/mmu.h | 4 > arch/x86/include/asm/mmu_context.h | 54 - > arch/x86/include/asm/pgtable_32_types.h | 15 > arch/x86/include/asm/pgtable_64_types.h | 47 > arch/x86/include/asm/processor.h | 6 > arch/x86/include/asm/stacktrace.h | 4 > arch/x86/include/asm/tlbflush.h | 136 +- > arch/x86/kernel/asm-offsets.c | 4 > arch/x86/kernel/asm-offsets_32.c | 2 > arch/x86/kernel/cpu/common.c | 100 - > arch/x86/kernel/cpu/microcode/intel.c | 13 > arch/x86/kernel/dumpstack.c | 11 > arch/x86/kernel/dumpstack_32.c | 6 > arch/x86/kernel/dumpstack_64.c | 12 > arch/x86/kernel/ldt.c | 47 > arch/x86/kernel/smpboot.c | 6 > arch/x86/kernel/traps.c | 6 > arch/x86/kvm/emulate.c | 32 > arch/x86/kvm/mmu.c | 8 > arch/x86/kvm/x86.c | 2 > arch/x86/lib/x86-opcode-map.txt | 13 > arch/x86/mm/Makefile | 2 > arch/x86/mm/cpu_entry_area.c | 139 ++ > arch/x86/mm/dump_pagetables.c | 98 + > arch/x86/mm/init_32.c | 6 > arch/x86/mm/kasan_init_64.c | 29 > arch/x86/mm/pgtable_32.c | 1 > arch/x86/mm/tlb.c | 10 > arch/x86/platform/uv/tlb_uv.c | 2 > arch/x86/xen/mmu_pv.c | 2 > block/bio.c | 2 > block/blk-throttle.c | 8 > crypto/af_alg.c | 6 > crypto/algif_aead.c | 16 > crypto/algif_skcipher.c | 16 > crypto/mcryptd.c | 23 > crypto/skcipher.c | 10 > drivers/acpi/apei/erst.c | 2 > drivers/acpi/nfit/core.c | 9 > drivers/char/ipmi/ipmi_si_intf.c | 1 > drivers/clk/sunxi/clk-sun9i-mmc.c | 12 > drivers/gpu/drm/i915/i915_gem.c | 9 > drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 > drivers/mfd/cros_ec_spi.c | 1 > drivers/mfd/twl4030-audio.c | 9 > drivers/mfd/twl6040.c | 12 > drivers/net/ethernet/marvell/mvneta.c | 8 > drivers/nvdimm/btt.c | 201 +++ > drivers/nvdimm/btt.h | 45 > drivers/nvdimm/pfn_devs.c | 20 > drivers/parisc/lba_pci.c | 33 > drivers/pci/pci-driver.c | 7 > drivers/pinctrl/intel/pinctrl-cherryview.c | 16 > drivers/spi/spi-armada-3700.c | 8 > drivers/spi/spi-xilinx.c | 11 > include/asm-generic/mm_hooks.h | 5 > include/asm-generic/pgtable.h | 5 > include/crypto/mcryptd.h | 1 > include/linux/bio.h | 2 > include/linux/blk_types.h | 9 > include/linux/blkdev.h | 2 > init/main.c | 6 > kernel/fork.c | 3 > net/ipv6/route.c | 58 - > sound/core/rawmidi.c | 15 > sound/pci/hda/patch_hdmi.c | 6 > sound/pci/hda/patch_realtek.c | 35 > sound/usb/mixer.c | 27 > sound/usb/quirks.c | 7 > tools/objtool/.gitignore | 2 > tools/objtool/Makefile | 30 > tools/objtool/arch/x86/Build | 10 > tools/objtool/arch/x86/decode.c | 6 > tools/objtool/arch/x86/include/asm/inat.h | 244 ++++ > tools/objtool/arch/x86/include/asm/inat_types.h | 29 > tools/objtool/arch/x86/include/asm/insn.h | 211 +++ > tools/objtool/arch/x86/include/asm/orc_types.h | 107 + > tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk | 393 ------- > tools/objtool/arch/x86/insn/inat.c | 97 - > tools/objtool/arch/x86/insn/inat.h | 234 ---- > tools/objtool/arch/x86/insn/inat_types.h | 29 > tools/objtool/arch/x86/insn/insn.c | 606 ----------- > tools/objtool/arch/x86/insn/insn.h | 211 --- > tools/objtool/arch/x86/insn/x86-opcode-map.txt | 1063 ------------------- > tools/objtool/arch/x86/lib/inat.c | 97 + > tools/objtool/arch/x86/lib/insn.c | 606 +++++++++++ > tools/objtool/arch/x86/lib/x86-opcode-map.txt | 1072 ++++++++++++++++++++ > tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk | 393 +++++++ > tools/objtool/orc.h | 2 > tools/objtool/orc_dump.c | 7 > tools/objtool/orc_types.h | 107 - > tools/objtool/sync-check.sh | 29 > tools/perf/util/intel-pt-decoder/x86-opcode-map.txt | 15 > tools/testing/selftests/x86/ldt_gdt.c | 9 > virt/kvm/arm/mmu.c | 10 > 116 files changed, 4023 insertions(+), 3424 deletions(-) > > Andy Lutomirski (3): > x86/vsyscall/64: Explicitly set _PAGE_USER in the pagetable hierarchy > x86/vsyscall/64: Warn and fail vsyscall emulation in NATIVE mode > x86/mm/64: Improve the memory map documentation > > Chen-Yu Tsai (1): > clk: sunxi: sun9i-mmc: Implement reset callback for reset controls > > Chris Wilson (1): > drm/i915: Flush pending GTT writes before unbinding > > Cédric Le Goater (1): > KVM: PPC: Book3S: fix XIVE migration of pending interrupts > > Dan Williams (3): > acpi, nfit: fix health event notification > libnvdimm, dax: fix 1GB-aligned namespaces vs physical misalignment > libnvdimm, pfn: fix start_pad handling for aligned namespaces > > Dave Hansen (4): > x86/entry: Rename SYSENTER_stack to CPU_ENTRY_AREA_entry_stack > x86/mm: Move the CR3 construction functions to tlbflush.h > x86/mm: Remove hard-coded ASID limit checks > x86/mm: Put MMU to hardware ASID translation in one place > > Eric Biggers (1): > crypto: skcipher - set walk.iv for zero-length inputs > > Greg Kroah-Hartman (2): > Revert "ipv6: grab rt->rt6i_ref before allocating pcpu rt" > Linux 4.14.10 > > Guneshwor Singh (1): > ALSA: hda - Add vendor id for Cannonlake HDMI codec > > Helge Deller (3): > parisc: Align os_hpmc_size on word boundary > parisc: Fix indenting in puts() > parisc: Hide Diva-built-in serial aux and graphics card > > Ingo Molnar (1): > tools/headers: Sync objtool UAPI header > > Jens Axboe (1): > block: unalign call_single_data in struct request > > Johan Hovold (2): > mfd: twl4030-audio: Fix sibling-node lookup > mfd: twl6040: Fix child-node lookup > > John David Anglin (1): > Revert "parisc: Re-enable interrupts early" > > John Einar Reitan (1): > Revert "ipmi_si: fix memory leak on new_smi" > > Jon Hunter (1): > mfd: cros ec: spi: Don't send first message too soon > > Josh Poimboeuf (3): > objtool: Move synced files to their original relative locations > objtool: Move kernel headers/code sync check to a script > objtool: Fix cross-build > > Julien Thierry (1): > arm64: kvm: Prevent restoring stale PMSCR_EL1 for vcpu > > Jussi Laako (1): > ALSA: usb-audio: Add native DSD support for Esoteric D-05X > > Kailang Yang (1): > ALSA: hda/realtek - Fix Dell AIO LineOut issue > > Laurent Vivier (1): > KVM: PPC: Book3S HV: Fix pending_pri value in kvmppc_xive_get_icp() > > Marc Zyngier (1): > KVM: arm/arm64: Fix HYP unmapping going off limits > > Maxime Chevallier (1): > spi: a3700: Fix clk prescaling for coefficient over 15 > > Maxime Ripard (1): > drm/sun4i: Fix error path handling > > Mika Westerberg (1): > pinctrl: cherryview: Mask all interrupts on Intel_Strago based systems > > Mikulas Patocka (1): > objtool: Fix 64-bit build on 32-bit host > > Paolo Bonzini (1): > kvm: x86: fix RSM when PCID is non-zero > > Peter Zijlstra (8): > x86/ldt: Rework locking > x86/doc: Remove obvious weirdnesses from the x86 MM layout documentation > x86/uv: Use the right TLB-flush API > x86/microcode: Dont abuse the TLB-flush interface > x86/mm: Use __flush_tlb_one() for kernel memory > x86/mm: Remove superfluous barriers > x86/mm: Add comments to clarify which TLB-flush functions are supposed to flush what > x86/mm: Create asm/invpcid.h > > Rafael J. Wysocki (1): > PCI / PM: Force devices to D0 in pci_pm_thaw_noirq() > > Randy Dunlap (1): > x86/decoder: Fix and update the opcodes map > > Ravi Bangoria (1): > powerpc/perf: Dereference BHRB entries safely > > Ricardo Neri (1): > x86/insn-eval: Add utility functions to get segment selector > > Ricardo Ribalda Delgado (1): > spi: xilinx: Detect stall with Unknown commands > > Sebastian Andrzej Siewior (1): > crypto: mcryptd - protect the per-CPU queue with a lock > > Shaohua Li (1): > block-throttle: avoid double charge > > Stephan Mueller (2): > crypto: af_alg - wait for data at beginning of recvmsg > crypto: af_alg - fix race accessing cipher request > > Takashi Iwai (3): > ACPI: APEI / ERST: Fix missing error handling in erst_reader() > ALSA: rawmidi: Avoid racy info ioctl via ctl device > ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU > > Thomas Gleixner (9): > x86/Kconfig: Limit NR_CPUS on 32-bit to a sane amount > x86/mm/dump_pagetables: Check PAGE_PRESENT for real > x86/mm/dump_pagetables: Make the address hints correct and readable > arch, mm: Allow arch_dup_mmap() to fail > x86/ldt: Prevent LDT inheritance on exec > x86/cpu_entry_area: Move it to a separate unit > x86/cpu_entry_area: Move it out of the fixmap > init: Invoke init_espfix_bsp() from mm_init() > x86/cpu_entry_area: Prevent wraparound in setup_cpu_entry_area_ptes() on 32bit > > Vishal Verma (1): > libnvdimm, btt: Fix an incompatibility in the log layout > > Wanpeng Li (2): > KVM: MMU: Fix infinite loop when there is no available mmu page > KVM: X86: Fix load RFLAGS w/o the fixed bit > > Yelena Krivosheev (3): > net: mvneta: clear interface link status on port disable > net: mvneta: use proper rxq_number in loop on rx queues > net: mvneta: eliminate wrong call to handle rx descriptor error >

7 years, 1 month

4
7
0 0

[Linux-stable-mirror] [PATCH] brcmfmac: Make sure CLM downloading is optional

by Bjorn Andersson

The presence of a CLM file is described as optional, but missing the clm blob causes the preinit to return unsuccessfully. Fix this by ignoring the return value of the brcmf_c_process_clm_blob(). Also remove the extra debug print, as brcmf_c_process_clm_blob() already did print a useful error message before returning. Fixes: fdd0bd88ceae ("brcmfmac: add CLM download support") Cc: stable(a)vger.kernel.org Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> --- This regression was introduced in v4.15-rc1, but I unfortunately didn't test WiFi until now. Included a Cc to stable@ in case you choose to pick this up after v4.15. drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index 6a59d0609d30..0c67ba6ae135 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -278,12 +278,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) } ri->result = err; - /* Do any CLM downloading */ - err = brcmf_c_process_clm_blob(ifp); - if (err < 0) { - brcmf_err("download CLM blob file failed, %d\n", err); - goto done; - } + /* Do any optional CLM downloading */ + brcmf_c_process_clm_blob(ifp); /* query for 'ver' to get version info from firmware */ memset(buf, 0, sizeof(buf)); -- 2.15.0

7 years, 1 month

2
2
0 0

[Linux-stable-mirror] [tip:sched/urgent] delayacct: Account blkio completion on the correct task

by tip-bot for Josh Snyder

Commit-ID: c96f5471ce7d2aefd0dda560cc23f08ab00bc65d Gitweb: https://git.kernel.org/tip/c96f5471ce7d2aefd0dda560cc23f08ab00bc65d Author: Josh Snyder <joshs(a)netflix.com> AuthorDate: Mon, 18 Dec 2017 16:15:10 +0000 Committer: Ingo Molnar <mingo(a)kernel.org> CommitDate: Tue, 16 Jan 2018 03:29:36 +0100 delayacct: Account blkio completion on the correct task Before commit: e33a9bba85a8 ("sched/core: move IO scheduling accounting from io_schedule_timeout() into scheduler") delayacct_blkio_end() was called after context-switching into the task which completed I/O. This resulted in double counting: the task would account a delay both waiting for I/O and for time spent in the runqueue. With e33a9bba85a8, delayacct_blkio_end() is called by try_to_wake_up(). In ttwu, we have not yet context-switched. This is more correct, in that the delay accounting ends when the I/O is complete. But delayacct_blkio_end() relies on 'get_current()', and we have not yet context-switched into the task whose I/O completed. This results in the wrong task having its delay accounting statistics updated. Instead of doing that, pass the task_struct being woken to delayacct_blkio_end(), so that it can update the statistics of the correct task. Signed-off-by: Josh Snyder <joshs(a)netflix.com> Acked-by: Tejun Heo <tj(a)kernel.org> Acked-by: Balbir Singh <bsingharora(a)gmail.com> Cc: <stable(a)vger.kernel.org> Cc: Brendan Gregg <bgregg(a)netflix.com> Cc: Jens Axboe <axboe(a)kernel.dk> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: linux-block(a)vger.kernel.org Fixes: e33a9bba85a8 ("sched/core: move IO scheduling accounting from io_schedule_timeout() into scheduler") Link: http://lkml.kernel.org/r/1513613712-571-1-git-send-email-joshs@netflix.com Signed-off-by: Ingo Molnar <mingo(a)kernel.org> --- include/linux/delayacct.h | 8 ++++---- kernel/delayacct.c | 42 ++++++++++++++++++++++++++---------------- kernel/sched/core.c | 6 +++--- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/include/linux/delayacct.h b/include/linux/delayacct.h index 4178d24..5e335b6 100644 --- a/include/linux/delayacct.h +++ b/include/linux/delayacct.h @@ -71,7 +71,7 @@ extern void delayacct_init(void); extern void __delayacct_tsk_init(struct task_struct *); extern void __delayacct_tsk_exit(struct task_struct *); extern void __delayacct_blkio_start(void); -extern void __delayacct_blkio_end(void); +extern void __delayacct_blkio_end(struct task_struct *); extern int __delayacct_add_tsk(struct taskstats *, struct task_struct *); extern __u64 __delayacct_blkio_ticks(struct task_struct *); extern void __delayacct_freepages_start(void); @@ -122,10 +122,10 @@ static inline void delayacct_blkio_start(void) __delayacct_blkio_start(); } -static inline void delayacct_blkio_end(void) +static inline void delayacct_blkio_end(struct task_struct *p) { if (current->delays) - __delayacct_blkio_end(); + __delayacct_blkio_end(p); delayacct_clear_flag(DELAYACCT_PF_BLKIO); } @@ -169,7 +169,7 @@ static inline void delayacct_tsk_free(struct task_struct *tsk) {} static inline void delayacct_blkio_start(void) {} -static inline void delayacct_blkio_end(void) +static inline void delayacct_blkio_end(struct task_struct *p) {} static inline int delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk) diff --git a/kernel/delayacct.c b/kernel/delayacct.c index 4a1c334..e2764d7 100644 --- a/kernel/delayacct.c +++ b/kernel/delayacct.c @@ -51,16 +51,16 @@ void __delayacct_tsk_init(struct task_struct *tsk) * Finish delay accounting for a statistic using its timestamps (@start), * accumalator (@total) and @count */ -static void delayacct_end(u64 *start, u64 *total, u32 *count) +static void delayacct_end(spinlock_t *lock, u64 *start, u64 *total, u32 *count) { s64 ns = ktime_get_ns() - *start; unsigned long flags; if (ns > 0) { - spin_lock_irqsave(&current->delays->lock, flags); + spin_lock_irqsave(lock, flags); *total += ns; (*count)++; - spin_unlock_irqrestore(&current->delays->lock, flags); + spin_unlock_irqrestore(lock, flags); } } @@ -69,17 +69,25 @@ void __delayacct_blkio_start(void) current->delays->blkio_start = ktime_get_ns(); } -void __delayacct_blkio_end(void) +/* + * We cannot rely on the `current` macro, as we haven't yet switched back to + * the process being woken. + */ +void __delayacct_blkio_end(struct task_struct *p) { - if (current->delays->flags & DELAYACCT_PF_SWAPIN) - /* Swapin block I/O */ - delayacct_end(&current->delays->blkio_start, - &current->delays->swapin_delay, - &current->delays->swapin_count); - else /* Other block I/O */ - delayacct_end(&current->delays->blkio_start, - &current->delays->blkio_delay, - &current->delays->blkio_count); + struct task_delay_info *delays = p->delays; + u64 *total; + u32 *count; + + if (p->delays->flags & DELAYACCT_PF_SWAPIN) { + total = &delays->swapin_delay; + count = &delays->swapin_count; + } else { + total = &delays->blkio_delay; + count = &delays->blkio_count; + } + + delayacct_end(&delays->lock, &delays->blkio_start, total, count); } int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk) @@ -153,8 +161,10 @@ void __delayacct_freepages_start(void) void __delayacct_freepages_end(void) { - delayacct_end(&current->delays->freepages_start, - &current->delays->freepages_delay, - &current->delays->freepages_count); + delayacct_end( + &current->delays->lock, + &current->delays->freepages_start, + &current->delays->freepages_delay, + &current->delays->freepages_count); } diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 644fa2e..a7bf32a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2056,7 +2056,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) p->state = TASK_WAKING; if (p->in_iowait) { - delayacct_blkio_end(); + delayacct_blkio_end(p); atomic_dec(&task_rq(p)->nr_iowait); } @@ -2069,7 +2069,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) #else /* CONFIG_SMP */ if (p->in_iowait) { - delayacct_blkio_end(); + delayacct_blkio_end(p); atomic_dec(&task_rq(p)->nr_iowait); } @@ -2122,7 +2122,7 @@ static void try_to_wake_up_local(struct task_struct *p, struct rq_flags *rf) if (!task_on_rq_queued(p)) { if (p->in_iowait) { - delayacct_blkio_end(); + delayacct_blkio_end(p); atomic_dec(&rq->nr_iowait); } ttwu_activate(rq, p, ENQUEUE_WAKEUP | ENQUEUE_NOCLOCK);

7 years, 1 month

1
0
0 0

[Linux-stable-mirror] [PATCH v2] ARM: vfp: Go back to clearing vfp_current_hw_state[]

by Fabio Estevam

From: Fabio Estevam <fabio.estevam(a)nxp.com> Commit 384b38b66947 ("ARM: 7873/1: vfp: clear vfp_current_hw_state for dying cpu") fixed the cpu dying notifier by clearing vfp_current_hw_state[]. However commit e5b61bafe704 ("arm: Convert VFP hotplug notifiers to state machine") incorrectly used the original vfp_force_reload() function in the cpu dying notifier. Fix it by going back to clearing vfp_current_hw_state[]. Fixes: e5b61bafe704 ("arm: Convert VFP hotplug notifiers to state machine") Cc: linux-stable <stable(a)vger.kernel.org> Reported-by: Kohji Okuno <okuno.kohji(a)jp.panasonic.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v1: - Improve the commit message arch/arm/vfp/vfpmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index a71a48e..aa7496b 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -648,7 +648,7 @@ int vfp_restore_user_hwstate(struct user_vfp __user *ufp, */ static int vfp_dying_cpu(unsigned int cpu) { - vfp_force_reload(cpu, current_thread_info()); + vfp_current_hw_state[cpu] = NULL; return 0; } -- 2.7.4

7 years, 1 month

1
0
0 0

[Linux-stable-mirror] [PATCH 4.9 v2] x86/pti/efi: broken conversion from efi to kernel page table

by Pavel Tatashin

The page table order must be increased for EFI table in order to avoid a bug where NMI tries to change the page table to kernel page table, while efi page table is active. For more disccussion about this bug, see this thread: http://lkml.iu.edu/hypermail/linux/kernel/1801.1/00951.html Signed-off-by: Pavel Tatashin <pasha.tatashin(a)oracle.com> Reviewed-by: Steven Sistare <steven.sistare(a)oracle.com> Acked-by: Jiri Kosina <jkosina(a)suse.cz> --- arch/x86/include/asm/pgalloc.h | 11 +++++++++++ arch/x86/mm/pgtable.c | 7 ------- arch/x86/platform/efi/efi_64.c | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) Changelog: v1 - v2: Fixed compiling warning diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h index b6d425999f99..1178a51b77f3 100644 --- a/arch/x86/include/asm/pgalloc.h +++ b/arch/x86/include/asm/pgalloc.h @@ -27,6 +27,17 @@ static inline void paravirt_release_pud(unsigned long pfn) {} */ extern gfp_t __userpte_alloc_gfp; +#ifdef CONFIG_PAGE_TABLE_ISOLATION +/* + * Instead of one PGD, we acquire two PGDs. Being order-1, it is + * both 8k in size and 8k-aligned. That lets us just flip bit 12 + * in a pointer to swap between the two 4k halves. + */ +#define PGD_ALLOCATION_ORDER 1 +#else +#define PGD_ALLOCATION_ORDER 0 +#endif + /* * Allocate and free page tables. */ diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 5aaec8effc5f..209b9465e97a 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -345,13 +345,6 @@ static inline void _pgd_free(pgd_t *pgd) } #else -/* - * Instead of one pgd, Kaiser acquires two pgds. Being order-1, it is - * both 8k in size and 8k-aligned. That lets us just flip bit 12 - * in a pointer to swap between the two 4k halves. - */ -#define PGD_ALLOCATION_ORDER kaiser_enabled - static inline pgd_t *_pgd_alloc(void) { return (pgd_t *)__get_free_pages(PGALLOC_GFP, PGD_ALLOCATION_ORDER); diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 2f25a363068c..dcb2d9d185a2 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -142,7 +142,7 @@ int __init efi_alloc_page_tables(void) return 0; gfp_mask = GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO; - efi_pgd = (pgd_t *)__get_free_page(gfp_mask); + efi_pgd = (pgd_t *)__get_free_pages(gfp_mask, PGD_ALLOCATION_ORDER); if (!efi_pgd) return -ENOMEM; -- 2.15.1

7 years, 1 month

3
2
0 0

Re: [Linux-stable-mirror] Patch "objtool: Allow alternatives to be ignored" has been added to the 4.9-stable tree

by Josh Poimboeuf

On Mon, Jan 15, 2018 at 12:55:11PM +0100, David Woodhouse wrote: > On Mon, 2018-01-15 at 10:06 +0100, gregkh(a)linuxfoundation.org wrote: > > This is a note to let you know that I've just added the patch titled > > > > objtool: Allow alternatives to be ignored > > > > to the 4.9-stable tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… > > > > The filename of the patch is: > > objtool-allow-alternatives-to-be-ignored.patch > > and it can be found in the queue-4.9 subdirectory. > > Hm... they aren't being ignored entirely. > > arch/x86/crypto/camellia-aesni-avx2-asm_64.o: warning: objtool: .altinstr_replacement+0xf: return instruction outside of a callable function > > Josh? This should fix it (to be applied on top): ---- From: Josh Poimboeuf <jpoimboe(a)redhat.com> Subject: [PATCH] objtool: Fix retpoline support for pre-ORC objtool Objtool 1.0 (pre-ORC) produces the following warning when it encounters a retpoline: arch/x86/crypto/camellia-aesni-avx2-asm_64.o: warning: objtool: .altinstr_replacement+0xf: return instruction outside of a callable function That warning is meant to catch GCC bugs and missing ENTRY/ENDPROC annotations, neither of which are applicable to alternatives. Silence the warning for alternative instructions, just like objtool 2.0 already does. Reported-by: David Woodhouse <dwmw2(a)infradead.org> Signed-off-by: Josh Poimboeuf <jpoimboe(a)redhat.com> --- tools/objtool/builtin-check.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c index f789621cbdba..a688a857a7ae 100644 --- a/tools/objtool/builtin-check.c +++ b/tools/objtool/builtin-check.c @@ -1230,6 +1230,14 @@ static int validate_uncallable_instructions(struct objtool_file *file) for_each_insn(file, insn) { if (!insn->visited && insn->type == INSN_RETURN) { + + /* + * Don't warn about call instructions in unvisited + * retpoline alternatives. + */ + if (!strcmp(insn->sec->name, ".altinstr_replacement")) + continue; + WARN_FUNC("return instruction outside of a callable function", insn->sec, insn->offset); warnings++; -- 2.14.3

7 years, 1 month

3
2
0 0

Re: [Linux-stable-mirror] stable-rc/linux-4.4.y build: 178 builds: 1 failed, 177 passed, 4 errors (v4.4.111-88-gaee64ffb2ece)

by Amit Pundir

Hi Greg, On 15 January 2018 at 17:21, kernelci.org bot <bot(a)kernelci.org> wrote: > stable-rc/linux-4.4.y build: 178 builds: 1 failed, 177 passed, 4 errors (v4.4.111-88-gaee64ffb2ece) > > Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.4.y/kernel/v4.4.111-88-… > > Tree: stable-rc > Branch: linux-4.4.y > Git Describe: v4.4.111-88-gaee64ffb2ece > Git Commit: aee64ffb2ececdfe86f0a00fb46f28aaad5f3acd > Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git > Built: 4 unique architectures > > Build Failure Detected: > > x86: gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.5) > > i386_defconfig: FAIL > > Errors Detected: > > x86: gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.5) > > i386_defconfig: 4 errors > > Errors summary: > > 1 arch/x86/kernel/cpu/bugs.c:76:24: error: 'X86_BUG_SPECTRE_V2' undeclared (first use in this function) > 1 arch/x86/kernel/cpu/bugs.c:68:24: error: 'X86_BUG_SPECTRE_V1' undeclared (first use in this function) > 1 arch/x86/kernel/cpu/bugs.c:60:19: error: 'X86_FEATURE_PTI' undeclared (first use in this function) > 1 arch/x86/kernel/cpu/bugs.c:58:24: error: 'X86_BUG_CPU_MELTDOWN' undeclared (first use in this function) > > Build failed due to following missing upstream patch backports for linux-4.4.y. I don't see these patches in queue-4.4 either. I'm not aware of other dependencies of these patches: a89f040fa34e ("x86/cpufeatures: Add X86_BUG_CPU_INSECURE") de791821c295c ("x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN") 99c6fa2511d8 ("x86/cpufeatures: Add X86_BUG_SPECTRE_V[12]") Regards, Amit Pundir <snip> ..

7 years, 1 month

2
2
0 0

[Linux-stable-mirror] Patch "x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN" has been added to the 4.4-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: x86-pti-rename-bug_cpu_insecure-to-bug_cpu_meltdown.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From de791821c295cc61419a06fe5562288417d1bc58 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx(a)linutronix.de> Date: Fri, 5 Jan 2018 15:27:34 +0100 Subject: x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN From: Thomas Gleixner <tglx(a)linutronix.de> commit de791821c295cc61419a06fe5562288417d1bc58 upstream. Use the name associated with the particular attack which needs page table isolation for mitigation. Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Acked-by: David Woodhouse <dwmw(a)amazon.co.uk> Cc: Alan Cox <gnomes(a)lxorguk.ukuu.org.uk> Cc: Jiri Koshina <jikos(a)kernel.org> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Tim Chen <tim.c.chen(a)linux.intel.com> Cc: Andi Lutomirski <luto(a)amacapital.net> Cc: Andi Kleen <ak(a)linux.intel.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Paul Turner <pjt(a)google.com> Cc: Tom Lendacky <thomas.lendacky(a)amd.com> Cc: Greg KH <gregkh(a)linux-foundation.org> Cc: Dave Hansen <dave.hansen(a)intel.com> Cc: Kees Cook <keescook(a)google.com> Cc: stable(a)vger.kernel.org Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801051525300.1724@nanos Signed-off-by: Razvan Ghitulete <rga(a)amazon.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- arch/x86/include/asm/cpufeature.h | 2 +- arch/x86/kernel/cpu/common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -277,7 +277,7 @@ #define X86_BUG_FXSAVE_LEAK X86_BUG(6) /* FXSAVE leaks FOP/FIP/FOP */ #define X86_BUG_CLFLUSH_MONITOR X86_BUG(7) /* AAI65, CLFLUSH required before MONITOR */ #define X86_BUG_SYSRET_SS_ATTRS X86_BUG(8) /* SYSRET doesn't fix up SS attrs */ -#define X86_BUG_CPU_INSECURE X86_BUG(14) /* CPU is insecure and needs kernel page table isolation */ +#define X86_BUG_CPU_MELTDOWN X86_BUG(14) /* CPU is affected by meltdown attack and needs kernel page table isolation */ #if defined(__KERNEL__) && !defined(__ASSEMBLY__) --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -832,7 +832,7 @@ static void __init early_identify_cpu(st setup_force_cpu_cap(X86_FEATURE_ALWAYS); /* Assume for now that ALL x86 CPUs are insecure */ - setup_force_cpu_bug(X86_BUG_CPU_INSECURE); + setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN); fpu__init_system(c); } Patches currently in stable-queue which might be from tglx(a)linutronix.de are queue-4.4/x86-mm-pat-dev-mem-remove-superfluous-error-message.patch queue-4.4/x86-cpufeatures-add-x86_bug_spectre_v.patch queue-4.4/x86-microcode-intel-extend-bdw-late-loading-with-a-revision-check.patch queue-4.4/x86-alternatives-add-missing-n-at-end-of-alternative-inline-asm.patch queue-4.4/sysfs-cpu-fix-typos-in-vulnerability-documentation.patch queue-4.4/locking-mutex-allow-next-waiter-lockless-wakeup.patch queue-4.4/x86-cpufeatures-add-x86_bug_cpu_insecure.patch queue-4.4/x86-cpufeatures-make-cpu-bugs-sticky.patch queue-4.4/x86-vsdo-fix-build-on-paravirt_clock-y-kvm_guest-n.patch queue-4.4/x86-pti-efi-broken-conversion-from-efi-to-kernel-page-table.patch queue-4.4/x86-documentation-add-pti-description.patch queue-4.4/x86-acpi-handle-sci-interrupts-above-legacy-space-gracefully.patch queue-4.4/x86-cpu-implement-cpu-vulnerabilites-sysfs-functions.patch queue-4.4/futex-replace-barrier-in-unqueue_me-with-read_once.patch queue-4.4/x86-cpu-factor-out-application-of-forced-cpu-caps.patch queue-4.4/selftests-x86-add-test_vsyscall.patch queue-4.4/x86-cpu-merge-bugs.c-and-bugs_64.c.patch queue-4.4/sysfs-cpu-add-vulnerability-folder.patch queue-4.4/x86-pti-rename-bug_cpu_insecure-to-bug_cpu_meltdown.patch queue-4.4/x86-acpi-reduce-code-duplication-in-mp_override_legacy_irq.patch queue-4.4/x86-alternatives-fix-optimize_nops-checking.patch

7 years, 1 month

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror