December 2020 - Linux-stable-mirror

[PATCH] drm/i915/gt: Define guc firmware blob for older Cometlakes

by Chris Wilson

When splitting the Coffeelake define to also identify Cometlakes, I missed the double fw_def for Coffeelake. That is only newer Cometlakes use the cml specific guc firmware, older Cometlakes should use kbl firmware. Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2859 Fixes: 5f4ae2704d59 ("drm/i915: Identify Cometlake platform") Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: <stable(a)vger.kernel.org> # v5.9+ --- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c index 180c23e2e25e..602f1a0bc587 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -53,6 +53,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, fw_def(ELKHARTLAKE, 0, guc_def(ehl, 49, 0, 1), huc_def(ehl, 9, 0, 0)) \ fw_def(ICELAKE, 0, guc_def(icl, 49, 0, 1), huc_def(icl, 9, 0, 0)) \ fw_def(COMETLAKE, 5, guc_def(cml, 49, 0, 1), huc_def(cml, 4, 0, 0)) \ + fw_def(COMETLAKE, 0, guc_def(kbl, 49, 0, 1), huc_def(kbl, 4, 0, 0)) \ fw_def(COFFEELAKE, 0, guc_def(kbl, 49, 0, 1), huc_def(kbl, 4, 0, 0)) \ fw_def(GEMINILAKE, 0, guc_def(glk, 49, 0, 1), huc_def(glk, 4, 0, 0)) \ fw_def(KABYLAKE, 0, guc_def(kbl, 49, 0, 1), huc_def(kbl, 4, 0, 0)) \ -- 2.20.1

3 years, 10 months

2
1
0 0

Linux 4.14.213

by Greg Kroah-Hartman

