4.19.41-stable review
Subsystems (5)
Greg Kroah-Hartman
maintainercover 4.19.41-stable review
This is the start of the stable review cycle for the 4.19.41 release. There are 99 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 08 May 2019 02:29:12 PM UTC. 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.41-rc1.gz
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 <[email protected]>
Linux 4.19.41-rc1
Jacopo Mondi <[email protected]>
media: v4l2: i2c: ov7670: Fix PLL bypass register values
Nicolas Le Bayon <[email protected]>
i2c: i2c-stm32f7: Fix SDADEL minimum formula
Peter Zijlstra <[email protected]>
x86/mm/tlb: Revert "x86/mm: Align TLB invalidation info"
Qian Cai <[email protected]>
x86/mm: Fix a crash with kmemleak_scan()
Baoquan He <[email protected]>
x86/mm/KASLR: Fix the size of the direct mapping section
David Müller <[email protected]>
clk: x86: Add system specific quirk to mark clocks as critical
Tony Luck <[email protected]>
x86/mce: Improve error message when kernel cannot recover, p2
Aneesh Kumar K.V <[email protected]>
powerpc/mm/hash: Handle mmap_min_addr correctly in get_unmapped_area topdown search
Alexander Wetzel <[email protected]>
mac80211: Honor SW_CRYPTO_CONTROL for unicast keys in AP VLAN mode
Ondrej Mosnacek <[email protected]>
selinux: never allow relabeling on context mounts
Stephen Smalley <[email protected]>
selinux: avoid silent denials in permissive mode under RCU walk
Anson Huang <[email protected]>
gpio: mxc: add check to return defer probe if clock tree NOT ready
Dmitry Torokhov <[email protected]>
Input: stmfts - acknowledge that setting brightness is a blocking call
Anson Huang <[email protected]>
Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ
Yuval Avnery <[email protected]>
IB/core: Destroy QP if XRC QP fails
Daniel Jurgens <[email protected]>
IB/core: Fix potential memory leak while creating MAD agents
Daniel Jurgens <[email protected]>
IB/core: Unregister notifier before freeing MAD security
Rajneesh Bhardwaj <[email protected]>
platform/x86: intel_pmc_core: Handle CFL regmap properly
Rajneesh Bhardwaj <[email protected]>
platform/x86: intel_pmc_core: Fix PCH IP name
Arnaud Pouliquen <[email protected]>
ASoC: stm32: fix sai driver name initialisation
Charles Keepax <[email protected]>
ASoC: wm_adsp: Correct handling of compressed streams that restart
Hans de Goede <[email protected]>
ASoC: Intel: bytcr_rt5651: Revert "Fix DMIC map headsetmic mapping"
Bart Van Assche <[email protected]>
scsi: RDMA/srpt: Fix a credit leak for aborted commands
Jeremy Fertic <[email protected]>
staging: iio: adt7316: fix the dac write calculation
Jeremy Fertic <[email protected]>
staging: iio: adt7316: fix the dac read calculation
Jeremy Fertic <[email protected]>
staging: iio: adt7316: allow adt751x to use internal vref for all dacs
Jeffrey Hugo <[email protected]>
clk: qcom: Add missing freq for usb30_master_clk on 8998
Sean Wang <[email protected]>
Bluetooth: mediatek: fix up an error path to restore bdev->tx_state
Brian Norris <[email protected]>
Bluetooth: btusb: request wake pin with NOAUTOEN
Kim Phillips <[email protected]>
perf/x86/amd: Update generic hardware cache events for Family 17h
Tetsuo Handa <[email protected]>
block: pass no-op callback to INIT_WORK().
Arnd Bergmann <[email protected]>
ARM: iop: don't use using 64-bit DMA masks
Arnd Bergmann <[email protected]>
ARM: orion: don't use using 64-bit DMA masks
Kirill Smelkov <[email protected]>
fs: stream_open - opener for stream-like files so that read and write can run simultaneously without deadlock
Guenter Roeck <[email protected]>
xsysace: Fix error handling in ace_setup
Randy Dunlap <[email protected]>
sh: fix multiple function definition build errors
Mike Kravetz <[email protected]>
hugetlbfs: fix memory leak for resv_map
Catalin Marinas <[email protected]>
kmemleak: powerpc: skip scanning holes in the .bss section
David Rientjes <[email protected]>
KVM: SVM: prevent DBG_DECRYPT and DBG_ENCRYPT overflow
Varun Prakash <[email protected]>
libcxgb: fix incorrect ppmax calculation
Yonglong Liu <[email protected]>
net: hns: Fix WARNING when remove HNS driver with SMMU enabled
Yonglong Liu <[email protected]>
net: hns: fix ICMP6 neighbor solicitation messages discard problem
Yonglong Liu <[email protected]>
net: hns: Fix probabilistic memory overwrite when HNS driver initialized
Yonglong Liu <[email protected]>
net: hns: Use NAPI_POLL_WEIGHT for hns driver
Liubin Shu <[email protected]>
net: hns: fix KASAN: use-after-free in hns_nic_net_xmit_hw()
Wei Li <[email protected]>
arm64: fix wrong check of on_sdei_stack in nmi context
Peng Hao <[email protected]>
arm/mach-at91/pm : fix possible object reference leak
Michael Kelley <[email protected]>
scsi: storvsc: Fix calculation of sub-channel count
Xose Vazquez Perez <[email protected]>
scsi: core: add new RDAC LENOVO/DE_Series device
Louis Taylor <[email protected]>
vfio/pci: use correct format characters
Dmitry Torokhov <[email protected]>
HID: input: add mapping for Assistant key
Alexandre Belloni <[email protected]>
rtc: da9063: set uie_unsupported when relevant
Shenghui Wang <[email protected]>
block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctx
Andreas Kemnade <[email protected]>
mfd: twl-core: Disable IRQ while suspended
Al Viro <[email protected]>
debugfs: fix use-after-free on symlink traversal
Al Viro <[email protected]>
jffs2: fix use-after-free on symlink traversal
Aaro Koskinen <[email protected]>
net: stmmac: don't log oversized frames
Aaro Koskinen <[email protected]>
net: stmmac: fix dropping of multi-descriptor RX frames
Aaro Koskinen <[email protected]>
net: stmmac: don't overwrite discard_frame status
Aaro Koskinen <[email protected]>
net: stmmac: don't stop NAPI processing when dropping a packet
Aaro Koskinen <[email protected]>
net: stmmac: ratelimit RX error logs
Aaro Koskinen <[email protected]>
net: stmmac: use correct DMA buffer size in the RX descriptor
Konstantin Khorenko <[email protected]>
bonding: show full hw address in sysfs for slave entries
Omri Kahalon <[email protected]>
net/mlx5: E-Switch, Fix esw manager vport indication for more vport commands
Xi Wang <[email protected]>
net: hns3: fix compile error
Jeffrey Hugo <[email protected]>
HID: quirks: Fix keyboard + touchpad on Lenovo Miix 630
Alan Kao <[email protected]>
riscv: fix accessing 8-byte variable from RV32
Arvind Sankar <[email protected]>
igb: Fix WARN_ONCE on runtime suspend
Axel Lin <[email protected]>
reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev
Douglas Anderson <[email protected]>
ARM: dts: rockchip: Fix gpu opp node names for rk3288
Anders Roxell <[email protected]>
batman-adv: fix warning in function batadv_v_elp_get_throughput
Sven Eckelmann <[email protected]>
batman-adv: Reduce tt_global hash refcnt only for removed entry
Sven Eckelmann <[email protected]>
batman-adv: Reduce tt_local hash refcnt only for removed entry
Sven Eckelmann <[email protected]>
batman-adv: Reduce claim hash refcnt only for removed entry
Geert Uytterhoeven <[email protected]>
rtc: sh: Fix invalid alarm warning for non-enabled alarm
Stephen Boyd <[email protected]>
rtc: cros-ec: Fail suspend/resume if wake IRQ can't be configured
He, Bo <[email protected]>
HID: debug: fix race condition with between rdesc_show() and device removal
Kangjie Lu <[email protected]>
HID: logitech: check the return value of create_singlethread_workqueue
Leonidas P. Papadakos <[email protected]>
arm64: dts: rockchip: fix rk3328-roc-cc gmac2io tx/rx_delay
Waiman Long <[email protected]>
efi: Fix debugobjects warning on 'efi_rts_work'
Yufen Yu <[email protected]>
nvme-loop: init nvmet_ctrl fatal_err_work when allocate
Alan Stern <[email protected]>
USB: core: Fix bug caused by duplicate interface PM usage counter
Alan Stern <[email protected]>
USB: core: Fix unterminated string returned by usb_string()
Malte Leip <[email protected]>
usb: usbip: fix isoc packet num validation in get_pipe
Alan Stern <[email protected]>
USB: dummy-hcd: Fix failure to give back unlinked URBs
Alan Stern <[email protected]>
USB: w1 ds2490: Fix bug caused by improper use of altsetting array
Alan Stern <[email protected]>
USB: yurex: Fix protection fault after device removal
Takashi Iwai <[email protected]>
ALSA: hda/realtek - Apply the fixup for ASUS Q325UAR
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fixed Dell AIO speaker noise
Kailang Yang <[email protected]>
ALSA: hda/realtek - Add new Dell platform for headset mode
Jarkko Nikula <[email protected]>
i2c: Prevent runtime suspend of adapter when Host Notify is required
Jim Broadus <[email protected]>
i2c: Allow recovery of the initial IRQ by an I2C client device.
Charles Keepax <[email protected]>
i2c: Clear client->irq in i2c_device_remove
Charles Keepax <[email protected]>
i2c: Remove unnecessary call to irq_find_mapping
Anson Huang <[email protected]>
i2c: imx: correct the method of getting private data in notifier_call
Ard Biesheuvel <[email protected]>
i2c: synquacer: fix enumeration of slave devices
Johannes Berg <[email protected]>
mac80211: don't attempt to rename ERR_PTR() debugfs dirs
Douglas Anderson <[email protected]>
mwifiex: Make resume actually do something useful again on SDIO cards
Emmanuel Grumbach <[email protected]>
iwlwifi: fix driver operation for 5350
-------------
Diffstat:
Documentation/driver-api/usb/power-management.rst | 14 +- Makefile | 4 +- arch/arm/boot/dts/rk3288.dtsi | 12 +- arch/arm/mach-at91/pm.c | 6 +- arch/arm/mach-iop13xx/setup.c | 8 +- arch/arm/mach-iop13xx/tpmi.c | 10 +- arch/arm/plat-iop/adma.c | 6 +- arch/arm/plat-orion/common.c | 4 +- arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 +- arch/arm64/kernel/sdei.c | 6 + arch/powerpc/kernel/kvm.c | 7 + arch/powerpc/mm/slice.c | 10 +- arch/riscv/include/asm/uaccess.h | 2 +- arch/sh/boards/of-generic.c | 4 +- arch/x86/events/amd/core.c | 111 ++++++- arch/x86/kernel/cpu/mcheck/mce-severity.c | 5 + arch/x86/kvm/svm.c | 12 +- arch/x86/mm/init.c | 6 + arch/x86/mm/kaslr.c | 2 +- arch/x86/mm/tlb.c | 2 +- block/blk-core.c | 6 +- block/blk-mq.c | 2 +- drivers/block/xsysace.c | 2 + drivers/bluetooth/btmtkuart.c | 2 + drivers/bluetooth/btusb.c | 2 +- drivers/clk/qcom/gcc-msm8998.c | 1 + drivers/clk/x86/clk-pmc-atom.c | 14 +- drivers/firmware/efi/runtime-wrappers.c | 2 +- drivers/gpio/gpio-mxc.c | 5 +- drivers/hid/hid-debug.c | 5 + drivers/hid/hid-input.c | 1 + drivers/hid/hid-logitech-hidpp.c | 8 +- drivers/hid/hid-quirks.c | 5 +- drivers/i2c/busses/i2c-imx.c | 4 +- drivers/i2c/busses/i2c-stm32f7.c | 2 +- drivers/i2c/busses/i2c-synquacer.c | 2 + drivers/i2c/i2c-core-base.c | 18 +- drivers/infiniband/core/security.c | 11 +- drivers/infiniband/core/verbs.c | 41 ++- drivers/infiniband/ulp/srpt/ib_srpt.c | 11 + drivers/input/keyboard/snvs_pwrkey.c | 6 +- drivers/input/touchscreen/stmfts.c | 30 +- drivers/media/i2c/ov7670.c | 16 +- drivers/mfd/twl-core.c | 23 ++ drivers/net/bonding/bond_sysfs_slave.c | 4 +- drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c | 9 +- drivers/net/ethernet/hisilicon/hns/hnae.c | 4 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 33 +- .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 12 +- .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 +- .../net/ethernet/hisilicon/hns3/hns3vf/Makefile | 2 +- drivers/net/ethernet/intel/igb/e1000_defines.h | 2 + drivers/net/ethernet/intel/igb/igb_main.c | 57 +--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 6 +- drivers/net/ethernet/stmicro/stmmac/descs_com.h | 22 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 2 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 2 +- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 22 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 12 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 34 +- drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 3 +- drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- drivers/nvme/target/core.c | 20 +- drivers/platform/x86/intel_pmc_core.c | 4 +- drivers/platform/x86/pmc_atom.c | 21 ++ drivers/reset/reset-meson-audio-arb.c | 1 + drivers/rtc/rtc-cros-ec.c | 4 +- drivers/rtc/rtc-da9063.c | 7 + drivers/rtc/rtc-sh.c | 2 +- drivers/scsi/scsi_devinfo.c | 1 + drivers/scsi/scsi_dh.c | 1 + drivers/scsi/storvsc_drv.c | 13 +- drivers/staging/iio/addac/adt7316.c | 22 +- drivers/usb/core/driver.c | 13 - drivers/usb/core/message.c | 4 +- drivers/usb/gadget/udc/dummy_hcd.c | 19 +- drivers/usb/misc/yurex.c | 1 + drivers/usb/storage/realtek_cr.c | 13 +- drivers/usb/usbip/stub_rx.c | 12 +- drivers/usb/usbip/usbip_common.h | 7 + drivers/vfio/pci/vfio_pci.c | 4 +- drivers/w1/masters/ds2490.c | 6 +- drivers/xen/xenbus/xenbus_dev_frontend.c | 4 +- fs/debugfs/inode.c | 13 +- fs/hugetlbfs/inode.c | 20 +- fs/jffs2/readinode.c | 5 - fs/jffs2/super.c | 5 +- fs/open.c | 18 + fs/read_write.c | 5 +- include/linux/fs.h | 4 + include/linux/i2c.h | 1 + include/linux/platform_data/x86/clk-pmc-atom.h | 3 + include/linux/usb.h | 2 - mm/kmemleak.c | 16 +- net/batman-adv/bat_v_elp.c | 6 +- net/batman-adv/bridge_loop_avoidance.c | 16 +- net/batman-adv/translation-table.c | 32 +- net/mac80211/debugfs_netdev.c | 2 +- net/mac80211/key.c | 9 +- scripts/coccinelle/api/stream_open.cocci | 363 +++++++++++++++++++++ security/selinux/avc.c | 23 +- security/selinux/hooks.c | 44 ++- security/selinux/include/avc.h | 1 + sound/pci/hda/patch_realtek.c | 13 + sound/soc/codecs/wm_adsp.c | 3 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/stm/stm32_sai_sub.c | 2 +- 109 files changed, 1125 insertions(+), 350 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/99 iwlwifi: fix driver operation for 5350
From: Emmanuel Grumbach <[email protected]>
commit 5c9adef9789148d382d7d1307c3d6bfaf51d143d upstream.
We introduced a bug that prevented this old device from working. The driver would simply not be able to complete the INIT flow while spewing this warning:
CSR addresses aren't configured
WARNING: CPU: 0 PID: 819 at drivers/net/wireless/intel/iwlwifi/pcie/drv.c:917 iwl_pci_probe+0x160/0x1e0 [iwlwifi]
--- drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/cfg/5000.c +2 -1
@@ -1,7 +1,7 @@/****************************************************************************** * * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved. -* Copyright(c) 2018 Intel Corporation +* Copyright(c) 2018 - 2019 Intel Corporation * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as
@@ -140,6 +140,7 @@ const struct iwl_cfg iwl5350_agn_cfg = { .ht_params = &iwl5000_ht_params, .led_mode = IWL_LED_BLINK, .internal_wimax_coex = true, + .csr = &iwl_csr_v1, };#define IWL_DEVICE_5150 \
Greg Kroah-Hartman
maintainerPATCH 2/99 mwifiex: Make resume actually do something useful again on SDIO cards
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
commit b82d6c1f8f8288f744a9dcc16cd3085d535decca upstream.
The commit fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables") had a fairly straightforward bug in it. It contained this bit of diff:
- if (!adapter->is_suspended) {
+ if (test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) {
As you can see the patch missed the "!" when converting to the atomic bitops. This meant that the resume hasn't done anything at all since that commit landed and suspend/resume for mwifiex SDIO cards has been totally broken.
After fixing this mwifiex suspend/resume appears to work again, at least with the simple testing I've done.
--- drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/sdio.c +1 -1
@@ -181,7 +181,7 @@ static int mwifiex_sdio_resume(struct de adapter = card->adapter; -if (test_bit (MWIFIEX_IS_SUSPENDED , &adapter->work_flags)) { +if (!test_bit (MWIFIEX_IS_SUSPENDED , &adapter->work_flags)) {mwifiex_dbg (adapter,WARN ,"device already resumed\n" );return 0 ;
Greg Kroah-Hartman
maintainerPATCH 3/99 mac80211: dont attempt to rename ERR_PTR() debugfs dirs
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 517879147493a5e1df6b89a50f708f1133fcaddb upstream.
We need to dereference the directory to get its parent to be able to rename it, so it's clearly not safe to try to do this with ERR_PTR() pointers. Skip in this case.
It seems that this is most likely what was causing the report by syzbot, but I'm not entirely sure as it didn't come with a reproducer this time.
--- net/mac80211/debugfs_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/debugfs_netdev.c +1 -1
@@ -838,7 +838,7 @@ void ieee80211_debugfs_rename_netdev(str dir = sdata->vif.debugfs_dir; -if (!dir) +if (IS_ERR_OR_NULL (dir))return ;sprintf (buf,"netdev:%s" , sdata->name);
Greg Kroah-Hartman
maintainerPATCH 4/99 i2c: synquacer: fix enumeration of slave devices
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit 95e0cf3caeb11e1b0398c747b5cfa12828263824 upstream.
The I2C host driver for SynQuacer fails to populate the of_node and ACPI companion fields of the struct i2c_adapter it instantiates, resulting in enumeration of the subordinate I2C bus to fail.
--- drivers/i2c/busses/i2c-synquacer.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/i2c/busses/i2c-synquacer.c +2 -0
@@ -602,6 +602,8 @@ static int synquacer_i2c_probe(struct pl i2c->adapter = synquacer_i2c_ops;i2c_set_adapdata (&i2c->adapter, i2c); i2c->adapter.dev.parent = &pdev->dev; + i2c->adapter.dev.of_node = pdev->dev.of_node; +ACPI_COMPANION_SET (&i2c->adapter.dev,ACPI_COMPANION (&pdev->dev)); i2c->adapter.nr = pdev->id;init_completion (&i2c->completion);
Greg Kroah-Hartman
maintainerPATCH 5/99 i2c: imx: correct the method of getting private data in notifier_call
In reply to Greg Kroah-HartmanFrom: Anson Huang <[email protected]>
commit d386bb9042f4629bf62cdc5952ea8aab225f24a7 upstream.
The way of getting private imx_i2c_struct in i2c_imx_clk_notifier_call() is incorrect, should use clk_change_nb element to get correct address and avoid below kernel dump during POST_RATE_CHANGE notify by clk framework:
Unable to handle kernel paging request at virtual address 03ef1488 pgd = (ptrval) [03ef1488] *pgd=00000000 Internal error: Oops: 5 [#1] PREEMPT SMP ARM Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) Workqueue: events reduce_bus_freq_handler PC is at i2c_imx_set_clk+0x10/0xb8 LR is at i2c_imx_clk_notifier_call+0x20/0x28 pc : [<806a893c>] lr : [<806a8a04>] psr: a0080013
sp : bf399dd8 ip : bf3432ac fp : bf7c1dc0
r10: 00000002 r9 : 00000000 r8 : 00000000
r7 : 03ef1480 r6 : bf399e50 r5 : ffffffff r4 : 00000000 r3 : bf025300 r2 : bf399e50 r1 : 00b71b00 r0 : bf399be8
Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none
Control: 10c5387d Table: 4e03004a DAC: 00000051 Process kworker/2:1 (pid: 38, stack limit = 0x(ptrval))
Stack: (0xbf399dd8 to 0xbf39a000)
9dc0: 806a89e4 00000000
9de0: ffffffff bf399e50 00000002 806a8a04 806a89e4 80142900 ffffffff 00000000 9e00: bf34ef18 bf34ef04 00000000 ffffffff bf399e50 80142d84 00000000 bf399e6c 9e20: bf34ef00 80f214c4 bf025300 00000002 80f08d08 bf017480 00000000 80142df0 9e40: 00000000 80166ed8 80c27638 8045de58 bf352340 03ef1480 00b71b00 0f82e242 9e60: bf025300 00000002 03ef1480 80f60e5c 00000001 8045edf0 00000002 8045eb08 9e80: bf025300 00000002 03ef1480 8045ee10 03ef1480 8045eb08 bf01be40 00000002 9ea0: 03ef1480 8045ee10 07de2900 8045eb08 bf01b780 00000002 07de2900 8045ee10 9ec0: 80c27898 bf399ee4 bf020a80 00000002 1f78a400 8045ee10 80f60e5c 80460514 9ee0: 80f60e5c bf01b600 bf01b480 80460460 0f82e242 bf383a80 bf383a00 80f60e5c 9f00: 00000000 bf7c1dc0 80f60e70 80460564 80f60df0 80f60d24 80f60df0 8011e72c 9f20: 00000000 80f60df0 80f60e6c bf7c4f00 00000000 8011e7ac bf274000 8013bd84 9f40: bf7c1dd8 80f03d00 bf274000 bf7c1dc0 bf274014 bf7c1dd8 80f03d00 bf398000 9f60: 00000008 8013bfb4 00000000 bf25d100 bf25d0c0 00000000 bf274000 8013bf88 9f80: bf25d11c bf0cfebc 00000000 8014140c bf25d0c0 801412ec 00000000 00000000 9fa0: 00000000 00000000 00000000 801010e8 00000000 00000000 00000000 00000000 9fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 9fe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000 [<806a893c>] (i2c_imx_set_clk) from [<806a8a04>] (i2c_imx_clk_notifier_call+0x20/0x28) [<806a8a04>] (i2c_imx_clk_notifier_call) from [<80142900>] (notifier_call_chain+0x44/0x84) [<80142900>] (notifier_call_chain) from [<80142d84>] (__srcu_notifier_call_chain+0x44/0x98) [<80142d84>] (__srcu_notifier_call_chain) from [<80142df0>] (srcu_notifier_call_chain+0x18/0x20) [<80142df0>] (srcu_notifier_call_chain) from [<8045de58>] (__clk_notify+0x78/0xa4) [<8045de58>] (__clk_notify) from [<8045edf0>] (__clk_recalc_rates+0x60/0xb4) [<8045edf0>] (__clk_recalc_rates) from [<8045ee10>] (__clk_recalc_rates+0x80/0xb4)
Code: e92d40f8 e5903298 e59072a0 e1530001 (e5975008) ---[ end trace fc7f5514b97b6cbb ]---
--- drivers/i2c/busses/i2c-imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-imx.c +2 -2
@@ -510,9 +510,9 @@ static int i2c_imx_clk_notifier_call(str unsigned long action, void *data) { struct clk_notifier_data *ndata = data; -struct imx_i2c_struct *i2c_imx =container_of (&ndata->clk, +struct imx_i2c_struct *i2c_imx =container_of (nb, struct imx_i2c_struct, - clk); + clk_change_nb);if (action &POST_RATE_CHANGE )i2c_imx_set_clk (i2c_imx, ndata->new_rate);
Greg Kroah-Hartman
maintainerPATCH 6/99 i2c: Remove unnecessary call to irq_find_mapping
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
commit b9bb3fdf4e870fb655064f5c3c81c1fee7fd89ce upstream.
irq_create_mapping calls irq_find_mapping internally and will use the found mapping if one exists, so there is no need to manually call this from i2c_smbus_host_notify_to_irq.
--- drivers/i2c/i2c-core-base.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/i2c/i2c-core-base.c +1 -4
@@ -306,10 +306,7 @@ static int i2c_smbus_host_notify_to_irq(if (client->flags &I2C_CLIENT_TEN )return -EINVAL ; - irq =irq_find_mapping (adap->host_notify_domain, client->addr); -if (!irq) - irq =irq_create_mapping (adap->host_notify_domain, - client->addr); + irq =irq_create_mapping (adap->host_notify_domain, client->addr);return irq >0 ? irq : -ENXIO ; }
Greg Kroah-Hartman
maintainerPATCH 7/99 i2c: Clear client->irq in i2c_device_remove
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
commit 6f108dd70d3010c391c1e9f56f3f20d1f9e75450 upstream.
The IRQ will be mapped in i2c_device_probe only if client->irq is zero and i2c_device_remove does not clear this. When rebinding an I2C device, whos IRQ provider has also been rebound this means that an IRQ mapping will never be created, causing the I2C device to fail to acquire its IRQ. Fix this issue by clearing client->irq in i2c_device_remove, forcing i2c_device_probe to lookup the mapping again.
--- drivers/i2c/i2c-core-base.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/i2c/i2c-core-base.c +2 -0
@@ -430,6 +430,8 @@ static int i2c_device_remove(struct devidev_pm_clear_wake_irq (&client->dev);device_init_wakeup (&client->dev, false); + client->irq =0 ; +return status; }
Greg Kroah-Hartman
maintainerPATCH 8/99 i2c: Allow recovery of the initial IRQ by an I2C client device.
In reply to Greg Kroah-HartmanFrom: Jim Broadus <[email protected]>
commit 93b6604c5a669d84e45fe5129294875bf82eb1ff upstream.
A previous change allowed I2C client devices to discover new IRQs upon reprobe by clearing the IRQ in i2c_device_remove. However, if an IRQ was assigned in i2c_new_device, that information is lost.
For example, the touchscreen and trackpad devices on a Dell Inspiron laptop are I2C devices whose IRQs are defined by ACPI extended IRQ types. The client device structures are initialized during an ACPI walk. After removing the i2c_hid device, modprobe fails.
This change caches the initial IRQ value in i2c_new_device and then resets the client device IRQ to the initial value in i2c_device_remove.
[wsa: this is an easy to backport fix for the regression. We will refactor the code to handle irq assignments better in general.]
--- drivers/i2c/i2c-core-base.c | 9 +++++---- include/linux/i2c.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/i2c/i2c-core-base.c +5 -4
@@ -430,7 +430,7 @@ static int i2c_device_remove(struct devidev_pm_clear_wake_irq (&client->dev);device_init_wakeup (&client->dev, false); - client->irq =0 ; + client->irq = client->init_irq;return status; }
@@ -741,10 +741,11 @@ i2c_new_device(struct i2c_adapter *adap, client->flags = info->flags; client->addr = info->addr; - client->irq = info->irq; -if (!client->irq) - client->irq =i2c_dev_irq_from_resources (info->resources, + client->init_irq = info->irq; +if (!client->init_irq) + client->init_irq =i2c_dev_irq_from_resources (info->resources, info->num_resources); + client->irq = client->init_irq;strlcpy (client->name, info->type,sizeof (client->name));
include/linux/i2c.h +1 -0
@@ -333,6 +333,7 @@ struct i2c_client {char name[I2C_NAME_SIZE ];struct i2c_adapter *adapter;/* the adapter we sit on */ struct device dev;/* the device structure */ +int init_irq;/* irq set at initialization */ int irq;/* irq issued by device */ struct list_head detected;#if IS_ENABLED (CONFIG_I2C_SLAVE )
Greg Kroah-Hartman
maintainerPATCH 9/99 i2c: Prevent runtime suspend of adapter when Host Notify is required
In reply to Greg Kroah-HartmanFrom: Jarkko Nikula <[email protected]>
commit 72bfcee11cf89509795c56b0e40a3785ab00bbdd upstream.
Multiple users have reported their Synaptics touchpad has stopped working between v4.20.1 and v4.20.2 when using SMBus interface.
The culprit for this appeared to be commit c5eb1190074c ("PCI / PM: Allow runtime PM without callback functions") that fixed the runtime PM for i2c-i801 SMBus adapter. Those Synaptics touchpad are using i2c-i801 for SMBus communication and testing showed they are able to get back working by preventing the runtime suspend of adapter.
Normally when i2c-i801 SMBus adapter transmits with the client it resumes before operation and autosuspends after.
However, if client requires SMBus Host Notify protocol, what those Synaptics touchpads do, then the host adapter must not go to runtime suspend since then it cannot process incoming SMBus Host Notify commands the client may send.
Fix this by keeping I2C/SMBus adapter active in case client requires Host Notify.
--- drivers/i2c/i2c-core-base.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/i2c/i2c-core-base.c +4 -0
@@ -327,6 +327,8 @@ static int i2c_device_probe(struct devicif (client->flags &I2C_CLIENT_HOST_NOTIFY ) {dev_dbg (dev,"Using Host Notify IRQ\n" ); +/* Keep adapter active when Host Notify is required */ +pm_runtime_get_sync (&client->adapter->dev); irq =i2c_smbus_host_notify_to_irq (client); }else if (dev->of_node) { irq =of_irq_get_byname (dev->of_node,"irq" );
@@ -431,6 +433,8 @@ static int i2c_device_remove(struct devidevice_init_wakeup (&client->dev, false); client->irq = client->init_irq; +if (client->flags &I2C_CLIENT_HOST_NOTIFY ) +pm_runtime_put (&client->adapter->dev);return status; }
Greg Kroah-Hartman
maintainerPATCH 10/99 ALSA: hda/realtek - Add new Dell platform for headset mode
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
commit 0a29c57b76624723b6b00c027e0e992d130ace49 upstream.
Add two Dell platform for headset mode.
[ Note: this is a further correction / addition of the previous
pin-based quirks for Dell machines; another entry for ALC236 with the d-mic pin 0x12 and an entry for ALC295 -- tiwai ]
--- sound/pci/hda/patch_realtek.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/pci/hda/patch_realtek.c +7 -0
@@ -7172,6 +7172,10 @@ static const struct snd_hda_pin_quirk al {0x21, 0x02211020}),SND_HDA_PIN_QUIRK (0x10ec0236 ,0x1028 ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE , {0x21, 0x02211020}), +SND_HDA_PIN_QUIRK (0x10ec0236 ,0x1028 ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE , + {0x12, 0x40000000}, + {0x14, 0x90170110}, + {0x21, 0x02211020}),SND_HDA_PIN_QUIRK (0x10ec0255 ,0x1028 ,"Dell" ,ALC255_FIXUP_DELL2_MIC_NO_PRESENCE , {0x14, 0x90170110}, {0x21, 0x02211020}),
@@ -7446,6 +7450,9 @@ static const struct snd_hda_pin_quirk al {0x17, 0x90170110}, {0x21, 0x04211020}),SND_HDA_PIN_QUIRK (0x10ec0295 ,0x1028 ,"Dell" ,ALC269_FIXUP_DELL1_MIC_NO_PRESENCE , + {0x14, 0x90170110}, + {0x21, 0x04211020}), +SND_HDA_PIN_QUIRK (0x10ec0295 ,0x1028 ,"Dell" ,ALC269_FIXUP_DELL1_MIC_NO_PRESENCE ,ALC295_STANDARD_PINS , {0x17, 0x21014020}, {0x18, 0x21a19030}),
Greg Kroah-Hartman
maintainerPATCH 11/99 ALSA: hda/realtek - Fixed Dell AIO speaker noise
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
commit 0700d3d117a7f110ddddbd83873e13652f69c54b upstream.
Fixed Dell AIO speaker noise.spec->gen.auto_mute_via_amp = 1, this option was solved speaker white noise at boot.codec->power_save_node = 0, this option was solved speaker noise at resume back.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -5448,6 +5448,8 @@ static void alc274_fixup_bind_dacs(strucreturn ; spec->gen.preferred_dacs = preferred_pairs; + spec->gen.auto_mute_via_amp =1 ; + codec->power_save_node =0 ; }/* The DAC of NID 0x3 will introduce click/pop noise on headphones, so invalidate it */
Greg Kroah-Hartman
maintainerPATCH 12/99 ALSA: hda/realtek - Apply the fixup for ASUS Q325UAR
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 3887c26c0e24d50a4d0ce20cf4726737cee1a2fd upstream.
Some ASUS models like Q325UAR with ALC295 codec requires the same fixup that has been applied to ALC294 codec. Just copy the entry with the pin matching to cover ALC295 too.
--- sound/pci/hda/patch_realtek.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/pci/hda/patch_realtek.c +4 -0
@@ -7451,6 +7451,10 @@ static const struct snd_hda_pin_quirk al {0x12, 0x90a60130}, {0x17, 0x90170110}, {0x21, 0x04211020}), +SND_HDA_PIN_QUIRK (0x10ec0295 ,0x1043 ,"ASUS" ,ALC294_FIXUP_ASUS_SPK , + {0x12, 0x90a60130}, + {0x17, 0x90170110}, + {0x21, 0x03211020}),SND_HDA_PIN_QUIRK (0x10ec0295 ,0x1028 ,"Dell" ,ALC269_FIXUP_DELL1_MIC_NO_PRESENCE , {0x14, 0x90170110}, {0x21, 0x04211020}),
Greg Kroah-Hartman
maintainerPATCH 13/99 USB: yurex: Fix protection fault after device removal
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit ef61eb43ada6c1d6b94668f0f514e4c268093ff3 upstream.
The syzkaller USB fuzzer found a general-protection-fault bug in the yurex driver. The fault occurs when a device has been unplugged; the driver's interrupt-URB handler logs an error message referring to the device by name, after the device has been unregistered and its name deallocated.
This problem is caused by the fact that the interrupt URB isn't cancelled until the driver's private data structure is released, which can happen long after the device is gone. The cure is to make sure that the interrupt URB is killed before yurex_disconnect() returns; this is exactly the sort of thing that usb_poison_urb() was meant for.
--- drivers/usb/misc/yurex.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/misc/yurex.c +1 -0
@@ -314,6 +314,7 @@ static void yurex_disconnect(struct usb_usb_deregister_dev (interface, &yurex_class);/* prevent more I/O from starting */ +usb_poison_urb (dev->urb);mutex_lock (&dev->io_mutex); dev->interface =NULL ;mutex_unlock (&dev->io_mutex);
Greg Kroah-Hartman
maintainerPATCH 14/99 USB: w1 ds2490: Fix bug caused by improper use of altsetting array
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit c114944d7d67f24e71562fcfc18d550ab787e4d4 upstream.
The syzkaller USB fuzzer spotted a slab-out-of-bounds bug in the ds2490 driver. This bug is caused by improper use of the altsetting array in the usb_interface structure (the array's entries are not always stored in numerical order), combined with a naive assumption that all interfaces probed by the driver will have the expected number of altsettings.
The bug can be fixed by replacing references to the possibly non-existent intf->altsetting[alt] entry with the guaranteed-to-exist intf->cur_altsetting entry.
--- drivers/w1/masters/ds2490.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/w1/masters/ds2490.c +3 -3
@@ -1016,15 +1016,15 @@ static int ds_probe(struct usb_interface/* alternative 3, 1ms interrupt (greatly speeds search), 64 byte bulk */ alt =3 ; err =usb_set_interface (dev->udev, - intf->altsetting[alt].desc.bInterfaceNumber, alt); + intf->cur_altsetting->desc.bInterfaceNumber, alt);if (err) {dev_err (&dev->udev->dev,"Failed to set alternative setting %d " "for %d interface: err=%d.\n" , alt, - intf->altsetting[alt].desc.bInterfaceNumber, err); + intf->cur_altsetting->desc.bInterfaceNumber, err); goto err_out_clear; } - iface_desc = &intf->altsetting[alt]; + iface_desc = intf->cur_altsetting;if (iface_desc->desc.bNumEndpoints !=NUM_EP -1 ) {pr_info ("Num endpoints=%d. It is not DS9490R.\n" , iface_desc->desc.bNumEndpoints);
Greg Kroah-Hartman
maintainerPATCH 15/99 USB: dummy-hcd: Fix failure to give back unlinked URBs
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit fc834e607ae3d18e1a20bca3f9a2d7f52ea7a2be upstream.
The syzkaller USB fuzzer identified a failure mode in which dummy-hcd would never give back an unlinked URB. This causes usb_kill_urb() to hang, leading to WARNINGs and unkillable threads.
In dummy-hcd, all URBs are given back by the dummy_timer() routine as it scans through the list of pending URBS. Failure to give back URBs can be caused by failure to start or early exit from the scanning loop. The code currently has two such pathways: One is triggered when an unsupported bus transfer speed is encountered, and the other by exhausting the simulated bandwidth for USB transfers during a frame.
This patch removes those two paths, thereby allowing all unlinked URBs to be given back in a timely manner. It adds a check for the bus speed when the gadget first starts running, so that dummy_timer() will never thereafter encounter an unsupported speed. And it prevents the loop from exiting as soon as the total bandwidth has been used up (the scanning loop continues, giving back unlinked URBs as they are found, but not transferring any more data).
Thanks to Andrey Konovalov for manually running the syzkaller fuzzer to help track down the source of the bug.
--- drivers/usb/gadget/udc/dummy_hcd.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/usb/gadget/udc/dummy_hcd.c +15 -4
@@ -979,8 +979,18 @@ static int dummy_udc_start(struct usb_gastruct dummy_hcd *dum_hcd =gadget_to_dummy_hcd (g);struct dummy *dum = dum_hcd->dum; -if (driver->max_speed ==USB_SPEED_UNKNOWN ) +switch (g->speed) { +/* All the speeds we support */ +case USB_SPEED_LOW : +case USB_SPEED_FULL : +case USB_SPEED_HIGH : +case USB_SPEED_SUPER : +break ; +default : +dev_err (dummy_dev (dum_hcd),"Unsupported driver max speed %d\n" , + driver->max_speed);return -EINVAL ; + }/* * SLAVE side init ... the layer above hardware, which
@@ -1784,9 +1794,10 @@ static void dummy_timer(struct timer_lis/* Bus speed is 500000 bytes/ms, so use a little less */ total =490000 ;break ; -default : +default :/* Can't happen */ dev_err (dummy_dev (dum_hcd),"bogus device speed\n" ); -return ; + total =0 ; +break ; }/* FIXME if HZ != 1000 this will probably misbehave ... */
@@ -1828,7 +1839,7 @@ restart:/* Used up this frame's bandwidth? */ if (total <=0 ) -break ; +continue ;/* find the gadget's ep for this request (if configured) */ address =usb_pipeendpoint (urb->pipe);
Greg Kroah-Hartman
maintainerPATCH 16/99 usb: usbip: fix isoc packet num validation in get_pipe
In reply to Greg Kroah-HartmanFrom: Malte Leip <[email protected]>
commit c409ca3be3c6ff3a1eeb303b191184e80d412862 upstream.
Change the validation of number_of_packets in get_pipe to compare the number of packets to a fixed maximum number of packets allowed, set to be 1024. This number was chosen due to it being used by other drivers as well, for example drivers/usb/host/uhci-q.c
Background/reason:
The get_pipe function in stub_rx.c validates the number of packets in isochronous mode and aborts with an error if that number is too large, in order to prevent malicious input from possibly triggering large memory allocations. This was previously done by checking whether pdu->u.cmd_submit.number_of_packets is bigger than the number of packets that would be needed for pdu->u.cmd_submit.transfer_buffer_length bytes if all except possibly the last packet had maximum length, given by usb_endpoint_maxp(epd) * usb_endpoint_maxp_mult(epd). This leads to an error if URBs with packets shorter than the maximum possible length are submitted, which is allowed according to Documentation/driver-api/usb/URB.rst and occurs for example with the snd-usb-audio driver.
--- drivers/usb/usbip/stub_rx.c | 12 +++--------- drivers/usb/usbip/usbip_common.h | 7 +++++++ 2 files changed, 10 insertions(+), 9 deletions(-)
drivers/usb/usbip/stub_rx.c +3 -9
@@ -361,16 +361,10 @@ static int get_pipe(struct stub_device * }if (usb_endpoint_xfer_isoc (epd)) { -/* validate packet size and number of packets */ -unsigned int maxp, packets, bytes; - - maxp =usb_endpoint_maxp (epd); - maxp *=usb_endpoint_maxp_mult (epd); - bytes = pdu->u.cmd_submit.transfer_buffer_length; - packets =DIV_ROUND_UP (bytes, maxp); - +/* validate number of packets */ if (pdu->u.cmd_submit.number_of_packets <0 || - pdu->u.cmd_submit.number_of_packets > packets) { + pdu->u.cmd_submit.number_of_packets > +USBIP_MAX_ISO_PACKETS ) {dev_err (&sdev->udev->dev,"CMD_SUBMIT: isoc invalid num packets %d\n" , pdu->u.cmd_submit.number_of_packets);
drivers/usb/usbip/usbip_common.h +7 -0
@@ -121,6 +121,13 @@ extern struct device_attribute dev_attr_#define USBIP_DIR_OUT 0x00#define USBIP_DIR_IN 0x01 +/* +* Arbitrary limit for the maximum number of isochronous packets in an URB, +* compare for example the uhci_submit_isochronous function in +* drivers/usb/host/uhci-q.c +*/ +#define USBIP_MAX_ISO_PACKETS 1024 +/** * struct usbip_header_basic - data pertinent to every request * @command: the usbip request type
Greg Kroah-Hartman
maintainerPATCH 17/99 USB: core: Fix unterminated string returned by usb_string()
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit c01c348ecdc66085e44912c97368809612231520 upstream.
Some drivers (such as the vub300 MMC driver) expect usb_string() to return a properly NUL-terminated string, even when an error occurs. (In fact, vub300's probe routine doesn't bother to check the return code from usb_string().) When the driver goes on to use an unterminated string, it leads to kernel errors such as stack-out-of-bounds, as found by the syzkaller USB fuzzer.
An out-of-range string index argument is not at all unlikely, given that some devices don't provide string descriptors and therefore list 0 as the value for their string indexes. This patch makes usb_string() return a properly terminated empty string along with the -EINVAL error code when an out-of-range index is encountered.
And since a USB string index is a single-byte value, indexes >= 256 are just as invalid as values of 0 or below.
--- drivers/usb/core/message.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/core/message.c +3 -1
@@ -820,9 +820,11 @@ int usb_string(struct usb_device *dev, iif (dev->state ==USB_STATE_SUSPENDED )return -EHOSTUNREACH ; -if (size <=0 || !buf || !index) +if (size <=0 || !buf)return -EINVAL ; buf[0 ] =0 ; +if (index <=0 || index >=256 ) +return -EINVAL ; tbuf =kmalloc (256 ,GFP_NOIO );if (!tbuf)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 18/99 USB: core: Fix bug caused by duplicate interface PM usage counter
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit c2b71462d294cf517a0bc6e4fd6424d7cee5596f upstream.
The syzkaller fuzzer reported a bug in the USB hub driver which turned out to be caused by a negative runtime-PM usage counter. This allowed a hub to be runtime suspended at a time when the driver did not expect it. The symptom is a WARNING issued because the hub's status URB is submitted while it is already active:
URB 0000000031fb463e submitted while active WARNING: CPU: 0 PID: 2917 at drivers/usb/core/urb.c:363
The negative runtime-PM usage count was caused by an unfortunate design decision made when runtime PM was first implemented for USB. At that time, USB class drivers were allowed to unbind from their interfaces without balancing the usage counter (i.e., leaving it with a positive count). The core code would take care of setting the counter back to 0 before allowing another driver to bind to the interface.
Later on when runtime PM was implemented for the entire kernel, the opposite decision was made: Drivers were required to balance their runtime-PM get and put calls. In order to maintain backward compatibility, however, the USB subsystem adapted to the new implementation by keeping an independent usage counter for each interface and using it to automatically adjust the normal usage counter back to 0 whenever a driver was unbound.
This approach involves duplicating information, but what is worse, it doesn't work properly in cases where a USB class driver delays decrementing the usage counter until after the driver's disconnect() routine has returned and the counter has been adjusted back to 0. Doing so would cause the usage counter to become negative. There's even a warning about this in the USB power management documentation!
As it happens, this is exactly what the hub driver does. The kick_hub_wq() routine increments the runtime-PM usage counter, and the corresponding decrement is carried out by hub_event() in the context of the hub_wq work-queue thread. This work routine may sometimes run after the driver has been unbound from its interface, and when it does it causes the usage counter to go negative.
It is not possible for hub_disconnect() to wait for a pending hub_event() call to finish, because hub_disconnect() is called with the device lock held and hub_event() acquires that lock. The only feasible fix is to reverse the original design decision: remove the duplicate interface-specific usage counter and require USB drivers to balance their runtime PM gets and puts. As far as I know, all existing drivers currently do this.
--- Documentation/driver-api/usb/power-management.rst | 14 +++++++++----- drivers/usb/core/driver.c | 13 ------------- drivers/usb/storage/realtek_cr.c | 13 +++++-------- include/linux/usb.h | 2 -- 4 files changed, 14 insertions(+), 28 deletions(-)
Documentation/driver-api/usb/power-management.rst +9 -5
@@ -370,11 +370,15 @@ autosuspend the interface's device. Whe then the interface is considered to be idle, and the kernel may autosuspend the device. -Drivers need not be concerned about balancing changes to the usage -counter; the USB core will undo any remaining "get"s when a driver -is unbound from its interface. As a corollary, drivers must not call -any of the ``usb_autopm_*`` functions after their ``disconnect`` -routine has returned. +Drivers must be careful to balance their overall changes to the usage +counter. Unbalanced "get"s will remain in effect when a driver is +unbound from its interface, preventing the device from going into +runtime suspend should the interface be bound to a driver again. On +the other hand, drivers are allowed to achieve this balance by calling +the ``usb_autopm_*`` functions even after their ``disconnect`` routine +has returned -- say from within a work-queue routine -- provided they +retain an active reference to the interface (via ``usb_get_intf`` and +``usb_put_intf``). Drivers using the async routines are responsible for their own synchronization and mutual exclusion.
drivers/usb/core/driver.c +0 -13
@@ -473,11 +473,6 @@ static int usb_unbind_interface(struct dpm_runtime_disable (dev);pm_runtime_set_suspended (dev); -/* Undo any residual pm_autopm_get_interface_* calls */ -for (r =atomic_read (&intf->pm_usage_cnt); r >0 ; --r) -usb_autopm_put_interface_no_suspend (intf); -atomic_set (&intf->pm_usage_cnt,0 ); -if (!error)usb_autosuspend_device (udev);
@@ -1636,7 +1631,6 @@ void usb_autopm_put_interface(struct usbint status;usb_mark_last_busy (udev); -atomic_dec (&intf->pm_usage_cnt); status =pm_runtime_put_sync (&intf->dev); dev_vdbg(&intf->dev, "%s: cnt %d -> %d\n", __func__, atomic_read(&intf->dev.power.usage_count),
@@ -1665,7 +1659,6 @@ void usb_autopm_put_interface_async(struint status;usb_mark_last_busy (udev); -atomic_dec (&intf->pm_usage_cnt); status =pm_runtime_put (&intf->dev); dev_vdbg(&intf->dev, "%s: cnt %d -> %d\n", __func__, atomic_read(&intf->dev.power.usage_count),
@@ -1687,7 +1680,6 @@ void usb_autopm_put_interface_no_suspendstruct usb_device *udev =interface_to_usbdev (intf);usb_mark_last_busy (udev); -atomic_dec (&intf->pm_usage_cnt);pm_runtime_put_noidle (&intf->dev); }EXPORT_SYMBOL_GPL (usb_autopm_put_interface_no_suspend);
@@ -1718,8 +1710,6 @@ int usb_autopm_get_interface(struct usb_ status =pm_runtime_get_sync (&intf->dev);if (status <0 )pm_runtime_put_sync (&intf->dev); -else -atomic_inc (&intf->pm_usage_cnt);dev_vdbg (&intf->dev,"%s: cnt %d -> %d\n" , __func__,atomic_read (&intf->dev.power.usage_count), status);
@@ -1753,8 +1743,6 @@ int usb_autopm_get_interface_async(struc status =pm_runtime_get (&intf->dev);if (status <0 && status != -EINPROGRESS )pm_runtime_put_noidle (&intf->dev); -else -atomic_inc (&intf->pm_usage_cnt);dev_vdbg (&intf->dev,"%s: cnt %d -> %d\n" , __func__,atomic_read (&intf->dev.power.usage_count), status);
@@ -1778,7 +1766,6 @@ void usb_autopm_get_interface_no_resume(struct usb_device *udev =interface_to_usbdev (intf);usb_mark_last_busy (udev); -atomic_inc (&intf->pm_usage_cnt);pm_runtime_get_noresume (&intf->dev); }EXPORT_SYMBOL_GPL (usb_autopm_get_interface_no_resume);
drivers/usb/storage/realtek_cr.c +5 -8
@@ -763,18 +763,16 @@ static void rts51x_suspend_timer_fn(strubreak ;case RTS51X_STAT_IDLE :case RTS51X_STAT_SS : -usb_stor_dbg (us,"RTS51X_STAT_SS, intf->pm_usage_cnt:%d, power.usage:%d\n" , -atomic_read (&us->pusb_intf->pm_usage_cnt), +usb_stor_dbg (us,"RTS51X_STAT_SS, power.usage:%d\n" ,atomic_read (&us->pusb_intf->dev.power.usage_count)); -if (atomic_read (&us->pusb_intf->pm_usage_cnt) >0 ) { +if (atomic_read (&us->pusb_intf->dev.power.usage_count) >0 ) {usb_stor_dbg (us,"Ready to enter SS state\n" );rts51x_set_stat (chip,RTS51X_STAT_SS );/* ignore mass storage interface's children */ pm_suspend_ignore_children (&us->pusb_intf->dev, true);usb_autopm_put_interface_async (us->pusb_intf); -usb_stor_dbg (us,"RTS51X_STAT_SS 01, intf->pm_usage_cnt:%d, power.usage:%d\n" , -atomic_read (&us->pusb_intf->pm_usage_cnt), +usb_stor_dbg (us,"RTS51X_STAT_SS 01, power.usage:%d\n" ,atomic_read (&us->pusb_intf->dev.power.usage_count)); }break ;
@@ -807,11 +805,10 @@ static void rts51x_invoke_transport(struint ret;if (working_scsi (srb)) { -usb_stor_dbg (us,"working scsi, intf->pm_usage_cnt:%d, power.usage:%d\n" , -atomic_read (&us->pusb_intf->pm_usage_cnt), +usb_stor_dbg (us,"working scsi, power.usage:%d\n" ,atomic_read (&us->pusb_intf->dev.power.usage_count)); -if (atomic_read (&us->pusb_intf->pm_usage_cnt) <=0 ) { +if (atomic_read (&us->pusb_intf->dev.power.usage_count) <=0 ) { ret =usb_autopm_get_interface (us->pusb_intf);usb_stor_dbg (us,"working scsi, ret=%d\n" , ret); }
include/linux/usb.h +0 -2
@@ -200,7 +200,6 @@ usb_find_last_int_out_endpoint(struct us* @dev: driver model's view of this device * @usb_dev: if an interface is bound to the USB major, this will point * to the sysfs representation for that device. -* @pm_usage_cnt: PM usage counter for this interface * @reset_ws: Used for scheduling resets from atomic context. * @resetting_device: USB core reset the device, so use alt setting 0 as * current; needs bandwidth alloc after reset.
@@ -257,7 +256,6 @@ struct usb_interface {struct device dev;/* interface specific device info */ struct device *usb_dev; -atomic_t pm_usage_cnt;/* usage counter for autosuspend */ struct work_struct reset_ws;/* for resets in atomic context */ };#define to_usb_interface (d) container_of(d, struct usb_interface, dev)
Greg Kroah-Hartman
maintainerPATCH 19/99 nvme-loop: init nvmet_ctrl fatal_err_work when allocate
In reply to Greg Kroah-Hartman[ Upstream commit d11de63f2b519f0a162b834013b6d3a46dbf3886 ]
After commit 4d43d395fe (workqueue: Try to catch flush_work() without INIT_WORK()), it can cause warning when delete nvme-loop device, trace like:
[ 76.601272] Call Trace: [ 76.601646] ? del_timer+0x72/0xa0 [ 76.602156] __cancel_work_timer+0x1ae/0x270 [ 76.602791] cancel_work_sync+0x14/0x20 [ 76.603407] nvmet_ctrl_free+0x1b7/0x2f0 [nvmet] [ 76.604091] ? free_percpu+0x168/0x300 [ 76.604652] nvmet_sq_destroy+0x106/0x240 [nvmet] [ 76.605346] nvme_loop_destroy_admin_queue+0x30/0x60 [nvme_loop] [ 76.606220] nvme_loop_shutdown_ctrl+0xc3/0xf0 [nvme_loop] [ 76.607026] nvme_loop_delete_ctrl_host+0x19/0x30 [nvme_loop] [ 76.607871] nvme_do_delete_ctrl+0x75/0xb0 [ 76.608477] nvme_sysfs_delete+0x7d/0xc0 [ 76.609057] dev_attr_store+0x24/0x40 [ 76.609603] sysfs_kf_write+0x4c/0x60 [ 76.610144] kernfs_fop_write+0x19a/0x260 [ 76.610742] __vfs_write+0x1c/0x60 [ 76.611246] vfs_write+0xfa/0x280 [ 76.611739] ksys_write+0x6e/0x120 [ 76.612238] __x64_sys_write+0x1e/0x30 [ 76.612787] do_syscall_64+0xbf/0x3a0 [ 76.613329] entry_SYSCALL_64_after_hwframe+0x44/0xa9
We fix it by moving fatal_err_work init to nvmet_alloc_ctrl(), which may more reasonable.
--- drivers/nvme/target/core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/nvme/target/core.c +10 -10
@@ -921,6 +921,15 @@ bool nvmet_host_allowed(struct nvmet_req *req, struct nvmet_subsys *subsys,return __nvmet_host_allowed (subsys, hostnqn); } +static void nvmet_fatal_error_handler (struct work_struct *work) +{ +struct nvmet_ctrl *ctrl = + container_of(work, struct nvmet_ctrl, fatal_err_work); + +pr_err ("ctrl %d fatal error occurred!\n" , ctrl->cntlid); + ctrl->ops->delete_ctrl (ctrl); +} +u16 nvmet_alloc_ctrl (const char *subsysnqn,const char *hostnqn,struct nvmet_req *req,u32 kato,struct nvmet_ctrl **ctrlp) {
@@ -962,6 +971,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,INIT_WORK (&ctrl->async_event_work, nvmet_async_event_work);INIT_LIST_HEAD (&ctrl->async_events); +INIT_WORK (&ctrl->fatal_err_work, nvmet_fatal_error_handler);memcpy (ctrl->subsysnqn, subsysnqn,NVMF_NQN_SIZE );memcpy (ctrl->hostnqn, hostnqn,NVMF_NQN_SIZE );
@@ -1076,21 +1086,11 @@ void nvmet_ctrl_put(struct nvmet_ctrl *ctrl)kref_put (&ctrl->ref, nvmet_ctrl_free); } -static void nvmet_fatal_error_handler (struct work_struct *work) -{ -struct nvmet_ctrl *ctrl = - container_of(work, struct nvmet_ctrl, fatal_err_work); - -pr_err ("ctrl %d fatal error occurred!\n" , ctrl->cntlid); - ctrl->ops->delete_ctrl (ctrl); -} -void nvmet_ctrl_fatal_error (struct nvmet_ctrl *ctrl) {mutex_lock (&ctrl->lock);if (!(ctrl->csts &NVME_CSTS_CFS )) { ctrl->csts |=NVME_CSTS_CFS ; -INIT_WORK (&ctrl->fatal_err_work, nvmet_fatal_error_handler);schedule_work (&ctrl->fatal_err_work); }mutex_unlock (&ctrl->lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/99 efi: Fix debugobjects warning on efi_rts_work
In reply to Greg Kroah-Hartman[ Upstream commit ef1491e791308317bb9851a0ad380c4a68b58d54 ]
The following commit:
9dbbedaa6171 ("efi: Make efi_rts_work accessible to efi page fault handler")
converted 'efi_rts_work' from an auto variable to a global variable. However, when submitting the work, INIT_WORK_ONSTACK() was still used, causing the following complaint from debugobjects:
ODEBUG: object 00000000ed27b500 is NOT on stack 00000000c7d38760, but annotated.
Change the macro to just INIT_WORK() to eliminate the warning.
--- drivers/firmware/efi/runtime-wrappers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/runtime-wrappers.c +1 -1
@@ -95,7 +95,7 @@ struct efi_runtime_work { efi_rts_work.status =EFI_ABORTED ; \ \init_completion (&efi_rts_work.efi_rts_comp); \ -INIT_WORK_ONSTACK (&efi_rts_work.work, efi_call_rts); \ +INIT_WORK (&efi_rts_work.work, efi_call_rts); \ efi_rts_work.arg1 = _arg1; \ efi_rts_work.arg2 = _arg2; \ efi_rts_work.arg3 = _arg3; \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/99 arm64: dts: rockchip: fix rk3328-roc-cc gmac2io tx/rx_delay
In reply to Greg Kroah-Hartman[ Upstream commit 924726888f660b2a86382a5dd051ec9ca1b18190 ]
The rk3328-roc-cc board exhibits tx stability issues with large packets, as does the rock64 board, which was fixed with this patch
https://patchwork.kernel.org/patch/10178969/
A similar patch was merged for the rk3328-roc-cc here
https://patchwork.kernel.org/patch/10804863/
but it doesn't include the tx/rx_delay tweaks, and I find that they help with an issue where large transfers would bring the ethernet link down, causing a link reset regularly.
--- arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +2 -2
@@ -94,8 +94,8 @@ snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; snps,reset-active-low; snps,reset-delays-us = <0 10000 50000>; - tx_delay = <0x25>; - rx_delay = <0x11>; + tx_delay = <0x24>; + rx_delay = <0x18>; status = "okay"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/99 HID: logitech: check the return value of create_singlethread_workqueue
In reply to Greg Kroah-Hartman[ Upstream commit 6c44b15e1c9076d925d5236ddadf1318b0a25ce2 ]
create_singlethread_workqueue may fail and return NULL. The fix checks if it is NULL to avoid NULL pointer dereference. Also, the fix moves the call of create_singlethread_workqueue earlier to avoid resource-release issues.
--- drivers/hid/hid-logitech-hidpp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/hid/hid-logitech-hidpp.c +7 -1
@@ -1907,6 +1907,13 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index)kfree (data);return -ENOMEM ; } + data->wq =create_singlethread_workqueue ("hidpp-ff-sendqueue" ); +if (!data->wq) { +kfree (data->effect_ids); +kfree (data); +return -ENOMEM ; + } + data->hidpp = hidpp; data->feature_index = feature_index; data->version = version;
@@ -1951,7 +1958,6 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index)/* ignore boost value at response.fap.params[2] */ /* init the hardware command queue */ - data->wq =create_singlethread_workqueue ("hidpp-ff-sendqueue" );atomic_set (&data->workqueue_size,0 );/* initialize with zero autocenter to get wheel in usable state */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/99 HID: debug: fix race condition with between rdesc_show() and device removal
In reply to Greg Kroah-Hartman[ Upstream commit cef0d4948cb0a02db37ebfdc320e127c77ab1637 ]
There is a race condition that could happen if hid_debug_rdesc_show() is running while hdev is in the process of going away (device removal, system suspend, etc) which could result in NULL pointer dereference:
BUG: unable to handle kernel paging request at 0000000783316040 CPU: 1 PID: 1512 Comm: getevent Tainted: G U O 4.19.20-quilt-2e5dc0ac-00029-gc455a447dd55 #1 RIP: 0010:hid_dump_device+0x9b/0x160 Call Trace: hid_debug_rdesc_show+0x72/0x1d0 seq_read+0xe0/0x410 full_proxy_read+0x5f/0x90 __vfs_read+0x3a/0x170 vfs_read+0xa0/0x150 ksys_read+0x58/0xc0 __x64_sys_read+0x1a/0x20 do_syscall_64+0x55/0x110 entry_SYSCALL_64_after_hwframe+0x49/0xbe
Grab driver_input_lock to make sure the input device exists throughout the whole process of dumping the rdesc.
--- drivers/hid/hid-debug.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hid/hid-debug.c +5 -0
@@ -1060,10 +1060,15 @@ static int hid_debug_rdesc_show(struct seq_file *f, void *p)seq_printf (f,"\n\n" );/* dump parsed data and input mappings */ +if (down_interruptible (&hdev->driver_input_lock)) +return 0 ; +hid_dump_device (hdev, f);seq_printf (f,"\n" );hid_dump_input_mapping (hdev, f); +up (&hdev->driver_input_lock); +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/99 rtc: cros-ec: Fail suspend/resume if wake IRQ cant be configured
In reply to Greg Kroah-Hartman[ Upstream commit d6752e185c3168771787a02dc6a55f32260943cc ]
If we encounter a failure during suspend where this RTC was programmed to wakeup the system from suspend, but that wakeup couldn't be configured because the system didn't support wakeup interrupts, we'll run into the following warning:
Unbalanced IRQ 166 wake disable WARNING: CPU: 7 PID: 3071 at kernel/irq/manage.c:669 irq_set_irq_wake+0x108/0x278
This happens because the suspend process isn't aborted when the RTC fails to configure the wakeup IRQ. Instead, we continue suspending the system and then another suspend callback fails the suspend process and "unwinds" the previously suspended drivers by calling their resume callbacks. When we get back to resuming this RTC driver, we'll call disable_irq_wake() on an IRQ that hasn't been configured for wake.
Let's just fail suspend/resume here if we can't configure the system to wake and the user has chosen to wakeup with this device. This fixes this warning and makes the code more robust in case there are systems out there that can't wakeup from suspend on this line but the user has chosen to do so.
--- drivers/rtc/rtc-cros-ec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rtc/rtc-cros-ec.c +2 -2
@@ -298,7 +298,7 @@ static int cros_ec_rtc_suspend(struct device *dev)struct cros_ec_rtc *cros_ec_rtc =dev_get_drvdata (&pdev->dev);if (device_may_wakeup (dev)) -enable_irq_wake (cros_ec_rtc->cros_ec->irq); +return enable_irq_wake (cros_ec_rtc->cros_ec->irq);return 0 ; }
@@ -309,7 +309,7 @@ static int cros_ec_rtc_resume(struct device *dev)struct cros_ec_rtc *cros_ec_rtc =dev_get_drvdata (&pdev->dev);if (device_may_wakeup (dev)) -disable_irq_wake (cros_ec_rtc->cros_ec->irq); +return disable_irq_wake (cros_ec_rtc->cros_ec->irq);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/99 rtc: sh: Fix invalid alarm warning for non-enabled alarm
In reply to Greg Kroah-Hartman[ Upstream commit 15d82d22498784966df8e4696174a16b02cc1052 ]
When no alarm has been programmed on RSK-RZA1, an error message is printed during boot:
rtc rtc0: invalid alarm value: 2019-03-14T255:255:255
sh_rtc_read_alarm_value() returns 0xff when querying a hardware alarm field that is not enabled. __rtc_read_alarm() validates the received alarm values, and fills in missing fields when needed.
While 0xff is handled fine for the year, month, and day fields, and corrected as considered being out-of-range, this is not the case for the hour, minute, and second fields, where -1 is expected for missing fields.
Fix this by returning -1 instead, as this value is handled fine for all fields.
--- drivers/rtc/rtc-sh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-sh.c +1 -1
@@ -377,7 +377,7 @@ static int sh_rtc_set_time(struct device *dev, struct rtc_time *tm)static inline int sh_rtc_read_alarm_value (struct sh_rtc *rtc,int reg_off) {unsigned int byte; -int value =0xff ;/* return 0xff for ignored values */ +int value =-1 ;/* return -1 for ignored values */ byte =readb (rtc->regbase + reg_off);if (byte &AR_ENB ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/99 batman-adv: Reduce claim hash refcnt only for removed entry
In reply to Greg Kroah-Hartman[ Upstream commit 4ba104f468bbfc27362c393815d03aa18fb7a20f ]
The batadv_hash_remove is a function which searches the hashtable for an entry using a needle, a hashtable bucket selection function and a compare function. It will lock the bucket list and delete an entry when the compare function matches it with the needle. It returns the pointer to the hlist_node which matches or NULL when no entry matches the needle.
The batadv_bla_del_claim is not itself protected in anyway to avoid that any other function is modifying the hashtable between the search for the entry and the call to batadv_hash_remove. It can therefore happen that the entry either doesn't exist anymore or an entry was deleted which is not the same object as the needle. In such an situation, the reference counter (for the reference stored in the hashtable) must not be reduced for the needle. Instead the reference counter of the actually removed entry has to be reduced.
Otherwise the reference counter will underflow and the object might be freed before all its references were dropped. The kref helpers reported this problem as:
refcount_t: underflow; use-after-free.
--- net/batman-adv/bridge_loop_avoidance.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
net/batman-adv/bridge_loop_avoidance.c +13 -3
@@ -803,6 +803,8 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, const u8 *mac, const unsigned short vid) {struct batadv_bla_claim search_claim, *claim; +struct batadv_bla_claim *claim_removed_entry; +struct hlist_node *claim_removed_node;ether_addr_copy (search_claim.addr, mac); search_claim.vid = vid;
@@ -813,10 +815,18 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv,batadv_dbg (BATADV_DBG_BLA , bat_priv,"%s(): %pM, vid %d\n" , __func__, mac,batadv_print_vid (vid)); -batadv_hash_remove (bat_priv->bla.claim_hash, batadv_compare_claim, - batadv_choose_claim, claim); -batadv_claim_put (claim);/* reference from the hash is gone */ + claim_removed_node =batadv_hash_remove (bat_priv->bla.claim_hash, + batadv_compare_claim, + batadv_choose_claim, claim); +if (!claim_removed_node) + goto free_claim; +/* reference from the hash is gone */ + claim_removed_entry =hlist_entry (claim_removed_node, + struct batadv_bla_claim, hash_entry); +batadv_claim_put (claim_removed_entry); + +free_claim:/* don't need the reference from hash_find() anymore */ batadv_claim_put (claim); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/99 batman-adv: Reduce tt_local hash refcnt only for removed entry
In reply to Greg Kroah-Hartman[ Upstream commit 3d65b9accab4a7ed5038f6df403fbd5e298398c7 ]
The batadv_hash_remove is a function which searches the hashtable for an entry using a needle, a hashtable bucket selection function and a compare function. It will lock the bucket list and delete an entry when the compare function matches it with the needle. It returns the pointer to the hlist_node which matches or NULL when no entry matches the needle.
The batadv_tt_local_remove is not itself protected in anyway to avoid that any other function is modifying the hashtable between the search for the entry and the call to batadv_hash_remove. It can therefore happen that the entry either doesn't exist anymore or an entry was deleted which is not the same object as the needle. In such an situation, the reference counter (for the reference stored in the hashtable) must not be reduced for the needle. Instead the reference counter of the actually removed entry has to be reduced.
Otherwise the reference counter will underflow and the object might be freed before all its references were dropped. The kref helpers reported this problem as:
refcount_t: underflow; use-after-free.
--- net/batman-adv/translation-table.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
net/batman-adv/translation-table.c +9 -5
@@ -1332,9 +1332,10 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr, unsigned short vid, const char *message, bool roaming) { + struct batadv_tt_local_entry *tt_removed_entry;struct batadv_tt_local_entry *tt_local_entry;u16 flags, curr_flags =BATADV_NO_FLAGS ; -void *tt_entry_exists; +struct hlist_node *tt_removed_node; tt_local_entry =batadv_tt_local_hash_find (bat_priv, addr, vid);if (!tt_local_entry)
@@ -1363,15 +1364,18 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr,*/ batadv_tt_local_event (bat_priv, tt_local_entry,BATADV_TT_CLIENT_DEL ); - tt_entry_exists =batadv_hash_remove (bat_priv->tt.local_hash, + tt_removed_node =batadv_hash_remove (bat_priv->tt.local_hash, batadv_compare_tt, batadv_choose_tt, &tt_local_entry->common); -if (!tt_entry_exists) +if (!tt_removed_node) goto out; -/* extra call to free the local tt entry */ -batadv_tt_local_entry_put (tt_local_entry); +/* drop reference of remove hash entry */ + tt_removed_entry =hlist_entry (tt_removed_node, + struct batadv_tt_local_entry, + common.hash_entry); +batadv_tt_local_entry_put (tt_removed_entry); out:if (tt_local_entry)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/99 batman-adv: Reduce tt_global hash refcnt only for removed entry
In reply to Greg Kroah-Hartman[ Upstream commit f131a56880d10932931e74773fb8702894a94a75 ]
The batadv_hash_remove is a function which searches the hashtable for an entry using a needle, a hashtable bucket selection function and a compare function. It will lock the bucket list and delete an entry when the compare function matches it with the needle. It returns the pointer to the hlist_node which matches or NULL when no entry matches the needle.
The batadv_tt_global_free is not itself protected in anyway to avoid that any other function is modifying the hashtable between the search for the entry and the call to batadv_hash_remove. It can therefore happen that the entry either doesn't exist anymore or an entry was deleted which is not the same object as the needle. In such an situation, the reference counter (for the reference stored in the hashtable) must not be reduced for the needle. Instead the reference counter of the actually removed entry has to be reduced.
Otherwise the reference counter will underflow and the object might be freed before all its references were dropped. The kref helpers reported this problem as:
refcount_t: underflow; use-after-free.
--- net/batman-adv/translation-table.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
net/batman-adv/translation-table.c +15 -3
@@ -616,14 +616,26 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv,struct batadv_tt_global_entry *tt_global, const char *message) { + struct batadv_tt_global_entry *tt_removed_entry; +struct hlist_node *tt_removed_node; +batadv_dbg (BATADV_DBG_TT , bat_priv,"Deleting global tt entry %pM (vid: %d): %s\n" , tt_global->common.addr,batadv_print_vid (tt_global->common.vid), message); -batadv_hash_remove (bat_priv->tt.global_hash, batadv_compare_tt, - batadv_choose_tt, &tt_global->common); -batadv_tt_global_entry_put (tt_global); + tt_removed_node =batadv_hash_remove (bat_priv->tt.global_hash, + batadv_compare_tt, + batadv_choose_tt, + &tt_global->common); +if (!tt_removed_node) +return ; + +/* drop reference of remove hash entry */ + tt_removed_entry =hlist_entry (tt_removed_node, + struct batadv_tt_global_entry, + common.hash_entry); +batadv_tt_global_entry_put (tt_removed_entry); }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/99 batman-adv: fix warning in function batadv_v_elp_get_throughput
In reply to Greg Kroah-Hartman[ Upstream commit ca8c3b922e7032aff6cc3fd05548f4df1f3df90e ]
When CONFIG_CFG80211 isn't enabled the compiler correcly warns about 'sinfo.pertid' may be unused. It can also happen for other error conditions that it not warn about.
net/batman-adv/bat_v_elp.c: In function ‘batadv_v_elp_get_throughput.isra.0’:include/net/cfg80211.h:6370:13: warning: ‘sinfo.pertid’ may be used
uninitialized in this function [-Wmaybe-uninitialized]
kfree(sinfo->pertid);
~~~~~^~~~~~~~Rework so that we only release '&sinfo' if cfg80211_get_station returns zero.
--- net/batman-adv/bat_v_elp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/batman-adv/bat_v_elp.c +4 -2
@@ -104,8 +104,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) ret =cfg80211_get_station (real_netdev, neigh->addr, &sinfo); -/* free the TID stats immediately */ -cfg80211_sinfo_release_content (&sinfo); +if (!ret) { +/* free the TID stats immediately */ +cfg80211_sinfo_release_content (&sinfo); + }dev_put (real_netdev);if (ret == -ENOENT ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/99 ARM: dts: rockchip: Fix gpu opp node names for rk3288
In reply to Greg Kroah-Hartman[ Upstream commit d040e4e8deeaa8257d6aa260e29ad69832b5d630 ]
The device tree compiler yells like this:
Warning (unit_address_vs_reg):
/gpu-opp-table/opp@100000000:
node has a unit name, but no reg property
Let's match the cpu opp node names and use a dash.
--- arch/arm/boot/dts/rk3288.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +6 -6
@@ -1261,27 +1261,27 @@ gpu_opp_table: gpu-opp-table { compatible = "operating-points-v2"; - opp@100000000 { + opp-100000000 { opp-hz = /bits/ 64 <100000000>; opp-microvolt = <950000>; }; - opp@200000000 { + opp-200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <950000>; }; - opp@300000000 { + opp-300000000 { opp-hz = /bits/ 64 <300000000>; opp-microvolt = <1000000>; }; - opp@400000000 { + opp-400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <1100000>; }; - opp@500000000 { + opp-500000000 { opp-hz = /bits/ 64 <500000000>; opp-microvolt = <1200000>; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <1250000>; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/99 reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev
In reply to Greg Kroah-Hartman[ Upstream commit 13e8a05b922457761ddef39cfff6231bd4ed9eef ]
Set .owner to prevent module unloading while being used.
--- drivers/reset/reset-meson-audio-arb.c | 1 + 1 file changed, 1 insertion(+)
drivers/reset/reset-meson-audio-arb.c +1 -0
@@ -130,6 +130,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev) arb->rstc.nr_resets =ARRAY_SIZE (axg_audio_arb_reset_bits); arb->rstc.ops = &meson_audio_arb_rstc_ops; arb->rstc.of_node = dev->of_node; + arb->rstc.owner =THIS_MODULE ;/* * Enable general :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/99 igb: Fix WARN_ONCE on runtime suspend
In reply to Greg Kroah-Hartman[ Upstream commit dabb8338be533c18f50255cf39ff4f66d4dabdbe ]
The runtime_suspend device callbacks are not supposed to save configuration state or change the power state. Commit fb29f76cc566 ("igb: Fix an issue that PME is not enabled during runtime suspend") changed the driver to not save configuration state during runtime suspend, however the driver callback still put the device into a low-power state. This causes a warning in the pci pm core and results in pci_pm_runtime_suspend not calling pci_save_state or pci_finish_runtime_suspend.
Fix this by not changing the power state either, leaving that to pci pm core, and make the same change for suspend callback as well.
Also move a couple of defines into the appropriate header file instead of inline in the .c file.
--- .../net/ethernet/intel/igb/e1000_defines.h | 2 + drivers/net/ethernet/intel/igb/igb_main.c | 57 +++---------------- 2 files changed, 10 insertions(+), 49 deletions(-)
drivers/net/ethernet/intel/igb/e1000_defines.h +2 -0
@@ -194,6 +194,8 @@/* enable link status from external LINK_0 and LINK_1 pins */ #define E1000_CTRL_SWDPIN0 0x00040000/* SWDPIN 0 value */ #define E1000_CTRL_SWDPIN1 0x00080000/* SWDPIN 1 value */ +#define E1000_CTRL_ADVD3WUC 0x00100000/* D3 WUC */ +#define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000/* PHY PM enable */ #define E1000_CTRL_SDP0_DIR 0x00400000/* SDP0 Data direction */ #define E1000_CTRL_SDP1_DIR 0x00800000/* SDP1 Data direction */ #define E1000_CTRL_RST 0x04000000/* Global reset */
drivers/net/ethernet/intel/igb/igb_main.c +8 -49
97 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/99 riscv: fix accessing 8-byte variable from RV32
In reply to Greg Kroah-Hartman[ Upstream commit dbee9c9c45846f003ec2f819710c2f4835630a6a ]
A memory save operation to 8-byte variable in RV32 is divided into two sw instructions in the put_user macro. The current fixup returns execution flow to the second sw instead of the one after it.
This patch fixes this fixup code according to the load access part.
--- arch/riscv/include/asm/uaccess.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/include/asm/uaccess.h +1 -1
@@ -307,7 +307,7 @@ do { \" .balign 4\n" \"4:\n" \" li %0, %6\n" \ -" jump 2b, %1\n" \ +" jump 3b, %1\n" \" .previous\n" \" .section __ex_table,\"a\"\n" \" .balign " RISCV_SZPTR "\n" \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/99 HID: quirks: Fix keyboard + touchpad on Lenovo Miix 630
In reply to Greg Kroah-Hartman[ Upstream commit 2bafa1e9625400bec4c840a168d70ba52607a58d ]
Similar to commit edfc3722cfef ("HID: quirks: Fix keyboard + touchpad on Toshiba Click Mini not working"), the Lenovo Miix 630 has a combo keyboard/touchpad device with vid:pid of 04F3:0400, which is shared with Elan touchpads. The combo on the Miix 630 has an ACPI id of QTEC0001, which is not claimed by the elan_i2c driver, so key on that similar to what was done for the Toshiba Click Mini.
--- drivers/hid/hid-quirks.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hid/hid-quirks.c +4 -1
@@ -744,7 +744,6 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_DEALEXTREAME, USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701) }, { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) }, { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, - { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0400) }, { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) }, { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) }, { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },
@@ -1025,6 +1024,10 @@ bool hid_ignore(struct hid_device *hdev)if (hdev->product ==0x0401 &&strncmp (hdev->name,"ELAN0800" ,8 ) !=0 )return true; +/* Same with product id 0x0400 */ +if (hdev->product ==0x0400 && +strncmp (hdev->name,"QTEC0001" ,8 ) !=0 ) +return true;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/99 net: hns3: fix compile error
In reply to Greg Kroah-Hartman[ Upstream commit 669efc76b317b3aa550ffbf0b79d064cb00a5f96 ]
Currently, the rules for configuring search paths in Kbuild have changed, this will lead some erros when compiling hns3 with the following command:
make O=DIR M=drivers/net/ethernet/hisilicon/hns3
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c:11:10:
fatal error: hnae3.h: No such file or directory
This patch fix it by adding $(srctree)/ prefix to the serach paths.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the HISILICON network device drivers. # -ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3 +ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3 obj-$(CONFIG_HNS3_HCLGE) += hclge.o hclge-objs = hclge_main.o hclge_cmd.o hclge_mdio.o hclge_tm.o hclge_mbx.o
drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the HISILICON network device drivers. # -ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3 +ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3 obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o hclgevf-objs = hclgevf_main.o hclgevf_cmd.o hclgevf_mbx.o
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/99 net/mlx5: E-Switch, Fix esw manager vport indication for more vport commands
In reply to Greg Kroah-Hartman[ Upstream commit eca4a928585ac08147e5cc8e2111ecbc6279ee31 ]
Traditionally, the PF (Physical Function) which resides on vport 0 was the E-switch manager. Since the ECPF (Embedded CPU Physical Function), which resides on vport 0xfffe, was introduced as the E-Switch manager, the assumption that the E-switch manager is on vport 0 is incorrect.
Since the eswitch code already uses the actual vport value, all we need is to always set other_vport=1.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +2 -4
@@ -80,8 +80,7 @@ static int arm_vport_context_events_cmd(struct mlx5_core_dev *dev, u16 vport, opcode, MLX5_CMD_OP_MODIFY_NIC_VPORT_CONTEXT);MLX5_SET (modify_nic_vport_context_in, in, field_select.change_event,1 );MLX5_SET (modify_nic_vport_context_in, in, vport_number, vport); -if (vport) -MLX5_SET (modify_nic_vport_context_in, in, other_vport,1 ); +MLX5_SET (modify_nic_vport_context_in, in, other_vport,1 ); nic_vport_ctx =MLX5_ADDR_OF (modify_nic_vport_context_in, in, nic_vport_context);
@@ -109,8 +108,7 @@ static int modify_esw_vport_context_cmd(struct mlx5_core_dev *dev, u16 vport,MLX5_SET (modify_esw_vport_context_in, in, opcode,MLX5_CMD_OP_MODIFY_ESW_VPORT_CONTEXT );MLX5_SET (modify_esw_vport_context_in, in, vport_number, vport); -if (vport) -MLX5_SET (modify_esw_vport_context_in, in, other_vport,1 ); +MLX5_SET (modify_esw_vport_context_in, in, other_vport,1 );return mlx5_cmd_exec (dev, in, inlen, out,sizeof (out)); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/99 bonding: show full hw address in sysfs for slave entries
In reply to Greg Kroah-Hartman[ Upstream commit 18bebc6dd3281955240062655a4df35eef2c46b3 ]
Bond expects ethernet hwaddr for its slave, but it can be longer than 6 bytes - infiniband interface for example.
# cat /sys/devices/<skipped>/net/ib0/address 80:00:02:08:fe:80:00:00:00:00:00:00:7c:fe:90:03:00:be:5d:e1
# cat /sys/devices/<skipped>/net/ib0/bonding_slave/perm_hwaddr 80:00:02:08:fe:80
So print full hwaddr in sysfs "bonding_slave/perm_hwaddr" as well.
--- drivers/net/bonding/bond_sysfs_slave.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/bonding/bond_sysfs_slave.c +3 -1
@@ -55,7 +55,9 @@ static SLAVE_ATTR_RO(link_failure_count);static ssize_t perm_hwaddr_show (struct slave *slave,char *buf) { -return sprintf (buf,"%pM\n" , slave->perm_hwaddr); +return sprintf (buf,"%*phC\n" , + slave->dev->addr_len, + slave->perm_hwaddr); }static SLAVE_ATTR_RO (perm_hwaddr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/99 net: stmmac: use correct DMA buffer size in the RX descriptor
In reply to Greg Kroah-Hartman[ Upstream commit 583e6361414903c5206258a30e5bd88cb03c0254 ]
We always program the maximum DMA buffer size into the receive descriptor, although the allocated size may be less. E.g. with the default MTU size we allocate only 1536 bytes. If somebody sends us a bigger frame, then memory may get corrupted.
Fix by using exact buffer sizes.
--- .../net/ethernet/stmicro/stmmac/descs_com.h | 22 ++++++++++++------- .../ethernet/stmicro/stmmac/dwmac4_descs.c | 2 +- .../ethernet/stmicro/stmmac/dwxgmac2_descs.c | 2 +- .../net/ethernet/stmicro/stmmac/enh_desc.c | 10 ++++++--- drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- .../net/ethernet/stmicro/stmmac/norm_desc.c | 10 ++++++--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++-- 7 files changed, 35 insertions(+), 19 deletions(-)
drivers/net/ethernet/stmicro/stmmac/descs_com.h +14 -8
@@ -29,11 +29,13 @@/* Specific functions used for Ring mode */ /* Enhanced descriptors */ -static inline void ehn_desc_rx_set_on_ring (struct dma_desc *p,int end) +static inline void ehn_desc_rx_set_on_ring (struct dma_desc *p,int end, +int bfsize) { - p->des1 |=cpu_to_le32 ((BUF_SIZE_8KiB - <<ERDES1_BUFFER2_SIZE_SHIFT ) - &ERDES1_BUFFER2_SIZE_MASK ); +if (bfsize == BUF_SIZE_16KiB) + p->des1 |=cpu_to_le32 ((BUF_SIZE_8KiB + <<ERDES1_BUFFER2_SIZE_SHIFT ) + &ERDES1_BUFFER2_SIZE_MASK );if (end) p->des1 |=cpu_to_le32 (ERDES1_END_RING );
@@ -59,11 +61,15 @@ static inline void enh_set_tx_desc_len_on_ring(struct dma_desc *p, int len) }/* Normal descriptors */ -static inline void ndesc_rx_set_on_ring (struct dma_desc *p,int end) +static inline void ndesc_rx_set_on_ring (struct dma_desc *p,int end,int bfsize) { - p->des1 |=cpu_to_le32 (((BUF_SIZE_2KiB -1 ) - <<RDES1_BUFFER2_SIZE_SHIFT ) - &RDES1_BUFFER2_SIZE_MASK ); +if (bfsize >= BUF_SIZE_2KiB) { +int bfsize2; + + bfsize2 =min (bfsize - BUF_SIZE_2KiB +1 , BUF_SIZE_2KiB -1 ); + p->des1 |=cpu_to_le32 ((bfsize2 <<RDES1_BUFFER2_SIZE_SHIFT ) + &RDES1_BUFFER2_SIZE_MASK ); + }if (end) p->des1 |=cpu_to_le32 (RDES1_END_RING );
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c +1 -1
@@ -296,7 +296,7 @@ static int dwmac4_wrback_get_rx_timestamp_status(void *desc, void *next_desc, }static void dwmac4_rd_init_rx_desc (struct dma_desc *p,int disable_rx_ic, -int mode,int end) +int mode,int end,int bfsize) {dwmac4_set_rx_owner (p, disable_rx_ic); }
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c +1 -1
@@ -123,7 +123,7 @@ static int dwxgmac2_get_rx_timestamp_status(void *desc, void *next_desc, }static void dwxgmac2_init_rx_desc (struct dma_desc *p,int disable_rx_ic, -int mode,int end) +int mode,int end,int bfsize) {dwxgmac2_set_rx_owner (p, disable_rx_ic); }
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +7 -3
@@ -259,15 +259,19 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x, }static void enh_desc_init_rx_desc (struct dma_desc *p,int disable_rx_ic, -int mode,int end) +int mode,int end,int bfsize) { +int bfsize1; + p->des0 |=cpu_to_le32 (RDES0_OWN ); - p->des1 |=cpu_to_le32 (BUF_SIZE_8KiB &ERDES1_BUFFER1_SIZE_MASK ); + + bfsize1 =min (bfsize, BUF_SIZE_8KiB); + p->des1 |=cpu_to_le32 (bfsize1 &ERDES1_BUFFER1_SIZE_MASK );if (mode ==STMMAC_CHAIN_MODE )ehn_desc_rx_set_on_chain (p);else -ehn_desc_rx_set_on_ring (p, end); +ehn_desc_rx_set_on_ring (p, end, bfsize);if (disable_rx_ic) p->des1 |=cpu_to_le32 (ERDES1_DISABLE_IC );
drivers/net/ethernet/stmicro/stmmac/hwif.h +1 -1
@@ -33,7 +33,7 @@ struct dma_extended_desc;struct stmmac_desc_ops {/* DMA RX descriptor ring initialization */ void (*init_rx_desc)(struct dma_desc *p,int disable_rx_ic,int mode, -int end); +int end,int bfsize);/* DMA TX descriptor ring initialization */ void (*init_tx_desc)(struct dma_desc *p,int mode,int end);/* Invoked by the xmit function to prepare the tx descriptor */
drivers/net/ethernet/stmicro/stmmac/norm_desc.c +7 -3
@@ -135,15 +135,19 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x, }static void ndesc_init_rx_desc (struct dma_desc *p,int disable_rx_ic,int mode, -int end) +int end,int bfsize) { +int bfsize1; + p->des0 |=cpu_to_le32 (RDES0_OWN ); - p->des1 |=cpu_to_le32 ((BUF_SIZE_2KiB -1 ) &RDES1_BUFFER1_SIZE_MASK ); + + bfsize1 =min (bfsize, BUF_SIZE_2KiB -1 ); + p->des1 |=cpu_to_le32 (bfsize &RDES1_BUFFER1_SIZE_MASK );if (mode ==STMMAC_CHAIN_MODE )ndesc_rx_set_on_chain (p, end);else -ndesc_rx_set_on_ring (p, end); +ndesc_rx_set_on_ring (p, end, bfsize);if (disable_rx_ic) p->des1 |=cpu_to_le32 (RDES1_DISABLE_IC );
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +4 -2
@@ -1111,11 +1111,13 @@ static void stmmac_clear_rx_descriptors(struct stmmac_priv *priv, u32 queue)if (priv->extend_desc)stmmac_init_rx_desc (priv, &rx_q->dma_erx[i].basic, priv->use_riwt, priv->mode, - (i ==DMA_RX_SIZE -1 )); + (i ==DMA_RX_SIZE -1 ), + priv->dma_buf_sz);else stmmac_init_rx_desc (priv, &rx_q->dma_rx[i], priv->use_riwt, priv->mode, - (i ==DMA_RX_SIZE -1 )); + (i ==DMA_RX_SIZE -1 ), + priv->dma_buf_sz); }/**
Signature · 1 line
2.20.1
Re: [PATCH 4.19 38/99] net: stmmac: use correct DMA buffer size in the RX descriptor
Hi,
Quoted 12 lines · Greg Kroah-Hartman
[ Upstream commit
583e6361414903c5206258a30e5bd88cb03c0254]We always program the maximum DMA buffer size into the receive descriptor, although the allocated size may be less. E.g. with the default MTU size we allocate only 1536 bytes. If somebody sends us a bigger frame, then memory may get corrupted.
Fix by using exact buffer sizes.
Signed-off-by Aaro Koskinen <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 8 lines
--- .../net/ethernet/stmicro/stmmac/descs_com.h | 22 ++++++++++++------- .../ethernet/stmicro/stmmac/dwmac4_descs.c | 2 +- .../ethernet/stmicro/stmmac/dwxgmac2_descs.c | 2 +- .../net/ethernet/stmicro/stmmac/enh_desc.c | 10 ++++++--- drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- .../net/ethernet/stmicro/stmmac/norm_desc.c | 10 ++++++--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--
This commit is incomplete and we need the following commit:
commit f87db4dbd52f2f8a170a2b51cb0926221ca7c9e2
Author: YueHaibing <[email protected]> Date: Wed Apr 17 09:49:39 2019 +0800
net: stmmac: Use bfsize1 in ndesc_init_rx_desc
gcc warn this:
drivers/net/ethernet/stmicro/stmmac/norm_desc.c: In function ndesc_init_rx_desc:
drivers/net/ethernet/stmicro/stmmac/norm_desc.c:138:6: warning: variable 'bfsize1' set but not used [-Wunused-but-set-variable]
Like enh_desc_init_rx_desc, we should use bfsize1 in ndesc_init_rx_desc to calculate 'p->des1'
And this fix is also needed for 5.0.14-rc. Please apply this commit to 4.19.y-rc and 5.0.y-rc.
Best regards,
Nobuhiro
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 38/99] net: stmmac: use correct DMA buffer size in the RX descriptor
Quoted 40 lines · Nobuhiro Iwamatsu
Hi,
Quoted 12 lines · Greg Kroah-Hartman
[ Upstream commit
583e6361414903c5206258a30e5bd88cb03c0254]We always program the maximum DMA buffer size into the receive descriptor, although the allocated size may be less. E.g. with the default MTU size we allocate only 1536 bytes. If somebody sends us a bigger frame, then memory may get corrupted.
Fix by using exact buffer sizes.
Signed-off-by Aaro Koskinen <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>Quoted 8 lines
--- .../net/ethernet/stmicro/stmmac/descs_com.h | 22 ++++++++++++------- .../ethernet/stmicro/stmmac/dwmac4_descs.c | 2 +- .../ethernet/stmicro/stmmac/dwxgmac2_descs.c | 2 +- .../net/ethernet/stmicro/stmmac/enh_desc.c | 10 ++++++--- drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- .../net/ethernet/stmicro/stmmac/norm_desc.c | 10 ++++++--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--This commit is incomplete and we need the following commit:
commit
f87db4dbd52f2f8a170a2b51cb0926221ca7c9e2Author: YueHaibing <[email protected]> Date: Wed Apr 17 09:49:39 2019 +0800net: stmmac: Use bfsize1 in
ndesc_init_rx_descgcc warn this:
drivers/net/ethernet/stmicro/stmmac/norm_desc.c: In functionndesc_init_rx_desc:
drivers/net/ethernet/stmicro/stmmac/norm_desc.c:138:6: warning: variable 'bfsize1' set but not used [-Wunused-but-set-variable]Like
enh_desc_init_rx_desc, we should use bfsize1 inndesc_init_rx_descto calculate 'p->des1'
Quoted 7 lines
Fixes 583e63614149 ("net: stmmac: use correct DMA buffer size in the RX descriptor")Signed-off-by YueHaibing <[email protected]>Reviewed-by Aaro Koskinen <[email protected]>Signed-off-by David S. Miller <[email protected]>And this fix is also needed for 5.0.14-rc. Please apply this commit to 4.19.y-rc and 5.0.y-rc.
Thanks, now queued up.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 39/99 net: stmmac: ratelimit RX error logs
In reply to Greg Kroah-Hartman[ Upstream commit 972c9be784e077bc56472c78243e0326e525b689 ]
Ratelimit RX error logs.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +8 -6
@@ -3412,9 +3412,10 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)* ignored */ if (frame_len > priv->dma_buf_sz) { -netdev_err (priv->dev, -"len %d larger than size (%d)\n" , - frame_len, priv->dma_buf_sz); +if (net_ratelimit ()) +netdev_err (priv->dev, +"len %d larger than size (%d)\n" , + frame_len, priv->dma_buf_sz); priv->dev->stats.rx_length_errors++;break ; }
@@ -3471,9 +3472,10 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) }else { skb = rx_q->rx_skbuff[entry];if (unlikely (!skb)) { -netdev_err (priv->dev, -"%s: Inconsistent Rx chain\n" , - priv->dev->name); +if (net_ratelimit ()) +netdev_err (priv->dev, +"%s: Inconsistent Rx chain\n" , + priv->dev->name); priv->dev->stats.rx_dropped++;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/99 net: stmmac: dont stop NAPI processing when dropping a packet
In reply to Greg Kroah-Hartman[ Upstream commit 07b3975352374c3f5ebb4a42ef0b253fe370542d ]
Currently, if we drop a packet, we exit from NAPI loop before the budget is consumed. In some situations this will make the RX processing stall e.g. when flood pinging the system with oversized packets, as the errorneous packets are not dropped efficiently.
If we drop a packet, we should just continue to the next one as long as the budget allows.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +7 -7
@@ -3333,9 +3333,8 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) {struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];struct stmmac_channel *ch = &priv->channel[queue]; -unsigned int entry = rx_q->cur_rx; +unsigned int next_entry = rx_q->cur_rx;int coe = priv->hw->rx_csum; -unsigned int next_entry;unsigned int count =0 ;bool xmac;
@@ -3353,10 +3352,12 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)stmmac_display_ring (priv, rx_head,DMA_RX_SIZE , true); }while (count < limit) { -int status; +int entry, status;struct dma_desc *p;struct dma_desc *np; + entry = next_entry; +if (priv->extend_desc) p = (struct dma_desc *)(rx_q->dma_erx + entry);else
@@ -3417,7 +3418,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)"len %d larger than size (%d)\n" , frame_len, priv->dma_buf_sz); priv->dev->stats.rx_length_errors++; -break ; +continue ; }/* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
@@ -3452,7 +3453,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)dev_warn (priv->device,"packet dropped\n" ); priv->dev->stats.rx_dropped++; -break ; +continue ; } dma_sync_single_for_cpu(priv->device,
@@ -3477,7 +3478,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)"%s: Inconsistent Rx chain\n" , priv->dev->name); priv->dev->stats.rx_dropped++; -break ; +continue ; }prefetch (skb->data -NET_IP_ALIGN ); rx_q->rx_skbuff[entry] =NULL ;
@@ -3512,7 +3513,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) priv->dev->stats.rx_packets++; priv->dev->stats.rx_bytes += frame_len; } - entry = next_entry; }stmmac_rx_refill (priv, queue);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/99 net: stmmac: dont overwrite discard_frame status
In reply to Greg Kroah-Hartman[ Upstream commit 1b746ce8b397e58f9e40ce5c63b7198de6930482 ]
If we have error bits set, the discard_frame status will get overwritten by checksum bit checks, which might set the status back to good one. Fix by checking the COE status only if the frame is good.
--- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +4 -3
@@ -231,9 +231,10 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,* It doesn't match with the information reported into the databook. * At any rate, we need to understand if the CSUM hw computation is ok * and report this info to the upper layers. */ - ret =enh_desc_coe_rdes0 (!!(rdes0 &RDES0_IPC_CSUM_ERROR ), - !!(rdes0 &RDES0_FRAME_TYPE ), - !!(rdes0 &ERDES0_RX_MAC_ADDR )); +if (likely (ret == good_frame)) + ret =enh_desc_coe_rdes0 (!!(rdes0 &RDES0_IPC_CSUM_ERROR ), + !!(rdes0 &RDES0_FRAME_TYPE ), + !!(rdes0 &ERDES0_RX_MAC_ADDR ));if (unlikely (rdes0 &RDES0_DRIBBLING )) x->dribbling_bit++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/99 net: stmmac: fix dropping of multi-descriptor RX frames
In reply to Greg Kroah-Hartman[ Upstream commit 8ac0c24fe1c256af6644caf3d311029440ec2fbd ]
Packets without the last descriptor set should be dropped early. If we receive a frame larger than the DMA buffer, the HW will continue using the next descriptor. Driver mistakes these as individual frames, and sometimes a truncated frame (without the LD set) may look like a valid packet.
This fixes a strange issue where the system replies to 4098-byte ping although the MTU/DMA buffer size is set to 4096, and yet at the same time it's logging an oversized packet.
--- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +5 -0
@@ -201,6 +201,11 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,if (unlikely (rdes0 &RDES0_OWN ))return dma_own; +if (unlikely (!(rdes0 &RDES0_LAST_DESCRIPTOR ))) { + stats->rx_length_errors++; +return discard_frame; + } +if (unlikely (rdes0 &RDES0_ERROR_SUMMARY )) {if (unlikely (rdes0 &RDES0_DESCRIPTOR_ERROR )) { x->rx_desc++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/99 net: stmmac: dont log oversized frames
In reply to Greg Kroah-Hartman[ Upstream commit 057a0c5642a2ff2db7c421cdcde34294a23bf37b ]
This is log is harmful as it can trigger multiple times per packet. Delete it.
--- drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/norm_desc.c +0 -2
@@ -91,8 +91,6 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,return dma_own;if (unlikely (!(rdes0 &RDES0_LAST_DESCRIPTOR ))) { -pr_warn ("%s: Oversized frame spanned multiple buffers\n" , - __func__); stats->rx_length_errors++;return discard_frame; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/99 jffs2: fix use-after-free on symlink traversal
In reply to Greg Kroah-Hartman[ Upstream commit 4fdcfab5b5537c21891e22e65996d4d0dd8ab4ca ]
free the symlink body after the same RCU delay we have for freeing the struct inode itself, so that traversal during RCU pathwalk wouldn't step into freed memory.
--- fs/jffs2/readinode.c | 5 ----- fs/jffs2/super.c | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-)
fs/jffs2/readinode.c +0 -5
@@ -1414,11 +1414,6 @@ void jffs2_do_clear_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f)jffs2_kill_fragtree (&f->fragtree, deleted?c:NULL ); -if (f->target) { -kfree (f->target); - f->target =NULL ; - } - fds = f->dents;while (fds) { fd = fds;
fs/jffs2/super.c +4 -1
@@ -47,7 +47,10 @@ static struct inode *jffs2_alloc_inode(struct super_block *sb)static void jffs2_i_callback (struct rcu_head *head) { struct inode *inode = container_of(head, struct inode, i_rcu); -kmem_cache_free (jffs2_inode_cachep,JFFS2_INODE_INFO (inode)); +struct jffs2_inode_info *f =JFFS2_INODE_INFO (inode); + +kfree (f->target); +kmem_cache_free (jffs2_inode_cachep, f); }static void jffs2_destroy_inode (struct inode *inode)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/99 debugfs: fix use-after-free on symlink traversal
In reply to Greg Kroah-Hartman[ Upstream commit 93b919da64c15b90953f96a536e5e61df896ca57 ]
symlink body shouldn't be freed without an RCU delay. Switch debugfs to ->destroy_inode() and use of call_rcu(); free both the inode and symlink body in the callback. Similar to solution for bpf, only here it's even more obvious that ->evict_inode() can be dropped.
--- fs/debugfs/inode.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
fs/debugfs/inode.c +9 -4
@@ -163,19 +163,24 @@ static int debugfs_show_options(struct seq_file *m, struct dentry *root)return 0 ; } -static void debugfs_evict_inode (struct inode *inode) +static void debugfs_i_callback (struct rcu_head *head) { -truncate_inode_pages_final (&inode->i_data); -clear_inode (inode); + struct inode *inode = container_of(head, struct inode, i_rcu);if (S_ISLNK (inode->i_mode))kfree (inode->i_link); +free_inode_nonrcu (inode); +} + +static void debugfs_destroy_inode (struct inode *inode) +{ +call_rcu (&inode->i_rcu, debugfs_i_callback); }static const struct super_operations debugfs_super_operations = { .statfs = simple_statfs, .remount_fs = debugfs_remount, .show_options = debugfs_show_options, - .evict_inode = debugfs_evict_inode, + .destroy_inode = debugfs_destroy_inode, };static void debugfs_release_dentry (struct dentry *dentry)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/99 mfd: twl-core: Disable IRQ while suspended
In reply to Greg Kroah-Hartman[ Upstream commit 20bb907f7dc82ecc9e135ad7067ac7eb69c81222 ]
Since commit 6e2bd956936 ("i2c: omap: Use noirq system sleep pm ops to idle device for suspend") on gta04 we have handle_twl4030_pih() called in situations where pm_runtime_get() in i2c-omap.c returns -EACCES.
[ 86.474365] Freezing remaining freezable tasks ... (elapsed 0.002 seconds) done. [ 86.485473] printk: Suspending console(s) (use no_console_suspend to debug) [ 86.555572] Disabling non-boot CPUs ... [ 86.555664] Successfully put all powerdomains to target state [ 86.563720] twl: Read failed (mod 1, reg 0x01 count 1) [ 86.563751] twl4030: I2C error -13 reading PIH ISR [ 86.563812] twl: Read failed (mod 1, reg 0x01 count 1) [ 86.563812] twl4030: I2C error -13 reading PIH ISR [ 86.563873] twl: Read failed (mod 1, reg 0x01 count 1) [ 86.563903] twl4030: I2C error -13 reading PIH ISR
This happens when we wakeup via something behing twl4030 (powerbutton or rtc alarm). This goes on for minutes until the system is finally resumed. Disable the irq on suspend and enable it on resume to avoid having i2c access problems when the irq registers are checked.
--- drivers/mfd/twl-core.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/mfd/twl-core.c +23 -0
@@ -1245,6 +1245,28 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)return status; } +static int __maybe_unused twl_suspend (struct device *dev) +{ +struct i2c_client *client =to_i2c_client (dev); + +if (client->irq) +disable_irq (client->irq); + +return 0 ; +} + +static int __maybe_unused twl_resume (struct device *dev) +{ +struct i2c_client *client =to_i2c_client (dev); + +if (client->irq) +enable_irq (client->irq); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(twl_dev_pm_ops, twl_suspend, twl_resume); +static const struct i2c_device_id twl_ids[] = { {"twl4030" ,TWL4030_VAUX2 },/* "Triton 2" */ {"twl5030" ,0 },/* T2 updated */
@@ -1262,6 +1284,7 @@ static const struct i2c_device_id twl_ids[] = {/* One Client Driver , 4 Clients */ static struct i2c_driver twl_driver = { .driver.name =DRIVER_NAME , + .driver.pm = &twl_dev_pm_ops, .id_table = twl_ids, .probe = twl_probe, .remove = twl_remove,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/99 block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctx
In reply to Greg Kroah-Hartman[ Upstream commit b9a1ff504b9492ad6beb7d5606e0e3365d4d8499 ]
kfree() can leak the hctx->fq->flush_rq field.
--- block/blk-mq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-mq.c +1 -1
@@ -2236,7 +2236,7 @@ static int blk_mq_init_hctx(struct request_queue *q,return 0 ; free_fq: -kfree (hctx->fq); +blk_free_flush_queue (hctx->fq); exit_hctx:if (set->ops->exit_hctx) set->ops->exit_hctx (hctx, hctx_idx);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/99 rtc: da9063: set uie_unsupported when relevant
In reply to Greg Kroah-Hartman[ Upstream commit 882c5e552ffd06856de42261460f46e18319d259 ]
The DA9063AD doesn't support alarms on any seconds and its granularity is the minute. Set uie_unsupported in that case.
--- drivers/rtc/rtc-da9063.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/rtc/rtc-da9063.c +7 -0
@@ -480,6 +480,13 @@ static int da9063_rtc_probe(struct platform_device *pdev)da9063_data_to_tm (data, &rtc->alarm_time, rtc); rtc->rtc_sync = false; +/* +* TODO: some models have alarms on a minute boundary but still support +* real hardware interrupts. Add this once the core supports it. +*/ +if (config->rtc_data_start !=RTC_SEC ) + rtc->rtc_dev->uie_unsupported =1 ; + irq_alarm =platform_get_irq_byname (pdev,"ALARM" ); ret = devm_request_threaded_irq(&pdev->dev, irq_alarm, NULL, da9063_alarm_event,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/99 HID: input: add mapping for Assistant key
In reply to Greg Kroah-Hartman[ Upstream commit ce856634af8cda3490947df8ac1ef5843e6356af ]
According to HUTRR89 usage 0x1cb from the consumer page was assigned to allow launching desktop-aware assistant application, so let's add the mapping.
--- drivers/hid/hid-input.c | 1 + 1 file changed, 1 insertion(+)
drivers/hid/hid-input.c +1 -0
@@ -982,6 +982,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fielcase 0x1b8 :map_key_clear (KEY_VIDEO );break ;case 0x1bc :map_key_clear (KEY_MESSENGER );break ;case 0x1bd :map_key_clear (KEY_INFO );break ; +case 0x1cb :map_key_clear (KEY_ASSISTANT );break ;case 0x201 :map_key_clear (KEY_NEW );break ;case 0x202 :map_key_clear (KEY_OPEN );break ;case 0x203 :map_key_clear (KEY_CLOSE );break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/99 vfio/pci: use correct format characters
In reply to Greg Kroah-Hartman[ Upstream commit 426b046b748d1f47e096e05bdcc6fb4172791307 ]
When compiling with -Wformat, clang emits the following warnings:
drivers/vfio/pci/vfio_pci.c:1601:5: warning: format specifies type
'unsigned short' but the argument has type 'unsigned int' [-Wformat]
vendor, device, subvendor, subdevice, ^~~~~~
drivers/vfio/pci/vfio_pci.c:1601:13: warning: format specifies type
'unsigned short' but the argument has type 'unsigned int' [-Wformat]
vendor, device, subvendor, subdevice,
^~~~~~
drivers/vfio/pci/vfio_pci.c:1601:21: warning: format specifies type
'unsigned short' but the argument has type 'unsigned int' [-Wformat]
vendor, device, subvendor, subdevice,
^~~~~~~~~
drivers/vfio/pci/vfio_pci.c:1601:32: warning: format specifies type
'unsigned short' but the argument has type 'unsigned int' [-Wformat]
vendor, device, subvendor, subdevice,
^~~~~~~~~
drivers/vfio/pci/vfio_pci.c:1605:5: warning: format specifies type
'unsigned short' but the argument has type 'unsigned int' [-Wformat]
vendor, device, subvendor, subdevice, ^~~~~~
drivers/vfio/pci/vfio_pci.c:1605:13: warning: format specifies type
'unsigned short' but the argument has type 'unsigned int' [-Wformat]
vendor, device, subvendor, subdevice,
^~~~~~
drivers/vfio/pci/vfio_pci.c:1605:21: warning: format specifies type
'unsigned short' but the argument has type 'unsigned int' [-Wformat]
vendor, device, subvendor, subdevice,
^~~~~~~~~
drivers/vfio/pci/vfio_pci.c:1605:32: warning: format specifies type
'unsigned short' but the argument has type 'unsigned int' [-Wformat]
vendor, device, subvendor, subdevice,
^~~~~~~~~
The types of these arguments are unconditionally defined, so this patch updates the format character to the correct ones for unsigned ints.
--- drivers/vfio/pci/vfio_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vfio/pci/vfio_pci.c +2 -2
@@ -1443,11 +1443,11 @@ static void __init vfio_pci_fill_ids(void) rc =pci_add_dynid (&vfio_pci_driver, vendor, device, subvendor, subdevice, class, class_mask,0 );if (rc) -pr_warn ("failed to add dynamic id [%04hx:%04hx[%04hx:%04hx]] class %#08x/%08x (%d)\n" , +pr_warn ("failed to add dynamic id [%04x:%04x[%04x:%04x]] class %#08x/%08x (%d)\n" , vendor, device, subvendor, subdevice, class, class_mask, rc);else -pr_info ("add [%04hx:%04hx[%04hx:%04hx]] class %#08x/%08x\n" , +pr_info ("add [%04x:%04x[%04x:%04x]] class %#08x/%08x\n" , vendor, device, subvendor, subdevice, class, class_mask); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/99 scsi: core: add new RDAC LENOVO/DE_Series device
In reply to Greg Kroah-Hartman[ Upstream commit 1cb1d2c64e812928fe0a40b8f7e74523d0283dbe ]
Blacklist "Universal Xport" LUN. It's used for in-band storage array management. Also add model to the rdac dh family.
--- drivers/scsi/scsi_devinfo.c | 1 + drivers/scsi/scsi_dh.c | 1 + 2 files changed, 2 insertions(+)
drivers/scsi/scsi_devinfo.c +1 -0
@@ -238,6 +238,7 @@ static struct { {"NETAPP", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"LSI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"ENGENIO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, + {"LENOVO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36}, {"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN}, {"SONY", "TSL", NULL, BLIST_FORCELUN}, /* DDS3 & DDS4 autoloaders */
drivers/scsi/scsi_dh.c +1 -0
@@ -75,6 +75,7 @@ static const struct scsi_dh_blist scsi_dh_blist[] = { {"NETAPP", "INF-01-00", "rdac", }, {"LSI", "INF-01-00", "rdac", }, {"ENGENIO", "INF-01-00", "rdac", }, + {"LENOVO", "DE_Series", "rdac", }, {NULL, NULL, NULL }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/99 scsi: storvsc: Fix calculation of sub-channel count
In reply to Greg Kroah-Hartman[ Upstream commit 382e06d11e075a40b4094b6ef809f8d4bcc7ab2a ]
When the number of sub-channels offered by Hyper-V is >= the number of CPUs in the VM, calculate the correct number of sub-channels. The current code produces one too many.
This scenario arises only when the number of CPUs is artificially restricted (for example, with maxcpus=<n> on the kernel boot line), because Hyper-V normally offers a sub-channel count < number of CPUs. While the current code doesn't break, the extra sub-channel is unbalanced across the CPUs (for example, a total of 5 channels on a VM with 4 CPUs).
--- drivers/scsi/storvsc_drv.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/scsi/storvsc_drv.c +11 -2
@@ -664,13 +664,22 @@ static void handle_sc_creation(struct vmbus_channel *new_sc)static void handle_multichannel_storage (struct hv_device *device,int max_chns) {struct storvsc_device *stor_device; -int num_cpus =num_online_cpus ();int num_sc;struct storvsc_cmd_request *request;struct vstor_packet *vstor_packet;int ret, t; - num_sc = ((max_chns > num_cpus) ? num_cpus : max_chns); +/* +* If the number of CPUs is artificially restricted, such as +* with maxcpus=1 on the kernel boot line, Hyper-V could offer +* sub-channels >= the number of CPUs. These sub-channels +* should not be created. The primary channel is already created +* and assigned to one CPU, so check against # CPUs - 1. +*/ + num_sc =min ((int )(num_online_cpus () -1 ), max_chns); +if (!num_sc) +return ; + stor_device =get_out_stor_device (device);if (!stor_device)return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/99 arm/mach-at91/pm : fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit ba5e60c9b75dec92d4c695b928f69300b17d7686 ]
of_find_device_by_node() takes a reference to the struct device when it finds a match via get_device. When returning error we should call put_device.
--- arch/arm/mach-at91/pm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-at91/pm.c +4 -2
@@ -594,13 +594,13 @@ static int __init at91_pm_backup_init(void) np =of_find_compatible_node (NULL ,NULL ,"atmel,sama5d2-securam" );if (!np) - goto securam_fail; + goto securam_fail_no_ref_dev; pdev =of_find_device_by_node (np);of_node_put (np);if (!pdev) {pr_warn ("%s: failed to find securam device!\n" , __func__); - goto securam_fail; + goto securam_fail_no_ref_dev; } sram_pool =gen_pool_get (&pdev->dev,NULL );
@@ -623,6 +623,8 @@ static int __init at91_pm_backup_init(void)return 0 ; securam_fail: +put_device (&pdev->dev); +securam_fail_no_ref_dev:iounmap (pm_data.sfrbu); pm_data.sfrbu =NULL ;return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/99 arm64: fix wrong check of on_sdei_stack in nmi context
In reply to Greg Kroah-Hartman[ Upstream commit 1c41860864c8ae0387ef7d44f0000e99cbb2e06d ]
When doing unwind_frame() in the context of pseudo nmi (need enable CONFIG_ARM64_PSEUDO_NMI), reaching the bottom of the stack (fp == 0, pc != 0), function on_sdei_stack() will return true while the sdei acpi table is not inited in fact. This will cause a "NULL pointer dereference" oops when going on.
--- arch/arm64/kernel/sdei.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm64/kernel/sdei.c +6 -0
@@ -94,6 +94,9 @@ static bool on_sdei_normal_stack(unsigned long sp, struct stack_info *info)unsigned long low = (unsigned long )raw_cpu_read (sdei_stack_normal_ptr);unsigned long high = low +SDEI_STACK_SIZE ; +if (!low) +return false; +if (sp < low || sp >= high)return false;
@@ -111,6 +114,9 @@ static bool on_sdei_critical_stack(unsigned long sp, struct stack_info *info)unsigned long low = (unsigned long )raw_cpu_read (sdei_stack_critical_ptr);unsigned long high = low +SDEI_STACK_SIZE ; +if (!low) +return false; +if (sp < low || sp >= high)return false;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/99 net: hns: fix KASAN: use-after-free in hns_nic_net_xmit_hw()
In reply to Greg Kroah-Hartman[ Upstream commit 3a39a12ad364a9acd1038ba8da67cd8430f30de4 ]
This patch is trying to fix the issue due to:
[27237.844750] BUG: KASAN: use-after-free in hns_nic_net_xmit_hw+0x708/0xa18[hns_enet_drv]
After hnae_queue_xmit() in hns_nic_net_xmit_hw(), can be interrupted by interruptions, and than call hns_nic_tx_poll_one() to handle the new packets, and free the skb. So, when turn back to hns_nic_net_xmit_hw(), calling skb->len will cause use-after-free.
This patch update tx ring statistics in hns_nic_tx_poll_one() to fix the bug.
--- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_enet.c +3 -2
@@ -376,8 +376,6 @@ netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,wmb ();/* commit all data before submit */ assert (skb->queue_mapping < priv->ae_handle->q_num);hnae_queue_xmit (priv->ae_handle->qs[skb->queue_mapping], buf_num); - ring->stats.tx_pkts++; - ring->stats.tx_bytes += skb->len;return NETDEV_TX_OK ;
@@ -999,6 +997,9 @@ static int hns_nic_tx_poll_one(struct hns_nic_ring_data *ring_data,/* issue prefetch for next Tx descriptor */ prefetch (&ring->desc_cb[ring->next_to_clean]); } +/* update tx ring statistics. */ + ring->stats.tx_pkts += pkts; + ring->stats.tx_bytes += bytes;NETIF_TX_UNLOCK (ring);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/99 net: hns: Use NAPI_POLL_WEIGHT for hns driver
In reply to Greg Kroah-Hartman[ Upstream commit acb1ce15a61154aa501891d67ebf79bc9ea26818 ]
When the HNS driver loaded, always have an error print:
"netif_napi_add() called with weight 256"
This is because the kernel checks the NAPI polling weights requested by drivers and it prints an error message if a driver requests a weight bigger than 64.
So use NAPI_POLL_WEIGHT to fix it.
--- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_enet.c +2 -5
@@ -29,9 +29,6 @@#define SERVICE_TIMER_HZ (1 * HZ) -#define NIC_TX_CLEAN_MAX_NUM 256 -#define NIC_RX_CLEAN_MAX_NUM 64 -#define RCB_IRQ_NOT_INITED 0#define RCB_IRQ_INITED 1#define HNS_BUFFER_SIZE_2048 2048
@@ -2151,7 +2148,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv) hns_nic_tx_fini_pro_v2;netif_napi_add (priv->netdev, &rd->napi, - hns_nic_common_poll,NIC_TX_CLEAN_MAX_NUM ); + hns_nic_common_poll,NAPI_POLL_WEIGHT ); rd->ring->irq_init_flag =RCB_IRQ_NOT_INITED ; }for (i = h->q_num; i < h->q_num *2 ; i++) {
@@ -2164,7 +2161,7 @@ static int hns_nic_init_ring_data(struct hns_nic_priv *priv) hns_nic_rx_fini_pro_v2;netif_napi_add (priv->netdev, &rd->napi, - hns_nic_common_poll,NIC_RX_CLEAN_MAX_NUM ); + hns_nic_common_poll,NAPI_POLL_WEIGHT ); rd->ring->irq_init_flag =RCB_IRQ_NOT_INITED ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/99 net: hns: Fix probabilistic memory overwrite when HNS driver initialized
In reply to Greg Kroah-Hartman[ Upstream commit c0b0984426814f3a9251873b689e67d34d8ccd84 ]
When reboot the system again and again, may cause a memory overwrite.
[ 15.638922] systemd[1]: Reached target Swap. [ 15.667561] tun: Universal TUN/TAP device driver, 1.6 [ 15.676756] Bridge firewalling registered [ 17.344135] Unable to handle kernel paging request at virtual address 0000000200000040 [ 17.352179] Mem abort info: [ 17.355007] ESR = 0x96000004 [ 17.358105] Exception class = DABT (current EL), IL = 32 bits [ 17.364112] SET = 0, FnV = 0 [ 17.367209] EA = 0, S1PTW = 0 [ 17.370393] Data abort info: [ 17.373315] ISV = 0, ISS = 0x00000004 [ 17.377206] CM = 0, WnR = 0 [ 17.380214] user pgtable: 4k pages, 48-bit VAs, pgdp = (____ptrval____) [ 17.386926] [0000000200000040] pgd=0000000000000000 [ 17.391878] Internal error: Oops: 96000004 [#1] SMP [ 17.396824] CPU: 23 PID: 95 Comm: kworker/u130:0 Tainted: G E 4.19.25-1.2.78.aarch64 #1 [ 17.414175] Hardware name: Huawei TaiShan 2280 /BC11SPCD, BIOS 1.54 08/16/2018 [ 17.425615] Workqueue: events_unbound async_run_entry_fn [ 17.435151] pstate: 00000005 (nzcv daif -PAN -UAO) [ 17.444139] pc : __mutex_lock.isra.1+0x74/0x540 [ 17.453002] lr : __mutex_lock.isra.1+0x3c/0x540 [ 17.461701] sp : ffff000100d9bb60 [ 17.469146] x29: ffff000100d9bb60 x28: 0000000000000000 [ 17.478547] x27: 0000000000000000 x26: ffff802fb8945000 [ 17.488063] x25: 0000000000000000 x24: ffff802fa32081a8 [ 17.497381] x23: 0000000000000002 x22: ffff801fa2b15220 [ 17.506701] x21: ffff000009809000 x20: ffff802fa23a0888 [ 17.515980] x19: ffff801fa2b15220 x18: 0000000000000000 [ 17.525272] x17: 0000000200000000 x16: 0000000200000000 [ 17.534511] x15: 0000000000000000 x14: 0000000000000000 [ 17.543652] x13: ffff000008d95db8 x12: 000000000000000d [ 17.552780] x11: ffff000008d95d90 x10: 0000000000000b00 [ 17.561819] x9 : ffff000100d9bb90 x8 : ffff802fb89d6560 [ 17.570829] x7 : 0000000000000004 x6 : 00000004a1801d05 [ 17.579839] x5 : 0000000000000000 x4 : 0000000000000000 [ 17.588852] x3 : ffff802fb89d5a00 x2 : 0000000000000000 [ 17.597734] x1 : 0000000200000000 x0 : 0000000200000000 [ 17.606631] Process kworker/u130:0 (pid: 95, stack limit = 0x(____ptrval____)) [ 17.617438] Call trace: [ 17.623349] __mutex_lock.isra.1+0x74/0x540 [ 17.630927] __mutex_lock_slowpath+0x24/0x30 [ 17.638602] mutex_lock+0x50/0x60 [ 17.645295] drain_workqueue+0x34/0x198 [ 17.652623] __sas_drain_work+0x7c/0x168 [ 17.659903] sas_drain_work+0x60/0x68 [ 17.666947] hisi_sas_scan_finished+0x30/0x40 [hisi_sas_main] [ 17.676129] do_scsi_scan_host+0x70/0xb0 [ 17.683534] do_scan_async+0x20/0x228 [ 17.690586] async_run_entry_fn+0x4c/0x1d0 [ 17.697997] process_one_work+0x1b4/0x3f8 [ 17.705296] worker_thread+0x54/0x470
Every time the call trace is not the same, but the overwrite address is always the same:
Unable to handle kernel paging request at virtual address 0000000200000040
The root cause is, when write the reg XGMAC_MAC_TX_LF_RF_CONTROL_REG, didn't use the io_base offset.
--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c +1 -1
@@ -129,7 +129,7 @@ static void hns_xgmac_lf_rf_control_init(struct mac_driver *mac_drv)dsaf_set_bit (val,XGMAC_UNIDIR_EN_B ,0 );dsaf_set_bit (val,XGMAC_RF_TX_EN_B ,1 );dsaf_set_field (val,XGMAC_LF_RF_INSERT_M ,XGMAC_LF_RF_INSERT_S ,0 ); -dsaf_write_reg (mac_drv,XGMAC_MAC_TX_LF_RF_CONTROL_REG , val); +dsaf_write_dev (mac_drv,XGMAC_MAC_TX_LF_RF_CONTROL_REG , val); }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/99 net: hns: fix ICMP6 neighbor solicitation messages discard problem
In reply to Greg Kroah-Hartman[ Upstream commit f058e46855dcbc28edb2ed4736f38a71fd19cadb ]
ICMP6 neighbor solicitation messages will be discard by the Hip06 chips, because of not setting forwarding pool. Enable promisc mode has the same problem.
This patch fix the wrong forwarding table configs for the multicast vague matching when enable promisc mode, and add forwarding pool for the forwarding table.
--- .../ethernet/hisilicon/hns/hns_dsaf_main.c | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +27 -6
@@ -2750,6 +2750,17 @@ int hns_dsaf_get_regs_count(void)return DSAF_DUMP_REGS_NUM ; } +static int hns_dsaf_get_port_id (u8 port) +{ +if (port <DSAF_SERVICE_NW_NUM ) +return port; + +if (port >=DSAF_BASE_INNER_PORT_NUM ) +return port -DSAF_BASE_INNER_PORT_NUM +DSAF_SERVICE_NW_NUM ; + +return -EINVAL ; +} +static void set_promisc_tcam_enable (struct dsaf_device *dsaf_dev,u32 port) {struct dsaf_tbl_tcam_ucast_cfg tbl_tcam_ucast = {0 ,1 ,0 ,0 ,0x80 };
@@ -2815,23 +2826,33 @@ static void set_promisc_tcam_enable(struct dsaf_device *dsaf_dev, u32 port)memset (&temp_key,0x0 ,sizeof (temp_key)); mask_entry.addr[0 ] =0x01 ;hns_dsaf_set_mac_key (dsaf_dev, &mask_key, mask_entry.in_vlan_id, - port, mask_entry.addr); +0xf , mask_entry.addr); tbl_tcam_mcast.tbl_mcast_item_vld =1 ; tbl_tcam_mcast.tbl_mcast_old_en =0 ; -if (port <DSAF_SERVICE_NW_NUM ) { - mskid = port; - }else if (port >=DSAF_BASE_INNER_PORT_NUM ) { - mskid = port -DSAF_BASE_INNER_PORT_NUM +DSAF_SERVICE_NW_NUM ; - }else { +/* set MAC port to handle multicast */ + mskid =hns_dsaf_get_port_id (port); +if (mskid == -EINVAL ) {dev_err (dsaf_dev->dev,"%s,pnum(%d)error,key(%#x:%#x)\n" , dsaf_dev->ae_dev.name, port, mask_key.high.val, mask_key.low.val);return ; } +dsaf_set_bit (tbl_tcam_mcast.tbl_mcast_port_msk[mskid /32 ], + mskid %32 ,1 ); +/* set pool bit map to handle multicast */ + mskid =hns_dsaf_get_port_id (port_num); +if (mskid == -EINVAL ) { +dev_err (dsaf_dev->dev, +"%s, pool bit map pnum(%d)error,key(%#x:%#x)\n" , + dsaf_dev->ae_dev.name, port_num, + mask_key.high.val, mask_key.low.val); +return ; + }dsaf_set_bit (tbl_tcam_mcast.tbl_mcast_port_msk[mskid /32 ], mskid %32 ,1 ); +memcpy (&temp_key, &mask_key,sizeof (mask_key)); hns_dsaf_tcam_mc_cfg_vague(dsaf_dev, entry_index, &tbl_tcam_data_mc, (struct dsaf_tbl_tcam_data *)(&mask_key),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/99 net: hns: Fix WARNING when remove HNS driver with SMMU enabled
In reply to Greg Kroah-Hartman[ Upstream commit 8601a99d7c0256b7a7fdd1ab14cf6c1f1dfcadc6 ]
When enable SMMU, remove HNS driver will cause a WARNING:
[ 141.924177] WARNING: CPU: 36 PID: 2708 at drivers/iommu/dma-iommu.c:443 __iommu_dma_unmap+0xc0/0xc8 [ 141.954673] Modules linked in: hns_enet_drv(-) [ 141.963615] CPU: 36 PID: 2708 Comm: rmmod Tainted: G W 5.0.0-rc1-28723-gb729c57de95c-dirty #32 [ 141.983593] Hardware name: Huawei D05/D05, BIOS Hisilicon D05 UEFI Nemo 1.8 RC0 08/31/2017 [ 142.000244] pstate: 60000005 (nZCv daif -PAN -UAO) [ 142.009886] pc : __iommu_dma_unmap+0xc0/0xc8 [ 142.018476] lr : __iommu_dma_unmap+0xc0/0xc8 [ 142.027066] sp : ffff000013533b90 [ 142.033728] x29: ffff000013533b90 x28: ffff8013e6983600 [ 142.044420] x27: 0000000000000000 x26: 0000000000000000 [ 142.055113] x25: 0000000056000000 x24: 0000000000000015 [ 142.065806] x23: 0000000000000028 x22: ffff8013e66eee68 [ 142.076499] x21: ffff8013db919800 x20: 0000ffffefbff000 [ 142.087192] x19: 0000000000001000 x18: 0000000000000007 [ 142.097885] x17: 000000000000000e x16: 0000000000000001 [ 142.108578] x15: 0000000000000019 x14: 363139343a70616d [ 142.119270] x13: 6e75656761705f67 x12: 0000000000000000 [ 142.129963] x11: 00000000ffffffff x10: 0000000000000006 [ 142.140656] x9 : 1346c1aa88093500 x8 : ffff0000114de4e0 [ 142.151349] x7 : 6662666578303d72 x6 : ffff0000105ffec8 [ 142.162042] x5 : 0000000000000000 x4 : 0000000000000000 [ 142.172734] x3 : 00000000ffffffff x2 : ffff0000114de500 [ 142.183427] x1 : 0000000000000000 x0 : 0000000000000035 [ 142.194120] Call trace: [ 142.199030] __iommu_dma_unmap+0xc0/0xc8 [ 142.206920] iommu_dma_unmap_page+0x20/0x28 [ 142.215335] __iommu_unmap_page+0x40/0x60 [ 142.223399] hnae_unmap_buffer+0x110/0x134 [ 142.231639] hnae_free_desc+0x6c/0x10c [ 142.239177] hnae_fini_ring+0x14/0x34 [ 142.246540] hnae_fini_queue+0x2c/0x40 [ 142.254080] hnae_put_handle+0x38/0xcc [ 142.261619] hns_nic_dev_remove+0x54/0xfc [hns_enet_drv] [ 142.272312] platform_drv_remove+0x24/0x64 [ 142.280552] device_release_driver_internal+0x17c/0x20c [ 142.291070] driver_detach+0x4c/0x90 [ 142.298259] bus_remove_driver+0x5c/0xd8 [ 142.306148] driver_unregister+0x2c/0x54 [ 142.314037] platform_driver_unregister+0x10/0x18 [ 142.323505] hns_nic_dev_driver_exit+0x14/0xf0c [hns_enet_drv] [ 142.335248] __arm64_sys_delete_module+0x214/0x25c [ 142.344891] el0_svc_common+0xb0/0x10c [ 142.352430] el0_svc_handler+0x24/0x80 [ 142.359968] el0_svc+0x8/0x7c0 [ 142.366104] ---[ end trace 60ad1cd58e63c407 ]---
The tx ring buffer map when xmit and unmap when xmit done. So in hnae_init_ring() did not map tx ring buffer, but in hnae_fini_ring() have a unmap operation for tx ring buffer, which is already unmapped when xmit done, than cause this WARNING.
The hnae_alloc_buffers() is called in hnae_init_ring(), so the hnae_free_buffers() should be in hnae_fini_ring(), not in hnae_free_desc().
In hnae_fini_ring(), adds a check is_rx_ring() as in hnae_init_ring(). When the ring buffer is tx ring, adds a piece of code to ensure that the tx ring is unmap.
--- drivers/net/ethernet/hisilicon/hns/hnae.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns/hnae.c +3 -1
@@ -150,7 +150,6 @@ static int hnae_alloc_buffers(struct hnae_ring *ring)/* free desc along with its attached buffer */ static void hnae_free_desc (struct hnae_ring *ring) { -hnae_free_buffers (ring);dma_unmap_single (ring_to_dev (ring), ring->desc_dma_addr, ring->desc_num *sizeof (ring->desc[0 ]),ring_to_dma_dir (ring));
@@ -183,6 +182,9 @@ static int hnae_alloc_desc(struct hnae_ring *ring)/* fini ring, also free the buffer for the ring */ static void hnae_fini_ring (struct hnae_ring *ring) { +if (is_rx_ring (ring)) +hnae_free_buffers (ring); +hnae_free_desc (ring);kfree (ring->desc_cb); ring->desc_cb =NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/99 libcxgb: fix incorrect ppmax calculation
In reply to Greg Kroah-Hartman[ Upstream commit cc5a726c79158bd307150e8d4176ec79b52001ea ]
BITS_TO_LONGS() uses DIV_ROUND_UP() because of this ppmax value can be greater than available per cpu page pods.
This patch removes BITS_TO_LONGS() to fix this issue.
--- drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c +8 -1
@@ -354,7 +354,10 @@ static struct cxgbi_ppm_pool *ppm_alloc_cpu_pool(unsigned int *total, ppmax = max;/* pool size must be multiple of unsigned long */ - bmap =BITS_TO_LONGS (ppmax); + bmap = ppmax / BITS_PER_TYPE(unsigned long); +if (!bmap) +return NULL ; + ppmax = (bmap *sizeof (unsigned long )) <<3 ; alloc_sz =sizeof (*pools) +sizeof (unsigned long ) * bmap;
@@ -402,6 +405,10 @@ int cxgbi_ppm_init(void **ppm_pp, struct net_device *ndev,if (reserve_factor) { ppmax_pool = ppmax / reserve_factor; pool =ppm_alloc_cpu_pool (&ppmax_pool, &pool_index_max); +if (!pool) { + ppmax_pool =0 ; + reserve_factor =0 ; + }pr_debug ("%s: ppmax %u, cpu total %u, per cpu %u.\n" , ndev->name, ppmax, ppmax_pool, pool_index_max);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/99 KVM: SVM: prevent DBG_DECRYPT and DBG_ENCRYPT overflow
In reply to Greg Kroah-Hartman[ Upstream commit b86bc2858b389255cd44555ce4b1e427b2b770c0 ]
This ensures that the address and length provided to DBG_DECRYPT and DBG_ENCRYPT do not cause an overflow.
At the same time, pass the actual number of pages pinned in memory to sev_unpin_memory() as a cleanup.
--- arch/x86/kvm/svm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/x86/kvm/svm.c +9 -3
@@ -6789,7 +6789,8 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec)struct page **src_p, **dst_p;struct kvm_sev_dbg debug;unsigned long n; -int ret, size; +unsigned int size; +int ret;if (!sev_guest (kvm))return -ENOTTY ;
@@ -6797,6 +6798,11 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec)if (copy_from_user (&debug, (void __user *)(uintptr_t )argp->data,sizeof (debug)))return -EFAULT ; +if (!debug.len || debug.src_uaddr + debug.len < debug.src_uaddr) +return -EINVAL ; +if (!debug.dst_uaddr) +return -EINVAL ; + vaddr = debug.src_uaddr; size = debug.len; vaddr_end = vaddr + size;
@@ -6847,8 +6853,8 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec) dst_vaddr, len, &argp->error); -sev_unpin_memory (kvm, src_p,1 ); -sev_unpin_memory (kvm, dst_p,1 ); +sev_unpin_memory (kvm, src_p, n); +sev_unpin_memory (kvm, dst_p, n);if (ret) goto err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/99 kmemleak: powerpc: skip scanning holes in the .bss section
In reply to Greg Kroah-Hartman[ Upstream commit 298a32b132087550d3fa80641ca58323c5dfd4d9 ]
Commit 2d4f567103ff ("KVM: PPC: Introduce kvm_tmp framework") adds kvm_tmp[] into the .bss section and then free the rest of unused spaces back to the page allocator.
kernel_init
kvm_guest_init
kvm_free_tmp
free_reserved_area
free_unref_page
free_unref_page_prepare
With DEBUG_PAGEALLOC=y, it will unmap those pages from kernel. As the result, kmemleak scan will trigger a panic when it scans the .bss section with unmapped pages.
This patch creates dedicated kmemleak objects for the .data, .bss and potentially .data..ro_after_init sections to allow partial freeing via the kmemleak_free_part() in the powerpc kvm_free_tmp() function.
--- arch/powerpc/kernel/kvm.c | 7 +++++++ mm/kmemleak.c | 16 +++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-)
arch/powerpc/kernel/kvm.c +7 -0
@@ -22,6 +22,7 @@#include <linux/kvm_host.h> #include <linux/init.h> #include <linux/export.h> +#include <linux/kmemleak.h> #include <linux/kvm_para.h> #include <linux/slab.h> #include <linux/of.h>
@@ -712,6 +713,12 @@ static void kvm_use_magic_page(void)static __init void kvm_free_tmp (void ) { +/* +* Inform kmemleak about the hole in the .bss section since the +* corresponding pages will be unmapped with DEBUG_PAGEALLOC=y. +*/ +kmemleak_free_part (&kvm_tmp[kvm_tmp_index], +ARRAY_SIZE (kvm_tmp) - kvm_tmp_index);free_reserved_area (&kvm_tmp[kvm_tmp_index], &kvm_tmp[ARRAY_SIZE (kvm_tmp)],-1 ,NULL ); }
mm/kmemleak.c +11 -5
@@ -1501,11 +1501,6 @@ static void kmemleak_scan(void) }rcu_read_unlock (); -/* data/bss scanning */ -scan_large_block (_sdata, _edata); -scan_large_block (__bss_start, __bss_stop); -scan_large_block (__start_ro_after_init, __end_ro_after_init); -#ifdef CONFIG_SMP /* per-cpu sections scanning */ for_each_possible_cpu (i)
@@ -2036,6 +2031,17 @@ void __init kmemleak_init(void) }local_irq_restore (flags); +/* register the data/bss sections */ +create_object ((unsigned long )_sdata, _edata - _sdata, +KMEMLEAK_GREY ,GFP_ATOMIC ); +create_object ((unsigned long )__bss_start, __bss_stop - __bss_start, +KMEMLEAK_GREY ,GFP_ATOMIC ); +/* only register .data..ro_after_init if not within .data */ +if (__start_ro_after_init < _sdata || __end_ro_after_init > _edata) +create_object ((unsigned long )__start_ro_after_init, + __end_ro_after_init - __start_ro_after_init, +KMEMLEAK_GREY ,GFP_ATOMIC ); +/* * This is the point where tracking allocations is safe. Automatic * scanning is started during the late initcall. Add the early logged
Signature · 1 line
2.20.1
Re: [PATCH 4.19 62/99] kmemleak: powerpc: skip scanning holes in the .bss section
Hi,
Quoted 34 lines · Greg Kroah-Hartman
[ Upstream commit
298a32b132087550d3fa80641ca58323c5dfd4d9]Commit
2d4f567103ff("KVM: PPC: Introducekvm_tmpframework") adds kvm_tmp[] into the .bss section and then free the rest of unused spaces back to the page allocator.
kernel_init
kvm_guest_init
kvm_free_tmp
free_reserved_area
free_unref_page
free_unref_page_prepareWith DEBUG_PAGEALLOC=y, it will unmap those pages from kernel. As the result, kmemleak scan will trigger a panic when it scans the .bss section with unmapped pages.
This patch creates dedicated kmemleak objects for the .data, .bss and potentially .data..ro_after_init sections to allow partial freeing via the
kmemleak_free_part()in the powerpckvm_free_tmp()function.Signed-off-by Catalin Marinas <[email protected]>Reported-by Qian Cai <[email protected]>Tested-by Qian Cai <[email protected]>Cc Paul Mackerras <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Avi Kivity <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Radim Krcmar <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 4 lines
--- arch/powerpc/kernel/kvm.c | 7 +++++++ mm/kmemleak.c | 16 +++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-)
This commit has other problems, so we also need the following commits:
commit dce5b0bdeec61bdbee56121ceb1d014151d5cab1
Author: Arnd Bergmann <[email protected]> Date: Thu Apr 18 17:50:48 2019 -0700
mm/kmemleak.c: fix unused-function warning
The only references outside of the #ifdef have been removed, so now we get a warning in non-SMP configurations:
mm/kmemleak.c:1404:13: error: unused function 'scan_large_block' [-Werror,-Wunused-function]
Add a new #ifdef around it.
Please apply this commit.
Best regards,
Nobuhiro
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 62/99] kmemleak: powerpc: skip scanning holes in the .bss section
Quoted 66 lines · Nobuhiro Iwamatsu
Hi,
Quoted 34 lines · Greg Kroah-Hartman
[ Upstream commit
298a32b132087550d3fa80641ca58323c5dfd4d9]Commit
2d4f567103ff("KVM: PPC: Introducekvm_tmpframework") adds kvm_tmp[] into the .bss section and then free the rest of unused spaces back to the page allocator.
kernel_init
kvm_guest_init
kvm_free_tmp
free_reserved_area
free_unref_page
free_unref_page_prepareWith DEBUG_PAGEALLOC=y, it will unmap those pages from kernel. As the result, kmemleak scan will trigger a panic when it scans the .bss section with unmapped pages.
This patch creates dedicated kmemleak objects for the .data, .bss and potentially .data..ro_after_init sections to allow partial freeing via the
kmemleak_free_part()in the powerpckvm_free_tmp()function.Signed-off-by Catalin Marinas <[email protected]>Reported-by Qian Cai <[email protected]>Tested-by Qian Cai <[email protected]>Cc Paul Mackerras <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Avi Kivity <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Radim Krcmar <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>Signed-off-by Sasha Levin <[email protected]>Quoted 4 lines
--- arch/powerpc/kernel/kvm.c | 7 +++++++ mm/kmemleak.c | 16 +++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-)This commit has other problems, so we also need the following commits:
commit
dce5b0bdeec61bdbee56121ceb1d014151d5cab1Author: Arnd Bergmann <[email protected]> Date: Thu Apr 18 17:50:48 2019 -0700
mm/kmemleak.c: fix unused-function warningThe only references outside of the #ifdef have been removed, so now we get a warning in non-SMP configurations:
mm/kmemleak.c:1404:13: error: unused function 'scan_large_block' [-Werror,-Wunused-function]Add a new #ifdef around it.
Fixes 298a32b13208 ("kmemleak: powerpc: skip scanning holes in the .bss section")Signed-off-by Arnd Bergmann <[email protected]>Acked-by Catalin Marinas <[email protected]>Cc Vincent Whitchurch <[email protected]>Cc Michael Ellerman <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>
Quoted 1 line
Please apply this commit.
Now queued up, thanks!
greg k-h
Greg Kroah-Hartman
maintainerPATCH 63/99 hugetlbfs: fix memory leak for resv_map
In reply to Greg Kroah-Hartman[ Upstream commit 58b6e5e8f1addd44583d61b0a03c0f5519527e35 ]
When mknod is used to create a block special file in hugetlbfs, it will allocate an inode and kmalloc a 'struct resv_map' via resv_map_alloc(). inode->i_mapping->private_data will point the newly allocated resv_map. However, when the device special file is opened bd_acquire() will set inode->i_mapping to bd_inode->i_mapping. Thus the pointer to the allocated resv_map is lost and the structure is leaked.
Programs to reproduce:
mount -t hugetlbfs nodev hugetlbfs
mknod hugetlbfs/dev b 0 0
exec 30<> hugetlbfs/dev
umount hugetlbfs/
resv_map structures are only needed for inodes which can have associated page allocations. To fix the leak, only allocate resv_map for those inodes which could possibly be associated with page allocations.
--- fs/hugetlbfs/inode.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
fs/hugetlbfs/inode.c +14 -6
@@ -741,11 +741,17 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, umode_t mode, dev_t dev) {struct inode *inode; -struct resv_map *resv_map; +struct resv_map *resv_map =NULL ; - resv_map =resv_map_alloc (); -if (!resv_map) -return NULL ; +/* +* Reserve maps are only needed for inodes that can have associated +* page allocations. +*/ +if (S_ISREG (mode) ||S_ISLNK (mode)) { + resv_map =resv_map_alloc (); +if (!resv_map) +return NULL ; + } inode =new_inode (sb);if (inode) {
@@ -780,8 +786,10 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb,break ; }lockdep_annotate_inode_mutex_key (inode); - }else -kref_put (&resv_map->refs, resv_map_release); + }else { +if (resv_map) +kref_put (&resv_map->refs, resv_map_release); + }return inode; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/99 sh: fix multiple function definition build errors
In reply to Greg Kroah-Hartman[ Upstream commit acaf892ecbf5be7710ae05a61fd43c668f68ad95 ]
Many of the sh CPU-types have their own plat_irq_setup() and arch_init_clk_ops() functions, so these same (empty) functions in arch/sh/boards/of-generic.c are not needed and cause build errors.
If there is some case where these empty functions are needed, they can be retained by marking them as "__weak" while at the same time making builds that do not need them succeed.
Fixes these build errors:
arch/sh/boards/of-generic.o: In function `plat_irq_setup':
(.init.text+0x134): multiple definition of plat_irq_setup' arch/sh/kernel/cpu/sh2/setup-sh7619.o:(.init.text+0x30): first defined here arch/sh/boards/of-generic.o: In function arch_init_clk_ops':
(.init.text+0x118): multiple definition of `arch_init_clk_ops' arch/sh/kernel/cpu/sh2/clock-sh7619.o:(.init.text+0x0): first defined here
--- arch/sh/boards/of-generic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/sh/boards/of-generic.c +2 -2
@@ -175,10 +175,10 @@ static struct sh_machine_vector __initmv sh_of_generic_mv = {struct sh_clk_ops ; -void __init arch_init_clk_ops (struct sh_clk_ops **ops,int idx) +void __init __weak arch_init_clk_ops (struct sh_clk_ops **ops,int idx) { } -void __init plat_irq_setup (void ) +void __init __weak plat_irq_setup (void ) { }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/99 xsysace: Fix error handling in ace_setup
In reply to Greg Kroah-Hartman[ Upstream commit 47b16820c490149c2923e8474048f2c6e7557cab ]
If xace hardware reports a bad version number, the error handling code in ace_setup() calls put_disk(), followed by queue cleanup. However, since the disk data structure has the queue pointer set, put_disk() also cleans and releases the queue. This results in blk_cleanup_queue() accessing an already released data structure, which in turn may result in a crash such as the following.
[ 10.681671] BUG: Kernel NULL pointer dereference at 0x00000040 [ 10.681826] Faulting instruction address: 0xc0431480 [ 10.682072] Oops: Kernel access of bad area, sig: 11 [#1] [ 10.682251] BE PAGE_SIZE=4K PREEMPT Xilinx Virtex440 [ 10.682387] Modules linked in: [ 10.682528] CPU: 0 PID: 1 Comm: swapper Tainted: G W 5.0.0-rc6-next-20190218+ #2 [ 10.682733] NIP: c0431480 LR: c043147c CTR: c0422ad8 [ 10.682863] REGS: cf82fbe0 TRAP: 0300 Tainted: G W (5.0.0-rc6-next-20190218+) [ 10.683065] MSR: 00029000 <CE,EE,ME> CR: 22000222 XER: 00000000 [ 10.683236] DEAR: 00000040 ESR: 00000000 [ 10.683236] GPR00: c043147c cf82fc90 cf82ccc0 00000000 00000000 00000000 00000002 00000000 [ 10.683236] GPR08: 00000000 00000000 c04310bc 00000000 22000222 00000000 c0002c54 00000000 [ 10.683236] GPR16: 00000000 00000001 c09aa39c c09021b0 c09021dc 00000007 c0a68c08 00000000 [ 10.683236] GPR24: 00000001 ced6d400 ced6dcf0 c0815d9c 00000000 00000000 00000000 cedf0800 [ 10.684331] NIP [c0431480] blk_mq_run_hw_queue+0x28/0x114 [ 10.684473] LR [c043147c] blk_mq_run_hw_queue+0x24/0x114 [ 10.684602] Call Trace: [ 10.684671] [cf82fc90] [c043147c] blk_mq_run_hw_queue+0x24/0x114 (unreliable) [ 10.684854] [cf82fcc0] [c04315bc] blk_mq_run_hw_queues+0x50/0x7c [ 10.685002] [cf82fce0] [c0422b24] blk_set_queue_dying+0x30/0x68 [ 10.685154] [cf82fcf0] [c0423ec0] blk_cleanup_queue+0x34/0x14c [ 10.685306] [cf82fd10] [c054d73c] ace_probe+0x3dc/0x508 [ 10.685445] [cf82fd50] [c052d740] platform_drv_probe+0x4c/0xb8 [ 10.685592] [cf82fd70] [c052abb0] really_probe+0x20c/0x32c [ 10.685728] [cf82fda0] [c052ae58] driver_probe_device+0x68/0x464 [ 10.685877] [cf82fdc0] [c052b500] device_driver_attach+0xb4/0xe4 [ 10.686024] [cf82fde0] [c052b5dc] __driver_attach+0xac/0xfc [ 10.686161] [cf82fe00] [c0528428] bus_for_each_dev+0x80/0xc0 [ 10.686314] [cf82fe30] [c0529b3c] bus_add_driver+0x144/0x234 [ 10.686457] [cf82fe50] [c052c46c] driver_register+0x88/0x15c [ 10.686610] [cf82fe60] [c09de288] ace_init+0x4c/0xac [ 10.686742] [cf82fe80] [c0002730] do_one_initcall+0xac/0x330 [ 10.686888] [cf82fee0] [c09aafd0] kernel_init_freeable+0x34c/0x478 [ 10.687043] [cf82ff30] [c0002c6c] kernel_init+0x18/0x114 [ 10.687188] [cf82ff40] [c000f2f0] ret_from_kernel_thread+0x14/0x1c [ 10.687349] Instruction dump: [ 10.687435] 3863ffd4 4bfffd70 9421ffd0 7c0802a6 93c10028 7c9e2378 93e1002c 38810008 [ 10.687637] 7c7f1b78 90010034 4bfffc25 813f008c <81290040> 75290100 4182002c 80810008 [ 10.688056] ---[ end trace 13c9ff51d41b9d40 ]---
Fix the problem by setting the disk queue pointer to NULL before calling put_disk(). A more comprehensive fix might be to rearrange the code to check the hardware version before initializing data structures, but I don't know if this would have undesirable side effects, and it would increase the complexity of backporting the fix to older kernels.
--- drivers/block/xsysace.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/block/xsysace.c +2 -0
@@ -1063,6 +1063,8 @@ static int ace_setup(struct ace_device *ace)return 0 ; err_read: +/* prevent double queue cleanup */ + ace->gd->queue =NULL ;put_disk (ace->gd); err_alloc_disk:blk_cleanup_queue (ace->queue);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/99 fs: stream_open - opener for stream-like files so that read and write can run simultaneously without deadlock
In reply to Greg Kroah-Hartman[ Upstream commit 10dce8af34226d90fa56746a934f8da5dcdba3df ]
Commit 9c225f2655e3 ("vfs: atomic f_pos accesses as per POSIX") added locking for file.f_pos access and in particular made concurrent read and write not possible - now both those functions take f_pos lock for the whole run, and so if e.g. a read is blocked waiting for data, write will deadlock waiting for that read to complete.
This caused regression for stream-like files where previously read and write could run simultaneously, but after that patch could not do so anymore. See e.g. commit 581d21a2d02a ("xenbus: fix deadlock on writes to /proc/xen/xenbus") which fixes such regression for particular case of /proc/xen/xenbus.
The patch that added f_pos lock in 2014 did so to guarantee POSIX thread safety for read/write/lseek and added the locking to file descriptors of all regular files. In 2014 that thread-safety problem was not new as it was already discussed earlier in 2006.
However even though 2006'th version of Linus's patch was adding f_pos locking "only for files that are marked seekable with FMODE_LSEEK (thus avoiding the stream-like objects like pipes and sockets)", the 2014 version - the one that actually made it into the tree as 9c225f2655e3 - is doing so irregardless of whether a file is seekable or not.
See
https://lore.kernel.org/lkml/[email protected]/ https://lwn.net/Articles/180387 https://lwn.net/Articles/180396
for historic context.
The reason that it did so is, probably, that there are many files that are marked non-seekable, but e.g. their read implementation actually depends on knowing current position to correctly handle the read. Some examples:
kernel/power/user.c snapshot_read fs/debugfs/file.c u32_array_read fs/fuse/control.c fuse_conn_waiting_read + ... drivers/hwmon/asus_atk0110.c atk_debugfs_ggrp_read arch/s390/hypfs/inode.c hypfs_read_iter ...
Despite that, many nonseekable_open users implement read and write with pure stream semantics - they don't depend on passed ppos at all. And for those cases where read could wait for something inside, it creates a situation similar to xenbus - the write could be never made to go until read is done, and read is waiting for some, potentially external, event, for potentially unbounded time -> deadlock.
Besides xenbus, there are 14 such places in the kernel that I've found with semantic patch (see below):
drivers/xen/evtchn.c:667:8-24: ERROR: evtchn_fops: .read() can deadlock .write() drivers/isdn/capi/capi.c:963:8-24: ERROR: capi_fops: .read() can deadlock .write() drivers/input/evdev.c:527:1-17: ERROR: evdev_fops: .read() can deadlock .write() drivers/char/pcmcia/cm4000_cs.c:1685:7-23: ERROR: cm4000_fops: .read() can deadlock .write() net/rfkill/core.c:1146:8-24: ERROR: rfkill_fops: .read() can deadlock .write() drivers/s390/char/fs3270.c:488:1-17: ERROR: fs3270_fops: .read() can deadlock .write() drivers/usb/misc/ldusb.c:310:1-17: ERROR: ld_usb_fops: .read() can deadlock .write() drivers/hid/uhid.c:635:1-17: ERROR: uhid_fops: .read() can deadlock .write() net/batman-adv/icmp_socket.c:80:1-17: ERROR: batadv_fops: .read() can deadlock .write() drivers/media/rc/lirc_dev.c:198:1-17: ERROR: lirc_fops: .read() can deadlock .write() drivers/leds/uleds.c:77:1-17: ERROR: uleds_fops: .read() can deadlock .write() drivers/input/misc/uinput.c:400:1-17: ERROR: uinput_fops: .read() can deadlock .write() drivers/infiniband/core/user_mad.c:985:7-23: ERROR: umad_fops: .read() can deadlock .write() drivers/gnss/core.c:45:1-17: ERROR: gnss_fops: .read() can deadlock .write()
In addition to the cases above another regression caused by f_pos locking is that now FUSE filesystems that implement open with FOPEN_NONSEEKABLE flag, can no longer implement bidirectional stream-like files - for the same reason as above e.g. read can deadlock write locking on file.f_pos in the kernel.
FUSE's FOPEN_NONSEEKABLE was added in 2008 in a7c1b990f715 ("fuse:
implement nonseekable open") to support OSSPD. OSSPD implements /dev/dsp in userspace with FOPEN_NONSEEKABLE flag, with corresponding read and write routines not depending on current position at all, and with both read and write being potentially blocking operations:
See
https://github.com/libfuse/osspd https://lwn.net/Articles/308445 https://github.com/libfuse/osspd/blob/14a9cff0/osspd.c#L1406 https://github.com/libfuse/osspd/blob/14a9cff0/osspd.c#L1438-L1477 https://github.com/libfuse/osspd/blob/14a9cff0/osspd.c#L1479-L1510
Corresponding libfuse example/test also describes FOPEN_NONSEEKABLE as "somewhat pipe-like files ..." with read handler not using offset. However that test implements only read without write and cannot exercise the deadlock scenario:
https://github.com/libfuse/libfuse/blob/fuse-3.4.2-3-ga1bff7d/example/poll.c#L124-L131 https://github.com/libfuse/libfuse/blob/fuse-3.4.2-3-ga1bff7d/example/poll.c#L146-L163 https://github.com/libfuse/libfuse/blob/fuse-3.4.2-3-ga1bff7d/example/poll.c#L209-L216
I've actually hit the read vs write deadlock for real while implementing my FUSE filesystem where there is /head/watch file, for which open creates separate bidirectional socket-like stream in between filesystem and its user with both read and write being later performed simultaneously. And there it is semantically not easy to split the stream into two separate read-only and write-only channels:
https://lab.nexedi.com/kirr/wendelin.core/blob/f13aa600/wcfs/wcfs.go#L88-169
Let's fix this regression. The plan is:
1. We can't change nonseekable_open to include &~FMODE_ATOMIC_POS - doing so would break many in-kernel nonseekable_open users which actually use ppos in read/write handlers.
2. Add stream_open() to kernel to open stream-like non-seekable file descriptors. Read and write on such file descriptors would never use nor change ppos. And with that property on stream-like files read and write will be running without taking f_pos lock - i.e. read and write could be running simultaneously.
3. With semantic patch search and convert to stream_open all in-kernel nonseekable_open users for which read and write actually do not depend on ppos and where there is no other methods in file_operations which assume @offset access.
4. Add FOPEN_STREAM to fs/fuse/ and open in-kernel file-descriptors via steam_open if that bit is present in filesystem open reply.
It was tempting to change fs/fuse/ open handler to use stream_open instead of nonseekable_open on just FOPEN_NONSEEKABLE flags, but grepping through Debian codesearch shows users of FOPEN_NONSEEKABLE, and in particular GVFS which actually uses offset in its read and write handlers
https://codesearch.debian.net/search?q=-%3Enonseekable+%3D https://gitlab.gnome.org/GNOME/gvfs/blob/1.40.0-6-gcbc54396/client/gvfsfusedaemon.c#L1080 https://gitlab.gnome.org/GNOME/gvfs/blob/1.40.0-6-gcbc54396/client/gvfsfusedaemon.c#L1247-1346 https://gitlab.gnome.org/GNOME/gvfs/blob/1.40.0-6-gcbc54396/client/gvfsfusedaemon.c#L1399-1481
so if we would do such a change it will break a real user.
5. Add stream_open and FOPEN_STREAM handling to stable kernels starting from v3.14+ (the kernel where 9c225f2655 first appeared).
This will allow to patch OSSPD and other FUSE filesystems that provide stream-like files to return FOPEN_STREAM | FOPEN_NONSEEKABLE in their open handler and this way avoid the deadlock on all kernel versions. This should work because fs/fuse/ ignores unknown open flags returned from a filesystem and so passing FOPEN_STREAM to a kernel that is not aware of this flag cannot hurt. In turn the kernel that is not aware of FOPEN_STREAM will be < v3.14 where just FOPEN_NONSEEKABLE is sufficient to implement streams without read vs write deadlock.
This patch adds stream_open, converts /proc/xen/xenbus to it and adds semantic patch to automatically locate in-kernel places that are either required to be converted due to read vs write deadlock, or that are just safe to be converted because read and write do not use ppos and there are no other funky methods in file_operations.
Regarding semantic patch I've verified each generated change manually - that it is correct to convert - and each other nonseekable_open instance left - that it is either not correct to convert there, or that it is not converted due to current stream_open.cocci limitations.
The script also does not convert files that should be valid to convert, but that currently have .llseek = noop_llseek or generic_file_llseek for unknown reason despite file being opened with nonseekable_open (e.g. drivers/input/mousedev.c)
--- drivers/xen/xenbus/xenbus_dev_frontend.c | 4 +- fs/open.c | 18 ++ fs/read_write.c | 5 +- include/linux/fs.h | 4 + scripts/coccinelle/api/stream_open.cocci | 363 +++++++++++++++++++++++ 5 files changed, 389 insertions(+), 5 deletions(-) create mode 100644 scripts/coccinelle/api/stream_open.cocci
drivers/xen/xenbus/xenbus_dev_frontend.c +1 -3
@@ -622,9 +622,7 @@ static int xenbus_file_open(struct inode *inode, struct file *filp)if (xen_store_evtchn ==0 )return -ENOENT ; -nonseekable_open (inode, filp); - - filp->f_mode &= ~FMODE_ATOMIC_POS ;/* cdev-style semantics */ +stream_open (inode, filp); u =kzalloc (sizeof (*u),GFP_KERNEL );if (u ==NULL )
fs/open.c +18 -0
@@ -1215,3 +1215,21 @@ int nonseekable_open(struct inode *inode, struct file *filp) }EXPORT_SYMBOL (nonseekable_open); + +/* +* stream_open is used by subsystems that want stream-like file descriptors. +* Such file descriptors are not seekable and don't have notion of position +* (file.f_pos is always 0). Contrary to file descriptors of other regular +* files, .read() and .write() can run simultaneously. +* +* stream_open never fails and is marked to return int so that it could be +* directly used as file_operations.open . +*/ +int stream_open (struct inode *inode,struct file *filp) +{ + filp->f_mode &= ~(FMODE_LSEEK |FMODE_PREAD |FMODE_PWRITE |FMODE_ATOMIC_POS ); + filp->f_mode |=FMODE_STREAM ; +return 0 ; +} + +EXPORT_SYMBOL (stream_open);
fs/read_write.c +3 -2
@@ -560,12 +560,13 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_static inline loff_t file_pos_read (struct file *file) { -return file->f_pos; +return file->f_mode &FMODE_STREAM ?0 : file->f_pos; }static inline void file_pos_write (struct file *file,loff_t pos) { - file->f_pos = pos; +if ((file->f_mode &FMODE_STREAM ) ==0 ) + file->f_pos = pos; }ssize_t ksys_read (unsigned int fd,char __user *buf,size_t count)
include/linux/fs.h +4 -0
@@ -153,6 +153,9 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,#define FMODE_OPENED ((__force fmode_t)0x80000)#define FMODE_CREATED ((__force fmode_t)0x100000) +/* File is stream-like */ +#define FMODE_STREAM ((__force fmode_t)0x200000) +/* File was opened by fanotify and shouldn't generate fanotify events */ #define FMODE_NONOTIFY ((__force fmode_t)0x4000000)
@@ -3019,6 +3022,7 @@ extern loff_t no_seek_end_llseek_size(struct file *, loff_t, int, loff_t);extern loff_t no_seek_end_llseek (struct file *,loff_t ,int );extern int generic_file_open (struct inode * inode,struct file * filp);extern int nonseekable_open (struct inode * inode,struct file * filp); +extern int stream_open (struct inode * inode,struct file * filp);#ifdef CONFIG_BLOCK typedef void (dio_submit_t)(struct bio *bio, struct inode *inode,
scripts/coccinelle/api/stream_open.cocci new file +363 -0
363 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/99 ARM: orion: dont use using 64-bit DMA masks
In reply to Greg Kroah-Hartman[ Upstream commit cd92d74d67c811dc22544430b9ac3029f5bd64c5 ]
clang warns about statically defined DMA masks from the DMA_BIT_MASK macro with length 64:
arch/arm/plat-orion/common.c:625:29: error: shift count >= width of type [-Werror,-Wshift-count-overflow]
.coherent_dma_mask = DMA_BIT_MASK(64),
^~~~~~~~~~~~~~~~include/linux/dma-mapping.h:141:54: note: expanded from macro 'DMA_BIT_MASK'
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
The ones in orion shouldn't really be 64 bit masks, so changing them to what the driver can support avoids the warning.
--- arch/arm/plat-orion/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/plat-orion/common.c +2 -2
@@ -622,7 +622,7 @@ static struct platform_device orion_xor0_shared = { .resource = orion_xor0_shared_resources, .dev = { .dma_mask = &orion_xor_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = &orion_xor0_pdata, }, };
@@ -683,7 +683,7 @@ static struct platform_device orion_xor1_shared = { .resource = orion_xor1_shared_resources, .dev = { .dma_mask = &orion_xor_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = &orion_xor1_pdata, }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/99 ARM: iop: dont use using 64-bit DMA masks
In reply to Greg Kroah-Hartman[ Upstream commit 2125801ccce19249708ca3245d48998e70569ab8 ]
clang warns about statically defined DMA masks from the DMA_BIT_MASK macro with length 64:
arch/arm/mach-iop13xx/setup.c:303:35: error: shift count >= width of type [-Werror,-Wshift-count-overflow]
static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64);
^~~~~~~~~~~~~~~~
include/linux/dma-mapping.h:141:54: note: expanded from macro 'DMA_BIT_MASK'
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
^ ~~~The ones in iop shouldn't really be 64 bit masks, so changing them to what the driver can support avoids the warning.
--- arch/arm/mach-iop13xx/setup.c | 8 ++++---- arch/arm/mach-iop13xx/tpmi.c | 10 +++++----- arch/arm/plat-iop/adma.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-)
arch/arm/mach-iop13xx/setup.c +4 -4
@@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = { } }; -static u64 iop13xx_adma_dmamask =DMA_BIT_MASK (64 ); +static u64 iop13xx_adma_dmamask =DMA_BIT_MASK (32 );static struct iop_adma_platform_data iop13xx_adma_0_data = { .hw_id =0 , .pool_size =PAGE_SIZE ,
@@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = { .resource = iop13xx_adma_0_resources, .dev = { .dma_mask = &iop13xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop13xx_adma_0_data, }, };
@@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = { .resource = iop13xx_adma_1_resources, .dev = { .dma_mask = &iop13xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop13xx_adma_1_data, }, };
@@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = { .resource = iop13xx_adma_2_resources, .dev = { .dma_mask = &iop13xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop13xx_adma_2_data, }, };
arch/arm/mach-iop13xx/tpmi.c +5 -5
@@ -152,7 +152,7 @@ static struct resource iop13xx_tpmi_3_resources[] = { } }; -u64 iop13xx_tpmi_mask =DMA_BIT_MASK (64 ); +u64 iop13xx_tpmi_mask =DMA_BIT_MASK (32 );static struct platform_device iop13xx_tpmi_0_device = { .name ="iop-tpmi" , .id =0 ,
@@ -160,7 +160,7 @@ static struct platform_device iop13xx_tpmi_0_device = { .resource = iop13xx_tpmi_0_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, };
@@ -171,7 +171,7 @@ static struct platform_device iop13xx_tpmi_1_device = { .resource = iop13xx_tpmi_1_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, };
@@ -182,7 +182,7 @@ static struct platform_device iop13xx_tpmi_2_device = { .resource = iop13xx_tpmi_2_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, };
@@ -193,7 +193,7 @@ static struct platform_device iop13xx_tpmi_3_device = { .resource = iop13xx_tpmi_3_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, };
arch/arm/plat-iop/adma.c +3 -3
@@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = { .resource = iop3xx_dma_0_resources, .dev = { .dma_mask = &iop3xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop3xx_dma_0_data, }, };
@@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = { .resource = iop3xx_dma_1_resources, .dev = { .dma_mask = &iop3xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop3xx_dma_1_data, }, };
@@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = { .resource = iop3xx_aau_resources, .dev = { .dma_mask = &iop3xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop3xx_aau_data, }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/99 block: pass no-op callback to INIT_WORK().
In reply to Greg Kroah-Hartman[ Upstream commit 2e3c18d0ada16f145087b2687afcad1748c0827c ]
syzbot is hitting flush_work() warning caused by commit 4d43d395fed12463 ("workqueue: Try to catch flush_work() without INIT_WORK().") [1]. Although that commit did not expect INIT_WORK(NULL) case, calling flush_work() without setting a valid callback should be avoided anyway. Fix this problem by setting a no-op callback instead of NULL.
[1] https://syzkaller.appspot.com/bug?id=e390366bc48bc82a7c668326e0663be3b91cbd29
--- block/blk-core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
block/blk-core.c +5 -1
@@ -980,6 +980,10 @@ static void blk_rq_timed_out_timer(struct timer_list *t)kblockd_schedule_work (&q->timeout_work); } +static void blk_timeout_work_dummy (struct work_struct *work) +{ +} +/** * blk_alloc_queue_node - allocate a request queue * @gfp_mask: memory allocation flags
@@ -1034,7 +1038,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id,timer_setup (&q->backing_dev_info->laptop_mode_wb_timer, laptop_mode_timer_fn,0 );timer_setup (&q->timeout, blk_rq_timed_out_timer,0 ); -INIT_WORK (&q->timeout_work,NULL ); +INIT_WORK (&q->timeout_work, blk_timeout_work_dummy);INIT_LIST_HEAD (&q->timeout_list);INIT_LIST_HEAD (&q->icq_list);#ifdef CONFIG_BLK_CGROUP
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/99 perf/x86/amd: Update generic hardware cache events for Family 17h
In reply to Greg Kroah-HartmanFrom: Kim Phillips <[email protected]>
commit 0e3b74e26280f2cf8753717a950b97d424da6046 upstream.
Add a new amd_hw_cache_event_ids_f17h assignment structure set for AMD families 17h and above, since a lot has changed. Specifically:
L1 Data Cache
The data cache access counter remains the same on Family 17h.
For DC misses, PMCx041's definition changes with Family 17h, so instead we use the L2 cache accesses from L1 data cache misses counter (PMCx060,umask=0xc8).
For DC hardware prefetch events, Family 17h breaks compatibility for PMCx067 "Data Prefetcher", so instead, we use PMCx05a "Hardware Prefetch DC Fills."
L1 Instruction Cache
PMCs 0x80 and 0x81 (32-byte IC fetches and misses) are backward compatible on Family 17h.
For prefetches, we remove the erroneous PMCx04B assignment which counts how many software data cache prefetch load instructions were dispatched.
LL - Last Level Cache
Removing PMCs 7D, 7E, and 7F assignments, as they do not exist on Family 17h, where the last level cache is L3. L3 counters can be accessed using the existing AMD Uncore driver.
Data TLB
On Intel machines, data TLB accesses ("dTLB-loads") are assigned to counters that count load/store instructions retired. This is inconsistent with instruction TLB accesses, where Intel implementations report iTLB misses that hit in the STLB.
Ideally, dTLB-loads would count higher level dTLB misses that hit in lower level TLBs, and dTLB-load-misses would report those that also missed in those lower-level TLBs, therefore causing a page table walk. That would be consistent with instruction TLB operation, remove the redundancy between dTLB-loads and L1-dcache-loads, and prevent perf from producing artificially low percentage ratios, i.e. the "0.01%" below:
42,550,869 L1-dcache-loads
41,591,860 dTLB-loads
4,802 dTLB-load-misses # 0.01% of all dTLB cache hits
7,283,682 L1-dcache-stores
7,912,392 dTLB-stores
310 dTLB-store-missesOn AMD Families prior to 17h, the "Data Cache Accesses" counter is used, which is slightly better than load/store instructions retired, but still counts in terms of individual load/store operations instead of TLB operations.
So, for AMD Families 17h and higher, this patch assigns "dTLB-loads" to a counter for L1 dTLB misses that hit in the L2 dTLB, and "dTLB-load-misses" to a counter for L1 DTLB misses that caused L2 DTLB misses and therefore also caused page table walks. This results in a much more accurate view of data TLB performance:
60,961,781 L1-dcache-loads
4,601 dTLB-loads
963 dTLB-load-misses # 20.93% of all dTLB cache hitsNote that for all AMD families, data loads and stores are combined in a single accesses counter, so no 'L1-dcache-stores' are reported separately, and stores are counted with loads in 'L1-dcache-loads'.
Also note that the "% of all dTLB cache hits" string is misleading because (a) "dTLB cache": although TLBs can be considered caches for page tables, in this context, it can be misinterpreted as data cache hits because the figures are similar (at least on Intel), and (b) not all those loads (technically accesses) technically "hit" at that hardware level. "% of all dTLB accesses" would be more clear/accurate.
Instruction TLB
On Intel machines, 'iTLB-loads' measure iTLB misses that hit in the STLB, and 'iTLB-load-misses' measure iTLB misses that also missed in the STLB and completed a page table walk.
For AMD Family 17h and above, for 'iTLB-loads' we replace the erroneous instruction cache fetches counter with PMCx084 "L1 ITLB Miss, L2 ITLB Hit".
For 'iTLB-load-misses' we still use PMCx085 "L1 ITLB Miss, L2 ITLB Miss", but set a 0xff umask because without it the event does not get counted.
Branch Predictor (BPU)
PMCs 0xc2 and 0xc3 continue to be valid across all AMD Families.
Node Level Events
Family 17h does not have a PMCx0e9 counter, and corresponding counters have not been made available publicly, so for now, we mark them as unsupported for Families 17h and above.
Reference:
"Open-Source Register Reference For AMD Family 17h Processors Models 00h-2Fh" Released 7/17/2018, Publication #56255, Revision 3.03:
https://www.amd.com/system/files/TechDocs/56255_OSRR.pdf
--- arch/x86/events/amd/core.c | 111 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 108 insertions(+), 3 deletions(-)
arch/x86/events/amd/core.c +108 -3
@@ -116,6 +116,110 @@ static __initconst const u64 amd_hw_cach }, }; +static __initconst const u64 amd_hw_cache_event_ids_f17h + [PERF_COUNT_HW_CACHE_MAX ] + [PERF_COUNT_HW_CACHE_OP_MAX ] + [PERF_COUNT_HW_CACHE_RESULT_MAX ] = { +[C (L1D )] = { + [C (OP_READ )] = { + [C (RESULT_ACCESS )] =0x0040 ,/* Data Cache Accesses */ + [C (RESULT_MISS )] =0xc860 ,/* L2$ access from DC Miss */ + }, + [C (OP_WRITE )] = { + [C (RESULT_ACCESS )] =0 , + [C (RESULT_MISS )] =0 , + }, + [C (OP_PREFETCH )] = { + [C (RESULT_ACCESS )] =0xff5a ,/* h/w prefetch DC Fills */ + [C (RESULT_MISS )] =0 , + }, +}, +[C (L1I )] = { + [C (OP_READ )] = { + [C (RESULT_ACCESS )] =0x0080 ,/* Instruction cache fetches */ + [C (RESULT_MISS )] =0x0081 ,/* Instruction cache misses */ + }, + [C (OP_WRITE )] = { + [C (RESULT_ACCESS )] =-1 , + [C (RESULT_MISS )] =-1 , + }, + [C (OP_PREFETCH )] = { + [C (RESULT_ACCESS )] =0 , + [C (RESULT_MISS )] =0 , + }, +}, +[C (LL )] = { + [C (OP_READ )] = { + [C (RESULT_ACCESS )] =0 , + [C (RESULT_MISS )] =0 , + }, + [C (OP_WRITE )] = { + [C (RESULT_ACCESS )] =0 , + [C (RESULT_MISS )] =0 , + }, + [C (OP_PREFETCH )] = { + [C (RESULT_ACCESS )] =0 , + [C (RESULT_MISS )] =0 , + }, +}, +[C (DTLB )] = { + [C (OP_READ )] = { + [C (RESULT_ACCESS )] =0xff45 ,/* All L2 DTLB accesses */ + [C (RESULT_MISS )] =0xf045 ,/* L2 DTLB misses (PT walks) */ + }, + [C (OP_WRITE )] = { + [C (RESULT_ACCESS )] =0 , + [C (RESULT_MISS )] =0 , + }, + [C (OP_PREFETCH )] = { + [C (RESULT_ACCESS )] =0 , + [C (RESULT_MISS )] =0 , + }, +}, +[C (ITLB )] = { + [C (OP_READ )] = { + [C (RESULT_ACCESS )] =0x0084 ,/* L1 ITLB misses, L2 ITLB hits */ + [C (RESULT_MISS )] =0xff85 ,/* L1 ITLB misses, L2 misses */ + }, + [C (OP_WRITE )] = { + [C (RESULT_ACCESS )] =-1 , + [C (RESULT_MISS )] =-1 , + }, + [C (OP_PREFETCH )] = { + [C (RESULT_ACCESS )] =-1 , + [C (RESULT_MISS )] =-1 , + }, +}, +[C (BPU )] = { + [C (OP_READ )] = { + [C (RESULT_ACCESS )] =0x00c2 ,/* Retired Branch Instr. */ + [C (RESULT_MISS )] =0x00c3 ,/* Retired Mispredicted BI */ + }, + [C (OP_WRITE )] = { + [C (RESULT_ACCESS )] =-1 , + [C (RESULT_MISS )] =-1 , + }, + [C (OP_PREFETCH )] = { + [C (RESULT_ACCESS )] =-1 , + [C (RESULT_MISS )] =-1 , + }, +}, +[C (NODE )] = { + [C (OP_READ )] = { + [C (RESULT_ACCESS )] =0 , + [C (RESULT_MISS )] =0 , + }, + [C (OP_WRITE )] = { + [C (RESULT_ACCESS )] =-1 , + [C (RESULT_MISS )] =-1 , + }, + [C (OP_PREFETCH )] = { + [C (RESULT_ACCESS )] =-1 , + [C (RESULT_MISS )] =-1 , + }, +}, +}; +/* * AMD Performance Monitor K7 and later, up to and including Family 16h: */
@@ -861,9 +965,10 @@ __init int amd_pmu_init(void) x86_pmu.amd_nb_constraints =0 ; } -/* Events are common for all AMDs */ -memcpy (hw_cache_event_ids, amd_hw_cache_event_ids, -sizeof (hw_cache_event_ids)); +if (boot_cpu_data.x86 >=0x17 ) +memcpy (hw_cache_event_ids, amd_hw_cache_event_ids_f17h,sizeof (hw_cache_event_ids)); +else +memcpy (hw_cache_event_ids, amd_hw_cache_event_ids,sizeof (hw_cache_event_ids));return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 71/99 Bluetooth: btusb: request wake pin with NOAUTOEN
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
commit 771acc7e4a6e5dba779cb1a7fd851a164bc81033 upstream.
Badly-designed systems might have (for example) active-high wake pins that default to high (e.g., because of external pull ups) until they have an active firmware which starts driving it low. This can cause an interrupt storm in the time between request_irq() and disable_irq().
We don't support shared interrupts here, so let's just pre-configure the interrupt to avoid auto-enabling it.
--- drivers/bluetooth/btusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/btusb.c +1 -1
@@ -2888,6 +2888,7 @@ static int btusb_config_oob_wake(structreturn 0 ; } +irq_set_status_flags (irq,IRQ_NOAUTOEN ); ret =devm_request_irq (&hdev->dev, irq, btusb_oob_wake_handler,0 ,"OOB Wake-on-BT" , data);if (ret) {
@@ -2902,7 +2903,6 @@ static int btusb_config_oob_wake(struct } data->oob_wake_irq = irq; -disable_irq (irq);bt_dev_info (hdev,"OOB Wake-on-BT configured at IRQ %u" , irq);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 72/99 Bluetooth: mediatek: fix up an error path to restore bdev->tx_state
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
commit 77f328dbc6cf42f22c691a164958a5452142a542 upstream.
Restore bdev->tx_state with clearing bit BTMTKUART_TX_WAIT_VND_EVT when there is an error on waiting for the corresponding event.
--- drivers/bluetooth/btmtkuart.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/bluetooth/btmtkuart.c +2 -0
@@ -115,11 +115,13 @@ static int mtk_hci_wmt_sync(struct hci_d TASK_INTERRUPTIBLE, HCI_INIT_TIMEOUT);if (err == -EINTR ) {bt_dev_err (hdev,"Execution of wmt command interrupted" ); +clear_bit (BTMTKUART_TX_WAIT_VND_EVT , &bdev->tx_state);return err; }if (err) {bt_dev_err (hdev,"Execution of wmt command timed out" ); +clear_bit (BTMTKUART_TX_WAIT_VND_EVT , &bdev->tx_state);return -ETIMEDOUT ; }
Greg Kroah-Hartman
maintainerPATCH 73/99 clk: qcom: Add missing freq for usb30_master_clk on 8998
In reply to Greg Kroah-HartmanFrom: Jeffrey Hugo <[email protected]>
commit 0c8ff62504e3a667387e87889a259632c3199a86 upstream.
The usb30_master_clk supports a 60Mhz frequency, but that is missing from the table of supported frequencies. Add it.
--- drivers/clk/qcom/gcc-msm8998.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-msm8998.c +1 -0
@@ -1101,6 +1101,7 @@ static struct clk_rcg2 ufs_axi_clk_src =static const struct freq_tbl ftbl_usb30_master_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ), +F (60000000 ,P_GPLL0_OUT_MAIN ,10 ,0 ,0 ),F (120000000 ,P_GPLL0_OUT_MAIN ,5 ,0 ,0 ),F (150000000 ,P_GPLL0_OUT_MAIN ,4 ,0 ,0 ), { }
Greg Kroah-Hartman
maintainerPATCH 74/99 staging: iio: adt7316: allow adt751x to use internal vref for all dacs
In reply to Greg Kroah-HartmanFrom: Jeremy Fertic <[email protected]>
commit 10bfe7cc1739c22f0aa296b39e53f61e9e3f4d99 upstream.
With adt7516/7/9, internal vref is available for dacs a and b, dacs c and d, or all dacs. The driver doesn't currently support internal vref for all dacs. Change the else if to an if so both bits are checked rather than just one or the other.
--- drivers/staging/iio/addac/adt7316.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/iio/addac/adt7316.c +1 -1
@@ -1086,7 +1086,7 @@ static ssize_t adt7316_store_DAC_interna ldac_config = chip->ldac_config & (~ADT7516_DAC_IN_VREF_MASK );if (data &0x1 ) ldac_config |=ADT7516_DAC_AB_IN_VREF ; -else if (data &0x2 ) +if (data &0x2 ) ldac_config |=ADT7516_DAC_CD_IN_VREF ; }else { ret =kstrtou8 (buf,16 , &data);
Greg Kroah-Hartman
maintainerPATCH 75/99 staging: iio: adt7316: fix the dac read calculation
In reply to Greg Kroah-HartmanFrom: Jeremy Fertic <[email protected]>
commit 45130fb030aec26ac28b4bb23344901df3ec3b7f upstream.
The calculation of the current dac value is using the wrong bits of the dac lsb register. Create two macros to shift the lsb register value into lsb position, depending on whether the dac is 10 or 12 bit. Initialize data to 0 so, with an 8 bit dac, the msb register value can be bitwise ORed with data.
--- drivers/staging/iio/addac/adt7316.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/staging/iio/addac/adt7316.c +8 -2
@@ -47,6 +47,8 @@#define ADT7516_MSB_AIN3 0xA#define ADT7516_MSB_AIN4 0xB#define ADT7316_DA_DATA_BASE 0x10 +#define ADT7316_DA_10_BIT_LSB_SHIFT 6 +#define ADT7316_DA_12_BIT_LSB_SHIFT 4#define ADT7316_DA_MSB_DATA_REGS 4#define ADT7316_LSB_DAC_A 0x10#define ADT7316_MSB_DAC_A 0x11
@@ -1408,7 +1410,7 @@ static IIO_DEVICE_ATTR(ex_analog_temp_ofstatic ssize_t adt7316_show_DAC (struct adt7316_chip_info *chip,int channel,char *buf) { -u16 data; +u16 data =0 ;u8 msb, lsb, offset;int ret;
@@ -1433,7 +1435,11 @@ static ssize_t adt7316_show_DAC(struct aif (ret)return -EIO ; - data = (msb << offset) + (lsb & ((1 << offset) -1 )); +if (chip->dac_bits ==12 ) + data = lsb >>ADT7316_DA_12_BIT_LSB_SHIFT ; +else if (chip->dac_bits ==10 ) + data = lsb >>ADT7316_DA_10_BIT_LSB_SHIFT ; + data |= msb << offset;return sprintf (buf,"%d\n" , data); }
Greg Kroah-Hartman
maintainerPATCH 76/99 staging: iio: adt7316: fix the dac write calculation
In reply to Greg Kroah-HartmanFrom: Jeremy Fertic <[email protected]>
commit 78accaea117c1ae878774974fab91ac4a0b0e2b0 upstream.
The lsb calculation is not masking the correct bits from the user input. Subtract 1 from (1 << offset) to correctly set up the mask to be applied to user input.
The lsb register stores its value starting at the bit 7 position. adt7316_store_DAC() currently assumes the value is at the other end of the register. Shift the lsb value before storing it in a new variable lsb_reg, and write this variable to the lsb register.
--- drivers/staging/iio/addac/adt7316.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/staging/iio/addac/adt7316.c +7 -3
@@ -1447,7 +1447,7 @@ static ssize_t adt7316_show_DAC(struct astatic ssize_t adt7316_store_DAC (struct adt7316_chip_info *chip,int channel,const char *buf,size_t len) { -u8 msb, lsb, offset; +u8 msb, lsb, lsb_reg, offset;u16 data;int ret;
@@ -1465,9 +1465,13 @@ static ssize_t adt7316_store_DAC(structreturn -EINVAL ;if (chip->dac_bits >8 ) { - lsb = data & (1 << offset); + lsb = data & ((1 << offset) -1 ); +if (chip->dac_bits ==12 ) + lsb_reg = lsb <<ADT7316_DA_12_BIT_LSB_SHIFT ; +else + lsb_reg = lsb <<ADT7316_DA_10_BIT_LSB_SHIFT ; ret = chip->bus.write (chip->bus.client, -ADT7316_DA_DATA_BASE + channel *2 , lsb); +ADT7316_DA_DATA_BASE + channel *2 , lsb_reg);if (ret)return -EIO ; }
Greg Kroah-Hartman
maintainerPATCH 77/99 scsi: RDMA/srpt: Fix a credit leak for aborted commands
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
commit 40ca8757291ca7a8775498112d320205b2a2e571 upstream.
Make sure that the next time a response is sent to the initiator that the credit it had allocated for the aborted request gets freed.
--- drivers/infiniband/ulp/srpt/ib_srpt.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/infiniband/ulp/srpt/ib_srpt.c +11 -0
@@ -2793,8 +2793,19 @@ static void srpt_queue_tm_rsp(struct se_srpt_queue_response (cmd); } +/* +* This function is called for aborted commands if no response is sent to the +* initiator. Make sure that the credits freed by aborting a command are +* returned to the initiator the next time a response is sent by incrementing +* ch->req_lim_delta. +*/ static void srpt_aborted_task (struct se_cmd *cmd) { +struct srpt_send_ioctx *ioctx =container_of (cmd, + struct srpt_send_ioctx, cmd); +struct srpt_rdma_ch *ch = ioctx->ch; + +atomic_inc (&ch->req_lim_delta); }static int srpt_queue_status (struct se_cmd *cmd)
Greg Kroah-Hartman
maintainerPATCH 78/99 ASoC: Intel: bytcr_rt5651: Revert "Fix DMIC map headsetmic mapping"
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit aee48a9ffa5a128bf4e433c57c39e015ea5b0208 upstream.
Commit 37c7401e8c1f ("ASoC: Intel: bytcr_rt5651: Fix DMIC map headsetmic mapping"), changed the headsetmic mapping from IN3P to IN2P, this was based on the observation that all bytcr_rt5651 devices I have access to (7 devices) where all using IN3P for the headsetmic. This was an attempt to unifify / simplify the mapping, but it was wrong.
None of those devices was actually using a digital internal mic. Now I've access to a Point of View TAB-P1006W-232 (v1.0) tabler, which does use a DMIC and it does have its headsetmic connected to IN2P, showing that the original mapping was correct, so this commit reverts the change changing the mapping back to IN2P.
--- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/bytcr_rt5651.c +1 -1
@@ -267,7 +267,7 @@ static const struct snd_soc_dapm_route bstatic const struct snd_soc_dapm_route byt_rt5651_intmic_dmic_map[] = { {"DMIC L1" ,NULL ,"Internal Mic" }, {"DMIC R1" ,NULL ,"Internal Mic" }, - {"IN3P" ,NULL ,"Headset Mic" }, + {"IN2P" ,NULL ,"Headset Mic" }, };static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = {
Greg Kroah-Hartman
maintainerPATCH 79/99 ASoC: wm_adsp: Correct handling of compressed streams that restart
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
commit 639e5eb3c7d67e407f2a71fccd95323751398f6f upstream.
Previously support was added to allow streams to be stopped and started again without the DSP being power cycled and this was done by clearing the buffer state in trigger start. Another supported use-case is using the DSP for a trigger event then opening the compressed stream later to receive the audio, unfortunately clearing the buffer state in trigger start destroys the data received from such a trigger. Correct this issue by moving the call to wm_adsp_buffer_clear to be in trigger stop instead.
--- sound/soc/codecs/wm_adsp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/codecs/wm_adsp.c +1 -2
@@ -3441,8 +3441,6 @@ int wm_adsp_compr_trigger(struct snd_com } } -wm_adsp_buffer_clear (compr->buf); -/* Trigger the IRQ at one fragment of data */ ret = wm_adsp_buffer_write(compr->buf, HOST_BUFFER_FIELD(high_water_mark),
@@ -3454,6 +3452,7 @@ int wm_adsp_compr_trigger(struct snd_com }break ;case SNDRV_PCM_TRIGGER_STOP : +wm_adsp_buffer_clear (compr->buf);break ;default : ret = -EINVAL ;
Re: [PATCH 4.19 79/99] ASoC: wm_adsp: Correct handling of compressed streams that restart
Hi,
Quoted 13 lines · Greg Kroah-Hartman
From: Charles Keepax <[email protected]>
commit
639e5eb3c7d67e407f2a71fccd95323751398f6fupstream.Previously support was added to allow streams to be stopped and started again without the DSP being power cycled and this was done by clearing the buffer state in trigger start. Another supported use-case is using the DSP for a trigger event then opening the compressed stream later to receive the audio, unfortunately clearing the buffer state in trigger start destroys the data received from such a trigger. Correct this issue by moving the call to
wm_adsp_buffer_clearto be in trigger stop instead.
Quoted 4 lines
Fixes 61fc060c40e6 ("ASoC: wm_adsp: Support streams which can start/stop with DSP active")Signed-off-by Charles Keepax <[email protected]>Signed-off-by Mark Brown <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
This commit has other problems, and it is fixed by commit 43d147be5738a9ed6cfb25c285ac50d6dd5793be. Please apply this commit too.
commit 43d147be5738a9ed6cfb25c285ac50d6dd5793be
Author: Charles Keepax <[email protected]> Date: Tue Apr 2 13:49:14 2019 +0100
ASoC: wm_adsp: Check for buffer in trigger stop
Trigger stop can be called in situations where trigger start failed and as such it can't be assumed the buffer is already attached to the compressed stream or a NULL pointer may be dereferenced.
Best regards,
Nobuhiro
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 79/99] ASoC: wm_adsp: Correct handling of compressed streams that restart
Quoted 30 lines · Nobuhiro Iwamatsu
Hi,
Quoted 13 lines · Greg Kroah-Hartman
From: Charles Keepax <[email protected]>
commit
639e5eb3c7d67e407f2a71fccd95323751398f6fupstream.Previously support was added to allow streams to be stopped and started again without the DSP being power cycled and this was done by clearing the buffer state in trigger start. Another supported use-case is using the DSP for a trigger event then opening the compressed stream later to receive the audio, unfortunately clearing the buffer state in trigger start destroys the data received from such a trigger. Correct this issue by moving the call to
wm_adsp_buffer_clearto be in trigger stop instead.Quoted 4 lines
Fixes 61fc060c40e6 ("ASoC: wm_adsp: Support streams which can start/stop with DSP active")Signed-off-by Charles Keepax <[email protected]>Signed-off-by Mark Brown <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>This commit has other problems, and it is fixed by commit
43d147be5738a9ed6cfb25c285ac50d6dd5793be. Please apply this commit too.commit
43d147be5738a9ed6cfb25c285ac50d6dd5793beAuthor: Charles Keepax <[email protected]> Date: Tue Apr 2 13:49:14 2019 +0100ASoC:
wm_adsp: Check for buffer in trigger stop
Quoted 7 lines
Trigger stop can be called in situations where trigger start failed and as such it can't be assumed the buffer is already attached to the compressed stream or a NULL pointer may be dereferenced.
Fixes 639e5eb3c7d6 ("ASoC: wm_adsp: Correct handling of compressed streams that restart")Signed-off-by Charles Keepax <[email protected]>Signed-off-by Mark Brown <[email protected]>
Thank you, now queued up!
greg k-h
Greg Kroah-Hartman
maintainerPATCH 80/99 ASoC: stm32: fix sai driver name initialisation
In reply to Greg Kroah-HartmanFrom: Arnaud Pouliquen <[email protected]>
commit 17d3069ccf06970e2db3f7cbf4335f207524279e upstream.
This patch fixes the sai driver structure overwriting which results in a cpu dai name equal NULL.
--- sound/soc/stm/stm32_sai_sub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/stm/stm32_sai_sub.c +1 -1
@@ -1194,7 +1194,6 @@ static int stm32_sai_sub_dais_init(strucif (!sai->cpu_dai_drv)return -ENOMEM ; - sai->cpu_dai_drv->name =dev_name (&pdev->dev);if (STM_SAI_IS_PLAYBACK (sai)) {memcpy (sai->cpu_dai_drv, &stm32_sai_playback_dai,sizeof (stm32_sai_playback_dai));
@@ -1204,6 +1203,7 @@ static int stm32_sai_sub_dais_init(struc sizeof(stm32_sai_capture_dai)); sai->cpu_dai_drv->capture.stream_name = sai->cpu_dai_drv->name; } + sai->cpu_dai_drv->name =dev_name (&pdev->dev);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 81/99 platform/x86: intel_pmc_core: Fix PCH IP name
In reply to Greg Kroah-HartmanFrom: Rajneesh Bhardwaj <[email protected]>
commit d6827015e671cd17871c9b7a0fabe06c044f7470 upstream.
For Cannonlake and Icelake, the IP name for Res_6 should be SPF i.e. South Port F. No functional change is intended other than just renaming the IP appropriately.
--- drivers/platform/x86/intel_pmc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/intel_pmc_core.c +1 -1
@@ -185,7 +185,7 @@ static const struct pmc_bit_map cnp_pfea {"CNVI", BIT(3)}, {"UFS0", BIT(4)}, {"EMMC", BIT(5)}, - {"Res_6", BIT(6)}, + {"SPF", BIT(6)}, {"SBR6", BIT(7)}, {"SBR7", BIT(0)},
Greg Kroah-Hartman
maintainerPATCH 82/99 platform/x86: intel_pmc_core: Handle CFL regmap properly
In reply to Greg Kroah-HartmanFrom: Rajneesh Bhardwaj <[email protected]>
commit e50af8332785355de3cb40d9f5e8c45dbfc86f53 upstream.
Only Coffeelake should use Cannonlake regmap other than Cannonlake platform. This allows Coffeelake special handling only when there is no matching PCI device and default reg map selected as per CPUID is for Sunrisepoint PCH. This change is needed to enable support for newer SoCs such as Icelake.
--- drivers/platform/x86/intel_pmc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/intel_pmc_core.c +1 -1
@@ -682,7 +682,7 @@ static int __init pmc_core_probe(void)* Sunrisepoint PCH regmap can't be used. Use Cannonlake PCH regmap * in this case. */ -if (!pci_dev_present (pmc_pci_ids)) +if (pmcdev->map == &spt_reg_map && !pci_dev_present (pmc_pci_ids)) pmcdev->map = &cnp_reg_map;if (lpit_read_residency_count_address (&slp_s0_addr))
Greg Kroah-Hartman
maintainerPATCH 83/99 IB/core: Unregister notifier before freeing MAD security
In reply to Greg Kroah-HartmanFrom: Daniel Jurgens <[email protected]>
commit d60667fc398ed34b3c7456b020481c55c760e503 upstream.
If the notifier runs after the security context is freed an access of freed memory can occur.
--- drivers/infiniband/core/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/core/security.c +2 -1
@@ -728,9 +728,10 @@ void ib_mad_agent_security_cleanup(strucif (!rdma_protocol_ib (agent->device, agent->port_num))return ; -security_ib_free_security (agent->security);if (agent->lsm_nb_reg)unregister_lsm_notifier (&agent->lsm_nb); + +security_ib_free_security (agent->security); }int ib_mad_enforce_security (struct ib_mad_agent_private *map,u16 pkey_index)
Greg Kroah-Hartman
maintainerPATCH 84/99 IB/core: Fix potential memory leak while creating MAD agents
In reply to Greg Kroah-HartmanFrom: Daniel Jurgens <[email protected]>
commit 6e88e672b69f0e627acdae74a527b730ea224b6b upstream.
If the MAD agents isn't allowed to manage the subnet, or fails to register for the LSM notifier, the security context is leaked. Free the context in these cases.
--- drivers/infiniband/core/security.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/infiniband/core/security.c +6 -2
@@ -711,16 +711,20 @@ int ib_mad_agent_security_setup(struct i agent->device->name, agent->port_num);if (ret) -return ret; + goto free_security; agent->lsm_nb.notifier_call = ib_mad_agent_security_change; ret =register_lsm_notifier (&agent->lsm_nb);if (ret) -return ret; + goto free_security; agent->smp_allowed = true; agent->lsm_nb_reg = true;return 0 ; + +free_security: +security_ib_free_security (agent->security); +return ret; }void ib_mad_agent_security_cleanup (struct ib_mad_agent *agent)
Greg Kroah-Hartman
maintainerPATCH 85/99 IB/core: Destroy QP if XRC QP fails
In reply to Greg Kroah-HartmanFrom: Yuval Avnery <[email protected]>
commit 535005ca8e5e71918d64074032f4b9d4fef8981e upstream.
The open-coded variant missed destroy of SELinux created QP, reuse already existing ib_detroy_qp() call and use this opportunity to clean ib_create_qp() from double prints and unclear exit paths.
--- drivers/infiniband/core/verbs.c | 41 +++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-)
drivers/infiniband/core/verbs.c +24 -17
@@ -1087,8 +1087,8 @@ struct ib_qp *ib_open_qp(struct ib_xrcd }EXPORT_SYMBOL (ib_open_qp); -static struct ib_qp *ib_create_xrc_qp (struct ib_qp *qp, -struct ib_qp_init_attr *qp_init_attr) +static struct ib_qp *create_xrc_qp (struct ib_qp *qp, +struct ib_qp_init_attr *qp_init_attr) {struct ib_qp *real_qp = qp;
@@ -1103,10 +1103,10 @@ static struct ib_qp *ib_create_xrc_qp(st qp =__ib_open_qp (real_qp, qp_init_attr->event_handler, qp_init_attr->qp_context); -if (!IS_ERR (qp)) -__ib_insert_xrcd_qp (qp_init_attr->xrcd, real_qp); -else - real_qp->device->destroy_qp (real_qp); +if (IS_ERR (qp)) +return qp; + +__ib_insert_xrcd_qp (qp_init_attr->xrcd, real_qp);return qp; }
@@ -1137,10 +1137,8 @@ struct ib_qp *ib_create_qp(struct ib_pdreturn qp; ret =ib_create_qp_security (qp, device); -if (ret) { -ib_destroy_qp (qp); -return ERR_PTR (ret); - } +if (ret) + goto err; qp->real_qp = qp; qp->qp_type = qp_init_attr->qp_type;
@@ -1153,8 +1151,15 @@ struct ib_qp *ib_create_qp(struct ib_pdINIT_LIST_HEAD (&qp->sig_mrs); qp->port =0 ; -if (qp_init_attr->qp_type ==IB_QPT_XRC_TGT ) -return ib_create_xrc_qp (qp, qp_init_attr); +if (qp_init_attr->qp_type ==IB_QPT_XRC_TGT ) { +struct ib_qp *xrc_qp =create_xrc_qp (qp, qp_init_attr); + +if (IS_ERR (xrc_qp)) { + ret =PTR_ERR (xrc_qp); + goto err; + } +return xrc_qp; + } qp->event_handler = qp_init_attr->event_handler; qp->qp_context = qp_init_attr->qp_context;
@@ -1181,11 +1186,8 @@ struct ib_qp *ib_create_qp(struct ib_pdif (qp_init_attr->cap.max_rdma_ctxs) { ret =rdma_rw_init_mrs (qp, qp_init_attr); -if (ret) { -pr_err ("failed to init MR pool ret= %d\n" , ret); -ib_destroy_qp (qp); -return ERR_PTR (ret); - } +if (ret) + goto err; }/*
@@ -1198,6 +1200,11 @@ struct ib_qp *ib_create_qp(struct ib_pd device->attrs.max_sge_rd);return qp; + +err: +ib_destroy_qp (qp); +return ERR_PTR (ret); + }EXPORT_SYMBOL (ib_create_qp);
Greg Kroah-Hartman
maintainerPATCH 86/99 Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ
In reply to Greg Kroah-HartmanFrom: Anson Huang <[email protected]>
commit bf2a7ca39fd3ab47ef71c621a7ee69d1813b1f97 upstream.
SNVS IRQ is requested before necessary driver data initialized, if there is a pending IRQ during driver probe phase, kernel NULL pointer panic will occur in IRQ handler. To avoid such scenario, just initialize necessary driver data before enabling IRQ. This patch is inspired by NXP's internal kernel tree.
--- drivers/input/keyboard/snvs_pwrkey.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/input/keyboard/snvs_pwrkey.c +3 -3
@@ -148,6 +148,9 @@ static int imx_snvs_pwrkey_probe(structreturn error; } + pdata->input = input; +platform_set_drvdata (pdev, pdata); + error =devm_request_irq (&pdev->dev, pdata->irq, imx_snvs_pwrkey_interrupt,0 , pdev->name, pdev);
@@ -163,9 +166,6 @@ static int imx_snvs_pwrkey_probe(structreturn error; } - pdata->input = input; -platform_set_drvdata (pdev, pdata); -device_init_wakeup (&pdev->dev, pdata->wakeup);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 87/99 Input: stmfts - acknowledge that setting brightness is a blocking call
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
commit 937c4e552fd1174784045684740edfcea536159d upstream.
We need to turn regulators on and off when switching brightness, and that may block, therefore we have to set stmfts_brightness_set() as LED's brightness_set_blocking() method.
--- drivers/input/touchscreen/stmfts.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
drivers/input/touchscreen/stmfts.c +16 -14
@@ -106,27 +106,29 @@ struct stmfts_data {bool running; }; -static void stmfts_brightness_set (struct led_classdev *led_cdev, +static int stmfts_brightness_set (struct led_classdev *led_cdev,enum led_brightness value) {struct stmfts_data *sdata =container_of (led_cdev, struct stmfts_data, led_cdev);int err; -if (value == sdata->led_status || !sdata->ledvdd) -return ; - -if (!value) { -regulator_disable (sdata->ledvdd); - }else { - err =regulator_enable (sdata->ledvdd); -if (err) -dev_warn (&sdata->client->dev, -"failed to disable ledvdd regulator: %d\n" , - err); +if (value != sdata->led_status && sdata->ledvdd) { +if (!value) { +regulator_disable (sdata->ledvdd); + }else { + err =regulator_enable (sdata->ledvdd); +if (err) { +dev_warn (&sdata->client->dev, +"failed to disable ledvdd regulator: %d\n" , + err); +return err; + } + } + sdata->led_status = value; } - sdata->led_status = value; +return 0 ; }static enum led_brightness stmfts_brightness_get (struct led_classdev *led_cdev)
@@ -608,7 +610,7 @@ static int stmfts_enable_led(struct stmf sdata->led_cdev.name =STMFTS_DEV_NAME ; sdata->led_cdev.max_brightness =LED_ON ; sdata->led_cdev.brightness =LED_OFF ; - sdata->led_cdev.brightness_set = stmfts_brightness_set; + sdata->led_cdev.brightness_set_blocking = stmfts_brightness_set; sdata->led_cdev.brightness_get = stmfts_brightness_get; err =devm_led_classdev_register (&sdata->client->dev, &sdata->led_cdev);
Greg Kroah-Hartman
maintainerPATCH 88/99 gpio: mxc: add check to return defer probe if clock tree NOT ready
In reply to Greg Kroah-HartmanFrom: Anson Huang <[email protected]>
commit a329bbe707cee2cf8c660890ef2ad0d00ec7e8a3 upstream.
On i.MX8MQ platform, clock driver uses platform driver model and it is probed after GPIO driver, so when GPIO driver fails to get clock, it should check the error type to decide whether to return defer probe or just ignore the clock operation.
--- drivers/gpio/gpio-mxc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpio/gpio-mxc.c +4 -1
@@ -438,8 +438,11 @@ static int mxc_gpio_probe(struct platfor/* the controller clock is optional */ port->clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (port->clk)) +if (IS_ERR (port->clk)) { +if (PTR_ERR (port->clk) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; port->clk =NULL ; + } err =clk_prepare_enable (port->clk);if (err) {
Greg Kroah-Hartman
maintainerPATCH 89/99 selinux: avoid silent denials in permissive mode under RCU walk
In reply to Greg Kroah-HartmanFrom: Stephen Smalley <[email protected]>
commit 3a28cff3bd4bf43f02be0c4e7933aebf3dc8197e upstream.
commit 0dc1ba24f7fff6 ("SELINUX: Make selinux cache VFS RCU walks safe") results in no audit messages at all if in permissive mode because the cache is updated during the rcu walk and thus no denial occurs on the subsequent ref walk. Fix this by not updating the cache when performing a non-blocking permission check. This only affects search and symlink read checks during rcu walk.
--- security/selinux/avc.c | 23 +++++++++++++++++++++-- security/selinux/hooks.c | 4 +++- security/selinux/include/avc.h | 1 + 3 files changed, 25 insertions(+), 3 deletions(-)
security/selinux/avc.c +21 -2
@@ -838,6 +838,7 @@ out:* @ssid,@tsid,@tclass : identifier of an AVC entry * @seqno : sequence number when decision was made * @xpd: extended_perms_decision to be added to the node +* @flags: the AVC_* flags, e.g. AVC_NONBLOCKING, AVC_EXTENDED_PERMS, or 0. * * if a valid AVC entry doesn't exist,this function returns -ENOENT. * if kmalloc() called internal returns NULL, this function returns -ENOMEM.
@@ -856,6 +857,23 @@ static int avc_update_node(struct selinustruct hlist_head *head;spinlock_t *lock; +/* +* If we are in a non-blocking code path, e.g. VFS RCU walk, +* then we must not add permissions to a cache entry +* because we cannot safely audit the denial. Otherwise, +* during the subsequent blocking retry (e.g. VFS ref walk), we +* will find the permissions already granted in the cache entry +* and won't audit anything at all, leading to silent denials in +* permissive mode that only appear when in enforcing mode. +* +* See the corresponding handling in slow_avc_audit(), and the +* logic in selinux_inode_follow_link and selinux_inode_permission +* for the VFS MAY_NOT_BLOCK flag, which is transliterated into +* AVC_NONBLOCKING for avc_has_perm_noaudit(). +*/ +if (flags &AVC_NONBLOCKING ) +return 0 ; + node =avc_alloc_node (avc);if (!node) { rc = -ENOMEM ;
@@ -1115,7 +1133,7 @@ decision:* @tsid: target security identifier * @tclass: target security class * @requested: requested permissions, interpreted based on @tclass -* @flags: AVC_STRICT or 0 +* @flags: AVC_STRICT, AVC_NONBLOCKING, or 0 * @avd: access vector decisions * * Check the AVC to determine whether the @requested permissions are granted
@@ -1199,7 +1217,8 @@ int avc_has_perm_flags(struct selinux_ststruct av_decision avd;int rc, rc2; - rc =avc_has_perm_noaudit (state, ssid, tsid, tclass, requested,0 , + rc =avc_has_perm_noaudit (state, ssid, tsid, tclass, requested, + (flags &MAY_NOT_BLOCK ) ?AVC_NONBLOCKING :0 , &avd); rc2 = avc_audit(state, ssid, tsid, tclass, requested, &avd, rc,
security/selinux/hooks.c +3 -1
@@ -3199,7 +3199,9 @@ static int selinux_inode_permission(strureturn PTR_ERR (isec); rc =avc_has_perm_noaudit (&selinux_state, - sid, isec->sid, isec->sclass, perms,0 , &avd); + sid, isec->sid, isec->sclass, perms, + (flags &MAY_NOT_BLOCK ) ?AVC_NONBLOCKING :0 , + &avd); audited =avc_audit_required (perms, &avd, rc, from_access ?FILE__AUDIT_ACCESS :0 , &denied);
security/selinux/include/avc.h +1 -0
@@ -142,6 +142,7 @@ static inline int avc_audit(struct selin#define AVC_STRICT 1/* Ignore permissive mode. */ #define AVC_EXTENDED_PERMS 2/* update extended permissions */ +#define AVC_NONBLOCKING 4/* non blocking */ int avc_has_perm_noaudit(struct selinux_state *state, u32 ssid, u32 tsid, u16 tclass, u32 requested,
Greg Kroah-Hartman
maintainerPATCH 90/99 selinux: never allow relabeling on context mounts
In reply to Greg Kroah-HartmanFrom: Ondrej Mosnacek <[email protected]>
commit a83d6ddaebe541570291205cb538e35ad4ff94f9 upstream.
In the SECURITY_FS_USE_MNTPOINT case we never want to allow relabeling files/directories, so we should never set the SBLABEL_MNT flag. The 'special handling' in selinux_is_sblabel_mnt() is only intended for when the behavior is set to SECURITY_FS_USE_GENFS.
While there, make the logic in selinux_is_sblabel_mnt() more explicit and add a BUILD_BUG_ON() to make sure that introducing a new SECURITY_FS_USE_* forces a review of the logic.
--- security/selinux/hooks.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-)
security/selinux/hooks.c +31 -9
@@ -497,16 +497,10 @@ static int may_context_mount_inode_relabreturn rc; } -static int selinux_is_sblabel_mnt (struct super_block *sb) +static int selinux_is_genfs_special_handling (struct super_block *sb) { -struct superblock_security_struct *sbsec = sb->s_security; - -return sbsec->behavior ==SECURITY_FS_USE_XATTR || - sbsec->behavior ==SECURITY_FS_USE_TRANS || - sbsec->behavior ==SECURITY_FS_USE_TASK || - sbsec->behavior ==SECURITY_FS_USE_NATIVE || -/* Special handling. Genfs but also in-core setxattr handler */ - !strcmp (sb->s_type->name,"sysfs" ) || +/* Special handling. Genfs but also in-core setxattr handler */ +return !strcmp (sb->s_type->name,"sysfs" ) || !strcmp (sb->s_type->name,"pstore" ) || !strcmp (sb->s_type->name,"debugfs" ) || !strcmp(sb->s_type->name, "tracefs") ||
@@ -516,6 +510,34 @@ static int selinux_is_sblabel_mnt(struct !strcmp(sb->s_type->name, "cgroup2"))); } +static int selinux_is_sblabel_mnt (struct super_block *sb) +{ +struct superblock_security_struct *sbsec = sb->s_security; + +/* +* IMPORTANT: Double-check logic in this function when adding a new +* SECURITY_FS_USE_* definition! +*/ +BUILD_BUG_ON (SECURITY_FS_USE_MAX !=7 ); + +switch (sbsec->behavior) { +case SECURITY_FS_USE_XATTR : +case SECURITY_FS_USE_TRANS : +case SECURITY_FS_USE_TASK : +case SECURITY_FS_USE_NATIVE : +return 1 ; + +case SECURITY_FS_USE_GENFS : +return selinux_is_genfs_special_handling (sb); + +/* Never allow relabeling on context mounts */ +case SECURITY_FS_USE_MNTPOINT : +case SECURITY_FS_USE_NONE : +default : +return 0 ; + } +} +static int sb_finish_set_opts (struct super_block *sb) {struct superblock_security_struct *sbsec = sb->s_security;
Greg Kroah-Hartman
maintainerPATCH 91/99 mac80211: Honor SW_CRYPTO_CONTROL for unicast keys in AP VLAN mode
In reply to Greg Kroah-HartmanFrom: Alexander Wetzel <[email protected]>
commit 78ad2341521d5ea96cb936244ed4c4c4ef9ec13b upstream.
Restore SW_CRYPTO_CONTROL operation on AP_VLAN interfaces for unicast keys, the original override was intended to be done for group keys as those are treated specially by mac80211 and would always have been rejected.
Now the situation is that AP_VLAN support must be enabled by the driver if it can support it (meaning it can support software crypto GTK TX).
Thus, also simplify the code - if we get here with AP_VLAN and non- pairwise key, software crypto must be used (driver doesn't know about the interface) and can be used (driver must've advertised AP_VLAN if it also uses SW_CRYPTO_CONTROL).
--- net/mac80211/key.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/mac80211/key.c +4 -5
@@ -167,8 +167,10 @@ static int ieee80211_key_enable_hw_accel* The driver doesn't know anything about VLAN interfaces. * Hence, don't send GTKs for VLAN interfaces to the driver. */ -if (!(key->conf.flags &IEEE80211_KEY_FLAG_PAIRWISE )) +if (!(key->conf.flags &IEEE80211_KEY_FLAG_PAIRWISE )) { + ret =1 ; goto out_unsupported; + } } ret = drv_set_key(key->local, SET_KEY, sdata,
@@ -213,11 +215,8 @@ static int ieee80211_key_enable_hw_accel/* all of these we can do in software - if driver can */ if (ret ==1 )return 0 ; -if (ieee80211_hw_check (&key->local->hw,SW_CRYPTO_CONTROL )) { -if (sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) -return 0 ; +if (ieee80211_hw_check (&key->local->hw,SW_CRYPTO_CONTROL ))return -EINVAL ; - }return 0 ;default :return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 92/99 powerpc/mm/hash: Handle mmap_min_addr correctly in get_unmapped_area topdown search
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
commit 3b4d07d2674f6b4a9281031f99d1f7efd325b16d upstream.
When doing top-down search the low_limit is not PAGE_SIZE but rather max(PAGE_SIZE, mmap_min_addr). This handle cases in which mmap_min_addr > PAGE_SIZE.
--- arch/powerpc/mm/slice.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/powerpc/mm/slice.c +6 -4
@@ -31,6 +31,7 @@#include <linux/spinlock.h> #include <linux/export.h> #include <linux/hugetlb.h> +#include <linux/security.h> #include <asm/mman.h> #include <asm/mmu.h> #include <asm/copro.h>
@@ -376,6 +377,7 @@ static unsigned long slice_find_area_topint pshift =max_t (int, mmu_psize_defs[psize].shift,PAGE_SHIFT );unsigned long addr, found, prev;struct vm_unmapped_area_info info; +unsigned long min_addr =max (PAGE_SIZE , mmap_min_addr); info.flags =VM_UNMAPPED_AREA_TOPDOWN ; info.length = len;
@@ -392,7 +394,7 @@ static unsigned long slice_find_area_topif (high_limit >DEFAULT_MAP_WINDOW ) addr += mm->context.slb_addr_limit -DEFAULT_MAP_WINDOW ; -while (addr >PAGE_SIZE ) { +while (addr > min_addr) { info.high_limit = addr;if (!slice_scan_available (addr -1 , available,0 , &addr))continue ;
@@ -404,8 +406,8 @@ static unsigned long slice_find_area_top* Check if we need to reduce the range, or if we can * extend it to cover the previous available slice. */ -if (addr <PAGE_SIZE ) - addr =PAGE_SIZE ; +if (addr < min_addr) + addr = min_addr;else if (slice_scan_available (addr -1 , available,0 , &prev)) { addr = prev; goto prev_slice;
@@ -527,7 +529,7 @@ unsigned long slice_get_unmapped_area(un addr =_ALIGN_UP (addr, page_size);slice_dbg (" aligned addr=%lx\n" , addr);/* Ignore hint if it's too large or overlaps a VMA */ -if (addr > high_limit - len || +if (addr > high_limit - len || addr < mmap_min_addr || !slice_area_is_free (mm, addr, len)) addr =0 ; }
Greg Kroah-Hartman
maintainerPATCH 93/99 x86/mce: Improve error message when kernel cannot recover, p2
In reply to Greg Kroah-HartmanFrom: Tony Luck <[email protected]>
commit 41f035a86b5b72a4f947c38e94239d20d595352a upstream.
In
c7d606f560e4 ("x86/mce: Improve error message when kernel cannot recover")
a case was added for a machine check caused by a DATA access to poison memory from the kernel. A case should have been added also for an uncorrectable error during an instruction fetch in the kernel.
Add that extra case so the error message now reads:
mce: [Hardware Error]: Machine check: Instruction fetch error in kernel
--- arch/x86/kernel/cpu/mcheck/mce-severity.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/kernel/cpu/mcheck/mce-severity.c +5 -0
@@ -165,6 +165,11 @@ static struct severity { SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_DATA), KERNEL ), + MCESEV( + PANIC, "Instruction fetch error in kernel", + SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_INSTR), + KERNEL + ),#endif MCESEV( PANIC, "Action required: unknown MCACOD",
Greg Kroah-Hartman
maintainerPATCH 94/99 clk: x86: Add system specific quirk to mark clocks as critical
In reply to Greg Kroah-HartmanFrom: David Müller <[email protected]>
commit 7c2e07130090ae001a97a6b65597830d6815e93e upstream.
Since commit 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL"), the pmc_plt_clocks of the Bay Trail SoC are unconditionally gated off. Unfortunately this will break systems where these clocks are used for external purposes beyond the kernel's knowledge. Fix it by implementing a system specific quirk to mark the necessary pmc_plt_clks as critical.
--- drivers/clk/x86/clk-pmc-atom.c | 14 +++++++++++--- drivers/platform/x86/pmc_atom.c | 21 +++++++++++++++++++++ include/linux/platform_data/x86/clk-pmc-atom.h | 3 +++ 3 files changed, 35 insertions(+), 3 deletions(-)
drivers/clk/x86/clk-pmc-atom.c +11 -3
@@ -165,7 +165,7 @@ static const struct clk_ops plt_clk_ops };static struct clk_plt *plt_clk_register (struct platform_device *pdev,int id, -void __iomem *base, +const struct pmc_clk_data *pmc_data,const char **parent_names,int num_parents) {
@@ -184,9 +184,17 @@ static struct clk_plt *plt_clk_register( init.num_parents = num_parents; pclk->hw.init = &init; - pclk->reg = base +PMC_CLK_CTL_OFFSET + id *PMC_CLK_CTL_SIZE ; + pclk->reg = pmc_data->base +PMC_CLK_CTL_OFFSET + id *PMC_CLK_CTL_SIZE ;spin_lock_init (&pclk->lock); +/* +* On some systems, the pmc_plt_clocks already enabled by the +* firmware are being marked as critical to avoid them being +* gated by the clock framework. +*/ +if (pmc_data->critical &&plt_clk_is_enabled (&pclk->hw)) + init.flags |=CLK_IS_CRITICAL ; + ret =devm_clk_hw_register (&pdev->dev, &pclk->hw);if (ret) { pclk =ERR_PTR (ret);
@@ -332,7 +340,7 @@ static int plt_clk_probe(struct platformreturn PTR_ERR (parent_names);for (i =0 ; i <PMC_CLK_NUM ; i++) { - data->clks[i] =plt_clk_register (pdev, i, pmc_data->base, + data->clks[i] =plt_clk_register (pdev, i, pmc_data, parent_names, data->nparents);if (IS_ERR (data->clks[i])) { err =PTR_ERR (data->clks[i]);
drivers/platform/x86/pmc_atom.c +21 -0
@@ -17,6 +17,7 @@#include <linux/debugfs.h> #include <linux/device.h> +#include <linux/dmi.h> #include <linux/init.h> #include <linux/io.h> #include <linux/platform_data/x86/clk-pmc-atom.h>
@@ -391,11 +392,27 @@ static int pmc_dbgfs_register(struct pmc }#endif /* CONFIG_DEBUG_FS */ +/* +* Some systems need one or more of their pmc_plt_clks to be +* marked as critical. +*/ +static const struct dmi_system_id critclk_systems[]__initconst = { + { + .ident ="MPL CEC1x" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"MPL AG" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"CEC10 Family" ), + }, + }, + {/*sentinel*/ } +}; +static int pmc_setup_clks (struct pci_dev *pdev,void __iomem *pmc_regmap,const struct pmc_data *pmc_data) {struct platform_device *clkdev;struct pmc_clk_data *clk_data; +const struct dmi_system_id *d =dmi_first_match (critclk_systems); clk_data =kzalloc (sizeof (*clk_data),GFP_KERNEL );if (!clk_data)
@@ -403,6 +420,10 @@ static int pmc_setup_clks(struct pci_dev clk_data->base = pmc_regmap;/* offset is added by client */ clk_data->clks = pmc_data->clks; +if (d) { + clk_data->critical = true; +pr_info ("%s critclks quirk enabled\n" , d->ident); + } clkdev = platform_device_register_data(&pdev->dev, "clk-pmc-atom", PLATFORM_DEVID_NONE,
include/linux/platform_data/x86/clk-pmc-atom.h +3 -0
@@ -35,10 +35,13 @@ struct pmc_clk {* * @base: PMC clock register base offset * @clks: pointer to set of registered clocks, typically 0..5 +* @critical: flag to indicate if firmware enabled pmc_plt_clks +* should be marked as critial or not */ struct pmc_clk_data {void __iomem *base;const struct pmc_clk *clks; +bool critical; };#endif /* __PLATFORM_DATA_X86_CLK_PMC_ATOM_H */
Greg Kroah-Hartman
maintainerPATCH 95/99 x86/mm/KASLR: Fix the size of the direct mapping section
In reply to Greg Kroah-HartmanFrom: Baoquan He <[email protected]>
commit ec3937107ab43f3e8b2bc9dad95710043c462ff7 upstream.
kernel_randomize_memory() uses __PHYSICAL_MASK_SHIFT to calculate the maximum amount of system RAM supported. The size of the direct mapping section is obtained from the smaller one of the below two values:
(actual system RAM size + padding size) vs (max system RAM size supported)
This calculation is wrong since commit
b83ce5ee9147 ("x86/mm/64: Make __PHYSICAL_MASK_SHIFT always 52").
In it, __PHYSICAL_MASK_SHIFT was changed to be 52, regardless of whether the kernel is using 4-level or 5-level page tables. Thus, it will always use 4 PB as the maximum amount of system RAM, even in 4-level paging mode where it should actually be 64 TB.
Thus, the size of the direct mapping section will always be the sum of the actual system RAM size plus the padding size.
Even when the amount of system RAM is 64 TB, the following layout will still be used. Obviously KALSR will be weakened significantly.
|____|_______actual RAM_______|_padding_|______the rest_______| 0 64TB ~120TB
Instead, it should be like this:
|____|_______actual RAM_______|_________the rest______________| 0 64TB ~120TB
The size of padding region is controlled by CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING, which is 10 TB by default.
The above issue only exists when CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING is set to a non-zero value, which is the case when CONFIG_MEMORY_HOTPLUG is enabled. Otherwise, using __PHYSICAL_MASK_SHIFT doesn't affect KASLR.
Fix it by replacing __PHYSICAL_MASK_SHIFT with MAX_PHYSMEM_BITS.
[ bp: Massage commit message. ]
--- arch/x86/mm/kaslr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/mm/kaslr.c +1 -1
@@ -93,7 +93,7 @@ void __init kernel_randomize_memory(voidif (!kaslr_memory_enabled ())return ; - kaslr_regions[0 ].size_tb =1 << (__PHYSICAL_MASK_SHIFT -TB_SHIFT ); + kaslr_regions[0 ].size_tb =1 << (MAX_PHYSMEM_BITS -TB_SHIFT ); kaslr_regions[1 ].size_tb =VMALLOC_SIZE_TB ;/*
Greg Kroah-Hartman
maintainerPATCH 96/99 x86/mm: Fix a crash with kmemleak_scan()
In reply to Greg Kroah-HartmanFrom: Qian Cai <[email protected]>
commit 0d02113b31b2017dd349ec9df2314e798a90fa6e upstream.
The first kmemleak_scan() call after boot would trigger the crash below because this callpath:
kernel_init
free_initmem
mem_encrypt_free_decrypted_mem
free_init_pages
unmaps memory inside the .bss when DEBUG_PAGEALLOC=y.
kmemleak_init() will register the .data/.bss sections and then kmemleak_scan() will scan those addresses and dereference them looking for pointer references. If free_init_pages() frees and unmaps pages in those sections, kmemleak_scan() will crash if referencing one of those addresses:
BUG: unable to handle kernel paging request at ffffffffbd402000 CPU: 12 PID: 325 Comm: kmemleak Not tainted 5.1.0-rc4+ #4 RIP: 0010:scan_block Call Trace: scan_gray_list kmemleak_scan kmemleak_scan_thread kthread ret_from_fork
Since kmemleak_free_part() is tolerant to unknown objects (not tracked by kmemleak), it is fine to call it from free_init_pages() even if not all address ranges passed to this function are known to kmemleak.
[ bp: Massage. ]
--- arch/x86/mm/init.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/mm/init.c +6 -0
@@ -6,6 +6,7 @@#include <linux/bootmem.h> /* for max_low_pfn */ #include <linux/swapfile.h> #include <linux/swapops.h> +#include <linux/kmemleak.h> #include <asm/set_memory.h> #include <asm/e820/api.h>
@@ -767,6 +768,11 @@ void free_init_pages(char *what, unsigneif (debug_pagealloc_enabled ()) {pr_info ("debug: unmapping init [mem %#010lx-%#010lx]\n" , begin, end -1 ); +/* +* Inform kmemleak about the hole in the memory since the +* corresponding pages will be unmapped. +*/ +kmemleak_free_part ((void *)begin, end - begin);set_memory_np (begin, (end - begin) >>PAGE_SHIFT ); }else {/*
Greg Kroah-Hartman
maintainerPATCH 97/99 x86/mm/tlb: Revert "x86/mm: Align TLB invalidation info"
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
commit 780e0106d468a2962b16b52fdf42898f2639e0a0 upstream.
Revert the following commit:
515ab7c41306: ("x86/mm: Align TLB invalidation info")
I found out (the hard way) that under some .config options (notably L1_CACHE_SHIFT=7) and compiler combinations this on-stack alignment leads to a 320 byte stack usage, which then triggers a KASAN stack warning elsewhere.
Using 320 bytes of stack space for a 40 byte structure is ludicrous and clearly not right.
--- arch/x86/mm/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/mm/tlb.c +1 -1
@@ -694,7 +694,7 @@ void flush_tlb_mm_range(struct mm_struct {int cpu; -struct flush_tlb_info info__aligned(SMP_CACHE_BYTES) = { +struct flush_tlb_info info = { .mm = mm, };
Greg Kroah-Hartman
maintainerPATCH 98/99 i2c: i2c-stm32f7: Fix SDADEL minimum formula
In reply to Greg Kroah-HartmanFrom: Nicolas Le Bayon <[email protected]>
commit c86da50cfd840edf223a242580913692acddbcf6 upstream.
It conforms with Reference Manual I2C timing section.
--- drivers/i2c/busses/i2c-stm32f7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-stm32f7.c +1 -1
@@ -424,7 +424,7 @@ static int stm32f7_i2c_compute_timing(st STM32F7_I2C_ANALOG_FILTER_DELAY_MAX : 0); dnf_delay = setup->dnf * i2cclk; - sdadel_min = setup->fall_time - i2c_specs[setup->speed].hddat_min - + sdadel_min = i2c_specs[setup->speed].hddat_min + setup->fall_time - af_delay_min - (setup->dnf +3 ) * i2cclk; sdadel_max = i2c_specs[setup->speed].vddat_max - setup->rise_time -
Greg Kroah-Hartman
maintainerPATCH 99/99 media: v4l2: i2c: ov7670: Fix PLL bypass register values
In reply to Greg Kroah-HartmanFrom: Jacopo Mondi <[email protected]>
commit 61da76beef1e4f0b6ba7be4f8d0cf0dac7ce1f55 upstream.
The following commits:
commit f6dd927f34d6 ("[media] media: ov7670: calculate framerate properly for ov7675") commit 04ee6d92047e ("[media] media: ov7670: add possibility to bypass pll for ov7675") introduced the ability to bypass PLL multiplier and use input clock (xvclk) as pixel clock output frequency for ov7675 sensor.
PLL is bypassed using register DBLV[7:6], according to ov7670 and ov7675 sensor manuals. Macros used to set DBLV register seem wrong in the driver, as their values do not match what reported in the datasheet.
Fix by changing DBLV_* macros to use bits [7:6] and set bits [3:0] to default 0x0a reserved value (according to datasheets).
While at there, remove a write to DBLV register in "ov7675_set_framerate()" that over-writes the previous one to the same register that takes "info->pll_bypass" flag into account instead of setting PLL multiplier to 4x unconditionally.
And, while at there, since "info->pll_bypass" is only used in set/get_framerate() functions used by ov7675 only, it is not necessary to check for the device id at probe time to make sure that when using ov7670 "info->pll_bypass" is set to false.
--- drivers/media/i2c/ov7670.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/media/i2c/ov7670.c +6 -10
@@ -159,10 +159,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-#define REG_GFIX 0x69/* Fix gain control */ #define REG_DBLV 0x6b/* PLL control an debugging */ -#define DBLV_BYPASS 0x00/* Bypass PLL */ -#define DBLV_X4 0x01/* clock x4 */ -#define DBLV_X6 0x10/* clock x6 */ -#define DBLV_X8 0x11/* clock x8 */ +#define DBLV_BYPASS 0x0a/* Bypass PLL */ +#define DBLV_X4 0x4a/* clock x4 */ +#define DBLV_X6 0x8a/* clock x6 */ +#define DBLV_X8 0xca/* clock x8 */ #define REG_SCALING_XSC 0x70/* Test pattern and horizontal scale factor */ #define TEST_PATTTERN_0 0x80
@@ -862,7 +862,7 @@ static int ov7675_set_framerate(struct vif (ret <0 )return ret; -return ov7670_write (sd,REG_DBLV ,DBLV_X4 ); +return 0 ; } static void ov7670_get_framerate_legacy(struct v4l2_subdev *sd,
@@ -1797,11 +1797,7 @@ static int ov7670_probe(struct i2c_clienif (config->clock_speed) info->clock_speed = config->clock_speed; -/* -* It should be allowed for ov7670 too when it is migrated to -* the new frame rate formula. -*/ -if (config->pll_bypass && id->driver_data !=MODEL_OV7670 ) +if (config->pll_bypass) info->pll_bypass = true;if (config->pclk_hb_disable)
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.41 release. There are 99 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 08 May 2019 02:29:12 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.41-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.19.41-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.19.y
git commit: f897c76a347c330cca7fc03afaa64164eda545f7
git describe: v4.19.40-100-gf897c76a347c
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.19-oe/build/v4.19.40-100-gf897c76a347c
No regressions (compared to build v4.19.40)
No fixes (compared to build v4.19.40)
Ran 24695 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libgpiod
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* kvm-unit-tests
* ltp-open-posix-tests
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.41 release. There are 99 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 08 May 2019 02:29:12 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.41-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v4.19:
12 builds: 12 pass, 0 fail
22 boots: 22 pass, 0 fail
32 tests: 32 pass, 0 failLinux version: 4.19.41-rc1-gf897c76a
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Cheers
Jon
Signature · 1 line
nvpublic
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.41 release. There are 99 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 08 May 2019 02:29:12 PM UTC. Anything received after that time might be too late.
Build results:
total: 156 pass: 156 fail: 0 Qemu test results: total: 349 pass: 349 fail: 0
Guenter
stable-rc/linux-4.19.y boot: 54 boots: 0 failed, 53 passed with 1 untried/unknown (v4.19.40-100-gf897c76a347c)
stable-rc/linux-4.19.y boot: 54 boots: 0 failed, 53 passed with 1 untried/unknown (v4.19.40-100-gf897c76a347c)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.19.y/kernel/v4.19.40-100-gf897c76a347c/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.19.y/kernel/v4.19.40-100-gf897c76a347c/
Tree: stable-rc
Branch: linux-4.19.y
Git Describe: v4.19.40-100-gf897c76a347c
Git Commit: f897c76a347c330cca7fc03afaa64164eda545f7
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 24 unique boards, 11 SoC families, 10 builds out of 206
---
For more info write to <[email protected]>
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.41 release. There are 99 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 08 May 2019 02:29:12 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.41-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah