December 2020 - Linux-stable-mirror

[PATCH 4.19 000/346] 4.19.164-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.164 release. There are 346 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.19.164-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.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.19.164-rc1 Jubin Zhong <zhongjubin(a)huawei.com> PCI: Fix pci_slot_release() NULL pointer dereference Carlos Garnacho <carlosg(a)gnome.org> platform/x86: intel-vbtn: Allow switch events on Acer Switch Alpha 12 Dan Williams <dan.j.williams(a)intel.com> libnvdimm/namespace: Fix reaping of invalidated block-window-namespace labels SeongJae Park <sjpark(a)amazon.de> xenbus/xenbus_backend: Disallow pending watch messages SeongJae Park <sjpark(a)amazon.de> xen/xenbus: Count pending messages for each watch SeongJae Park <sjpark(a)amazon.de> xen/xenbus/xen_bus_type: Support will_handle watch callback SeongJae Park <sjpark(a)amazon.de> xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path() SeongJae Park <sjpark(a)amazon.de> xen/xenbus: Allow watches discard events before queueing 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 Yangtao Li <frank(a)allwinnertech.com> pinctrl: sunxi: Always call chained_irq_{enter, exit} in sunxi_pinctrl_irq_handler Zhao Heming <heming.zhao(a)suse.com> md/cluster: fix deadlock when node is doing resync job Zhao Heming <heming.zhao(a)suse.com> md/cluster: block reshape with remote resync job Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio:imu:bmi160: Fix too large a buffer. Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio:pressure:mpl3115: Force alignment of buffer Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio:light:st_uvis25: Fix timestamp alignment and prevent data leak. Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio:light:rpr0521: Fix timestamp alignment and prevent data leak. 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 James Smart <james.smart(a)broadcom.com> scsi: lpfc: Re-fix use after free in lpfc_rq_buf_free() James Smart <james.smart(a)broadcom.com> scsi: lpfc: Fix invalid sleeping context in lpfc_sli4_nvmet_alloc() Praveenkumar I <ipkumar(a)codeaurora.org> mtd: rawnand: qcom: Fix DMA sync on FLASH_STATUS register read Sven Eckelmann <sven(a)narfation.org> mtd: parser: cmdline: Fix parsing of part-names with colons Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: spinand: Fix OOB read Evan Green <evgreen(a)chromium.org> soc: qcom: smp2p: Safely acquire spinlock without IRQs Qinglang Miao <miaoqinglang(a)huawei.com> spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe 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 Richard Weinberger <richard(a)nod.at> ubifs: wbuf: Don't leak kernel memory to flash Steve French <stfrench(a)microsoft.com> SMB3.1.1: do not log warning message if server doesn't populate salt Steve French <stfrench(a)microsoft.com> SMB3: avoid confusing warning message on mount to Azure Luis Henriques <lhenriques(a)suse.de> ceph: fix race in concurrent __ceph_remove_cap invocations Roberto Sassu <roberto.sassu(a)huawei.com> ima: Don't modify file descriptor mode on the fly David Hildenbrand <david(a)redhat.com> powerpc/powernv/memtrace: Fix crashing the kernel when enabling concurrently David Hildenbrand <david(a)redhat.com> powerpc/powernv/memtrace: Don't leak kernel memory to user space Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/xmon: Change printk() to pr_cont() Tyrel Datwyler <tyreld(a)linux.ibm.com> powerpc/rtas: Fix typo of ibm,open-errinjct in RTAS filter Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> powerpc: Fix incorrect stw{, ux, u, x} instructions in __set_pte_at Nicolas Ferre <nicolas.ferre(a)microchip.com> ARM: dts: at91: sama5d2: fix CAN message ram offset and size H. Nikolaus Schaller <hns(a)goldelico.com> ARM: dts: pandaboard: fix pinmux for gpio user button of Pandaboard ES Marc Zyngier <maz(a)kernel.org> KVM: arm64: Introduce handling of AArch32 TTBCR2 traps Jan Kara <jack(a)suse.cz> ext4: fix deadlock with fs freezing and EA inodes Chunguang Xu <brookxu(a)tencent.com> ext4: fix a memory leak of ext4_free_data 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: digi_acceleport: fix write-wakeup deadlocks Johan Hovold <johan(a)kernel.org> USB: serial: mos7720: fix parallel-port state restore Borislav Petkov <bp(a)suse.de> EDAC/amd64: Fix PCI component registration Ard Biesheuvel <ardb(a)kernel.org> crypto: ecdh - avoid unaligned accesses in ecdh_set_secret() 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 Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix hanging device offline processing Philipp Rudo <prudo(a)linux.ibm.com> s390/kexec_file: fix diag308 subcode when loading crash kernel Sven Schnelle <svens(a)linux.ibm.com> s390/smp: perform initial CPU reset also for SMT siblings Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Disable sample read check if firmware doesn't give back Amadej Kastelic <amadejkastelic7(a)gmail.com> ALSA: usb-audio: Add VID to support native DSD reproduction on FiiO devices Chris Chiu <chiu(a)endlessos.org> ALSA: hda/realtek: Apply jack fixup for Quanta NL3 Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek: Add quirk for MSI-GP73 Takashi Iwai <tiwai(a)suse.de> ALSA: pcm: oss: Fix a few more UBSAN fixes Chris Chiu <chiu(a)endlessos.org> ALSA: hda/realtek - Enable headset mic of ASUS Q524UQK with ALC255 Chris Chiu <chiu(a)endlessos.org> ALSA: hda/realtek - Enable headset mic of ASUS X430UN with ALC256 Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Fix regressions on clear and reconfig sysfs 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" Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> PM: ACPI: PCI: Drop acpi_pm_set_bridge_wakeup() Connor McAdams <conmanx360(a)gmail.com> ALSA: hda/ca0132 - Change Input Source enum strings. Arnd Bergmann <arnd(a)arndb.de> Input: cyapa_gen6 - fix out-of-bounds stack access Sakari Ailus <sakari.ailus(a)linux.intel.com> media: ipu3-cio2: Make the field on subdev format V4L2_FIELD_NONE Sakari Ailus <sakari.ailus(a)linux.intel.com> media: ipu3-cio2: Validate mbus format in setting subdev format Sakari Ailus <sakari.ailus(a)linux.intel.com> media: ipu3-cio2: Serialise access to pad format Sakari Ailus <sakari.ailus(a)linux.intel.com> media: ipu3-cio2: Return actual subdev format Sakari Ailus <sakari.ailus(a)linux.intel.com> media: ipu3-cio2: Remove traces of returned buffers 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 Dongdong Wang <wangdongdong.6(a)bytedance.com> lwt: Disable BH too in run_lwt_bpf() Serge Hallyn <shallyn(a)cisco.com> fix namespaced fscaps when !CONFIG_SECURITY Sara Sharon <sara.sharon(a)intel.com> cfg80211: initialize rekey_data Paul Kocialkowski <contact(a)paulk.fr> ARM: sunxi: Add machine match for the Allwinner V3 SoC Masahiro Yamada <masahiroy(a)kernel.org> kconfig: fix return value of do_error_if() Jernej Skrabec <jernej.skrabec(a)siol.net> clk: sunxi-ng: Make sure divider tables have sentinel 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 Lokesh Vutla <lokeshvutla(a)ti.com> pwm: lp3943: Dynamically allocate PWM chip base Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: zx: Add missing cleanup in error path Zhang Qilong <zhangqilong3(a)huawei.com> clk: ti: Fix memleak in ti_fapll_synth_setup Arnd Bergmann <arnd(a)arndb.de> watchdog: coh901327: add COMMON_CLK dependency Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> watchdog: qcom: Avoid context switch in restart handler Zhang Qilong <zhangqilong3(a)huawei.com> libnvdimm/label: Return -ENXIO for no slot in __blk_label_update 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 Anton Ivanov <anton.ivanov(a)cambridgegreys.com> um: tty: Fix handling of close in tty lines Anton Ivanov <anton.ivanov(a)cambridgegreys.com> um: Monitor error events in IRQ controller Wang Wensheng <wangwensheng4(a)huawei.com> watchdog: Fix potential dereferencing of null pointer Lingling Xu <ling_ling.xu(a)unisoc.com> watchdog: sprd: check busy bit before new loading rather than after that Lingling Xu <ling_ling.xu(a)unisoc.com> watchdog: sprd: remove watchdog disable from resume fail path Guenter Roeck <linux(a)roeck-us.net> watchdog: sirfsoc: Add missing dependency on HAS_IOMEM 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() Johannes Berg <johannes.berg(a)intel.com> mac80211: don't set set TDLS STA bandwidth wider than possible 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 Zhang Changzhong <zhangchangzhong(a)huawei.com> bus: fsl-mc: fix error return code in fsl_mc_object_allocate() 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: remove redundant cacheinfo update Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops Vadim Pasternak <vadimp(a)nvidia.com> platform/x86: mlx-platform: Fix item counter assignment for MSN2700, MSN24xx systems 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() Qinglang Miao <miaoqinglang(a)huawei.com> scsi: qedi: Fix missing destroy_workqueue() on error in __qedi_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: mediatek: 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() Leon Romanovsky <leonro(a)nvidia.com> net/mlx5: Properly convey driver version to firmware Jing Xiangfeng <jingxiangfeng(a)huawei.com> memstick: r592: Fix error return in r592_probe() Chen-Yu Tsai <wens(a)csie.org> arm64: dts: rockchip: Fix UART pull-ups on rk3328 Yu Kuai <yukuai3(a)huawei.com> pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() Claudiu Beznea <claudiu.beznea(a)microchip.com> ARM: dts: at91: sama5d2: map securam as device 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 Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> ath10k: Release some resources in an error handling path Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> ath10k: Fix an error handling path Rakesh Pillai <pillair(a)codeaurora.org> ath10k: Fix the parsing error in service available event Qinglang Miao <miaoqinglang(a)huawei.com> platform/x86: dell-smbios-base: Fix error return code in dell_smbios_init Alexandre Belloni <alexandre.belloni(a)bootlin.com> ARM: dts: at91: at91sam9rl: fix ADC triggers Artem Lapkin <art(a)khadas.com> arm64: dts: meson: fix spi-max-frequency on Khadas VIM2 Bharat Gooty <bharat.gooty(a)broadcom.com> PCI: iproc: Fix out-of-bound array accesses Colin Ian King <colin.king(a)canonical.com> PCI: Fix overflow in command-line resource alignment requests Bjorn Helgaas <bhelgaas(a)google.com> PCI: Bounds-check command-line resource alignment requests Marc Zyngier <maz(a)kernel.org> genirq/irqdomain: Don't try to free an interrupt that has no mapping Zhang Qilong <zhangqilong3(a)huawei.com> power: supply: bq24190_charger: fix reference leak Hans de Goede <hdegoede(a)redhat.com> power: supply: axp288_charger: Fix HP Pavilion x2 10 DMI matching Chen-Yu Tsai <wens(a)csie.org> arm64: dts: rockchip: Set dr_mode to "host" for OTG on rk3328-roc-cc Chris Packham <chris.packham(a)alliedtelesis.co.nz> ARM: dts: Remove non-existent i2c1 from 98dx3236 Jing Xiangfeng <jingxiangfeng(a)huawei.com> HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() Bjorn Andersson <bjorn.andersson(a)linaro.org> slimbus: qcom-ngd-ctrl: Avoid sending power requests without QMI Dan Carpenter <dan.carpenter(a)oracle.com> media: max2175: fix max2175_set_csm_mode() error code Qinglang Miao <miaoqinglang(a)huawei.com> mips: cdmm: fix use-after-free in mips_cdmm_bus_discover Daniel T. Lee <danieltimlee(a)gmail.com> samples: bpf: Fix lwt_len_hist reusing previous BPF map Vadim Pasternak <vadimp(a)nvidia.com> platform/x86: mlx-platform: Remove PSU EEPROM from MSN274x platform configuration Vadim Pasternak <vadimp(a)nvidia.com> platform/x86: mlx-platform: Remove PSU EEPROM from default platform configuration Keita Suzuki <keitasuzuki.park(a)sslab.ics.keio.ac.jp> media: siano: fix memory leak of debugfs members in smsdvb_hotplug Zhihao Cheng <chengzhihao1(a)huawei.com> dmaengine: mv_xor_v2: Fix error return code in mv_xor_v2_probe() 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 Zhang Qilong <zhangqilong3(a)huawei.com> Input: omap4-keypad - fix runtime PM error handling 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 Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> spi: fix resource leak for drivers without .remove callback Zhang Qilong <zhangqilong3(a)huawei.com> crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe Nathan Chancellor <natechancellor(a)gmail.com> crypto: crypto4xx - Replace bitwise OR with logical OR in crypto4xx_build_pd Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 Zhang Qilong <zhangqilong3(a)huawei.com> spi: mxs: fix reference leak in mxs_spi_probe Yang Yingliang <yangyingliang(a)huawei.com> usb/max3421: fix return error code in max3421_probe() 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 David Jander <david(a)protonic.nl> Input: ads7846 - fix race that causes missing releases Yang Yingliang <yangyingliang(a)huawei.com> drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() Yang Yingliang <yangyingliang(a)huawei.com> video: fbdev: atmel_lcdfb: fix return error code in atmel_lcdfb_of_init() Qinglang Miao <miaoqinglang(a)huawei.com> media: solo6x10: fix missing snd_card_free in error handling case Martin Wilck <mwilck(a)suse.com> scsi: core: Fix VPD LUN ID designator priorities Jerome Brunet <jbrunet(a)baylibre.com> ASoC: meson: fix COMPILE_TEST error Yu Kuai <yukuai3(a)huawei.com> media: mtk-vcodec: add missing put_device() call in mtk_vcodec_release_dec_pm() Colin Ian King <colin.king(a)canonical.com> media: tm6000: Fix sizeof() mismatches Jing Xiangfeng <jingxiangfeng(a)huawei.com> staging: gasket: interrupt: fix the missed eventfd_ctx_put() in gasket_interrupt.c Zhang Qilong <zhangqilong3(a)huawei.com> staging: greybus: codecs: Fix reference counter leak in error handling Jack Xu <jack.xu(a)intel.com> crypto: qat - fix status check in qat_hal_put_rel_rd_xfer() 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 Zhang Qilong <zhangqilong3(a)huawei.com> ASoC: arizona: Fix a wrong free in wm8997_probe 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> ASoC: wm8998: Fix PM disable depth imbalance on error Tsuchiya Yuto <kitakar(a)gmail.com> mwifiex: fix mwifiex_shutdown_sw() causing sw reset failure Qinglang Miao <miaoqinglang(a)huawei.com> spi: bcm63xx-hsspi: fix missing clk_disable_unprepare() on error in bcm63xx_hsspi_resume 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 Anant Thazhemadam <anant.thazhemadam(a)gmail.com> Bluetooth: hci_h5: fix memory leak in h5_close 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 Paweł Chmiel <pawel.mikolaj.chmiel(a)gmail.com> arm64: dts: exynos: Include common syscon restart/poweroff for Exynos7 Paul Moore <paul(a)paul-moore.com> selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling Cezary Rojewski <cezary.rojewski(a)intel.com> ASoC: pcm: DRAIN support reactivation Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dsi_pll_10nm: restore VCO rate during restore_state Zhang Qilong <zhangqilong3(a)huawei.com> spi: img-spfi: fix reference leak in img_spfi_resume Jordan Niethe <jniethe5(a)gmail.com> powerpc/64: Set up a kernel stack for secondaries before cpu_restore() Arnd Bergmann <arnd(a)arndb.de> drm/amdgpu: fix build_coefficients() argument Colin Ian King <colin.king(a)canonical.com> crypto: inside-secure - Fix sizeof() mismatch Christophe Leroy <christophe.leroy(a)csgroup.eu> crypto: talitos - Fix return type of current_desc_hdr() Christophe Leroy <christophe.leroy(a)csgroup.eu> crypto: talitos - Endianess in current_desc_hdr() Thomas Gleixner <tglx(a)linutronix.de> sched: Reenable interrupts in do_sched_yield() Peng Liu <iwtbavbm(a)gmail.com> sched/deadline: Fix sched_dl_global_validate() David Woodhouse <dwmw(a)amazon.co.uk> x86/apic: Fix x2apic enablement without interrupt remapping Ard Biesheuvel <ardb(a)kernel.org> ARM: p2v: fix handling of LPAE translation in BE mode Arvind Sankar <nivedita(a)alum.mit.edu> x86/mm/ident_map: Check for errors from ident_pud_init() Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Compute PSN windows correctly Joel Stanley <joel(a)jms.id.au> ARM: dts: aspeed: s2600wf: Fix VGA memory region location Tianyue Ren <rentianyue(a)kylinos.cn> selinux: fix error initialization in inode_doinit_with_dentry() Kamal Heib <kamalheib1(a)gmail.com> RDMA/bnxt_re: Set queue pair state when being queried Douglas Anderson <dianders(a)chromium.org> soc: qcom: geni: More properly switch to DMA mode Nicolas Boichat <drinkcat(a)chromium.org> soc: mediatek: Check if power domains can be powered on at boot time Dan Carpenter <dan.carpenter(a)oracle.com> soc: renesas: rmobile-sysc: Fix some leaks in rmobile_init_pm_domains() Krzysztof Kozlowski <krzk(a)kernel.org> drm/tve200: Fix handling of platform_get_irq() error Tom Rix <trix(a)redhat.com> drm/gma500: fix double free of gma_connector Leo Yan <leo.yan(a)linaro.org> perf cs-etm: Move definition of 'traceid_list' global variable from header file Leo Yan <leo.yan(a)linaro.org> perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata Dae R. Jeong <dae.r.jeong(a)kaist.ac.kr> md: fix a warning caused by a race between concurrent md_ioctl()s Eric Biggers <ebiggers(a)google.com> crypto: af_alg - avoid undefined behavior accessing salg_name Antti Palosaari <crope(a)iki.fi> media: msi2500: assign SPI bus number dynamically Jan Kara <jack(a)suse.cz> quota: Sanity-check quota file headers on load Peilin Ye <yepeilin.cs(a)gmail.com> Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() 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 Arnd Bergmann <arnd(a)arndb.de> scsi: megaraid_sas: Check user-provided offsets Mao Jinlong <jinlmao(a)codeaurora.org> coresight: tmc-etr: Check if page is valid before dma_map_page() 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 Will McVicker <willmcvicker(a)google.com> USB: gadget: f_rndis: fix bitrate for SuperSpeed and above 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_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 Sven Eckelmann <sven(a)narfation.org> vxlan: Copy needed_tailroom from lowerdev Sven Eckelmann <sven(a)narfation.org> vxlan: Add needed_headroom for lower device Mark Rutland <mark.rutland(a)arm.com> arm64: syscall: exit userspace before unmasking exceptions 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 Deepak R Varma <mh12gx2825(a)gmail.com> drm/tegra: replace idr_init() by idr_init_base() Björn Töpel <bjorn.topel(a)intel.com> ixgbe: avoid premature Rx buffer reuse Leon Romanovsky <leonro(a)nvidia.com> RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait Toke Høiland-Jørgensen <toke(a)redhat.com> selftests/bpf/test_offload.py: Reset ethtool features after failed setting Chunyan Zhang <chunyan.zhang(a)unisoc.com> gpio: eic-sprd: break loop when getting NULL device resource Subash Abhinov Kasiviswanathan <subashab(a)codeaurora.org> netfilter: x_tables: Switch synchronization to RCU Johannes Thumshirn <johannes.thumshirn(a)wdc.com> block: factor out requeue handling from dispatch code Geert Uytterhoeven <geert+renesas(a)glider.be> clk: renesas: r9a06g032: Drop __packed for portability Zhang Qilong <zhangqilong3(a)huawei.com> can: softing: softing_netdev_open(): fix error handling Luc Van Oostenryck <luc.vanoostenryck(a)gmail.com> xsk: Fix xsk_poll()'s return type Randy Dunlap <rdunlap(a)infradead.org> scsi: bnx2i: Requires MMU Baruch Siach <baruch(a)tkos.co.il> gpio: mvebu: fix potential user-after-free on probe Icenowy Zheng <icenowy(a)aosc.io> ARM: dts: sun8i: v3s: fix GIC node memory range 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 Xiaochen Shen <xiaochen.shen(a)intel.com> x86/resctrl: Fix incorrect local bandwidth when mba_sc is enabled James Morse <james.morse(a)arm.com> x86/resctrl: Remove unused struct mbm_state::chunks_bw Fangrui Song <maskray(a)google.com> arm64: Change .weak to SYM_FUNC_START_WEAK_PI for arch/arm64/lib/mem*.S Vincenzo Frascino <vincenzo.frascino(a)arm.com> arm64: lse: Fix LSE atomics with LLVM Sami Tolvanen <samitolvanen(a)google.com> arm64: lse: fix LSE atomics with LLVM's integrated assembler Xin Xiong <xiongx18(a)fudan.edu.cn> drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi Oleksandr Andrushchenko <oleksandr_andrushchenko(a)epam.com> drm/xen-front: Fix misused IS_ERR_OR_NULL checks 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 Oliver Neukum <oneukum(a)suse.com> USB: UAS: introduce a quirk to set no_write_same 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() Steven Rostedt (VMware) <rostedt(a)goodmis.org> ktest.pl: If size of log is too big to email, email error message 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 Moshe Shemesh <moshe(a)mellanox.com> net/mlx4_en: Handle TX error CQE Sergej Bauer <sbauer(a)blackbox.su> lan743x: fix for potential NULL pointer dereference with bare card Moshe Shemesh <moshe(a)mellanox.com> net/mlx4_en: Avoid scheduling restart task if it is already running Neal Cardwell <ncardwell(a)google.com> tcp: fix cwnd-limited bug for TSO deferral where we send nothing Eric Dumazet <edumazet(a)google.com> tcp: select sane initial rcvq_space.space for big MSS Fugang Duan <fugang.duan(a)nxp.com> net: stmmac: free tx skb buffer in stmmac_resume() Eric Dumazet <edumazet(a)google.com> mac80211: mesh: fix mesh_pathtbl_init() error path Ansuel Smith <ansuelsmth(a)gmail.com> PCI: qcom: Add missing reset for ipq806x Arvind Sankar <nivedita(a)alum.mit.edu> compiler.h: fix barrier_data() on clang Thomas Gleixner <tglx(a)linutronix.de> x86/apic/vector: Fix ordering in vector assignment Andy Lutomirski <luto(a)kernel.org> x86/membarrier: Get rid of a dubious optimization Arvind Sankar <nivedita(a)alum.mit.edu> x86/mm/mem_encrypt: Fix definition of PMD_FLAGS_DEC_WP Dan Carpenter <dan.carpenter(a)oracle.com> scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" Arnd Bergmann <arnd(a)arndb.de> kbuild: avoid static_assert for genksyms Bean Huo <beanhuo(a)micron.com> mmc: block: Fixup condition for CMD13 polling for RPMB requests 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 Max Verevkin <me(a)maxverevkin.tk> platform/x86: intel-vbtn: Support for tablet mode on HP Pavilion 13 x360 PC Timo Witte <timo.witte(a)gmail.com> platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Hans de Goede <hdegoede(a)redhat.com> platform/x86: thinkpad_acpi: Add BAT1 is primary battery quirk for Thinkpad Yoga 11e 4th gen Hans de Goede <hdegoede(a)redhat.com> platform/x86: thinkpad_acpi: Do not report SW_TABLET_MODE on Yoga 11e Hao Si <si.hao(a)zte.com.cn> soc: fsl: dpio: Get the cpumask through cpumask_of(cpu) Xu Qiang <xuqiang36(a)huawei.com> irqchip/gic-v3-its: Unconditionally save/restore the ITS state on suspend Can Guo <cang(a)codeaurora.org> scsi: ufs: Make sure clk scaling happens only when HBA is runtime ACTIVE Vineet Gupta <vgupta(a)synopsys.com> ARC: stack unwinding: don't assume non-current task is sleeping Michael Ellerman <mpe(a)ellerman.id.au> powerpc: Drop -me200 addition to build flags Sara Sharon <sara.sharon(a)intel.com> iwlwifi: mvm: fix kernel panic in case of assert during CSA 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 Fangrui Song <maskray(a)google.com> x86/lib: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S Nick Desaulniers <ndesaulniers(a)google.com> Kbuild: do not emit debug info for assembly with LLVM_IAS=1 ------------- Diffstat: Documentation/admin-guide/kernel-parameters.txt | 1 + Documentation/networking/ip-sysctl.txt | 3 + Makefile | 7 +- arch/arc/kernel/stacktrace.c | 23 ++-- arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 5 - arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +- 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/omap4-panda-es.dts | 2 +- 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/arm/mach-sunxi/sunxi.c | 1 + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +- arch/arm64/boot/dts/exynos/exynos7.dtsi | 12 +- arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 1 + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 16 +-- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 + arch/arm64/include/asm/atomic_lse.h | 76 +++++++++---- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/lse.h | 6 +- arch/arm64/kernel/syscall.c | 2 +- arch/arm64/kvm/sys_regs.c | 1 + arch/arm64/lib/memcpy.S | 3 +- arch/arm64/lib/memmove.S | 3 +- arch/arm64/lib/memset.S | 3 +- arch/mips/bcm47xx/Kconfig | 1 + arch/powerpc/Makefile | 1 - arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +- arch/powerpc/include/asm/cputable.h | 5 - arch/powerpc/include/asm/nohash/pgtable.h | 4 +- arch/powerpc/kernel/head_64.S | 8 +- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 4 +- arch/powerpc/perf/core-book3s.c | 10 ++ arch/powerpc/platforms/powernv/memtrace.c | 44 +++++-- arch/powerpc/platforms/pseries/suspend.c | 4 - arch/powerpc/xmon/nonstdio.c | 2 +- arch/s390/kernel/smp.c | 18 +-- arch/s390/purgatory/head.S | 9 +- arch/um/drivers/chan_user.c | 4 +- arch/um/drivers/xterm.c | 5 + arch/um/os-Linux/irq.c | 2 +- arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/include/asm/sync_core.h | 9 +- arch/x86/kernel/apic/apic.c | 14 ++- arch/x86/kernel/apic/vector.c | 24 ++-- arch/x86/kernel/apic/x2apic_phys.c | 9 ++ arch/x86/kernel/cpu/intel_rdt.h | 2 - arch/x86/kernel/cpu/intel_rdt_monitor.c | 7 +- arch/x86/kernel/kprobes/core.c | 5 + arch/x86/lib/memcpy_64.S | 6 +- arch/x86/lib/memmove_64.S | 4 +- arch/x86/lib/memset_64.S | 6 +- arch/x86/mm/ident_map.c | 12 +- arch/x86/mm/mem_encrypt_identity.c | 4 +- arch/x86/mm/tlb.c | 10 +- block/blk-mq.c | 29 +++-- 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/bluetooth/hci_h5.c | 3 + drivers/bus/fsl-mc/fsl-mc-allocator.c | 4 +- drivers/bus/mips_cdmm.c | 4 +- drivers/clk/clk-s2mps11.c | 1 + drivers/clk/mvebu/armada-37xx-xtal.c | 4 +- drivers/clk/renesas/r9a06g032-clocks.c | 2 +- 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/amcc/crypto4xx_core.c | 2 +- drivers/crypto/inside-secure/safexcel.c | 2 +- drivers/crypto/omap-aes.c | 3 +- drivers/crypto/qat/qat_common/qat_hal.c | 2 +- drivers/crypto/talitos.c | 10 +- drivers/dma/mv_xor_v2.c | 4 +- drivers/edac/amd64_edac.c | 26 +++-- drivers/extcon/extcon-max77693.c | 2 +- drivers/gpio/gpio-eic-sprd.c | 2 +- drivers/gpio/gpio-mvebu.c | 16 ++- .../drm/amd/display/modules/color/color_gamma.c | 2 +- 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/msm/dsi/pll/dsi_pll_10nm.c | 8 ++ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 + drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tegra/sor.c | 10 +- drivers/gpu/drm/tve200/tve200_drv.c | 4 +- drivers/gpu/drm/xen/xen_drm_front.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 8 +- drivers/gpu/drm/xen/xen_drm_front_kms.c | 2 +- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++ drivers/hsi/controllers/omap_ssi_core.c | 2 +- drivers/hwtracing/coresight/coresight-tmc-etr.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/light/st_uvis25.h | 5 + drivers/iio/light/st_uvis25_core.c | 8 +- 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/irqchip/irq-gic-v3-its.c | 16 +-- drivers/md/dm-ioctl.c | 1 + drivers/md/dm-table.c | 6 - drivers/md/md-cluster.c | 67 ++++++----- drivers/md/md.c | 21 +++- drivers/media/common/siano/smsdvb-main.c | 5 +- drivers/media/i2c/max2175.c | 2 +- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 62 +++++----- drivers/media/pci/intel/ipu3/ipu3-cio2.h | 1 + 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 +- .../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/media/usb/tm6000/tm6000-video.c | 5 +- drivers/memstick/core/memstick.c | 1 - drivers/memstick/host/r592.c | 12 +- drivers/mmc/core/block.c | 2 +- drivers/mtd/cmdlinepart.c | 14 ++- drivers/mtd/nand/raw/qcom_nandc.c | 2 + drivers/mtd/nand/spi/core.c | 4 + 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/intel/ixgbe/ixgbe_main.c | 24 ++-- 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/microchip/lan743x_ethtool.c | 9 +- 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 | 27 ++++- drivers/net/vxlan.c | 3 + drivers/net/wireless/ath/ath10k/usb.c | 7 +- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 4 +- drivers/net/wireless/ath/ath10k/wmi.c | 9 +- drivers/net/wireless/ath/ath10k/wmi.h | 1 + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 36 ++++-- .../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 | 13 ++- drivers/pci/controller/dwc/pcie-qcom.c | 12 ++ drivers/pci/controller/pcie-iproc.c | 10 +- drivers/pci/pci-acpi.c | 4 +- drivers/pci/pci.c | 14 ++- 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/pinctrl/sunxi/pinctrl-sunxi.c | 6 +- drivers/platform/x86/acer-wmi.c | 1 + drivers/platform/x86/dell-smbios-base.c | 1 + drivers/platform/x86/intel-vbtn.c | 12 ++ drivers/platform/x86/mlx-platform.c | 16 +-- drivers/platform/x86/thinkpad_acpi.c | 10 +- drivers/power/supply/axp288_charger.c | 28 +++-- 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 | 22 +++- drivers/scsi/be2iscsi/be_main.c | 4 +- drivers/scsi/bnx2i/Kconfig | 1 + drivers/scsi/fnic/fnic_main.c | 1 + drivers/scsi/lpfc/lpfc_mem.c | 6 +- drivers/scsi/lpfc/lpfc_sli.c | 10 +- drivers/scsi/megaraid/megaraid_sas_base.c | 16 ++- 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/slimbus/qcom-ngd-ctrl.c | 6 + drivers/soc/fsl/dpio/dpio-driver.c | 5 +- drivers/soc/mediatek/mtk-scpsys.c | 5 +- drivers/soc/qcom/qcom-geni-se.c | 17 ++- 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-bcm63xx-hsspi.c | 4 +- drivers/spi/spi-davinci.c | 2 +- drivers/spi/spi-img-spfi.c | 4 +- drivers/spi/spi-mxs.c | 1 + 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 | 19 ++-- drivers/staging/comedi/drivers/mf6x4.c | 3 +- drivers/staging/gasket/gasket_interrupt.c | 15 ++- drivers/staging/greybus/audio_codec.c | 2 + drivers/staging/mt7621-spi/spi-mt7621.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/max3421-hcd.c | 3 +- drivers/usb/host/oxu210hp-hcd.c | 4 +- drivers/usb/host/xhci-hub.c | 4 + drivers/usb/misc/sisusbvga/Kconfig | 2 +- drivers/usb/serial/digi_acceleport.c | 45 +++----- 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/video/fbdev/atmel_lcdfb.c | 2 +- drivers/watchdog/Kconfig | 3 +- drivers/watchdog/qcom-wdt.c | 2 +- drivers/watchdog/sprd_wdt.c | 34 +++--- drivers/watchdog/watchdog_core.c | 22 ++-- 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/ceph/caps.c | 11 +- fs/cifs/smb2ops.c | 3 +- fs/cifs/smb2pdu.c | 7 +- fs/cifs/smb2pdu.h | 14 ++- 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 ++++ fs/ubifs/io.c | 13 ++- include/acpi/acpi_bus.h | 5 - include/linux/build_bug.h | 5 + include/linux/compiler-clang.h | 1 - include/linux/compiler-gcc.h | 19 ---- include/linux/compiler.h | 18 ++- include/linux/inetdevice.h | 4 +- include/linux/netfilter/x_tables.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/core/lwt_bpf.c | 8 +- net/ipv4/netfilter/arp_tables.c | 14 +-- net/ipv4/netfilter/ip_tables.c | 14 +-- net/ipv4/tcp_input.c | 3 +- net/ipv4/tcp_output.c | 9 +- net/ipv6/netfilter/ip6_tables.c | 14 +-- net/mac80211/mesh_pathtbl.c | 4 +- net/mac80211/vht.c | 14 ++- net/netfilter/x_tables.c | 49 +++----- 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 +- net/xdp/xsk.c | 8 +- samples/bpf/lwt_len_hist.sh | 2 + samples/bpf/test_lwt_bpf.sh | 0 scripts/checkpatch.pl | 2 +- scripts/kconfig/preprocess.c | 2 +- security/integrity/ima/ima_crypto.c | 20 +--- security/selinux/hooks.c | 16 ++- sound/core/oss/pcm_oss.c | 28 +++-- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_sysfs.c | 2 +- sound/pci/hda/patch_ca0132.c | 2 +- sound/pci/hda/patch_realtek.c | 4 + 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/meson/Kconfig | 2 +- sound/soc/soc-pcm.c | 2 + sound/usb/clock.c | 6 + sound/usb/format.c | 2 + sound/usb/quirks.c | 1 + sound/usb/stream.c | 6 +- tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 8 +- tools/perf/util/cs-etm.c | 29 ++++- tools/perf/util/cs-etm.h | 10 +- tools/perf/util/parse-regs-options.c | 2 +- tools/testing/ktest/ktest.pl | 7 +- tools/testing/selftests/bpf/test_offload.py | 1 + 354 files changed, 2093 insertions(+), 1109 deletions(-)

