February 2018 - Linux-stable-mirror

[PATCH] x86/xen: zero MSR_IA32_SPEC_CTRL before suspend

by Juergen Gross

Older Xen versions (4.5 and before) might have problems migrating pv guests with MSR_IA32_SPEC_CTRL having a non-zero value. So before suspending zero that MSR and restore it after being resumed. Cc: stable(a)vger.kernel.org Signed-off-by: Juergen Gross <jgross(a)suse.com> --- arch/x86/xen/suspend.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index d9f96cc5d743..1d83152c761b 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c @@ -1,12 +1,15 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/types.h> #include <linux/tick.h> +#include <linux/percpu-defs.h> #include <xen/xen.h> #include <xen/interface/xen.h> #include <xen/grant_table.h> #include <xen/events.h> +#include <asm/cpufeatures.h> +#include <asm/msr-index.h> #include <asm/xen/hypercall.h> #include <asm/xen/page.h> #include <asm/fixmap.h> @@ -15,6 +18,8 @@ #include "mmu.h" #include "pmu.h" +static DEFINE_PER_CPU(u64, spec_ctrl); + void xen_arch_pre_suspend(void) { xen_save_time_memory_area(); @@ -35,6 +40,9 @@ void xen_arch_post_suspend(int cancelled) static void xen_vcpu_notify_restore(void *data) { + if (xen_pv_domain() && boot_cpu_has(X86_FEATURE_SPEC_CTRL)) + wrmsrl(MSR_IA32_SPEC_CTRL, this_cpu_read(spec_ctrl)); + /* Boot processor notified via generic timekeeping_resume() */ if (smp_processor_id() == 0) return; @@ -44,7 +52,15 @@ static void xen_vcpu_notify_restore(void *data) static void xen_vcpu_notify_suspend(void *data) { + u64 tmp; + tick_suspend_local(); + + if (xen_pv_domain() && boot_cpu_has(X86_FEATURE_SPEC_CTRL)) { + rdmsrl(MSR_IA32_SPEC_CTRL, tmp); + this_cpu_write(spec_ctrl, tmp); + wrmsrl(MSR_IA32_SPEC_CTRL, 0); + } } void xen_arch_resume(void) -- 2.13.6

6 years, 9 months

2
2
0 0

[PATCH 0/29] arm meltdown fix backporting review for lts 4.9

by Alex Shi

Hi All, This backport patchset fixed the meltdown issue, it's original branch: https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=kpti A few dependency or fixingpatches are also picked up, if they are necessary and no functional changes. The patchset also on repository: git://git.linaro.org/kernel/linux-linaro-stable.git lts-4.9-spectrevv2 No bug found yet from kernelci.org and lkft testing. Any comments are appreciated! Regards Alex --- AKASHI Takahiro (1): module: extend 'rodata=off' boot cmdline parameter to module mappings Jayachandran C (2): arm64: cputype: Add MIDR values for Cavium ThunderX2 CPUs arm64: Turn on KPTI only on CPUs that need it Marc Zyngier (2): arm64: Allow checking of a CPU-local erratum arm64: Force KPTI to be disabled on Cavium ThunderX Mark Rutland (1): arm64: factor out entry stack manipulation Suzuki K Poulose (1): arm64: capabilities: Handle duplicate entries for a capability Will Deacon (21): arm64: mm: Use non-global mappings for kernel space arm64: mm: Move ASID from TTBR0 to TTBR1 arm64: mm: Allocate ASIDs in pairs arm64: mm: Add arm64_kernel_unmapped_at_el0 helper arm64: mm: Invalidate both kernel and user ASIDs when performing TLBI arm64: entry: Add exception trampoline page for exceptions from EL0 arm64: mm: Map entry trampoline into trampoline and kernel page tables arm64: entry: Explicitly pass exception level to kernel_ventry macro arm64: entry: Hook up entry trampoline to exception vectors arm64: tls: Avoid unconditional zeroing of tpidrro_el0 for native tasks arm64: entry: Add fake CPU feature for unmapping the kernel at EL0 arm64: kaslr: Put kernel vectors address in separate data page arm64: use RET instruction for exiting the trampoline arm64: Kconfig: Add CONFIG_UNMAP_KERNEL_AT_EL0 arm64: Kconfig: Reword UNMAP_KERNEL_AT_EL0 kconfig entry arm64: Take into account ID_AA64PFR0_EL1.CSV3 arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75 arm64: kpti: Make use of nG dependent on arm64_kernel_unmapped_at_el0() arm64: kpti: Add ->enable callback to remap swapper using nG mappings arm64: entry: Reword comment about post_ttbr_update_workaround arm64: idmap: Use "awx" flags for .idmap.text .pushsection directives Xie XiuQi (1): arm64: entry.S: move SError handling into a C function for future expansion

6 years, 9 months

5
42
0 0

[PATCH 4.4 000/193] 4.4.118-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.118 release. There are 193 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun Feb 25 17:02:20 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.118-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.4.118-rc1 Kamil Konieczny <k.konieczny(a)partner.samsung.com> crypto: s5p-sss - Fix kernel Oops in AES-ECB mode Jan Dakinevich <jan.dakinevich(a)gmail.com> KVM: nVMX: invvpid handling improvements Jan Dakinevich <jan.dakinevich(a)gmail.com> KVM: VMX: clean up declaration of VPID/EPT invalidation types Jim Mattson <jmattson(a)google.com> kvm: nVMX: Fix kernel panics induced by illegal INVEPT/INVVPID types David Hildenbrand <david(a)redhat.com> KVM: nVMX: vmx_complete_nested_posted_interrupt() can't fail David Hildenbrand <david(a)redhat.com> KVM: nVMX: kmap() can't fail Darren Kenny <darren.kenny(a)oracle.com> x86/speculation: Fix typo IBRS_ATT, which should be IBRS_ALL KarimAllah Ahmed <karahmed(a)amazon.de> x86/spectre: Simplify spectre_v2 command line parsing David Woodhouse <dwmw(a)amazon.co.uk> x86/retpoline: Avoid retpolines for built-in __init functions Dan Williams <dan.j.williams(a)intel.com> x86/kvm: Update spectre-v1 mitigation Josh Poimboeuf <jpoimboe(a)redhat.com> x86/paravirt: Remove 'noreplace-paravirt' cmdline option Colin Ian King <colin.king(a)canonical.com> x86/spectre: Fix spelling mistake: "vunerable"-> "vulnerable" Dan Williams <dan.j.williams(a)intel.com> x86/spectre: Report get_user mitigation for spectre_v1 Dan Williams <dan.j.williams(a)intel.com> nl80211: Sanitize array index in parse_txq_params Dan Williams <dan.j.williams(a)intel.com> vfs, fdtable: Prevent bounds-check bypass via speculative execution Dan Williams <dan.j.williams(a)intel.com> x86/syscall: Sanitize syscall table de-references under speculation Dan Williams <dan.j.williams(a)intel.com> x86/get_user: Use pointer masking to limit speculation Dan Williams <dan.j.williams(a)intel.com> x86: Introduce barrier_nospec Dan Williams <dan.j.williams(a)intel.com> x86: Implement array_index_mask_nospec Dan Williams <dan.j.williams(a)intel.com> array_index_nospec: Sanitize speculative array de-references Mark Rutland <mark.rutland(a)arm.com> Documentation: Document array_index_nospec Dou Liyang <douly.fnst(a)cn.fujitsu.com> x86/spectre: Check CONFIG_RETPOLINE in command line parser Thomas Gleixner <tglx(a)linutronix.de> x86/cpu/bugs: Make retpoline module warning conditional Borislav Petkov <bp(a)suse.de> x86/bugs: Drop one "mitigation" from dmesg Borislav Petkov <bp(a)suse.de> x86/nospec: Fix header guards names Andi Kleen <ak(a)linux.intel.com> module/retpoline: Warn about missing retpoline in module Peter Zijlstra <peterz(a)infradead.org> KVM: VMX: Make indirect call speculation safe Peter Zijlstra <peterz(a)infradead.org> KVM: x86: Make indirect calls in emulator speculation safe Waiman Long <longman(a)redhat.com> x86/retpoline: Remove the esp/rsp thunk Wanpeng Li <wanpeng.li(a)hotmail.com> KVM: async_pf: Fix #DF due to inject "Page not Present" and "Page Ready" exceptions simultaneously Arnd Bergmann <arnd(a)arndb.de> kasan: rework Kconfig settings Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> drm/gma500: remove helper function Borislav Petkov <bp(a)suse.de> x86/microcode/AMD: Change load_microcode_amd()'s param to bool to fix preemptibility bug Michal Marek <mmarek(a)suse.com> genksyms: Fix segfault with invalid declarations Andy Lutomirski <luto(a)kernel.org> dell-wmi, dell-laptop: depends DMI Arnd Bergmann <arnd(a)arndb.de> netlink: fix nla_put_{u8,u16,u32} for KASAN Vinod Koul <vinod.koul(a)intel.com> ASoC: Intel: Kconfig: fix build when ACPI is not enabled Arnd Bergmann <arnd(a)arndb.de> ARM: tegra: select USB_ULPI from EHCI rather than platform Arnd Bergmann <arnd(a)arndb.de> ncr5380: shut up gcc indentation warning Arnd Bergmann <arnd(a)arndb.de> usb: phy: msm add regulator dependency Arnd Bergmann <arnd(a)arndb.de> idle: i7300: add PCI dependency Arnd Bergmann <arnd(a)arndb.de> binfmt_elf: compat: avoid unused function warning Arnd Bergmann <arnd(a)arndb.de> isdn: sc: work around type mismatch warning Arnd Bergmann <arnd(a)arndb.de> power: bq27xxx_battery: mark some symbols __maybe_unused Arnd Bergmann <arnd(a)arndb.de> Revert "power: bq27xxx_battery: Remove unneeded dependency in Kconfig" Miklos Szeredi <mszeredi(a)redhat.com> ncpfs: fix unused variable warning Arnd Bergmann <arnd(a)arndb.de> gpio: xgene: mark PM functions as __maybe_unused Arnd Bergmann <arnd(a)arndb.de> net: hp100: remove unnecessary #ifdefs Jun Nie <jun.nie(a)linaro.org> dmaengine: zx: fix build warning Arnd Bergmann <arnd(a)arndb.de> perf/x86: Shut up false-positive -Wmaybe-uninitialized warning Arnd Bergmann <arnd(a)arndb.de> wireless: cw1200: use __maybe_unused to hide pm functions_ Arnd Bergmann <arnd(a)arndb.de> cw1200: fix bogus maybe-uninitialized warning Arnd Bergmann <arnd(a)arndb.de> v4l: remove MEDIA_TUNER dependency for VIDEO_TUNER Arnd Bergmann <arnd(a)arndb.de> hdpvr: hide unused variable Thierry Reding <treding(a)nvidia.com> drm/gma500: Sanity-check pipe index Heikki Krogerus <heikki.krogerus(a)linux.intel.com> serial: 8250_mid: fix broken DMA dependency Arnd Bergmann <arnd(a)arndb.de> ASoC: rockchip: use __maybe_unused to hide st_irq_syscfg_resume Arnd Bergmann <arnd(a)arndb.de> ISDN: eicon: reduce stack size of sig_ind function Arnd Bergmann <arnd(a)arndb.de> em28xx: only use mt9v011 if camera support is enabled Arnd Bergmann <arnd(a)arndb.de> go7007: add MEDIA_CAMERA_SUPPORT dependency Arnd Bergmann <arnd(a)arndb.de> KVM: add X86_LOCAL_APIC dependency Arnd Bergmann <arnd(a)arndb.de> Input: tca8418_keypad - hide gcc-4.9 -Wmaybe-uninitialized warning Arnd Bergmann <arnd(a)arndb.de> drm/nouveau: hide gcc-4.9 -Wmaybe-uninitialized Arnd Bergmann <arnd(a)arndb.de> tc358743: fix register i2c_rd/wr functions Randy Dunlap <rdunlap(a)infradead.org> staging: unisys: visorinput depends on INPUT Luis R. Rodriguez <mcgrof(a)kernel.org> i2c: remove __init from i2c_register_board_info() Arnd Bergmann <arnd(a)arndb.de> b2c2: flexcop: avoid unused function warnings Arnd Bergmann <arnd(a)arndb.de> infiniband: cxgb4: use %pR format string for printing resources Colin Ian King <colin.king(a)canonical.com> iio: adc: axp288: remove redundant duplicate const on axp288_adc_channels Arnd Bergmann <arnd(a)arndb.de> ASoC: mediatek: add i2c dependency Arnd Bergmann <arnd(a)arndb.de> genirq/msi: Add stubs for get_cached_msi_msg/pci_write_msi_msg Arnd Bergmann <arnd(a)arndb.de> tty: cyclades: cyz_interrupt is only used for PCI Paul Bolle <pebolle(a)tiscali.nl> drm/vmwgfx: use *_32_bits() macros Arnd Bergmann <arnd(a)arndb.de> tlan: avoid unused label with PCI=n Colin Ian King <colin.king(a)canonical.com> tc1100-wmi: fix build warning when CONFIG_PM not enabled Arnd Bergmann <arnd(a)arndb.de> ipv4: ipconfig: avoid unused ic_proto_used symbol Arnd Bergmann <arnd(a)arndb.de> netfilter: ipvs: avoid unused variable warnings Borislav Petkov <bp(a)suse.de> x86/platform/olpc: Fix resume handler build warning Glen Lee <glen.lee(a)atmel.com> staging: wilc1000: fix kbuild test robot error Arnd Bergmann <arnd(a)arndb.de> rtlwifi: fix gcc-6 indentation warning Arnd Bergmann <arnd(a)arndb.de> USB: cdc_subset: only build when one driver is enabled Arnd Bergmann <arnd(a)arndb.de> hwrng: exynos - use __maybe_unused to hide pm functions Arnd Bergmann <arnd(a)arndb.de> fbdev: sm712fb: avoid unused function warnings Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> Drivers: hv: vmbus: fix build warning Arnd Bergmann <arnd(a)arndb.de> modsign: hide openssl output in silent builds Arnd Bergmann <arnd(a)arndb.de> fbdev: s6e8ax0: avoid unused function warnings Arnd Bergmann <arnd(a)arndb.de> mtd: cfi: enforce valid geometry configuration Arnd Bergmann <arnd(a)arndb.de> mtd: sh_flctl: pass FIFO as physical address Borislav Petkov <bp(a)suse.de> amd-xgbe: Fix unused suspend handlers build warning Arnd Bergmann <arnd(a)arndb.de> fbdev: auo_k190x: avoid unused function warnings Arnd Bergmann <arnd(a)arndb.de> driver-core: use 'dev' argument in dev_dbg_ratelimited stub Arnd Bergmann <arnd(a)arndb.de> target/user: Fix cast from pointer to phys_addr_t Arnd Bergmann <arnd(a)arndb.de> tty: hvc_xen: hide xen_console_remove when unused Arnd Bergmann <arnd(a)arndb.de> usb: musb/ux500: remove duplicate check for dma_is_compatible Arnd Bergmann <arnd(a)arndb.de> pwc: hide unused label Arnd Bergmann <arnd(a)arndb.de> SCSI: initio: remove duplicate module device table Arnd Bergmann <arnd(a)arndb.de> scsi: mvumi: use __maybe_unused to hide pm functions Daniel Wagner <daniel.wagner(a)bmw-carit.de> video: Use bool instead int pointer for get_opt_bool() argument Arnd Bergmann <arnd(a)arndb.de> fbdev: sis: enforce selection of at least one backend Arnd Bergmann <arnd(a)arndb.de> staging: ste_rmi4: avoid unused function warnings Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> video: fbdev: sis: remove unused variable Arnd Bergmann <arnd(a)arndb.de> scsi: fdomain: drop fdomain_pci_tbl when built-in Arnd Bergmann <arnd(a)arndb.de> mptfusion: hide unused seq_mpt_print_ioc_summary function Julia Lawall <julia.lawall(a)lip6.fr> mtd: maps: add __init attribute Arnd Bergmann <arnd(a)arndb.de> mtd: ichxrom: maybe-uninitialized with gcc-4.9 Arnd Bergmann <arnd(a)arndb.de> md: avoid warning for 32-bit sector_t Arnd Bergmann <arnd(a)arndb.de> profile: hide unused functions when !CONFIG_PROC_FS Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> dpt_i2o: fix build warning Fabian Frederick <fabf(a)skynet.be> drivers/net: fix eisa_driver probe section mismatch Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> scsi: sim710: fix build warning Arnd Bergmann <arnd(a)arndb.de> x86/boot: Avoid warning for zero-filling .bss Arnd Bergmann <arnd(a)arndb.de> thermal: spear: use __maybe_unused for PM functions Arnd Bergmann <arnd(a)arndb.de> ssb: mark ssb_bus_register as __maybe_unused Arnd Bergmann <arnd(a)arndb.de> reiserfs: avoid a -Wmaybe-uninitialized warning Arnd Bergmann <arnd(a)arndb.de> ALSA: hda/ca0132 - fix possible NULL pointer use Kefeng Wang <wangkefeng.wang(a)huawei.com> arm64: Kconfig: select COMPAT_BINFMT_ELF only when BINFMT_ELF is set Arnd Bergmann <arnd(a)arndb.de> scsi: advansys: fix uninitialized data access Arnd Bergmann <arnd(a)arndb.de> x86/platform: Add PCI dependency for PUNIT_ATOM_DEBUG Arnd Bergmann <arnd(a)arndb.de> x86: add MULTIUSER dependency for KVM Arnd Bergmann <arnd(a)arndb.de> thermal: fix INTEL_SOC_DTS_IOSF_CORE dependencies Arnd Bergmann <arnd(a)arndb.de> x86/build: Silence the build with "make -s" Josh Poimboeuf <jpoimboe(a)redhat.com> tools build: Add tools tree support for 'make -s' Arnd Bergmann <arnd(a)arndb.de> x86/fpu/math-emu: Fix possible uninitialized variable use Arnd Bergmann <arnd(a)arndb.de> arm64: define BUG() instruction without CONFIG_BUG Borislav Petkov <bp(a)suse.de> x86/ras/inject: Make it depend on X86_LOCAL_APIC=y Arnd Bergmann <arnd(a)arndb.de> scsi: advansys: fix build warning for PCI=n Arnd Bergmann <arnd(a)arndb.de> video: fbdev: via: remove possibly unused variables Borislav Petkov <bp(a)suse.de> platform/x86: intel_mid_thermal: Fix suspend handlers unused warning Augusto Mecking Caringi <augustocaringi(a)gmail.com> gpio: intel-mid: Fix build warning when !CONFIG_PM Arnd Bergmann <arnd(a)arndb.de> vmxnet3: prevent building with 64K pages Arnd Bergmann <arnd(a)arndb.de> isdn: icn: remove a #warning Arnd Bergmann <arnd(a)arndb.de> virtio_balloon: prevent uninitialized variable use Jia-Ju Bai <baijiaju1990(a)163.com> hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close Jan Beulich <JBeulich(a)suse.com> xen: XEN_ACPI_PROCESSOR is Dom0-only Karol Herbst <kherbst(a)redhat.com> x86/mm/kmmio: Fix mmiotrace for page unaligned addresses Dave Young <dyoung(a)redhat.com> mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Tobias Jordan <Tobias.Jordan(a)elektrobit.com> dmaengine: jz4740: disable/unprepare clk if probe fails Russell King <rmk+kernel(a)armlinux.org.uk> drm/armada: fix leak of crtc structure Steffen Klassert <steffen.klassert(a)secunet.com> xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies. Takuo Koguchi <takuo.koguchi(a)gmail.com> spi: sun4i: disable clocks in the remove function Stefan Potyra <Stefan.Potyra(a)elektrobit.com> ASoC: rockchip: disable clock on error Cai Li <cai.li(a)spreadtrum.com> clk: fix a panic error caused by accessing NULL pointer Gustavo A. R. Silva <garsilva(a)embeddedor.com> dmaengine: at_hdmac: fix potential NULL pointer dereference in atc_prep_dma_interleaved Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> dmaengine: ioat: Fix error handling path Eric Biggers <ebiggers3(a)gmail.com> 509: fix printing uninitialized stack memory when OID is empty Nikolay Borisov <nborisov(a)suse.com> btrfs: Fix possible off-by-one in btrfs_search_path_in_tree Nogah Frankel <nogahf(a)mellanox.com> net_sched: red: Avoid illegal values Nogah Frankel <nogahf(a)mellanox.com> net_sched: red: Avoid devision by zero Zumeng Chen <zumeng.chen(a)gmail.com> gianfar: fix a flooded alignment reports because of padding issue. Stefan Haberland <sth(a)linux.vnet.ibm.com> s390/dasd: prevent prefix I/O error Ravi Bangoria <ravi.bangoria(a)linux.vnet.ibm.com> powerpc/perf: Fix oops when grouping different pmu events Greg Ungerer <gerg(a)linux-m68k.org> m68k: add missing SOFTIRQENTRY_TEXT linker section Gao Feng <gfree.wind(a)vip.163.com> ipvlan: Add the skb->mark as flow4's member to lookup route Will Deacon <will.deacon(a)arm.com> scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none Moni Shoua <monis(a)mellanox.com> RDMA/cma: Make sure that PSN is not over max allowed Andre Przywara <andre.przywara(a)arm.com> pinctrl: sunxi: Fix A80 interrupt pin bank Mauro Carvalho Chehab <mchehab(a)s-opensource.com> media: s5k6aa: describe some function parameters Satheesh Rajendran <sathnaga(a)linux.vnet.ibm.com> perf bench numa: Fixup discontiguous/sparse numa nodes Jiri Olsa <jolsa(a)kernel.org> perf top: Fix window dimensions change handling Peter Ujfalusi <peter.ujfalusi(a)ti.com> ARM: dts: am4372: Correct the interrupts_properties of McASP Tony Lindgren <tony(a)atomide.com> ARM: dts: Fix omap4 hang with GPS connected to USB by using wakeupgen Keerthy <j-keerthy(a)ti.com> ARM: AM33xx: PRM: Remove am33xx_pwrdm_read_prev_pwrst function Tony Lindgren <tony(a)atomide.com> ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context Randy Dunlap <rdunlap(a)infradead.org> usb: build drivers/usb/common/ when USB_SUPPORT is set Shuah Khan <shuahkh(a)osg.samsung.com> usbip: keep usbip_device sockfd state in sync with tcp_socket Alexandru Ardelean <alexandru.ardelean(a)analog.com> staging: iio: adc: ad7192: fix external frequency setting Eric Biggers <ebiggers(a)google.com> binder: check for binder_thread allocation failure in binder_poll() Ben Hutchings <ben(a)decadent.org.uk> staging: android: ashmem: Fix a race condition in pin ioctls Paolo Abeni <pabeni(a)redhat.com> dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock Dave Jones <davej(a)codemonkey.org.uk> Make DST_CACHE a silent config option Arnd Bergmann <arnd(a)arndb.de> arm64: dts: add #cooling-cells to CPU nodes Arnd Bergmann <arnd(a)arndb.de> video: fbdev/mmp: add MODULE_LICENSE Arnd Bergmann <arnd(a)arndb.de> ASoC: ux500: add MODULE_LICENSE tag Willem de Bruijn <willemb(a)google.com> net: avoid skb_warn_bad_offload on IS_ERR Cong Wang <xiyou.wangcong(a)gmail.com> netfilter: xt_RATEEST: acquire xt_rateest_mutex for hash insert Paolo Abeni <pabeni(a)redhat.com> netfilter: on sockopt() acquire sock lock only in the required scope Dmitry Vyukov <dvyukov(a)google.com> netfilter: ipt_CLUSTERIP: fix out-of-bounds accesses in clusterip_tg_check() Eric Dumazet <edumazet(a)google.com> netfilter: x_tables: avoid out-of-bounds reads in xt_request_find_{match|target} Dmitry Vyukov <dvyukov(a)google.com> netfilter: x_tables: fix int overflow in xt_alloc_table_info() Wanpeng Li <wanpeng.li(a)hotmail.com> KVM: x86: fix escape of guest dr6 to the host Laura Abbott <labbott(a)redhat.com> staging: android: ion: Add __GFP_NOWARN for system contig heap Eric Biggers <ebiggers(a)google.com> crypto: x86/twofish-3way - Fix %rbp usage Paul Moore <paul(a)paul-moore.com> selinux: skip bounded transition processing if the policy isn't loaded Paul Moore <paul(a)paul-moore.com> selinux: ensure the context is NUL terminated in security_context_to_sid_core() David Howells <dhowells(a)redhat.com> Provide a function to create a NUL-terminated string from unterminated data Chris Wilson <chris(a)chris-wilson.co.uk> drm: Require __GFP_NOFAIL for the legacy drm_modeset_lock_all Jens Axboe <axboe(a)kernel.dk> blktrace: fix unlocked registration of tracepoints Cong Wang <xiyou.wangcong(a)gmail.com> xfrm: check id proto in validate_tmpl() Steffen Klassert <steffen.klassert(a)secunet.com> xfrm: Fix stack-out-of-bounds read on socket policy lookup. Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed. Johannes Berg <johannes.berg(a)intel.com> cfg80211: check dev_set_name() return value Paolo Abeni <pabeni(a)redhat.com> net: replace dst_cache ip6_tunnel implementation with the generic one Paolo Abeni <pabeni(a)redhat.com> net: add dst_cache support ------------- Diffstat: Documentation/kernel-parameters.txt | 2 - Documentation/speculation.txt | 90 ++ Makefile | 10 +- arch/arm/boot/dts/am4372.dtsi | 6 +- arch/arm/boot/dts/omap4.dtsi | 2 - arch/arm/mach-omap2/omap-secure.c | 19 + arch/arm/mach-omap2/omap-secure.h | 4 + arch/arm/mach-omap2/pm.h | 4 - arch/arm/mach-omap2/pm34xx.c | 13 +- arch/arm/mach-omap2/prm33xx.c | 12 - arch/arm/mach-omap2/sleep34xx.S | 26 +- arch/arm/mach-tegra/Kconfig | 2 - arch/arm64/Kconfig | 2 +- arch/arm64/Kconfig.platforms | 2 - arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 + arch/arm64/include/asm/bug.h | 33 +- arch/m68k/kernel/vmlinux-nommu.lds | 2 + arch/m68k/kernel/vmlinux-std.lds | 2 + arch/m68k/kernel/vmlinux-sun3.lds | 2 + arch/powerpc/perf/core-book3s.c | 4 +- arch/x86/Kconfig | 2 +- arch/x86/Kconfig.debug | 1 + arch/x86/boot/Makefile | 5 +- arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 112 +- arch/x86/entry/common.c | 2 + arch/x86/include/asm/asm-prototypes.h | 1 - arch/x86/include/asm/barrier.h | 28 + arch/x86/include/asm/microcode_amd.h | 1 - arch/x86/include/asm/msr.h | 3 +- arch/x86/include/asm/nospec-branch.h | 8 +- arch/x86/include/asm/vmx.h | 5 +- arch/x86/kernel/alternative.c | 14 - arch/x86/kernel/cpu/bugs.c | 122 +- arch/x86/kernel/cpu/mcheck/mce-inject.c | 5 +- arch/x86/kernel/cpu/microcode/amd.c | 17 +- arch/x86/kernel/cpu/perf_event.c | 4 +- arch/x86/kernel/head_32.S | 9 +- arch/x86/kvm/Kconfig | 3 +- arch/x86/kvm/emulate.c | 9 +- arch/x86/kvm/vmx.c | 83 +- arch/x86/kvm/x86.c | 40 +- arch/x86/lib/getuser.S | 10 + arch/x86/lib/retpoline.S | 1 - arch/x86/math-emu/Makefile | 4 +- arch/x86/math-emu/reg_compare.c | 16 +- arch/x86/mm/ioremap.c | 4 +- arch/x86/mm/kmmio.c | 12 +- arch/x86/platform/olpc/olpc-xo15-sci.c | 2 + certs/Makefile | 33 +- drivers/Makefile | 1 + drivers/android/binder.c | 2 + drivers/char/hw_random/exynos-rng.c | 10 +- drivers/crypto/s5p-sss.c | 13 +- drivers/dma/at_hdmac.c | 4 +- drivers/dma/dma-jz4740.c | 4 +- drivers/dma/ioat/init.c | 2 +- drivers/dma/zx296702_dma.c | 2 +- drivers/gpio/gpio-intel-mid.c | 2 +- drivers/gpio/gpio-xgene.c | 13 +- drivers/gpu/drm/armada/armada_crtc.c | 25 +- drivers/gpu/drm/drm_modeset_lock.c | 2 +- drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 10 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 7 +- drivers/hv/hv.c | 5 +- drivers/i2c/i2c-boardinfo.c | 4 +- drivers/idle/Kconfig | 1 + drivers/iio/adc/axp288_adc.c | 2 +- drivers/infiniband/core/cma.c | 1 + drivers/infiniband/hw/cxgb4/device.c | 5 +- drivers/input/keyboard/tca8418_keypad.c | 21 +- drivers/isdn/hardware/eicon/message.c | 16 +- drivers/isdn/icn/icn.c | 2 +- drivers/isdn/sc/init.c | 7 +- drivers/md/md.c | 10 +- drivers/media/common/b2c2/flexcop-fe-tuner.c | 4 +- drivers/media/i2c/s5k6aa.c | 5 + drivers/media/i2c/tc358743.c | 46 +- drivers/media/usb/em28xx/Kconfig | 2 +- drivers/media/usb/go7007/Kconfig | 2 +- drivers/media/usb/hdpvr/hdpvr-core.c | 2 + drivers/media/usb/pwc/pwc-if.c | 2 + drivers/media/v4l2-core/Kconfig | 1 - drivers/message/fusion/mptbase.c | 2 + drivers/mtd/chips/Kconfig | 4 + drivers/mtd/maps/ck804xrom.c | 4 +- drivers/mtd/maps/esb2rom.c | 4 +- drivers/mtd/maps/ichxrom.c | 10 +- drivers/mtd/nand/sh_flctl.c | 5 +- drivers/net/Kconfig | 3 + drivers/net/ethernet/3com/3c509.c | 2 +- drivers/net/ethernet/3com/3c59x.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 4 +- drivers/net/ethernet/dec/tulip/de4x5.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 6 +- drivers/net/ethernet/hp/hp100.c | 20 +- drivers/net/ethernet/ti/tlan.c | 2 +- drivers/net/hippi/rrunner.c | 2 +- drivers/net/ipvlan/ipvlan_core.c | 1 + drivers/net/usb/Kconfig | 10 + drivers/net/usb/Makefile | 2 +- drivers/net/wireless/cw1200/cw1200_spi.c | 9 +- drivers/net/wireless/cw1200/pm.h | 9 +- drivers/net/wireless/cw1200/wsm.c | 8 +- .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +- drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 6 +- drivers/platform/x86/Kconfig | 2 + drivers/platform/x86/intel_mid_thermal.c | 2 + drivers/platform/x86/tc1100-wmi.c | 2 + drivers/power/Kconfig | 1 + drivers/power/bq27xxx_battery.c | 6 +- drivers/s390/block/dasd_eckd.c | 16 +- drivers/scsi/advansys.c | 24 +- drivers/scsi/dpt_i2o.c | 3 + drivers/scsi/fdomain.c | 2 +- drivers/scsi/g_NCR5380.c | 5 +- drivers/scsi/initio.c | 16 - drivers/scsi/mvumi.c | 4 +- drivers/scsi/sim710.c | 3 +- drivers/spi/spi-sun4i.c | 2 +- drivers/ssb/main.c | 7 +- drivers/staging/android/ashmem.c | 19 +- drivers/staging/android/ion/ion_system_heap.c | 2 +- drivers/staging/iio/adc/ad7192.c | 27 +- drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 7 +- drivers/staging/unisys/visorinput/Kconfig | 2 +- drivers/staging/wilc1000/wilc_wlan_if.h | 1 + drivers/target/target_core_user.c | 2 +- drivers/thermal/Kconfig | 4 +- drivers/thermal/spear_thermal.c | 6 +- drivers/tty/Kconfig | 2 +- drivers/tty/hvc/hvc_xen.c | 2 +- drivers/tty/serial/8250/Kconfig | 2 +- drivers/usb/host/Kconfig | 2 + drivers/usb/musb/ux500_dma.c | 3 - drivers/usb/phy/Kconfig | 1 + drivers/usb/usbip/stub_dev.c | 3 + drivers/usb/usbip/vhci_hcd.c | 2 + drivers/video/fbdev/Kconfig | 1 + drivers/video/fbdev/auo_k190x.c | 11 +- drivers/video/fbdev/exynos/s6e8ax0.c | 13 +- drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- drivers/video/fbdev/mmp/core.c | 5 + drivers/video/fbdev/sis/init301.c | 10 +- drivers/video/fbdev/sm712fb.c | 16 +- drivers/video/fbdev/via/viafbdev.c | 8 +- drivers/virtio/virtio_balloon.c | 2 + drivers/xen/Kconfig | 2 +- fs/btrfs/ioctl.c | 2 +- fs/compat_binfmt_elf.c | 2 + fs/ncpfs/dir.c | 3 +- fs/reiserfs/lbalance.c | 2 +- fs/reiserfs/reiserfs.h | 1 - include/linux/device.h | 7 +- include/linux/fdtable.h | 5 +- include/linux/init.h | 9 +- include/linux/module.h | 9 + include/linux/msi.h | 11 +- include/linux/mtd/sh_flctl.h | 1 + include/linux/nospec.h | 72 + include/linux/string.h | 1 + include/net/dst_cache.h | 97 ++ include/net/ip6_tunnel.h | 15 +- include/net/netlink.h | 73 +- include/net/red.h | 13 +- include/trace/events/clk.h | 4 +- kernel/module.c | 11 + kernel/profile.c | 4 +- kernel/trace/blktrace.c | 32 +- lib/Kconfig.debug | 2 +- lib/oid_registry.c | 8 +- mm/early_ioremap.c | 2 +- mm/util.c | 24 + mm/vmscan.c | 3 + net/Kconfig | 4 + net/core/Makefile | 1 + net/core/dev.c | 2 +- net/core/dst_cache.c | 168 ++ net/decnet/af_decnet.c | 62 +- net/ipv4/ip_sockglue.c | 14 +- net/ipv4/ipconfig.c | 4 + net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +- net/ipv6/Kconfig | 1 + net/ipv6/ip6_gre.c | 12 +- net/ipv6/ip6_tunnel.c | 149 +- net/ipv6/ip6_vti.c | 2 +- net/ipv6/ipv6_sockglue.c | 17 +- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 +- net/netfilter/ipvs/ip_vs_app.c | 8 +- net/netfilter/ipvs/ip_vs_ctl.c | 15 +- net/netfilter/x_tables.c | 10 +- net/netfilter/xt_RATEEST.c | 22 +- net/sched/sch_choke.c | 3 + net/sched/sch_gred.c | 3 + net/sched/sch_red.c | 2 + net/sched/sch_sfq.c | 3 + net/wireless/core.c | 8 +- net/wireless/nl80211.c | 9 +- net/xfrm/xfrm_policy.c | 8 +- net/xfrm/xfrm_user.c | 24 + scripts/genksyms/parse.tab.c_shipped | 1682 +++++++++----------- scripts/genksyms/parse.tab.h_shipped | 133 +- scripts/genksyms/parse.y | 2 - scripts/kernel-doc | 2 +- scripts/mod/modpost.c | 9 + security/selinux/ss/services.c | 21 +- sound/pci/hda/patch_ca0132.c | 3 + sound/soc/intel/Kconfig | 7 +- sound/soc/mediatek/Kconfig | 4 +- sound/soc/rockchip/rockchip_spdif.c | 22 +- sound/soc/ux500/mop500.c | 4 + sound/soc/ux500/ux500_pcm.c | 5 + tools/build/Makefile.build | 10 + tools/perf/bench/numa.c | 56 +- tools/perf/builtin-top.c | 15 +- tools/scripts/Makefile.include | 12 +- 218 files changed, 2535 insertions(+), 1875 deletions(-)