I'm announcing the release of the 4.14.213 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: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/admin-guide/kernel-parameters.txt | 1 Makefile | 2 arch/arc/kernel/stacktrace.c | 23 ++- arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 5 arch/arm/boot/dts/at91-sama5d3_xplained.dts | 7 + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 7 + arch/arm/boot/dts/at91sam9rl.dtsi | 19 +- arch/arm/boot/dts/exynos5410-odroidxu.dts | 6 arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 ++++ arch/arm/boot/dts/exynos5410.dtsi | 4 arch/arm/boot/dts/sama5d2.dtsi | 7 - arch/arm/boot/dts/sun8i-v3s.dtsi | 2 arch/arm/kernel/head.S | 6 arch/arm/mach-shmobile/pm-rmobile.c | 1 arch/arm64/boot/dts/exynos/exynos7.dtsi | 4 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 16 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 arch/arm64/include/asm/kvm_host.h | 1 arch/arm64/kvm/sys_regs.c | 1 arch/mips/bcm47xx/Kconfig | 1 arch/powerpc/include/asm/cputable.h | 5 arch/powerpc/kernel/rtas.c | 2 arch/powerpc/perf/core-book3s.c | 10 + arch/powerpc/platforms/powernv/memtrace.c | 22 +++ arch/powerpc/platforms/pseries/suspend.c | 4 arch/powerpc/xmon/nonstdio.c | 2 arch/s390/kernel/smp.c | 18 -- arch/um/drivers/xterm.c | 5 arch/x86/include/asm/pgtable_types.h | 1 arch/x86/kernel/kprobes/core.c | 5 arch/x86/mm/ident_map.c | 12 + arch/x86/mm/mem_encrypt.c | 4 crypto/af_alg.c | 10 + crypto/ecdh.c | 9 - drivers/acpi/acpi_pnp.c | 3 drivers/acpi/device_pm.c | 41 +---- drivers/acpi/resource.c | 2 drivers/block/xen-blkback/xenbus.c | 4 drivers/bus/mips_cdmm.c | 4 drivers/clk/clk-s2mps11.c | 1 drivers/clk/mvebu/armada-37xx-xtal.c | 4 drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 1 drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 1 drivers/clk/tegra/clk-id.h | 1 drivers/clk/tegra/clk-tegra-periph.c | 2 drivers/clk/ti/fapll.c | 11 + drivers/clocksource/arm_arch_timer.c | 23 ++- drivers/clocksource/cadence_ttc_timer.c | 18 +- drivers/cpufreq/highbank-cpufreq.c | 7 + drivers/cpufreq/loongson1-cpufreq.c | 1 drivers/cpufreq/mediatek-cpufreq.c | 1 drivers/cpufreq/scpi-cpufreq.c | 1 drivers/cpufreq/sti-cpufreq.c | 7 + drivers/crypto/omap-aes.c | 3 drivers/crypto/talitos.c | 6 drivers/edac/amd64_edac.c | 26 ++- drivers/extcon/extcon-max77693.c | 2 drivers/gpio/gpio-mvebu.c | 16 +- drivers/gpu/drm/drm_dp_aux_dev.c | 2 drivers/gpu/drm/drm_dp_mst_topology.c | 7 - drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 drivers/gpu/drm/tegra/sor.c | 10 + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 + drivers/hsi/controllers/omap_ssi_core.c | 2 drivers/iio/adc/rockchip_saradc.c | 2 drivers/iio/imu/bmi160/bmi160_core.c | 4 drivers/iio/industrialio-buffer.c | 6 drivers/iio/light/rpr0521.c | 17 +- drivers/iio/pressure/mpl3115.c | 9 + drivers/infiniband/core/cm.c | 2 drivers/infiniband/hw/bnxt_re/ib_verbs.c | 1 drivers/infiniband/hw/cxgb4/cq.c | 3 drivers/infiniband/hw/mthca/mthca_cq.c | 2 drivers/infiniband/hw/mthca/mthca_dev.h | 1 drivers/infiniband/sw/rxe/rxe_req.c | 3 drivers/input/keyboard/cros_ec_keyb.c | 1 drivers/input/keyboard/omap4-keypad.c | 89 +++++++----- drivers/input/misc/cm109.c | 7 - drivers/input/mouse/cyapa_gen6.c | 2 drivers/input/serio/i8042-x86ia64io.h | 42 ++++++ drivers/input/touchscreen/ads7846.c | 52 ++++--- drivers/input/touchscreen/goodix.c | 12 + drivers/irqchip/irq-alpine-msi.c | 3 drivers/md/dm-ioctl.c | 1 drivers/md/dm-table.c | 6 drivers/md/md-cluster.c | 67 +++++---- drivers/md/md.c | 13 + drivers/media/common/siano/smsdvb-main.c | 5 drivers/media/i2c/max2175.c | 2 drivers/media/pci/netup_unidvb/netup_unidvb_spi.c | 5 drivers/media/pci/saa7146/mxb.c | 19 +- drivers/media/pci/solo6x10/solo6x10-g723.c | 2 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 1 drivers/media/rc/sunxi-cir.c | 2 drivers/media/usb/gspca/gspca.c | 1 drivers/media/usb/msi2500/msi2500.c | 2 drivers/memstick/core/memstick.c | 1 drivers/memstick/host/r592.c | 12 + drivers/mtd/cmdlinepart.c | 14 +- drivers/net/can/softing/softing_main.c | 9 + drivers/net/ethernet/allwinner/sun4i-emac.c | 7 - drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 drivers/net/ethernet/korina.c | 2 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 21 ++- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 40 ++++- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 12 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 6 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 27 +++ drivers/net/vxlan.c | 3 drivers/net/wireless/ath/ath10k/usb.c | 7 - drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 36 +++-- drivers/net/wireless/intersil/orinoco/orinoco_usb.c | 14 +- drivers/net/wireless/marvell/mwifiex/main.c | 2 drivers/net/wireless/st/cw1200/main.c | 2 drivers/net/xen-netback/xenbus.c | 6 drivers/nfc/s3fwrn5/firmware.c | 4 drivers/nvdimm/label.c | 9 + drivers/pci/dwc/pcie-qcom.c | 12 + drivers/pci/host/pcie-iproc.c | 10 - drivers/pci/pci-acpi.c | 4 drivers/pci/slot.c | 6 drivers/pinctrl/intel/pinctrl-baytrail.c | 8 + drivers/pinctrl/intel/pinctrl-merrifield.c | 8 + drivers/pinctrl/pinctrl-amd.c | 7 - drivers/pinctrl/pinctrl-falcon.c | 14 +- drivers/platform/x86/acer-wmi.c | 1 drivers/power/supply/bq24190_charger.c | 20 ++ drivers/ps3/ps3stor_lib.c | 2 drivers/pwm/pwm-lp3943.c | 1 drivers/pwm/pwm-zx.c | 1 drivers/s390/block/dasd_alias.c | 12 + drivers/scsi/be2iscsi/be_main.c | 4 drivers/scsi/bnx2i/Kconfig | 1 drivers/scsi/fnic/fnic_main.c | 1 drivers/scsi/mpt3sas/mpt3sas_base.c | 2 drivers/scsi/pm8001/pm8001_init.c | 3 drivers/scsi/qedi/qedi_main.c | 4 drivers/scsi/scsi_lib.c | 126 ++++++++++++------ drivers/scsi/ufs/ufshcd.c | 7 + drivers/soc/mediatek/mtk-scpsys.c | 5 drivers/soc/qcom/smp2p.c | 5 drivers/soc/tegra/fuse/speedo-tegra210.c | 2 drivers/soc/ti/knav_dma.c | 13 + drivers/soc/ti/knav_qmss_queue.c | 4 drivers/spi/spi-bcm2835aux.c | 17 -- drivers/spi/spi-davinci.c | 2 drivers/spi/spi-img-spfi.c | 4 drivers/spi/spi-pic32.c | 1 drivers/spi/spi-rb4xx.c | 2 drivers/spi/spi-sc18is602.c | 13 - drivers/spi/spi-sh.c | 13 - drivers/spi/spi-st-ssc4.c | 5 drivers/spi/spi-tegra114.c | 2 drivers/spi/spi-tegra20-sflash.c | 1 drivers/spi/spi-tegra20-slink.c | 2 drivers/spi/spi-ti-qspi.c | 1 drivers/staging/comedi/drivers/mf6x4.c | 3 drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 5 drivers/staging/greybus/audio_codec.c | 2 drivers/staging/speakup/speakup_dectlk.c | 2 drivers/tty/serial/8250/8250_omap.c | 5 drivers/tty/serial/serial_core.c | 4 drivers/usb/chipidea/ci_hdrc_imx.c | 3 drivers/usb/core/quirks.c | 3 drivers/usb/gadget/function/f_acm.c | 2 drivers/usb/gadget/function/f_fs.c | 5 drivers/usb/gadget/function/f_midi.c | 6 drivers/usb/gadget/function/f_rndis.c | 4 drivers/usb/gadget/udc/dummy_hcd.c | 2 drivers/usb/host/ehci-omap.c | 1 drivers/usb/host/oxu210hp-hcd.c | 4 drivers/usb/host/xhci-hub.c | 4 drivers/usb/misc/sisusbvga/Kconfig | 2 drivers/usb/serial/keyspan_pda.c | 63 ++++----- drivers/usb/serial/mos7720.c | 2 drivers/usb/serial/option.c | 23 +++ drivers/usb/storage/uas.c | 3 drivers/usb/storage/unusual_uas.h | 7 - drivers/usb/storage/usb.c | 3 drivers/vfio/pci/vfio_pci.c | 4 drivers/watchdog/Kconfig | 3 drivers/watchdog/qcom-wdt.c | 2 drivers/xen/xen-pciback/xenbus.c | 2 drivers/xen/xenbus/xenbus.h | 2 drivers/xen/xenbus/xenbus_client.c | 8 + drivers/xen/xenbus/xenbus_probe.c | 1 drivers/xen/xenbus/xenbus_probe_backend.c | 7 + drivers/xen/xenbus/xenbus_xs.c | 34 +++- fs/btrfs/inode.c | 2 fs/btrfs/tests/btrfs-tests.c | 8 + fs/ceph/caps.c | 11 + fs/ext4/inode.c | 19 ++ fs/ext4/mballoc.c | 1 fs/jffs2/readinode.c | 16 ++ fs/jfs/jfs_dmap.h | 2 fs/lockd/host.c | 20 +- fs/nfs/inode.c | 2 fs/nfs/nfs4proc.c | 10 + fs/nfs_common/grace.c | 6 fs/nfsd/nfssvc.c | 3 fs/quota/quota_v2.c | 19 ++ include/acpi/acpi_bus.h | 5 include/linux/build_bug.h | 5 include/linux/security.h | 2 include/linux/seq_buf.h | 2 include/linux/sunrpc/xprt.h | 1 include/linux/trace_seq.h | 4 include/linux/usb_usual.h | 2 include/uapi/linux/if_alg.h | 16 ++ include/xen/xenbus.h | 15 ++ kernel/cpu.c | 6 kernel/irq/irqdomain.c | 11 + kernel/sched/core.c | 6 kernel/sched/deadline.c | 5 kernel/sched/sched.h | 42 ++---- net/bluetooth/hci_event.c | 17 +- net/bridge/br_vlan.c | 4 net/ipv4/tcp_output.c | 9 - net/mac80211/mesh_pathtbl.c | 4 net/sunrpc/xprt.c | 65 +++++++-- net/sunrpc/xprtrdma/module.c | 1 net/sunrpc/xprtrdma/transport.c | 1 net/sunrpc/xprtsock.c | 4 net/wireless/nl80211.c | 2 samples/bpf/lwt_len_hist.sh | 2 scripts/checkpatch.pl | 2 security/integrity/ima/ima_crypto.c | 20 -- security/selinux/hooks.c | 16 +- sound/core/oss/pcm_oss.c | 28 ++-- sound/pci/hda/patch_realtek.c | 1 sound/soc/codecs/wm8997.c | 2 sound/soc/codecs/wm8998.c | 4 sound/soc/codecs/wm_adsp.c | 5 sound/soc/jz4740/jz4740-i2s.c | 4 sound/soc/soc-pcm.c | 2 sound/usb/clock.c | 6 sound/usb/format.c | 2 sound/usb/stream.c | 6 tools/perf/util/parse-regs-options.c | 2 243 files changed, 1447 insertions(+), 672 deletions(-) Alan Stern (1): media: gspca: Fix memory leak in probe Alexander Sverdlin (1): serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access Alexandre Belloni (1): ARM: dts: at91: at91sam9rl: fix ADC triggers Alexey Kardashevskiy (1): serial_core: Check for port state when tty is in error state Andy Shevchenko (2): pinctrl: merrifield: Set default bias in case no particular value given pinctrl: baytrail: Avoid clearing debounce value when turning it off Anmol Karn (1): Bluetooth: Fix null pointer dereference in hci_event_packet() Ansuel Smith (1): PCI: qcom: Add missing reset for ipq806x Anton Ivanov (1): um: chan_xterm: Fix fd leak Antti Palosaari (1): media: msi2500: assign SPI bus number dynamically Ard Biesheuvel (2): ARM: p2v: fix handling of LPAE translation in BE mode crypto: ecdh - avoid unaligned accesses in ecdh_set_secret() Arnd Bergmann (5): kbuild: avoid static_assert for genksyms RDMa/mthca: Work around -Wenum-conversion warning seq_buf: Avoid type mismatch for seq_buf_init watchdog: coh901327: add COMMON_CLK dependency Input: cyapa_gen6 - fix out-of-bounds stack access Arvind Sankar (2): x86/mm/mem_encrypt: Fix definition of PMD_FLAGS_DEC_WP x86/mm/ident_map: Check for errors from ident_pud_init() Athira Rajeev (1): powerpc/perf: Exclude kernel samples while counting events in user space. Baruch Siach (1): gpio: mvebu: fix potential user-after-free on probe Bharat Gooty (1): PCI: iproc: Fix out-of-bound array accesses Bob Pearson (1): RDMA/rxe: Compute PSN windows correctly Bongsu Jeon (1): nfc: s3fwrn5: Release the nfc firmware Borislav Petkov (1): EDAC/amd64: Fix PCI component registration Bui Quang Minh (1): USB: dummy-hcd: Fix uninitialized array use in init() Calum Mackay (1): lockd: don't use interval-based rebinding over TCP Can Guo (1): scsi: ufs: Make sure clk scaling happens only when HBA is runtime ACTIVE Cezary Rojewski (1): ASoC: pcm: DRAIN support reactivation Chen-Yu Tsai (1): arm64: dts: rockchip: Fix UART pull-ups on rk3328 Cheng Lin (1): nfs_common: need lock during iterate through the list Chris Chiu (2): Input: i8042 - add Acer laptops to the i8042 reset list ALSA: hda/realtek - Enable headset mic of ASUS Q524UQK with ALC255 Chris Packham (1): ARM: dts: Remove non-existent i2c1 from 98dx3236 Christophe JAILLET (5): ath10k: Fix an error handling path ath10k: Release some resources in an error handling path net: bcmgenet: Fix a resource leak in an error handling path in the probe functin net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function clk: s2mps11: Fix a resource leak in error handling paths in the probe function Christophe Leroy (3): crypto: talitos - Fix return type of current_desc_hdr() powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 powerpc/xmon: Change printk() to pr_cont() Chuhong Yuan (1): ASoC: jz4740-i2s: add missed checks for clk_get() Chunguang Xu (1): ext4: fix a memory leak of ext4_free_data Claudiu Beznea (1): ARM: dts: at91: sama5d2: map securam as device Coiby Xu (1): pinctrl: amd: remove debounce filter setting in IRQ type setting Cristian Birsan (2): ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host Dae R. Jeong (1): md: fix a warning caused by a race between concurrent md_ioctl()s Dan Carpenter (6): scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" soc: renesas: rmobile-sysc: Fix some leaks in rmobile_init_pm_domains() media: max2175: fix max2175_set_csm_mode() error code media: saa7146: fix array overflow in vidioc_s_audio() ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() qlcnic: Fix error code in probe Dan Williams (1): libnvdimm/namespace: Fix reaping of invalidated block-window-namespace labels Daniel Scally (1): Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" Daniel T. Lee (1): samples: bpf: Fix lwt_len_hist reusing previous BPF map Dave Kleikamp (1): jfs: Fix array index bounds check in dbAdjTree David Hildenbrand (1): powerpc/powernv/memtrace: Don't leak kernel memory to user space David Jander (1): Input: ads7846 - fix race that causes missing releases Dmitry Osipenko (1): clk: tegra: Fix duplicated SE clock entry Dmitry Torokhov (3): Input: cm109 - do not stomp on control URB Input: ads7846 - fix unaligned access on 7845 Input: cros_ec_keyb - send 'scancodes' in addition to key events Dwaipayan Ray (1): checkpatch: fix unescaped left brace Eric Biggers (1): crypto: af_alg - avoid undefined behavior accessing salg_name Eric Dumazet (1): mac80211: mesh: fix mesh_pathtbl_init() error path Evan Green (1): soc: qcom: smp2p: Safely acquire spinlock without IRQs Fabio Estevam (1): usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul Filipe Manana (1): Btrfs: fix selftests failure due to uninitialized i_mode in test inodes Fugang Duan (2): net: stmmac: free tx skb buffer in stmmac_resume() net: stmmac: delete the eee_ctrl_timer after napi disabled Greg Kroah-Hartman (1): Linux 4.14.213 Guenter Roeck (1): watchdog: sirfsoc: Add missing dependency on HAS_IOMEM Hao Si (1): soc: fsl: dpio: Get the cpumask through cpumask_of(cpu) Hui Wang (1): ACPI: PNP: compare the string length in the matching_id() Ian Abbott (1): staging: comedi: mf6x4: Fix AI end-of-conversion detection Icenowy Zheng (1): ARM: dts: sun8i: v3s: fix GIC node memory range Jack Pham (1): usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus Jan Kara (2): quota: Sanity-check quota file headers on load ext4: fix deadlock with fs freezing and EA inodes Jason Gunthorpe (1): vfio-pci: Use io_remap_pfn_range() for PCI IO memory Jernej Skrabec (1): clk: sunxi-ng: Make sure divider tables have sentinel Jing Xiangfeng (2): HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() memstick: r592: Fix error return in r592_probe() Johan Hovold (8): USB: serial: option: add interface-number sanity check to flag handling USB: serial: mos7720: fix parallel-port state restore USB: serial: keyspan_pda: fix dropped unthrottle interrupts USB: serial: keyspan_pda: fix write deadlock USB: serial: keyspan_pda: fix stalled writes USB: serial: keyspan_pda: fix write-wakeup use-after-free USB: serial: keyspan_pda: fix tx-unthrottle use-after-free USB: serial: keyspan_pda: fix write unthrottling Johannes Berg (1): iwlwifi: pcie: limit memory read spin time Jonathan Cameron (3): iio:light:rpr0521: Fix timestamp alignment and prevent data leak. iio:pressure:mpl3115: Force alignment of buffer iio:imu:bmi160: Fix too large a buffer. Jubin Zhong (1): PCI: Fix pci_slot_release() NULL pointer dereference Julian Sax (1): HID: i2c-hid: add Vero K147 to descriptor override Kamal Heib (2): RDMA/bnxt_re: Set queue pair state when being queried RDMA/cxgb4: Validate the number of CQEs Keita Suzuki (1): media: siano: fix memory leak of debugfs members in smsdvb_hotplug Keqian Zhu (1): clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI Krzysztof Kozlowski (3): ARM: dts: exynos: fix roles of USB 3.0 ports on Odroid XU ARM: dts: exynos: fix USB 3.0 VBUS control and over-current pins on Exynos5410 ARM: dts: exynos: fix USB 3.0 pins supply being turned off on Odroid XU Leon Romanovsky (2): RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait net/mlx5: Properly convey driver version to firmware Li Jun (1): xhci: Give USB2 ports time to enter U3 in bus suspend Lokesh Vutla (1): pwm: lp3943: Dynamically allocate PWM chip base Luis Henriques (1): ceph: fix race in concurrent __ceph_remove_cap invocations Lukas Wunner (8): spi: bcm2835aux: Fix use-after-free on unbind media: netup_unidvb: Don't leak SPI master in probe error path spi: spi-sh: Fix use-after-free on unbind spi: davinci: Fix use-after-free on unbind spi: pic32: Don't leak DMA channels in probe error path spi: rb4xx: Don't leak SPI master in probe error path spi: sc18is602: Don't leak SPI master in probe error path spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path Manivannan Sadhasivam (1): watchdog: qcom: Avoid context switch in restart handler Marc Zyngier (3): genirq/irqdomain: Don't try to free an interrupt that has no mapping irqchip/alpine-msi: Fix freeing of interrupts on allocation error path KVM: arm64: Introduce handling of AArch32 TTBCR2 traps Marek Szyprowski (1): extcon: max77693: Fix modalias string Markus Reichl (1): arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. Martin Blumenstingl (1): net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux Martin Wilck (1): scsi: core: Fix VPD LUN ID designator priorities Masami Hiramatsu (1): x86/kprobes: Restore BTF if the single-stepping is cancelled Moshe Shemesh (2): net/mlx4_en: Avoid scheduling restart task if it is already running net/mlx4_en: Handle TX error CQE Nathan Chancellor (1): spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe Nathan Lynch (2): powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops powerpc/pseries/hibernation: remove redundant cacheinfo update Neal Cardwell (1): tcp: fix cwnd-limited bug for TSO deferral where we send nothing Necip Fazil Yildiran (1): MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA NeilBrown (1): NFS: switch nfsiod to be an UNBOUND workqueue. Nicholas Piggin (1): kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling Nicolas Boichat (1): soc: mediatek: Check if power domains can be powered on at boot time Nicolas Ferre (1): ARM: dts: at91: sama5d2: fix CAN message ram offset and size Nicolin Chen (1): soc/tegra: fuse: Fix index bug in get_process_id Nuno Sá (1): iio: buffer: Fix demux update Oleksij Rempel (1): Input: ads7846 - fix integer overflow on Rt calculation Olga Kornievskaia (1): NFSv4.2: condition READDIR's mask for security label based on LSM state Oliver Neukum (2): USB: add RESET_RESUME quirk for Snapscan 1212 USB: UAS: introduce a quirk to set no_write_same Pali Rohár (5): cpufreq: highbank: Add missing MODULE_DEVICE_TABLE cpufreq: mediatek: Add missing MODULE_DEVICE_TABLE cpufreq: st: Add missing MODULE_DEVICE_TABLE cpufreq: loongson1: Add missing MODULE_ALIAS cpufreq: scpi: Add missing MODULE_ALIAS Paul Moore (1): selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling Pavel Machek (1): btrfs: fix return value mixup in btrfs_get_extent Pawel Wieczorkiewicz (1): xen-blkback: set ring->xenblkd to NULL after kthread_stop() Paweł Chmiel (1): arm64: dts: exynos: Correct psci compatible used on Exynos7 Peilin Ye (1): Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() Peng Liu (1): sched/deadline: Fix sched_dl_global_validate() Qinglang Miao (8): drm/tegra: sor: Disable clocks on error in tegra_sor_init() media: solo6x10: fix missing snd_card_free in error handling case memstick: fix a double-free bug in memstick_check cw1200: fix missing destroy_workqueue() on error in cw1200_init_common mips: cdmm: fix use-after-free in mips_cdmm_bus_discover dm ioctl: fix error return code in target_message scsi: qedi: Fix missing destroy_workqueue() on error in __qedi_probe iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume Rafael J. Wysocki (1): PM: ACPI: PCI: Drop acpi_pm_set_bridge_wakeup() Randy Dunlap (1): scsi: bnx2i: Requires MMU Roberto Sassu (1): ima: Don't modify file descriptor mode on the fly Sara Sharon (2): iwlwifi: mvm: fix kernel panic in case of assert during CSA cfg80211: initialize rekey_data Sean Young (1): media: sunxi-cir: ensure IR is handled when it is continuous Sebastian Andrzej Siewior (1): orinoco: Move context allocation after processing the skb SeongJae Park (5): xen/xenbus: Allow watches discard events before queueing xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path() xen/xenbus/xen_bus_type: Support will_handle watch callback xen/xenbus: Count pending messages for each watch xenbus/xenbus_backend: Disallow pending watch messages Serge Hallyn (1): fix namespaced fscaps when !CONFIG_SECURITY Simon Beginn (1): Input: goodix - add upside-down quirk for Teclast X98 Pro tablet Sreekanth Reddy (1): scsi: mpt3sas: Increase IOCInit request timeout to 30s Stefan Haberland (3): s390/dasd: prevent inconsistent LCU device data s390/dasd: fix list corruption of pavgroup group list s390/dasd: fix list corruption of lcu list Sven Eckelmann (3): vxlan: Add needed_headroom for lower device vxlan: Copy needed_tailroom from lowerdev mtd: parser: cmdline: Fix parsing of part-names with colons Sven Schnelle (1): s390/smp: perform initial CPU reset also for SMT siblings Takashi Iwai (5): ALSA: usb-audio: Fix potential out-of-bounds shift ALSA: usb-audio: Fix control 'access overflow' errors from chmap ALSA: pcm: oss: Fix potential out-of-bounds shift ALSA: pcm: oss: Fix a few more UBSAN fixes ALSA: usb-audio: Disable sample read check if firmware doesn't give back Terry Zhou (1): clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 Thomas Gleixner (3): USB: sisusbvga: Make console support depend on BROKEN dm table: Remove BUG_ON(in_interrupt()) sched: Reenable interrupts in do_sched_yield() Tianyue Ren (1): selinux: fix error initialization in inode_doinit_with_dentry() Timo Witte (1): platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Tom Rix (1): drm/gma500: fix double free of gma_connector Trond Myklebust (1): SUNRPC: xprt_load_transport() needs to support the netid "rdma6" Tsuchiya Yuto (1): mwifiex: fix mwifiex_shutdown_sw() causing sw reset failure Tyrel Datwyler (1): powerpc/rtas: Fix typo of ibm,open-errinjct in RTAS filter Uwe Kleine-König (1): pwm: zx: Add missing cleanup in error path Vincent Stehlé (2): powerpc/ps3: use dma_mapping_error() net: korina: fix return value Vineet Gupta (1): ARC: stack unwinding: don't assume non-current task is sleeping Will McVicker (2): USB: gadget: f_midi: setup SuperSpeed Plus descriptors USB: gadget: f_rndis: fix bitrate for SuperSpeed and above Xin Xiong (1): drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi Yang Yingliang (2): drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() speakup: fix uninitialized flush_lock Yu Kuai (3): media: mtk-vcodec: add missing put_device() call in mtk_vcodec_release_dec_pm() clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() Zhang Changzhong (2): net: bridge: vlan: fix error return code in __vlan_add() scsi: fnic: Fix error return code in fnic_probe() Zhang Qilong (18): can: softing: softing_netdev_open(): fix error handling spi: img-spfi: fix reference leak in img_spfi_resume spi: spi-ti-qspi: fix reference leak in ti_qspi_setup spi: tegra20-slink: fix reference leak in slink ops of tegra20 spi: tegra20-sflash: fix reference leak in tegra_sflash_resume spi: tegra114: fix reference leak in tegra spi ops ASoC: wm8998: Fix PM disable depth imbalance on error ASoC: arizona: Fix a wrong free in wm8997_probe staging: greybus: codecs: Fix reference counter leak in error handling crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe soc: ti: knav_qmss: fix reference leak in knav_queue_probe soc: ti: Fix reference imbalance in knav_dma_probe Input: omap4-keypad - fix runtime PM error handling power: supply: bq24190_charger: fix reference leak scsi: pm80xx: Fix error return in pm8001_pci_probe() usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe usb: oxu210hp-hcd: Fix memory leak in oxu_create clk: ti: Fix memleak in ti_fapll_synth_setup Zhao Heming (1): md/cluster: fix deadlock when node is doing resync job Zhe Li (1): jffs2: Fix GC exit abnormally Zheng Zengkai (1): perf record: Fix memory leak when using '--user-regs=?' to list registers Zhihao Cheng (1): drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe Zwane Mwaikambo (1): drm/dp_aux_dev: check aux_dev before use in drm_dp_aux_dev_get_by_minor() kazuo ito (1): nfsd: Fix message level for normal termination taehyun.cho (1): USB: gadget: f_acm: add support for SuperSpeed Plus

3 years, 10 months

1
1
0 0

Linux 4.9.249

by Greg Kroah-Hartman

I'm announcing the release of the 4.9.249 kernel. All users of the 4.9 kernel series must upgrade. The updated 4.9.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arc/kernel/stacktrace.c | 23 ++++--- arch/arm/boot/dts/at91-sama5d3_xplained.dts | 7 ++ arch/arm/boot/dts/at91-sama5d4_xplained.dts | 7 ++ arch/arm/boot/dts/at91sam9rl.dtsi | 19 +++-- arch/arm/boot/dts/exynos5410-odroidxu.dts | 6 + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 ++++++++ arch/arm/boot/dts/exynos5410.dtsi | 4 + arch/arm/kernel/head.S | 6 - arch/arm64/boot/dts/exynos/exynos7.dtsi | 4 - arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 arch/arm64/include/asm/kvm_host.h | 1 arch/arm64/kvm/sys_regs.c | 1 arch/mips/bcm47xx/Kconfig | 1 arch/powerpc/include/asm/cputable.h | 5 - arch/powerpc/perf/core-book3s.c | 10 +++ arch/powerpc/platforms/pseries/suspend.c | 1 arch/powerpc/xmon/nonstdio.c | 2 arch/um/drivers/xterm.c | 5 + arch/x86/kernel/kprobes/core.c | 5 + drivers/acpi/acpi_pnp.c | 3 drivers/acpi/resource.c | 2 drivers/block/xen-blkback/xenbus.c | 1 drivers/bus/mips_cdmm.c | 4 - drivers/clk/clk-s2mps11.c | 1 drivers/clk/mvebu/armada-37xx-xtal.c | 4 - drivers/clk/tegra/clk-id.h | 1 drivers/clk/tegra/clk-tegra-periph.c | 2 drivers/clk/ti/fapll.c | 11 ++- drivers/clocksource/arm_arch_timer.c | 23 ++++--- drivers/clocksource/cadence_ttc_timer.c | 18 ++--- drivers/cpufreq/highbank-cpufreq.c | 7 ++ drivers/cpufreq/loongson1-cpufreq.c | 1 drivers/cpufreq/scpi-cpufreq.c | 1 drivers/cpufreq/sti-cpufreq.c | 7 ++ drivers/crypto/omap-aes.c | 3 drivers/crypto/talitos.c | 6 - drivers/extcon/extcon-max77693.c | 2 drivers/gpu/drm/drm_dp_aux_dev.c | 2 drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 drivers/gpu/drm/tegra/sor.c | 10 ++- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++ drivers/hsi/controllers/omap_ssi_core.c | 2 drivers/iio/adc/rockchip_saradc.c | 2 drivers/iio/industrialio-buffer.c | 6 - drivers/iio/pressure/mpl3115.c | 9 ++ drivers/infiniband/core/cm.c | 2 drivers/infiniband/hw/cxgb4/cq.c | 3 drivers/infiniband/hw/mthca/mthca_cq.c | 2 drivers/infiniband/hw/mthca/mthca_dev.h | 1 drivers/infiniband/sw/rxe/rxe_req.c | 3 drivers/input/keyboard/cros_ec_keyb.c | 1 drivers/input/misc/cm109.c | 7 +- drivers/input/mouse/cyapa_gen6.c | 2 drivers/input/serio/i8042-x86ia64io.h | 42 ++++++++++++ drivers/input/touchscreen/ads7846.c | 8 +- drivers/input/touchscreen/goodix.c | 12 +++ drivers/irqchip/irq-alpine-msi.c | 3 drivers/md/dm-ioctl.c | 1 drivers/md/dm-table.c | 6 - drivers/md/md.c | 7 +- drivers/media/common/siano/smsdvb-main.c | 5 + drivers/media/pci/netup_unidvb/netup_unidvb_spi.c | 5 - drivers/media/pci/saa7146/mxb.c | 19 +++-- drivers/media/pci/solo6x10/solo6x10-g723.c | 2 drivers/media/rc/sunxi-cir.c | 2 drivers/media/usb/gspca/gspca.c | 1 drivers/media/usb/msi2500/msi2500.c | 2 drivers/memstick/core/memstick.c | 1 drivers/memstick/host/r592.c | 12 ++- drivers/mtd/cmdlinepart.c | 14 ++++ drivers/net/can/softing/softing_main.c | 9 ++ drivers/net/ethernet/allwinner/sun4i-emac.c | 7 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 - drivers/net/ethernet/korina.c | 2 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 20 ++++-- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 7 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 6 - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 +++- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 36 ++++++++--- drivers/net/wireless/intersil/orinoco/orinoco_usb.c | 14 ++-- drivers/net/wireless/st/cw1200/main.c | 2 drivers/nfc/s3fwrn5/firmware.c | 4 - drivers/pci/slot.c | 6 - drivers/pinctrl/intel/pinctrl-baytrail.c | 8 ++ drivers/pinctrl/intel/pinctrl-merrifield.c | 8 ++ drivers/pinctrl/pinctrl-amd.c | 7 -- drivers/pinctrl/pinctrl-falcon.c | 14 ++-- drivers/platform/x86/acer-wmi.c | 1 drivers/ps3/ps3stor_lib.c | 2 drivers/s390/block/dasd_alias.c | 12 +++ drivers/scsi/be2iscsi/be_main.c | 4 - drivers/scsi/bnx2i/Kconfig | 1 drivers/scsi/fnic/fnic_main.c | 1 drivers/scsi/mpt3sas/mpt3sas_base.c | 2 drivers/scsi/pm8001/pm8001_init.c | 3 drivers/soc/qcom/smp2p.c | 5 - drivers/soc/tegra/fuse/speedo-tegra210.c | 2 drivers/soc/ti/knav_dma.c | 13 +++- drivers/soc/ti/knav_qmss_queue.c | 4 - drivers/spi/Kconfig | 3 drivers/spi/spi-bcm2835aux.c | 17 +---- drivers/spi/spi-davinci.c | 2 drivers/spi/spi-img-spfi.c | 4 - drivers/spi/spi-pic32.c | 1 drivers/spi/spi-rb4xx.c | 2 drivers/spi/spi-sc18is602.c | 13 ---- drivers/spi/spi-sh.c | 13 +--- drivers/spi/spi-st-ssc4.c | 5 - drivers/spi/spi-tegra114.c | 2 drivers/spi/spi-tegra20-sflash.c | 1 drivers/spi/spi-tegra20-slink.c | 2 drivers/spi/spi-ti-qspi.c | 1 drivers/spi/spi.c | 21 ++++++ drivers/staging/comedi/drivers/mf6x4.c | 3 drivers/staging/greybus/audio_codec.c | 2 drivers/staging/speakup/speakup_dectlk.c | 2 drivers/tty/serial/8250/8250_omap.c | 5 - drivers/tty/serial/serial_core.c | 4 + drivers/usb/chipidea/ci_hdrc_imx.c | 3 drivers/usb/core/quirks.c | 3 drivers/usb/gadget/function/f_acm.c | 2 drivers/usb/gadget/function/f_fs.c | 5 + drivers/usb/gadget/function/f_midi.c | 6 + drivers/usb/gadget/function/f_rndis.c | 4 - drivers/usb/gadget/udc/dummy_hcd.c | 2 drivers/usb/host/ehci-omap.c | 1 drivers/usb/host/oxu210hp-hcd.c | 4 - drivers/usb/host/xhci-hub.c | 4 + drivers/usb/misc/sisusbvga/Kconfig | 2 drivers/usb/serial/keyspan_pda.c | 63 ++++++++++--------- drivers/usb/serial/mos7720.c | 2 drivers/usb/serial/option.c | 23 ++++++- drivers/vfio/pci/vfio_pci.c | 4 - drivers/watchdog/qcom-wdt.c | 2 fs/btrfs/inode.c | 2 fs/btrfs/qgroup.c | 4 - fs/btrfs/scrub.c | 17 ++--- fs/btrfs/tests/btrfs-tests.c | 8 ++ fs/ceph/caps.c | 11 ++- fs/ext4/mballoc.c | 1 fs/jffs2/readinode.c | 16 ++++ fs/jfs/jfs_dmap.h | 2 fs/lockd/host.c | 20 +++--- fs/nfs/inode.c | 2 fs/nfs/nfs4proc.c | 10 ++- fs/nfs_common/grace.c | 6 + fs/nfsd/nfssvc.c | 3 include/linux/seq_buf.h | 2 include/linux/sunrpc/xprt.h | 1 include/linux/trace_seq.h | 4 - kernel/cpu.c | 6 + net/bluetooth/hci_event.c | 17 +++-- net/bridge/br_vlan.c | 4 - net/ipv4/tcp_output.c | 9 +- net/mac80211/mesh_pathtbl.c | 4 - net/sunrpc/xprt.c | 65 +++++++++++++++----- net/sunrpc/xprtrdma/module.c | 1 net/sunrpc/xprtrdma/transport.c | 1 net/sunrpc/xprtsock.c | 4 + net/wireless/nl80211.c | 2 scripts/checkpatch.pl | 2 sound/core/oss/pcm_oss.c | 28 +++++--- sound/soc/codecs/wm_adsp.c | 5 - sound/soc/jz4740/jz4740-i2s.c | 4 + sound/soc/soc-pcm.c | 2 sound/usb/clock.c | 6 + sound/usb/format.c | 2 sound/usb/stream.c | 6 - tools/perf/util/parse-regs-options.c | 2 172 files changed, 831 insertions(+), 341 deletions(-) Alan Stern (1): media: gspca: Fix memory leak in probe Alexander Sverdlin (1): serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access Alexandre Belloni (1): ARM: dts: at91: at91sam9rl: fix ADC triggers Alexey Kardashevskiy (1): serial_core: Check for port state when tty is in error state Andy Shevchenko (2): pinctrl: merrifield: Set default bias in case no particular value given pinctrl: baytrail: Avoid clearing debounce value when turning it off Anmol Karn (1): Bluetooth: Fix null pointer dereference in hci_event_packet() Anton Ivanov (1): um: chan_xterm: Fix fd leak Antti Palosaari (1): media: msi2500: assign SPI bus number dynamically Ard Biesheuvel (1): ARM: p2v: fix handling of LPAE translation in BE mode Arnd Bergmann (3): RDMa/mthca: Work around -Wenum-conversion warning seq_buf: Avoid type mismatch for seq_buf_init Input: cyapa_gen6 - fix out-of-bounds stack access Athira Rajeev (1): powerpc/perf: Exclude kernel samples while counting events in user space. Bob Pearson (1): RDMA/rxe: Compute PSN windows correctly Bongsu Jeon (1): nfc: s3fwrn5: Release the nfc firmware Bui Quang Minh (1): USB: dummy-hcd: Fix uninitialized array use in init() Calum Mackay (1): lockd: don't use interval-based rebinding over TCP Cezary Rojewski (1): ASoC: pcm: DRAIN support reactivation Cheng Lin (1): nfs_common: need lock during iterate through the list Chris Chiu (1): Input: i8042 - add Acer laptops to the i8042 reset list Christophe JAILLET (3): net: bcmgenet: Fix a resource leak in an error handling path in the probe functin net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function clk: s2mps11: Fix a resource leak in error handling paths in the probe function Christophe Leroy (3): crypto: talitos - Fix return type of current_desc_hdr() powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 powerpc/xmon: Change printk() to pr_cont() Chuhong Yuan (1): ASoC: jz4740-i2s: add missed checks for clk_get() Chunguang Xu (1): ext4: fix a memory leak of ext4_free_data Coiby Xu (1): pinctrl: amd: remove debounce filter setting in IRQ type setting Cristian Birsan (2): ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host Dae R. Jeong (1): md: fix a warning caused by a race between concurrent md_ioctl()s Dan Carpenter (4): scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" media: saa7146: fix array overflow in vidioc_s_audio() ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() qlcnic: Fix error code in probe Daniel Scally (1): Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" Dave Kleikamp (1): jfs: Fix array index bounds check in dbAdjTree Dmitry Osipenko (1): clk: tegra: Fix duplicated SE clock entry Dmitry Torokhov (3): Input: cm109 - do not stomp on control URB Input: ads7846 - fix unaligned access on 7845 Input: cros_ec_keyb - send 'scancodes' in addition to key events Dwaipayan Ray (1): checkpatch: fix unescaped left brace Eric Dumazet (1): mac80211: mesh: fix mesh_pathtbl_init() error path Evan Green (1): soc: qcom: smp2p: Safely acquire spinlock without IRQs Fabio Estevam (1): usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul Filipe Manana (1): Btrfs: fix selftests failure due to uninitialized i_mode in test inodes Fugang Duan (1): net: stmmac: delete the eee_ctrl_timer after napi disabled Greg Kroah-Hartman (1): Linux 4.9.249 Hui Wang (1): ACPI: PNP: compare the string length in the matching_id() Ian Abbott (1): staging: comedi: mf6x4: Fix AI end-of-conversion detection Jack Pham (1): usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus Jason Gunthorpe (1): vfio-pci: Use io_remap_pfn_range() for PCI IO memory Jing Xiangfeng (2): HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() memstick: r592: Fix error return in r592_probe() Johan Hovold (8): USB: serial: option: add interface-number sanity check to flag handling USB: serial: mos7720: fix parallel-port state restore USB: serial: keyspan_pda: fix dropped unthrottle interrupts USB: serial: keyspan_pda: fix write deadlock USB: serial: keyspan_pda: fix stalled writes USB: serial: keyspan_pda: fix write-wakeup use-after-free USB: serial: keyspan_pda: fix tx-unthrottle use-after-free USB: serial: keyspan_pda: fix write unthrottling Johannes Berg (1): iwlwifi: pcie: limit memory read spin time Jonathan Cameron (1): iio:pressure:mpl3115: Force alignment of buffer Jubin Zhong (1): PCI: Fix pci_slot_release() NULL pointer dereference Julian Sax (1): HID: i2c-hid: add Vero K147 to descriptor override Kamal Heib (1): RDMA/cxgb4: Validate the number of CQEs Keita Suzuki (1): media: siano: fix memory leak of debugfs members in smsdvb_hotplug Keqian Zhu (1): clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI Krzysztof Kozlowski (3): ARM: dts: exynos: fix roles of USB 3.0 ports on Odroid XU ARM: dts: exynos: fix USB 3.0 VBUS control and over-current pins on Exynos5410 ARM: dts: exynos: fix USB 3.0 pins supply being turned off on Odroid XU Leon Romanovsky (1): RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait Li Jun (1): xhci: Give USB2 ports time to enter U3 in bus suspend Luis Henriques (1): ceph: fix race in concurrent __ceph_remove_cap invocations Lukas Wunner (9): spi: bcm2835aux: Fix use-after-free on unbind spi: Prevent adding devices below an unregistering controller media: netup_unidvb: Don't leak SPI master in probe error path spi: spi-sh: Fix use-after-free on unbind spi: davinci: Fix use-after-free on unbind spi: pic32: Don't leak DMA channels in probe error path spi: rb4xx: Don't leak SPI master in probe error path spi: sc18is602: Don't leak SPI master in probe error path spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path Manivannan Sadhasivam (1): watchdog: qcom: Avoid context switch in restart handler Marc Zyngier (2): irqchip/alpine-msi: Fix freeing of interrupts on allocation error path KVM: arm64: Introduce handling of AArch32 TTBCR2 traps Marek Szyprowski (1): extcon: max77693: Fix modalias string Markus Reichl (1): arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. Martin Blumenstingl (1): net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux Masami Hiramatsu (1): x86/kprobes: Restore BTF if the single-stepping is cancelled Moshe Shemesh (1): net/mlx4_en: Avoid scheduling restart task if it is already running Nathan Chancellor (1): spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe Nathan Lynch (1): powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops Neal Cardwell (1): tcp: fix cwnd-limited bug for TSO deferral where we send nothing Necip Fazil Yildiran (1): MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA NeilBrown (1): NFS: switch nfsiod to be an UNBOUND workqueue. Nicholas Piggin (1): kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling Nicolin Chen (1): soc/tegra: fuse: Fix index bug in get_process_id Nuno Sá (1): iio: buffer: Fix demux update Oleksij Rempel (1): Input: ads7846 - fix integer overflow on Rt calculation Olga Kornievskaia (1): NFSv4.2: condition READDIR's mask for security label based on LSM state Oliver Neukum (1): USB: add RESET_RESUME quirk for Snapscan 1212 Pali Rohár (4): cpufreq: highbank: Add missing MODULE_DEVICE_TABLE cpufreq: st: Add missing MODULE_DEVICE_TABLE cpufreq: loongson1: Add missing MODULE_ALIAS cpufreq: scpi: Add missing MODULE_ALIAS Pavel Machek (1): btrfs: fix return value mixup in btrfs_get_extent Pawel Wieczorkiewicz (1): xen-blkback: set ring->xenblkd to NULL after kthread_stop() Paweł Chmiel (1): arm64: dts: exynos: Correct psci compatible used on Exynos7 Peilin Ye (1): Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() Qinglang Miao (7): drm/tegra: sor: Disable clocks on error in tegra_sor_init() media: solo6x10: fix missing snd_card_free in error handling case memstick: fix a double-free bug in memstick_check cw1200: fix missing destroy_workqueue() on error in cw1200_init_common mips: cdmm: fix use-after-free in mips_cdmm_bus_discover dm ioctl: fix error return code in target_message iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume Qu Wenruo (2): btrfs: quota: Set rescan progress to (u64)-1 if we hit last leaf btrfs: scrub: Don't use inode page cache in scrub_handle_errored_block() Randy Dunlap (1): scsi: bnx2i: Requires MMU Sara Sharon (1): cfg80211: initialize rekey_data Sean Young (1): media: sunxi-cir: ensure IR is handled when it is continuous Sebastian Andrzej Siewior (1): orinoco: Move context allocation after processing the skb Simon Beginn (1): Input: goodix - add upside-down quirk for Teclast X98 Pro tablet Sreekanth Reddy (1): scsi: mpt3sas: Increase IOCInit request timeout to 30s Stefan Haberland (3): s390/dasd: prevent inconsistent LCU device data s390/dasd: fix list corruption of pavgroup group list s390/dasd: fix list corruption of lcu list Sven Eckelmann (1): mtd: parser: cmdline: Fix parsing of part-names with colons Takashi Iwai (5): ALSA: usb-audio: Fix potential out-of-bounds shift ALSA: usb-audio: Fix control 'access overflow' errors from chmap ALSA: pcm: oss: Fix potential out-of-bounds shift ALSA: pcm: oss: Fix a few more UBSAN fixes ALSA: usb-audio: Disable sample read check if firmware doesn't give back Terry Zhou (1): clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 Thomas Gleixner (2): USB: sisusbvga: Make console support depend on BROKEN dm table: Remove BUG_ON(in_interrupt()) Timo Witte (1): platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Tom Rix (1): drm/gma500: fix double free of gma_connector Trond Myklebust (1): SUNRPC: xprt_load_transport() needs to support the netid "rdma6" Vincent Stehlé (2): powerpc/ps3: use dma_mapping_error() net: korina: fix return value Vineet Gupta (1): ARC: stack unwinding: don't assume non-current task is sleeping Will McVicker (2): USB: gadget: f_midi: setup SuperSpeed Plus descriptors USB: gadget: f_rndis: fix bitrate for SuperSpeed and above Yang Yingliang (2): drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() speakup: fix uninitialized flush_lock Yu Kuai (2): clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() Zhang Changzhong (2): net: bridge: vlan: fix error return code in __vlan_add() scsi: fnic: Fix error return code in fnic_probe() Zhang Qilong (14): can: softing: softing_netdev_open(): fix error handling spi: img-spfi: fix reference leak in img_spfi_resume spi: spi-ti-qspi: fix reference leak in ti_qspi_setup spi: tegra20-slink: fix reference leak in slink ops of tegra20 spi: tegra20-sflash: fix reference leak in tegra_sflash_resume spi: tegra114: fix reference leak in tegra spi ops staging: greybus: codecs: Fix reference counter leak in error handling crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe soc: ti: knav_qmss: fix reference leak in knav_queue_probe soc: ti: Fix reference imbalance in knav_dma_probe scsi: pm80xx: Fix error return in pm8001_pci_probe() usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe usb: oxu210hp-hcd: Fix memory leak in oxu_create clk: ti: Fix memleak in ti_fapll_synth_setup Zhe Li (1): jffs2: Fix GC exit abnormally Zheng Zengkai (1): perf record: Fix memory leak when using '--user-regs=?' to list registers Zhihao Cheng (1): drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe Zwane Mwaikambo (1): drm/dp_aux_dev: check aux_dev before use in drm_dp_aux_dev_get_by_minor() kazuo ito (1): nfsd: Fix message level for normal termination taehyun.cho (1): USB: gadget: f_acm: add support for SuperSpeed Plus