3 years, 4 months

8
356
0 0

[PATCH v2 1/2] dm crypt: use GFP_ATOMIC when allocating crypto requests from softirq

by Ignat Korchagin

Commit 39d42fa96ba1b7d2544db3f8ed5da8fb0d5cb877 made it possible for some code paths in dm-crypt to be executed in softirq context, when the underlying driver processes IO requests in interrupt/softirq context. In this case sometimes when allocating a new crypto request we may get a stacktrace like below: [ 210.103008][ C0] BUG: sleeping function called from invalid context at mm/mempool.c:381 [ 210.104746][ C0] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2602, name: fio [ 210.106599][ C0] CPU: 0 PID: 2602 Comm: fio Tainted: G W 5.10.0+ #50 [ 210.108331][ C0] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 0.0.0 02/06/2015 [ 210.110212][ C0] Call Trace: [ 210.110921][ C0] <IRQ> [ 210.111527][ C0] dump_stack+0x7d/0xa3 [ 210.112411][ C0] ___might_sleep.cold+0x122/0x151 [ 210.113527][ C0] mempool_alloc+0x16b/0x2f0 [ 210.114524][ C0] ? __queue_work+0x515/0xde0 [ 210.115553][ C0] ? mempool_resize+0x700/0x700 [ 210.116586][ C0] ? crypt_endio+0x91/0x180 [ 210.117479][ C0] ? blk_update_request+0x757/0x1150 [ 210.118513][ C0] ? blk_mq_end_request+0x4b/0x480 [ 210.119572][ C0] ? blk_done_softirq+0x21d/0x340 [ 210.120628][ C0] ? __do_softirq+0x190/0x611 [ 210.121626][ C0] crypt_convert+0x29f9/0x4c00 [ 210.122668][ C0] ? _raw_spin_lock_irqsave+0x87/0xe0 [ 210.123824][ C0] ? kasan_set_track+0x1c/0x30 [ 210.124858][ C0] ? crypt_iv_tcw_ctr+0x4a0/0x4a0 [ 210.125930][ C0] ? kmem_cache_free+0x104/0x470 [ 210.126973][ C0] ? crypt_endio+0x91/0x180 [ 210.127947][ C0] kcryptd_crypt_read_convert+0x30e/0x420 [ 210.129165][ C0] blk_update_request+0x757/0x1150 [ 210.130231][ C0] blk_mq_end_request+0x4b/0x480 [ 210.131294][ C0] blk_done_softirq+0x21d/0x340 [ 210.132332][ C0] ? _raw_spin_lock+0x81/0xd0 [ 210.133289][ C0] ? blk_mq_stop_hw_queue+0x30/0x30 [ 210.134399][ C0] ? _raw_read_lock_irq+0x40/0x40 [ 210.135458][ C0] __do_softirq+0x190/0x611 [ 210.136409][ C0] ? handle_edge_irq+0x221/0xb60 [ 210.137447][ C0] asm_call_irq_on_stack+0x12/0x20 [ 210.138507][ C0] </IRQ> [ 210.139118][ C0] do_softirq_own_stack+0x37/0x40 [ 210.140191][ C0] irq_exit_rcu+0x110/0x1b0 [ 210.141151][ C0] common_interrupt+0x74/0x120 [ 210.142171][ C0] asm_common_interrupt+0x1e/0x40 [ 210.143206][ C0] RIP: 0010:_aesni_enc1+0x65/0xb0 [ 210.144313][ C0] Code: 38 dc c2 41 0f 28 52 d0 66 0f 38 dc c2 41 0f 28 52 e0 66 0f 38 dc c2 41 0f 28 52 f0 66 0f 38 dc c2 41 0f 28 12 66 0f 38 dc c2 <41> 0f 28 52 10 66 0f 38 dc c2 41 0f 28 52 20 66 0f 38 dc c2 41 0f [ 210.148542][ C0] RSP: 0018:ffff88810dbe6db0 EFLAGS: 00000286 [ 210.149842][ C0] RAX: ffffffff9a90cdc0 RBX: 0000000000000000 RCX: 0000000000000200 [ 210.151576][ C0] RDX: ffff888101e5f240 RSI: ffff888101e5f240 RDI: ffff8881111b5020 [ 210.153339][ C0] RBP: ffff88810dbe6e20 R08: 0000000000000000 R09: 0000000000000020 [ 210.155063][ C0] R10: ffff8881111b5090 R11: 1ffff11021b7cdcc R12: ffffffff9e87cd40 [ 210.156791][ C0] R13: ffff8881111b5210 R14: ffff888101e5f0d8 R15: 0000000000000000 [ 210.158497][ C0] ? aesni_set_key+0x1e0/0x1e0 [ 210.159523][ C0] ? aesni_enc+0xf/0x20 [ 210.160408][ C0] ? glue_xts_req_128bit+0x181/0x6f0 [ 210.161571][ C0] ? aesni_set_key+0x1e0/0x1e0 [ 210.162560][ C0] ? glue_ctr_req_128bit+0x630/0x630 [ 210.163706][ C0] ? kasan_save_stack+0x37/0x50 [ 210.164761][ C0] ? kasan_save_stack+0x20/0x50 [ 210.165786][ C0] ? get_page_from_freelist+0x2052/0x36a0 [ 210.167024][ C0] ? __blkdev_direct_IO_simple+0x43b/0x7e0 [ 210.168288][ C0] ? blkdev_direct_IO+0xd16/0x1020 [ 210.169396][ C0] ? generic_file_direct_write+0x1a3/0x480 [ 210.170648][ C0] ? __generic_file_write_iter+0x1d9/0x530 [ 210.171882][ C0] ? blkdev_write_iter+0x20d/0x3e0 [ 210.172954][ C0] ? vfs_write+0x524/0x770 [ 210.173889][ C0] ? do_syscall_64+0x33/0x40 [ 210.174859][ C0] ? __zone_watermark_ok+0x340/0x340 [ 210.175977][ C0] ? crypt_convert+0x28b6/0x4c00 [ 210.177079][ C0] ? mempool_alloc+0x107/0x2f0 [ 210.178096][ C0] ? crypt_iv_tcw_ctr+0x4a0/0x4a0 [ 210.179193][ C0] ? bio_add_page+0x111/0x170 [ 210.180251][ C0] ? __bio_try_merge_page+0x480/0x480 [ 210.181446][ C0] ? bio_associate_blkg+0x6d/0x100 [ 210.182558][ C0] ? kcryptd_crypt_write_convert+0x5ea/0x980 [ 210.183852][ C0] ? crypt_map+0x5bf/0xc80 [ 210.184838][ C0] ? bio_clone_blkg_association+0x10e/0x2c0 [ 210.186125][ C0] ? __map_bio.isra.0+0x109/0x3f0 [ 210.187204][ C0] ? __split_and_process_non_flush+0x7f9/0xc50 [ 210.188560][ C0] ? __send_empty_flush+0x2d0/0x2d0 [ 210.189697][ C0] ? __part_start_io_acct+0x70/0x2d0 [ 210.190842][ C0] ? dm_submit_bio+0x4d8/0xe40 [ 210.191845][ C0] ? __split_and_process_non_flush+0xc50/0xc50 [ 210.193201][ C0] ? submit_bio_noacct+0x2b9/0xe50 [ 210.194313][ C0] ? blk_queue_enter+0x6d0/0x6d0 [ 210.195372][ C0] ? __bio_add_page+0x246/0x3d0 [ 210.196418][ C0] ? bio_iov_iter_get_pages+0x7dd/0xbe0 [ 210.197611][ C0] ? submit_bio+0xe2/0x460 [ 210.198481][ C0] ? submit_bio_noacct+0xe50/0xe50 [ 210.199496][ C0] ? free_unref_page_commit.constprop.0+0x130/0x330 [ 210.200825][ C0] ? __blkdev_direct_IO_simple+0x43b/0x7e0 [ 210.202050][ C0] ? bd_link_disk_holder+0x690/0x690 [ 210.203239][ C0] ? put_pages_list+0x210/0x210 [ 210.204341][ C0] ? scan_shadow_nodes+0xb0/0xb0 [ 210.205472][ C0] ? _raw_write_lock_irqsave+0xe0/0xe0 [ 210.206698][ C0] ? bd_may_claim+0xc0/0xc0 [ 210.207715][ C0] ? zero_user_segments.constprop.0+0x2e0/0x2e0 [ 210.209092][ C0] ? blkdev_direct_IO+0xd16/0x1020 [ 210.210200][ C0] ? pagevec_lookup_range_tag+0x28/0x60 [ 210.211416][ C0] ? __filemap_fdatawait_range+0xc4/0x1f0 [ 210.212669][ C0] ? page_cache_next_miss+0x1e0/0x1e0 [ 210.213842][ C0] ? generic_file_buffered_read+0x520/0x9e0 [ 210.215128][ C0] ? delete_from_page_cache_batch+0x850/0x850 [ 210.216470][ C0] ? bd_abort_claiming+0xd0/0xd0 [ 210.217531][ C0] ? file_remove_privs+0x74/0x430 [ 210.218589][ C0] ? filemap_check_errors+0x50/0xe0 [ 210.219705][ C0] ? generic_file_direct_write+0x1a3/0x480 [ 210.220979][ C0] ? __generic_file_write_iter+0x1d9/0x530 [ 210.222238][ C0] ? blkdev_write_iter+0x20d/0x3e0 [ 210.223328][ C0] ? bd_unlink_disk_holder+0x360/0x360 [ 210.224464][ C0] ? new_sync_write+0x37b/0x620 [ 210.225511][ C0] ? new_sync_read+0x610/0x610 [ 210.226539][ C0] ? _cond_resched+0x17/0x80 [ 210.227539][ C0] ? inode_security+0x58/0x100 [ 210.228582][ C0] ? security_file_permission+0x54/0x450 [ 210.229796][ C0] ? vfs_write+0x524/0x770 [ 210.230758][ C0] ? __x64_sys_pwrite64+0x197/0x1f0 [ 210.231890][ C0] ? vfs_write+0x770/0x770 [ 210.232869][ C0] ? do_syscall_64+0x33/0x40 [ 210.233839][ C0] ? entry_SYSCALL_64_after_hwframe+0x44/0xa9 Fix this by allocating crypto requests with GFP_ATOMIC mask in interrupt context Fixes: 39d42fa96ba1 ("dm crypt: add flags to optionally bypass kcryptd workqueues") Reported-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> Cc: <stable(a)vger.kernel.org> # v5.9+ Signed-off-by: Ignat Korchagin <ignat(a)cloudflare.com> --- drivers/md/dm-crypt.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 53791138d78b..e4fd690c70e1 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1454,13 +1454,16 @@ static int crypt_convert_block_skcipher(struct crypt_config *cc, static void kcryptd_async_done(struct crypto_async_request *async_req, int error); -static void crypt_alloc_req_skcipher(struct crypt_config *cc, +static int crypt_alloc_req_skcipher(struct crypt_config *cc, struct convert_context *ctx) { unsigned key_index = ctx->cc_sector & (cc->tfms_count - 1); - if (!ctx->r.req) - ctx->r.req = mempool_alloc(&cc->req_pool, GFP_NOIO); + if (!ctx->r.req) { + ctx->r.req = mempool_alloc(&cc->req_pool, in_interrupt() ? GFP_ATOMIC : GFP_NOIO); + if (!ctx->r.req) + return -ENOMEM; + } skcipher_request_set_tfm(ctx->r.req, cc->cipher_tfm.tfms[key_index]); @@ -1471,13 +1474,18 @@ static void crypt_alloc_req_skcipher(struct crypt_config *cc, skcipher_request_set_callback(ctx->r.req, CRYPTO_TFM_REQ_MAY_BACKLOG, kcryptd_async_done, dmreq_of_req(cc, ctx->r.req)); + + return 0; } -static void crypt_alloc_req_aead(struct crypt_config *cc, +static int crypt_alloc_req_aead(struct crypt_config *cc, struct convert_context *ctx) { - if (!ctx->r.req_aead) - ctx->r.req_aead = mempool_alloc(&cc->req_pool, GFP_NOIO); + if (!ctx->r.req) { + ctx->r.req = mempool_alloc(&cc->req_pool, in_interrupt() ? GFP_ATOMIC : GFP_NOIO); + if (!ctx->r.req) + return -ENOMEM; + } aead_request_set_tfm(ctx->r.req_aead, cc->cipher_tfm.tfms_aead[0]); @@ -1488,15 +1496,17 @@ static void crypt_alloc_req_aead(struct crypt_config *cc, aead_request_set_callback(ctx->r.req_aead, CRYPTO_TFM_REQ_MAY_BACKLOG, kcryptd_async_done, dmreq_of_req(cc, ctx->r.req_aead)); + + return 0; } -static void crypt_alloc_req(struct crypt_config *cc, +static int crypt_alloc_req(struct crypt_config *cc, struct convert_context *ctx) { if (crypt_integrity_aead(cc)) - crypt_alloc_req_aead(cc, ctx); + return crypt_alloc_req_aead(cc, ctx); else - crypt_alloc_req_skcipher(cc, ctx); + return crypt_alloc_req_skcipher(cc, ctx); } static void crypt_free_req_skcipher(struct crypt_config *cc, @@ -1539,7 +1549,10 @@ static blk_status_t crypt_convert(struct crypt_config *cc, while (ctx->iter_in.bi_size && ctx->iter_out.bi_size) { - crypt_alloc_req(cc, ctx); + r = crypt_alloc_req(cc, ctx); + if (r) + return BLK_STS_RESOURCE; + atomic_inc(&ctx->cc_pending); if (crypt_integrity_aead(cc)) -- 2.20.1