6 years, 9 months

14
206
0 0

[PATCH] Fix NULL pointer exception in find_bio_stripe()

by Dmitriy Gorokh

On detaching of a disk which is a part of a RAID6 filesystem, the following kernel OOPS may happen: [63122.680461] BTRFS error (device sdo): bdev /dev/sdo errs: wr 0, rd 0, flush 1, corrupt 0, gen 0 [63122.719584] BTRFS warning (device sdo): lost page write due to IO error on /dev/sdo [63122.719587] BTRFS error (device sdo): bdev /dev/sdo errs: wr 1, rd 0, flush 1, corrupt 0, gen 0 [63122.803516] BTRFS warning (device sdo): lost page write due to IO error on /dev/sdo [63122.803519] BTRFS error (device sdo): bdev /dev/sdo errs: wr 2, rd 0, flush 1, corrupt 0, gen 0 [63122.863902] BTRFS critical (device sdo): fatal error on device /dev/sdo [63122.935338] BUG: unable to handle kernel NULL pointer dereference at 0000000000000080 [63122.946554] IP: fail_bio_stripe+0x58/0xa0 [btrfs] [63122.958185] PGD 9ecda067 P4D 9ecda067 PUD b2b37067 PMD 0 [63122.971202] Oops: 0000 [#1] SMP [63122.990786] Modules linked in: libcrc32c dlm configfs cpufreq_userspace cpufreq_powersave cpufreq_conservative softdog nfsd auth_rpcgss nfs_acl nfs lockd grace fscache sunrpc bonding ipmi_devintf ipmi_msghandler joydev snd_intel8x0 snd_ac97_codec snd_pcm snd_timer snd psmouse evdev parport_pc soundcore serio_raw battery pcspkr video ac97_bus ac parport ohci_pci ohci_hcd i2c_piix4 button crc32c_generic crc32c_intel btrfs xor zstd_decompress zstd_compress xxhash raid6_pq dm_mod dax raid1 md_mod hid_generic usbhid hid xhci_pci xhci_hcd ehci_pci ehci_hcd usbcore sg sd_mod sr_mod cdrom ata_generic ahci libahci ata_piix libata e1000 scsi_mod [last unloaded: scst] [63123.006760] CPU: 0 PID: 3979 Comm: kworker/u8:9 Tainted: G W 4.14.2-16-scst34x+ #8 [63123.007091] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 [63123.007402] Workqueue: btrfs-worker btrfs_worker_helper [btrfs] [63123.007595] task: ffff880036ea4040 task.stack: ffffc90006384000 [63123.007796] RIP: 0010:fail_bio_stripe+0x58/0xa0 [btrfs] [63123.007968] RSP: 0018:ffffc90006387ad8 EFLAGS: 00010287 [63123.008140] RAX: 0000000000000002 RBX: ffff88004beaa0b8 RCX: ffff8800b2bd5690 [63123.008359] RDX: 0000000000000000 RSI: ffff88007bb43500 RDI: ffff88004beaa000 [63123.008621] RBP: ffffc90006387ae8 R08: 0000000099100000 R09: ffff8800b2bd5600 [63123.008840] R10: 0000000000000004 R11: 0000000000010000 R12: ffff88007bb43500 [63123.009059] R13: 00000000fffffffb R14: ffff880036fc5180 R15: 0000000000000004 [63123.009278] FS: 0000000000000000(0000) GS:ffff8800b7000000(0000) knlGS:0000000000000000 [63123.009564] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [63123.009748] CR2: 0000000000000080 CR3: 00000000b0866000 CR4: 00000000000406f0 [63123.009969] Call Trace: [63123.010085] raid_write_end_io+0x7e/0x80 [btrfs] [63123.010251] bio_endio+0xa1/0x120 [63123.010378] generic_make_request+0x218/0x270 [63123.010921] submit_bio+0x66/0x130 [63123.011073] finish_rmw+0x3fc/0x5b0 [btrfs] [63123.011245] full_stripe_write+0x96/0xc0 [btrfs] [63123.011428] raid56_parity_write+0x117/0x170 [btrfs] [63123.011604] btrfs_map_bio+0x2ec/0x320 [btrfs] [63123.011759] ? ___cache_free+0x1c5/0x300 [63123.011909] __btrfs_submit_bio_done+0x26/0x50 [btrfs] [63123.012087] run_one_async_done+0x9c/0xc0 [btrfs] [63123.012257] normal_work_helper+0x19e/0x300 [btrfs] [63123.012429] btrfs_worker_helper+0x12/0x20 [btrfs] [63123.012656] process_one_work+0x14d/0x350 [63123.012888] worker_thread+0x4d/0x3a0 [63123.013026] ? _raw_spin_unlock_irqrestore+0x15/0x20 [63123.013192] kthread+0x109/0x140 [63123.013315] ? process_scheduled_works+0x40/0x40 [63123.013472] ? kthread_stop+0x110/0x110 [63123.013610] ret_from_fork+0x25/0x30 [63123.013741] Code: 7e 43 31 c0 48 63 d0 48 8d 14 52 49 8d 4c d1 60 48 8b 51 08 49 39 d0 72 1f 4c 63 1b 4c 01 da 49 39 d0 73 14 48 8b 11 48 8b 52 68 <48> 8b 8a 80 00 00 00 48 39 4e 08 74 14 83 c0 01 44 39 d0 75 c4 [63123.014469] RIP: fail_bio_stripe+0x58/0xa0 [btrfs] RSP: ffffc90006387ad8 [63123.014678] CR2: 0000000000000080 [63123.016590] ---[ end trace a295ea7259c17880 ]— This is reproducible in a cycle, where a series of writes is followed by SCSI device delete command. The test may take up to few minutes. Fixes: commit 74d46992e0d9dee7f1f376de0d56d31614c8a17a ("block: replace bi_bdev with a gendisk pointer and partitions index") --- fs/btrfs/raid56.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index dec0907dfb8a..fcfc20de2df3 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -1370,6 +1370,7 @@ static int find_bio_stripe(struct btrfs_raid_bio *rbio, stripe_start = stripe->physical; if (physical >= stripe_start && physical < stripe_start + rbio->stripe_len && + stripe->dev->bdev && bio->bi_disk == stripe->dev->bdev->bd_disk && bio->bi_partno == stripe->dev->bdev->bd_partno) { return i; -- 2.14.2

6 years, 9 months

3
3
0 0

FAILED: patch "[PATCH] drm/nouveau: Fix deadlock on runtime suspend" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-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 d61a5c1063515e855bedb1b81e20e50b0ac3541e Mon Sep 17 00:00:00 2001 From: Lukas Wunner <lukas(a)wunner.de> Date: Sun, 11 Feb 2018 10:38:28 +0100 Subject: [PATCH] drm/nouveau: Fix deadlock on runtime suspend nouveau's ->runtime_suspend hook calls drm_kms_helper_poll_disable(), which waits for the output poll worker to finish if it's running. The output poll worker meanwhile calls pm_runtime_get_sync() in nouveau_connector_detect() which waits for the ongoing suspend to finish, causing a deadlock. Fix by not acquiring a runtime PM ref if nouveau_connector_detect() is called in the output poll worker's context. This is safe because the poll worker is only enabled while runtime active and we know that ->runtime_suspend waits for it to finish. Other contexts calling nouveau_connector_detect() do require a runtime PM ref, these comprise: status_store() drm sysfs interface ->fill_modes drm callback drm_fb_helper_probe_connector_modes() drm_mode_getconnector() nouveau_connector_hotplug() nouveau_display_hpd_work() nv17_tv_set_property() Stack trace for posterity: INFO: task kworker/0:1:58 blocked for more than 120 seconds. Workqueue: events output_poll_execute [drm_kms_helper] Call Trace: schedule+0x28/0x80 rpm_resume+0x107/0x6e0 __pm_runtime_resume+0x47/0x70 nouveau_connector_detect+0x7e/0x4a0 [nouveau] nouveau_connector_detect_lvds+0x132/0x180 [nouveau] drm_helper_probe_detect_ctx+0x85/0xd0 [drm_kms_helper] output_poll_execute+0x11e/0x1c0 [drm_kms_helper] process_one_work+0x184/0x380 worker_thread+0x2e/0x390 INFO: task kworker/0:2:252 blocked for more than 120 seconds. Workqueue: pm pm_runtime_work Call Trace: schedule+0x28/0x80 schedule_timeout+0x1e3/0x370 wait_for_completion+0x123/0x190 flush_work+0x142/0x1c0 nouveau_pmops_runtime_suspend+0x7e/0xd0 [nouveau] pci_pm_runtime_suspend+0x5c/0x180 vga_switcheroo_runtime_suspend+0x1e/0xa0 __rpm_callback+0xc1/0x200 rpm_callback+0x1f/0x70 rpm_suspend+0x13c/0x640 pm_runtime_work+0x6e/0x90 process_one_work+0x184/0x380 worker_thread+0x2e/0x390 Bugzilla: https://bugs.archlinux.org/task/53497 Bugzilla: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870523 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70388#c33 Fixes: 5addcf0a5f0f ("nouveau: add runtime PM support (v0.9)") Cc: stable(a)vger.kernel.org # v3.12+: 27d4ee03078a: workqueue: Allow retrieval of current task's work struct Cc: stable(a)vger.kernel.org # v3.12+: 25c058ccaf2e: drm: Allow determining if current task is output poll worker Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Dave Airlie <airlied(a)redhat.com> Reviewed-by: Lyude Paul <lyude(a)redhat.com> Signed-off-by: Lukas Wunner <lukas(a)wunner.de> Link: https://patchwork.freedesktop.org/patch/msgid/b7d2cbb609a80f59ccabfdf479b9d… diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 69d6e61a01ec..6ed9cb053dfa 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -570,9 +570,15 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) nv_connector->edid = NULL; } - ret = pm_runtime_get_sync(connector->dev->dev); - if (ret < 0 && ret != -EACCES) - return conn_status; + /* Outputs are only polled while runtime active, so acquiring a + * runtime PM ref here is unnecessary (and would deadlock upon + * runtime suspend because it waits for polling to finish). + */ + if (!drm_kms_helper_is_poll_worker()) { + ret = pm_runtime_get_sync(connector->dev->dev); + if (ret < 0 && ret != -EACCES) + return conn_status; + } nv_encoder = nouveau_connector_ddc_detect(connector); if (nv_encoder && (i2c = nv_encoder->i2c) != NULL) { @@ -647,8 +653,10 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) out: - pm_runtime_mark_last_busy(connector->dev->dev); - pm_runtime_put_autosuspend(connector->dev->dev); + if (!drm_kms_helper_is_poll_worker()) { + pm_runtime_mark_last_busy(connector->dev->dev); + pm_runtime_put_autosuspend(connector->dev->dev); + } return conn_status; }

6 years, 9 months

3
2
0 0

please do *NOT* backport 9965db26ac05 ("drm/i915: Check for fused or unused pipes")

by Jani Nikula

Stable team, commit 9965db26ac05 ("drm/i915: Check for fused or unused pipes") with Cc: stable is broken, please do not backport. Thanks, Jani. -- Jani Nikula, Intel Open Source Technology Center

6 years, 9 months

2
3
0 0

[PATCH v1 06/19] arm: dts: mt7623: fix USB initialization fails on bananapi-r2

by sean.wang＠mediatek.com

From: Sean Wang <sean.wang(a)mediatek.com> Fix that USB initialization fails as below runtime log is present during booting on bananapi-r2 board by adding missing regulators the USB device requires. Current regulators USB device uses are being updated with the correct ones to reflect real configurations which are all from fixed regulators rather than MT6323 one's output. [ 6.473958] xhci-mtk 1a1c0000.usb: fail to get vbus [ 6.479313] xhci-mtk 1a240000.usb: fail to get vbus Cc: stable(a)vger.kernel.org Fixes: f4ff257cd160 ("arm: dts: mt7623: add support for Bananapi R2 (BPI-R2) board") Signed-off-by: Sean Wang <sean.wang(a)mediatek.com> --- arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts index ec11e14..f660d15 100644 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -39,6 +39,24 @@ }; }; + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_5v: regulator-5v { + compatible = "regulator-fixed"; + regulator-name = "fixed-5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + }; + gpio_keys { compatible = "gpio-keys"; pinctrl-names = "default"; @@ -502,12 +520,14 @@ }; &usb1 { - vusb33-supply = <&mt6323_vusb_reg>; + vusb33-supply = <&reg_3p3v>; + vbus-supply = <&reg_5v>; status = "okay"; }; &usb2 { - vusb33-supply = <&mt6323_vusb_reg>; + vusb33-supply = <&reg_3p3v>; + vbus-supply = <&reg_5v>; status = "okay"; }; -- 2.7.4

6 years, 9 months

2
1
0 0

[Linux-stable-mirror] [PATCH] soc: mediatek: fix the mistaken pointer accessed when subdomains are added

by sean.wang＠mediatek.com

From: Sean Wang <sean.wang(a)mediatek.com> Fix the pointer to struct scp_subdomian not being moved forward when each sub-domain is expected to be iteratively added through pm_genpd_add_subdomain call. Cc: stable(a)vger.kernel.org Fixes: 53fddb1a66dd ("soc: mediatek: reduce code duplication of scpsys_probe across all SoCs") Reported-by: Weiyi Lu <weiyi.lu(a)mediatek.com> Signed-off-by: Sean Wang <sean.wang(a)mediatek.com> --- drivers/soc/mediatek/mtk-scpsys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c index fc55faa..9de801e 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -1048,7 +1048,7 @@ static int scpsys_probe(struct platform_device *pdev) pd_data = &scp->pd_data; - for (i = 0, sd = soc->subdomains ; i < soc->num_subdomains ; i++) { + for (i = 0, sd = soc->subdomains; i < soc->num_subdomains; i++, sd++) { ret = pm_genpd_add_subdomain(pd_data->domains[sd->origin], pd_data->domains[sd->subdomain]); if (ret && IS_ENABLED(CONFIG_PM)) -- 2.7.4

6 years, 9 months

3
2
0 0

[Linux-stable-mirror] [PATCH] Bluetooth: btusb: Restore QCA Rome suspend/resume fix with a "rewritten" version

by Hans de Goede

Commit 7d06d5895c15 ("Revert "Bluetooth: btusb: fix QCA...suspend/resume"") removed the setting of the BTUSB_RESET_RESUME quirk for QCA Rome devices, instead favoring adding USB_QUIRK_RESET_RESUME quirks in usb/core/quirks.c. This was done because the DIY BTUSB_RESET_RESUME reset-resume handling has several issues (see the original commit message). An added advantage of moving over to the USB-core reset-resume handling is that it also disables autosuspend for these devices, which is similarly broken on these. But there are 2 issues with this approach: 1) It leaves the broken DIY BTUSB_RESET_RESUME code in place for Realtek devices. 2) Sofar only 2 of the 10 QCA devices known to the btusb code have been added to usb/core/quirks.c and if we fix the Realtek case the same way we need to add an additional 14 entries. So in essence we need to duplicate a large part of the usb_device_id table in btusb.c in usb/core/quirks.c and manually keep them in sync. This commit instead restores setting a reset-resume quirk for QCA devices in the btusb.c code, avoiding the duplicate usb_device_id table problem. This commit avoids the problems with the original DIY BTUSB_RESET_RESUME code by simply setting the USB_QUIRK_RESET_RESUME quirk directly on the usb_device. This commit also moves the BTUSB_REALTEK case over to directly setting the USB_QUIRK_RESET_RESUME on the usb_device and removes the now unused BTUSB_RESET_RESUME code. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1514836 Fixes: 7d06d5895c15 ("Revert "Bluetooth: btusb: fix QCA...suspend/resume"") Cc: stable(a)vger.kernel.org Cc: Leif Liddy <leif.linux(a)gmail.com> Cc: Matthias Kaehlcke <mka(a)chromium.org> Cc: Brian Norris <briannorris(a)chromium.org> Cc: Daniel Drake <drake(a)endlessm.com> Cc: Kai-Heng Feng <kai.heng.feng(a)canonical.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- Note: 1) Once this has been merged, the 2 commits adding QCA device entries to drivers/usb/core/quirks.c should be reverted or dropped from bluetooth-next. 2) I don't have any of the affected devices, please test --- drivers/bluetooth/btusb.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 4764100a5888..c4689f03220f 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -23,6 +23,7 @@ #include <linux/module.h> #include <linux/usb.h> +#include <linux/usb/quirks.h> #include <linux/firmware.h> #include <linux/of_device.h> #include <linux/of_irq.h> @@ -388,9 +389,8 @@ static const struct usb_device_id blacklist_table[] = { #define BTUSB_FIRMWARE_LOADED 7 #define BTUSB_FIRMWARE_FAILED 8 #define BTUSB_BOOTING 9 -#define BTUSB_RESET_RESUME 10 -#define BTUSB_DIAG_RUNNING 11 -#define BTUSB_OOB_WAKE_ENABLED 12 +#define BTUSB_DIAG_RUNNING 10 +#define BTUSB_OOB_WAKE_ENABLED 11 struct btusb_data { struct hci_dev *hdev; @@ -3118,6 +3118,12 @@ static int btusb_probe(struct usb_interface *intf, if (id->driver_info & BTUSB_QCA_ROME) { data->setup_on_usb = btusb_setup_qca; hdev->set_bdaddr = btusb_set_bdaddr_ath3012; + + /* QCA Rome devices lose their updated firmware over suspend, + * but the USB hub doesn't notice any status change. + * explicitly request a device reset on resume. + */ + interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME; } #ifdef CONFIG_BT_HCIBTUSB_RTL @@ -3128,7 +3134,7 @@ static int btusb_probe(struct usb_interface *intf, * but the USB hub doesn't notice any status change. * Explicitly request a device reset on resume. */ - set_bit(BTUSB_RESET_RESUME, &data->flags); + interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME; } #endif @@ -3297,14 +3303,6 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) enable_irq(data->oob_wake_irq); } - /* Optionally request a device reset on resume, but only when - * wakeups are disabled. If wakeups are enabled we assume the - * device will stay powered up throughout suspend. - */ - if (test_bit(BTUSB_RESET_RESUME, &data->flags) && - !device_may_wakeup(&data->udev->dev)) - data->udev->reset_resume = 1; - return 0; } -- 2.14.3