3 years, 10 months

1
1
0 0

Linux 4.4.249

by Greg Kroah-Hartman

I'm announcing the release of the 4.4.249 kernel. All users of the 4.4 kernel series must upgrade. The updated 4.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arc/kernel/stacktrace.c | 23 +++++--- arch/arm/boot/dts/at91-sama5d3_xplained.dts | 7 ++ arch/arm/boot/dts/at91-sama5d4_xplained.dts | 7 ++ arch/arm/kernel/head.S | 6 -- arch/mips/bcm47xx/Kconfig | 1 arch/powerpc/include/asm/cputable.h | 5 - arch/powerpc/perf/core-book3s.c | 10 +++ arch/powerpc/platforms/pseries/suspend.c | 1 arch/um/drivers/xterm.c | 5 + arch/x86/kernel/kprobes/core.c | 5 + drivers/acpi/acpi_pnp.c | 3 + drivers/acpi/resource.c | 2 drivers/block/xen-blkback/xenbus.c | 3 - drivers/bus/mips_cdmm.c | 4 - drivers/clk/clk-s2mps11.c | 1 drivers/clk/ti/fapll.c | 11 +++ drivers/clocksource/arm_arch_timer.c | 23 +++++--- drivers/cpufreq/highbank-cpufreq.c | 7 ++ drivers/cpufreq/ls1x-cpufreq.c | 1 drivers/cpufreq/scpi-cpufreq.c | 1 drivers/crypto/talitos.c | 6 +- drivers/extcon/extcon-max77693.c | 2 drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 drivers/iio/adc/rockchip_saradc.c | 2 drivers/iio/pressure/mpl3115.c | 9 ++- drivers/infiniband/core/cm.c | 2 drivers/infiniband/hw/mthca/mthca_cq.c | 2 drivers/infiniband/hw/mthca/mthca_dev.h | 1 drivers/input/keyboard/cros_ec_keyb.c | 1 drivers/input/misc/cm109.c | 7 +- drivers/input/mouse/cyapa_gen6.c | 2 drivers/input/serio/i8042-x86ia64io.h | 42 ++++++++++++++ drivers/input/touchscreen/ads7846.c | 8 +- drivers/input/touchscreen/goodix.c | 12 ++++ drivers/md/dm-ioctl.c | 1 drivers/md/dm-table.c | 6 -- drivers/media/pci/netup_unidvb/netup_unidvb_spi.c | 5 + drivers/media/pci/saa7146/mxb.c | 19 +++--- drivers/media/pci/solo6x10/solo6x10-g723.c | 2 drivers/media/rc/sunxi-cir.c | 2 drivers/media/usb/gspca/gspca.c | 1 drivers/media/usb/msi2500/msi2500.c | 2 drivers/memstick/core/memstick.c | 1 drivers/memstick/host/r592.c | 12 ++-- drivers/mtd/cmdlinepart.c | 14 ++++ drivers/net/can/softing/softing_main.c | 9 ++- drivers/net/ethernet/allwinner/sun4i-emac.c | 7 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 + drivers/net/ethernet/korina.c | 2 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 17 +++-- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 7 ++ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 +++- drivers/net/wireless/cw1200/main.c | 2 drivers/net/wireless/orinoco/orinoco_usb.c | 14 ++-- drivers/net/xen-netback/xenbus.c | 4 + drivers/nfc/s3fwrn5/firmware.c | 4 + drivers/pci/slot.c | 6 +- drivers/pinctrl/pinctrl-amd.c | 7 -- drivers/pinctrl/pinctrl-falcon.c | 14 +++- drivers/platform/x86/acer-wmi.c | 1 drivers/ps3/ps3stor_lib.c | 2 drivers/s390/block/dasd_alias.c | 3 - drivers/scsi/bnx2i/Kconfig | 1 drivers/scsi/fnic/fnic_main.c | 1 drivers/scsi/pm8001/pm8001_init.c | 3 - drivers/soc/tegra/fuse/speedo-tegra210.c | 2 drivers/soc/ti/knav_dma.c | 13 +++- drivers/soc/ti/knav_qmss_queue.c | 4 + drivers/spi/Kconfig | 3 + drivers/spi/spi-bcm2835aux.c | 17 ++--- drivers/spi/spi-img-spfi.c | 4 + drivers/spi/spi-rb4xx.c | 2 drivers/spi/spi-tegra114.c | 2 drivers/spi/spi-tegra20-sflash.c | 1 drivers/spi/spi-tegra20-slink.c | 2 drivers/spi/spi-ti-qspi.c | 1 drivers/spi/spi.c | 21 ++++++- drivers/staging/comedi/drivers/mf6x4.c | 3 - drivers/staging/speakup/speakup_dectlk.c | 2 drivers/tty/serial/8250/8250_omap.c | 5 - drivers/usb/chipidea/ci_hdrc_imx.c | 3 - drivers/usb/core/quirks.c | 3 + drivers/usb/gadget/function/f_rndis.c | 4 + drivers/usb/gadget/udc/dummy_hcd.c | 2 drivers/usb/host/ehci-omap.c | 1 drivers/usb/host/oxu210hp-hcd.c | 4 + drivers/usb/host/xhci-hub.c | 4 + drivers/usb/misc/sisusbvga/Kconfig | 2 drivers/usb/serial/cp210x.c | 2 drivers/usb/serial/keyspan_pda.c | 63 +++++++++++----------- drivers/usb/serial/mos7720.c | 2 drivers/usb/serial/option.c | 23 +++++++- drivers/xen/xen-pciback/xenbus.c | 2 drivers/xen/xenbus/xenbus_client.c | 8 ++ drivers/xen/xenbus/xenbus_probe.c | 1 drivers/xen/xenbus/xenbus_probe.h | 2 drivers/xen/xenbus/xenbus_probe_backend.c | 7 ++ drivers/xen/xenbus/xenbus_xs.c | 38 ++++++++----- fs/btrfs/inode.c | 2 fs/btrfs/qgroup.c | 4 + fs/btrfs/scrub.c | 17 +++-- fs/btrfs/tests/btrfs-tests.c | 8 ++ fs/ceph/caps.c | 11 +++ fs/ext4/mballoc.c | 1 fs/jffs2/readinode.c | 16 +++++ fs/jfs/jfs_dmap.h | 2 fs/lockd/host.c | 20 +++--- fs/nfs/inode.c | 2 fs/nfs/nfs4proc.c | 10 ++- fs/nfs_common/grace.c | 6 +- include/linux/seq_buf.h | 2 include/linux/trace_seq.h | 4 - include/xen/xenbus.h | 15 ++++- net/bluetooth/hci_event.c | 17 +++-- net/bridge/br_vlan.c | 4 + net/ipv4/tcp_output.c | 9 ++- net/wireless/nl80211.c | 2 scripts/checkpatch.pl | 2 sound/core/oss/pcm_oss.c | 28 ++++++--- sound/soc/codecs/wm_adsp.c | 5 + sound/soc/jz4740/jz4740-i2s.c | 4 + sound/soc/soc-pcm.c | 2 sound/usb/format.c | 2 sound/usb/stream.c | 6 +- tools/perf/util/parse-regs-options.c | 2 128 files changed, 618 insertions(+), 252 deletions(-) Alan Stern (1): media: gspca: Fix memory leak in probe Alexander Sverdlin (1): serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access Anmol Karn (1): Bluetooth: Fix null pointer dereference in hci_event_packet() Anton Ivanov (1): um: chan_xterm: Fix fd leak Antti Palosaari (1): media: msi2500: assign SPI bus number dynamically Ard Biesheuvel (1): ARM: p2v: fix handling of LPAE translation in BE mode Arnd Bergmann (3): RDMa/mthca: Work around -Wenum-conversion warning seq_buf: Avoid type mismatch for seq_buf_init Input: cyapa_gen6 - fix out-of-bounds stack access Athira Rajeev (1): powerpc/perf: Exclude kernel samples while counting events in user space. Bongsu Jeon (1): nfc: s3fwrn5: Release the nfc firmware Brant Merryman (1): USB: serial: cp210x: enable usb generic throttle/unthrottle Bui Quang Minh (1): USB: dummy-hcd: Fix uninitialized array use in init() Calum Mackay (1): lockd: don't use interval-based rebinding over TCP Cezary Rojewski (1): ASoC: pcm: DRAIN support reactivation Cheng Lin (1): nfs_common: need lock during iterate through the list Chris Chiu (1): Input: i8042 - add Acer laptops to the i8042 reset list Christophe JAILLET (3): net: bcmgenet: Fix a resource leak in an error handling path in the probe functin net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function clk: s2mps11: Fix a resource leak in error handling paths in the probe function Christophe Leroy (2): crypto: talitos - Fix return type of current_desc_hdr() powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 Chuhong Yuan (1): ASoC: jz4740-i2s: add missed checks for clk_get() Chunguang Xu (1): ext4: fix a memory leak of ext4_free_data Coiby Xu (1): pinctrl: amd: remove debounce filter setting in IRQ type setting Cristian Birsan (2): ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host Dan Carpenter (3): media: saa7146: fix array overflow in vidioc_s_audio() ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() qlcnic: Fix error code in probe Daniel Scally (1): Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" Dave Kleikamp (1): jfs: Fix array index bounds check in dbAdjTree Dmitry Torokhov (3): Input: cm109 - do not stomp on control URB Input: ads7846 - fix unaligned access on 7845 Input: cros_ec_keyb - send 'scancodes' in addition to key events Dwaipayan Ray (1): checkpatch: fix unescaped left brace Fabio Estevam (1): usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul Filipe Manana (1): Btrfs: fix selftests failure due to uninitialized i_mode in test inodes Fugang Duan (1): net: stmmac: delete the eee_ctrl_timer after napi disabled Greg Kroah-Hartman (1): Linux 4.4.249 Hui Wang (1): ACPI: PNP: compare the string length in the matching_id() Ian Abbott (1): staging: comedi: mf6x4: Fix AI end-of-conversion detection Jing Xiangfeng (1): memstick: r592: Fix error return in r592_probe() Johan Hovold (8): USB: serial: option: add interface-number sanity check to flag handling USB: serial: mos7720: fix parallel-port state restore USB: serial: keyspan_pda: fix dropped unthrottle interrupts USB: serial: keyspan_pda: fix write deadlock USB: serial: keyspan_pda: fix stalled writes USB: serial: keyspan_pda: fix write-wakeup use-after-free USB: serial: keyspan_pda: fix tx-unthrottle use-after-free USB: serial: keyspan_pda: fix write unthrottling Jonathan Cameron (1): iio:pressure:mpl3115: Force alignment of buffer Jubin Zhong (1): PCI: Fix pci_slot_release() NULL pointer dereference Keqian Zhu (1): clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI Leon Romanovsky (1): RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait Li Jun (1): xhci: Give USB2 ports time to enter U3 in bus suspend Luis Henriques (1): ceph: fix race in concurrent __ceph_remove_cap invocations Lukas Wunner (4): spi: bcm2835aux: Fix use-after-free on unbind spi: Prevent adding devices below an unregistering controller media: netup_unidvb: Don't leak SPI master in probe error path spi: rb4xx: Don't leak SPI master in probe error path Marek Szyprowski (1): extcon: max77693: Fix modalias string Masami Hiramatsu (1): x86/kprobes: Restore BTF if the single-stepping is cancelled Moshe Shemesh (1): net/mlx4_en: Avoid scheduling restart task if it is already running Nathan Chancellor (1): spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe Nathan Lynch (1): powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops Neal Cardwell (1): tcp: fix cwnd-limited bug for TSO deferral where we send nothing Necip Fazil Yildiran (1): MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA NeilBrown (1): NFS: switch nfsiod to be an UNBOUND workqueue. Nicolin Chen (1): soc/tegra: fuse: Fix index bug in get_process_id Oleksij Rempel (1): Input: ads7846 - fix integer overflow on Rt calculation Olga Kornievskaia (1): NFSv4.2: condition READDIR's mask for security label based on LSM state Oliver Neukum (1): USB: add RESET_RESUME quirk for Snapscan 1212 Pali Rohár (3): cpufreq: highbank: Add missing MODULE_DEVICE_TABLE cpufreq: loongson1: Add missing MODULE_ALIAS cpufreq: scpi: Add missing MODULE_ALIAS Pavel Machek (1): btrfs: fix return value mixup in btrfs_get_extent Peilin Ye (1): Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() Qinglang Miao (6): media: solo6x10: fix missing snd_card_free in error handling case memstick: fix a double-free bug in memstick_check cw1200: fix missing destroy_workqueue() on error in cw1200_init_common mips: cdmm: fix use-after-free in mips_cdmm_bus_discover dm ioctl: fix error return code in target_message iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume Qu Wenruo (2): btrfs: quota: Set rescan progress to (u64)-1 if we hit last leaf btrfs: scrub: Don't use inode page cache in scrub_handle_errored_block() Randy Dunlap (1): scsi: bnx2i: Requires MMU Sara Sharon (1): cfg80211: initialize rekey_data Sean Young (1): media: sunxi-cir: ensure IR is handled when it is continuous Sebastian Andrzej Siewior (1): orinoco: Move context allocation after processing the skb SeongJae Park (5): xen/xenbus: Allow watches discard events before queueing xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path() xen/xenbus/xen_bus_type: Support will_handle watch callback xen/xenbus: Count pending messages for each watch xenbus/xenbus_backend: Disallow pending watch messages Simon Beginn (1): Input: goodix - add upside-down quirk for Teclast X98 Pro tablet Stefan Haberland (2): s390/dasd: fix list corruption of pavgroup group list s390/dasd: fix list corruption of lcu list Sven Eckelmann (1): mtd: parser: cmdline: Fix parsing of part-names with colons Takashi Iwai (4): ALSA: usb-audio: Fix potential out-of-bounds shift ALSA: usb-audio: Fix control 'access overflow' errors from chmap ALSA: pcm: oss: Fix potential out-of-bounds shift ALSA: pcm: oss: Fix a few more UBSAN fixes Thomas Gleixner (2): USB: sisusbvga: Make console support depend on BROKEN dm table: Remove BUG_ON(in_interrupt()) Timo Witte (1): platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Tom Rix (1): drm/gma500: fix double free of gma_connector Vincent Stehlé (2): powerpc/ps3: use dma_mapping_error() net: korina: fix return value Vineet Gupta (1): ARC: stack unwinding: don't assume non-current task is sleeping Will McVicker (1): USB: gadget: f_rndis: fix bitrate for SuperSpeed and above Yang Yingliang (2): drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() speakup: fix uninitialized flush_lock Yu Kuai (1): pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() Zhang Changzhong (2): net: bridge: vlan: fix error return code in __vlan_add() scsi: fnic: Fix error return code in fnic_probe() Zhang Qilong (12): can: softing: softing_netdev_open(): fix error handling spi: img-spfi: fix reference leak in img_spfi_resume spi: spi-ti-qspi: fix reference leak in ti_qspi_setup spi: tegra20-slink: fix reference leak in slink ops of tegra20 spi: tegra20-sflash: fix reference leak in tegra_sflash_resume spi: tegra114: fix reference leak in tegra spi ops soc: ti: knav_qmss: fix reference leak in knav_queue_probe soc: ti: Fix reference imbalance in knav_dma_probe scsi: pm80xx: Fix error return in pm8001_pci_probe() usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe usb: oxu210hp-hcd: Fix memory leak in oxu_create clk: ti: Fix memleak in ti_fapll_synth_setup Zhe Li (1): jffs2: Fix GC exit abnormally Zheng Zengkai (1): perf record: Fix memory leak when using '--user-regs=?' to list registers Zhihao Cheng (1): drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe

3 years, 10 months

1
1
0 0

[PATCH] usb: gadget: configfs: Fix use-after-free issue with udc_name

by Macpaul Lin

There is a use-after-free issue, if access udc_name in function gadget_dev_desc_UDC_store after another context free udc_name in function unregister_gadget. Contex 1: gadget_dev_desc_UDC_store()->unregister_gadget()-> free udc_name->set udc_name to NULL Contex 2: gadget_dev_desc_UDC_show()-> access udc_name Call trace: dump_backtrace+0x0/0x340 show_stack+0x14/0x1c dump_stack+0xe4/0x134 print_address_description+0x78/0x478 __kasan_report+0x270/0x2ec kasan_report+0x10/0x18 __asan_report_load1_noabort+0x18/0x20 string+0xf4/0x138 vsnprintf+0x428/0x14d0 sprintf+0xe4/0x12c gadget_dev_desc_UDC_show+0x54/0x64 configfs_read_file+0x210/0x3a0 __vfs_read+0xf0/0x49c vfs_read+0x130/0x2b4 SyS_read+0x114/0x208 el0_svc_naked+0x34/0x38 Add mutex_lock to protect this kind of scenario. Signed-off-by: Eddie Hung <eddie.hung(a)mediatek.com> Signed-off-by: Macpaul Lin <macpaul.lin(a)mediatek.com> Cc: stable(a)vger.kernel.org --- drivers/usb/gadget/configfs.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index 9dc06a4e1b30..21110b2865b9 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -221,9 +221,16 @@ static ssize_t gadget_dev_desc_bcdUSB_store(struct config_item *item, static ssize_t gadget_dev_desc_UDC_show(struct config_item *item, char *page) { - char *udc_name = to_gadget_info(item)->composite.gadget_driver.udc_name; + struct gadget_info *gi = to_gadget_info(item); + char *udc_name; + int ret; + + mutex_lock(&gi->lock); + udc_name = gi->composite.gadget_driver.udc_name; + ret = sprintf(page, "%s\n", udc_name ?: ""); + mutex_unlock(&gi->lock); - return sprintf(page, "%s\n", udc_name ?: ""); + return ret; } static int unregister_gadget(struct gadget_info *gi) -- 2.18.0

3 years, 10 months

5
9
0 0

[PATCH 4.9 000/175] 4.9.249-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.249 release. There are 175 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 Wed, 30 Dec 2020 12:48:23 +0000. 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.9.249-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.9.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.9.249-rc1 Jubin Zhong <zhongjubin(a)huawei.com> PCI: Fix pci_slot_release() NULL pointer dereference Pawel Wieczorkiewicz <wipawel(a)amazon.de> xen-blkback: set ring->xenblkd to NULL after kthread_stop() Terry Zhou <bjzhou(a)marvell.com> clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio:pressure:mpl3115: Force alignment of buffer Qinglang Miao <miaoqinglang(a)huawei.com> iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume Nuno Sá <nuno.sa(a)analog.com> iio: buffer: Fix demux update Sven Eckelmann <sven(a)narfation.org> mtd: parser: cmdline: Fix parsing of part-names with colons Evan Green <evgreen(a)chromium.org> soc: qcom: smp2p: Safely acquire spinlock without IRQs Lukas Wunner <lukas(a)wunner.de> spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path Lukas Wunner <lukas(a)wunner.de> spi: sc18is602: Don't leak SPI master in probe error path Lukas Wunner <lukas(a)wunner.de> spi: rb4xx: Don't leak SPI master in probe error path Lukas Wunner <lukas(a)wunner.de> spi: pic32: Don't leak DMA channels in probe error path Lukas Wunner <lukas(a)wunner.de> spi: davinci: Fix use-after-free on unbind Lukas Wunner <lukas(a)wunner.de> spi: spi-sh: Fix use-after-free on unbind Zwane Mwaikambo <zwane(a)yosper.io> drm/dp_aux_dev: check aux_dev before use in drm_dp_aux_dev_get_by_minor() Dave Kleikamp <dave.kleikamp(a)oracle.com> jfs: Fix array index bounds check in dbAdjTree Zhe Li <lizhe67(a)huawei.com> jffs2: Fix GC exit abnormally Luis Henriques <lhenriques(a)suse.de> ceph: fix race in concurrent __ceph_remove_cap invocations Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/xmon: Change printk() to pr_cont() Marc Zyngier <maz(a)kernel.org> KVM: arm64: Introduce handling of AArch32 TTBCR2 traps Chunguang Xu <brookxu(a)tencent.com> ext4: fix a memory leak of ext4_free_data Pavel Machek <pavel(a)denx.de> btrfs: fix return value mixup in btrfs_get_extent Filipe Manana <fdmanana(a)suse.com> Btrfs: fix selftests failure due to uninitialized i_mode in test inodes Qu Wenruo <wqu(a)suse.com> btrfs: scrub: Don't use inode page cache in scrub_handle_errored_block() Qu Wenruo <wqu(a)suse.com> btrfs: quota: Set rescan progress to (u64)-1 if we hit last leaf Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix write unthrottling Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix tx-unthrottle use-after-free Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix write-wakeup use-after-free Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix stalled writes Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix write deadlock Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: fix dropped unthrottle interrupts Johan Hovold <johan(a)kernel.org> USB: serial: mos7720: fix parallel-port state restore Athira Rajeev <atrajeev(a)linux.vnet.ibm.com> powerpc/perf: Exclude kernel samples while counting events in user space. Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: mf6x4: Fix AI end-of-conversion detection Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix list corruption of lcu list Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix list corruption of pavgroup group list Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: prevent inconsistent LCU device data Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Disable sample read check if firmware doesn't give back Takashi Iwai <tiwai(a)suse.de> ALSA: pcm: oss: Fix a few more UBSAN fixes Hui Wang <hui.wang(a)canonical.com> ACPI: PNP: compare the string length in the matching_id() Daniel Scally <djrscally(a)gmail.com> Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" Arnd Bergmann <arnd(a)arndb.de> Input: cyapa_gen6 - fix out-of-bounds stack access Lukas Wunner <lukas(a)wunner.de> media: netup_unidvb: Don't leak SPI master in probe error path Sean Young <sean(a)mess.org> media: sunxi-cir: ensure IR is handled when it is continuous Alan Stern <stern(a)rowland.harvard.edu> media: gspca: Fix memory leak in probe Simon Beginn <linux(a)simonmicro.de> Input: goodix - add upside-down quirk for Teclast X98 Pro tablet Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Input: cros_ec_keyb - send 'scancodes' in addition to key events Sara Sharon <sara.sharon(a)intel.com> cfg80211: initialize rekey_data Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> clk: s2mps11: Fix a resource leak in error handling paths in the probe function Dan Carpenter <dan.carpenter(a)oracle.com> qlcnic: Fix error code in probe Zheng Zengkai <zhengzengkai(a)huawei.com> perf record: Fix memory leak when using '--user-regs=?' to list registers Zhang Qilong <zhangqilong3(a)huawei.com> clk: ti: Fix memleak in ti_fapll_synth_setup Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> watchdog: qcom: Avoid context switch in restart handler Vincent Stehlé <vincent.stehle(a)laposte.net> net: korina: fix return value Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> net: bcmgenet: Fix a resource leak in an error handling path in the probe functin Dwaipayan Ray <dwaipayanray1(a)gmail.com> checkpatch: fix unescaped left brace Vincent Stehlé <vincent.stehle(a)laposte.net> powerpc/ps3: use dma_mapping_error() Bongsu Jeon <bongsu.jeon(a)samsung.com> nfc: s3fwrn5: Release the nfc firmware Anton Ivanov <anton.ivanov(a)cambridgegreys.com> um: chan_xterm: Fix fd leak Marc Zyngier <maz(a)kernel.org> irqchip/alpine-msi: Fix freeing of interrupts on allocation error path Dan Carpenter <dan.carpenter(a)oracle.com> ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() Marek Szyprowski <m.szyprowski(a)samsung.com> extcon: max77693: Fix modalias string Dmitry Osipenko <digetx(a)gmail.com> clk: tegra: Fix duplicated SE clock entry Masami Hiramatsu <mhiramat(a)kernel.org> x86/kprobes: Restore BTF if the single-stepping is cancelled Cheng Lin <cheng.lin130(a)zte.com.cn> nfs_common: need lock during iterate through the list kazuo ito <kzpn200(a)gmail.com> nfsd: Fix message level for normal termination Yang Yingliang <yangyingliang(a)huawei.com> speakup: fix uninitialized flush_lock Zhang Qilong <zhangqilong3(a)huawei.com> usb: oxu210hp-hcd: Fix memory leak in oxu_create Zhang Qilong <zhangqilong3(a)huawei.com> usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops Zhang Changzhong <zhangchangzhong(a)huawei.com> scsi: fnic: Fix error return code in fnic_probe() Arnd Bergmann <arnd(a)arndb.de> seq_buf: Avoid type mismatch for seq_buf_init Zhang Qilong <zhangqilong3(a)huawei.com> scsi: pm80xx: Fix error return in pm8001_pci_probe() Pali Rohár <pali(a)kernel.org> cpufreq: scpi: Add missing MODULE_ALIAS Pali Rohár <pali(a)kernel.org> cpufreq: loongson1: Add missing MODULE_ALIAS Pali Rohár <pali(a)kernel.org> cpufreq: st: Add missing MODULE_DEVICE_TABLE Pali Rohár <pali(a)kernel.org> cpufreq: highbank: Add missing MODULE_DEVICE_TABLE Keqian Zhu <zhukeqian1(a)huawei.com> clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI Qinglang Miao <miaoqinglang(a)huawei.com> dm ioctl: fix error return code in target_message Chuhong Yuan <hslester96(a)gmail.com> ASoC: jz4740-i2s: add missed checks for clk_get() Jing Xiangfeng <jingxiangfeng(a)huawei.com> memstick: r592: Fix error return in r592_probe() Yu Kuai <yukuai3(a)huawei.com> pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() Yu Kuai <yukuai3(a)huawei.com> clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() Dan Carpenter <dan.carpenter(a)oracle.com> media: saa7146: fix array overflow in vidioc_s_audio() Jason Gunthorpe <jgg(a)nvidia.com> vfio-pci: Use io_remap_pfn_range() for PCI IO memory NeilBrown <neilb(a)suse.de> NFS: switch nfsiod to be an UNBOUND workqueue. Calum Mackay <calum.mackay(a)oracle.com> lockd: don't use interval-based rebinding over TCP Trond Myklebust <trond.myklebust(a)hammerspace.com> SUNRPC: xprt_load_transport() needs to support the netid "rdma6" Olga Kornievskaia <kolga(a)netapp.com> NFSv4.2: condition READDIR's mask for security label based on LSM state Alexandre Belloni <alexandre.belloni(a)bootlin.com> ARM: dts: at91: at91sam9rl: fix ADC triggers Jing Xiangfeng <jingxiangfeng(a)huawei.com> HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() Qinglang Miao <miaoqinglang(a)huawei.com> mips: cdmm: fix use-after-free in mips_cdmm_bus_discover Keita Suzuki <keitasuzuki.park(a)sslab.ics.keio.ac.jp> media: siano: fix memory leak of debugfs members in smsdvb_hotplug Qinglang Miao <miaoqinglang(a)huawei.com> cw1200: fix missing destroy_workqueue() on error in cw1200_init_common Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> orinoco: Move context allocation after processing the skb Cristian Birsan <cristian.birsan(a)microchip.com> ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host Cristian Birsan <cristian.birsan(a)microchip.com> ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host Qinglang Miao <miaoqinglang(a)huawei.com> memstick: fix a double-free bug in memstick_check Kamal Heib <kamalheib1(a)gmail.com> RDMA/cxgb4: Validate the number of CQEs Zhihao Cheng <chengzhihao1(a)huawei.com> drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe Zhang Qilong <zhangqilong3(a)huawei.com> soc: ti: Fix reference imbalance in knav_dma_probe Zhang Qilong <zhangqilong3(a)huawei.com> soc: ti: knav_qmss: fix reference leak in knav_queue_probe Zhang Qilong <zhangqilong3(a)huawei.com> crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Input: ads7846 - fix unaligned access on 7845 Oleksij Rempel <o.rempel(a)pengutronix.de> Input: ads7846 - fix integer overflow on Rt calculation Yang Yingliang <yangyingliang(a)huawei.com> drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() Qinglang Miao <miaoqinglang(a)huawei.com> media: solo6x10: fix missing snd_card_free in error handling case Zhang Qilong <zhangqilong3(a)huawei.com> staging: greybus: codecs: Fix reference counter leak in error handling Necip Fazil Yildiran <fazilyildiran(a)gmail.com> MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA Arnd Bergmann <arnd(a)arndb.de> RDMa/mthca: Work around -Wenum-conversion warning Vincent Bernat <vincent(a)bernat.ch> net: evaluate net.ipv4.conf.all.proxy_arp_pvlan Vincent Bernat <vincent(a)bernat.ch> net: evaluate net.ipvX.conf.all.ignore_routes_with_linkdown Zhang Qilong <zhangqilong3(a)huawei.com> spi: tegra114: fix reference leak in tegra spi ops Zhang Qilong <zhangqilong3(a)huawei.com> spi: tegra20-sflash: fix reference leak in tegra_sflash_resume Zhang Qilong <zhangqilong3(a)huawei.com> spi: tegra20-slink: fix reference leak in slink ops of tegra20 Zhang Qilong <zhangqilong3(a)huawei.com> spi: spi-ti-qspi: fix reference leak in ti_qspi_setup Anmol Karn <anmol.karan123(a)gmail.com> Bluetooth: Fix null pointer dereference in hci_event_packet() Paweł Chmiel <pawel.mikolaj.chmiel(a)gmail.com> arm64: dts: exynos: Correct psci compatible used on Exynos7 Cezary Rojewski <cezary.rojewski(a)intel.com> ASoC: pcm: DRAIN support reactivation Zhang Qilong <zhangqilong3(a)huawei.com> spi: img-spfi: fix reference leak in img_spfi_resume Christophe Leroy <christophe.leroy(a)csgroup.eu> crypto: talitos - Fix return type of current_desc_hdr() Ard Biesheuvel <ardb(a)kernel.org> ARM: p2v: fix handling of LPAE translation in BE mode Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Compute PSN windows correctly Tom Rix <trix(a)redhat.com> drm/gma500: fix double free of gma_connector Peilin Ye <yepeilin.cs(a)gmail.com> Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() Dae R. Jeong <dae.r.jeong(a)kaist.ac.kr> md: fix a warning caused by a race between concurrent md_ioctl()s Antti Palosaari <crope(a)iki.fi> media: msi2500: assign SPI bus number dynamically Alexey Kardashevskiy <aik(a)ozlabs.ru> serial_core: Check for port state when tty is in error state Julian Sax <jsbc(a)gmx.de> HID: i2c-hid: add Vero K147 to descriptor override Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: fix USB 3.0 pins supply being turned off on Odroid XU Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: fix USB 3.0 VBUS control and over-current pins on Exynos5410 Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: fix roles of USB 3.0 ports on Odroid XU Fabio Estevam <festevam(a)gmail.com> usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul Jack Pham <jackp(a)codeaurora.org> usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus Will McVicker <willmcvicker(a)google.com> USB: gadget: f_rndis: fix bitrate for SuperSpeed and above Will McVicker <willmcvicker(a)google.com> USB: gadget: f_midi: setup SuperSpeed Plus descriptors taehyun.cho <taehyun.cho(a)samsung.com> USB: gadget: f_acm: add support for SuperSpeed Plus Johan Hovold <johan(a)kernel.org> USB: serial: option: add interface-number sanity check to flag handling Nicolin Chen <nicoleotsuka(a)gmail.com> soc/tegra: fuse: Fix index bug in get_process_id Thomas Gleixner <tglx(a)linutronix.de> dm table: Remove BUG_ON(in_interrupt()) Sreekanth Reddy <sreekanth.reddy(a)broadcom.com> scsi: mpt3sas: Increase IOCInit request timeout to 30s Qinglang Miao <miaoqinglang(a)huawei.com> drm/tegra: sor: Disable clocks on error in tegra_sor_init() Nicholas Piggin <npiggin(a)gmail.com> kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling Leon Romanovsky <leonro(a)nvidia.com> RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait Zhang Qilong <zhangqilong3(a)huawei.com> can: softing: softing_netdev_open(): fix error handling Randy Dunlap <rdunlap(a)infradead.org> scsi: bnx2i: Requires MMU Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> pinctrl: baytrail: Avoid clearing debounce value when turning it off Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> pinctrl: merrifield: Set default bias in case no particular value given Alexander Sverdlin <alexander.sverdlin(a)gmail.com> serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access Takashi Iwai <tiwai(a)suse.de> ALSA: pcm: oss: Fix potential out-of-bounds shift Thomas Gleixner <tglx(a)linutronix.de> USB: sisusbvga: Make console support depend on BROKEN Li Jun <jun.li(a)nxp.com> xhci: Give USB2 ports time to enter U3 in bus suspend Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix control 'access overflow' errors from chmap Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix potential out-of-bounds shift Oliver Neukum <oneukum(a)suse.com> USB: add RESET_RESUME quirk for Snapscan 1212 Bui Quang Minh <minhquangbui99(a)gmail.com> USB: dummy-hcd: Fix uninitialized array use in init() Eric Dumazet <edumazet(a)google.com> mac80211: mesh: fix mesh_pathtbl_init() error path Zhang Changzhong <zhangchangzhong(a)huawei.com> net: bridge: vlan: fix error return code in __vlan_add() Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux Fugang Duan <fugang.duan(a)nxp.com> net: stmmac: delete the eee_ctrl_timer after napi disabled Neal Cardwell <ncardwell(a)google.com> tcp: fix cwnd-limited bug for TSO deferral where we send nothing Moshe Shemesh <moshe(a)mellanox.com> net/mlx4_en: Avoid scheduling restart task if it is already running Lukas Wunner <lukas(a)wunner.de> spi: Prevent adding devices below an unregistering controller Dan Carpenter <dan.carpenter(a)oracle.com> scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" Coiby Xu <coiby.xu(a)gmail.com> pinctrl: amd: remove debounce filter setting in IRQ type setting Chris Chiu <chiu(a)endlessos.org> Input: i8042 - add Acer laptops to the i8042 reset list Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Input: cm109 - do not stomp on control URB Timo Witte <timo.witte(a)gmail.com> platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Vineet Gupta <vgupta(a)synopsys.com> ARC: stack unwinding: don't assume non-current task is sleeping Markus Reichl <m.reichl(a)fivetechno.de> arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: limit memory read spin time Nathan Chancellor <natechancellor(a)gmail.com> spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe Lukas Wunner <lukas(a)wunner.de> spi: bcm2835aux: Fix use-after-free on unbind ------------- Diffstat: Documentation/networking/ip-sysctl.txt | 3 + Makefile | 4 +- arch/arc/kernel/stacktrace.c | 23 +++++--- arch/arm/boot/dts/at91-sama5d3_xplained.dts | 7 +++ arch/arm/boot/dts/at91-sama5d4_xplained.dts | 7 +++ arch/arm/boot/dts/at91sam9rl.dtsi | 19 ++++--- arch/arm/boot/dts/exynos5410-odroidxu.dts | 6 +- arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 ++++++++++ arch/arm/boot/dts/exynos5410.dtsi | 4 ++ arch/arm/kernel/head.S | 6 +- arch/arm64/boot/dts/exynos/exynos7.dtsi | 4 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 + arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/sys_regs.c | 1 + arch/mips/bcm47xx/Kconfig | 1 + arch/powerpc/include/asm/cputable.h | 5 -- arch/powerpc/perf/core-book3s.c | 10 ++++ arch/powerpc/platforms/pseries/suspend.c | 1 - arch/powerpc/xmon/nonstdio.c | 2 +- arch/um/drivers/xterm.c | 5 ++ arch/x86/kernel/kprobes/core.c | 5 ++ drivers/acpi/acpi_pnp.c | 3 + drivers/acpi/resource.c | 2 +- drivers/block/xen-blkback/xenbus.c | 1 + drivers/bus/mips_cdmm.c | 4 +- drivers/clk/clk-s2mps11.c | 1 + drivers/clk/mvebu/armada-37xx-xtal.c | 4 +- drivers/clk/tegra/clk-id.h | 1 + drivers/clk/tegra/clk-tegra-periph.c | 2 +- drivers/clk/ti/fapll.c | 11 +++- drivers/clocksource/arm_arch_timer.c | 23 +++++--- drivers/clocksource/cadence_ttc_timer.c | 18 +++--- drivers/cpufreq/highbank-cpufreq.c | 7 +++ drivers/cpufreq/loongson1-cpufreq.c | 1 + drivers/cpufreq/scpi-cpufreq.c | 1 + drivers/cpufreq/sti-cpufreq.c | 7 +++ drivers/crypto/omap-aes.c | 3 +- drivers/crypto/talitos.c | 6 +- drivers/extcon/extcon-max77693.c | 2 +- drivers/gpu/drm/drm_dp_aux_dev.c | 2 +- drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 + drivers/gpu/drm/tegra/sor.c | 10 +++- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 +++ drivers/hsi/controllers/omap_ssi_core.c | 2 +- drivers/iio/adc/rockchip_saradc.c | 2 +- drivers/iio/industrialio-buffer.c | 6 +- drivers/iio/pressure/mpl3115.c | 9 ++- drivers/infiniband/core/cm.c | 2 + drivers/infiniband/hw/cxgb4/cq.c | 3 + drivers/infiniband/hw/mthca/mthca_cq.c | 2 +- drivers/infiniband/hw/mthca/mthca_dev.h | 1 - drivers/infiniband/sw/rxe/rxe_req.c | 3 +- drivers/input/keyboard/cros_ec_keyb.c | 1 + drivers/input/misc/cm109.c | 7 ++- drivers/input/mouse/cyapa_gen6.c | 2 +- drivers/input/serio/i8042-x86ia64io.h | 42 ++++++++++++++ drivers/input/touchscreen/ads7846.c | 8 ++- drivers/input/touchscreen/goodix.c | 12 ++++ drivers/irqchip/irq-alpine-msi.c | 3 +- drivers/md/dm-ioctl.c | 1 + drivers/md/dm-table.c | 6 -- drivers/md/md.c | 7 ++- drivers/media/common/siano/smsdvb-main.c | 5 +- drivers/media/pci/netup_unidvb/netup_unidvb_spi.c | 5 +- drivers/media/pci/saa7146/mxb.c | 19 ++++--- drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +- drivers/media/rc/sunxi-cir.c | 2 + drivers/media/usb/gspca/gspca.c | 1 + drivers/media/usb/msi2500/msi2500.c | 2 +- drivers/memstick/core/memstick.c | 1 - drivers/memstick/host/r592.c | 12 ++-- drivers/mtd/cmdlinepart.c | 14 ++++- drivers/net/can/softing/softing_main.c | 9 ++- drivers/net/ethernet/allwinner/sun4i-emac.c | 7 ++- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- drivers/net/ethernet/korina.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 20 ++++--- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 7 ++- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 ++++- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 36 +++++++++--- .../net/wireless/intersil/orinoco/orinoco_usb.c | 14 ++--- drivers/net/wireless/st/cw1200/main.c | 2 + drivers/nfc/s3fwrn5/firmware.c | 4 +- drivers/pci/slot.c | 6 +- drivers/pinctrl/intel/pinctrl-baytrail.c | 8 ++- drivers/pinctrl/intel/pinctrl-merrifield.c | 8 +++ drivers/pinctrl/pinctrl-amd.c | 7 --- drivers/pinctrl/pinctrl-falcon.c | 14 +++-- drivers/platform/x86/acer-wmi.c | 1 + drivers/ps3/ps3stor_lib.c | 2 +- drivers/s390/block/dasd_alias.c | 12 +++- drivers/scsi/be2iscsi/be_main.c | 4 +- drivers/scsi/bnx2i/Kconfig | 1 + drivers/scsi/fnic/fnic_main.c | 1 + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 3 +- drivers/soc/qcom/smp2p.c | 5 +- drivers/soc/tegra/fuse/speedo-tegra210.c | 2 +- drivers/soc/ti/knav_dma.c | 13 ++++- drivers/soc/ti/knav_qmss_queue.c | 4 +- drivers/spi/Kconfig | 3 + drivers/spi/spi-bcm2835aux.c | 17 ++---- drivers/spi/spi-davinci.c | 2 +- drivers/spi/spi-img-spfi.c | 4 +- drivers/spi/spi-pic32.c | 1 + drivers/spi/spi-rb4xx.c | 2 +- drivers/spi/spi-sc18is602.c | 13 +---- drivers/spi/spi-sh.c | 13 ++--- drivers/spi/spi-st-ssc4.c | 5 +- drivers/spi/spi-tegra114.c | 2 + drivers/spi/spi-tegra20-sflash.c | 1 + drivers/spi/spi-tegra20-slink.c | 2 + drivers/spi/spi-ti-qspi.c | 1 + drivers/spi/spi.c | 21 ++++++- drivers/staging/comedi/drivers/mf6x4.c | 3 +- drivers/staging/greybus/audio_codec.c | 2 + drivers/staging/speakup/speakup_dectlk.c | 2 +- drivers/tty/serial/8250/8250_omap.c | 5 -- drivers/tty/serial/serial_core.c | 4 ++ drivers/usb/chipidea/ci_hdrc_imx.c | 3 +- drivers/usb/core/quirks.c | 3 + drivers/usb/gadget/function/f_acm.c | 2 +- drivers/usb/gadget/function/f_fs.c | 5 +- drivers/usb/gadget/function/f_midi.c | 6 ++ drivers/usb/gadget/function/f_rndis.c | 4 +- drivers/usb/gadget/udc/dummy_hcd.c | 2 +- drivers/usb/host/ehci-omap.c | 1 + drivers/usb/host/oxu210hp-hcd.c | 4 +- drivers/usb/host/xhci-hub.c | 4 ++ drivers/usb/misc/sisusbvga/Kconfig | 2 +- drivers/usb/serial/keyspan_pda.c | 63 +++++++++++---------- drivers/usb/serial/mos7720.c | 2 + drivers/usb/serial/option.c | 23 +++++++- drivers/vfio/pci/vfio_pci.c | 4 +- drivers/watchdog/qcom-wdt.c | 2 +- fs/btrfs/inode.c | 2 +- fs/btrfs/qgroup.c | 4 +- fs/btrfs/scrub.c | 17 +++--- fs/btrfs/tests/btrfs-tests.c | 8 ++- fs/ceph/caps.c | 11 +++- fs/ext4/mballoc.c | 1 + fs/jffs2/readinode.c | 16 ++++++ fs/jfs/jfs_dmap.h | 2 +- fs/lockd/host.c | 20 ++++--- fs/nfs/inode.c | 2 +- fs/nfs/nfs4proc.c | 10 +++- fs/nfs_common/grace.c | 6 +- fs/nfsd/nfssvc.c | 3 +- include/linux/inetdevice.h | 4 +- include/linux/seq_buf.h | 2 +- include/linux/sunrpc/xprt.h | 1 + include/linux/trace_seq.h | 4 +- kernel/cpu.c | 6 +- net/bluetooth/hci_event.c | 17 +++--- net/bridge/br_vlan.c | 4 +- net/ipv4/tcp_output.c | 9 ++- net/mac80211/mesh_pathtbl.c | 4 +- net/sunrpc/xprt.c | 65 ++++++++++++++++------ net/sunrpc/xprtrdma/module.c | 1 + net/sunrpc/xprtrdma/transport.c | 1 + net/sunrpc/xprtsock.c | 4 ++ net/wireless/nl80211.c | 2 +- scripts/checkpatch.pl | 2 +- sound/core/oss/pcm_oss.c | 28 +++++++--- sound/soc/codecs/wm_adsp.c | 5 +- sound/soc/jz4740/jz4740-i2s.c | 4 ++ sound/soc/soc-pcm.c | 2 + sound/usb/clock.c | 6 ++ sound/usb/format.c | 2 + sound/usb/stream.c | 6 +- tools/perf/util/parse-regs-options.c | 2 +- 174 files changed, 837 insertions(+), 344 deletions(-)

3 years, 10 months

4
178
0 0

[PATCH 4.14 3/3] mm: memcontrol: fix excessive complexity in memory.stat reporting

by Shaoying Xu

From: Johannes Weiner <hannes(a)cmpxchg.org> commit a983b5ebee57209c99f68c8327072f25e0e6e3da upstream We've seen memory.stat reads in top-level cgroups take up to fourteen seconds during a userspace bug that created tens of thousands of ghost cgroups pinned by lingering page cache. Even with a more reasonable number of cgroups, aggregating memory.stat is unnecessarily heavy. The complexity is this: nr_cgroups * nr_stat_items * nr_possible_cpus where the stat items are ~70 at this point. With 128 cgroups and 128 CPUs - decent, not enormous setups - reading the top-level memory.stat has to aggregate over a million per-cpu counters. This doesn't scale. Instead of spreading the source of truth across all CPUs, use the per-cpu counters merely to batch updates to shared atomic counters. This is the same as the per-cpu stocks we use for charging memory to the shared atomic page_counters, and also the way the global vmstat counters are implemented. Vmstat has elaborate spilling thresholds that depend on the number of CPUs, amount of memory, and memory pressure - carefully balancing the cost of counter updates with the amount of per-cpu error. That's because the vmstat counters are system-wide, but also used for decisions inside the kernel (e.g. NR_FREE_PAGES in the allocator). Neither is true for the memory controller. Use the same static batch size we already use for page_counter updates during charging. The per-cpu error in the stats will be 128k, which is an acceptable ratio of cores to memory accounting granularity. [hannes(a)cmpxchg.org: fix warning in __this_cpu_xchg() calls] Link: http://lkml.kernel.org/r/20171201135750.GB8097@cmpxchg.org Link: http://lkml.kernel.org/r/20171103153336.24044-3-hannes@cmpxchg.org Signed-off-by: Johannes Weiner <hannes(a)cmpxchg.org> Acked-by: Vladimir Davydov <vdavydov.dev(a)gmail.com> Cc: Michal Hocko <mhocko(a)suse.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: stable(a)vger.kernel.org [shaoyi(a)amazon.com: resolved the conflict brought by commit 17ffa29c355658c8e9b19f56cbf0388500ca7905 in mm/memcontrol.c by contextual fix] Signed-off-by: Shaoying Xu <shaoyi(a)amazon.com> --- The excessive complexity in memory.stat reporting was fixed in v4.16 but didn't appear to make it to 4.14 stable. When backporting this patch, there is a small conflict brought by commit 17ffa29c355658c8e9b19f56cbf0388500ca7905 within free_mem_cgroup_per_node_info() of mm/memcontrol.c and can be resolved by contextual fix. include/linux/memcontrol.h | 96 +++++++++++++++++++++++++++--------------- mm/memcontrol.c | 101 +++++++++++++++++++++++---------------------- 2 files changed, 113 insertions(+), 84 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 1ffc54ac4cc9..882046863581 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -108,7 +108,10 @@ struct lruvec_stat { */ struct mem_cgroup_per_node { struct lruvec lruvec; - struct lruvec_stat __percpu *lruvec_stat; + + struct lruvec_stat __percpu *lruvec_stat_cpu; + atomic_long_t lruvec_stat[NR_VM_NODE_STAT_ITEMS]; + unsigned long lru_zone_size[MAX_NR_ZONES][NR_LRU_LISTS]; struct mem_cgroup_reclaim_iter iter[DEF_PRIORITY + 1]; @@ -227,10 +230,10 @@ struct mem_cgroup { spinlock_t move_lock; struct task_struct *move_lock_task; unsigned long move_lock_flags; - /* - * percpu counter. - */ - struct mem_cgroup_stat_cpu __percpu *stat; + + struct mem_cgroup_stat_cpu __percpu *stat_cpu; + atomic_long_t stat[MEMCG_NR_STAT]; + atomic_long_t events[MEMCG_NR_EVENTS]; unsigned long socket_pressure; @@ -265,6 +268,12 @@ struct mem_cgroup { /* WARNING: nodeinfo must be the last member here */ }; +/* + * size of first charge trial. "32" comes from vmscan.c's magic value. + * TODO: maybe necessary to use big numbers in big irons. + */ +#define MEMCG_CHARGE_BATCH 32U + extern struct mem_cgroup *root_mem_cgroup; static inline bool mem_cgroup_disabled(void) @@ -485,32 +494,38 @@ void unlock_page_memcg(struct page *page); static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx) { - long val = 0; - int cpu; - - for_each_possible_cpu(cpu) - val += per_cpu(memcg->stat->count[idx], cpu); - - if (val < 0) - val = 0; - - return val; + long x = atomic_long_read(&memcg->stat[idx]); +#ifdef CONFIG_SMP + if (x < 0) + x = 0; +#endif + return x; } /* idx can be of type enum memcg_stat_item or node_stat_item */ static inline void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val) { - if (!mem_cgroup_disabled()) - __this_cpu_add(memcg->stat->count[idx], val); + long x; + + if (mem_cgroup_disabled()) + return; + + x = val + __this_cpu_read(memcg->stat_cpu->count[idx]); + if (unlikely(abs(x) > MEMCG_CHARGE_BATCH)) { + atomic_long_add(x, &memcg->stat[idx]); + x = 0; + } + __this_cpu_write(memcg->stat_cpu->count[idx], x); } /* idx can be of type enum memcg_stat_item or node_stat_item */ static inline void mod_memcg_state(struct mem_cgroup *memcg, int idx, int val) { - if (!mem_cgroup_disabled()) - this_cpu_add(memcg->stat->count[idx], val); + preempt_disable(); + __mod_memcg_state(memcg, idx, val); + preempt_enable(); } /** @@ -548,26 +563,25 @@ static inline unsigned long lruvec_page_state(struct lruvec *lruvec, enum node_stat_item idx) { struct mem_cgroup_per_node *pn; - long val = 0; - int cpu; + long x; if (mem_cgroup_disabled()) return node_page_state(lruvec_pgdat(lruvec), idx); pn = container_of(lruvec, struct mem_cgroup_per_node, lruvec); - for_each_possible_cpu(cpu) - val += per_cpu(pn->lruvec_stat->count[idx], cpu); - - if (val < 0) - val = 0; - - return val; + x = atomic_long_read(&pn->lruvec_stat[idx]); +#ifdef CONFIG_SMP + if (x < 0) + x = 0; +#endif + return x; } static inline void __mod_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx, int val) { struct mem_cgroup_per_node *pn; + long x; /* Update node */ __mod_node_page_state(lruvec_pgdat(lruvec), idx, val); @@ -581,7 +595,12 @@ static inline void __mod_lruvec_state(struct lruvec *lruvec, __mod_memcg_state(pn->memcg, idx, val); /* Update lruvec */ - __this_cpu_add(pn->lruvec_stat->count[idx], val); + x = val + __this_cpu_read(pn->lruvec_stat_cpu->count[idx]); + if (unlikely(abs(x) > MEMCG_CHARGE_BATCH)) { + atomic_long_add(x, &pn->lruvec_stat[idx]); + x = 0; + } + __this_cpu_write(pn->lruvec_stat_cpu->count[idx], x); } static inline void mod_lruvec_state(struct lruvec *lruvec, @@ -624,16 +643,25 @@ unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, static inline void __count_memcg_events(struct mem_cgroup *memcg, int idx, unsigned long count) { - if (!mem_cgroup_disabled()) - __this_cpu_add(memcg->stat->events[idx], count); + unsigned long x; + + if (mem_cgroup_disabled()) + return; + + x = count + __this_cpu_read(memcg->stat_cpu->events[idx]); + if (unlikely(x > MEMCG_CHARGE_BATCH)) { + atomic_long_add(x, &memcg->events[idx]); + x = 0; + } + __this_cpu_write(memcg->stat_cpu->events[idx], x); } -/* idx can be of type enum memcg_event_item or vm_event_item */ static inline void count_memcg_events(struct mem_cgroup *memcg, int idx, unsigned long count) { - if (!mem_cgroup_disabled()) - this_cpu_add(memcg->stat->events[idx], count); + preempt_disable(); + __count_memcg_events(memcg, idx, count); + preempt_enable(); } /* idx can be of type enum memcg_event_item or vm_event_item */ diff --git a/mm/memcontrol.c b/mm/memcontrol.c index eba9dc4795b5..4e763cdccb33 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -542,39 +542,10 @@ mem_cgroup_largest_soft_limit_node(struct mem_cgroup_tree_per_node *mctz) return mz; } -/* - * Return page count for single (non recursive) @memcg. - * - * Implementation Note: reading percpu statistics for memcg. - * - * Both of vmstat[] and percpu_counter has threshold and do periodic - * synchronization to implement "quick" read. There are trade-off between - * reading cost and precision of value. Then, we may have a chance to implement - * a periodic synchronization of counter in memcg's counter. - * - * But this _read() function is used for user interface now. The user accounts - * memory usage by memory cgroup and he _always_ requires exact value because - * he accounts memory. Even if we provide quick-and-fuzzy read, we always - * have to visit all online cpus and make sum. So, for now, unnecessary - * synchronization is not implemented. (just implemented for cpu hotplug) - * - * If there are kernel internal actions which can make use of some not-exact - * value, and reading all cpu value can be performance bottleneck in some - * common workload, threshold and synchronization as vmstat[] should be - * implemented. - * - * The parameter idx can be of type enum memcg_event_item or vm_event_item. - */ - static unsigned long memcg_sum_events(struct mem_cgroup *memcg, int event) { - unsigned long val = 0; - int cpu; - - for_each_possible_cpu(cpu) - val += per_cpu(memcg->stat->events[event], cpu); - return val; + return atomic_long_read(&memcg->events[event]); } static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, @@ -606,7 +577,7 @@ static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, nr_pages = -nr_pages; /* for event */ } - __this_cpu_add(memcg->stat->nr_page_events, nr_pages); + __this_cpu_add(memcg->stat_cpu->nr_page_events, nr_pages); } unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, @@ -642,8 +613,8 @@ static bool mem_cgroup_event_ratelimit(struct mem_cgroup *memcg, { unsigned long val, next; - val = __this_cpu_read(memcg->stat->nr_page_events); - next = __this_cpu_read(memcg->stat->targets[target]); + val = __this_cpu_read(memcg->stat_cpu->nr_page_events); + next = __this_cpu_read(memcg->stat_cpu->targets[target]); /* from time_after() in jiffies.h */ if ((long)(next - val) < 0) { switch (target) { @@ -659,7 +630,7 @@ static bool mem_cgroup_event_ratelimit(struct mem_cgroup *memcg, default: break; } - __this_cpu_write(memcg->stat->targets[target], next); + __this_cpu_write(memcg->stat_cpu->targets[target], next); return true; } return false; @@ -1726,11 +1697,6 @@ void unlock_page_memcg(struct page *page) } EXPORT_SYMBOL(unlock_page_memcg); -/* - * size of first charge trial. "32" comes from vmscan.c's magic value. - * TODO: maybe necessary to use big numbers in big irons. - */ -#define CHARGE_BATCH 32U struct memcg_stock_pcp { struct mem_cgroup *cached; /* this never be root cgroup */ unsigned int nr_pages; @@ -1758,7 +1724,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages) unsigned long flags; bool ret = false; - if (nr_pages > CHARGE_BATCH) + if (nr_pages > MEMCG_CHARGE_BATCH) return ret; local_irq_save(flags); @@ -1827,7 +1793,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) } stock->nr_pages += nr_pages; - if (stock->nr_pages > CHARGE_BATCH) + if (stock->nr_pages > MEMCG_CHARGE_BATCH) drain_stock(stock); local_irq_restore(flags); @@ -1877,9 +1843,44 @@ static void drain_all_stock(struct mem_cgroup *root_memcg) static int memcg_hotplug_cpu_dead(unsigned int cpu) { struct memcg_stock_pcp *stock; + struct mem_cgroup *memcg; stock = &per_cpu(memcg_stock, cpu); drain_stock(stock); + + for_each_mem_cgroup(memcg) { + int i; + + for (i = 0; i < MEMCG_NR_STAT; i++) { + int nid; + long x; + + x = this_cpu_xchg(memcg->stat_cpu->count[i], 0); + if (x) + atomic_long_add(x, &memcg->stat[i]); + + if (i >= NR_VM_NODE_STAT_ITEMS) + continue; + + for_each_node(nid) { + struct mem_cgroup_per_node *pn; + + pn = mem_cgroup_nodeinfo(memcg, nid); + x = this_cpu_xchg(pn->lruvec_stat_cpu->count[i], 0); + if (x) + atomic_long_add(x, &pn->lruvec_stat[i]); + } + } + + for (i = 0; i < MEMCG_NR_EVENTS; i++) { + long x; + + x = this_cpu_xchg(memcg->stat_cpu->events[i], 0); + if (x) + atomic_long_add(x, &memcg->events[i]); + } + } + return 0; } @@ -1900,7 +1901,7 @@ static void high_work_func(struct work_struct *work) struct mem_cgroup *memcg; memcg = container_of(work, struct mem_cgroup, high_work); - reclaim_high(memcg, CHARGE_BATCH, GFP_KERNEL); + reclaim_high(memcg, MEMCG_CHARGE_BATCH, GFP_KERNEL); } /* @@ -1924,7 +1925,7 @@ void mem_cgroup_handle_over_high(void) static int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, unsigned int nr_pages) { - unsigned int batch = max(CHARGE_BATCH, nr_pages); + unsigned int batch = max(MEMCG_CHARGE_BATCH, nr_pages); int nr_retries = MEM_CGROUP_RECLAIM_RETRIES; struct mem_cgroup *mem_over_limit; struct page_counter *counter; @@ -4203,8 +4204,8 @@ static int alloc_mem_cgroup_per_node_info(struct mem_cgroup *memcg, int node) if (!pn) return 1; - pn->lruvec_stat = alloc_percpu(struct lruvec_stat); - if (!pn->lruvec_stat) { + pn->lruvec_stat_cpu = alloc_percpu(struct lruvec_stat); + if (!pn->lruvec_stat_cpu) { kfree(pn); return 1; } @@ -4225,7 +4226,7 @@ static void free_mem_cgroup_per_node_info(struct mem_cgroup *memcg, int node) if (!pn) return; - free_percpu(pn->lruvec_stat); + free_percpu(pn->lruvec_stat_cpu); kfree(pn); } @@ -4235,7 +4236,7 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg) for_each_node(node) free_mem_cgroup_per_node_info(memcg, node); - free_percpu(memcg->stat); + free_percpu(memcg->stat_cpu); kfree(memcg); } @@ -4264,8 +4265,8 @@ static struct mem_cgroup *mem_cgroup_alloc(void) if (memcg->id.id < 0) goto fail; - memcg->stat = alloc_percpu(struct mem_cgroup_stat_cpu); - if (!memcg->stat) + memcg->stat_cpu = alloc_percpu(struct mem_cgroup_stat_cpu); + if (!memcg->stat_cpu) goto fail; for_each_node(node) @@ -5686,7 +5687,7 @@ static void uncharge_batch(const struct uncharge_gather *ug) __mod_memcg_state(ug->memcg, MEMCG_RSS_HUGE, -ug->nr_huge); __mod_memcg_state(ug->memcg, NR_SHMEM, -ug->nr_shmem); __count_memcg_events(ug->memcg, PGPGOUT, ug->pgpgout); - __this_cpu_add(ug->memcg->stat->nr_page_events, nr_pages); + __this_cpu_add(ug->memcg->stat_cpu->nr_page_events, nr_pages); memcg_check_events(ug->memcg, ug->dummy_page); local_irq_restore(flags); -- 2.16.6

3 years, 10 months

1
0
0 0

[PATCH 4.14 2/3] mm: memcontrol: implement lruvec stat functions on top of each other

by Shaoying Xu

From: Johannes Weiner <hannes(a)cmpxchg.org> commit 284542656e22c43fdada8c8cc0ca9ede8453eed7 upstream The implementation of the lruvec stat functions and their variants for accounting through a page, or accounting from a preemptible context, are mostly identical and needlessly repetitive. Implement the lruvec_page functions by looking up the page's lruvec and then using the lruvec function. Implement the functions for preemptible contexts by disabling preemption before calling the atomic context functions. Link: http://lkml.kernel.org/r/20171103153336.24044-2-hannes@cmpxchg.org Signed-off-by: Johannes Weiner <hannes(a)cmpxchg.org> Acked-by: Vladimir Davydov <vdavydov.dev(a)gmail.com> Cc: Michal Hocko <mhocko(a)suse.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: stable(a)vger.kernel.org Signed-off-by: Shaoying Xu <shaoyi(a)amazon.com> --- include/linux/memcontrol.h | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 2c80b69dd266..1ffc54ac4cc9 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -569,51 +569,51 @@ static inline void __mod_lruvec_state(struct lruvec *lruvec, { struct mem_cgroup_per_node *pn; + /* Update node */ __mod_node_page_state(lruvec_pgdat(lruvec), idx, val); + if (mem_cgroup_disabled()) return; + pn = container_of(lruvec, struct mem_cgroup_per_node, lruvec); + + /* Update memcg */ __mod_memcg_state(pn->memcg, idx, val); + + /* Update lruvec */ __this_cpu_add(pn->lruvec_stat->count[idx], val); } static inline void mod_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx, int val) { - struct mem_cgroup_per_node *pn; - - mod_node_page_state(lruvec_pgdat(lruvec), idx, val); - if (mem_cgroup_disabled()) - return; - pn = container_of(lruvec, struct mem_cgroup_per_node, lruvec); - mod_memcg_state(pn->memcg, idx, val); - this_cpu_add(pn->lruvec_stat->count[idx], val); + preempt_disable(); + __mod_lruvec_state(lruvec, idx, val); + preempt_enable(); } static inline void __mod_lruvec_page_state(struct page *page, enum node_stat_item idx, int val) { - struct mem_cgroup_per_node *pn; + pg_data_t *pgdat = page_pgdat(page); + struct lruvec *lruvec; - __mod_node_page_state(page_pgdat(page), idx, val); - if (mem_cgroup_disabled() || !page->mem_cgroup) + /* Untracked pages have no memcg, no lruvec. Update only the node */ + if (!page->mem_cgroup) { + __mod_node_page_state(pgdat, idx, val); return; - __mod_memcg_state(page->mem_cgroup, idx, val); - pn = page->mem_cgroup->nodeinfo[page_to_nid(page)]; - __this_cpu_add(pn->lruvec_stat->count[idx], val); + } + + lruvec = mem_cgroup_lruvec(pgdat, page->mem_cgroup); + __mod_lruvec_state(lruvec, idx, val); } static inline void mod_lruvec_page_state(struct page *page, enum node_stat_item idx, int val) { - struct mem_cgroup_per_node *pn; - - mod_node_page_state(page_pgdat(page), idx, val); - if (mem_cgroup_disabled() || !page->mem_cgroup) - return; - mod_memcg_state(page->mem_cgroup, idx, val); - pn = page->mem_cgroup->nodeinfo[page_to_nid(page)]; - this_cpu_add(pn->lruvec_stat->count[idx], val); + preempt_disable(); + __mod_lruvec_page_state(page, idx, val); + preempt_enable(); } unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, -- 2.16.6

3 years, 10 months

1
0
0 0

[PATCH 1/2] mm: memcg: fix memcg file_dirty numa stat

by Shakeel Butt

The kernel updates the per-node NR_FILE_DIRTY stats on page migration but not the memcg numa stats. That was not an issue until recently the commit 5f9a4f4a7096 ("mm: memcontrol: add the missing numa_stat interface for cgroup v2") exposed numa stats for the memcg. So fixing the file_dirty per-memcg numa stat. Fixes: 5f9a4f4a7096 ("mm: memcontrol: add the missing numa_stat interface for cgroup v2") Signed-off-by: Shakeel Butt <shakeelb(a)google.com> Cc: <stable(a)vger.kernel.org> --- mm/migrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index ee5e612b4cd8..613794f6a433 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -500,9 +500,9 @@ int migrate_page_move_mapping(struct address_space *mapping, __inc_lruvec_state(new_lruvec, NR_SHMEM); } if (dirty && mapping_can_writeback(mapping)) { - __dec_node_state(oldzone->zone_pgdat, NR_FILE_DIRTY); + __dec_lruvec_state(old_lruvec, NR_FILE_DIRTY); __dec_zone_state(oldzone, NR_ZONE_WRITE_PENDING); - __inc_node_state(newzone->zone_pgdat, NR_FILE_DIRTY); + __inc_lruvec_state(new_lruvec, NR_FILE_DIRTY); __inc_zone_state(newzone, NR_ZONE_WRITE_PENDING); } } -- 2.29.2.729.g45daf8777d-goog

3 years, 10 months

4
7
0 0

patch "serial: mvebu-uart: fix tx lost characters at power off" added to tty-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled serial: mvebu-uart: fix tx lost characters at power off to my tty git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git in the tty-linus 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 hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 54ca955b5a4024e2ce0f206b03adb7109bc4da26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali(a)kernel.org> Date: Wed, 23 Dec 2020 20:19:31 +0100 Subject: serial: mvebu-uart: fix tx lost characters at power off MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit c685af1108d7 ("serial: mvebu-uart: fix tx lost characters") fixed tx lost characters at low baud rates but started causing tx lost characters when kernel is going to power off or reboot. TX_EMP tells us when transmit queue is empty therefore all characters were transmitted. TX_RDY tells us when CPU can send a new character. Therefore we need to use different check prior transmitting new character and different check after all characters were sent. This patch splits polling code into two functions: wait_for_xmitr() which waits for TX_RDY and wait_for_xmite() which waits for TX_EMP. When rebooting A3720 platform without this patch on UART is print only: [ 42.699� And with this patch on UART is full output: [ 39.530216] reboot: Restarting system Fixes: c685af1108d7 ("serial: mvebu-uart: fix tx lost characters") Signed-off-by: Pali Rohár <pali(a)kernel.org> Cc: stable <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20201223191931.18343-1-pali@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/tty/serial/mvebu-uart.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c index 118b29912289..e0c00a1b0763 100644 --- a/drivers/tty/serial/mvebu-uart.c +++ b/drivers/tty/serial/mvebu-uart.c @@ -648,6 +648,14 @@ static void wait_for_xmitr(struct uart_port *port) (val & STAT_TX_RDY(port)), 1, 10000); } +static void wait_for_xmite(struct uart_port *port) +{ + u32 val; + + readl_poll_timeout_atomic(port->membase + UART_STAT, val, + (val & STAT_TX_EMP), 1, 10000); +} + static void mvebu_uart_console_putchar(struct uart_port *port, int ch) { wait_for_xmitr(port); @@ -675,7 +683,7 @@ static void mvebu_uart_console_write(struct console *co, const char *s, uart_console_write(port, s, count, mvebu_uart_console_putchar); - wait_for_xmitr(port); + wait_for_xmite(port); if (ier) writel(ier, port->membase + UART_CTRL(port)); -- 2.29.2

3 years, 10 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2020