3 years, 4 months

2
2
0 0

[merged] lib-zlib-fix-inflating-zlib-streams-on-s390.patch removed from -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: lib/zlib: fix inflating zlib streams on s390 has been removed from the -mm tree. Its filename was lib-zlib-fix-inflating-zlib-streams-on-s390.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Ilya Leoshkevich <iii(a)linux.ibm.com> Subject: lib/zlib: fix inflating zlib streams on s390 Decompressing zlib streams on s390 fails with "incorrect data check" error. Userspace zlib checks inflate_state.flags in order to byteswap checksums only for zlib streams, and s390 hardware inflate code, which was ported from there, tries to match this behavior. At the same time, kernel zlib does not use inflate_state.flags, so it contains essentially random values. For many use cases either zlib stream is zeroed out or checksum is not used, so this problem is masked, but at least SquashFS is still affected. Fix by always passing a checksum to and from the hardware as is, which matches zlib_inflate()'s expectations. Link: https://lkml.kernel.org/r/20201215155551.894884-1-iii@linux.ibm.com Fixes: 126196100063 ("lib/zlib: add s390 hardware support for kernel zlib_inflate") Signed-off-by: Ilya Leoshkevich <iii(a)linux.ibm.com> Tested-by: Christian Borntraeger <borntraeger(a)de.ibm.com> Acked-by: Mikhail Zaslonko <zaslonko(a)linux.ibm.com> Acked-by: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: Heiko Carstens <hca(a)linux.ibm.com> Cc: Vasily Gorbik <gor(a)linux.ibm.com> Cc: Mikhail Zaslonko <zaslonko(a)linux.ibm.com> Cc: <stable(a)vger.kernel.org> [5.6+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- lib/zlib_dfltcc/dfltcc_inflate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/lib/zlib_dfltcc/dfltcc_inflate.c~lib-zlib-fix-inflating-zlib-streams-on-s390 +++ a/lib/zlib_dfltcc/dfltcc_inflate.c @@ -125,7 +125,7 @@ dfltcc_inflate_action dfltcc_inflate( param->ho = (state->write - state->whave) & ((1 << HB_BITS) - 1); if (param->hl) param->nt = 0; /* Honor history for the first block */ - param->cv = state->flags ? REVERSE(state->check) : state->check; + param->cv = state->check; /* Inflate */ do { @@ -138,7 +138,7 @@ dfltcc_inflate_action dfltcc_inflate( state->bits = param->sbb; state->whave = param->hl; state->write = (param->ho + param->hl) & ((1 << HB_BITS) - 1); - state->check = state->flags ? REVERSE(param->cv) : param->cv; + state->check = param->cv; if (cc == DFLTCC_CC_OP2_CORRUPT && param->oesc != 0) { /* Report an error if stream is corrupted */ state->mode = BAD; _ Patches currently in -mm which might be from iii(a)linux.ibm.com are

3 years, 4 months

1
0
0 0

[merged] mm-memmap-defer-init-dosnt-work-as-expected.patch removed from -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: mm: memmap defer init doesn't work as expected has been removed from the -mm tree. Its filename was mm-memmap-defer-init-dosnt-work-as-expected.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Baoquan He <bhe(a)redhat.com> Subject: mm: memmap defer init doesn't work as expected VMware observed a performance regression during memmap init on their platform, and bisected to commit 73a6e474cb376 ("mm: memmap_init: iterate over memblock regions rather that check each PFN") causing it. Before the commit: [0.033176] Normal zone: 1445888 pages used for memmap [0.033176] Normal zone: 89391104 pages, LIFO batch:63 [0.035851] ACPI: PM-Timer IO Port: 0x448 With commit [0.026874] Normal zone: 1445888 pages used for memmap [0.026875] Normal zone: 89391104 pages, LIFO batch:63 [2.028450] ACPI: PM-Timer IO Port: 0x448 The root cause is the current memmap defer init doesn't work as expected. Before, memmap_init_zone() was used to do memmap init of one whole zone, to initialize all low zones of one numa node, but defer memmap init of the last zone in that numa node. However, since commit 73a6e474cb376, function memmap_init() is adapted to iterater over memblock regions inside one zone, then call memmap_init_zone() to do memmap init for each region. E.g, on VMware's system, the memory layout is as below, there are two memory regions in node 2. The current code will mistakenly initialize the whole 1st region [mem 0xab00000000-0xfcffffffff], then do memmap defer to iniatialize only one memmory section on the 2nd region [mem 0x10000000000-0x1033fffffff]. In fact, we only expect to see that there's only one memory section's memmap initialized. That's why more time is costed at the time. [ 0.008842] ACPI: SRAT: Node 0 PXM 0 [mem 0x00000000-0x0009ffff] [ 0.008842] ACPI: SRAT: Node 0 PXM 0 [mem 0x00100000-0xbfffffff] [ 0.008843] ACPI: SRAT: Node 0 PXM 0 [mem 0x100000000-0x55ffffffff] [ 0.008844] ACPI: SRAT: Node 1 PXM 1 [mem 0x5600000000-0xaaffffffff] [ 0.008844] ACPI: SRAT: Node 2 PXM 2 [mem 0xab00000000-0xfcffffffff] [ 0.008845] ACPI: SRAT: Node 2 PXM 2 [mem 0x10000000000-0x1033fffffff] Now, let's add a parameter 'zone_end_pfn' to memmap_init_zone() to pass down the real zone end pfn so that defer_init() can use it to judge whether defer need be taken in zone wide. Link: https://lkml.kernel.org/r/20201223080811.16211-1-bhe@redhat.com Link: https://lkml.kernel.org/r/20201223080811.16211-2-bhe@redhat.com Fixes: commit 73a6e474cb376 ("mm: memmap_init: iterate over memblock regions rather that check each PFN") Signed-off-by: Baoquan He <bhe(a)redhat.com> Reported-by: Rahul Gopakumar <gopakumarr(a)vmware.com> Reviewed-by: Mike Rapoport <rppt(a)linux.ibm.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- arch/ia64/mm/init.c | 4 ++-- include/linux/mm.h | 5 +++-- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 8 +++++--- 4 files changed, 11 insertions(+), 8 deletions(-) --- a/arch/ia64/mm/init.c~mm-memmap-defer-init-dosnt-work-as-expected +++ a/arch/ia64/mm/init.c @@ -536,7 +536,7 @@ virtual_memmap_init(u64 start, u64 end, if (map_start < map_end) memmap_init_zone((unsigned long)(map_end - map_start), - args->nid, args->zone, page_to_pfn(map_start), + args->nid, args->zone, page_to_pfn(map_start), page_to_pfn(map_end), MEMINIT_EARLY, NULL, MIGRATE_MOVABLE); return 0; } @@ -546,7 +546,7 @@ memmap_init (unsigned long size, int nid unsigned long start_pfn) { if (!vmem_map) { - memmap_init_zone(size, nid, zone, start_pfn, + memmap_init_zone(size, nid, zone, start_pfn, start_pfn + size, MEMINIT_EARLY, NULL, MIGRATE_MOVABLE); } else { struct page *start; --- a/include/linux/mm.h~mm-memmap-defer-init-dosnt-work-as-expected +++ a/include/linux/mm.h @@ -2439,8 +2439,9 @@ extern int __meminit early_pfn_to_nid(un #endif extern void set_dma_reserve(unsigned long new_dma_reserve); -extern void memmap_init_zone(unsigned long, int, unsigned long, unsigned long, - enum meminit_context, struct vmem_altmap *, int migratetype); +extern void memmap_init_zone(unsigned long, int, unsigned long, + unsigned long, unsigned long, enum meminit_context, + struct vmem_altmap *, int migratetype); extern void setup_per_zone_wmarks(void); extern int __meminit init_per_zone_wmark_min(void); extern void mem_init(void); --- a/mm/memory_hotplug.c~mm-memmap-defer-init-dosnt-work-as-expected +++ a/mm/memory_hotplug.c @@ -713,7 +713,7 @@ void __ref move_pfn_range_to_zone(struct * expects the zone spans the pfn range. All the pages in the range * are reserved so nobody should be touching them so we should be safe */ - memmap_init_zone(nr_pages, nid, zone_idx(zone), start_pfn, + memmap_init_zone(nr_pages, nid, zone_idx(zone), start_pfn, 0, MEMINIT_HOTPLUG, altmap, migratetype); set_zone_contiguous(zone); --- a/mm/page_alloc.c~mm-memmap-defer-init-dosnt-work-as-expected +++ a/mm/page_alloc.c @@ -423,6 +423,8 @@ defer_init(int nid, unsigned long pfn, u if (end_pfn < pgdat_end_pfn(NODE_DATA(nid))) return false; + if (NODE_DATA(nid)->first_deferred_pfn != ULONG_MAX) + return true; /* * We start only with one section of pages, more pages are added as * needed until the rest of deferred pages are initialized. @@ -6116,7 +6118,7 @@ overlap_memmap_init(unsigned long zone, * zone stats (e.g., nr_isolate_pageblock) are touched. */ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, - unsigned long start_pfn, + unsigned long start_pfn, unsigned long zone_end_pfn, enum meminit_context context, struct vmem_altmap *altmap, int migratetype) { @@ -6152,7 +6154,7 @@ void __meminit memmap_init_zone(unsigned if (context == MEMINIT_EARLY) { if (overlap_memmap_init(zone, &pfn)) continue; - if (defer_init(nid, pfn, end_pfn)) + if (defer_init(nid, pfn, zone_end_pfn)) break; } @@ -6266,7 +6268,7 @@ void __meminit __weak memmap_init(unsign if (end_pfn > start_pfn) { size = end_pfn - start_pfn; - memmap_init_zone(size, nid, zone, start_pfn, + memmap_init_zone(size, nid, zone, start_pfn, range_end_pfn, MEMINIT_EARLY, NULL, MIGRATE_MOVABLE); } } _ Patches currently in -mm which might be from bhe(a)redhat.com are