6 years, 9 months

6
24
0 0

[Linux-stable-mirror] [PATCH] loop: Fix lost writes caused by missing flag

by Ross Zwisler

The following commit: commit aa4d86163e4e ("block: loop: switch to VFS ITER_BVEC") replaced __do_lo_send_write(), which used ITER_KVEC iterators, with lo_write_bvec() which uses ITER_BVEC iterators. In this change, though, the WRITE flag was lost: - iov_iter_kvec(&from, ITER_KVEC | WRITE, &kvec, 1, len); + iov_iter_bvec(&i, ITER_BVEC, bvec, 1, bvec->bv_len); This flag is necessary for the DAX case because we make decisions based on whether or not the iterator is a READ or a WRITE in dax_iomap_actor() and in dax_iomap_rw(). We end up going through this path in configurations where we combine a PMEM device with 4k sectors, a loopback device and DAX. The consequence of this missed flag is that what we intend as a write actually turns into a read in the DAX code, so no data is ever written. The very simplest test case is to create a loopback device and try and write a small string to it, then hexdump a few bytes of the device to see if the write took. Without this patch you read back all zeros, with this you read back the string you wrote. For XFS this causes us to fail or panic during the following xfstests: xfs/074 xfs/078 xfs/216 xfs/217 xfs/250 For ext4 we have a similar issue where writes never happen, but we don't currently have any xfstests that use loopback and show this issue. Fix this by restoring the WRITE flag argument to iov_iter_bvec(). This causes the xfstests to all pass. Signed-off-by: Ross Zwisler <ross.zwisler(a)linux.intel.com> Fixes: commit aa4d86163e4e ("block: loop: switch to VFS ITER_BVEC") Cc: Christoph Hellwig <hch(a)lst.de> Cc: Al Viro <viro(a)zeniv.linux.org.uk> Cc: stable(a)vger.kernel.org --- drivers/block/loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index d5fe720cf149..89d2ee00cced 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -266,7 +266,7 @@ static int lo_write_bvec(struct file *file, struct bio_vec *bvec, loff_t *ppos) struct iov_iter i; ssize_t bw; - iov_iter_bvec(&i, ITER_BVEC, bvec, 1, bvec->bv_len); + iov_iter_bvec(&i, ITER_BVEC | WRITE, bvec, 1, bvec->bv_len); file_start_write(file); bw = vfs_iter_write(file, &i, ppos, 0); -- 2.14.3

6 years, 9 months

5
9
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror February 2018