3 years, 4 months

1
0
0 0

[merged] mm-hugetlb-fix-deadlock-in-hugetlb_cow-error-path.patch removed from -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: mm/hugetlb: fix deadlock in hugetlb_cow error path has been removed from the -mm tree. Its filename was mm-hugetlb-fix-deadlock-in-hugetlb_cow-error-path.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Mike Kravetz <mike.kravetz(a)oracle.com> Subject: mm/hugetlb: fix deadlock in hugetlb_cow error path syzbot reported the deadlock here [1]. The issue is in hugetlb cow error handling when there are not enough huge pages for the faulting task which took the original reservation. It is possible that other (child) tasks could have consumed pages associated with the reservation. In this case, we want the task which took the original reservation to succeed. So, we unmap any associated pages in children so that they can be used by the faulting task that owns the reservation. The unmapping code needs to hold i_mmap_rwsem in write mode. However, due to commit c0d0381ade79 ("hugetlbfs: use i_mmap_rwsem for more pmd sharing synchronization") we are already holding i_mmap_rwsem in read mode when hugetlb_cow is called. Technically, i_mmap_rwsem does not need to be held in read mode for COW mappings as they can not share pmd's. Modifying the fault code to not take i_mmap_rwsem in read mode for COW (and other non-sharable) mappings is too involved for a stable fix. Instead, we simply drop the hugetlb_fault_mutex and i_mmap_rwsem before unmapping. This is OK as it is technically not needed. They are reacquired after unmapping as expected by calling code. Since this is done in an uncommon error path, the overhead of dropping and reacquiring mutexes is acceptable. While making changes, remove redundant BUG_ON after unmap_ref_private. [1] https://lkml.kernel.org/r/000000000000b73ccc05b5cf8558@google.com Link: https://lkml.kernel.org/r/4c5781b8-3b00-761e-c0c7-c5edebb6ec1a@oracle.com Fixes: c0d0381ade79 ("hugetlbfs: use i_mmap_rwsem for more pmd sharing synchronization") Signed-off-by: Mike Kravetz <mike.kravetz(a)oracle.com> Reported-by: syzbot+5eee4145df3c15e96625(a)syzkaller.appspotmail.com Cc: Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com> Cc: Michal Hocko <mhocko(a)kernel.org> Cc: Hugh Dickins <hughd(a)google.com> Cc: "Aneesh Kumar K . V" <aneesh.kumar(a)linux.vnet.ibm.com> Cc: Davidlohr Bueso <dave(a)stgolabs.net> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/hugetlb.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) --- a/mm/hugetlb.c~mm-hugetlb-fix-deadlock-in-hugetlb_cow-error-path +++ a/mm/hugetlb.c @@ -4105,10 +4105,30 @@ retry_avoidcopy: * may get SIGKILLed if it later faults. */ if (outside_reserve) { + struct address_space *mapping = vma->vm_file->f_mapping; + pgoff_t idx; + u32 hash; + put_page(old_page); BUG_ON(huge_pte_none(pte)); + /* + * Drop hugetlb_fault_mutex and i_mmap_rwsem before + * unmapping. unmapping needs to hold i_mmap_rwsem + * in write mode. Dropping i_mmap_rwsem in read mode + * here is OK as COW mappings do not interact with + * PMD sharing. + * + * Reacquire both after unmap operation. + */ + idx = vma_hugecache_offset(h, vma, haddr); + hash = hugetlb_fault_mutex_hash(mapping, idx); + mutex_unlock(&hugetlb_fault_mutex_table[hash]); + i_mmap_unlock_read(mapping); + unmap_ref_private(mm, vma, old_page, haddr); - BUG_ON(huge_pte_none(pte)); + + i_mmap_lock_read(mapping); + mutex_lock(&hugetlb_fault_mutex_table[hash]); spin_lock(ptl); ptep = huge_pte_offset(mm, haddr, huge_page_size(h)); if (likely(ptep && _ Patches currently in -mm which might be from mike.kravetz(a)oracle.com are mm-hugetlb-change-hugetlb_reserve_pages-to-type-bool.patch hugetlbfs-remove-special-hugetlbfs_set_page_dirty.patch

3 years, 4 months

1
0
0 0

[PATCH 4/4] io_uring: cancel requests enqueued as task_work's

by Pavel Begunkov

Currently request cancellations are happening before PF_EXITING is set, so it's allowed to call task_work_run(). Even though it should work as it's not it's safer to remove PF_EXITING checks. Cc: stable(a)vger.kernel.org # 5.5+ Signed-off-by: Pavel Begunkov <asml.silence(a)gmail.com> --- fs/io_uring.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index ca46f314640b..8d4fa0031e0a 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2361,12 +2361,8 @@ static inline unsigned int io_put_rw_kbuf(struct io_kiocb *req) static inline bool io_run_task_work(void) { - /* - * Not safe to run on exiting task, and the task_work handling will - * not add work to such a task. - */ - if (unlikely(current->flags & PF_EXITING)) - return false; + WARN_ON_ONCE(current->flags & PF_EXITING); + if (current->task_works) { __set_current_state(TASK_RUNNING); task_work_run(); -- 2.24.0

3 years, 4 months

2
1
0 0

sound

by Christian Labisch

Hello ! I could need your help ... I have tested the new kernel 5.10.3 and sound doesn't work with this version. Seems the new Intel audio drivers are the main reason. What can be done ? Do you have any ideas ? Intel Catpt driver support is new ... This deprecates the previous Haswell SoC audio driver code previously providing the audio capabilities. And I am having a Haswell CPU -> Audio device: Intel Corporation Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller (rev 06) Regards, Christian

3 years, 4 months

5
9
0 0

patch "crypto: asym_tpm: correct zero out potential secrets" added to char-misc-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled crypto: asym_tpm: correct zero out potential secrets to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-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 f93274ef0fe972c120c96b3207f8fce376231a60 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Date: Fri, 4 Dec 2020 09:01:36 +0100 Subject: crypto: asym_tpm: correct zero out potential secrets The function derive_pub_key() should be calling memzero_explicit() instead of memset() in case the complier decides to optimize away the call to memset() because it "knows" no one is going to touch the memory anymore. Cc: stable <stable(a)vger.kernel.org> Reported-by: Ilil Blum Shem-Tov <ilil.blum.shem-tov(a)intel.com> Tested-by: Ilil Blum Shem-Tov <ilil.blum.shem-tov(a)intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Link: https://lore.kernel.org/r/X8ns4AfwjKudpyfe@kroah.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- crypto/asymmetric_keys/asym_tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/asymmetric_keys/asym_tpm.c b/crypto/asymmetric_keys/asym_tpm.c index 511932aa94a6..0959613560b9 100644 --- a/crypto/asymmetric_keys/asym_tpm.c +++ b/crypto/asymmetric_keys/asym_tpm.c @@ -354,7 +354,7 @@ static uint32_t derive_pub_key(const void *pub_key, uint32_t len, uint8_t *buf) memcpy(cur, e, sizeof(e)); cur += sizeof(e); /* Zero parameters to satisfy set_pub_key ABI. */ - memset(cur, 0, SETKEY_PARAMS_SIZE); + memzero_explicit(cur, SETKEY_PARAMS_SIZE); return cur - buf; } -- 2.30.0

3 years, 4 months

2
1
0 0

[PATCH 1/2] dm crypt: use GFP_ATOMIC when allocating crypto requests from softirq

by Ignat Korchagin

Commit 39d42fa96ba1b7d2544db3f8ed5da8fb0d5cb877 made it possible for some code paths in dm-crypt to be executed in softirq context, when the underlying driver processes IO requests in interrupt/softirq context. In this case sometimes when allocating a new crypto request we may get a stacktrace like below: [ 210.103008][ C0] BUG: sleeping function called from invalid context at mm/mempool.c:381 [ 210.104746][ C0] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2602, name: fio [ 210.106599][ C0] CPU: 0 PID: 2602 Comm: fio Tainted: G W 5.10.0+ #50 [ 210.108331][ C0] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 0.0.0 02/06/2015 [ 210.110212][ C0] Call Trace: [ 210.110921][ C0] <IRQ> [ 210.111527][ C0] dump_stack+0x7d/0xa3 [ 210.112411][ C0] ___might_sleep.cold+0x122/0x151 [ 210.113527][ C0] mempool_alloc+0x16b/0x2f0 [ 210.114524][ C0] ? __queue_work+0x515/0xde0 [ 210.115553][ C0] ? mempool_resize+0x700/0x700 [ 210.116586][ C0] ? crypt_endio+0x91/0x180 [ 210.117479][ C0] ? blk_update_request+0x757/0x1150 [ 210.118513][ C0] ? blk_mq_end_request+0x4b/0x480 [ 210.119572][ C0] ? blk_done_softirq+0x21d/0x340 [ 210.120628][ C0] ? __do_softirq+0x190/0x611 [ 210.121626][ C0] crypt_convert+0x29f9/0x4c00 [ 210.122668][ C0] ? _raw_spin_lock_irqsave+0x87/0xe0 [ 210.123824][ C0] ? kasan_set_track+0x1c/0x30 [ 210.124858][ C0] ? crypt_iv_tcw_ctr+0x4a0/0x4a0 [ 210.125930][ C0] ? kmem_cache_free+0x104/0x470 [ 210.126973][ C0] ? crypt_endio+0x91/0x180 [ 210.127947][ C0] kcryptd_crypt_read_convert+0x30e/0x420 [ 210.129165][ C0] blk_update_request+0x757/0x1150 [ 210.130231][ C0] blk_mq_end_request+0x4b/0x480 [ 210.131294][ C0] blk_done_softirq+0x21d/0x340 [ 210.132332][ C0] ? _raw_spin_lock+0x81/0xd0 [ 210.133289][ C0] ? blk_mq_stop_hw_queue+0x30/0x30 [ 210.134399][ C0] ? _raw_read_lock_irq+0x40/0x40 [ 210.135458][ C0] __do_softirq+0x190/0x611 [ 210.136409][ C0] ? handle_edge_irq+0x221/0xb60 [ 210.137447][ C0] asm_call_irq_on_stack+0x12/0x20 [ 210.138507][ C0] </IRQ> [ 210.139118][ C0] do_softirq_own_stack+0x37/0x40 [ 210.140191][ C0] irq_exit_rcu+0x110/0x1b0 [ 210.141151][ C0] common_interrupt+0x74/0x120 [ 210.142171][ C0] asm_common_interrupt+0x1e/0x40 [ 210.143206][ C0] RIP: 0010:_aesni_enc1+0x65/0xb0 [ 210.144313][ C0] Code: 38 dc c2 41 0f 28 52 d0 66 0f 38 dc c2 41 0f 28 52 e0 66 0f 38 dc c2 41 0f 28 52 f0 66 0f 38 dc c2 41 0f 28 12 66 0f 38 dc c2 <41> 0f 28 52 10 66 0f 38 dc c2 41 0f 28 52 20 66 0f 38 dc c2 41 0f [ 210.148542][ C0] RSP: 0018:ffff88810dbe6db0 EFLAGS: 00000286 [ 210.149842][ C0] RAX: ffffffff9a90cdc0 RBX: 0000000000000000 RCX: 0000000000000200 [ 210.151576][ C0] RDX: ffff888101e5f240 RSI: ffff888101e5f240 RDI: ffff8881111b5020 [ 210.153339][ C0] RBP: ffff88810dbe6e20 R08: 0000000000000000 R09: 0000000000000020 [ 210.155063][ C0] R10: ffff8881111b5090 R11: 1ffff11021b7cdcc R12: ffffffff9e87cd40 [ 210.156791][ C0] R13: ffff8881111b5210 R14: ffff888101e5f0d8 R15: 0000000000000000 [ 210.158497][ C0] ? aesni_set_key+0x1e0/0x1e0 [ 210.159523][ C0] ? aesni_enc+0xf/0x20 [ 210.160408][ C0] ? glue_xts_req_128bit+0x181/0x6f0 [ 210.161571][ C0] ? aesni_set_key+0x1e0/0x1e0 [ 210.162560][ C0] ? glue_ctr_req_128bit+0x630/0x630 [ 210.163706][ C0] ? kasan_save_stack+0x37/0x50 [ 210.164761][ C0] ? kasan_save_stack+0x20/0x50 [ 210.165786][ C0] ? get_page_from_freelist+0x2052/0x36a0 [ 210.167024][ C0] ? __blkdev_direct_IO_simple+0x43b/0x7e0 [ 210.168288][ C0] ? blkdev_direct_IO+0xd16/0x1020 [ 210.169396][ C0] ? generic_file_direct_write+0x1a3/0x480 [ 210.170648][ C0] ? __generic_file_write_iter+0x1d9/0x530 [ 210.171882][ C0] ? blkdev_write_iter+0x20d/0x3e0 [ 210.172954][ C0] ? vfs_write+0x524/0x770 [ 210.173889][ C0] ? do_syscall_64+0x33/0x40 [ 210.174859][ C0] ? __zone_watermark_ok+0x340/0x340 [ 210.175977][ C0] ? crypt_convert+0x28b6/0x4c00 [ 210.177079][ C0] ? mempool_alloc+0x107/0x2f0 [ 210.178096][ C0] ? crypt_iv_tcw_ctr+0x4a0/0x4a0 [ 210.179193][ C0] ? bio_add_page+0x111/0x170 [ 210.180251][ C0] ? __bio_try_merge_page+0x480/0x480 [ 210.181446][ C0] ? bio_associate_blkg+0x6d/0x100 [ 210.182558][ C0] ? kcryptd_crypt_write_convert+0x5ea/0x980 [ 210.183852][ C0] ? crypt_map+0x5bf/0xc80 [ 210.184838][ C0] ? bio_clone_blkg_association+0x10e/0x2c0 [ 210.186125][ C0] ? __map_bio.isra.0+0x109/0x3f0 [ 210.187204][ C0] ? __split_and_process_non_flush+0x7f9/0xc50 [ 210.188560][ C0] ? __send_empty_flush+0x2d0/0x2d0 [ 210.189697][ C0] ? __part_start_io_acct+0x70/0x2d0 [ 210.190842][ C0] ? dm_submit_bio+0x4d8/0xe40 [ 210.191845][ C0] ? __split_and_process_non_flush+0xc50/0xc50 [ 210.193201][ C0] ? submit_bio_noacct+0x2b9/0xe50 [ 210.194313][ C0] ? blk_queue_enter+0x6d0/0x6d0 [ 210.195372][ C0] ? __bio_add_page+0x246/0x3d0 [ 210.196418][ C0] ? bio_iov_iter_get_pages+0x7dd/0xbe0 [ 210.197611][ C0] ? submit_bio+0xe2/0x460 [ 210.198481][ C0] ? submit_bio_noacct+0xe50/0xe50 [ 210.199496][ C0] ? free_unref_page_commit.constprop.0+0x130/0x330 [ 210.200825][ C0] ? __blkdev_direct_IO_simple+0x43b/0x7e0 [ 210.202050][ C0] ? bd_link_disk_holder+0x690/0x690 [ 210.203239][ C0] ? put_pages_list+0x210/0x210 [ 210.204341][ C0] ? scan_shadow_nodes+0xb0/0xb0 [ 210.205472][ C0] ? _raw_write_lock_irqsave+0xe0/0xe0 [ 210.206698][ C0] ? bd_may_claim+0xc0/0xc0 [ 210.207715][ C0] ? zero_user_segments.constprop.0+0x2e0/0x2e0 [ 210.209092][ C0] ? blkdev_direct_IO+0xd16/0x1020 [ 210.210200][ C0] ? pagevec_lookup_range_tag+0x28/0x60 [ 210.211416][ C0] ? __filemap_fdatawait_range+0xc4/0x1f0 [ 210.212669][ C0] ? page_cache_next_miss+0x1e0/0x1e0 [ 210.213842][ C0] ? generic_file_buffered_read+0x520/0x9e0 [ 210.215128][ C0] ? delete_from_page_cache_batch+0x850/0x850 [ 210.216470][ C0] ? bd_abort_claiming+0xd0/0xd0 [ 210.217531][ C0] ? file_remove_privs+0x74/0x430 [ 210.218589][ C0] ? filemap_check_errors+0x50/0xe0 [ 210.219705][ C0] ? generic_file_direct_write+0x1a3/0x480 [ 210.220979][ C0] ? __generic_file_write_iter+0x1d9/0x530 [ 210.222238][ C0] ? blkdev_write_iter+0x20d/0x3e0 [ 210.223328][ C0] ? bd_unlink_disk_holder+0x360/0x360 [ 210.224464][ C0] ? new_sync_write+0x37b/0x620 [ 210.225511][ C0] ? new_sync_read+0x610/0x610 [ 210.226539][ C0] ? _cond_resched+0x17/0x80 [ 210.227539][ C0] ? inode_security+0x58/0x100 [ 210.228582][ C0] ? security_file_permission+0x54/0x450 [ 210.229796][ C0] ? vfs_write+0x524/0x770 [ 210.230758][ C0] ? __x64_sys_pwrite64+0x197/0x1f0 [ 210.231890][ C0] ? vfs_write+0x770/0x770 [ 210.232869][ C0] ? do_syscall_64+0x33/0x40 [ 210.233839][ C0] ? entry_SYSCALL_64_after_hwframe+0x44/0xa9 Fix this by allocating crypto requests with GFP_ATOMIC mask in interrupt context Fixes: 39d42fa96ba1 ("dm crypt: add flags to optionally bypass kcryptd workqueues") Reported-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> Cc: <stable(a)vger.kernel.org> # v5.9+ Signed-off-by: Ignat Korchagin <ignat(a)cloudflare.com> --- drivers/md/dm-crypt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 5f9f9b3a226d..777b5c71a2f7 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1460,7 +1460,7 @@ static void crypt_alloc_req_skcipher(struct crypt_config *cc, unsigned key_index = ctx->cc_sector & (cc->tfms_count - 1); if (!ctx->r.req) - ctx->r.req = mempool_alloc(&cc->req_pool, GFP_NOIO); + ctx->r.req = mempool_alloc(&cc->req_pool, in_interrupt() ? GFP_ATOMIC : GFP_NOIO); skcipher_request_set_tfm(ctx->r.req, cc->cipher_tfm.tfms[key_index]); @@ -1477,7 +1477,7 @@ static void crypt_alloc_req_aead(struct crypt_config *cc, struct convert_context *ctx) { if (!ctx->r.req_aead) - ctx->r.req_aead = mempool_alloc(&cc->req_pool, GFP_NOIO); + ctx->r.req_aead = mempool_alloc(&cc->req_pool, in_interrupt() ? GFP_ATOMIC : GFP_NOIO); aead_request_set_tfm(ctx->r.req_aead, cc->cipher_tfm.tfms_aead[0]); -- 2.20.1

3 years, 4 months

2
3
0 0

[PATCH v2 2/2] dm crypt: do not wait for backlogged crypto request completion in softirq

by Ignat Korchagin

Commit 39d42fa96ba1b7d2544db3f8ed5da8fb0d5cb877 made it possible for some code paths in dm-crypt to be executed in softirq context, when the underlying driver processes IO requests in interrupt/softirq context. When Crypto API backlogs a crypto request, dm-crypt uses wait_for_completion to avoid sending further requests to an already overloaded crypto driver. However, if the code is executing in softirq context, we might get the following stacktrace: [ 210.235213][ C0] BUG: scheduling while atomic: fio/2602/0x00000102 [ 210.236701][ C0] Modules linked in: [ 210.237566][ C0] CPU: 0 PID: 2602 Comm: fio Tainted: G W 5.10.0+ #50 [ 210.239292][ C0] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 0.0.0 02/06/2015 [ 210.241233][ C0] Call Trace: [ 210.241946][ C0] <IRQ> [ 210.242561][ C0] dump_stack+0x7d/0xa3 [ 210.243466][ C0] __schedule_bug.cold+0xb3/0xc2 [ 210.244539][ C0] __schedule+0x156f/0x20d0 [ 210.245518][ C0] ? io_schedule_timeout+0x140/0x140 [ 210.246660][ C0] schedule+0xd0/0x270 [ 210.247541][ C0] schedule_timeout+0x1fb/0x280 [ 210.248586][ C0] ? usleep_range+0x150/0x150 [ 210.249624][ C0] ? unpoison_range+0x3a/0x60 [ 210.250632][ C0] ? ____kasan_kmalloc.constprop.0+0x82/0xa0 [ 210.251949][ C0] ? unpoison_range+0x3a/0x60 [ 210.252958][ C0] ? __prepare_to_swait+0xa7/0x190 [ 210.254067][ C0] do_wait_for_common+0x2ab/0x370 [ 210.255158][ C0] ? usleep_range+0x150/0x150 [ 210.256192][ C0] ? bit_wait_io_timeout+0x160/0x160 [ 210.257358][ C0] ? blk_update_request+0x757/0x1150 [ 210.258582][ C0] ? _raw_spin_lock_irq+0x82/0xd0 [ 210.259674][ C0] ? _raw_read_unlock_irqrestore+0x30/0x30 [ 210.260917][ C0] wait_for_completion+0x4c/0x90 [ 210.261971][ C0] crypt_convert+0x19a6/0x4c00 [ 210.263033][ C0] ? _raw_spin_lock_irqsave+0x87/0xe0 [ 210.264193][ C0] ? kasan_set_track+0x1c/0x30 [ 210.265191][ C0] ? crypt_iv_tcw_ctr+0x4a0/0x4a0 [ 210.266283][ C0] ? kmem_cache_free+0x104/0x470 [ 210.267363][ C0] ? crypt_endio+0x91/0x180 [ 210.268327][ C0] kcryptd_crypt_read_convert+0x30e/0x420 [ 210.269565][ C0] blk_update_request+0x757/0x1150 [ 210.270563][ C0] blk_mq_end_request+0x4b/0x480 [ 210.271680][ C0] blk_done_softirq+0x21d/0x340 [ 210.272775][ C0] ? _raw_spin_lock+0x81/0xd0 [ 210.273847][ C0] ? blk_mq_stop_hw_queue+0x30/0x30 [ 210.275031][ C0] ? _raw_read_lock_irq+0x40/0x40 [ 210.276182][ C0] __do_softirq+0x190/0x611 [ 210.277203][ C0] ? handle_edge_irq+0x221/0xb60 [ 210.278340][ C0] asm_call_irq_on_stack+0x12/0x20 [ 210.279514][ C0] </IRQ> [ 210.280164][ C0] do_softirq_own_stack+0x37/0x40 [ 210.281281][ C0] irq_exit_rcu+0x110/0x1b0 [ 210.282286][ C0] common_interrupt+0x74/0x120 [ 210.283376][ C0] asm_common_interrupt+0x1e/0x40 [ 210.284496][ C0] RIP: 0010:_aesni_enc1+0x65/0xb0 Fix this by making crypt_convert function reentrant from the point of a single bio and make dm-crypt defer further bio processing to a workqueue, if Crypto API backlogs a request in interrupt context. Fixes: 39d42fa96ba1 ("dm crypt: add flags to optionally bypass kcryptd workq ueues") Cc: <stable(a)vger.kernel.org> # v5.9+ Signed-off-by: Ignat Korchagin <ignat(a)cloudflare.com> --- drivers/md/dm-crypt.c | 102 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 5 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index e4fd690c70e1..0d939fbe51af 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1539,13 +1539,19 @@ static void crypt_free_req(struct crypt_config *cc, void *req, struct bio *base_ * Encrypt / decrypt data from one bio to another one (can be the same one) */ static blk_status_t crypt_convert(struct crypt_config *cc, - struct convert_context *ctx, bool atomic) + struct convert_context *ctx, bool atomic, bool reset_pending) { unsigned int tag_offset = 0; unsigned int sector_step = cc->sector_size >> SECTOR_SHIFT; int r; - atomic_set(&ctx->cc_pending, 1); + /* + * if reset_pending is set we are dealing with the bio for the first time, + * else we're continuing to work on the previous bio, so don't mess with + * the cc_pending counter + */ + if (reset_pending) + atomic_set(&ctx->cc_pending, 1); while (ctx->iter_in.bi_size && ctx->iter_out.bi_size) { @@ -1566,7 +1572,24 @@ static blk_status_t crypt_convert(struct crypt_config *cc, * but the driver request queue is full, let's wait. */ case -EBUSY: - wait_for_completion(&ctx->restart); + if (in_interrupt()) { + if (try_wait_for_completion(&ctx->restart)) { + /* + * we don't have to block to wait for completion, + * so proceed + */ + } else { + /* + * we can't wait for completion without blocking + * exit and continue processing in a workqueue + */ + ctx->r.req = NULL; + ctx->cc_sector += sector_step; + tag_offset++; + return BLK_STS_DEV_RESOURCE; + } + } else + wait_for_completion(&ctx->restart); reinit_completion(&ctx->restart); fallthrough; /* @@ -1958,6 +1981,37 @@ static bool kcryptd_crypt_write_inline(struct crypt_config *cc, } } +static void kcryptd_crypt_write_continue(struct work_struct *work) +{ + struct dm_crypt_io *io = container_of(work, struct dm_crypt_io, work); + struct crypt_config *cc = io->cc; + struct convert_context *ctx = &io->ctx; + int crypt_finished; + sector_t sector = io->sector; + blk_status_t r; + + wait_for_completion(&ctx->restart); + reinit_completion(&ctx->restart); + + r = crypt_convert(cc, &io->ctx, true, false); + if (r) + io->error = r; + crypt_finished = atomic_dec_and_test(&ctx->cc_pending); + if (!crypt_finished && kcryptd_crypt_write_inline(cc, ctx)) { + /* Wait for completion signaled by kcryptd_async_done() */ + wait_for_completion(&ctx->restart); + crypt_finished = 1; + } + + /* Encryption was already finished, submit io now */ + if (crypt_finished) { + kcryptd_crypt_write_io_submit(io, 0); + io->sector = sector; + } + + crypt_dec_pending(io); +} + static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) { struct crypt_config *cc = io->cc; @@ -1986,7 +2040,17 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) crypt_inc_pending(io); r = crypt_convert(cc, ctx, - test_bit(DM_CRYPT_NO_WRITE_WORKQUEUE, &cc->flags)); + test_bit(DM_CRYPT_NO_WRITE_WORKQUEUE, &cc->flags), true); + /* + * Crypto API backlogged the request, because its queue was full + * and we're in softirq context, so continue from a workqueue + * (TODO: is it actually possible to be in softirq in the write path?) + */ + if (r == BLK_STS_DEV_RESOURCE) { + INIT_WORK(&io->work, kcryptd_crypt_write_continue); + queue_work(cc->crypt_queue, &io->work); + return; + } if (r) io->error = r; crypt_finished = atomic_dec_and_test(&ctx->cc_pending); @@ -2011,6 +2075,25 @@ static void kcryptd_crypt_read_done(struct dm_crypt_io *io) crypt_dec_pending(io); } +static void kcryptd_crypt_read_continue(struct work_struct *work) +{ + struct dm_crypt_io *io = container_of(work, struct dm_crypt_io, work); + struct crypt_config *cc = io->cc; + blk_status_t r; + + wait_for_completion(&io->ctx.restart); + reinit_completion(&io->ctx.restart); + + r = crypt_convert(cc, &io->ctx, true, false); + if (r) + io->error = r; + + if (atomic_dec_and_test(&io->ctx.cc_pending)) + kcryptd_crypt_read_done(io); + + crypt_dec_pending(io); +} + static void kcryptd_crypt_read_convert(struct dm_crypt_io *io) { struct crypt_config *cc = io->cc; @@ -2022,7 +2105,16 @@ static void kcryptd_crypt_read_convert(struct dm_crypt_io *io) io->sector); r = crypt_convert(cc, &io->ctx, - test_bit(DM_CRYPT_NO_READ_WORKQUEUE, &cc->flags)); + test_bit(DM_CRYPT_NO_READ_WORKQUEUE, &cc->flags), true); + /* + * Crypto API backlogged the request, because its queue was full + * and we're in softirq context, so continue from a workqueue + */ + if (r == BLK_STS_DEV_RESOURCE) { + INIT_WORK(&io->work, kcryptd_crypt_read_continue); + queue_work(cc->crypt_queue, &io->work); + return; + } if (r) io->error = r; -- 2.20.1

3 years, 4 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2020