5.4.50-rc1 review
Subsystems (2)
Sasha Levin
maintainercover 5.4.50-rc1 review
This is the start of the stable review cycle for the 5.4.50 release. There are 178 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 01 Jul 2020 03:25:02 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/patch/?id=linux-5.4.y&id2=v5.4.49
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y
and the diffstat can be found below.
--
Thanks,
Sasha
-------------------------
Pseudo-Shortlog of commits:
Aaron Plattner (1):
ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table
Aditya Pakki (3):
rocker: fix incorrect error handling in dma_rings_init RDMA/rvt: Fix potential memory leak caused by rvt_alloc_rq
test_objagg: Fix potential memory leak in error handling
Al Cooper (1):
xhci: Fix enumeration issue when setting max packet size for FS
devices.
Al Viro (1):
fix a braino in "sparc32: fix register window handling in
genregs32_[gs]et()"
Alexander Lobakin (7):
net: qed: fix left elements count calculation
net: qed: fix async event callbacks unregistering
net: qede: stop adding events on an already destroyed workqueue
net: qed: fix NVMe login fails over VFs
net: qed: fix excessive QM ILT lines consumption
net: qede: fix PTP initialization on recovery
net: qede: fix use-after-free on recovery and AER handling
Anton Eidelman (2):
nvme-multipath: fix deadlock between ana_work and scan_work
nvme-multipath: fix deadlock due to head->lock
Bernard Zhao (1):
drm/amd: fix potential memleak in err branch
Charles Keepax (1):
regmap: Fix memory leak from regmap_register_patch
Chuck Lever (2):
SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment()
xprtrdma: Fix handling of RDMA_ERROR replies
Chuhong Yuan (1):
USB: ohci-sm501: Add missed iounmap() in remove
Claudiu Manoil (1):
enetc: Fix tx rings bitmap iteration range, irq handling
Dan Carpenter (3):
x86/resctrl: Fix a NULL vs IS_ERR() static checker warning in
rdt_cdp_peer_get()
usb: gadget: udc: Potential Oops in error handling code
Staging: rtl8723bs: prevent buffer overflow in
update_sta_support_rate()
Daniel Gomez (1):
drm: rcar-du: Fix build error
Dave Martin (1):
arm64/sve: Eliminate data races on sve_default_vl
David Christensen (1):
tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes
David Howells (3):
rxrpc: Fix notification call on completion of discarded calls
rxrpc: Fix handling of rwind from an ACK packet
afs: Fix storage of cell names
Denis Efremov (2):
drm/amd/display: Use kfree() to free rgb_user in
calculate_user_regamma_ramp()
drm/radeon: fix fb_div check in ni_init_smc_spll_table()
Denis Kirjanov (1):
tcp: don't ignore ECN CWR on pure ACK
Dennis Dalessandro (1):
IB/hfi1: Fix module use count flaw due to leftover module put calls
Dinghao Liu (1):
hwrng: ks-sa - Fix runtime PM imbalance on error
Dmitry Baryshkov (1):
pinctrl: qcom: spmi-gpio: fix warning about irq chip reusage
Doug Berger (1):
net: bcmgenet: use hardware padding of runt frames
Drew Fustini (1):
ARM: dts: am335x-pocketbeagle: Fix mmc0 Write Protect
Eddie James (1):
i2c: fsi: Fix the port number field in status register
Eric Dumazet (2):
net: increment xmit_recursion level in dev_direct_xmit()
tcp: grow window for OOO packets only for SACK flows
Fabian Vogt (1):
efi/tpm: Verify event log header before parsing
Fan Guo (1):
RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads()
Filipe Manana (4):
btrfs: fix bytes_may_use underflow when running balance and scrub in
parallel
btrfs: fix data block group relocation failure due to concurrent scrub
btrfs: check if a log root exists before locking the log_mutex on
unlink
btrfs: fix failure of RWF_NOWAIT write into prealloc extent beyond eof
Florian Fainelli (1):
net: phy: Check harder for errors in get_phy_id()
Gao Xiang (1):
erofs: fix partially uninitialized misuse in z_erofs_onlinepage_fixup
Gaurav Singh (1):
bpf, xdp, samples: Fix null pointer dereference in *_user code
Huaisheng Ye (1):
dm writecache: correct uncommitted_block when discarding uncommitted
entry
Huy Nguyen (1):
xfrm: Fix double ESP trailer insertion in IPsec crypto offload.
Ilya Ponetayev (1):
sch_cake: don't try to reallocate or unshare skb unconditionally
Jason A. Donenfeld (1):
ACPI: configfs: Disallow loading ACPI tables when locked down
Jeremy Kerr (1):
net: usb: ax88179_178a: fix packet alignment padding
Jiping Ma (1):
arm64: perf: Report the PC value in REGS_ABI_32 mode
Joakim Tjernlund (1):
cdc-acm: Add DISABLE_ECHO quirk for Microchip/SMSC chip
Julian Wiedmann (1):
s390/qeth: fix error handling for isolation mode cmds
Junxiao Bi (4):
ocfs2: avoid inode removal while nfsd is accessing it
ocfs2: load global_inode_alloc
ocfs2: fix value of OCFS2_INVALID_SLOT
ocfs2: fix panic on nfs server over ocfs2
Juri Lelli (2):
sched/deadline: Initialize ->dl_boosted sched/core: Fix PI boosting between RT and DEADLINE tasks
Kai-Heng Feng (3):
xhci: Poll for U0 after disabling USB2 LPM
xhci: Return if xHCI doesn't support LPM
ALSA: hda/realtek: Add mute LED and micmute LED support for HP systems
Kees Cook (1):
x86/cpu: Use pinning mask for CR4 bits needing to be 0
Keith Busch (1):
nvme-multipath: set bdi capabilities once
Laurence Tratt (1):
ALSA: usb-audio: Add implicit feedback quirk for SSL2+.
Li Jun (1):
usb: typec: tcpci_rt1711h: avoid screaming irq causing boot hangs
Longfang Liu (1):
USB: ehci: reopen solution for Synopsys HC bug
Lorenzo Bianconi (2):
openvswitch: take into account de-fragmentation/gso_size in
execute_check_pkt_len
samples/bpf: xdp_redirect_cpu: Set MAX_CPUS according to NR_CPUS
Lu Baolu (2):
iommu/vt-d: Enable PCI ACS for platform opt in hint iommu/vt-d: Update scalable mode paging structure coherency
Luis Chamberlain (1):
blktrace: break out of blktrace setup on concurrent calls
Macpaul Lin (2):
usb: host: xhci-mtk: avoid runtime suspend when removing hcd
ALSA: usb-audio: add quirk for Samsung USBC Headset (AKG)
Mans Rullgard (1):
i2c: core: check returned size of emulated smbus block read
Marcelo Ricardo Leitner (1):
sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket
Mark Zhang (1):
RDMA/cma: Protect bind_list and listen_list while finding matching cm
id
Masahiro Yamada (1):
kbuild: improve cc-option to clean up all temporary files
Masami Hiramatsu (2):
kprobes: Suppress the suspicious RCU warning on kprobes
tracing: Fix event trigger to accept redundant spaces
Mathias Nyman (1):
xhci: Fix incorrect EP_STATE_MASK
Matt Fleming (1):
x86/asm/64: Align start of __clear_user() loop to 16-bytes
Matthew Hagan (1):
ARM: dts: NSP: Correct FA2 mailbox node
Michal Kalderon (1):
RDMA/qedr: Fix KASAN: use-after-free in ucma_event_handler+0x532
Mikulas Patocka (1):
dm writecache: add cond_resched to loop in persistent_memory_claim()
Minas Harutyunyan (1):
usb: dwc2: Postponed gadget registration to the udc class driver
Muchun Song (1):
mm/memcontrol.c: add missed css_put()
Nathan Chancellor (2):
s390/vdso: Use $(LD) instead of $(CC) to link vDSO
ACPI: sysfs: Fix pm_profile_attr type
Nathan Huckleberry (1):
riscv/atomic: Fix sign extension for RV64I
Navid Emamdoost (1):
sata_rcar: handle pm_runtime_get_sync failure cases
Neal Cardwell (1):
tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT
Olga Kornievskaia (1):
NFSv4 fix CLOSE not waiting for direct IO compeletion
Peter Chen (3):
usb: cdns3: trace: using correct dir value
usb: cdns3: ep0: fix the test mode set incorrectly
usb: cdns3: ep0: add spinlock for cdns3_check_new_setup
Qiushi Wu (2):
efi/esrt: Fix reference count leak in esre_create_sysfs_entry.
ASoC: rockchip: Fix a reference count leak.
Rahul Lakkireddy (1):
cxgb4: move handling L2T ARP failures to caller
Robin Gong (3):
regualtor: pfuze100: correct sw1a/sw2 on pfuze3000
arm64: dts: imx8mm-evk: correct ldo1/ldo2 voltage range
arm64: dts: imx8mn-ddr4-evk: correct ldo1/ldo2 voltage range
Roman Bolshakov (1):
scsi: qla2xxx: Keep initiator ports after RSCN
Russell King (1):
netfilter: ipset: fix unaligned atomic access
Sabrina Dubroca (1):
geneve: allow changing DF behavior after creation
Sagi Grimberg (2):
nvme: fix possible deadlock when I/O is blocked
nvme: don't protect ns mutation with ns->head->lock
Sami Tolvanen (1):
recordmcount: support >64k sections
Sasha Levin (2):
btrfs: fix a block group ref counter leak after failure to remove
block group
Linux 5.4.50-rc1
Sean Christopherson (2):
KVM: nVMX: Plumb L2 GPA through to PML emulation
KVM: VMX: Stop context switching MSR_IA32_UMWAIT_CONTROL
SeongJae Park (1):
scsi: lpfc: Avoid another null dereference in lpfc_sli4_hba_unset()
Shay Drory (1):
IB/mad: Fix use after free when destroying MAD agent
Shengjiu Wang (1):
ASoC: fsl_ssi: Fix bclk calculation for mono channel
Srinivas Kandagatla (3):
ASoC: q6asm: handle EOS correctly
ASoc: q6afe: add support to get port direction
ASoC: qcom: common: set correct directions for dailinks
Stanislav Fomichev (1):
bpf: Don't return EINVAL from {get,set}sockopt when optlen > PAGE_SIZE
Steffen Maier (1):
scsi: zfcp: Fix panic on ERP timeout for previously dismissed ERP
action
Steven Rostedt (VMware) (1):
ring-buffer: Zero out time extend if it is nested and not absolute
Sven Auhagen (1):
mvpp2: ethtool rxtx stats fix
Sven Schnelle (2):
s390/ptrace: pass invalid syscall numbers to tracing s390/ptrace: fix setting syscall number
Taehee Yoo (3):
net: core: reduce recursion limit value
ip6_gre: fix use-after-free in ip6gre_tunnel_lookup()
ip_tunnel: fix use-after-free in ip_tunnel_lookup()
Takashi Iwai (3):
ALSA: usb-audio: Fix potential use-after-free of streams
ALSA: usb-audio: Fix OOB access of mixer element list
ALSA: hda/realtek - Add quirk for MSI GE63 laptop
Tang Bin (1):
usb: host: ehci-exynos: Fix error check in exynos_ehci_probe()
Tariq Toukan (1):
net: Do not clear the sock TX queue in sk_set_socket()
Thierry Reding (1):
Revert "i2c: tegra: Fix suspending in active runtime PM state"
Thomas Falcon (2):
ibmveth: Fix max MTU limit
ibmvnic: Harden device login requests
Thomas Martitz (1):
net: bridge: enfore alignment for ethernet address
Todd Kjos (1):
binder: fix null deref of proc->context
Toke Høiland-Jørgensen (3):
sch_cake: don't call diffserv parsing code when it is not needed
sch_cake: fix a few style nits
devmap: Use bpf_map_area_alloc() for allocating hash buckets
Tom Seewald (1):
RDMA/siw: Fix pointer-to-int-cast warning in siw_rx_pbl()
Tomasz Meresiński (1):
usb: add USB_QUIRK_DELAY_INIT for Logitech C922
Tony Lindgren (4):
bus: ti-sysc: Flush posted write on enable and disable
bus: ti-sysc: Ignore clockactivity unless specified as a quirk
ARM: OMAP2+: Fix legacy mode dss_reset
ARM: dts: Fix duovero smsc interrupt for suspend
Trond Myklebust (1):
pNFS/flexfiles: Fix list corruption if the mirror count changes
Valentin Longchamp (1):
net: sched: export __netdev_watchdog_up()
Vasily Averin (1):
sunrpc: fixed rollback in rpc_gssd_dummy_populate()
Vidya Sagar (1):
pinctrl: tegra: Use noirq suspend/resume callbacks
Vincent Chen (1):
clk: sifive: allocate sufficient memory for struct __prci_data
Vincenzo Frascino (1):
s390/vdso: fix vDSO clock_getres()
Waiman Long (1):
mm/slab: use memzero_explicit() in kzfree()
Wang Hai (1):
mld: fix memory leak in ipv6_mc_destroy_dev()
Weiping Zhang (1):
block: update hctx map when use multiple maps
Wenhui Sheng (1):
drm/amdgpu: add fw release for sdma v5_0
Will Deacon (1):
arm64: sve: Fix build failure when ARM64_SVE=y and SYSCTL=n
Willem de Bruijn (1):
selftests/net: report etf errors correctly
Xiaoyao Li (1):
KVM: X86: Fix MSR range of APIC registers in X2APIC mode
Xiyu Yang (1):
cifs: Fix cached_fid refcnt leak in open_shroot
Yang Yingliang (1):
net: fix memleak in register_netdevice()
Yash Shah (1):
RISC-V: Don't allow write+exec only page mapping request in mmap
Ye Bin (1):
ata/libata: Fix usage of page address by page_address in
ata_scsi_mode_select_xlat function
Yick W. Tse (1):
ALSA: usb-audio: add quirk for Denon DCD-1500RE
Yoshihiro Shimoda (1):
usb: renesas_usbhs: getting residue from callback_result
Zekun Shen (1):
net: alx: fix race condition in alx_remove
Zhang Xiaoxu (2):
cifs/smb3: Fix data inconsistent when punch hole cifs/smb3: Fix data inconsistent when zero file range
Zheng Bin (2):
loop: replace kill_bdev with invalidate_bdev
xfs: add agf freeblocks verify in xfs_agf_verify
guodeqing (1):
net: Fix the arp error in some cases
yu kuai (2):
block/bio-integrity: don't free 'buf' if bio_integrity_add_page()
failed
ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram()
Makefile | 4 +- arch/arm/boot/dts/am335x-pocketbeagle.dts | 1 - arch/arm/boot/dts/bcm-nsp.dtsi | 6 +- arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- arch/arm/mach-imx/pm-imx5.c | 6 +- arch/arm/mach-omap2/omap_hwmod.c | 2 +- arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 4 +- .../boot/dts/freescale/imx8mn-ddr4-evk.dts | 4 +- arch/arm64/kernel/fpsimd.c | 31 ++++-- arch/arm64/kernel/perf_regs.c | 25 ++++- arch/riscv/include/asm/cmpxchg.h | 8 +- arch/riscv/kernel/sys_riscv.c | 6 ++ arch/s390/include/asm/vdso.h | 1 + arch/s390/kernel/asm-offsets.c | 2 +- arch/s390/kernel/entry.S | 2 +- arch/s390/kernel/ptrace.c | 37 ++++++- arch/s390/kernel/time.c | 1 + arch/s390/kernel/vdso64/Makefile | 10 +- arch/s390/kernel/vdso64/clock_getres.S | 10 +- arch/sparc/kernel/ptrace_32.c | 9 +- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kernel/cpu/common.c | 24 ++--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 1 + arch/x86/kernel/cpu/umwait.c | 6 -- arch/x86/kvm/mmu.c | 4 +- arch/x86/kvm/mmu.h | 2 +- arch/x86/kvm/paging_tmpl.h | 7 +- arch/x86/kvm/vmx/vmx.c | 24 +---- arch/x86/kvm/vmx/vmx.h | 2 - arch/x86/kvm/x86.c | 4 +- arch/x86/lib/usercopy_64.c | 1 + block/bio-integrity.c | 1 - block/blk-mq.c | 4 +- drivers/acpi/acpi_configfs.c | 6 +- drivers/acpi/sysfs.c | 4 +- drivers/android/binder.c | 14 +-- drivers/ata/libata-scsi.c | 9 +- drivers/ata/sata_rcar.c | 11 ++- drivers/base/regmap/regmap.c | 1 + drivers/block/loop.c | 6 +- drivers/bus/ti-sysc.c | 15 ++- drivers/char/hw_random/ks-sa-rng.c | 1 + drivers/clk/sifive/fu540-prci.c | 5 +- drivers/firmware/efi/esrt.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 1 + .../amd/display/modules/color/color_gamma.c | 2 +- drivers/gpu/drm/radeon/ni_dpm.c | 2 +- drivers/gpu/drm/rcar-du/Kconfig | 1 + drivers/i2c/busses/i2c-fsi.c | 2 +- drivers/i2c/busses/i2c-tegra.c | 9 -- drivers/i2c/i2c-core-smbus.c | 7 ++ drivers/infiniband/core/cma.c | 18 ++++ drivers/infiniband/core/mad.c | 3 +- drivers/infiniband/hw/hfi1/debugfs.c | 19 +--- drivers/infiniband/hw/qedr/qedr_iw_cm.c | 13 ++- drivers/infiniband/sw/rdmavt/qp.c | 6 +- drivers/infiniband/sw/siw/siw_qp_rx.c | 3 +- drivers/iommu/dmar.c | 3 +- drivers/iommu/intel-iommu.c | 13 ++- drivers/md/dm-writecache.c | 4 + drivers/net/ethernet/atheros/alx/main.c | 9 +- .../net/ethernet/broadcom/genet/bcmgenet.c | 8 +- drivers/net/ethernet/broadcom/tg3.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/l2t.c | 52 +++++----- drivers/net/ethernet/freescale/enetc/enetc.c | 4 +- drivers/net/ethernet/ibm/ibmveth.c | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 21 +++- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_dev.c | 9 +- drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 2 - drivers/net/ethernet/qlogic/qed/qed_roce.c | 1 - drivers/net/ethernet/qlogic/qed/qed_vf.c | 23 ++++- drivers/net/ethernet/qlogic/qede/qede_main.c | 3 +- drivers/net/ethernet/qlogic/qede/qede_ptp.c | 31 +++--- drivers/net/ethernet/qlogic/qede/qede_ptp.h | 2 +- drivers/net/ethernet/qlogic/qede/qede_rdma.c | 3 +- drivers/net/ethernet/rocker/rocker_main.c | 4 +- drivers/net/geneve.c | 1 + drivers/net/phy/phy_device.c | 6 +- drivers/net/usb/ax88179_178a.c | 11 ++- drivers/nvme/host/core.c | 1 - drivers/nvme/host/multipath.c | 46 +++++---- drivers/nvme/host/nvme.h | 2 + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 21 ++-- drivers/pinctrl/tegra/pinctrl-tegra.c | 4 +- drivers/regulator/pfuze100-regulator.c | 60 ++++++++---- drivers/s390/net/qeth_core_main.c | 5 +- drivers/s390/scsi/zfcp_erp.c | 13 ++- drivers/scsi/lpfc/lpfc_init.c | 3 +- drivers/scsi/qla2xxx/qla_gs.c | 4 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 4 +- drivers/usb/cdns3/ep0.c | 10 +- drivers/usb/cdns3/trace.h | 2 +- drivers/usb/class/cdc-acm.c | 2 + drivers/usb/core/quirks.c | 3 +- drivers/usb/dwc2/gadget.c | 6 -- drivers/usb/dwc2/platform.c | 11 +++ drivers/usb/gadget/udc/mv_udc_core.c | 3 +- drivers/usb/host/ehci-exynos.c | 5 +- drivers/usb/host/ehci-pci.c | 7 ++ drivers/usb/host/ohci-sm501.c | 1 + drivers/usb/host/xhci-mtk.c | 5 +- drivers/usb/host/xhci.c | 9 +- drivers/usb/host/xhci.h | 2 +- drivers/usb/renesas_usbhs/fifo.c | 23 +++-- drivers/usb/renesas_usbhs/fifo.h | 2 +- drivers/usb/typec/tcpm/tcpci_rt1711h.c | 31 ++---- fs/afs/cell.c | 9 ++ fs/afs/internal.h | 2 +- fs/btrfs/block-group.c | 19 ++-- fs/btrfs/ctree.h | 2 + fs/btrfs/inode.c | 39 ++++++-- fs/btrfs/tree-log.c | 5 + fs/cifs/smb2ops.c | 12 +++ fs/erofs/zdata.h | 20 ++-- fs/nfs/direct.c | 13 ++- fs/nfs/file.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 11 ++- fs/ocfs2/dlmglue.c | 17 +++- fs/ocfs2/ocfs2.h | 1 + fs/ocfs2/ocfs2_fs.h | 4 +- fs/ocfs2/suballoc.c | 9 +- fs/xfs/libxfs/xfs_alloc.c | 16 +++ include/linux/netdevice.h | 2 +- include/linux/qed/qed_chain.h | 26 +++-- include/linux/tpm_eventlog.h | 14 ++- include/net/sctp/constants.h | 8 +- include/net/sock.h | 1 - include/net/xfrm.h | 1 + kernel/bpf/cgroup.c | 53 ++++++---- kernel/bpf/devmap.c | 10 +- kernel/kprobes.c | 3 +- kernel/sched/core.c | 3 +- kernel/sched/deadline.c | 1 + kernel/trace/blktrace.c | 13 +++ kernel/trace/ring_buffer.c | 2 +- kernel/trace/trace_events_trigger.c | 21 +++- lib/test_objagg.c | 4 +- mm/memcontrol.c | 4 +- mm/slab_common.c | 2 +- net/bridge/br_private.h | 2 +- net/core/dev.c | 9 ++ net/core/sock.c | 4 +- net/ipv4/fib_semantics.c | 2 +- net/ipv4/ip_tunnel.c | 14 +-- net/ipv4/tcp_cubic.c | 2 + net/ipv4/tcp_input.c | 26 ++++- net/ipv6/ip6_gre.c | 9 +- net/ipv6/mcast.c | 1 + net/netfilter/ipset/ip_set_core.c | 2 + net/openvswitch/actions.c | 9 +- net/rxrpc/call_accept.c | 7 ++ net/rxrpc/input.c | 7 +- net/sched/sch_cake.c | 58 +++++++---- net/sched/sch_generic.c | 1 + net/sctp/associola.c | 5 +- net/sctp/bind_addr.c | 1 + net/sctp/protocol.c | 3 +- net/sunrpc/rpc_pipe.c | 1 + net/sunrpc/xdr.c | 4 + net/sunrpc/xprtrdma/rpc_rdma.c | 9 +- net/xfrm/xfrm_device.c | 4 +- samples/bpf/xdp_monitor_user.c | 8 +- samples/bpf/xdp_redirect_cpu_kern.c | 2 +- samples/bpf/xdp_redirect_cpu_user.c | 34 +++---- samples/bpf/xdp_rxq_info_user.c | 13 +-- scripts/Kbuild.include | 11 ++- scripts/recordmcount.h | 98 +++++++++++++++++-- sound/pci/hda/patch_hdmi.c | 5 + sound/pci/hda/patch_realtek.c | 3 + sound/soc/fsl/fsl_ssi.c | 13 ++- sound/soc/qcom/common.c | 14 ++- sound/soc/qcom/qdsp6/q6afe.c | 8 ++ sound/soc/qcom/qdsp6/q6afe.h | 1 + sound/soc/qcom/qdsp6/q6asm.c | 7 +- sound/soc/rockchip/rockchip_pdm.c | 4 +- sound/usb/mixer.c | 15 ++- sound/usb/mixer.h | 9 +- sound/usb/mixer_quirks.c | 3 +- sound/usb/pcm.c | 2 + sound/usb/quirks.c | 9 ++ tools/testing/selftests/net/so_txtime.c | 33 +++++-- 184 files changed, 1165 insertions(+), 581 deletions(-)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 1/178 block/bio-integrity: don't free 'buf' if bio_integrity_add_page() failed
From: yu kuai <[email protected]>
commit a75ca9303175d36af93c0937dd9b1a6422908b8d upstream.
commit e7bf90e5afe3 ("block/bio-integrity: fix a memory leak bug") added a kfree() for 'buf' if bio_integrity_add_page() returns '0'. However, the object will be freed in bio_integrity_free() since 'bio->bi_opf' and 'bio->bi_integrity' were set previousy in bio_integrity_alloc().
--- block/bio-integrity.c | 1 - 1 file changed, 1 deletion(-)
block/bio-integrity.c +0 -1
@@ -278,7 +278,6 @@ bool bio_integrity_prep(struct bio *bio)if (ret ==0 ) {printk (KERN_ERR "could not attach integrity payload\n" ); -kfree (buf); status =BLK_STS_RESOURCE ; goto err_end_io; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 2/178 enetc: Fix tx rings bitmap iteration range, irq handling
In reply to Sasha LevinFrom: Claudiu Manoil <[email protected]>
[ Upstream commit 0574e2000fc3103cbc69ba82ec1175ce171fdf5e ]
The rings bitmap of an interrupt vector encodes which of the device's rings were assigned to that interrupt vector.
Hence the iteration range of the tx rings bitmap (for_each_set_bit()) should be the total number of Tx rings of that netdevice instead of the number of rings assigned to the interrupt vector.
Since there are 2 cores, and one interrupt vector for each core, the number of rings asigned to an interrupt vector is half the number of available rings. The impact of this error is that the upper half of the tx rings could still generate interrupts during napi polling.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +2 -2
@@ -254,7 +254,7 @@ static irqreturn_t enetc_msix(int irq, void *data)/* disable interrupts */ enetc_wr_reg (v->rbier,0 ); -for_each_set_bit (i, &v->tx_rings_map, v->count_tx_rings) +for_each_set_bit (i, &v->tx_rings_map,ENETC_MAX_NUM_TXQS )enetc_wr_reg (v->tbier_base +ENETC_BDR_OFF (i),0 );napi_schedule_irqoff (&v->napi);
@@ -290,7 +290,7 @@ static int enetc_poll(struct napi_struct *napi, int budget)/* enable interrupts */ enetc_wr_reg (v->rbier,ENETC_RBIER_RXTIE ); -for_each_set_bit (i, &v->tx_rings_map, v->count_tx_rings) +for_each_set_bit (i, &v->tx_rings_map,ENETC_MAX_NUM_TXQS )enetc_wr_reg (v->tbier_base +ENETC_BDR_OFF (i),ENETC_TBIER_TXTIE );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 3/178 geneve: allow changing DF behavior after creation
In reply to Sasha LevinFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 56c09de347e40804fc8dad155272fb9609e0a97b ]
Currently, trying to change the DF parameter of a geneve device does nothing:
# ip -d link show geneve1
14: geneve1: <snip>
link/ether <snip>
geneve id 1 remote 10.0.0.1 ttl auto df set dstport 6081 <snip>
# ip link set geneve1 type geneve id 1 df unset
# ip -d link show geneve1
14: geneve1: <snip>
link/ether <snip>
geneve id 1 remote 10.0.0.1 ttl auto df set dstport 6081 <snip>We just need to update the value in geneve_changelink.
--- drivers/net/geneve.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/geneve.c +1 -0
@@ -1649,6 +1649,7 @@ static int geneve_changelink(struct net_device *dev, struct nlattr *tb[], geneve->collect_md = metadata; geneve->use_udp6_rx_checksums = use_udp6_rx_checksums; geneve->ttl_inherit = ttl_inherit; + geneve->df = df;geneve_unquiesce (geneve, gs4, gs6);return 0 ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 4/178 ibmveth: Fix max MTU limit
In reply to Sasha LevinFrom: Thomas Falcon <[email protected]>
[ Upstream commit 5948378b26d89f8aa5eac37629dbd0616ce8d7a7 ]
The max MTU limit defined for ibmveth is not accounting for virtual ethernet buffer overhead, which is twenty-two additional bytes set aside for the ethernet header and eight additional bytes of an opaque handle reserved for use by the hypervisor. Update the max MTU to reflect this overhead.
--- drivers/net/ethernet/ibm/ibmveth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmveth.c +1 -1
@@ -1682,7 +1682,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) } netdev->min_mtu =IBMVETH_MIN_MTU ; - netdev->max_mtu =ETH_MAX_MTU ; + netdev->max_mtu =ETH_MAX_MTU -IBMVETH_BUFF_OH ;memcpy (netdev->dev_addr, mac_addr_p,ETH_ALEN );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 5/178 mld: fix memory leak in ipv6_mc_destroy_dev()
In reply to Sasha LevinFrom: Wang Hai <[email protected]>
[ Upstream commit ea2fce88d2fd678ed9d45354ff49b73f1d5615dd ]
Commit a84d01647989 ("mld: fix memory leak in mld_del_delrec()") fixed the memory leak of MLD, but missing the ipv6_mc_destroy_dev() path, in which mca_sources are leaked after ma_put().
Using ip6_mc_clear_src() to take care of the missing free.
BUG: memory leak
unreferenced object 0xffff8881113d3180 (size 64):
comm "syz-executor071", pid 389, jiffies 4294887985 (age 17.943s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 ff 02 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 ................
backtrace:
[<000000002cbc483c>] kmalloc include/linux/slab.h:555 [inline]
[<000000002cbc483c>] kzalloc include/linux/slab.h:669 [inline]
[<000000002cbc483c>] ip6_mc_add1_src net/ipv6/mcast.c:2237 [inline]
[<000000002cbc483c>] ip6_mc_add_src+0x7f5/0xbb0 net/ipv6/mcast.c:2357
[<0000000058b8b1ff>] ip6_mc_source+0xe0c/0x1530 net/ipv6/mcast.c:449
[<000000000bfc4fb5>] do_ipv6_setsockopt.isra.12+0x1b2c/0x3b30 net/ipv6/ipv6_sockglue.c:754
[<00000000e4e7a722>] ipv6_setsockopt+0xda/0x150 net/ipv6/ipv6_sockglue.c:950
[<0000000029260d9a>] rawv6_setsockopt+0x45/0x100 net/ipv6/raw.c:1081
[<000000005c1b46f9>] __sys_setsockopt+0x131/0x210 net/socket.c:2132
[<000000008491f7db>] __do_sys_setsockopt net/socket.c:2148 [inline]
[<000000008491f7db>] __se_sys_setsockopt net/socket.c:2145 [inline]
[<000000008491f7db>] __x64_sys_setsockopt+0xba/0x150 net/socket.c:2145
[<00000000c7bc11c5>] do_syscall_64+0xa1/0x530 arch/x86/entry/common.c:295
[<000000005fb7a3f3>] entry_SYSCALL_64_after_hwframe+0x49/0xb3--- net/ipv6/mcast.c | 1 + 1 file changed, 1 insertion(+)
net/ipv6/mcast.c +1 -0
@@ -2618,6 +2618,7 @@ void ipv6_mc_destroy_dev(struct inet6_dev *idev) idev->mc_list = i->next;write_unlock_bh (&idev->lock); +ip6_mc_clear_src (i);ma_put (i);write_lock_bh (&idev->lock); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 6/178 mvpp2: ethtool rxtx stats fix
In reply to Sasha LevinFrom: Sven Auhagen <[email protected]>
[ Upstream commit cc970925feb9a38c2f0d34305518e00a3084ce85 ]
The ethtool rx and tx queue statistics are reporting wrong values. Fix reading out the correct ones.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +2 -2
@@ -1541,7 +1541,7 @@ static void mvpp2_read_stats(struct mvpp2_port *port)for (q =0 ; q < port->ntxqs; q++)for (i =0 ; i <ARRAY_SIZE (mvpp2_ethtool_txq_regs); i++) *pstats++ +=mvpp2_read_index (port->priv, -MVPP22_CTRS_TX_CTR (port->id, i), +MVPP22_CTRS_TX_CTR (port->id, q), mvpp2_ethtool_txq_regs[i].offset);/* Rxqs are numbered from 0 from the user standpoint, but not from the
@@ -1550,7 +1550,7 @@ static void mvpp2_read_stats(struct mvpp2_port *port)for (q =0 ; q < port->nrxqs; q++)for (i =0 ; i <ARRAY_SIZE (mvpp2_ethtool_rxq_regs); i++) *pstats++ +=mvpp2_read_index (port->priv, - port->first_rxq + i, + port->first_rxq + q, mvpp2_ethtool_rxq_regs[i].offset); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 7/178 net: bridge: enfore alignment for ethernet address
In reply to Sasha LevinFrom: Thomas Martitz <[email protected]>
[ Upstream commit db7202dec92e6caa2706c21d6fc359af318bde2e ]
The eth_addr member is passed to ether_addr functions that require 2-byte alignment, therefore the member must be properly aligned to avoid unaligned accesses.
The problem is in place since the initial merge of multicast to unicast:
commit 6db6f0eae6052b70885562e1733896647ec1d807 bridge: multicast to unicast
--- net/bridge/br_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bridge/br_private.h +1 -1
@@ -208,8 +208,8 @@ struct net_bridge_port_group {struct rcu_head rcu;struct timer_list timer;struct br_ip addr; +unsigned char eth_addr[ETH_ALEN ]__aligned(2) ;unsigned char flags; -unsigned char eth_addr[ETH_ALEN ]; };struct net_bridge_mdb_entry {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 8/178 net: core: reduce recursion limit value
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit fb7861d14c8d7edac65b2fcb6e8031cb138457b2 ]
In the current code, ->ndo_start_xmit() can be executed recursively only 10 times because of stack memory.
But, in the case of the vxlan, 10 recursion limit value results in a stack overflow.
In the current code, the nested interface is limited by 8 depth. There is no critical reason that the recursion limitation value should be 10.
So, it would be good to be the same value with the limitation value of nesting interface depth.
Test commands:
ip link add vxlan10 type vxlan vni 10 dstport 4789 srcport 4789 4789
ip link set vxlan10 up
ip a a 192.168.10.1/24 dev vxlan10
ip n a 192.168.10.2 dev vxlan10 lladdr fc:22:33:44:55:66 nud permanent
for i in {9..0}
do
let A=$i+1
ip link add vxlan$i type vxlan vni $i dstport 4789 srcport 4789 4789
ip link set vxlan$i up
ip a a 192.168.$i.1/24 dev vxlan$i
ip n a 192.168.$i.2 dev vxlan$i lladdr fc:22:33:44:55:66 nud permanent
bridge fdb add fc:22:33:44:55:66 dev vxlan$A dst 192.168.$i.2 self
done
hping3 192.168.10.2 -2 -d 60000Splat looks like:
[ 103.814237][ T1127] ============================================================================= [ 103.871955][ T1127] BUG kmalloc-2k (Tainted: G B ): Padding overwritten. 0x00000000897a2e4f-0x000 [ 103.873187][ T1127] ----------------------------------------------------------------------------- [ 103.873187][ T1127] [ 103.874252][ T1127] INFO: Slab 0x000000005cccc724 objects=5 used=5 fp=0x0000000000000000 flags=0x10000000001020 [ 103.881323][ T1127] CPU: 3 PID: 1127 Comm: hping3 Tainted: G B 5.7.0+ #575 [ 103.882131][ T1127] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 [ 103.883006][ T1127] Call Trace: [ 103.883324][ T1127] dump_stack+0x96/0xdb [ 103.883716][ T1127] slab_err+0xad/0xd0 [ 103.884106][ T1127] ? _raw_spin_unlock+0x1f/0x30 [ 103.884620][ T1127] ? get_partial_node.isra.78+0x140/0x360 [ 103.885214][ T1127] slab_pad_check.part.53+0xf7/0x160 [ 103.885769][ T1127] ? pskb_expand_head+0x110/0xe10 [ 103.886316][ T1127] check_slab+0x97/0xb0 [ 103.886763][ T1127] alloc_debug_processing+0x84/0x1a0 [ 103.887308][ T1127] ___slab_alloc+0x5a5/0x630 [ 103.887765][ T1127] ? pskb_expand_head+0x110/0xe10 [ 103.888265][ T1127] ? lock_downgrade+0x730/0x730 [ 103.888762][ T1127] ? pskb_expand_head+0x110/0xe10 [ 103.889244][ T1127] ? __slab_alloc+0x3e/0x80 [ 103.889675][ T1127] __slab_alloc+0x3e/0x80 [ 103.890108][ T1127] __kmalloc_node_track_caller+0xc7/0x420
[ ... ]
--- include/linux/netdevice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/netdevice.h +1 -1
@@ -3043,7 +3043,7 @@ static inline int dev_recursion_level(void)return this_cpu_read (softnet_data.xmit.recursion); } -#define XMIT_RECURSION_LIMIT 10 +#define XMIT_RECURSION_LIMIT 8static inline bool dev_xmit_recursion (void ) { return unlikely(__this_cpu_read(softnet_data.xmit.recursion) >
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 9/178 net: Do not clear the sock TX queue in sk_set_socket()
In reply to Sasha LevinFrom: Tariq Toukan <[email protected]>
[ Upstream commit 41b14fb8724d5a4b382a63cb4a1a61880347ccb8 ]
Clearing the sock TX queue in sk_set_socket() might cause unexpected out-of-order transmit when called from sock_orphan(), as outstanding packets can pick a different TX queue and bypass the ones already queued.
This is undesired in general. More specifically, it breaks the in-order scheduling property guarantee for device-offloaded TLS sockets.
Remove the call to sk_tx_queue_clear() in sk_set_socket(), and add it explicitly only where needed.
--- include/net/sock.h | 1 - net/core/sock.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)
include/net/sock.h +0 -1
@@ -1803,7 +1803,6 @@ static inline int sk_rx_queue_get(const struct sock *sk)static inline void sk_set_socket (struct sock *sk,struct socket *sock) { -sk_tx_queue_clear (sk); sk->sk_socket = sock; }
net/core/sock.c +2 -0
@@ -1679,6 +1679,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,cgroup_sk_alloc (&sk->sk_cgrp_data);sock_update_classid (&sk->sk_cgrp_data);sock_update_netprioidx (&sk->sk_cgrp_data); +sk_tx_queue_clear (sk); }return sk;
@@ -1895,6 +1896,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)*/ sk_refcnt_debug_inc (newsk);sk_set_socket (newsk,NULL ); +sk_tx_queue_clear (newsk);RCU_INIT_POINTER (newsk->sk_wq,NULL );if (newsk->sk_prot->sockets_allocated)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 10/178 net: fix memleak in register_netdevice()
In reply to Sasha LevinFrom: Yang Yingliang <[email protected]>
[ Upstream commit 814152a89ed52c722ab92e9fbabcac3cb8a39245 ]
I got a memleak report when doing some fuzz test:
unreferenced object 0xffff888112584000 (size 13599):
comm "ip", pid 3048, jiffies 4294911734 (age 343.491s) hex dump (first 32 bytes):
74 61 70 30 00 00 00 00 00 00 00 00 00 00 00 00 tap0............
00 ee d9 19 81 88 ff ff 00 00 00 00 00 00 00 00 ................
backtrace:
[<000000002f60ba65>] __kmalloc_node+0x309/0x3a0
[<0000000075b211ec>] kvmalloc_node+0x7f/0xc0
[<00000000d3a97396>] alloc_netdev_mqs+0x76/0xfc0
[<00000000609c3655>] __tun_chr_ioctl+0x1456/0x3d70
[<000000001127ca24>] ksys_ioctl+0xe5/0x130
[<00000000b7d5e66a>] __x64_sys_ioctl+0x6f/0xb0
[<00000000e1023498>] do_syscall_64+0x56/0xa0
[<000000009ec0eb12>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
unreferenced object 0xffff888111845cc0 (size 8):
comm "ip", pid 3048, jiffies 4294911734 (age 343.491s)
hex dump (first 8 bytes):
74 61 70 30 00 88 ff ff tap0....
backtrace:
[<000000004c159777>] kstrdup+0x35/0x70
[<00000000d8b496ad>] kstrdup_const+0x3d/0x50
[<00000000494e884a>] kvasprintf_const+0xf1/0x180
[<0000000097880a2b>] kobject_set_name_vargs+0x56/0x140
[<000000008fbdfc7b>] dev_set_name+0xab/0xe0
[<000000005b99e3b4>] netdev_register_kobject+0xc0/0x390
[<00000000602704fe>] register_netdevice+0xb61/0x1250
[<000000002b7ca244>] __tun_chr_ioctl+0x1cd1/0x3d70
[<000000001127ca24>] ksys_ioctl+0xe5/0x130
[<00000000b7d5e66a>] __x64_sys_ioctl+0x6f/0xb0
[<00000000e1023498>] do_syscall_64+0x56/0xa0
[<000000009ec0eb12>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
unreferenced object 0xffff88811886d800 (size 512):
comm "ip", pid 3048, jiffies 4294911734 (age 343.491s)
hex dump (first 32 bytes):
00 00 00 00 ad 4e ad de ff ff ff ff 00 00 00 00 .....N..........
ff ff ff ff ff ff ff ff c0 66 3d a3 ff ff ff ff .........f=.....
backtrace:
[<0000000050315800>] device_add+0x61e/0x1950
[<0000000021008dfb>] netdev_register_kobject+0x17e/0x390
[<00000000602704fe>] register_netdevice+0xb61/0x1250
[<000000002b7ca244>] __tun_chr_ioctl+0x1cd1/0x3d70
[<000000001127ca24>] ksys_ioctl+0xe5/0x130
[<00000000b7d5e66a>] __x64_sys_ioctl+0x6f/0xb0
[<00000000e1023498>] do_syscall_64+0x56/0xa0
[<000000009ec0eb12>] entry_SYSCALL_64_after_hwframe+0x44/0xa9If call_netdevice_notifiers() failed, then rollback_registered() calls netdev_unregister_kobject() which holds the kobject. The reference cannot be put because the netdev won't be add to todo list, so it will leads a memleak, we need put the reference to avoid memleak.
--- net/core/dev.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/core/dev.c +7 -0
@@ -9114,6 +9114,13 @@ int register_netdevice(struct net_device *dev)rcu_barrier (); dev->reg_state =NETREG_UNREGISTERED ; +/* We should put the kobject that hold in +* netdev_unregister_kobject(), otherwise +* the net device cannot be freed when +* driver calls free_netdev(), because the +* kobject is being hold. +*/ +kobject_put (&dev->dev.kobj); }/* * Prevent userspace races by waiting until the network
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 11/178 net: Fix the arp error in some cases
In reply to Sasha LevinFrom: guodeqing <[email protected]>
[ Upstream commit 5eea3a63ff4aba6a26002e657a6d21934b7e2b96 ]
ie.,
$ ifconfig eth0 6.6.6.6 netmask 255.255.255.0
$ ip rule add from 6.6.6.6 table 6666
$ ip route add 9.9.9.9 via 6.6.6.6
$ ping -I 6.6.6.6 9.9.9.9 PING 9.9.9.9 (9.9.9.9) from 6.6.6.6 : 56(84) bytes of data.
3 packets transmitted, 0 received, 100% packet loss, time 2079ms
$ arp Address HWtype HWaddress Flags Mask Iface 6.6.6.6 (incomplete) eth0
The arp request address is error, this is because fib_table_lookup in fib_check_nh lookup the destnation 9.9.9.9 nexthop, the scope of the fib result is RT_SCOPE_LINK,the correct scope is RT_SCOPE_HOST. Here I add a check of whether this is RT_TABLE_MAIN to solve this problem.
--- net/ipv4/fib_semantics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/fib_semantics.c +1 -1
@@ -1100,7 +1100,7 @@ static int fib_check_nh_v4_gw(struct net *net, struct fib_nh *nh, u32 table,if (fl4.flowi4_scope <RT_SCOPE_LINK ) fl4.flowi4_scope =RT_SCOPE_LINK ; -if (table) +if (table && table !=RT_TABLE_MAIN ) tbl =fib_get_table (net, table);if (tbl)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 12/178 net: increment xmit_recursion level in dev_direct_xmit()
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 0ad6f6e767ec2f613418cbc7ebe5ec4c35af540c ]
Back in commit f60e5990d9c1 ("ipv6: protect skb->sk accesses from recursive dereference inside the stack") Hannes added code so that IPv6 stack would not trust skb->sk for typical cases where packet goes through 'standard' xmit path (__dev_queue_xmit())
Alas af_packet had a dev_direct_xmit() path that was not dealing yet with xmit_recursion level.
Also change sk_mc_loop() to dump a stack once only.
Without this patch, syzbot was able to trigger :
[1]
[ 153.567378] WARNING: CPU: 7 PID: 11273 at net/core/sock.c:721 sk_mc_loop+0x51/0x70 [ 153.567378] Modules linked in: nfnetlink ip6table_raw ip6table_filter iptable_raw iptable_nat nf_nat nf_conntrack nf_defrag_ipv4 nf_defrag_ipv6 iptable_filter macsec macvtap tap macvlan 8021q hsr wireguard libblake2s blake2s_x86_64 libblake2s_generic udp_tunnel ip6_udp_tunnel libchacha20poly1305 poly1305_x86_64 chacha_x86_64 libchacha curve25519_x86_64 libcurve25519_generic netdevsim batman_adv dummy team bridge stp llc w1_therm wire i2c_mux_pca954x i2c_mux cdc_acm ehci_pci ehci_hcd mlx4_en mlx4_ib ib_uverbs ib_core mlx4_core [ 153.567386] CPU: 7 PID: 11273 Comm: b159172088 Not tainted 5.8.0-smp-DEV #273 [ 153.567387] RIP: 0010:sk_mc_loop+0x51/0x70 [ 153.567388] Code: 66 83 f8 0a 75 24 0f b6 4f 12 b8 01 00 00 00 31 d2 d3 e0 a9 bf ef ff ff 74 07 48 8b 97 f0 02 00 00 0f b6 42 3a 83 e0 01 5d c3 <0f> 0b b8 01 00 00 00 5d c3 0f b6 87 18 03 00 00 5d c0 e8 04 83 e0 [ 153.567388] RSP: 0018:ffff95c69bb93990 EFLAGS: 00010212 [ 153.567388] RAX: 0000000000000011 RBX: ffff95c6e0ee3e00 RCX: 0000000000000007 [ 153.567389] RDX: ffff95c69ae50000 RSI: ffff95c6c30c3000 RDI: ffff95c6c30c3000 [ 153.567389] RBP: ffff95c69bb93990 R08: ffff95c69a77f000 R09: 0000000000000008 [ 153.567389] R10: 0000000000000040 R11: 00003e0e00026128 R12: ffff95c6c30c3000 [ 153.567390] R13: ffff95c6cc4fd500 R14: ffff95c6f84500c0 R15: ffff95c69aa13c00 [ 153.567390] FS: 00007fdc3a283700(0000) GS:ffff95c6ff9c0000(0000) knlGS:0000000000000000 [ 153.567390] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 153.567391] CR2: 00007ffee758e890 CR3: 0000001f9ba20003 CR4: 00000000001606e0 [ 153.567391] Call Trace: [ 153.567391] ip6_finish_output2+0x34e/0x550 [ 153.567391] __ip6_finish_output+0xe7/0x110 [ 153.567391] ip6_finish_output+0x2d/0xb0 [ 153.567392] ip6_output+0x77/0x120 [ 153.567392] ? __ip6_finish_output+0x110/0x110 [ 153.567392] ip6_local_out+0x3d/0x50 [ 153.567392] ipvlan_queue_xmit+0x56c/0x5e0 [ 153.567393] ? ksize+0x19/0x30 [ 153.567393] ipvlan_start_xmit+0x18/0x50 [ 153.567393] dev_direct_xmit+0xf3/0x1c0 [ 153.567393] packet_direct_xmit+0x69/0xa0 [ 153.567394] packet_sendmsg+0xbf0/0x19b0 [ 153.567394] ? plist_del+0x62/0xb0 [ 153.567394] sock_sendmsg+0x65/0x70 [ 153.567394] sock_write_iter+0x93/0xf0 [ 153.567394] new_sync_write+0x18e/0x1a0 [ 153.567395] __vfs_write+0x29/0x40 [ 153.567395] vfs_write+0xb9/0x1b0 [ 153.567395] ksys_write+0xb1/0xe0 [ 153.567395] __x64_sys_write+0x1a/0x20 [ 153.567395] do_syscall_64+0x43/0x70 [ 153.567396] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 153.567396] RIP: 0033:0x453549 [ 153.567396] Code: Bad RIP value. [ 153.567396] RSP: 002b:00007fdc3a282cc8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 153.567397] RAX: ffffffffffffffda RBX: 00000000004d32d0 RCX: 0000000000453549 [ 153.567397] RDX: 0000000000000020 RSI: 0000000020000300 RDI: 0000000000000003 [ 153.567398] RBP: 00000000004d32d8 R08: 0000000000000000 R09: 0000000000000000 [ 153.567398] R10: 0000000000000000 R11: 0000000000000246 R12: 00000000004d32dc [ 153.567398] R13: 00007ffee742260f R14: 00007fdc3a282dc0 R15: 00007fdc3a283700 [ 153.567399] ---[ end trace c1d5ae2b1059ec62 ]---
f60e5990d9c1 ("ipv6: protect skb->sk accesses from recursive dereference inside the stack")
--- net/core/dev.c | 2 ++ net/core/sock.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
net/core/dev.c +2 -0
@@ -3832,10 +3832,12 @@ int dev_direct_xmit(struct sk_buff *skb, u16 queue_id)local_bh_disable (); +dev_xmit_recursion_inc ();HARD_TX_LOCK (dev, txq,smp_processor_id ());if (!netif_xmit_frozen_or_drv_stopped (txq)) ret =netdev_start_xmit (skb, dev, txq, false);HARD_TX_UNLOCK (dev, txq); +dev_xmit_recursion_dec ();local_bh_enable ();
net/core/sock.c +1 -1
@@ -709,7 +709,7 @@ bool sk_mc_loop(struct sock *sk)return inet6_sk (sk)->mc_loop;#endif } -WARN_ON (1 ); +WARN_ON_ONCE (1 );return true; }EXPORT_SYMBOL (sk_mc_loop);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 13/178 net: usb: ax88179_178a: fix packet alignment padding
In reply to Sasha LevinFrom: Jeremy Kerr <[email protected]>
[ Upstream commit e869e7a17798d85829fa7d4f9bbe1eebd4b2d3f6 ]
Using a AX88179 device (0b95:1790), I see two bytes of appended data on every RX packet. For example, this 48-byte ping, using 0xff as a payload byte:
04:20:22.528472 IP 192.168.1.1 > 192.168.1.2: ICMP echo request, id 2447, seq 1, length 64
0x0000: 000a cd35 ea50 000a cd35 ea4f 0800 4500 0x0010: 0054 c116 4000 4001 f63e c0a8 0101 c0a8 0x0020: 0102 0800 b633 098f 0001 87ea cd5e 0000 0x0030: 0000 dcf2 0600 0000 0000 ffff ffff ffff 0x0040: ffff ffff ffff ffff ffff ffff ffff ffff 0x0050: ffff ffff ffff ffff ffff ffff ffff ffff 0x0060: ffff 961f
Those last two bytes - 96 1f - aren't part of the original packet.
In the ax88179 RX path, the usbnet rx_fixup function trims a 2-byte 'alignment pseudo header' from the start of the packet, and sets the length from a per-packet field populated by hardware. It looks like that length field *includes* the 2-byte header; the current driver assumes that it's excluded.
This change trims the 2-byte alignment header after we've set the packet length, so the resulting packet length is correct. While we're moving the comment around, this also fixes the spelling of 'pseudo'.
--- drivers/net/usb/ax88179_178a.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/usb/ax88179_178a.c +6 -5
@@ -1387,10 +1387,10 @@ static int ax88179_rx_fixup(struct usbnet *dev, struct sk_buff *skb) }if (pkt_cnt ==0 ) { -/* Skip IP alignment psudo header */ -skb_pull (skb,2 ); skb->len = pkt_len; -skb_set_tail_pointer (skb, pkt_len); +/* Skip IP alignment pseudo header */ +skb_pull (skb,2 ); +skb_set_tail_pointer (skb, skb->len); skb->truesize = pkt_len +sizeof (struct sk_buff );ax88179_rx_checksum (skb, pkt_hdr);return 1 ;
@@ -1399,8 +1399,9 @@ static int ax88179_rx_fixup(struct usbnet *dev, struct sk_buff *skb) ax_skb =skb_clone (skb,GFP_ATOMIC );if (ax_skb) { ax_skb->len = pkt_len; - ax_skb->data = skb->data +2 ; -skb_set_tail_pointer (ax_skb, pkt_len); +/* Skip IP alignment pseudo header */ +skb_pull (ax_skb,2 ); +skb_set_tail_pointer (ax_skb, ax_skb->len); ax_skb->truesize = pkt_len +sizeof (struct sk_buff );ax88179_rx_checksum (ax_skb, pkt_hdr);usbnet_skb_return (dev, ax_skb);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 14/178 openvswitch: take into account de-fragmentation/gso_size in execute_check_pkt_len
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 17843655708e1941c0653af3cd61be6948e36f43 ]
ovs connection tracking module performs de-fragmentation on incoming fragmented traffic. Take info account if traffic has been de-fragmented in execute_check_pkt_len action otherwise we will perform the wrong nested action considering the original packet size. This issue typically occurs if ovs-vswitchd adds a rule in the pipeline that requires connection tracking (e.g. OVN stateful ACLs) before execute_check_pkt_len action. Moreover take into account GSO fragment size for GSO packet in execute_check_pkt_len routine
--- net/openvswitch/actions.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/openvswitch/actions.c +7 -2
@@ -1146,9 +1146,10 @@ static int execute_check_pkt_len(struct datapath *dp, struct sk_buff *skb,struct sw_flow_key *key, const struct nlattr *attr, bool last) { + struct ovs_skb_cb *ovs_cb = OVS_CB(skb);const struct nlattr *actions, *cpl_arg; +int len, max_len, rem =nla_len (attr);const struct check_pkt_len_arg *arg; -int rem =nla_len (attr);bool clone_flow_key;/* The first netlink attribute in 'attr' is always
@@ -1157,7 +1158,11 @@ static int execute_check_pkt_len(struct datapath *dp, struct sk_buff *skb, cpl_arg =nla_data (attr); arg =nla_data (cpl_arg); -if (skb->len <= arg->pkt_len) { + len = ovs_cb->mru ? ovs_cb->mru + skb->mac_len : skb->len; + max_len = arg->pkt_len; + +if ((skb_is_gso (skb) &&skb_gso_validate_mac_len (skb, max_len)) || + len <= max_len) {/* Second netlink attribute in 'attr' is always * 'OVS_CHECK_PKT_LEN_ATTR_ACTIONS_IF_LESS_EQUAL'. */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 15/178 rocker: fix incorrect error handling in dma_rings_init
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit 58d0c864e1a759a15c9df78f50ea5a5c32b3989e ]
In rocker_dma_rings_init, the goto blocks in case of errors caused by the functions rocker_dma_cmd_ring_waits_alloc() and rocker_dma_ring_create() are incorrect. The patch fixes the order consistent with cleanup in rocker_dma_rings_fini().
--- drivers/net/ethernet/rocker/rocker_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/rocker/rocker_main.c +2 -2
@@ -647,10 +647,10 @@ static int rocker_dma_rings_init(struct rocker *rocker) err_dma_event_ring_bufs_alloc:rocker_dma_ring_destroy (rocker, &rocker->event_ring); err_dma_event_ring_create: +rocker_dma_cmd_ring_waits_free (rocker); +err_dma_cmd_ring_waits_alloc:rocker_dma_ring_bufs_free (rocker, &rocker->cmd_ring,PCI_DMA_BIDIRECTIONAL ); -err_dma_cmd_ring_waits_alloc: -rocker_dma_cmd_ring_waits_free (rocker); err_dma_cmd_ring_bufs_alloc:rocker_dma_ring_destroy (rocker, &rocker->cmd_ring);return err;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 16/178 rxrpc: Fix notification call on completion of discarded calls
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit 0041cd5a50442db6e456b145892a0eaf2dff061f ]
When preallocated service calls are being discarded, they're passed to ->discard_new_call() to have the caller clean up any attached higher-layer preallocated pieces before being marked completed. However, the act of marking them completed now invokes the call's notification function - which causes a problem because that function might assume that the previously freed pieces of memory are still there.
Fix this by setting a dummy notification function on the socket after calling ->discard_new_call().
This results in the following kasan message when the kafs module is removed.
==================================================================
BUG: KASAN: use-after-free in afs_wake_up_async_call+0x6aa/0x770 fs/afs/rxrpc.c:707
Write of size 1 at addr ffff8880946c39e4 by task kworker/u4:1/21
CPU: 0 PID: 21 Comm: kworker/u4:1 Not tainted 5.8.0-rc1-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Workqueue: netns cleanup_net
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0x18f/0x20d lib/dump_stack.c:118
print_address_description.constprop.0.cold+0xd3/0x413 mm/kasan/report.c:383
__kasan_report mm/kasan/report.c:513 [inline]
kasan_report.cold+0x1f/0x37 mm/kasan/report.c:530
afs_wake_up_async_call+0x6aa/0x770 fs/afs/rxrpc.c:707
rxrpc_notify_socket+0x1db/0x5d0 net/rxrpc/recvmsg.c:40
__rxrpc_set_call_completion.part.0+0x172/0x410 net/rxrpc/recvmsg.c:76
__rxrpc_call_completed net/rxrpc/recvmsg.c:112 [inline]
rxrpc_call_completed+0xca/0xf0 net/rxrpc/recvmsg.c:111
rxrpc_discard_prealloc+0x781/0xab0 net/rxrpc/call_accept.c:233
rxrpc_listen+0x147/0x360 net/rxrpc/af_rxrpc.c:245
afs_close_socket+0x95/0x320 fs/afs/rxrpc.c:110
afs_net_exit+0x1bc/0x310 fs/afs/main.c:155
ops_exit_list.isra.0+0xa8/0x150 net/core/net_namespace.c:186
cleanup_net+0x511/0xa50 net/core/net_namespace.c:603
process_one_work+0x965/0x1690 kernel/workqueue.c:2269
worker_thread+0x96/0xe10 kernel/workqueue.c:2415
kthread+0x3b5/0x4a0 kernel/kthread.c:291
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:293
Allocated by task 6820:
save_stack+0x1b/0x40 mm/kasan/common.c:48
set_track mm/kasan/common.c:56 [inline]
__kasan_kmalloc mm/kasan/common.c:494 [inline]
__kasan_kmalloc.constprop.0+0xbf/0xd0 mm/kasan/common.c:467
kmem_cache_alloc_trace+0x153/0x7d0 mm/slab.c:3551
kmalloc include/linux/slab.h:555 [inline]
kzalloc include/linux/slab.h:669 [inline]
afs_alloc_call+0x55/0x630 fs/afs/rxrpc.c:141
afs_charge_preallocation+0xe9/0x2d0 fs/afs/rxrpc.c:757
afs_open_socket+0x292/0x360 fs/afs/rxrpc.c:92
afs_net_init+0xa6c/0xe30 fs/afs/main.c:125
ops_init+0xaf/0x420 net/core/net_namespace.c:151
setup_net+0x2de/0x860 net/core/net_namespace.c:341
copy_net_ns+0x293/0x590 net/core/net_namespace.c:482
create_new_namespaces+0x3fb/0xb30 kernel/nsproxy.c:110
unshare_nsproxy_namespaces+0xbd/0x1f0 kernel/nsproxy.c:231
ksys_unshare+0x43d/0x8e0 kernel/fork.c:2983
__do_sys_unshare kernel/fork.c:3051 [inline]
__se_sys_unshare kernel/fork.c:3049 [inline]
__x64_sys_unshare+0x2d/0x40 kernel/fork.c:3049
do_syscall_64+0x60/0xe0 arch/x86/entry/common.c:359
entry_SYSCALL_64_after_hwframe+0x44/0xa9
Freed by task 21:
save_stack+0x1b/0x40 mm/kasan/common.c:48
set_track mm/kasan/common.c:56 [inline]
kasan_set_free_info mm/kasan/common.c:316 [inline]
__kasan_slab_free+0xf7/0x140 mm/kasan/common.c:455
__cache_free mm/slab.c:3426 [inline]
kfree+0x109/0x2b0 mm/slab.c:3757
afs_put_call+0x585/0xa40 fs/afs/rxrpc.c:190
rxrpc_discard_prealloc+0x764/0xab0 net/rxrpc/call_accept.c:230
rxrpc_listen+0x147/0x360 net/rxrpc/af_rxrpc.c:245
afs_close_socket+0x95/0x320 fs/afs/rxrpc.c:110
afs_net_exit+0x1bc/0x310 fs/afs/main.c:155
ops_exit_list.isra.0+0xa8/0x150 net/core/net_namespace.c:186
cleanup_net+0x511/0xa50 net/core/net_namespace.c:603
process_one_work+0x965/0x1690 kernel/workqueue.c:2269
worker_thread+0x96/0xe10 kernel/workqueue.c:2415
kthread+0x3b5/0x4a0 kernel/kthread.c:291
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:293
The buggy address belongs to the object at ffff8880946c3800
which belongs to the cache kmalloc-1k of size 1024
The buggy address is located 484 bytes inside of
1024-byte region [ffff8880946c3800, ffff8880946c3c00)
The buggy address belongs to the page:
page:ffffea000251b0c0 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0xfffe0000000200(slab)
raw: 00fffe0000000200 ffffea0002546508 ffffea00024fa248 ffff8880aa000c40
raw: 0000000000000000 ffff8880946c3000 0000000100000002 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff8880946c3880: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff8880946c3900: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff8880946c3980: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff8880946c3a00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff8880946c3a80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
==================================================================--- net/rxrpc/call_accept.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/rxrpc/call_accept.c +7 -0
@@ -22,6 +22,11 @@#include <net/ip.h> #include "ar-internal.h" +static void rxrpc_dummy_notify (struct sock *sk,struct rxrpc_call *call, +unsigned long user_call_ID) +{ +} +/* * Preallocate a single service call, connection and peer and, if possible, * give them a user ID and attach the user's side of the ID to them.
@@ -228,6 +233,8 @@ void rxrpc_discard_prealloc(struct rxrpc_sock *rx)if (rx->discard_new_call) {_debug ("discard %lx" , call->user_call_ID); rx->discard_new_call (call, call->user_call_ID); +if (call->notify_rx) + call->notify_rx = rxrpc_dummy_notify;rxrpc_put_call (call, rxrpc_call_put_kernel); }rxrpc_call_completed (call);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 17/178 sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket
In reply to Sasha LevinFrom: Marcelo Ricardo Leitner <[email protected]>
[ Upstream commit 471e39df96b9a4c4ba88a2da9e25a126624d7a9c ]
If a socket is set ipv6only, it will still send IPv4 addresses in the INIT and INIT_ACK packets. This potentially misleads the peer into using them, which then would cause association termination.
The fix is to not add IPv4 addresses to ipv6only sockets.
--- include/net/sctp/constants.h | 8 +++++--- net/sctp/associola.c | 5 ++++- net/sctp/bind_addr.c | 1 + net/sctp/protocol.c | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-)
include/net/sctp/constants.h +5 -3
@@ -341,11 +341,13 @@ enum { ipv4_is_anycast_6to4(a))/* Flags used for the bind address copy functions. */ -#define SCTP_ADDR6_ALLOWED 0x00000001/* IPv6 address is allowed by +#define SCTP_ADDR4_ALLOWED 0x00000001/* IPv4 address is allowed by local sock family */ -#define SCTP_ADDR4_PEERSUPP 0x00000002/* IPv4 address is supported by +#define SCTP_ADDR6_ALLOWED 0x00000002/* IPv6 address is allowed by +local sock family */ +#define SCTP_ADDR4_PEERSUPP 0x00000004/* IPv4 address is supported by peer */ -#define SCTP_ADDR6_PEERSUPP 0x00000004/* IPv6 address is supported by +#define SCTP_ADDR6_PEERSUPP 0x00000008/* IPv6 address is supported by peer */ /* Reasons to retransmit. */
net/sctp/associola.c +4 -1
@@ -1569,12 +1569,15 @@ void sctp_assoc_rwnd_decrease(struct sctp_association *asoc, unsigned int len)int sctp_assoc_set_bind_addr_from_ep (struct sctp_association *asoc,enum sctp_scope scope,gfp_t gfp) { +struct sock *sk = asoc->base.sk;int flags;/* Use scoping rules to determine the subset of addresses from * the endpoint. */ - flags = (PF_INET6 == asoc->base.sk->sk_family) ?SCTP_ADDR6_ALLOWED :0 ; + flags = (PF_INET6 == sk->sk_family) ?SCTP_ADDR6_ALLOWED :0 ; +if (!inet_v6_ipv6only (sk)) + flags |=SCTP_ADDR4_ALLOWED ;if (asoc->peer.ipv4_address) flags |=SCTP_ADDR4_PEERSUPP ;if (asoc->peer.ipv6_address)
net/sctp/bind_addr.c +1 -0
@@ -461,6 +461,7 @@ static int sctp_copy_one_addr(struct net *net, struct sctp_bind_addr *dest,* well as the remote peer. */ if ((((AF_INET == addr->sa.sa_family) && + (flags & SCTP_ADDR4_ALLOWED) && (flags & SCTP_ADDR4_PEERSUPP))) || (((AF_INET6 == addr->sa.sa_family) && (flags & SCTP_ADDR6_ALLOWED) &&
net/sctp/protocol.c +2 -1
@@ -148,7 +148,8 @@ int sctp_copy_local_addr_list(struct net *net, struct sctp_bind_addr *bp,* sock as well as the remote peer. */ if (addr->a.sa.sa_family ==AF_INET && - !(copy_flags &SCTP_ADDR4_PEERSUPP )) + (!(copy_flags &SCTP_ADDR4_ALLOWED ) || + !(copy_flags &SCTP_ADDR4_PEERSUPP )))continue ; if (addr->a.sa.sa_family == AF_INET6 && (!(copy_flags & SCTP_ADDR6_ALLOWED) ||
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 18/178 tcp: don't ignore ECN CWR on pure ACK
In reply to Sasha LevinFrom: Denis Kirjanov <[email protected]>
[ Upstream commit 2570284060b48f3f79d8f1a2698792f36c385e9a ]
there is a problem with the CWR flag set in an incoming ACK segment and it leads to the situation when the ECE flag is latched forever
the following packetdrill script shows what happens:
// Stack receives incoming segments with CE set +0.1 <[ect0] . 11001:12001(1000) ack 1001 win 65535
+0.0 <[ce] . 12001:13001(1000) ack 1001 win 65535
+0.0 <[ect0] P. 13001:14001(1000) ack 1001 win 65535
// Stack repsonds with ECN ECHO
+0.0 >[noecn] . 1001:1001(0) ack 12001
+0.0 >[noecn] E. 1001:1001(0) ack 13001
+0.0 >[noecn] E. 1001:1001(0) ack 14001
// Write a packet
+0.1 write(3, ..., 1000) = 1000
+0.0 >[ect0] PE. 1001:2001(1000) ack 14001
// Pure ACK received
+0.01 <[noecn] W. 14001:14001(0) ack 2001 win 65535
// Since CWR was sent, this packet should NOT have ECE set
+0.1 write(3, ..., 1000) = 1000
+0.0 >[ect0] P. 2001:3001(1000) ack 14001
// but Linux will still keep ECE latched here, with packetdrill // flagging a missing ECE flag, expecting
// >[ect0] PE. 2001:3001(1000) ack 14001
// in the script
In the situation above we will continue to send ECN ECHO packets and trigger the peer to reduce the congestion window. To avoid that we can check CWR on pure ACKs received.
v3:
- Add a sequence check to avoid sending an ACK to an ACK
v2:
- Adjusted the comment
- move CWR check before checking for unacknowledged packets
--- net/ipv4/tcp_input.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
net/ipv4/tcp_input.c +11 -3
@@ -260,7 +260,8 @@ static void tcp_ecn_accept_cwr(struct sock *sk, const struct sk_buff *skb)* cwnd may be very low (even just 1 packet), so we should ACK * immediately. */ -inet_csk (sk)->icsk_ack.pending |=ICSK_ACK_NOW ; +if (TCP_SKB_CB (skb)->seq !=TCP_SKB_CB (skb)->end_seq) +inet_csk (sk)->icsk_ack.pending |=ICSK_ACK_NOW ; } }
@@ -3682,6 +3683,15 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)tcp_in_ack_event (sk, ack_ev_flags); } +/* This is a deviation from RFC3168 since it states that: +* "When the TCP data sender is ready to set the CWR bit after reducing +* the congestion window, it SHOULD set the CWR bit only on the first +* new data packet that it transmits." +* We accept CWR on pure ACKs to be more robust +* with widely-deployed TCP implementations that do this. +*/ +tcp_ecn_accept_cwr (sk, skb); +/* We passed data and got it acked, remove any soft error * log. Something worked... */
@@ -4771,8 +4781,6 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)skb_dst_drop (skb);__skb_pull (skb,tcp_hdr (skb)->doff *4 ); -tcp_ecn_accept_cwr (sk, skb); - tp->rx_opt.dsack =0 ;/* Queue data for delivery to the user.
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 19/178 tcp: grow window for OOO packets only for SACK flows
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 662051215c758ae8545451628816204ed6cd372d ]
Back in 2013, we made a change that broke fast retransmit for non SACK flows.
Indeed, for these flows, a sender needs to receive three duplicate ACK before starting fast retransmit. Sending ACK with different receive window do not count.
Even if enabling SACK is strongly recommended these days, there still are some cases where it has to be disabled.
Not increasing the window seems better than having to rely on RTO.
After the fix, following packetdrill test gives :
// Initialize connection
0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3
+0 setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0 +0 bind(3, ..., ...) = 0
+0 listen(3, 1) = 0
+0 < S 0:0(0) win 32792 <mss 1000,nop,wscale 7> +0 > S. 0:0(0) ack 1 <mss 1460,nop,wscale 8> +0 < . 1:1(0) ack 1 win 514
+0 accept(3, ..., ...) = 4
+0 < . 1:1001(1000) ack 1 win 514
// Quick ack
+0 > . 1:1(0) ack 1001 win 264
+0 < . 2001:3001(1000) ack 1 win 514
// DUPACK : Normally we should not change the window
+0 > . 1:1(0) ack 1001 win 264
+0 < . 3001:4001(1000) ack 1 win 514
// DUPACK : Normally we should not change the window
+0 > . 1:1(0) ack 1001 win 264
+0 < . 4001:5001(1000) ack 1 win 514
// DUPACK : Normally we should not change the window
+0 > . 1:1(0) ack 1001 win 264
+0 < . 1001:2001(1000) ack 1 win 514
// Hole is repaired.
+0 > . 1:1(0) ack 5001 win 272
--- net/ipv4/tcp_input.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/ipv4/tcp_input.c +10 -2
@@ -4597,7 +4597,11 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)if (tcp_ooo_try_coalesce (sk, tp->ooo_last_skb, skb, &fragstolen)) { coalesce_done: -tcp_grow_window (sk, skb); +/* For non sack flows, do not grow window to force DUPACK +* and trigger fast retransmit. +*/ +if (tcp_is_sack (tp)) +tcp_grow_window (sk, skb);kfree_skb_partial (skb, fragstolen); skb =NULL ; goto add_sack;
@@ -4681,7 +4685,11 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)tcp_sack_new_ofo_skb (sk, seq, end_seq); end:if (skb) { -tcp_grow_window (sk, skb); +/* For non sack flows, do not grow window to force DUPACK +* and trigger fast retransmit. +*/ +if (tcp_is_sack (tp)) +tcp_grow_window (sk, skb);skb_condense (skb);skb_set_owner_r (skb, sk); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 20/178 tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes
In reply to Sasha LevinFrom: David Christensen <[email protected]>
[ Upstream commit 3a2656a211caf35e56afc9425e6e518fa52f7fbc ]
The driver function tg3_io_error_detected() calls napi_disable twice, without an intervening napi_enable, when the number of EEH errors exceeds eeh_max_freezes, resulting in an indefinite sleep while holding rtnl_lock.
Add check for pcierr_recovery which skips code already executed for the "Frozen" state.
--- drivers/net/ethernet/broadcom/tg3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/tg3.c +2 -2
@@ -18176,8 +18176,8 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,rtnl_lock (); -/* We probably don't have netdev yet */ -if (!netdev || !netif_running (netdev)) +/* Could be second call or maybe we don't have netdev yet */ +if (!netdev || tp->pcierr_recovery || !netif_running (netdev)) goto done;/* We needn't recover from permanent error */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 21/178 ip6_gre: fix use-after-free in ip6gre_tunnel_lookup()
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit dafabb6590cb15f300b77c095d50312e2c7c8e0f ]
In the datapath, the ip6gre_tunnel_lookup() is used and it internally uses fallback tunnel device pointer, which is fb_tunnel_dev.
This pointer variable should be set to NULL when a fb interface is deleted. But there is no routine to set fb_tunnel_dev pointer to NULL. So, this pointer will be still used after interface is deleted and it eventually results in the use-after-free problem.
Test commands:
ip netns add A
ip netns add B
ip link add eth0 type veth peer name eth1
ip link set eth0 netns A
ip link set eth1 netns B
ip netns exec A ip link set lo up
ip netns exec A ip link set eth0 up
ip netns exec A ip link add ip6gre1 type ip6gre local fc:0::1 \
remote fc:0::2
ip netns exec A ip -6 a a fc:100::1/64 dev ip6gre1 ip netns exec A ip link set ip6gre1 up
ip netns exec A ip -6 a a fc:0::1/64 dev eth0
ip netns exec A ip link set ip6gre0 up
ip netns exec B ip link set lo up
ip netns exec B ip link set eth1 up
ip netns exec B ip link add ip6gre1 type ip6gre local fc:0::2 \
remote fc:0::1
ip netns exec B ip -6 a a fc:100::2/64 dev ip6gre1 ip netns exec B ip link set ip6gre1 up
ip netns exec B ip -6 a a fc:0::2/64 dev eth1
ip netns exec B ip link set ip6gre0 up
ip netns exec A ping fc:100::2 -s 60000 &
ip netns del B
Splat looks like:
[ 73.087285][ C1] BUG: KASAN: use-after-free in ip6gre_tunnel_lookup+0x1064/0x13f0 [ip6_gre] [ 73.088361][ C1] Read of size 4 at addr ffff888040559218 by task ping/1429 [ 73.089317][ C1] [ 73.089638][ C1] CPU: 1 PID: 1429 Comm: ping Not tainted 5.7.0+ #602 [ 73.090531][ C1] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 [ 73.091725][ C1] Call Trace: [ 73.092160][ C1] <IRQ> [ 73.092556][ C1] dump_stack+0x96/0xdb [ 73.093122][ C1] print_address_description.constprop.6+0x2cc/0x450 [ 73.094016][ C1] ? ip6gre_tunnel_lookup+0x1064/0x13f0 [ip6_gre] [ 73.094894][ C1] ? ip6gre_tunnel_lookup+0x1064/0x13f0 [ip6_gre] [ 73.095767][ C1] ? ip6gre_tunnel_lookup+0x1064/0x13f0 [ip6_gre] [ 73.096619][ C1] kasan_report+0x154/0x190 [ 73.097209][ C1] ? ip6gre_tunnel_lookup+0x1064/0x13f0 [ip6_gre] [ 73.097989][ C1] ip6gre_tunnel_lookup+0x1064/0x13f0 [ip6_gre] [ 73.098750][ C1] ? gre_del_protocol+0x60/0x60 [gre] [ 73.099500][ C1] gre_rcv+0x1c5/0x1450 [ip6_gre] [ 73.100199][ C1] ? ip6gre_header+0xf00/0xf00 [ip6_gre] [ 73.100985][ C1] ? rcu_read_lock_sched_held+0xc0/0xc0 [ 73.101830][ C1] ? ip6_input_finish+0x5/0xf0 [ 73.102483][ C1] ip6_protocol_deliver_rcu+0xcbb/0x1510 [ 73.103296][ C1] ip6_input_finish+0x5b/0xf0 [ 73.103920][ C1] ip6_input+0xcd/0x2c0 [ 73.104473][ C1] ? ip6_input_finish+0xf0/0xf0 [ 73.105115][ C1] ? rcu_read_lock_held+0x90/0xa0 [ 73.105783][ C1] ? rcu_read_lock_sched_held+0xc0/0xc0 [ 73.106548][ C1] ipv6_rcv+0x1f1/0x300
[ ... ]
--- net/ipv6/ip6_gre.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/ipv6/ip6_gre.c +6 -3
@@ -127,6 +127,7 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev, gre_proto == htons(ETH_P_ERSPAN2)) ?ARPHRD_ETHER :ARPHRD_IP6GRE ;int score, cand_score =4 ; +struct net_device *ndev;for_each_ip_tunnel_rcu (t, ign->tunnels_r_l[h0 ^ h1]) { if (!ipv6_addr_equal(local, &t->parms.laddr) ||
@@ -238,9 +239,9 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev,if (t && t->dev->flags &IFF_UP )return t; - dev = ign->fb_tunnel_dev; -if (dev && dev->flags &IFF_UP ) -return netdev_priv (dev); + ndev =READ_ONCE (ign->fb_tunnel_dev); +if (ndev && ndev->flags &IFF_UP ) +return netdev_priv (ndev);return NULL ; }
@@ -413,6 +414,8 @@ static void ip6gre_tunnel_uninit(struct net_device *dev)ip6gre_tunnel_unlink_md (ign, t);ip6gre_tunnel_unlink (ign, t); +if (ign->fb_tunnel_dev == dev) +WRITE_ONCE (ign->fb_tunnel_dev,NULL );dst_cache_reset (&t->dst_cache);dev_put (dev); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 22/178 net: phy: Check harder for errors in get_phy_id()
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit b2ffc75e2e990b09903f9d15ccd53bc5f3a4217c ]
Commit 02a6efcab675 ("net: phy: allow scanning busses with missing phys") added a special condition to return -ENODEV in case -ENODEV or -EIO was returned from the first read of the MII_PHYSID1 register.
In case the MDIO bus data line pull-up is not strong enough, the MDIO bus controller will not flag this as a read error. This can happen when a pluggable daughter card is not connected and weak internal pull-ups are used (since that is the only option, otherwise the pins are floating).
The second read of MII_PHYSID2 will be correctly flagged an error though, but now we will return -EIO which will be treated as a hard error, thus preventing MDIO bus scanning loops to continue succesfully.
Apply the same logic to both register reads, thus allowing the scanning logic to proceed.
--- drivers/net/phy/phy_device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/phy/phy_device.c +4 -2
@@ -797,8 +797,10 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,/* Grab the bits from PHYIR2, and put them in the lower half */ phy_reg =mdiobus_read (bus, addr,MII_PHYSID2 ); -if (phy_reg <0 ) -return -EIO ; +if (phy_reg <0 ) { +/* returning -ENODEV doesn't stop bus scanning */ +return (phy_reg == -EIO || phy_reg == -ENODEV ) ? -ENODEV : -EIO ; + } *phy_id |= phy_reg;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 23/178 ip_tunnel: fix use-after-free in ip_tunnel_lookup()
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit ba61539c6ae57f4146284a5cb4f7b7ed8d42bf45 ]
In the datapath, the ip_tunnel_lookup() is used and it internally uses fallback tunnel device pointer, which is fb_tunnel_dev.
This pointer variable should be set to NULL when a fb interface is deleted. But there is no routine to set fb_tunnel_dev pointer to NULL. So, this pointer will be still used after interface is deleted and it eventually results in the use-after-free problem.
Test commands:
ip netns add A
ip netns add B
ip link add eth0 type veth peer name eth1
ip link set eth0 netns A
ip link set eth1 netns B
ip netns exec A ip link set lo up
ip netns exec A ip link set eth0 up
ip netns exec A ip link add gre1 type gre local 10.0.0.1 \
remote 10.0.0.2
ip netns exec A ip link set gre1 up
ip netns exec A ip a a 10.0.100.1/24 dev gre1
ip netns exec A ip a a 10.0.0.1/24 dev eth0
ip netns exec B ip link set lo up
ip netns exec B ip link set eth1 up
ip netns exec B ip link add gre1 type gre local 10.0.0.2 \
remote 10.0.0.1
ip netns exec B ip link set gre1 up
ip netns exec B ip a a 10.0.100.2/24 dev gre1
ip netns exec B ip a a 10.0.0.2/24 dev eth1
ip netns exec A hping3 10.0.100.2 -2 --flood -d 60000 & ip netns del B
Splat looks like:
[ 77.793450][ C3] ================================================================== [ 77.794702][ C3] BUG: KASAN: use-after-free in ip_tunnel_lookup+0xcc4/0xf30 [ 77.795573][ C3] Read of size 4 at addr ffff888060bd9c84 by task hping3/2905 [ 77.796398][ C3] [ 77.796664][ C3] CPU: 3 PID: 2905 Comm: hping3 Not tainted 5.8.0-rc1+ #616 [ 77.797474][ C3] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 [ 77.798453][ C3] Call Trace: [ 77.798815][ C3] <IRQ> [ 77.799142][ C3] dump_stack+0x9d/0xdb [ 77.799605][ C3] print_address_description.constprop.7+0x2cc/0x450 [ 77.800365][ C3] ? ip_tunnel_lookup+0xcc4/0xf30 [ 77.800908][ C3] ? ip_tunnel_lookup+0xcc4/0xf30 [ 77.801517][ C3] ? ip_tunnel_lookup+0xcc4/0xf30 [ 77.802145][ C3] kasan_report+0x154/0x190 [ 77.802821][ C3] ? ip_tunnel_lookup+0xcc4/0xf30 [ 77.803503][ C3] ip_tunnel_lookup+0xcc4/0xf30 [ 77.804165][ C3] __ipgre_rcv+0x1ab/0xaa0 [ip_gre] [ 77.804862][ C3] ? rcu_read_lock_sched_held+0xc0/0xc0 [ 77.805621][ C3] gre_rcv+0x304/0x1910 [ip_gre] [ 77.806293][ C3] ? lock_acquire+0x1a9/0x870 [ 77.806925][ C3] ? gre_rcv+0xfe/0x354 [gre] [ 77.807559][ C3] ? erspan_xmit+0x2e60/0x2e60 [ip_gre] [ 77.808305][ C3] ? rcu_read_lock_sched_held+0xc0/0xc0 [ 77.809032][ C3] ? rcu_read_lock_held+0x90/0xa0 [ 77.809713][ C3] gre_rcv+0x1b8/0x354 [gre]
[ ... ]
--- net/ipv4/ip_tunnel.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
net/ipv4/ip_tunnel.c +8 -6
@@ -85,9 +85,10 @@ struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn, __be32 remote, __be32 local, __be32 key) { - unsigned int hash; struct ip_tunnel *t, *cand = NULL;struct hlist_head *head; +struct net_device *ndev; +unsigned int hash; hash =ip_tunnel_hash (key, remote); head = &itn->tunnels[hash];
@@ -162,8 +163,9 @@ struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,if (t && t->dev->flags &IFF_UP )return t; -if (itn->fb_tunnel_dev && itn->fb_tunnel_dev->flags &IFF_UP ) -return netdev_priv (itn->fb_tunnel_dev); + ndev =READ_ONCE (itn->fb_tunnel_dev); +if (ndev && ndev->flags &IFF_UP ) +return netdev_priv (ndev);return NULL ; }
@@ -1245,9 +1247,9 @@ void ip_tunnel_uninit(struct net_device *dev)struct ip_tunnel_net *itn; itn =net_generic (net, tunnel->ip_tnl_net_id); -/* fb_tunnel_dev will be unregisted in net-exit call. */ -if (itn->fb_tunnel_dev != dev) -ip_tunnel_del (itn,netdev_priv (dev)); +ip_tunnel_del (itn,netdev_priv (dev)); +if (itn->fb_tunnel_dev == dev) +WRITE_ONCE (itn->fb_tunnel_dev,NULL );dst_cache_reset (&tunnel->dst_cache); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 24/178 sch_cake: don't try to reallocate or unshare skb unconditionally
In reply to Sasha LevinFrom: Ilya Ponetayev <[email protected]>
[ Upstream commit 9208d2863ac689a563b92f2161d8d1e7127d0add ]
cake_handle_diffserv() tries to linearize mac and network header parts of skb and to make it writable unconditionally. In some cases it leads to full skb reallocation, which reduces throughput and increases CPU load. Some measurements of IPv4 forward + NAPT on MIPS router with 580 MHz single-core CPU was conducted. It appears that on kernel 4.9 skb_try_make_writable() reallocates skb, if skb was allocated in ethernet driver via so-called 'build skb' method from page cache (it was discovered by strange increase of kmalloc-2048 slab at first).
Obtain DSCP value via read-only skb_header_pointer() call, and leave linearization only for DSCP bleaching or ECN CE setting. And, as an additional optimisation, skip diffserv parsing entirely if it is not needed by the current configuration.
--- net/sched/sch_cake.c | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-)
net/sched/sch_cake.c +30 -11
@@ -1517,30 +1517,49 @@ static unsigned int cake_drop(struct Qdisc *sch, struct sk_buff **to_free)static u8 cake_handle_diffserv (struct sk_buff *skb,u16 wash) { -int wlen =skb_network_offset (skb); +const int offset =skb_network_offset (skb); +u16 *buf, buf_;u8 dscp;switch (tc_skb_protocol (skb)) {case htons (ETH_P_IP ): - wlen +=sizeof (struct iphdr ); -if (!pskb_may_pull (skb, wlen) || -skb_try_make_writable (skb, wlen)) + buf =skb_header_pointer (skb, offset,sizeof (buf_), &buf_); +if (unlikely (!buf))return 0 ; - dscp =ipv4_get_dsfield (ip_hdr (skb)) >>2 ; -if (wash && dscp) +/* ToS is in the second byte of iphdr */ + dscp =ipv4_get_dsfield ((struct iphdr *)buf) >>2 ; + +if (wash && dscp) { +const int wlen = offset +sizeof (struct iphdr ); + +if (!pskb_may_pull (skb, wlen) || +skb_try_make_writable (skb, wlen)) +return 0 ; +ipv4_change_dsfield (ip_hdr (skb),INET_ECN_MASK ,0 ); + } +return dscp;case htons (ETH_P_IPV6 ): - wlen +=sizeof (struct ipv6hdr ); -if (!pskb_may_pull (skb, wlen) || -skb_try_make_writable (skb, wlen)) + buf =skb_header_pointer (skb, offset,sizeof (buf_), &buf_); +if (unlikely (!buf))return 0 ; - dscp =ipv6_get_dsfield (ipv6_hdr (skb)) >>2 ; -if (wash && dscp) +/* Traffic class is in the first and second bytes of ipv6hdr */ + dscp =ipv6_get_dsfield ((struct ipv6hdr *)buf) >>2 ; + +if (wash && dscp) { +const int wlen = offset +sizeof (struct ipv6hdr ); + +if (!pskb_may_pull (skb, wlen) || +skb_try_make_writable (skb, wlen)) +return 0 ; +ipv6_change_dsfield (ipv6_hdr (skb),INET_ECN_MASK ,0 ); + } +return dscp;case htons (ETH_P_ARP ):
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 25/178 sch_cake: don't call diffserv parsing code when it is not needed
In reply to Sasha LevinFrom: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 8c95eca0bb8c4bd2231a0d581f1ad0d50c90488c ]
As a further optimisation of the diffserv parsing codepath, we can skip it entirely if CAKE is configured to neither use diffserv-based classification, nor to zero out the diffserv bits.
--- net/sched/sch_cake.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/sched/sch_cake.c +9 -4
@@ -1515,7 +1515,7 @@ static unsigned int cake_drop(struct Qdisc *sch, struct sk_buff **to_free)return idx + (tin <<16 ); } -static u8 cake_handle_diffserv (struct sk_buff *skb,u16 wash) +static u8 cake_handle_diffserv (struct sk_buff *skb,bool wash) {const int offset =skb_network_offset (skb);u16 *buf, buf_;
@@ -1576,14 +1576,17 @@ static struct cake_tin_data *cake_select_tin(struct Qdisc *sch, {struct cake_sched_data *q =qdisc_priv (sch);u32 tin, mark; +bool wash;u8 dscp;/* Tin selection: Default to diffserv-based selection, allow overriding -* using firewall marks or skb->priority. +* using firewall marks or skb->priority. Call DSCP parsing early if +* wash is enabled, otherwise defer to below to skip unneeded parsing. */ - dscp =cake_handle_diffserv (skb, - q->rate_flags &CAKE_FLAG_WASH ); mark = (skb->mark & q->fwmark_mask) >> q->fwmark_shft; + wash = !!(q->rate_flags &CAKE_FLAG_WASH ); +if (wash) + dscp =cake_handle_diffserv (skb, wash);if (q->tin_mode ==CAKE_DIFFSERV_BESTEFFORT ) tin =0 ;
@@ -1597,6 +1600,8 @@ static struct cake_tin_data *cake_select_tin(struct Qdisc *sch, tin = q->tin_order[TC_H_MIN (skb->priority) -1 ]; else { +if (!wash) + dscp =cake_handle_diffserv (skb, wash); tin = q->tin_index[dscp];if (unlikely (tin >= q->tin_cnt))
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 26/178 sch_cake: fix a few style nits
In reply to Sasha LevinFrom: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 3f608f0c41360b11b04c763f348b712f651c8bac ]
I spotted a few nits when comparing the in-tree version of sch_cake with the out-of-tree one: A redundant error variable declaration shadowing an outer declaration, and an indentation alignment issue. Fix both of these.
--- net/sched/sch_cake.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sched/sch_cake.c +2 -2
@@ -2703,7 +2703,7 @@ static int cake_init(struct Qdisc *sch, struct nlattr *opt,qdisc_watchdog_init (&q->watchdog, sch);if (opt) { -int err =cake_change (sch, opt, extack); + err =cake_change (sch, opt, extack);if (err)return err;
@@ -3020,7 +3020,7 @@ static int cake_dump_class_stats(struct Qdisc *sch, unsigned long cl,PUT_STAT_S32 (BLUE_TIMER_US ,ktime_to_us (ktime_sub (now, - flow->cvars.blue_timer))); + flow->cvars.blue_timer))); }if (flow->cvars.dropping) { PUT_STAT_S32(DROP_NEXT_US,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 27/178 tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT
In reply to Sasha LevinFrom: Neal Cardwell <[email protected]>
[ Upstream commit b344579ca8478598937215f7005d6c7b84d28aee ]
Mirja Kuehlewind reported a bug in Linux TCP CUBIC Hystart, where Hystart HYSTART_DELAY mechanism can exit Slow Start spuriously on an ACK when the minimum rtt of a connection goes down. From inspection it is clear from the existing code that this could happen in an example like the following:
o The first 8 RTT samples in a round trip are 150ms, resulting in a curr_rtt of 150ms and a delay_min of 150ms.
o The 9th RTT sample is 100ms. The curr_rtt does not change after the first 8 samples, so curr_rtt remains 150ms. But delay_min can be lowered at any time, so delay_min falls to 100ms. The code executes the HYSTART_DELAY comparison between curr_rtt of 150ms and delay_min of 100ms, and the curr_rtt is declared far enough above delay_min to force a (spurious) exit of Slow start.
The fix here is simple: allow every RTT sample in a round trip to lower the curr_rtt.
--- net/ipv4/tcp_cubic.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv4/tcp_cubic.c +2 -0
@@ -404,6 +404,8 @@ static void hystart_update(struct sock *sk, u32 delay)if (hystart_detect &HYSTART_DELAY ) {/* obtain the minimum delay of more than sampling packets */ +if (ca->curr_rtt > delay) + ca->curr_rtt = delay;if (ca->sample_cnt <HYSTART_MIN_SAMPLES ) {if (ca->curr_rtt ==0 || ca->curr_rtt > delay) ca->curr_rtt = delay;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 28/178 Revert "i2c: tegra: Fix suspending in active runtime PM state"
In reply to Sasha LevinFrom: Thierry Reding <[email protected]>
[ Upstream commit 78ad73421831247e46c31899a7bead02740e4bef ]
This reverts commit 9f42de8d4ec2304f10bbc51dc0484f3503d61196.
It's not safe to use pm_runtime_force_{suspend,resume}(), especially during the noirq phase of suspend. See also the guidance provided in commit 1e2ef05bb8cf ("PM: Limit race conditions between runtime PM and system sleep (v2)").
--- drivers/i2c/busses/i2c-tegra.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/i2c/busses/i2c-tegra.c +0 -9
@@ -1719,14 +1719,9 @@ static int tegra_i2c_remove(struct platform_device *pdev)static int __maybe_unused tegra_i2c_suspend (struct device *dev) {struct tegra_i2c_dev *i2c_dev =dev_get_drvdata (dev); -int err;i2c_mark_adapter_suspended (&i2c_dev->adapter); - err =pm_runtime_force_suspend (dev); -if (err <0 ) -return err; -return 0 ; }
@@ -1747,10 +1742,6 @@ static int __maybe_unused tegra_i2c_resume(struct device *dev)if (err)return err; - err =pm_runtime_force_resume (dev); -if (err <0 ) -return err; -i2c_mark_adapter_resumed (&i2c_dev->adapter);return 0 ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 29/178 btrfs: fix a block group ref counter leak after failure to remove block group
In reply to Sasha Levin[ Upstream commit 9fecd13202f520f3f25d5b1c313adb740fe19773 ]
When removing a block group, if we fail to delete the block group's item from the extent tree, we jump to the 'out' label and end up decrementing the block group's reference count once only (by 1), resulting in a counter leak because the block group at that point was already removed from the block group cache rbtree - so we have to decrement the reference count twice, once for the rbtree and once for our lookup at the start of the function.
There is a second bug where if removing the free space tree entries (the call to remove_block_group_free_space()) fails we end up jumping to the 'out_put_group' label but end up decrementing the reference count only once, when we should have done it twice, since we have already removed the block group from the block group cache rbtree. This happens because the reference count decrement for the rbtree reference happens after attempting to remove the free space tree entries, which is far away from the place where we remove the block group from the rbtree.
To make things less error prone, decrement the reference count for the rbtree immediately after removing the block group from it. This also eleminates the need for two different exit labels on error, renaming 'out_put_label' to just 'out' and removing the old 'out'.
--- fs/btrfs/block-group.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
fs/btrfs/block-group.c +9 -10
@@ -910,7 +910,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, path =btrfs_alloc_path ();if (!path) { ret = -ENOMEM ; - goto out_put_group; + goto out; }/*
@@ -948,7 +948,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, ret =btrfs_orphan_add (trans,BTRFS_I (inode));if (ret) {btrfs_add_delayed_iput (inode); - goto out_put_group; + goto out; }clear_nlink (inode);/* One for the block groups ref */
@@ -971,13 +971,13 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, ret =btrfs_search_slot (trans, tree_root, &key, path,-1 ,1 );if (ret <0 ) - goto out_put_group; + goto out;if (ret >0 )btrfs_release_path (path);if (ret ==0 ) { ret =btrfs_del_item (trans, tree_root, path);if (ret) - goto out_put_group; + goto out;btrfs_release_path (path); }
@@ -986,6 +986,9 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, &fs_info->block_group_cache_tree);RB_CLEAR_NODE (&block_group->cache_node); +/* Once for the block groups rbtree */ +btrfs_put_block_group (block_group); +if (fs_info->first_logical_byte == block_group->key.objectid) fs_info->first_logical_byte = (u64)-1 ;spin_unlock (&fs_info->block_group_cache_lock);
@@ -1094,10 +1097,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, ret =remove_block_group_free_space (trans, block_group);if (ret) - goto out_put_group; - -/* Once for the block groups rbtree */ -btrfs_put_block_group (block_group); + goto out; ret =btrfs_search_slot (trans, root, &key, path,-1 ,1 );if (ret >0 )
@@ -1120,10 +1120,9 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,free_extent_map (em); } -out_put_group: +out:/* Once for the lookup reference */ btrfs_put_block_group (block_group); -out:if (remove_rsv)btrfs_delayed_refs_rsv_release (fs_info,1 );btrfs_free_path (path);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 30/178 net: sched: export __netdev_watchdog_up()
In reply to Sasha LevinFrom: Valentin Longchamp <[email protected]>
[ Upstream commit 1a3db27ad9a72d033235b9673653962c02e3486e ]
Since the quiesce/activate rework, __netdev_watchdog_up() is directly called in the ucc_geth driver.
Unfortunately, this function is not available for modules and thus ucc_geth cannot be built as a module anymore. Fix it by exporting __netdev_watchdog_up().
Since the commit introducing the regression was backported to stable branches, this one should ideally be as well.
--- net/sched/sch_generic.c | 1 + 1 file changed, 1 insertion(+)
net/sched/sch_generic.c +1 -0
@@ -469,6 +469,7 @@ void __netdev_watchdog_up(struct net_device *dev)dev_hold (dev); } } +EXPORT_SYMBOL_GPL (__netdev_watchdog_up);static void dev_watchdog_up (struct net_device *dev) {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 31/178 fix a braino in "sparc32: fix register window handling in genregs32_[gs]et()"
In reply to Sasha LevinFrom: Al Viro <[email protected]>
[ Upstream commit 9d964e1b82d8182184153b70174f445ea616f053 ]
lost npc in PTRACE_SETREGSET, breaking PTRACE_SETREGS as well
--- arch/sparc/kernel/ptrace_32.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/sparc/kernel/ptrace_32.c +7 -2
@@ -168,12 +168,17 @@ static int genregs32_set(struct task_struct *target,if (ret || !count)return ret; ret =user_regset_copyin (&pos, &count, &kbuf, &ubuf, - ®s->y, + ®s->npc,34 *sizeof (u32),35 *sizeof (u32));if (ret || !count)return ret; + ret =user_regset_copyin (&pos, &count, &kbuf, &ubuf, + ®s->y, +35 *sizeof (u32),36 *sizeof (u32)); +if (ret || !count) +return ret;return user_regset_copyin_ignore (&pos, &count, &kbuf, &ubuf, -35 *sizeof (u32),38 *sizeof (u32)); +36 *sizeof (u32),38 *sizeof (u32)); } static int fpregs32_get(struct task_struct *target,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 32/178 ALSA: usb-audio: Fix potential use-after-free of streams
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit ff58bbc7b9704a5869204176f804eff57307fef0 ]
With the recent full-duplex support of implicit feedback streams, an endpoint can be still running after closing the capture stream as long as the playback stream with the sync-endpoint is running. In such a state, the URBs are still be handled and they may call retire_data_urb callback, which tries to transfer the data from the PCM buffer. Since the PCM stream gets closed, this may lead to use-after-free.
This patch adds the proper clearance of the callback at stopping the capture stream for addressing the possible UAF above.
--- sound/usb/pcm.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/pcm.c +1 -0
@@ -1778,6 +1778,7 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substreamreturn 0 ;case SNDRV_PCM_TRIGGER_STOP :stop_endpoints (subs, false); + subs->data_endpoint->retire_data_urb =NULL ; subs->running =0 ;return 0 ;case SNDRV_PCM_TRIGGER_PAUSE_PUSH :
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 33/178 binder: fix null deref of proc->context
In reply to Sasha LevinFrom: Todd Kjos <[email protected]>
commit d35d3660e065b69fdb8bf512f3d899f350afce52 upstream.
The binder driver makes the assumption proc->context pointer is invariant after initialization (as documented in the kerneldoc header for struct proc). However, in commit f0fe2c0f050d ("binder: prevent UAF for binderfs devices II") proc->context is set to NULL during binder_deferred_release().
Another proc was in the middle of setting up a transaction to the dying process and crashed on a NULL pointer deref on "context" which is a local set to &proc->context:
new_ref->data.desc = (node == context->binder_context_mgr_node) ? 0 : 1;
Here's the stack:
[ 5237.855435] Call trace: [ 5237.855441] binder_get_ref_for_node_olocked+0x100/0x2ec [ 5237.855446] binder_inc_ref_for_node+0x140/0x280 [ 5237.855451] binder_translate_binder+0x1d0/0x388 [ 5237.855456] binder_transaction+0x2228/0x3730 [ 5237.855461] binder_thread_write+0x640/0x25bc [ 5237.855466] binder_ioctl_write_read+0xb0/0x464 [ 5237.855471] binder_ioctl+0x30c/0x96c [ 5237.855477] do_vfs_ioctl+0x3e0/0x700 [ 5237.855482] __arm64_sys_ioctl+0x78/0xa4 [ 5237.855488] el0_svc_common+0xb4/0x194 [ 5237.855493] el0_svc_handler+0x74/0x98 [ 5237.855497] el0_svc+0x8/0xc
The fix is to move the kfree of the binder_device to binder_free_proc() so the binder_device is freed when we know there are no references remaining on the binder_proc.
--- drivers/android/binder.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/android/binder.c +7 -7
@@ -4688,8 +4688,15 @@ static struct binder_thread *binder_get_thread(struct binder_proc *proc)static void binder_free_proc (struct binder_proc *proc) { +struct binder_device *device; +BUG_ON (!list_empty (&proc->todo));BUG_ON (!list_empty (&proc->delivered_death)); + device = container_of(proc->context, struct binder_device, context); +if (refcount_dec_and_test (&device->ref)) { +kfree (proc->context->name); +kfree (device); + }binder_alloc_deferred_release (&proc->alloc);put_task_struct (proc->tsk);binder_stats_deleted (BINDER_STAT_PROC );
@@ -5408,7 +5415,6 @@ static int binder_node_release(struct binder_node *node, int refs)static void binder_deferred_release (struct binder_proc *proc) {struct binder_context *context = proc->context; -struct binder_device *device;struct rb_node *n;int threads, nodes, incoming_refs, outgoing_refs, active_transactions;
@@ -5425,12 +5431,6 @@ static void binder_deferred_release(struct binder_proc *proc) context->binder_context_mgr_node =NULL ; }mutex_unlock (&context->context_mgr_node_lock); - device = container_of(proc->context, struct binder_device, context); -if (refcount_dec_and_test (&device->ref)) { -kfree (context->name); -kfree (device); - } - proc->context =NULL ;binder_inner_proc_lock (proc);/* * Make sure proc stays alive after we
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 34/178 USB: ohci-sm501: Add missed iounmap() in remove
In reply to Sasha LevinFrom: Chuhong Yuan <[email protected]>
commit 07c112fb09c86c0231f6ff0061a000ffe91c8eb9 upstream.
This driver misses calling iounmap() in remove to undo the ioremap() called in probe.
Add the missed call to fix it.
--- drivers/usb/host/ohci-sm501.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/ohci-sm501.c +1 -0
@@ -191,6 +191,7 @@ static int ohci_hcd_sm501_drv_remove(struct platform_device *pdev)struct resource *mem;usb_remove_hcd (hcd); +iounmap (hcd->regs);release_mem_region (hcd->rsrc_start, hcd->rsrc_len);usb_put_hcd (hcd); mem =platform_get_resource (pdev,IORESOURCE_MEM ,1 );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 35/178 usb: dwc2: Postponed gadget registration to the udc class driver
In reply to Sasha LevinFrom: Minas Harutyunyan <[email protected]>
commit 207324a321a866401b098cadf19e4a2dd6584622 upstream.
During dwc2 driver probe, after gadget registration to the udc class driver, if exist any builtin function driver it immediately bound to dwc2 and after init host side (dwc2_hcd_init()) stucked in host mode. Patch postpone gadget registration after host side initialization done.
--- drivers/usb/dwc2/gadget.c | 6 ------ drivers/usb/dwc2/platform.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/usb/dwc2/gadget.c +0 -6
@@ -4886,12 +4886,6 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg) epnum, 0); } - ret =usb_add_gadget_udc (dev, &hsotg->gadget); -if (ret) { -dwc2_hsotg_ep_free_request (&hsotg->eps_out[0 ]->ep, - hsotg->ctrl_req); -return ret; - }dwc2_hsotg_dump (hsotg);return 0 ;
drivers/usb/dwc2/platform.c +11 -0
@@ -507,6 +507,17 @@ static int dwc2_driver_probe(struct platform_device *dev)if (hsotg->dr_mode ==USB_DR_MODE_PERIPHERAL )dwc2_lowlevel_hw_disable (hsotg); +#if IS_ENABLED (CONFIG_USB_DWC2_PERIPHERAL ) || \ +IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE ) +/* Postponed adding a new gadget to the udc class driver list */ +if (hsotg->gadget_enabled) { + retval =usb_add_gadget_udc (hsotg->dev, &hsotg->gadget); +if (retval) { +dwc2_hsotg_remove (hsotg); + goto error; + } + } +#endif /* CONFIG_USB_DWC2_PERIPHERAL || CONFIG_USB_DWC2_DUAL_ROLE */ return 0 ; error:
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 36/178 usb: add USB_QUIRK_DELAY_INIT for Logitech C922
In reply to Sasha LevinFrom: Tomasz Meresiński <[email protected]>
commit 5d8021923e8a8cc37a421a64e27c7221f0fee33c upstream.
The Logitech C922, just like other Logitech webcams, needs the USB_QUIRK_DELAY_INIT or it will randomly not respond after device connection
--- drivers/usb/core/quirks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/core/quirks.c +2 -1
@@ -218,11 +218,12 @@ static const struct usb_device_id usb_quirk_list[] = {/* Logitech HD Webcam C270 */ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Logitech HD Pro Webcams C920, C920-C, C925e and C930e */ + /* Logitech HD Pro Webcams C920, C920-C, C922, C925e and C930e */ { USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT }, { USB_DEVICE(0x046d, 0x0841), .driver_info = USB_QUIRK_DELAY_INIT }, { USB_DEVICE(0x046d, 0x0843), .driver_info = USB_QUIRK_DELAY_INIT }, { USB_DEVICE(0x046d, 0x085b), .driver_info = USB_QUIRK_DELAY_INIT }, + { USB_DEVICE(0x046d, 0x085c), .driver_info = USB_QUIRK_DELAY_INIT }, /* Logitech ConferenceCam CC3000e */ { USB_DEVICE(0x046d, 0x0847), .driver_info = USB_QUIRK_DELAY_INIT },
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 37/178 USB: ehci: reopen solution for Synopsys HC bug
In reply to Sasha LevinFrom: Longfang Liu <[email protected]>
commit 1ddcb71a3edf0e1682b6e056158e4c4b00325f66 upstream.
A Synopsys USB2.0 core used in Huawei Kunpeng920 SoC has a bug which might cause the host controller not issuing ping.
Bug description:
After indicating an Interrupt on Async Advance, the software uses the doorbell mechanism to delete the Next Link queue head of the last executed queue head. At this time, the host controller still references the removed queue head(the queue head is NULL). NULL reference causes the host controller to lose the USB device.
Solution:
After deleting the Next Link queue head, when has_synopsys_hc_bug set to 1,the software can write one of the valid queue head addresses to the ASYNCLISTADDR register to allow the host controller to get the valid queue head. in order to solve that problem, this patch set the flag for Huawei Kunpeng920
There are detailed instructions and solutions in this patch:
commit 2f7ac6c19997 ("USB: ehci: add workaround for Synopsys HC bug")
--- drivers/usb/host/ehci-pci.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/host/ehci-pci.c +7 -0
@@ -216,6 +216,13 @@ static int ehci_pci_setup(struct usb_hcd *hcd)ehci_info (ehci,"applying MosChip frame-index workaround\n" ); ehci->frame_index_bug =1 ;break ; +case PCI_VENDOR_ID_HUAWEI : +/* Synopsys HC bug */ +if (pdev->device ==0xa239 ) { +ehci_info (ehci,"applying Synopsys HC workaround\n" ); + ehci->has_synopsys_hc_bug =1 ; + } +break ; }/* optional debug port, normally in the first BAR */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 38/178 usb: host: xhci-mtk: avoid runtime suspend when removing hcd
In reply to Sasha LevinFrom: Macpaul Lin <[email protected]>
commit a24d5072e87457a14023ee1dd3fc8b1e76f899ef upstream.
When runtime suspend was enabled, runtime suspend might happen when xhci is removing hcd. This might cause kernel panic when hcd has been freed but runtime pm suspend related handle need to reference it.
--- drivers/usb/host/xhci-mtk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-mtk.c +3 -2
@@ -592,6 +592,9 @@ static int xhci_mtk_remove(struct platform_device *dev)struct xhci_hcd *xhci =hcd_to_xhci (hcd);struct usb_hcd *shared_hcd = xhci->shared_hcd; +pm_runtime_put_noidle (&dev->dev); +pm_runtime_disable (&dev->dev); +usb_remove_hcd (shared_hcd); xhci->shared_hcd =NULL ;device_init_wakeup (&dev->dev, false);
@@ -602,8 +605,6 @@ static int xhci_mtk_remove(struct platform_device *dev)xhci_mtk_sch_exit (mtk);xhci_mtk_clks_disable (mtk);xhci_mtk_ldos_disable (mtk); -pm_runtime_put_sync (&dev->dev); -pm_runtime_disable (&dev->dev);return 0 ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 39/178 xhci: Poll for U0 after disabling USB2 LPM
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
commit b3d71abd135e6919ca0b6cab463738472653ddfb upstream.
USB2 devices with LPM enabled may interrupt the system suspend:
[ 932.510475] usb 1-7: usb suspend, wakeup 0 [ 932.510549] hub 1-0:1.0: hub_suspend [ 932.510581] usb usb1: bus suspend, wakeup 0 [ 932.510590] xhci_hcd 0000:00:14.0: port 9 not suspended [ 932.510593] xhci_hcd 0000:00:14.0: port 8 not suspended .. [ 932.520323] xhci_hcd 0000:00:14.0: Port change event, 1-7, id 7, portsc: 0x400e03 .. [ 932.591405] PM: pci_pm_suspend(): hcd_pci_suspend+0x0/0x30 returns -16 [ 932.591414] PM: dpm_run_callback(): pci_pm_suspend+0x0/0x160 returns -16 [ 932.591418] PM: Device 0000:00:14.0 failed to suspend async: error -16
During system suspend, USB core will let HC suspends the device if it doesn't have remote wakeup enabled and doesn't have any children. However, from the log above we can see that the usb 1-7 doesn't get bus suspended due to not in U0. After a while the port finished U2 -> U0 transition, interrupts the suspend process.
The observation is that after disabling LPM, port doesn't transit to U0 immediately and can linger in U2. xHCI spec 4.23.5.2 states that the maximum exit latency for USB2 LPM should be BESL + 10us. The BESL for the affected device is advertised as 400us, which is still not enough based on my testing result.
So let's use the maximum permitted latency, 10000, to poll for U0 status to solve the issue.
--- drivers/usb/host/xhci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci.c +3 -0
@@ -4471,6 +4471,9 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,mutex_lock (hcd->bandwidth_mutex);xhci_change_max_exit_latency (xhci, udev,0 );mutex_unlock (hcd->bandwidth_mutex); +readl_poll_timeout (ports[port_num]->addr, pm_val, + (pm_val &PORT_PLS_MASK ) ==XDEV_U0 , +100 ,10000 );return 0 ; } }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 40/178 usb: host: ehci-exynos: Fix error check in exynos_ehci_probe()
In reply to Sasha LevinFrom: Tang Bin <[email protected]>
commit 44ed240d62736ad29943ec01e41e194b96f7c5e9 upstream.
If the function platform_get_irq() failed, the negative value returned will not be detected here. So fix error handling in exynos_ehci_probe(). And when get irq failed, the function platform_get_irq() logs an error message, so remove redundant message here.
--- drivers/usb/host/ehci-exynos.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/usb/host/ehci-exynos.c +2 -3
@@ -203,9 +203,8 @@ static int exynos_ehci_probe(struct platform_device *pdev) hcd->rsrc_len =resource_size (res); irq =platform_get_irq (pdev,0 ); -if (!irq) { -dev_err (&pdev->dev,"Failed to get IRQ\n" ); - err = -ENODEV ; +if (irq <0 ) { + err = irq; goto fail_io; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 41/178 usb: typec: tcpci_rt1711h: avoid screaming irq causing boot hangs
In reply to Sasha LevinFrom: Li Jun <[email protected]>
commit 302c570bf36e997d55ad0d60628a2feec76954a4 upstream.
John reported screaming irq caused by rt1711h when system boot[1], this is because irq request is done before tcpci_register_port(), so the chip->tcpci has not been setup, irq handler is entered but can't do anything, this patch is to address this by moving the irq request after tcpci_register_port().
[1] https://lore.kernel.org/linux-usb/[email protected]
--- drivers/usb/typec/tcpm/tcpci_rt1711h.c | 31 +++++++++----------------- 1 file changed, 10 insertions(+), 21 deletions(-)
drivers/usb/typec/tcpm/tcpci_rt1711h.c +10 -21
@@ -179,26 +179,6 @@ static irqreturn_t rt1711h_irq(int irq, void *dev_id)return tcpci_irq (chip->tcpci); } -static int rt1711h_init_alert (struct rt1711h_chip *chip, -struct i2c_client *client) -{ -int ret; - -/* Disable chip interrupts before requesting irq */ - ret =rt1711h_write16 (chip,TCPC_ALERT_MASK ,0 ); -if (ret <0 ) -return ret; - - ret =devm_request_threaded_irq (chip->dev, client->irq,NULL , - rt1711h_irq, -IRQF_ONESHOT |IRQF_TRIGGER_LOW , -dev_name (chip->dev), chip); -if (ret <0 ) -return ret; -enable_irq_wake (client->irq); -return 0 ; -} -static int rt1711h_sw_reset (struct rt1711h_chip *chip) {int ret;
@@ -260,7 +240,8 @@ static int rt1711h_probe(struct i2c_client *client,if (ret <0 )return ret; - ret =rt1711h_init_alert (chip, client); +/* Disable chip interrupts before requesting irq */ + ret =rt1711h_write16 (chip,TCPC_ALERT_MASK ,0 );if (ret <0 )return ret;
@@ -271,6 +252,14 @@ static int rt1711h_probe(struct i2c_client *client,if (IS_ERR_OR_NULL (chip->tcpci))return PTR_ERR (chip->tcpci); + ret =devm_request_threaded_irq (chip->dev, client->irq,NULL , + rt1711h_irq, +IRQF_ONESHOT |IRQF_TRIGGER_LOW , +dev_name (chip->dev), chip); +if (ret <0 ) +return ret; +enable_irq_wake (client->irq); +return 0 ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 42/178 ALSA: usb-audio: Add implicit feedback quirk for SSL2+.
In reply to Sasha LevinFrom: Laurence Tratt <[email protected]>
commit e7585db1b0b5b4e4eb1967bb1472df308f7ffcbf upstream.
This uses the same quirk as the Motu M2 and M4 to ensure the driver uses the audio interface's clock. Tested on an SSL2+.
--- sound/usb/pcm.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/pcm.c +1 -0
@@ -349,6 +349,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, ifnum =0 ; goto add_sync_ep_from_ifnum;case USB_ID (0x07fd ,0x0008 ):/* MOTU M Series */ +case USB_ID (0x31e9 ,0x0002 ):/* Solid State Logic SSL2+ */ ep =0x81 ; ifnum =2 ; goto add_sync_ep_from_ifnum;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 43/178 ALSA: usb-audio: add quirk for Denon DCD-1500RE
In reply to Sasha LevinFrom: "Yick W. Tse" <[email protected]>
commit c9808bbfed3cfc911ecb60fe8e80c0c27876c657 upstream.
fix error "clock source 41 is not valid, cannot use"
[] New USB device found, idVendor=154e, idProduct=1002, bcdDevice= 1.00 [] New USB device strings: Mfr=1, Product=2, SerialNumber=0 [] Product: DCD-1500RE
[] Manufacturer: D & M Holdings Inc.
[]
[] clock source 41 is not valid, cannot use
[] usbcore: registered new interface driver snd-usb-audio
--- sound/usb/quirks.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/quirks.c +1 -0
@@ -1461,6 +1461,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)static bool is_itf_usb_dsd_dac (unsigned int id) {switch (id) { +case USB_ID (0x154e ,0x1002 ):/* Denon DCD-1500RE */ case USB_ID (0x154e ,0x1003 ):/* Denon DA-300USB */ case USB_ID (0x154e ,0x3005 ):/* Marantz HD-DAC1 */ case USB_ID (0x154e ,0x3006 ):/* Marantz SA-14S1 */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 44/178 ALSA: usb-audio: add quirk for Samsung USBC Headset (AKG)
In reply to Sasha LevinFrom: Macpaul Lin <[email protected]>
commit a32a1fc99807244d920d274adc46ba04b538cc8a upstream.
We've found Samsung USBC Headset (AKG) (VID: 0x04e8, PID: 0xa051) need a tiny delay after each class compliant request. Otherwise the device might not be able to be recognized each times.
--- sound/usb/quirks.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/usb/quirks.c +8 -0
@@ -1603,6 +1603,14 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, chip->usb_id == USB_ID(0x0951, 0x16ad)) && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)usleep_range (1000 ,2000 ); + +/* +* Samsung USBC Headset (AKG) need a tiny delay after each +* class compliant request. (Model number: AAM625R or AAM627R) +*/ +if (chip->usb_id ==USB_ID (0x04e8 ,0xa051 ) && + (requesttype &USB_TYPE_MASK ) ==USB_TYPE_CLASS ) +usleep_range (5000 ,6000 ); }/*
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 45/178 ALSA: usb-audio: Fix OOB access of mixer element list
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
commit 220345e98f1cdc768eeb6e3364a0fa7ab9647fe7 upstream.
The USB-audio mixer code holds a linked list of usb_mixer_elem_list, and several operations are performed for each mixer element. A few of them (snd_usb_mixer_notify_id() and snd_usb_mixer_interrupt_v2()) assume each mixer element being a usb_mixer_elem_info object that is a subclass of usb_mixer_elem_list, cast via container_of() and access it members. This may result in an out-of-bound access when a non-standard list element has been added, as spotted by syzkaller recently.
This patch adds a new field, is_std_info, in usb_mixer_elem_list to indicate that the element is the usb_mixer_elem_info type or not, and skip the access to such an element if needed.
--- sound/usb/mixer.c | 15 +++++++++++---- sound/usb/mixer.h | 9 +++++++-- sound/usb/mixer_quirks.c | 3 ++- 3 files changed, 20 insertions(+), 7 deletions(-)
sound/usb/mixer.c +11 -4
@@ -576,8 +576,9 @@ static int check_matrix_bitmap(unsigned char *bmap,* if failed, give up and free the control instance. */ -int snd_usb_mixer_add_control (struct usb_mixer_elem_list *list, -struct snd_kcontrol *kctl) +int snd_usb_mixer_add_list (struct usb_mixer_elem_list *list, +struct snd_kcontrol *kctl, +bool is_std_info) {struct usb_mixer_interface *mixer = list->mixer;int err;
@@ -591,6 +592,7 @@ int snd_usb_mixer_add_control(struct usb_mixer_elem_list *list,return err; } list->kctl = kctl; + list->is_std_info = is_std_info; list->next_id_elem = mixer->id_elems[list->id]; mixer->id_elems[list->id] = list;return 0 ;
@@ -3213,8 +3215,11 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid) unitid =delegate_notify (mixer, unitid,NULL ,NULL );for_each_mixer_elem (list, mixer, unitid) { -struct usb_mixer_elem_info *info = -mixer_elem_list_to_info (list); +struct usb_mixer_elem_info *info; + +if (!list->is_std_info) +continue ; + info =mixer_elem_list_to_info (list);/* invalidate cache, so the value is read from the device */ info->cached =0 ; snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
@@ -3294,6 +3299,8 @@ static void snd_usb_mixer_interrupt_v2(struct usb_mixer_interface *mixer,if (!list->kctl)continue ; +if (!list->is_std_info) +continue ; info =mixer_elem_list_to_info (list);if (count >1 && info->control != control)
sound/usb/mixer.h +7 -2
@@ -66,6 +66,7 @@ struct usb_mixer_elem_list {struct usb_mixer_elem_list *next_id_elem;/* list of controls with same id */ struct snd_kcontrol *kctl;unsigned int id; +bool is_std_info;usb_mixer_elem_dump_func_t dump;usb_mixer_elem_resume_func_t resume; };
@@ -103,8 +104,12 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid);int snd_usb_mixer_set_ctl_value (struct usb_mixer_elem_info *cval,int request,int validx,int value_set); -int snd_usb_mixer_add_control (struct usb_mixer_elem_list *list, -struct snd_kcontrol *kctl); +int snd_usb_mixer_add_list (struct usb_mixer_elem_list *list, +struct snd_kcontrol *kctl, +bool is_std_info); + +#define snd_usb_mixer_add_control (list, kctl) \ + snd_usb_mixer_add_list(list, kctl, true) void snd_usb_mixer_elem_init_std(struct usb_mixer_elem_list *list, struct usb_mixer_interface *mixer,
sound/usb/mixer_quirks.c +2 -1
@@ -157,7 +157,8 @@ static int add_single_ctl_with_resume(struct usb_mixer_interface *mixer,return -ENOMEM ; } kctl->private_free = snd_usb_mixer_elem_free; -return snd_usb_mixer_add_control (list, kctl); +/* don't use snd_usb_mixer_add_control() here, this is a special list element */ +return snd_usb_mixer_add_list (list, kctl, false); }/*
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 46/178 usb: cdns3: trace: using correct dir value
In reply to Sasha LevinFrom: Peter Chen <[email protected]>
commit ba3a80fe0fb67d8790f62b7bc60df97406d89871 upstream.
It should use the correct direction value from register, not depends on previous software setting. It fixed the EP number wrong issue at trace when the TRBERR interrupt occurs for EP0IN.
When the EP0IN IOC has finished, software prepares the setup packet request, the expected direction is OUT, but at that time, the TRBERR for EP0IN may occur since it is DMULT mode, the DMA does not stop until TRBERR has met.
--- drivers/usb/cdns3/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/cdns3/trace.h +1 -1
@@ -150,7 +150,7 @@ DECLARE_EVENT_CLASS(cdns3_log_ep0_irq,__dynamic_array (char, str,CDNS3_MSG_MAX ) ),TP_fast_assign ( - __entry->ep_dir = priv_dev->ep0_data_dir; + __entry->ep_dir = priv_dev->selected_ep; __entry->ep_sts = ep_sts; ), TP_printk("%s", cdns3_decode_ep0_irq(__get_str(str),
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 47/178 usb: cdns3: ep0: fix the test mode set incorrectly
In reply to Sasha LevinFrom: Peter Chen <[email protected]>
commit b51e1cf64f93acebb6d8afbacd648a6ecefc39b4 upstream.
The 'tmode' is ctrl->wIndex, changing it as the real test mode value for register assignment.
--- drivers/usb/cdns3/ep0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/cdns3/ep0.c +2 -1
@@ -327,7 +327,8 @@ static int cdns3_ep0_feature_handle_device(struct cdns3_device *priv_dev,if (!set || (tmode &0xff ) !=0 )return -EINVAL ; -switch (tmode >>8 ) { + tmode >>=8 ; +switch (tmode) {case TEST_J :case TEST_K :case TEST_SE0_NAK :
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 48/178 usb: cdns3: ep0: add spinlock for cdns3_check_new_setup
In reply to Sasha LevinFrom: Peter Chen <[email protected]>
commit 2587a029fa2a877d0a8dda955ef1b24c94b4bd0e upstream.
The other thread may access other endpoints when the cdns3_check_new_setup is handling, add spinlock to protect it.
--- drivers/usb/cdns3/ep0.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/usb/cdns3/ep0.c +4 -3
@@ -712,15 +712,17 @@ static int cdns3_gadget_ep0_queue(struct usb_ep *ep,int ret =0 ;u8 zlp =0 ; +spin_lock_irqsave (&priv_dev->lock, flags);trace_cdns3_ep0_queue (priv_dev, request);/* cancel the request if controller receive new SETUP packet. */ -if (cdns3_check_new_setup (priv_dev)) +if (cdns3_check_new_setup (priv_dev)) { +spin_unlock_irqrestore (&priv_dev->lock, flags);return -ECONNRESET ; + }/* send STATUS stage. Should be called only for SET_CONFIGURATION */ if (priv_dev->ep0_stage ==CDNS3_STATUS_STAGE ) { -spin_lock_irqsave (&priv_dev->lock, flags);cdns3_select_ep (priv_dev,0x00 ); erdy_sent = !priv_dev->hw_configured_flag;
@@ -745,7 +747,6 @@ static int cdns3_gadget_ep0_queue(struct usb_ep *ep,return 0 ; } -spin_lock_irqsave (&priv_dev->lock, flags);if (!list_empty (&priv_ep->pending_req_list)) {dev_err (priv_dev->dev,"can't handle multiple requests for ep0\n" );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 49/178 scsi: qla2xxx: Keep initiator ports after RSCN
In reply to Sasha LevinFrom: Roman Bolshakov <[email protected]>
commit 632f24f09d5b7c8a2f94932c3391ca957ae76cc4 upstream.
The driver performs SCR (state change registration) in all modes including pure target mode.
For each RSCN, scan_needed flag is set in qla2x00_handle_rscn() for the port mentioned in the RSCN and fabric rescan is scheduled. During the rescan, GNN_FT handler, qla24xx_async_gnnft_done() deletes session of the port that caused the RSCN.
In target mode, the session deletion has an impact on ATIO handler, qlt_24xx_atio_pkt(). Target responds with SAM STATUS BUSY to I/O incoming from the deleted session. qlt_handle_cmd_for_atio() and qlt_handle_task_mgmt() return -EFAULT if they are not able to find session of the command/TMF, and that results in invocation of qlt_send_busy():
qlt_24xx_atio_pkt_all_vps: qla_target(0): type 6 ox_id 0014 qla_target(0): Unable to send command to target, sending BUSY status
Such response causes command timeout on the initiator. Error handler thread on the initiator will be spawned to abort the commands:
scsi 23:0:0:0: tag#0 abort scheduled
scsi 23:0:0:0: tag#0 aborting command
qla2xxx [0000:af:00.0]-188c:23: Entered qla24xx_abort_command. qla2xxx [0000:af:00.0]-801c:23: Abort command issued nexus=23:0:0 -- 0 2003.
Command abort is rejected by target and fails (2003), error handler then tries to perform DEVICE RESET and TARGET RESET but they're also doomed to fail because TMFs are ignored for the deleted sessions.
Then initiator makes BUS RESET that resets the link via qla2x00_full_login_lip(). BUS RESET succeeds and brings initiator port up, SAN switch detects that and sends RSCN to the target port and it fails again the same way as described above. It never goes out of the loop.
The change breaks the RSCN loop by keeping initiator sessions mentioned in RSCN payload in all modes, including dual and pure target mode.
--- drivers/scsi/qla2xxx/qla_gs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_gs.c +3 -1
@@ -3638,7 +3638,9 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)qla2x00_clear_loop_id (fcport); fcport->flags |=FCF_FABRIC_DEVICE ; }else if (fcport->d_id.b24 != rp->id.b24 || - fcport->scan_needed) { + (fcport->scan_needed && + fcport->port_type !=FCT_INITIATOR && + fcport->port_type !=FCT_NVME_INITIATOR )) {qlt_schedule_sess_for_deletion (fcport); } fcport->d_id.b24 = rp->id.b24;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 50/178 scsi: zfcp: Fix panic on ERP timeout for previously dismissed ERP action
In reply to Sasha LevinFrom: Steffen Maier <[email protected]>
commit 936e6b85da0476dd2edac7c51c68072da9fb4ba2 upstream.
Suppose that, for unrelated reasons, FSF requests on behalf of recovery are very slow and can run into the ERP timeout.
In the case at hand, we did adapter recovery to a large degree. However due to the slowness a LUN open is pending so the corresponding fc_rport remains blocked. After fast_io_fail_tmo we trigger close physical port recovery for the port under which the LUN should have been opened. The new higher order port recovery dismisses the pending LUN open ERP action and dismisses the pending LUN open FSF request. Such dismissal decouples the ERP action from the pending corresponding FSF request by setting zfcp_fsf_req->erp_action to NULL (among other things) [zfcp_erp_strategy_check_fsfreq()].
If now the ERP timeout for the pending open LUN request runs out, we must not use zfcp_fsf_req->erp_action in the ERP timeout handler. This is a problem since v4.15 commit 75492a51568b ("s390/scsi: Convert timers to use timer_setup()"). Before that we intentionally only passed zfcp_erp_action as context argument to zfcp_erp_timeout_handler().
Note: The lifetime of the corresponding zfcp_fsf_req object continues until a (late) response or an (unrelated) adapter recovery.
Just like the regular response path ignores dismissed requests [zfcp_fsf_req_complete() => zfcp_fsf_protstatus_eval() => return early] the ERP timeout handler now needs to ignore dismissed requests. So simply return early in the ERP timeout handler if the FSF request is marked as dismissed in its status flags. To protect against the race where zfcp_erp_strategy_check_fsfreq() dismisses and sets zfcp_fsf_req->erp_action to NULL after our previous status flag check, return early if zfcp_fsf_req->erp_action is NULL. After all, the former ERP action does not need to be woken up as that was already done as part of the dismissal above [zfcp_erp_action_dismiss()].
This fixes the following panic due to kernel page fault in IRQ context:
Unable to handle kernel pointer dereference in virtual kernel address space
Failing address: 0000000000000000 TEID: 0000000000000483
Fault in home space mode while using kernel ASCE.
AS:000009859238c00b R2:00000e3e7ffd000b R3:00000e3e7ffcc007 S:00000e3e7ffd7000 P:000000000000013d
Oops: 0004 ilc:2 [#1] SMP
Modules linked in: ...
CPU: 82 PID: 311273 Comm: stress Kdump: loaded Tainted: G E X ...
Hardware name: IBM 8561 T01 701 (LPAR)
Krnl PSW : 0404c00180000000 001fffff80549be0 (zfcp_erp_notify+0x40/0xc0 [zfcp])
R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:3 CC:0 PM:0 RI:0 EA:3
Krnl GPRS: 0000000000000080 00000e3d00000000 00000000000000f0 0000000000030000
000000010028e700 000000000400a39c 000000010028e700 00000e3e7cf87e02
0000000010000000 0700098591cb67f0 0000000000000000 0000000000000000
0000033840e9a000 0000000000000000 001fffe008d6bc18 001fffe008d6bbc8
Krnl Code: 001fffff80549bd4: a7180000 lhi %r1,0
001fffff80549bd8: 4120a0f0 la %r2,240(%r10)
#001fffff80549bdc: a53e0003 llilh %r3,3
>001fffff80549be0: ba132000 cs %r1,%r3,0(%r2)
001fffff80549be4: a7740037 brc 7,1fffff80549c52
001fffff80549be8: e320b0180004 lg %r2,24(%r11)
001fffff80549bee: e31020e00004 lg %r1,224(%r2)
001fffff80549bf4: 412020e0 la %r2,224(%r2)
Call Trace:
[<001fffff80549be0>] zfcp_erp_notify+0x40/0xc0 [zfcp]
[<00000985915e26f0>] call_timer_fn+0x38/0x190
[<00000985915e2944>] expire_timers+0xfc/0x190
[<00000985915e2ac4>] run_timer_softirq+0xec/0x218
[<0000098591ca7c4c>] __do_softirq+0x144/0x398
[<00000985915110aa>] do_softirq_own_stack+0x72/0x88
[<0000098591551b58>] irq_exit+0xb0/0xb8
[<0000098591510c6a>] do_IRQ+0x82/0xb0
[<0000098591ca7140>] ext_int_handler+0x128/0x12c
[<0000098591722d98>] clear_subpage.constprop.13+0x38/0x60
([<000009859172ae4c>] clear_huge_page+0xec/0x250)
[<000009859177e7a2>] do_huge_pmd_anonymous_page+0x32a/0x768
[<000009859172a712>] __handle_mm_fault+0x88a/0x900
[<000009859172a860>] handle_mm_fault+0xd8/0x1b0
[<0000098591529ef6>] do_dat_exception+0x136/0x3e8
[<0000098591ca6d34>] pgm_check_handler+0x1c8/0x220
Last Breaking-Event-Address:
[<001fffff80549c88>] zfcp_erp_timeout_handler+0x10/0x18 [zfcp]
Kernel panic - not syncing: Fatal exception in interrupt--- drivers/s390/scsi/zfcp_erp.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/s390/scsi/zfcp_erp.c +11 -2
@@ -576,7 +576,10 @@ static void zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *act) ZFCP_STATUS_ERP_TIMEDOUT)) { req->status |=ZFCP_STATUS_FSFREQ_DISMISSED ;zfcp_dbf_rec_run ("erscf_1" , act); - req->erp_action =NULL ; +/* lock-free concurrent access with +* zfcp_erp_timeout_handler() +*/ +WRITE_ONCE (req->erp_action,NULL ); }if (act->status &ZFCP_STATUS_ERP_TIMEDOUT )zfcp_dbf_rec_run ("erscf_2" , act);
@@ -612,8 +615,14 @@ void zfcp_erp_notify(struct zfcp_erp_action *erp_action, unsigned long set_mask)void zfcp_erp_timeout_handler (struct timer_list *t) {struct zfcp_fsf_req *fsf_req =from_timer (fsf_req, t, timer); -struct zfcp_erp_action *act = fsf_req->erp_action; +struct zfcp_erp_action *act; +if (fsf_req->status &ZFCP_STATUS_FSFREQ_DISMISSED ) +return ; +/* lock-free concurrent access with zfcp_erp_strategy_check_fsfreq() */ + act =READ_ONCE (fsf_req->erp_action); +if (!act) +return ;zfcp_erp_notify (act,ZFCP_STATUS_ERP_TIMEDOUT ); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 51/178 cifs: Fix cached_fid refcnt leak in open_shroot
In reply to Sasha LevinFrom: Xiyu Yang <[email protected]>
commit 77577de64167aa0643d47ffbaacf3642632b321b upstream.
open_shroot() invokes kref_get(), which increases the refcount of the "tcon->crfid" object. When open_shroot() returns not zero, it means the open operation failed and close_shroot() will not be called to decrement the refcount of the "tcon->crfid".
The reference counting issue happens in one normal path of open_shroot(). When the cached root have been opened successfully in a concurrent process, the function increases the refcount and jump to "oshr_free" to return. However the current return value "rc" may not equal to 0, thus the increased refcount will not be balanced outside the function, causing a refcnt leak.
Fix this issue by setting the value of "rc" to 0 before jumping to "oshr_free" label.
--- fs/cifs/smb2ops.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/smb2ops.c +1 -0
@@ -736,6 +736,7 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon, struct cifs_fid *pfid)/* close extra handle outside of crit sec */ SMB2_close (xid, tcon, fid.persistent_fid, fid.volatile_fid); } + rc =0 ; goto oshr_free; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 52/178 cifs/smb3: Fix data inconsistent when punch hole
In reply to Sasha LevinFrom: Zhang Xiaoxu <[email protected]>
commit acc91c2d8de4ef46ed751c5f9df99ed9a109b100 upstream.
When punch hole success, we also can read old data from file:
# strace -e trace=pread64,fallocate xfs_io -f -c "pread 20 40" \
-c "fpunch 20 40" -c"pread 20 40" file
pread64(3, " version 5.8.0-rc1+"..., 40, 20) = 40
fallocate(3, FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE, 20, 40) = 0
pread64(3, " version 5.8.0-rc1+"..., 40, 20) = 40CIFS implements the fallocate(FALLOCATE_FL_PUNCH_HOLE) with send SMB ioctl(FSCTL_SET_ZERO_DATA) to server. It just set the range of the remote file to zero, but local page caches not updated, then the local page caches inconsistent with server.
Also can be found by xfstests generic/316.
So, we need to remove the page caches before send the SMB ioctl(FSCTL_SET_ZERO_DATA) to server.
--- fs/cifs/smb2ops.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/cifs/smb2ops.c +6 -0
@@ -3036,6 +3036,12 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,return rc; } +/* +* We implement the punch hole through ioctl, so we need remove the page +* caches first, otherwise the data may be inconsistent with the server. +*/ +truncate_pagecache_range (inode, offset, offset + len -1 ); +cifs_dbg (FYI ,"Offset %lld len %lld\n" , offset, len); fsctl_buf.FileOffset =cpu_to_le64 (offset);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 53/178 cifs/smb3: Fix data inconsistent when zero file range
In reply to Sasha LevinFrom: Zhang Xiaoxu <[email protected]>
commit 6b69040247e14b43419a520f841f2b3052833df9 upstream.
CIFS implements the fallocate(FALLOC_FL_ZERO_RANGE) with send SMB ioctl(FSCTL_SET_ZERO_DATA) to server. It just set the range of the remote file to zero, but local page cache not update, then the data inconsistent with server, which leads the xfstest generic/008 failed.
So we need to remove the local page caches before send SMB ioctl(FSCTL_SET_ZERO_DATA) to server. After next read, it will re-cache it.
--- fs/cifs/smb2ops.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/cifs/smb2ops.c +5 -0
@@ -2970,6 +2970,11 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon,trace_smb3_zero_enter (xid, cfile->fid.persistent_fid, tcon->tid, ses->Suid, offset, len); +/* +* We zero the range through ioctl, so we need remove the page caches +* first, otherwise the data may be inconsistent with the server. +*/ +truncate_pagecache_range (inode, offset, offset + len -1 );/* if file not oplocked can't be sure whether asking to extend size */ if (!CIFS_CACHE_READ (cifsi))
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 54/178 xhci: Fix incorrect EP_STATE_MASK
In reply to Sasha LevinFrom: Mathias Nyman <[email protected]>
commit dceea67058fe22075db3aed62d5cb62092be5053 upstream.
EP_STATE_MASK should be 0x7 instead of 0xf
xhci spec 6.2.3 shows that the EP state field in the endpoint context data structure consist of bits [2:0].
The old value included a bit from the next field which fortunately is a
RsvdZ region. So hopefully this hasn't caused too much harm
--- drivers/usb/host/xhci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci.h +1 -1
@@ -716,7 +716,7 @@ struct xhci_ep_ctx {* 4 - TRB error * 5-7 - reserved */ -#define EP_STATE_MASK (0xf) +#define EP_STATE_MASK (0x7)#define EP_STATE_DISABLED 0#define EP_STATE_RUNNING 1#define EP_STATE_HALTED 2
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 55/178 xhci: Fix enumeration issue when setting max packet size for FS devices.
In reply to Sasha LevinFrom: Al Cooper <[email protected]>
commit a73d9d9cfc3cfceabd91fb0b0c13e4062b6dbcd7 upstream.
Unable to complete the enumeration of a USB TV Tuner device.
Per XHCI spec (4.6.5), the EP state field of the input context shall be cleared for a set address command. In the special case of an FS device that has "MaxPacketSize0 = 8", the Linux XHCI driver does not do this before evaluating the context. With an XHCI controller that checks the EP state field for parameter context error this causes a problem in cases such as the device getting reset again after enumeration.
When that field is cleared, the problem does not occur.
This was found and fixed by Sasi Kumar.
--- drivers/usb/host/xhci.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/xhci.c +1 -0
@@ -1430,6 +1430,7 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id, xhci->devs[slot_id]->out_ctx, ep_index); ep_ctx =xhci_get_ep_ctx (xhci, command->in_ctx, ep_index); + ep_ctx->ep_info &=cpu_to_le32 (~EP_STATE_MASK );/* must clear */ ep_ctx->ep_info2 &=cpu_to_le32 (~MAX_PACKET_MASK ); ep_ctx->ep_info2 |=cpu_to_le32 (MAX_PACKET (max_packet_size));
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 56/178 xhci: Return if xHCI doesn't support LPM
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
commit f0c472a6da51f9fac15e80fe2fd9c83b68754cff upstream.
Just return if xHCI is quirked to disable LPM. We can save some time from reading registers and doing spinlocks.
Add stable tag as we want this patch together with the next one, "Poll for U0 after disabling USB2 LPM" which fixes a suspend issue for some USB2 LPM devices
--- drivers/usb/host/xhci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/host/xhci.c +4 -1
@@ -4391,6 +4391,9 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,int hird, exit_latency;int ret; +if (xhci->quirks &XHCI_HW_LPM_DISABLE ) +return -EPERM ; +if (hcd->speed >=HCD_USB3 || !xhci->hw_lpm_support || !udev->lpm_capable)return -EPERM ;
@@ -4413,7 +4416,7 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,xhci_dbg (xhci,"%s port %d USB2 hardware LPM\n" , enable ?"enable" :"disable" , port_num +1 ); -if (enable && !(xhci->quirks &XHCI_HW_LPM_DISABLE )) { +if (enable) {/* Host supports BESL timeout instead of HIRD */ if (udev->usb2_hw_lpm_besl_capable) {/* if device doesn't have a preferred BESL value use a
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 57/178 cdc-acm: Add DISABLE_ECHO quirk for Microchip/SMSC chip
In reply to Sasha LevinFrom: Joakim Tjernlund <[email protected]>
commit 03894573f2913181ee5aae0089f333b2131f2d4b upstream.
USB_DEVICE(0x0424, 0x274e) can send data before cdc_acm is ready, causing garbage chars on the TTY causing stray input to the shell and/or login prompt.
--- drivers/usb/class/cdc-acm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/class/cdc-acm.c +2 -0
@@ -1689,6 +1689,8 @@ static int acm_pre_reset(struct usb_interface *intf)static const struct usb_device_id acm_ids[] = {/* quirky and broken devices */ + {USB_DEVICE (0x0424 ,0x274e ),/* Microchip Technology, Inc. (formerly SMSC) */ + .driver_info =DISABLE_ECHO , },/* DISABLE ECHO in termios flag */ {USB_DEVICE (0x076d ,0x0006 ),/* Denso Cradle CU-321 */ .driver_info =NO_UNION_NORMAL , },/* has no union descriptor */ {USB_DEVICE (0x17ef ,0x7000 ),/* Lenovo USB modem */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 58/178 loop: replace kill_bdev with invalidate_bdev
In reply to Sasha LevinFrom: Zheng Bin <[email protected]>
commit f4bd34b139a3fa2808c4205f12714c65e1548c6c upstream.
When a filesystem is mounted on a loop device and on a loop ioctl LOOP_SET_STATUS64, because of kill_bdev, buffer_head mappings are getting destroyed.kill_bdev
truncate_inode_pages
truncate_inode_pages_range
do_invalidatepage
block_invalidatepage
discard_buffer -->clear BH_Mapped flagsb_bread
__bread_gfp
bh = __getblk_gfp
-->discard_buffer clear BH_Mapped flag
__bread_slow
submit_bh
submit_bh_wbc
BUG_ON(!buffer_mapped(bh)) --> hit this BUG_ON--- drivers/block/loop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/block/loop.c +3 -3
@@ -1284,7 +1284,7 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)if (lo->lo_offset != info->lo_offset || lo->lo_sizelimit != info->lo_sizelimit) {sync_blockdev (lo->lo_device); -kill_bdev (lo->lo_device); +invalidate_bdev (lo->lo_device); }/* I/O need to be drained during transfer transition */
@@ -1558,12 +1558,12 @@ static int loop_set_block_size(struct loop_device *lo, unsigned long arg)if (lo->lo_queue->limits.logical_block_size != arg) {sync_blockdev (lo->lo_device); -kill_bdev (lo->lo_device); +invalidate_bdev (lo->lo_device); }blk_mq_freeze_queue (lo->lo_queue); -/* kill_bdev should have truncated all the pages */ +/* invalidate_bdev should have truncated all the pages */ if (lo->lo_queue->limits.logical_block_size != arg && lo->lo_device->bd_inode->i_mapping->nrpages) { err = -EAGAIN ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 59/178 IB/mad: Fix use after free when destroying MAD agent
In reply to Sasha LevinFrom: Shay Drory <[email protected]>
commit 116a1b9f1cb769b83e5adff323f977a62b1dcb2e upstream.
Currently, when RMPP MADs are processed while the MAD agent is destroyed, it could result in use after free of rmpp_recv, as decribed below:
cpu-0 cpu-1 ----- -----
ib_mad_recv_done()
ib_mad_complete_recv()
ib_process_rmpp_recv_wc()
unregister_mad_agent()
ib_cancel_rmpp_recvs()
cancel_delayed_work()
process_rmpp_data()
start_rmpp()
queue_delayed_work(rmpp_recv->cleanup_work)
destroy_rmpp_recv()
free_rmpp_recv()
cleanup_work()[1]
spin_lock_irqsave(&rmpp_recv->agent->lock) <-- use after free[1] cleanup_work() == recv_cleanup_handler
Fix it by waiting for the MAD agent reference count becoming zero before calling to ib_cancel_rmpp_recvs().
--- drivers/infiniband/core/mad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/mad.c +1 -1
@@ -639,10 +639,10 @@ static void unregister_mad_agent(struct ib_mad_agent_private *mad_agent_priv)xa_erase (&ib_mad_clients, mad_agent_priv->agent.hi_tid);flush_workqueue (port_priv->wq); -ib_cancel_rmpp_recvs (mad_agent_priv);deref_mad_agent (mad_agent_priv);wait_for_completion (&mad_agent_priv->comp); +ib_cancel_rmpp_recvs (mad_agent_priv);ib_mad_agent_security_cleanup (&mad_agent_priv->agent);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 60/178 IB/hfi1: Fix module use count flaw due to leftover module put calls
In reply to Sasha LevinFrom: Dennis Dalessandro <[email protected]>
commit 822fbd37410639acdae368ea55477ddd3498651d upstream.
When the try_module_get calls were removed from opening and closing of the i2c debugfs file, the corresponding module_put calls were missed. This results in an inaccurate module use count that requires a power cycle to fix.
--- drivers/infiniband/hw/hfi1/debugfs.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
drivers/infiniband/hw/hfi1/debugfs.c +2 -17
@@ -985,15 +985,10 @@ static ssize_t qsfp2_debugfs_read(struct file *file, char __user *buf,static int __i2c_debugfs_open (struct inode *in,struct file *fp,u32 target) {struct hfi1_pportdata *ppd; -int ret; ppd =private2ppd (fp); - ret =acquire_chip_resource (ppd->dd,i2c_target (target),0 ); -if (ret)/* failed - release the module */ -module_put (THIS_MODULE ); - -return ret; +return acquire_chip_resource (ppd->dd,i2c_target (target),0 ); }static int i2c1_debugfs_open (struct inode *in,struct file *fp)
@@ -1013,7 +1008,6 @@ static int __i2c_debugfs_release(struct inode *in, struct file *fp, u32 target) ppd =private2ppd (fp);release_chip_resource (ppd->dd,i2c_target (target)); -module_put (THIS_MODULE );return 0 ; }
@@ -1031,18 +1025,10 @@ static int i2c2_debugfs_release(struct inode *in, struct file *fp)static int __qsfp_debugfs_open (struct inode *in,struct file *fp,u32 target) {struct hfi1_pportdata *ppd; -int ret; - -if (!try_module_get (THIS_MODULE )) -return -ENODEV ; ppd =private2ppd (fp); - ret =acquire_chip_resource (ppd->dd,i2c_target (target),0 ); -if (ret)/* failed - release the module */ -module_put (THIS_MODULE ); - -return ret; +return acquire_chip_resource (ppd->dd,i2c_target (target),0 ); }static int qsfp1_debugfs_open (struct inode *in,struct file *fp)
@@ -1062,7 +1048,6 @@ static int __qsfp_debugfs_release(struct inode *in, struct file *fp, u32 target) ppd =private2ppd (fp);release_chip_resource (ppd->dd,i2c_target (target)); -module_put (THIS_MODULE );return 0 ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 61/178 bus: ti-sysc: Flush posted write on enable and disable
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 5ce8aee81be6c8bc19051d7c7b0d3cbb7ac5fc3f ]
Looks like we're missing flush of posted write after module enable and disable. I've seen occasional errors accessing various modules, and it is suspected that the lack of posted writes can also cause random reboots.
The errors we can see are similar to the one below from spi for example:
44000000.ocp:L3 Custom Error: MASTER MPU TARGET L4CFG (Read): Data Access in User mode during Functional access
...mcspi_wait_for_reg_bitomap2_mcspi_transfer_onespi_transfer_one_message
...
We also want to also flush posted write for disable. The clkctrl clock disable happens after module disable, and we don't want to have the module potentially stay active while we're trying to disable the clock.
--- drivers/bus/ti-sysc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/bus/ti-sysc.c +6 -0
@@ -938,6 +938,9 @@ static int sysc_enable_module(struct device *dev)sysc_write (ddata, ddata->offsets[SYSC_SYSCONFIG ], reg); } +/* Flush posted write */ +sysc_read (ddata, ddata->offsets[SYSC_SYSCONFIG ]); +if (ddata->module_enable_quirk) ddata->module_enable_quirk (ddata);
@@ -1018,6 +1021,9 @@ static int sysc_disable_module(struct device *dev) reg |=1 << regbits->autoidle_shift;sysc_write (ddata, ddata->offsets[SYSC_SYSCONFIG ], reg); +/* Flush posted write */ +sysc_read (ddata, ddata->offsets[SYSC_SYSCONFIG ]); +return 0 ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 62/178 bus: ti-sysc: Ignore clockactivity unless specified as a quirk
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 08b91dd6e547467fad61a7c201ff71080d7ad65a ]
We must ignore the clockactivity bit for most modules and not set it unless specified for the module with SYSC_QUIRK_USE_CLOCKACT. Otherwise the interface clock can be automatically gated constantly causing unexpected performance issues.
--- drivers/bus/ti-sysc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/bus/ti-sysc.c +6 -3
@@ -880,10 +880,13 @@ static int sysc_enable_module(struct device *dev) regbits = ddata->cap->regbits; reg =sysc_read (ddata, ddata->offsets[SYSC_SYSCONFIG ]); -/* Set CLOCKACTIVITY, we only use it for ick */ +/* +* Set CLOCKACTIVITY, we only use it for ick. And we only configure it +* based on the SYSC_QUIRK_USE_CLOCKACT flag, not based on the hardware +* capabilities. See the old HWMOD_SET_DEFAULT_CLOCKACT flag. +*/ if (regbits->clkact_shift >=0 && - (ddata->cfg.quirks &SYSC_QUIRK_USE_CLOCKACT || - ddata->cfg.sysc_val &BIT (regbits->clkact_shift))) + (ddata->cfg.quirks &SYSC_QUIRK_USE_CLOCKACT )) reg |=SYSC_CLOCACT_ICK << regbits->clkact_shift;/* Set SIDLE mode */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 63/178 ARM: OMAP2+: Fix legacy mode dss_reset
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 77cad9dbc957f23a73169e8a8971186744296614 ]
We must check for "dss_core" instead of "dss" to avoid also matching also "dss_dispc". This only matters for the mixed case of data configured in device tree but with legacy booting ti,hwmods property still enabled.
--- arch/arm/mach-omap2/omap_hwmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod.c +1 -1
@@ -3535,7 +3535,7 @@ static const struct omap_hwmod_reset dra7_reset_quirks[] = { };static const struct omap_hwmod_reset omap_reset_quirks[] = { - { .match ="dss" , .len =3 , .reset = omap_dss_reset, }, + { .match ="dss_core" , .len =8 , .reset = omap_dss_reset, }, { .match ="hdq1w" , .len =5 , .reset = omap_hdq1w_reset, }, { .match ="i2c" , .len =3 , .reset = omap_i2c_reset, }, { .match ="wd_timer" , .len =8 , .reset = omap2_wd_timer_reset, },
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 64/178 xfrm: Fix double ESP trailer insertion in IPsec crypto offload.
In reply to Sasha LevinFrom: Huy Nguyen <[email protected]>
[ Upstream commit 94579ac3f6d0820adc83b5dc5358ead0158101e9 ]
During IPsec performance testing, we see bad ICMP checksum. The error packet has duplicated ESP trailer due to double validate_xmit_xfrm calls. The first call is from ip_output, but the packet cannot be sent because netif_xmit_frozen_or_stopped is true and the packet gets dev_requeue_skb. The second call is from NET_TX softirq. However after the first call, the packet already has the ESP trailer.
Fix by marking the skb with XFRM_XMIT bit after the packet is handled by validate_xmit_xfrm to avoid duplicate ESP trailer insertion.
--- include/net/xfrm.h | 1 + net/xfrm/xfrm_device.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)
include/net/xfrm.h +1 -0
@@ -1012,6 +1012,7 @@ struct xfrm_offload {#define XFRM_GRO 32#define XFRM_ESP_NO_TRAILER 64#define XFRM_DEV_RESUME 128 +#define XFRM_XMIT 256__u32 status;#define CRYPTO_SUCCESS 1
net/xfrm/xfrm_device.c +3 -1
@@ -82,7 +82,7 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featurstruct xfrm_offload *xo =xfrm_offload (skb);struct sec_path *sp; -if (!xo) +if (!xo || (xo->flags &XFRM_XMIT ))return skb;if (!(features &NETIF_F_HW_ESP ))
@@ -103,6 +103,8 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featurreturn skb; } + xo->flags |=XFRM_XMIT ; +if (skb_is_gso (skb)) {struct net_device *dev = skb->dev;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 65/178 ASoC: q6asm: handle EOS correctly
In reply to Sasha LevinFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 6476b60f32866be49d05e2e0163f337374c55b06 ]
Successful send of EOS command does not indicate that EOS is actually finished, correct event to wait EOS is finished is EOS_RENDERED event. EOS_RENDERED means that the DSP has finished processing all the buffers for that particular session and stream.
This patch fixes EOS handling!
--- sound/soc/qcom/qdsp6/q6asm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/soc/qcom/qdsp6/q6asm.c +4 -3
@@ -25,6 +25,7 @@#define ASM_STREAM_CMD_FLUSH 0x00010BCE#define ASM_SESSION_CMD_PAUSE 0x00010BD3#define ASM_DATA_CMD_EOS 0x00010BDB +#define ASM_DATA_EVENT_RENDERED_EOS 0x00010C1C#define ASM_NULL_POPP_TOPOLOGY 0x00010C68#define ASM_STREAM_CMD_FLUSH_READBUFS 0x00010C09#define ASM_STREAM_CMD_SET_ENCDEC_PARAM 0x00010C10
@@ -546,9 +547,6 @@ static int32_t q6asm_stream_callback(struct apr_device *adev,case ASM_SESSION_CMD_SUSPEND : client_event =ASM_CLIENT_EVENT_CMD_SUSPEND_DONE ;break ; -case ASM_DATA_CMD_EOS : - client_event =ASM_CLIENT_EVENT_CMD_EOS_DONE ; -break ;case ASM_STREAM_CMD_FLUSH : client_event =ASM_CLIENT_EVENT_CMD_FLUSH_DONE ;break ;
@@ -651,6 +649,9 @@ static int32_t q6asm_stream_callback(struct apr_device *adev,spin_unlock_irqrestore (&ac->lock, flags); } +break ; +case ASM_DATA_EVENT_RENDERED_EOS : + client_event =ASM_CLIENT_EVENT_CMD_EOS_DONE ;break ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 66/178 efi/tpm: Verify event log header before parsing
In reply to Sasha LevinFrom: Fabian Vogt <[email protected]>
[ Upstream commit 7dfc06a0f25b593a9f51992f540c0f80a57f3629 ]
It is possible that the first event in the event log is not actually a log header at all, but rather a normal event. This leads to the cast in __calc_tpm2_event_size being an invalid conversion, which means that the values read are effectively garbage. Depending on the first event's contents, this leads either to apparently normal behaviour, a crash or a freeze.
While this behaviour of the firmware is not in accordance with the TCG Client EFI Specification, this happens on a Dell Precision 5510 with the TPM enabled but hidden from the OS ("TPM On" disabled, state otherwise untouched). The EFI firmware claims that the TPM is present and active and that it supports the TCG 2.0 event log format.
Fortunately, this can be worked around by simply checking the header of the first event and the event log header signature itself.
Commit b4f1874c6216 ("tpm: check event log version before reading final events") addressed a similar issue also found on Dell models.
Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1165773
--- include/linux/tpm_eventlog.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
include/linux/tpm_eventlog.h +13 -1
@@ -81,6 +81,8 @@ struct tcg_efi_specid_event_algs {u16 digest_size; } __packed; +#define TCG_SPECID_SIG "Spec ID Event03" +struct tcg_efi_specid_event_head {u8 signature[16 ];u32 platform_class;
@@ -171,6 +173,7 @@ static inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event,int i;int j;u32 count, event_type; +const u8 zero_digest[sizeof (event_header->digest)] = {0 }; marker = event; marker_start = marker;
@@ -198,10 +201,19 @@ static inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event, count =READ_ONCE (event->count); event_type =READ_ONCE (event->event_type); +/* Verify that it's the log header */ +if (event_header->pcr_idx !=0 || + event_header->event_type !=NO_ACTION || +memcmp (event_header->digest, zero_digest,sizeof (zero_digest))) { + size =0 ; + goto out; + } + efispecid = (struct tcg_efi_specid_event_head *)event_header->event;/* Check if event is malformed. */ -if (count > efispecid->num_algs) { +if (memcmp (efispecid->signature,TCG_SPECID_SIG , +sizeof (TCG_SPECID_SIG )) || count > efispecid->num_algs) { size =0 ; goto out; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 67/178 efi/esrt: Fix reference count leak in esre_create_sysfs_entry.
In reply to Sasha LevinFrom: Qiushi Wu <[email protected]>
[ Upstream commit 4ddf4739be6e375116c375f0a68bf3893ffcee21 ]
kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object. Previous commit "b8eb718348b8" fixed a similar problem.
--- drivers/firmware/efi/esrt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/esrt.c +1 -1
@@ -181,7 +181,7 @@ static int esre_create_sysfs_entry(void *esre, int entry_num) rc =kobject_init_and_add (&entry->kobj, &esre1_ktype,NULL ,"entry%d" , entry_num);if (rc) { -kfree (entry); +kobject_put (&entry->kobj);return rc; } }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 68/178 ASoc: q6afe: add support to get port direction
In reply to Sasha LevinFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 4a95737440d426e93441d49d11abf4c6526d4666 ]
This patch adds support to q6afe_is_rx_port() to get direction of DSP BE dai port, this is useful for setting dailink directions correctly.
--- sound/soc/qcom/qdsp6/q6afe.c | 8 ++++++++ sound/soc/qcom/qdsp6/q6afe.h | 1 + 2 files changed, 9 insertions(+)
sound/soc/qcom/qdsp6/q6afe.c +8 -0
@@ -800,6 +800,14 @@ int q6afe_get_port_id(int index) }EXPORT_SYMBOL_GPL (q6afe_get_port_id); +int q6afe_is_rx_port (int index) +{ +if (index <0 || index >=AFE_PORT_MAX ) +return -EINVAL ; + +return port_maps[index].is_rx; +} +EXPORT_SYMBOL_GPL (q6afe_is_rx_port);static int afe_apr_send_pkt (struct q6afe *afe,struct apr_pkt *pkt,struct q6afe_port *port) {
sound/soc/qcom/qdsp6/q6afe.h +1 -0
@@ -198,6 +198,7 @@ int q6afe_port_start(struct q6afe_port *port);int q6afe_port_stop (struct q6afe_port *port);void q6afe_port_put (struct q6afe_port *port);int q6afe_get_port_id (int index); +int q6afe_is_rx_port (int index);void q6afe_hdmi_port_prepare (struct q6afe_port *port,struct q6afe_hdmi_cfg *cfg); void q6afe_slim_port_prepare(struct q6afe_port *port,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 69/178 ASoC: qcom: common: set correct directions for dailinks
In reply to Sasha LevinFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit a2120089251f1fe221305e88df99af16f940e236 ]
Currently both FE and BE dai-links are configured bi-directional, However the DSP BE dais are only single directional,
so set the directions as supported by the BE dais.
--- sound/soc/qcom/common.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
sound/soc/qcom/common.c +12 -2
@@ -4,6 +4,7 @@#include <linux/module.h> #include "common.h" +#include "qdsp6/q6afe.h" int qcom_snd_parse_of (struct snd_soc_card *card) {
@@ -101,6 +102,15 @@ int qcom_snd_parse_of(struct snd_soc_card *card) } link->no_pcm =1 ; link->ignore_pmdown_time =1 ; + +if (q6afe_is_rx_port (link->id)) { + link->dpcm_playback =1 ; + link->dpcm_capture =0 ; + }else { + link->dpcm_playback =0 ; + link->dpcm_capture =1 ; + } + }else { dlc =devm_kzalloc (dev,sizeof (*dlc),GFP_KERNEL );if (!dlc)
@@ -113,12 +123,12 @@ int qcom_snd_parse_of(struct snd_soc_card *card) link->codecs->dai_name ="snd-soc-dummy-dai" ; link->codecs->name ="snd-soc-dummy" ; link->dynamic =1 ; + link->dpcm_playback =1 ; + link->dpcm_capture =1 ; } link->ignore_suspend =1 ; link->nonatomic =1 ; - link->dpcm_playback =1 ; - link->dpcm_capture =1 ; link->stream_name = link->name; link++;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 70/178 regualtor: pfuze100: correct sw1a/sw2 on pfuze3000
In reply to Sasha LevinFrom: Robin Gong <[email protected]>
[ Upstream commit 6f1cf5257acc6e6242ddf2f52bc7912aed77b79f ]
PFUZE100_SWB_REG is not proper for sw1a/sw2, because enable_mask/enable_reg is not correct. On PFUZE3000, sw1a/sw2 should be the same as sw1a/sw2 on pfuze100 except that voltages are not linear, so add new PFUZE3000_SW_REG and pfuze3000_sw_regulator_ops which like the non-linear PFUZE100_SW_REG and pfuze100_sw_regulator_ops.
--- drivers/regulator/pfuze100-regulator.c | 60 +++++++++++++++++--------- 1 file changed, 39 insertions(+), 21 deletions(-)
drivers/regulator/pfuze100-regulator.c +39 -21
@@ -209,6 +209,19 @@ static const struct regulator_ops pfuze100_swb_regulator_ops = { }; +static const struct regulator_ops pfuze3000_sw_regulator_ops = { + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, + .list_voltage = regulator_list_voltage_table, + .map_voltage = regulator_map_voltage_ascend, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_voltage_time_sel = regulator_set_voltage_time_sel, + .set_ramp_delay = pfuze100_set_ramp_delay, + +}; +#define PFUZE100_FIXED_REG (_chip, _name, base, voltage) \ [_chip ## _ ## _name] = { \ .desc = { \
@@ -318,23 +331,28 @@ static const struct regulator_ops pfuze100_swb_regulator_ops = { .stby_mask = 0x20, \ } - -#define PFUZE3000_SW2_REG (_chip, _name, base, min, max, step) { \ - .desc = { \ - .name = #_name,\ - .n_voltages = ((max) - (min)) / (step) + 1, \ - .ops = &pfuze100_sw_regulator_ops, \ - .type = REGULATOR_VOLTAGE, \ - .id = _chip ## _ ## _name, \ - .owner = THIS_MODULE, \ - .min_uV = (min), \ - .uV_step = (step), \ - .vsel_reg = (base) + PFUZE100_VOL_OFFSET, \ - .vsel_mask = 0x7, \ - }, \ - .stby_reg = (base) + PFUZE100_STANDBY_OFFSET, \ - .stby_mask = 0x7, \ -} +/* No linar case for the some switches of PFUZE3000 */ +#define PFUZE3000_SW_REG (_chip, _name, base, mask, voltages) \ + [_chip ## _ ## _name] = { \ + .desc = { \ + .name = #_name, \ + .n_voltages = ARRAY_SIZE(voltages), \ + .ops = &pfuze3000_sw_regulator_ops, \ + .type = REGULATOR_VOLTAGE, \ + .id = _chip ## _ ## _name, \ + .owner = THIS_MODULE, \ + .volt_table = voltages, \ + .vsel_reg = (base) + PFUZE100_VOL_OFFSET, \ + .vsel_mask = (mask), \ + .enable_reg = (base) + PFUZE100_MODE_OFFSET, \ + .enable_mask = 0xf, \ + .enable_val = 0x8, \ + .enable_time = 500, \ + }, \ + .stby_reg = (base) + PFUZE100_STANDBY_OFFSET, \ + .stby_mask = (mask), \ + .sw_reg = true, \ + }#define PFUZE3000_SW3_REG (_chip, _name, base, min, max, step) { \ .desc = { \
@@ -391,9 +409,9 @@ static struct pfuze_regulator pfuze200_regulators[] = { };static struct pfuze_regulator pfuze3000_regulators[] = { -PFUZE100_SWB_REG (PFUZE3000 ,SW1A ,PFUZE100_SW1ABVOL ,0x1f , pfuze3000_sw1a), +PFUZE3000_SW_REG (PFUZE3000 ,SW1A ,PFUZE100_SW1ABVOL ,0x1f , pfuze3000_sw1a),PFUZE100_SW_REG (PFUZE3000 ,SW1B ,PFUZE100_SW1CVOL ,700000 ,1475000 ,25000 ), -PFUZE100_SWB_REG (PFUZE3000 ,SW2 ,PFUZE100_SW2VOL ,0x7 , pfuze3000_sw2lo), +PFUZE3000_SW_REG (PFUZE3000 ,SW2 ,PFUZE100_SW2VOL ,0x7 , pfuze3000_sw2lo),PFUZE3000_SW3_REG (PFUZE3000 ,SW3 ,PFUZE100_SW3AVOL ,900000 ,1650000 ,50000 ),PFUZE100_SWB_REG (PFUZE3000 ,SWBST ,PFUZE100_SWBSTCON1 ,0x3 , pfuze100_swbst),PFUZE100_SWB_REG (PFUZE3000 ,VSNVS ,PFUZE100_VSNVSVOL ,0x7 , pfuze100_vsnvs),
@@ -407,8 +425,8 @@ static struct pfuze_regulator pfuze3000_regulators[] = { };static struct pfuze_regulator pfuze3001_regulators[] = { -PFUZE100_SWB_REG (PFUZE3001 ,SW1 ,PFUZE100_SW1ABVOL ,0x1f , pfuze3000_sw1a), -PFUZE100_SWB_REG (PFUZE3001 ,SW2 ,PFUZE100_SW2VOL ,0x7 , pfuze3000_sw2lo), +PFUZE3000_SW_REG (PFUZE3001 ,SW1 ,PFUZE100_SW1ABVOL ,0x1f , pfuze3000_sw1a), +PFUZE3000_SW_REG (PFUZE3001 ,SW2 ,PFUZE100_SW2VOL ,0x7 , pfuze3000_sw2lo),PFUZE3000_SW3_REG (PFUZE3001 ,SW3 ,PFUZE100_SW3AVOL ,900000 ,1650000 ,50000 ),PFUZE100_SWB_REG (PFUZE3001 ,VSNVS ,PFUZE100_VSNVSVOL ,0x7 , pfuze100_vsnvs),PFUZE100_VGEN_REG (PFUZE3001 ,VLDO1 ,PFUZE100_VGEN1VOL ,1800000 ,3300000 ,100000 ),
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 71/178 RDMA/siw: Fix pointer-to-int-cast warning in siw_rx_pbl()
In reply to Sasha LevinFrom: Tom Seewald <[email protected]>
[ Upstream commit 6769b275a313c76ddcd7d94c632032326db5f759 ]
The variable buf_addr is type dma_addr_t, which may not be the same size as a pointer. To ensure it is the correct size, cast to a uintptr_t.
--- drivers/infiniband/sw/siw/siw_qp_rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/sw/siw/siw_qp_rx.c +2 -1
@@ -139,7 +139,8 @@ static int siw_rx_pbl(struct siw_rx_stream *srx, int *pbl_idx,break ; bytes =min (bytes, len); -if (siw_rx_kva (srx, (void *)buf_addr, bytes) == bytes) { +if (siw_rx_kva (srx, (void *)(uintptr_t )buf_addr, bytes) == + bytes) { copied += bytes; offset += bytes; len -= bytes;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 72/178 ASoC: fsl_ssi: Fix bclk calculation for mono channel
In reply to Sasha LevinFrom: Shengjiu Wang <[email protected]>
[ Upstream commit ed1220df6e666500ebf58c4f2fccc681941646fb ]
For mono channel, SSI will switch to Normal mode.
In Normal mode and Network mode, the Word Length Control bits control the word length divider in clock generator, which is different with I2S Master mode (the word length is fixed to 32bit), it should be the value of params_width(hw_params).
The condition "slots == 2" is not good for I2S Master mode, because for Network mode and Normal mode, the slots can also be 2. Then we need to use (ssi->i2s_net & SSI_SCR_I2S_MODE_MASK) to check if it is I2S Master mode.
So we refine the formula for mono channel, otherwise there will be sound issue for S24_LE.
--- sound/soc/fsl/fsl_ssi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
sound/soc/fsl/fsl_ssi.c +9 -4
@@ -678,8 +678,9 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,struct regmap *regs = ssi->regs;u32 pm =999 , div2, psr, stccr, mask, afreq, factor, i;unsigned long clkrate, baudrate, tmprate; -unsigned int slots =params_channels (hw_params); -unsigned int slot_width =32 ; +unsigned int channels =params_channels (hw_params); +unsigned int slot_width =params_width (hw_params); +unsigned int slots =2 ;u64 sub, savesub =100000 ;unsigned int freq;bool baudclk_is_used;
@@ -688,10 +689,14 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,/* Override slots and slot_width if being specifically set... */ if (ssi->slots) slots = ssi->slots; -/* ...but keep 32 bits if slots is 2 -- I2S Master mode */ -if (ssi->slot_width && slots !=2 ) +if (ssi->slot_width) slot_width = ssi->slot_width; +/* ...but force 32 bits for stereo audio using I2S Master Mode */ +if (channels ==2 && + (ssi->i2s_net &SSI_SCR_I2S_MODE_MASK ) ==SSI_SCR_I2S_MODE_MASTER ) + slot_width =32 ; +/* Generate bit clock based on the slot number and slot width */ freq = slots * slot_width *params_rate (hw_params);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 73/178 samples/bpf: xdp_redirect_cpu: Set MAX_CPUS according to NR_CPUS
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 6a09815428547657f3ffd2f5c31ac2a191e7fdf3 ]
xdp_redirect_cpu is currently failing in bpf_prog_load_xattr() allocating cpu_map map if CONFIG_NR_CPUS is less than 64 since cpu_map_alloc() requires max_entries to be less than NR_CPUS. Set cpu_map max_entries according to NR_CPUS in xdp_redirect_cpu_kern.c and get currently running cpus in xdp_redirect_cpu_user.c
--- samples/bpf/xdp_redirect_cpu_kern.c | 2 +- samples/bpf/xdp_redirect_cpu_user.c | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 14 deletions(-)
samples/bpf/xdp_redirect_cpu_kern.c +1 -1
@@ -15,7 +15,7 @@#include "bpf_helpers.h" #include "hash_func01.h" -#define MAX_CPUS 64/* WARNING - sync with _user.c */ +#define MAX_CPUS NR_CPUS/* Special map type that can XDP_REDIRECT frames to another CPU */ struct {
samples/bpf/xdp_redirect_cpu_user.c +16 -13
@@ -13,6 +13,7 @@ static const char *__doc__ =#include <unistd.h> #include <locale.h> #include <sys/resource.h> +#include <sys/sysinfo.h> #include <getopt.h> #include <net/if.h> #include <time.h>
@@ -24,8 +25,6 @@ static const char *__doc__ =#include <arpa/inet.h> #include <linux/if_link.h> -#define MAX_CPUS 64/* WARNING - sync with _kern.c */ -/* How many xdp_progs are defined in _kern.c */ #define MAX_PROG 6
@@ -40,6 +39,7 @@ static char *ifname;static __u32 prog_id;static __u32 xdp_flags =XDP_FLAGS_UPDATE_IF_NOEXIST ; +static int n_cpus;static int cpu_map_fd;static int rx_cnt_map_fd;static int redirect_err_cnt_map_fd;
@@ -170,7 +170,7 @@ struct stats_record {struct record redir_err;struct record kthread;struct record exception; -struct record enq[MAX_CPUS ]; +struct record enq[]; };static bool map_collect_percpu (int fd,__u32 key,struct record *rec)
@@ -225,10 +225,11 @@ static struct datarec *alloc_record_per_cpu(void)static struct stats_record *alloc_stats_record (void ) {struct stats_record *rec; -int i; +int i, size; - rec =malloc (sizeof (*rec)); -memset (rec,0 ,sizeof (*rec)); + size =sizeof (*rec) + n_cpus *sizeof (struct record ); + rec =malloc (size); +memset (rec,0 , size);if (!rec) {fprintf (stderr,"Mem alloc error\n" );exit (EXIT_FAIL_MEM );
@@ -237,7 +238,7 @@ static struct stats_record *alloc_stats_record(void) rec->redir_err.cpu =alloc_record_per_cpu (); rec->kthread.cpu =alloc_record_per_cpu (); rec->exception.cpu =alloc_record_per_cpu (); -for (i =0 ; i <MAX_CPUS ; i++) +for (i =0 ; i < n_cpus; i++) rec->enq[i].cpu =alloc_record_per_cpu ();return rec;
@@ -247,7 +248,7 @@ static void free_stats_record(struct stats_record *r) {int i; -for (i =0 ; i <MAX_CPUS ; i++) +for (i =0 ; i < n_cpus; i++)free (r->enq[i].cpu);free (r->exception.cpu);free (r->kthread.cpu);
@@ -350,7 +351,7 @@ static void stats_print(struct stats_record *stats_rec, }/* cpumap enqueue stats */ -for (to_cpu =0 ; to_cpu <MAX_CPUS ; to_cpu++) { +for (to_cpu =0 ; to_cpu < n_cpus; to_cpu++) {char *fmt ="%-15s %3d:%-3d %'-14.0f %'-11.0f %'-10.2f %s\n" ;char *fm2 ="%-15s %3s:%-3d %'-14.0f %'-11.0f %'-10.2f %s\n" ;char *errstr ="" ;
@@ -475,7 +476,7 @@ static void stats_collect(struct stats_record *rec)map_collect_percpu (fd,1 , &rec->redir_err); fd = cpumap_enqueue_cnt_map_fd; -for (i =0 ; i <MAX_CPUS ; i++) +for (i =0 ; i < n_cpus; i++)map_collect_percpu (fd, i, &rec->enq[i]); fd = cpumap_kthread_cnt_map_fd;
@@ -549,10 +550,10 @@ static int create_cpu_entry(__u32 cpu, __u32 queue_size,*/ static void mark_cpus_unavailable (void ) { -__u32 invalid_cpu =MAX_CPUS ; +__u32 invalid_cpu = n_cpus;int ret, i; -for (i =0 ; i <MAX_CPUS ; i++) { +for (i =0 ; i < n_cpus; i++) { ret =bpf_map_update_elem (cpus_available_map_fd, &i, &invalid_cpu,0 );if (ret) {
@@ -688,6 +689,8 @@ int main(int argc, char **argv)int prog_fd;__u32 qsize; + n_cpus =get_nprocs_conf (); +/* Notice: choosing he queue size is very important with the * ixgbe driver, because it's driver page recycling trick is * dependend on pages being returned quickly. The number of
@@ -757,7 +760,7 @@ int main(int argc, char **argv)case 'c' :/* Add multiple CPUs */ add_cpu =strtoul (optarg,NULL ,0 ); -if (add_cpu >=MAX_CPUS ) { +if (add_cpu >= n_cpus) {fprintf (stderr,"--cpu nr too large for cpumap err(%d):%s\n" , errno,strerror (errno));
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 74/178 bpf, xdp, samples: Fix null pointer dereference in *_user code
In reply to Sasha LevinFrom: Gaurav Singh <[email protected]>
[ Upstream commit 6903cdae9f9f08d61e49c16cbef11c293e33a615 ]
Memset on the pointer right after malloc can cause a NULL pointer deference if it failed to allocate memory. A simple fix is to replace malloc()/memset() pair with a simple call to calloc().
--- samples/bpf/xdp_monitor_user.c | 8 ++------ samples/bpf/xdp_redirect_cpu_user.c | 7 ++----- samples/bpf/xdp_rxq_info_user.c | 13 +++---------- 3 files changed, 7 insertions(+), 21 deletions(-)
samples/bpf/xdp_monitor_user.c +2 -6
@@ -509,11 +509,8 @@ static void *alloc_rec_per_cpu(int record_size) {unsigned int nr_cpus =bpf_num_possible_cpus ();void *array; -size_t size; - size = record_size * nr_cpus; - array =malloc (size); -memset (array,0 , size); + array =calloc (nr_cpus, record_size);if (!array) {fprintf (stderr,"Mem alloc error (nr_cpus:%u)\n" , nr_cpus);exit (EXIT_FAIL_MEM );
@@ -528,8 +525,7 @@ static struct stats_record *alloc_stats_record(void)int i;/* Alloc main stats_record structure */ - rec =malloc (sizeof (*rec)); -memset (rec,0 ,sizeof (*rec)); + rec =calloc (1 ,sizeof (*rec));if (!rec) {fprintf (stderr,"Mem alloc error\n" );exit (EXIT_FAIL_MEM );
samples/bpf/xdp_redirect_cpu_user.c +2 -5
@@ -210,11 +210,8 @@ static struct datarec *alloc_record_per_cpu(void) {unsigned int nr_cpus =bpf_num_possible_cpus ();struct datarec *array; -size_t size; - size =sizeof (struct datarec ) * nr_cpus; - array =malloc (size); -memset (array,0 , size); + array =calloc (nr_cpus,sizeof (struct datarec ));if (!array) {fprintf (stderr,"Mem alloc error (nr_cpus:%u)\n" , nr_cpus);exit (EXIT_FAIL_MEM );
@@ -229,11 +226,11 @@ static struct stats_record *alloc_stats_record(void) size =sizeof (*rec) + n_cpus *sizeof (struct record ); rec =malloc (size); -memset (rec,0 , size);if (!rec) {fprintf (stderr,"Mem alloc error\n" );exit (EXIT_FAIL_MEM ); } +memset (rec,0 , size); rec->rx_cnt.cpu =alloc_record_per_cpu (); rec->redir_err.cpu =alloc_record_per_cpu (); rec->kthread.cpu =alloc_record_per_cpu ();
samples/bpf/xdp_rxq_info_user.c +3 -10
@@ -198,11 +198,8 @@ static struct datarec *alloc_record_per_cpu(void) {unsigned int nr_cpus =bpf_num_possible_cpus ();struct datarec *array; -size_t size; - size =sizeof (struct datarec ) * nr_cpus; - array =malloc (size); -memset (array,0 , size); + array =calloc (nr_cpus,sizeof (struct datarec ));if (!array) {fprintf (stderr,"Mem alloc error (nr_cpus:%u)\n" , nr_cpus);exit (EXIT_FAIL_MEM );
@@ -214,11 +211,8 @@ static struct record *alloc_record_per_rxq(void) {unsigned int nr_rxqs =bpf_map__def (rx_queue_index_map)->max_entries;struct record *array; -size_t size; - size =sizeof (struct record ) * nr_rxqs; - array =malloc (size); -memset (array,0 , size); + array =calloc (nr_rxqs,sizeof (struct record ));if (!array) {fprintf (stderr,"Mem alloc error (nr_rxqs:%u)\n" , nr_rxqs);exit (EXIT_FAIL_MEM );
@@ -232,8 +226,7 @@ static struct stats_record *alloc_stats_record(void)struct stats_record *rec;int i; - rec =malloc (sizeof (*rec)); -memset (rec,0 ,sizeof (*rec)); + rec =calloc (1 ,sizeof (struct stats_record ));if (!rec) {fprintf (stderr,"Mem alloc error\n" );exit (EXIT_FAIL_MEM );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 75/178 ARM: dts: am335x-pocketbeagle: Fix mmc0 Write Protect
In reply to Sasha LevinFrom: Drew Fustini <[email protected]>
[ Upstream commit d7af722344e6dc52d87649100516515263e15c75 ]
AM3358 pin mcasp0_aclkr (ZCZ ball B13) [0] is routed to P1.31 header [1] Mode 4 of this pin is mmc0_sdwp (SD Write Protect). A signal connected to P1.31 may accidentally trigger mmc0 write protection. To avoid this situation, do not put mcasp0_aclkr in mode 4 (mmc0_sdwp) by default.
[0] http://www.ti.com/lit/ds/symlink/am3358.pdf
[1] https://github.com/beagleboard/pocketbeagle/wiki/System-Reference-Manual#531_Expansion_Headers
--- arch/arm/boot/dts/am335x-pocketbeagle.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/am335x-pocketbeagle.dts +0 -1
@@ -88,7 +88,6 @@ AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_MMC0_CMD, PIN_INPUT_PULLUP, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_MMC0_CLK, PIN_INPUT_PULLUP, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT, MUX_MODE4) /* (B12) mcasp0_aclkr.mmc0_sdwp */ >; };
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 76/178 ARM: dts: Fix duovero smsc interrupt for suspend
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 9cf28e41f9f768791f54ee18333239fda6927ed8 ]
While testing the recent suspend and resume regressions I noticed that duovero can still end up losing edge gpio interrupts on runtime suspend. This causes NFSroot easily stopping working after resume on duovero.
Let's fix the issue by using gpio level interrupts for smsc as then the gpio interrupt state is seen by the gpio controller on resume.
--- arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap4-duovero-parlor.dts +1 -1
@@ -139,7 +139,7 @@ ethernet@gpmc { reg = <5 0 0xff>; interrupt-parent = <&gpio2>; - interrupts = <12 IRQ_TYPE_EDGE_FALLING>; /* gpio_44 */ + interrupts = <12 IRQ_TYPE_LEVEL_LOW>; /* gpio_44 */ phy-mode = "mii";
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 77/178 x86/resctrl: Fix a NULL vs IS_ERR() static checker warning in rdt_cdp_peer_get()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit cc5277fe66cf3ad68f41f1c539b2ef0d5e432974 ]
The callers don't expect *d_cdp to be set to an error pointer, they only check for NULL. This leads to a static checker warning:
arch/x86/kernel/cpu/resctrl/rdtgroup.c:2648 __init_one_rdt_domain()
warn: 'd_cdp' could be an error pointer
This would not trigger a bug in this specific case because __init_one_rdt_domain() calls it with a valid domain that would not have a negative id and thus not trigger the return of the ERR_PTR(). If this was a negative domain id then the call to rdt_find_domain() in domain_add_cpu() would have returned the ERR_PTR() much earlier and the creation of the domain with an invalid id would have been prevented.
Even though a bug is not triggered currently the right and safe thing to do is to set the pointer to NULL because that is what can be checked for when the caller is handling the CDP and non-CDP cases.
--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/resctrl/rdtgroup.c +1 -0
@@ -1027,6 +1027,7 @@ static int rdt_cdp_peer_get(struct rdt_resource *r, struct rdt_domain *d, _d_cdp =rdt_find_domain (_r_cdp, d->id,NULL );if (WARN_ON (IS_ERR_OR_NULL (_d_cdp))) { _r_cdp =NULL ; + _d_cdp =NULL ; ret = -EINVAL ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 78/178 regmap: Fix memory leak from regmap_register_patch
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit 95b2c3ec4cb1689db2389c251d39f64490ba641c ]
When a register patch is registered the reg_sequence is copied but the memory allocated is never freed. Add a kfree in regmap_exit to clean it up.
--- drivers/base/regmap/regmap.c | 1 + 1 file changed, 1 insertion(+)
drivers/base/regmap/regmap.c +1 -0
@@ -1356,6 +1356,7 @@ void regmap_exit(struct regmap *map)if (map->hwlock)hwspin_lock_free (map->hwlock);kfree_const (map->name); +kfree (map->patch);kfree (map); }EXPORT_SYMBOL_GPL (regmap_exit);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 79/178 devmap: Use bpf_map_area_alloc() for allocating hash buckets
In reply to Sasha LevinFrom: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 99c51064fb06146b3d494b745c947e438a10aaa7 ]
Syzkaller discovered that creating a hash of type devmap_hash with a large number of entries can hit the memory allocator limit for allocating contiguous memory regions. There's really no reason to use kmalloc_array() directly in the devmap code, so just switch it to the existing bpf_map_area_alloc() function that is used elsewhere.
--- kernel/bpf/devmap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/bpf/devmap.c +6 -4
@@ -88,12 +88,13 @@ struct bpf_dtab {static DEFINE_SPINLOCK (dev_map_lock);static LIST_HEAD (dev_map_list); -static struct hlist_head *dev_map_create_hash (unsigned int entries) +static struct hlist_head *dev_map_create_hash (unsigned int entries, +int numa_node) {int i;struct hlist_head *hash; - hash =kmalloc_array (entries,sizeof (*hash),GFP_KERNEL ); + hash =bpf_map_area_alloc (entries *sizeof (*hash), numa_node);if (hash !=NULL )for (i =0 ; i < entries; i++)INIT_HLIST_HEAD (&hash[i]);
@@ -151,7 +152,8 @@ static int dev_map_init_map(struct bpf_dtab *dtab, union bpf_attr *attr)INIT_LIST_HEAD (per_cpu_ptr (dtab->flush_list, cpu));if (attr->map_type ==BPF_MAP_TYPE_DEVMAP_HASH ) { - dtab->dev_index_head =dev_map_create_hash (dtab->n_buckets); + dtab->dev_index_head =dev_map_create_hash (dtab->n_buckets, + dtab->map.numa_node);if (!dtab->dev_index_head) goto free_percpu;
@@ -249,7 +251,7 @@ static void dev_map_free(struct bpf_map *map) } } -kfree (dtab->dev_index_head); +bpf_map_area_free (dtab->dev_index_head); }else {for (i =0 ; i < dtab->map.max_entries; i++) {struct bpf_dtab_netdev *dev;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 80/178 bpf: Don't return EINVAL from {get,set}sockopt when optlen > PAGE_SIZE
In reply to Sasha LevinFrom: Stanislav Fomichev <[email protected]>
[ Upstream commit d8fe449a9c51a37d844ab607e14e2f5c657d3cf2 ]
Attaching to these hooks can break iptables because its optval is usually quite big, or at least bigger than the current PAGE_SIZE limit. David also mentioned some SCTP options can be big (around 256k).
For such optvals we expose only the first PAGE_SIZE bytes to the BPF program. BPF program has two options:
1. Set ctx->optlen to 0 to indicate that the BPF's optval should be ignored and the kernel should use original userspace value.
2. Set ctx->optlen to something that's smaller than the PAGE_SIZE.
v5:
* use ctx->optlen == 0 with trimmed buffer (Alexei Starovoitov)
* update the docs accordingly
v4:
* use temporary buffer to avoid optval == optval_end == NULL; this removes the corner case in the verifier that might assume non-zero PTR_TO_PACKET/PTR_TO_PACKET_END.
v3:
* don't increase the limit, bypass the argument
v2:
* proper comments formatting (Jakub Kicinski)
--- kernel/bpf/cgroup.c | 53 ++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 20 deletions(-)
kernel/bpf/cgroup.c +33 -20
@@ -966,16 +966,23 @@ static bool __cgroup_bpf_prog_array_is_empty(struct cgroup *cgrp,static int sockopt_alloc_buf (struct bpf_sockopt_kern *ctx,int max_optlen) { -if (unlikely (max_optlen >PAGE_SIZE ) || max_optlen <0 ) +if (unlikely (max_optlen <0 ))return -EINVAL ; +if (unlikely (max_optlen >PAGE_SIZE )) { +/* We don't expose optvals that are greater than PAGE_SIZE +* to the BPF program. +*/ + max_optlen =PAGE_SIZE ; + } + ctx->optval =kzalloc (max_optlen,GFP_USER );if (!ctx->optval)return -ENOMEM ; ctx->optval_end = ctx->optval + max_optlen; -return 0 ; +return max_optlen; }static void sockopt_free_buf (struct bpf_sockopt_kern *ctx)
@@ -1009,13 +1016,13 @@ int __cgroup_bpf_run_filter_setsockopt(struct sock *sk, int *level,*/ max_optlen =max_t (int,16 , *optlen); - ret =sockopt_alloc_buf (&ctx, max_optlen); -if (ret) -return ret; + max_optlen =sockopt_alloc_buf (&ctx, max_optlen); +if (max_optlen <0 ) +return max_optlen; ctx.optlen = *optlen; -if (copy_from_user (ctx.optval, optval, *optlen) !=0 ) { +if (copy_from_user (ctx.optval, optval,min (*optlen, max_optlen)) !=0 ) { ret = -EFAULT ; goto out; }
@@ -1043,8 +1050,14 @@ int __cgroup_bpf_run_filter_setsockopt(struct sock *sk, int *level,/* export any potential modifications */ *level = ctx.level; *optname = ctx.optname; - *optlen = ctx.optlen; - *kernel_optval = ctx.optval; + +/* optlen == 0 from BPF indicates that we should +* use original userspace data. +*/ +if (ctx.optlen !=0 ) { + *optlen = ctx.optlen; + *kernel_optval = ctx.optval; + } } out:
@@ -1076,12 +1089,12 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level, __cgroup_bpf_prog_array_is_empty(cgrp, BPF_CGROUP_GETSOCKOPT))return retval; - ret =sockopt_alloc_buf (&ctx, max_optlen); -if (ret) -return ret; - ctx.optlen = max_optlen; + max_optlen =sockopt_alloc_buf (&ctx, max_optlen); +if (max_optlen <0 ) +return max_optlen; +if (!retval) {/* If kernel getsockopt finished successfully, * copy whatever was returned to the user back
@@ -1095,10 +1108,8 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level, goto out; } -if (ctx.optlen > max_optlen) - ctx.optlen = max_optlen; - -if (copy_from_user (ctx.optval, optval, ctx.optlen) !=0 ) { +if (copy_from_user (ctx.optval, optval, +min (ctx.optlen, max_optlen)) !=0 ) { ret = -EFAULT ; goto out; }
@@ -1127,10 +1138,12 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level, goto out; } -if (copy_to_user (optval, ctx.optval, ctx.optlen) || -put_user (ctx.optlen, optlen)) { - ret = -EFAULT ; - goto out; +if (ctx.optlen !=0 ) { +if (copy_to_user (optval, ctx.optval, ctx.optlen) || +put_user (ctx.optlen, optlen)) { + ret = -EFAULT ; + goto out; + } } ret = ctx.retval;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 81/178 ARM: dts: NSP: Correct FA2 mailbox node
In reply to Sasha LevinFrom: Matthew Hagan <[email protected]>
[ Upstream commit ac4e106d8934a5894811fc263f4b03fc8ed0fb7a ]
The FA2 mailbox is specified at 0x18025000 but should actually be 0x18025c00, length 0x400 according to socregs_nsp.h and board_bu.c. Also the interrupt was off by one and should be GIC SPI 151 instead of 150.
--- arch/arm/boot/dts/bcm-nsp.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm-nsp.dtsi +3 -3
@@ -257,10 +257,10 @@ status = "disabled"; }; - mailbox: mailbox@25000 { + mailbox: mailbox@25c00 { compatible = "brcm,iproc-fa2-mbox"; - reg = <0x25000 0x445>; - interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>; + reg = <0x25c00 0x400>; + interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>; #mbox-cells = <1>; brcm,rx-status-len = <32>; brcm,use-bcm-hdr;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 82/178 rxrpc: Fix handling of rwind from an ACK packet
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit a2ad7c21ad8cf1ce4ad65e13df1c2a1c29b38ac5 ]
The handling of the receive window size (rwind) from a received ACK packet is not correct. The rxrpc_input_ackinfo() function currently checks the current Tx window size against the rwind from the ACK to see if it has changed, but then limits the rwind size before storing it in the tx_winsize member and, if it increased, wake up the transmitting process. This means that if rwind > RXRPC_RXTX_BUFF_SIZE - 1, this path will always be followed.
Fix this by limiting rwind before we compare it to tx_winsize.
The effect of this can be seen by enabling the rxrpc_rx_rwind_change tracepoint.
--- net/rxrpc/input.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/rxrpc/input.c +3 -4
@@ -723,13 +723,12 @@ static void rxrpc_input_ackinfo(struct rxrpc_call *call, struct sk_buff *skb,ntohl (ackinfo->rxMTU),ntohl (ackinfo->maxMTU), rwind, ntohl(ackinfo->jumbo_max)); +if (rwind >RXRPC_RXTX_BUFF_SIZE -1 ) + rwind =RXRPC_RXTX_BUFF_SIZE -1 ;if (call->tx_winsize != rwind) { -if (rwind >RXRPC_RXTX_BUFF_SIZE -1 ) - rwind =RXRPC_RXTX_BUFF_SIZE -1 ;if (rwind > call->tx_winsize) wake = true; -trace_rxrpc_rx_rwind_change (call, sp->hdr.serial, -ntohl (ackinfo->rwind), wake); +trace_rxrpc_rx_rwind_change (call, sp->hdr.serial, rwind, wake); call->tx_winsize = rwind; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 83/178 RDMA/rvt: Fix potential memory leak caused by rvt_alloc_rq
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit 90a239ee25fa3a483facec3de7c144361a3d3a51 ]
In case of failure of alloc_ud_wq_attr(), the memory allocated by rvt_alloc_rq() is not freed. Fix it by calling rvt_free_rq() using the existing clean-up code.
--- drivers/infiniband/sw/rdmavt/qp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rdmavt/qp.c +4 -2
@@ -1196,7 +1196,7 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd, err =alloc_ud_wq_attr (qp, rdi->dparms.node);if (err) { ret = (ERR_PTR (err)); - goto bail_driver_priv; + goto bail_rq_rvt; } err = alloc_qpn(rdi, &rdi->qp_dev->qpn_table,
@@ -1300,9 +1300,11 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,rvt_free_qpn (&rdi->qp_dev->qpn_table, qp->ibqp.qp_num); bail_rq_wq: -rvt_free_rq (&qp->r_rq);free_ud_wq_attr (qp); +bail_rq_rvt: +rvt_free_rq (&qp->r_rq); + bail_driver_priv: rdi->driver_f.qp_priv_free (rdi, qp);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 84/178 RDMA/qedr: Fix KASAN: use-after-free in ucma_event_handler+0x532
In reply to Sasha LevinFrom: Michal Kalderon <[email protected]>
[ Upstream commit 0dfbd5ecf28cbcb81674c49d34ee97366db1be44 ]
Private data passed to iwarp_cm_handler is copied for connection request / response, but ignored otherwise. If junk is passed, it is stored in the event and used later in the event processing.
The driver passes an old junk pointer during connection close which leads to a use-after-free on event processing. Set private data to NULL for events that don 't have private data.
BUG: KASAN: use-after-free in ucma_event_handler+0x532/0x560 [rdma_ucm] kernel: Read of size 4 at addr ffff8886caa71200 by task kworker/u128:1/5250 kernel: kernel: Workqueue: iw_cm_wq cm_work_handler [iw_cm] kernel: Call Trace: kernel: dump_stack+0x8c/0xc0 kernel: print_address_description.constprop.0+0x1b/0x210 kernel: ? ucma_event_handler+0x532/0x560 [rdma_ucm] kernel: ? ucma_event_handler+0x532/0x560 [rdma_ucm] kernel: __kasan_report.cold+0x1a/0x33 kernel: ? ucma_event_handler+0x532/0x560 [rdma_ucm] kernel: kasan_report+0xe/0x20 kernel: check_memory_region+0x130/0x1a0 kernel: memcpy+0x20/0x50 kernel: ucma_event_handler+0x532/0x560 [rdma_ucm] kernel: ? __rpc_execute+0x608/0x620 [sunrpc] kernel: cma_iw_handler+0x212/0x330 [rdma_cm] kernel: ? iw_conn_req_handler+0x6e0/0x6e0 [rdma_cm] kernel: ? enqueue_timer+0x86/0x140 kernel: ? _raw_write_lock_irq+0xd0/0xd0 kernel: cm_work_handler+0xd3d/0x1070 [iw_cm]
--- drivers/infiniband/hw/qedr/qedr_iw_cm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/infiniband/hw/qedr/qedr_iw_cm.c +11 -2
@@ -150,8 +150,17 @@ qedr_iw_issue_event(void *context,if (params->cm_info) { event.ird = params->cm_info->ird; event.ord = params->cm_info->ord; - event.private_data_len = params->cm_info->private_data_len; - event.private_data = (void *)params->cm_info->private_data; +/* Only connect_request and reply have valid private data +* the rest of the events this may be left overs from +* connection establishment. CONNECT_REQUEST is issued via +* qedr_iw_mpa_request +*/ +if (event_type ==IW_CM_EVENT_CONNECT_REPLY ) { + event.private_data_len = + params->cm_info->private_data_len; + event.private_data = + (void *)params->cm_info->private_data; + } }if (ep->cm_id)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 85/178 RDMA/cma: Protect bind_list and listen_list while finding matching cm id
In reply to Sasha LevinFrom: Mark Zhang <[email protected]>
[ Upstream commit 730c8912484186d4623d0c76509066d285c3a755 ]
The bind_list and listen_list must be accessed under a lock, add the missing locking around the access in cm_ib_id_from_event()
In addition add lockdep asserts to make it clearer what the locking semantic is here.
general protection fault: 0000 [#1] SMP NOPTI CPU: 226 PID: 126135 Comm: kworker/226:1 Tainted: G OE 4.12.14-150.47-default #1 SLE15 Hardware name: Cray Inc. Windom/Windom, BIOS 0.8.7 01-10-2020 Workqueue: ib_cm cm_work_handler [ib_cm] task: ffff9c5a60a1d2c0 task.stack: ffffc1d91f554000 RIP: 0010:cma_ib_req_handler+0x3f1/0x11b0 [rdma_cm] RSP: 0018:ffffc1d91f557b40 EFLAGS: 00010286 RAX: deacffffffffff30 RBX: 0000000000000001 RCX: ffff9c2af5bb6000 RDX: 00000000000000a9 RSI: ffff9c5aa4ed2f10 RDI: ffffc1d91f557b08 RBP: ffffc1d91f557d90 R08: ffff9c340cc80000 R09: ffff9c2c0f901900 R10: 0000000000000000 R11: 0000000000000001 R12: deacffffffffff30 R13: ffff9c5a48aeec00 R14: ffffc1d91f557c30 R15: ffff9c5c2eea3688 FS: 0000000000000000(0000) GS:ffff9c5c2fa80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00002b5cc03fa320 CR3: 0000003f8500a000 CR4: 00000000003406e0 Call Trace: ? rdma_addr_cancel+0xa0/0xa0 [ib_core] ? cm_process_work+0x28/0x140 [ib_cm] cm_process_work+0x28/0x140 [ib_cm] ? cm_get_bth_pkey.isra.44+0x34/0xa0 [ib_cm] cm_work_handler+0xa06/0x1a6f [ib_cm] ? __switch_to_asm+0x34/0x70 ? __switch_to_asm+0x34/0x70 ? __switch_to_asm+0x40/0x70 ? __switch_to_asm+0x34/0x70 ? __switch_to_asm+0x40/0x70 ? __switch_to_asm+0x34/0x70 ? __switch_to_asm+0x40/0x70 ? __switch_to+0x7c/0x4b0 ? __switch_to_asm+0x40/0x70 ? __switch_to_asm+0x34/0x70 process_one_work+0x1da/0x400 worker_thread+0x2b/0x3f0 ? process_one_work+0x400/0x400 kthread+0x118/0x140 ? kthread_create_on_node+0x40/0x40 ret_from_fork+0x22/0x40 Code: 00 66 83 f8 02 0f 84 ca 05 00 00 49 8b 84 24 d0 01 00 00 48 85 c0 0f 84 68 07 00 00 48 2d d0 01 00 00 49 89 c4 0f 84 59 07 00 00 <41> 0f b7 44 24 20 49 8b 77 50 66 83 f8 0a 75 9e 49 8b 7c 24 28
--- drivers/infiniband/core/cma.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/infiniband/core/cma.c +18 -0
@@ -1631,6 +1631,8 @@ static struct rdma_id_private *cma_find_listener( {struct rdma_id_private *id_priv, *id_priv_dev; +lockdep_assert_held (&lock); +if (!bind_list)return ERR_PTR (-EINVAL );
@@ -1677,6 +1679,7 @@ cma_ib_id_from_event(struct ib_cm_id *cm_id, } } +mutex_lock (&lock);/* * Net namespace might be getting deleted while route lookup, * cm_id lookup is in progress. Therefore, perform netdevice
@@ -1718,6 +1721,7 @@ cma_ib_id_from_event(struct ib_cm_id *cm_id, id_priv =cma_find_listener (bind_list, cm_id, ib_event, req, *net_dev); err:rcu_read_unlock (); +mutex_unlock (&lock);if (IS_ERR (id_priv) && *net_dev) {dev_put (*net_dev); *net_dev =NULL ;
@@ -2473,6 +2477,8 @@ static void cma_listen_on_dev(struct rdma_id_private *id_priv,struct net *net = id_priv->id.route.addr.dev_addr.net;int ret; +lockdep_assert_held (&lock); +if (cma_family (id_priv) ==AF_IB && !rdma_cap_ib_cm (cma_dev->device,1 ))return ;
@@ -3245,6 +3251,8 @@ static void cma_bind_port(struct rdma_bind_list *bind_list,u64 sid, mask;__be16 port; +lockdep_assert_held (&lock); + addr =cma_src_addr (id_priv); port =htons (bind_list->port);
@@ -3273,6 +3281,8 @@ static int cma_alloc_port(enum rdma_ucm_port_space ps,struct rdma_bind_list *bind_list;int ret; +lockdep_assert_held (&lock); + bind_list =kzalloc (sizeof *bind_list,GFP_KERNEL );if (!bind_list)return -ENOMEM ;
@@ -3299,6 +3309,8 @@ static int cma_port_is_unique(struct rdma_bind_list *bind_list,struct sockaddr *saddr =cma_src_addr (id_priv);__be16 dport =cma_port (daddr); +lockdep_assert_held (&lock); +hlist_for_each_entry (cur_id, &bind_list->owners, node) {struct sockaddr *cur_daddr =cma_dst_addr (cur_id);struct sockaddr *cur_saddr =cma_src_addr (cur_id);
@@ -3338,6 +3350,8 @@ static int cma_alloc_any_port(enum rdma_ucm_port_space ps,unsigned int rover;struct net *net = id_priv->id.route.addr.dev_addr.net; +lockdep_assert_held (&lock); +inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ; rover =prandom_u32 () % remaining + low;
@@ -3385,6 +3399,8 @@ static int cma_check_port(struct rdma_bind_list *bind_list,struct rdma_id_private *cur_id;struct sockaddr *addr, *cur_addr; +lockdep_assert_held (&lock); + addr =cma_src_addr (id_priv);hlist_for_each_entry (cur_id, &bind_list->owners, node) {if (id_priv == cur_id)
@@ -3415,6 +3431,8 @@ static int cma_use_port(enum rdma_ucm_port_space ps,unsigned short snum;int ret; +lockdep_assert_held (&lock); + snum =ntohs (cma_port (cma_src_addr (id_priv)));if (snum <PROT_SOCK && !capable (CAP_NET_BIND_SERVICE ))return -EACCES ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 86/178 ASoC: rockchip: Fix a reference count leak.
In reply to Sasha LevinFrom: Qiushi Wu <[email protected]>
[ Upstream commit f141a422159a199f4c8dedb7e0df55b3b2cf16cd ]
Calling pm_runtime_get_sync increments the counter even in case of failure, causing incorrect ref count if pm_runtime_put is not called in error handling paths. Call pm_runtime_put if pm_runtime_get_sync fails.
--- sound/soc/rockchip/rockchip_pdm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/rockchip/rockchip_pdm.c +3 -1
@@ -590,8 +590,10 @@ static int rockchip_pdm_resume(struct device *dev)int ret; ret =pm_runtime_get_sync (dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put (dev);return ret; + } ret =regcache_sync (pdm->regmap);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 87/178 s390/qeth: fix error handling for isolation mode cmds
In reply to Sasha LevinFrom: Julian Wiedmann <[email protected]>
[ Upstream commit e2dfcfba00ba4a414617ef4c5a8501fe21567eb3 ]
Current(?) OSA devices also store their cmd-specific return codes for SET_ACCESS_CONTROL cmds into the top-level cmd->hdr.return_code. So once we added stricter checking for the top-level field a while ago, none of the error logic that rolls back the user's configuration to its old state is applied any longer.
For this specific cmd, go back to the old model where we peek into the cmd structure even though the top-level field indicated an error.
--- drivers/s390/net/qeth_core_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/s390/net/qeth_core_main.c +1 -4
@@ -4163,9 +4163,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,int fallback = *(int *)reply->param;QETH_CARD_TEXT (card,4 ,"setaccb" ); -if (cmd->hdr.return_code) -return -EIO ; -qeth_setadpparms_inspect_rc (cmd); access_ctrl_req = &cmd->data.setadapterparms.data.set_access_ctrl; QETH_CARD_TEXT_(card, 2, "rc=%d",
@@ -4175,7 +4172,7 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,QETH_DBF_MESSAGE (3 ,"ERR:SET_ACCESS_CTRL(%#x) on device %x: %#x\n" , access_ctrl_req->subcmd_code,CARD_DEVID (card), cmd->data.setadapterparms.hdr.return_code); -switch (cmd->data.setadapterparms.hdr.return_code) { +switch (qeth_setadpparms_inspect_rc (cmd)) {case SET_ACCESS_CTRL_RC_SUCCESS :if (card->options.isolation ==ISOLATION_MODE_NONE ) { dev_info(&card->gdev->dev,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 88/178 RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads()
In reply to Sasha LevinFrom: Fan Guo <[email protected]>
[ Upstream commit a17f4bed811c60712d8131883cdba11a105d0161 ]
If ib_dma_mapping_error() returns non-zero value, ib_mad_post_receive_mads() will jump out of loops and return -ENOMEM without freeing mad_priv. Fix this memory-leak problem by freeing mad_priv in this case.
--- drivers/infiniband/core/mad.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/core/mad.c +1 -0
@@ -2960,6 +2960,7 @@ static int ib_mad_post_receive_mads(struct ib_mad_qp_info *qp_info, DMA_FROM_DEVICE);if (unlikely (ib_dma_mapping_error (qp_info->port_priv->device, sg_list.addr))) { +kfree (mad_priv); ret = -ENOMEM ;break ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 89/178 selftests/net: report etf errors correctly
In reply to Sasha LevinFrom: Willem de Bruijn <[email protected]>
[ Upstream commit ca8826095e4d4afc0ccaead27bba6e4b623a12ae ]
The ETF qdisc can queue skbs that it could not pace on the errqueue.
Address a few issues in the selftest
- recv buffer size was too small, and incorrectly calculated
- compared errno to ee_code instead of ee_errno
- missed invalid request error type
v2:
- fix a few checkpatch --strict indentation warnings
--- tools/testing/selftests/net/so_txtime.c | 33 +++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-)
tools/testing/selftests/net/so_txtime.c +26 -7
@@ -15,8 +15,9 @@#include <inttypes.h> #include <linux/net_tstamp.h> #include <linux/errqueue.h> +#include <linux/if_ether.h> #include <linux/ipv6.h> -#include <linux/tcp.h> +#include <linux/udp.h> #include <stdbool.h> #include <stdlib.h> #include <stdio.h>
@@ -140,8 +141,8 @@ static void do_recv_errqueue_timeout(int fdt) {char control[CMSG_SPACE (sizeof (struct sock_extended_err )) +CMSG_SPACE (sizeof (struct sockaddr_in6 ))] = {0 }; -char data[sizeof (struct ipv6hdr ) + -sizeof (struct tcphdr ) +1 ]; +char data[sizeof (struct ethhdr ) +sizeof (struct ipv6hdr ) + +sizeof (struct udphdr ) +1 ];struct sock_extended_err *err;struct msghdr msg = {0 };struct iovec iov = {0 };
@@ -159,6 +160,8 @@ static void do_recv_errqueue_timeout(int fdt) msg.msg_controllen =sizeof (control);while (1 ) { +const char *reason; + ret =recvmsg (fdt, &msg,MSG_ERRQUEUE );if (ret ==-1 && errno ==EAGAIN )break ;
@@ -176,14 +179,30 @@ static void do_recv_errqueue_timeout(int fdt) err = (struct sock_extended_err *)CMSG_DATA (cm);if (err->ee_origin !=SO_EE_ORIGIN_TXTIME )error (1 ,0 ,"errqueue: origin 0x%x\n" , err->ee_origin); -if (err->ee_code !=ECANCELED ) -error (1 ,0 ,"errqueue: code 0x%x\n" , err->ee_code); + +switch (err->ee_errno) { +case ECANCELED : +if (err->ee_code !=SO_EE_CODE_TXTIME_MISSED ) +error (1 ,0 ,"errqueue: unknown ECANCELED %u\n" , + err->ee_code); + reason ="missed txtime" ; +break ; +case EINVAL : +if (err->ee_code !=SO_EE_CODE_TXTIME_INVALID_PARAM ) +error (1 ,0 ,"errqueue: unknown EINVAL %u\n" , + err->ee_code); + reason ="invalid txtime" ; +break ; +default : +error (1 ,0 ,"errqueue: errno %u code %u\n" , + err->ee_errno, err->ee_code); + }; tstamp = ((int64_t ) err->ee_data) <<32 | err->ee_info; tstamp -= (int64_t ) glob_tstart; tstamp /=1000 *1000 ; -fprintf (stderr,"send: pkt %c at %" PRId64"ms dropped\n" , - data[ret -1 ], tstamp); +fprintf (stderr,"send: pkt %c at %" PRId64"ms dropped: %s\n" , + data[ret -1 ], tstamp, reason); msg.msg_flags =0 ; msg.msg_controllen =sizeof (control);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 90/178 iommu/vt-d: Enable PCI ACS for platform opt in hint
In reply to Sasha LevinFrom: Lu Baolu <[email protected]>
[ Upstream commit 50310600ebda74b9988467e2e6128711c7ba56fc ]
PCI ACS is disabled if Intel IOMMU is off by default or intel_iommu=off is used in command line. Unfortunately, Intel IOMMU will be forced on if there're devices sitting on an external facing PCI port that is marked as untrusted (for example, thunderbolt peripherals). That means, PCI ACS is disabled while Intel IOMMU is forced on to isolate those devices. As the result, the devices of an MFD will be grouped by a single group even the ACS is supported on device.
[ 0.691263] pci 0000:00:07.1: Adding to iommu group 3 [ 0.691277] pci 0000:00:07.2: Adding to iommu group 3 [ 0.691292] pci 0000:00:07.3: Adding to iommu group 3
Fix it by requesting PCI ACS when Intel IOMMU is detected with platform opt in hint.
--- drivers/iommu/dmar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/dmar.c +2 -1
@@ -898,7 +898,8 @@ int __init detect_intel_iommu(void)if (!ret) ret =dmar_walk_dmar_table ((struct acpi_table_dmar *)dmar_tbl, &validate_drhd_cb); -if (!ret && !no_iommu && !iommu_detected && !dmar_disabled) { +if (!ret && !no_iommu && !iommu_detected && + (!dmar_disabled ||dmar_platform_optin ())) { iommu_detected =1 ;/* Make sure ACS will be enabled */ pci_request_acs ();
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 91/178 iommu/vt-d: Update scalable mode paging structure coherency
In reply to Sasha LevinFrom: Lu Baolu <[email protected]>
[ Upstream commit 04c00956ee3cd138fd38560a91452a804a8c5550 ]
The Scalable-mode Page-walk Coherency (SMPWC) field in the VT-d extended capability register indicates the hardware coherency behavior on paging structures accessed through the pasid table entry. This is ignored in current code and using ECAP.C instead which is only valid in legacy mode. Fix this so that paging structure updates could be manually flushed from the cache line if hardware page walking is not snooped.
--- drivers/iommu/intel-iommu.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/iommu/intel-iommu.c +10 -3
@@ -611,6 +611,12 @@ struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)return g_iommus[iommu_id]; } +static inline bool iommu_paging_structure_coherency (struct intel_iommu *iommu) +{ +return sm_supported (iommu) ? +ecap_smpwc (iommu->ecap) :ecap_coherent (iommu->ecap); +} +static void domain_update_iommu_coherency (struct dmar_domain *domain) {struct dmar_drhd_unit *drhd;
@@ -622,7 +628,7 @@ static void domain_update_iommu_coherency(struct dmar_domain *domain)for_each_domain_iommu (i, domain) { found = true; -if (!ecap_coherent (g_iommus[i]->ecap)) { +if (!iommu_paging_structure_coherency (g_iommus[i])) { domain->iommu_coherency =0 ;break ; }
@@ -633,7 +639,7 @@ static void domain_update_iommu_coherency(struct dmar_domain *domain)/* No hardware attached; use lowest common denominator */ rcu_read_lock ();for_each_active_iommu (iommu, drhd) { -if (!ecap_coherent (iommu->ecap)) { +if (!iommu_paging_structure_coherency (iommu)) { domain->iommu_coherency =0 ;break ; }
@@ -2090,7 +2096,8 @@ static int domain_context_mapping_one(struct dmar_domain *domain,context_set_fault_enable (context);context_set_present (context); -domain_flush_cache (domain, context,sizeof (*context)); +if (!ecap_coherent (iommu->ecap)) +clflush_cache_range (context,sizeof (*context));/* * It's a non-present to present mapping. If hardware doesn't cache
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 92/178 net: qed: fix left elements count calculation
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 97dd1abd026ae4e6a82fa68645928404ad483409 ]
qed_chain_get_element_left{,_u32} returned 0 when the difference between producer and consumer page count was equal to the total page count.
Fix this by conditional expanding of producer value (vs unconditional). This allowed to eliminate normalizaton against total page count, which was the cause of this bug.
Misc: replace open-coded constants with common defines.
--- include/linux/qed/qed_chain.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
include/linux/qed/qed_chain.h +16 -10
@@ -207,28 +207,34 @@ static inline u32 qed_chain_get_cons_idx_u32(struct qed_chain *p_chain)static inline u16 qed_chain_get_elem_left (struct qed_chain *p_chain) { +u16 elem_per_page = p_chain->elem_per_page; +u32 prod = p_chain->u.chain16.prod_idx; +u32 cons = p_chain->u.chain16.cons_idx;u16 used; - used = (u16) (((u32 )0x10000 + - (u32 )p_chain->u.chain16.prod_idx) - - (u32 )p_chain->u.chain16.cons_idx); +if (prod < cons) + prod += (u32 )U16_MAX +1 ; + + used = (u16)(prod - cons);if (p_chain->mode ==QED_CHAIN_MODE_NEXT_PTR ) - used -= p_chain->u.chain16.prod_idx / p_chain->elem_per_page - - p_chain->u.chain16.cons_idx / p_chain->elem_per_page; + used -= prod / elem_per_page - cons / elem_per_page;return (u16)(p_chain->capacity - used); }static inline u32 qed_chain_get_elem_left_u32 (struct qed_chain *p_chain) { +u16 elem_per_page = p_chain->elem_per_page; +u64 prod = p_chain->u.chain32.prod_idx; +u64 cons = p_chain->u.chain32.cons_idx;u32 used; - used = (u32) (((u64 )0x100000000ULL + - (u64 )p_chain->u.chain32.prod_idx) - - (u64 )p_chain->u.chain32.cons_idx); +if (prod < cons) + prod += (u64 )U32_MAX +1 ; + + used = (u32)(prod - cons);if (p_chain->mode ==QED_CHAIN_MODE_NEXT_PTR ) - used -= p_chain->u.chain32.prod_idx / p_chain->elem_per_page - - p_chain->u.chain32.cons_idx / p_chain->elem_per_page; + used -= (u32)(prod / elem_per_page - cons / elem_per_page);return p_chain->capacity - used; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 93/178 net: qed: fix async event callbacks unregistering
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 31333c1a2521ff4b4ceb0c29de492549cd4a8de3 ]
qed_spq_unregister_async_cb() should be called before qed_rdma_info_free() to avoid crash-spawning uses-after-free. Instead of calling it from each subsystem exit code, do it in one place on PF down.
--- drivers/net/ethernet/qlogic/qed/qed_dev.c | 9 +++++++-- drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 2 -- drivers/net/ethernet/qlogic/qed/qed_roce.c | 1 - 3 files changed, 7 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_dev.c +7 -2
@@ -1368,6 +1368,8 @@ static void qed_dbg_user_data_free(struct qed_hwfn *p_hwfn)void qed_resc_free (struct qed_dev *cdev) { +struct qed_rdma_info *rdma_info; +struct qed_hwfn *p_hwfn;int i;if (IS_VF (cdev)) {
@@ -1385,7 +1387,8 @@ void qed_resc_free(struct qed_dev *cdev)qed_llh_free (cdev);for_each_hwfn (cdev, i) { -struct qed_hwfn *p_hwfn = &cdev->hwfns[i]; + p_hwfn = cdev->hwfns + i; + rdma_info = p_hwfn->p_rdma_info;qed_cxt_mngr_free (p_hwfn);qed_qm_info_free (p_hwfn);
@@ -1404,8 +1407,10 @@ void qed_resc_free(struct qed_dev *cdev)qed_ooo_free (p_hwfn); } -if (QED_IS_RDMA_PERSONALITY (p_hwfn)) +if (QED_IS_RDMA_PERSONALITY (p_hwfn) && rdma_info) { +qed_spq_unregister_async_cb (p_hwfn, rdma_info->proto);qed_rdma_info_free (p_hwfn); + }qed_iov_free (p_hwfn);qed_l2_free (p_hwfn);
drivers/net/ethernet/qlogic/qed/qed_iwarp.c +0 -2
@@ -2832,8 +2832,6 @@ int qed_iwarp_stop(struct qed_hwfn *p_hwfn)if (rc)return rc; -qed_spq_unregister_async_cb (p_hwfn,PROTOCOLID_IWARP ); -return qed_iwarp_ll2_stop (p_hwfn); }
drivers/net/ethernet/qlogic/qed/qed_roce.c +0 -1
@@ -113,7 +113,6 @@ void qed_roce_stop(struct qed_hwfn *p_hwfn)break ; } } -qed_spq_unregister_async_cb (p_hwfn,PROTOCOLID_ROCE ); } static void qed_rdma_copy_gids(struct qed_rdma_qp *qp, __le32 *src_gid,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 94/178 net: qede: stop adding events on an already destroyed workqueue
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 4079c7f7a2a00ab403c177ce723b560de59139c3 ]
Set rdma_wq pointer to NULL after destroying the workqueue and check for it when adding new events to fix crashes on driver unload.
--- drivers/net/ethernet/qlogic/qede/qede_rdma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qede/qede_rdma.c +2 -1
@@ -105,6 +105,7 @@ static void qede_rdma_destroy_wq(struct qede_dev *edev)qede_rdma_cleanup_event (edev);destroy_workqueue (edev->rdma_info.rdma_wq); + edev->rdma_info.rdma_wq =NULL ; }int qede_rdma_dev_add (struct qede_dev *edev,bool recovery)
@@ -325,7 +326,7 @@ static void qede_rdma_add_event(struct qede_dev *edev,if (edev->rdma_info.exp_recovery)return ; -if (!edev->rdma_info.qedr_dev) +if (!edev->rdma_info.qedr_dev || !edev->rdma_info.rdma_wq)return ;/* We don't want the cleanup flow to start while we're allocating and
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 95/178 net: qed: fix NVMe login fails over VFs
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit ccd7c7ce167a21dbf2b698ffcf00f11d96d44f9b ]
25ms sleep cycles in waiting for PF response are excessive and may lead to different timeout failures.
Start to wait with short udelays, and in most cases polling will end here. If the time was not sufficient, switch to msleeps. usleep_range() may go far beyond 100us depending on platform and tick configuration, hence atomic udelays for consistency.
Also add explicit DMA barriers since 'done' always comes from a shared request-response DMA pool, and note that in the comment nearby.
--- drivers/net/ethernet/qlogic/qed/qed_vf.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_vf.c +18 -5
@@ -81,12 +81,17 @@ static void qed_vf_pf_req_end(struct qed_hwfn *p_hwfn, int req_status)mutex_unlock (&(p_hwfn->vf_iov_info->mutex)); } +#define QED_VF_CHANNEL_USLEEP_ITERATIONS 90 +#define QED_VF_CHANNEL_USLEEP_DELAY 100 +#define QED_VF_CHANNEL_MSLEEP_ITERATIONS 10 +#define QED_VF_CHANNEL_MSLEEP_DELAY 25 +static int qed_send_msg2pf (struct qed_hwfn *p_hwfn,u8 *done,u32 resp_size) {union vfpf_tlvs *p_req = p_hwfn->vf_iov_info->vf2pf_request;struct ustorm_trigger_vf_zone trigger;struct ustorm_vf_zone *zone_data; -int rc =0 , time =100 ; +int iter, rc =0 ; zone_data = (struct ustorm_vf_zone *)PXP_VF_BAR0_START_USDM_ZONE_B ;
@@ -126,11 +131,19 @@ static int qed_send_msg2pf(struct qed_hwfn *p_hwfn, u8 *done, u32 resp_size)REG_WR (p_hwfn, (uintptr_t )&zone_data->trigger, *((u32 *)&trigger));/* When PF would be done with the response, it would write back to the -* `done' address. Poll until then. +* `done' address from a coherent DMA zone. Poll until then. */ -while ((!*done) && time) { -msleep (25 ); - time--; + + iter =QED_VF_CHANNEL_USLEEP_ITERATIONS ; +while (!*done && iter--) { +udelay (QED_VF_CHANNEL_USLEEP_DELAY ); +dma_rmb (); + } + + iter =QED_VF_CHANNEL_MSLEEP_ITERATIONS ; +while (!*done && iter--) { +msleep (QED_VF_CHANNEL_MSLEEP_DELAY ); +dma_rmb (); }if (!*done) {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 96/178 net: qed: fix excessive QM ILT lines consumption
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit d434d02f7e7c24c721365fd594ed781acb18e0da ]
This is likely a copy'n'paste mistake. The amount of ILT lines to reserve for a single VF was being multiplied by the total VFs count. This led to a huge redundancy in reservation and potential lines drainouts.
--- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qed/qed_cxt.c +1 -1
@@ -396,7 +396,7 @@ static void qed_cxt_qm_iids(struct qed_hwfn *p_hwfn, vf_tids += segs[NUM_TASK_PF_SEGMENTS ].count; } - iids->vf_cids += vf_cids * p_mngr->vf_count; + iids->vf_cids = vf_cids; iids->tids += vf_tids * p_mngr->vf_count; DP_VERBOSE(p_hwfn, QED_MSG_ILT,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 97/178 net: qede: fix PTP initialization on recovery
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 1c85f394c2206ea3835f43534d5675f0574e1b70 ]
Currently PTP cyclecounter and timecounter are initialized only on the first probing and are cleaned up during removal. This means that PTP becomes non-functional after device recovery.
Fix this by unconditional PTP initialization on probing and clearing Tx pending bit on exiting.
--- drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- drivers/net/ethernet/qlogic/qede/qede_ptp.c | 31 ++++++++------------ drivers/net/ethernet/qlogic/qede/qede_ptp.h | 2 +- 3 files changed, 15 insertions(+), 20 deletions(-)
drivers/net/ethernet/qlogic/qede/qede_main.c +1 -1
@@ -1158,7 +1158,7 @@ static int __qede_probe(struct pci_dev *pdev, u32 dp_module, u8 dp_level,/* PTP not supported on VFs */ if (!is_vf) -qede_ptp_enable (edev, (mode ==QEDE_PROBE_NORMAL )); +qede_ptp_enable (edev); edev->ops->register_ops (cdev, &qede_ll_ops, edev);
drivers/net/ethernet/qlogic/qede/qede_ptp.c +13 -18
@@ -411,6 +411,7 @@ void qede_ptp_disable(struct qede_dev *edev)if (ptp->tx_skb) {dev_kfree_skb_any (ptp->tx_skb); ptp->tx_skb =NULL ; +clear_bit_unlock (QEDE_FLAGS_PTP_TX_IN_PRORGESS , &edev->flags); }/* Disable PTP in HW */
@@ -422,7 +423,7 @@ void qede_ptp_disable(struct qede_dev *edev) edev->ptp =NULL ; } -static int qede_ptp_init (struct qede_dev *edev,bool init_tc) +static int qede_ptp_init (struct qede_dev *edev) {struct qede_ptp *ptp;int rc;
@@ -443,25 +444,19 @@ static int qede_ptp_init(struct qede_dev *edev, bool init_tc)/* Init work queue for Tx timestamping */ INIT_WORK (&ptp->work, qede_ptp_task); -/* Init cyclecounter and timecounter. This is done only in the first -* load. If done in every load, PTP application will fail when doing -* unload / load (e.g. MTU change) while it is running. -*/ -if (init_tc) { -memset (&ptp->cc,0 ,sizeof (ptp->cc)); - ptp->cc.read = qede_ptp_read_cc; - ptp->cc.mask =CYCLECOUNTER_MASK (64 ); - ptp->cc.shift =0 ; - ptp->cc.mult =1 ; - -timecounter_init (&ptp->tc, &ptp->cc, -ktime_to_ns (ktime_get_real ())); - } +/* Init cyclecounter and timecounter */ +memset (&ptp->cc,0 ,sizeof (ptp->cc)); + ptp->cc.read = qede_ptp_read_cc; + ptp->cc.mask =CYCLECOUNTER_MASK (64 ); + ptp->cc.shift =0 ; + ptp->cc.mult =1 ; -return rc; +timecounter_init (&ptp->tc, &ptp->cc,ktime_to_ns (ktime_get_real ())); + +return 0 ; } -int qede_ptp_enable (struct qede_dev *edev,bool init_tc) +int qede_ptp_enable (struct qede_dev *edev) {struct qede_ptp *ptp;int rc;
@@ -482,7 +477,7 @@ int qede_ptp_enable(struct qede_dev *edev, bool init_tc) edev->ptp = ptp; - rc =qede_ptp_init (edev, init_tc); + rc =qede_ptp_init (edev);if (rc) goto err1;
drivers/net/ethernet/qlogic/qede/qede_ptp.h +1 -1
@@ -41,7 +41,7 @@ void qede_ptp_rx_ts(struct qede_dev *edev, struct sk_buff *skb);void qede_ptp_tx_ts (struct qede_dev *edev,struct sk_buff *skb);int qede_ptp_hw_ts (struct qede_dev *edev,struct ifreq *req);void qede_ptp_disable (struct qede_dev *edev); -int qede_ptp_enable (struct qede_dev *edev,bool init_tc); +int qede_ptp_enable (struct qede_dev *edev);int qede_ptp_get_ts_info (struct qede_dev *edev,struct ethtool_ts_info *ts); static inline void qede_ptp_record_rx_ts(struct qede_dev *edev,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 98/178 net: qede: fix use-after-free on recovery and AER handling
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit ec6c80590bde6b5dfa4970fffa3572f1acd313ca ]
Set edev->cdev pointer to NULL after calling remove() callback to avoid using of already freed object.
--- drivers/net/ethernet/qlogic/qede/qede_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/qlogic/qede/qede_main.c +1 -0
@@ -1247,6 +1247,7 @@ static void __qede_remove(struct pci_dev *pdev, enum qede_remove_mode mode)if (system_state ==SYSTEM_POWER_OFF )return ; qed_ops->common->remove (cdev); + edev->cdev =NULL ;/* Since this can happen out-of-sync with other flows, * don't release the netdevice until after slowpath stop
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 99/178 cxgb4: move handling L2T ARP failures to caller
In reply to Sasha LevinFrom: Rahul Lakkireddy <[email protected]>
[ Upstream commit 11d8cd5c9f3b46f397f889cefdb66795518aaebd ]
Move code handling L2T ARP failures to the only caller.
Fixes following sparse warning:
skbuff.h:2091:29: warning: context imbalance in
'handle_failed_resolution' - unexpected unlock
--- drivers/net/ethernet/chelsio/cxgb4/l2t.c | 52 +++++++++++------------- 1 file changed, 24 insertions(+), 28 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/l2t.c +24 -28
@@ -506,41 +506,20 @@ u64 cxgb4_select_ntuple(struct net_device *dev, }EXPORT_SYMBOL (cxgb4_select_ntuple); -/* -* Called when address resolution fails for an L2T entry to handle packets -* on the arpq head. If a packet specifies a failure handler it is invoked, -* otherwise the packet is sent to the device. -*/ -static void handle_failed_resolution (struct adapter *adap,struct l2t_entry *e) -{ -struct sk_buff *skb; - -while ((skb =__skb_dequeue (&e->arpq)) !=NULL ) { -const struct l2t_skb_cb *cb =L2T_SKB_CB (skb); - -spin_unlock (&e->lock); -if (cb->arp_err_handler) - cb->arp_err_handler (cb->handle, skb); -else -t4_ofld_send (adap, skb); -spin_lock (&e->lock); - } -} -/* * Called when the host's neighbor layer makes a change to some entry that is * loaded into the HW L2 table. */ void t4_l2t_update (struct adapter *adap,struct neighbour *neigh) { -struct l2t_entry *e; -struct sk_buff_head *arpq =NULL ; -struct l2t_data *d = adap->l2t;unsigned int addr_len = neigh->tbl->key_len;u32 *addr = (u32 *) neigh->primary_key; -int ifidx = neigh->dev->ifindex; -int hash =addr_hash (d, addr, addr_len, ifidx); +int hash, ifidx = neigh->dev->ifindex; +struct sk_buff_head *arpq =NULL ; +struct l2t_data *d = adap->l2t; +struct l2t_entry *e; + hash =addr_hash (d, addr, addr_len, ifidx);read_lock_bh (&d->lock);for (e = d->l2tab[hash].first; e; e = e->next)if (!addreq (e, addr) && e->ifindex == ifidx) {
@@ -573,8 +552,25 @@ void t4_l2t_update(struct adapter *adap, struct neighbour *neigh)write_l2e (adap, e,0 ); } -if (arpq) -handle_failed_resolution (adap, e); +if (arpq) { +struct sk_buff *skb; + +/* Called when address resolution fails for an L2T +* entry to handle packets on the arpq head. If a +* packet specifies a failure handler it is invoked, +* otherwise the packet is sent to the device. +*/ +while ((skb =__skb_dequeue (&e->arpq)) !=NULL ) { +const struct l2t_skb_cb *cb =L2T_SKB_CB (skb); + +spin_unlock (&e->lock); +if (cb->arp_err_handler) + cb->arp_err_handler (cb->handle, skb); +else +t4_ofld_send (adap, skb); +spin_lock (&e->lock); + } + }spin_unlock_bh (&e->lock); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 100/178 ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram()
In reply to Sasha LevinFrom: yu kuai <[email protected]>
[ Upstream commit 586745f1598ccf71b0a5a6df2222dee0a865954e ]
if of_find_device_by_node() succeed, imx_suspend_alloc_ocram() doesn't have a corresponding put_device(). Thus add a jump target to fix the exception handling for this function implementation.
--- arch/arm/mach-imx/pm-imx5.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-imx/pm-imx5.c +4 -2
@@ -295,14 +295,14 @@ static int __init imx_suspend_alloc_ocram(if (!ocram_pool) {pr_warn ("%s: ocram pool unavailable!\n" , __func__); ret = -ENODEV ; - goto put_node; + goto put_device; } ocram_base =gen_pool_alloc (ocram_pool, size);if (!ocram_base) {pr_warn ("%s: unable to alloc ocram!\n" , __func__); ret = -ENOMEM ; - goto put_node; + goto put_device; } phys =gen_pool_virt_to_phys (ocram_pool, ocram_base);
@@ -312,6 +312,8 @@ static int __init imx_suspend_alloc_ocram(if (virt_out) *virt_out = virt; +put_device: +put_device (&pdev->dev); put_node:of_node_put (node);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 101/178 scsi: lpfc: Avoid another null dereference in lpfc_sli4_hba_unset()
In reply to Sasha LevinFrom: SeongJae Park <[email protected]>
[ Upstream commit 46da547e21d6cefceec3fb3dba5ebbca056627fc ]
Commit cdb42becdd40 ("scsi: lpfc: Replace io_channels for nvme and fcp with general hdw_queues per cpu") has introduced static checker warnings for potential null dereferences in 'lpfc_sli4_hba_unset()' and commit 1ffdd2c0440d ("scsi: lpfc: resolve static checker warning in lpfc_sli4_hba_unset") has tried to fix it. However, yet another potential null dereference is remaining. This commit fixes it.
This bug was discovered and resolved using Coverity Static Analysis Security Testing (SAST) by Synopsys, Inc.
--- drivers/scsi/lpfc/lpfc_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_init.c +2 -1
@@ -11542,7 +11542,8 @@ lpfc_sli4_hba_unset(struct lpfc_hba *phba)lpfc_sli4_xri_exchange_busy_wait (phba);/* per-phba callback de-registration for hotplug event */ -lpfc_cpuhp_remove (phba); +if (phba->pport) +lpfc_cpuhp_remove (phba);/* Disable PCI subsystem interrupt */ lpfc_sli4_disable_intr (phba);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 102/178 usb: gadget: udc: Potential Oops in error handling code
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit e55f3c37cb8d31c7e301f46396b2ac6a19eb3a7c ]
If this is in "transceiver" mode the the ->qwork isn't required and is a NULL pointer. This can lead to a NULL dereference when we call destroy_workqueue(udc->qwork).
--- drivers/usb/gadget/udc/mv_udc_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/gadget/udc/mv_udc_core.c +2 -1
@@ -2313,7 +2313,8 @@ static int mv_udc_probe(struct platform_device *pdev)return 0 ; err_create_workqueue: -destroy_workqueue (udc->qwork); +if (udc->qwork) +destroy_workqueue (udc->qwork); err_destroy_dma:dma_pool_destroy (udc->dtd_pool); err_free_dma:
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 103/178 usb: renesas_usbhs: getting residue from callback_result
In reply to Sasha LevinFrom: Yoshihiro Shimoda <[email protected]>
[ Upstream commit ea0efd687b01355cd799c8643d0c636ba4859ffc ]
This driver assumed that dmaengine_tx_status() could return the residue even if the transfer was completed. However, this was not correct usage [1] and this caused to break getting the residue after the commit 24461d9792c2 ("dmaengine:
virt-dma: Fix access after free in vchan_complete()") actually. So, this is possible to get wrong received size if the usb controller gets a short packet. For example, g_zero driver causes "bad OUT byte" errors.
The usb-dmac driver will support the callback_result, so this driver can use it to get residue correctly. Note that even if the usb-dmac driver has not supported the callback_result yet, this patch doesn't cause any side-effects.
[1]
https://lore.kernel.org/dmaengine/20200616165550.GP2324254@vkoul-mobl/
--- drivers/usb/renesas_usbhs/fifo.c | 23 +++++++++++++---------- drivers/usb/renesas_usbhs/fifo.h | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-)
drivers/usb/renesas_usbhs/fifo.c +13 -10
@@ -803,7 +803,8 @@ static int __usbhsf_dma_map_ctrl(struct usbhs_pkt *pkt, int map)return info->dma_map_ctrl (chan->device->dev, pkt, map); } -static void usbhsf_dma_complete (void *arg); +static void usbhsf_dma_complete (void *arg, +const struct dmaengine_result *result);static void usbhsf_dma_xfer_preparing (struct usbhs_pkt *pkt) {struct usbhs_pipe *pipe = pkt->pipe;
@@ -813,6 +814,7 @@ static void usbhsf_dma_xfer_preparing(struct usbhs_pkt *pkt)struct dma_chan *chan;struct device *dev =usbhs_priv_to_dev (priv);enum dma_transfer_direction dir; +dma_cookie_t cookie; fifo =usbhs_pipe_to_fifo (pipe);if (!fifo)
@@ -827,11 +829,11 @@ static void usbhsf_dma_xfer_preparing(struct usbhs_pkt *pkt)if (!desc)return ; - desc->callback = usbhsf_dma_complete; - desc->callback_param = pipe; + desc->callback_result = usbhsf_dma_complete; + desc->callback_param = pkt; - pkt->cookie =dmaengine_submit (desc); -if (pkt->cookie <0 ) { + cookie =dmaengine_submit (desc); +if (cookie <0 ) {dev_err (dev,"Failed to submit dma descriptor\n" );return ; }
@@ -1152,12 +1154,10 @@ static size_t usbhs_dma_calc_received_size(struct usbhs_pkt *pkt, struct dma_chan *chan, int dtln) {struct usbhs_pipe *pipe = pkt->pipe; -struct dma_tx_state state;size_t received_size;int maxp =usbhs_pipe_get_maxpacket (pipe); -dmaengine_tx_status (chan, pkt->cookie, &state); - received_size = pkt->length - state.residue; + received_size = pkt->length - pkt->dma_result->residue;if (dtln) { received_size -=USBHS_USB_DMAC_XFER_SIZE ;
@@ -1363,13 +1363,16 @@ static int usbhsf_irq_ready(struct usbhs_priv *priv,return 0 ; } -static void usbhsf_dma_complete (void *arg) +static void usbhsf_dma_complete (void *arg, +const struct dmaengine_result *result) { -struct usbhs_pipe *pipe = arg; +struct usbhs_pkt *pkt = arg; +struct usbhs_pipe *pipe = pkt->pipe;struct usbhs_priv *priv =usbhs_pipe_to_priv (pipe);struct device *dev =usbhs_priv_to_dev (priv);int ret; + pkt->dma_result = result; ret =usbhsf_pkt_handler (pipe,USBHSF_PKT_DMA_DONE );if (ret <0 ) dev_err(dev, "dma_complete run_error %d : %d\n",
drivers/usb/renesas_usbhs/fifo.h +1 -1
@@ -50,7 +50,7 @@ struct usbhs_pkt { struct usbhs_pkt *pkt);struct work_struct work;dma_addr_t dma; -dma_cookie_t cookie; +const struct dmaengine_result *dma_result;void *buf;int length;int trans;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 104/178 nvme-multipath: set bdi capabilities once
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit b2ce4d90690bd29ce5b554e203cd03682dd59697 ]
The queues' backing device info capabilities don't change with each namespace revalidation. Set it only when each path's request_queue is initially added to a multipath queue.
--- drivers/nvme/host/multipath.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/nvme/host/multipath.c +8 -0
@@ -3,6 +3,7 @@* Copyright (c) 2017-2018 Christoph Hellwig. */ +#include <linux/backing-dev.h> #include <linux/moduleparam.h> #include <trace/events/block.h> #include "nvme.h"
@@ -666,6 +667,13 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id)nvme_mpath_set_live (ns);mutex_unlock (&ns->head->lock); } + +if (bdi_cap_stable_pages_required (ns->queue->backing_dev_info)) { +struct backing_dev_info *info = + ns->head->disk->queue->backing_dev_info; + + info->capabilities |=BDI_CAP_STABLE_WRITES ; + } }void nvme_mpath_remove_disk (struct nvme_ns_head *head)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 105/178 nvme: fix possible deadlock when I/O is blocked
In reply to Sasha LevinFrom: Sagi Grimberg <[email protected]>
[ Upstream commit 3b4b19721ec652ad2c4fe51dfbe5124212b5f581 ]
Revert fab7772bfbcf ("nvme-multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns")
When adding a new namespace to the head disk (via nvme_mpath_set_live) we will see partition scan which triggers I/O on the mpath device node. This process will usually be triggered from the scan_work which holds the scan_lock. If I/O blocks (if we got ana change currently have only available paths but none are accessible) this can deadlock on the head disk bd_mutex as both partition scan I/O takes it, and head disk revalidation takes it to check for resize (also triggered from scan_work on a different path). See trace [1].
The mpath disk revalidation was originally added to detect online disk size change, but this is no longer needed since commit cb224c3af4df ("nvme: Convert to use set_capacity_revalidate_and_notify") which already updates resize info without unnecessarily revalidating the disk (the mpath disk doesn't even implement .revalidate_disk fop).
[1]:
--
kernel: INFO: task kworker/u65:9:494 blocked for more than 241 seconds. kernel: Tainted: G OE 5.3.5-050305-generic #201910071830 kernel: "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. kernel: kworker/u65:9 D 0 494 2 0x80004000 kernel: Workqueue: nvme-wq nvme_scan_work [nvme_core] kernel: Call Trace: kernel: __schedule+0x2b9/0x6c0 kernel: schedule+0x42/0xb0 kernel: schedule_preempt_disabled+0xe/0x10 kernel: __mutex_lock.isra.0+0x182/0x4f0 kernel: __mutex_lock_slowpath+0x13/0x20 kernel: mutex_lock+0x2e/0x40 kernel: revalidate_disk+0x63/0xa0 kernel: __nvme_revalidate_disk+0xfe/0x110 [nvme_core] kernel: nvme_revalidate_disk+0xa4/0x160 [nvme_core] kernel: ? evict+0x14c/0x1b0 kernel: revalidate_disk+0x2b/0xa0 kernel: nvme_validate_ns+0x49/0x940 [nvme_core] kernel: ? blk_mq_free_request+0xd2/0x100 kernel: ? __nvme_submit_sync_cmd+0xbe/0x1e0 [nvme_core] kernel: nvme_scan_work+0x24f/0x380 [nvme_core] kernel: process_one_work+0x1db/0x380 kernel: worker_thread+0x249/0x400 kernel: kthread+0x104/0x140 kernel: ? process_one_work+0x380/0x380 kernel: ? kthread_park+0x80/0x80 kernel: ret_from_fork+0x1f/0x40 ... kernel: INFO: task kworker/u65:1:2630 blocked for more than 241 seconds. kernel: Tainted: G OE 5.3.5-050305-generic #201910071830 kernel: "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. kernel: kworker/u65:1 D 0 2630 2 0x80004000 kernel: Workqueue: nvme-wq nvme_scan_work [nvme_core] kernel: Call Trace: kernel: __schedule+0x2b9/0x6c0 kernel: schedule+0x42/0xb0 kernel: io_schedule+0x16/0x40 kernel: do_read_cache_page+0x438/0x830 kernel: ? __switch_to_asm+0x34/0x70 kernel: ? file_fdatawait_range+0x30/0x30 kernel: read_cache_page+0x12/0x20 kernel: read_dev_sector+0x27/0xc0 kernel: read_lba+0xc1/0x220 kernel: ? kmem_cache_alloc_trace+0x19c/0x230 kernel: efi_partition+0x1e6/0x708 kernel: ? vsnprintf+0x39e/0x4e0 kernel: ? snprintf+0x49/0x60 kernel: check_partition+0x154/0x244 kernel: rescan_partitions+0xae/0x280 kernel: __blkdev_get+0x40f/0x560 kernel: blkdev_get+0x3d/0x140 kernel: __device_add_disk+0x388/0x480 kernel: device_add_disk+0x13/0x20 kernel: nvme_mpath_set_live+0x119/0x140 [nvme_core] kernel: nvme_update_ns_ana_state+0x5c/0x60 [nvme_core] kernel: nvme_set_ns_ana_state+0x1e/0x30 [nvme_core] kernel: nvme_parse_ana_log+0xa1/0x180 [nvme_core] kernel: ? nvme_update_ns_ana_state+0x60/0x60 [nvme_core] kernel: nvme_mpath_add_disk+0x47/0x90 [nvme_core] kernel: nvme_validate_ns+0x396/0x940 [nvme_core] kernel: ? blk_mq_free_request+0xd2/0x100 kernel: nvme_scan_work+0x24f/0x380 [nvme_core] kernel: process_one_work+0x1db/0x380 kernel: worker_thread+0x249/0x400 kernel: kthread+0x104/0x140 kernel: ? process_one_work+0x380/0x380 kernel: ? kthread_park+0x80/0x80 kernel: ret_from_fork+0x1f/0x40
--
in nvme_validate_ns")
--- drivers/nvme/host/core.c | 1 - 1 file changed, 1 deletion(-)
drivers/nvme/host/core.c +0 -1
@@ -1870,7 +1870,6 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)if (ns->head->disk) {nvme_update_disk_info (ns->head->disk, ns, id);blk_queue_stack_limits (ns->head->disk->queue, ns->queue); -revalidate_disk (ns->head->disk); }#endif }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 106/178 nvme-multipath: fix deadlock between ana_work and scan_work
In reply to Sasha LevinFrom: Anton Eidelman <[email protected]>
[ Upstream commit 489dd102a2c7c94d783a35f9412eb085b8da1aa4 ]
When scan_work calls nvme_mpath_add_disk() this holds ana_lock and invokes nvme_parse_ana_log(), which may issue IO
in device_add_disk() and hang waiting for an accessible path. While nvme_mpath_set_live() only called when nvme_state_is_live(), a transition may cause NVME_SC_ANA_TRANSITION and requeue the IO.
In order to recover and complete the IO ana_work on the same ctrl should be able to update the path state and remove NVME_NS_ANA_PENDING.
The deadlock occurs because scan_work keeps holding ana_lock, so ana_work hangs [1].
Fix:
Now nvme_mpath_add_disk() uses nvme_parse_ana_log() to obtain a copy of the ANA group desc, and then calls nvme_update_ns_ana_state() without holding ana_lock.
[1]:
kernel: Workqueue: nvme-wq nvme_scan_work [nvme_core] kernel: Call Trace: kernel: __schedule+0x2b9/0x6c0 kernel: schedule+0x42/0xb0 kernel: io_schedule+0x16/0x40 kernel: do_read_cache_page+0x438/0x830 kernel: read_cache_page+0x12/0x20 kernel: read_dev_sector+0x27/0xc0 kernel: read_lba+0xc1/0x220 kernel: efi_partition+0x1e6/0x708 kernel: check_partition+0x154/0x244 kernel: rescan_partitions+0xae/0x280 kernel: __blkdev_get+0x40f/0x560 kernel: blkdev_get+0x3d/0x140 kernel: __device_add_disk+0x388/0x480 kernel: device_add_disk+0x13/0x20 kernel: nvme_mpath_set_live+0x119/0x140 [nvme_core] kernel: nvme_update_ns_ana_state+0x5c/0x60 [nvme_core] kernel: nvme_set_ns_ana_state+0x1e/0x30 [nvme_core] kernel: nvme_parse_ana_log+0xa1/0x180 [nvme_core] kernel: nvme_mpath_add_disk+0x47/0x90 [nvme_core] kernel: nvme_validate_ns+0x396/0x940 [nvme_core] kernel: nvme_scan_work+0x24f/0x380 [nvme_core] kernel: process_one_work+0x1db/0x380 kernel: worker_thread+0x249/0x400 kernel: kthread+0x104/0x140
kernel: Workqueue: nvme-wq nvme_ana_work [nvme_core] kernel: Call Trace: kernel: __schedule+0x2b9/0x6c0 kernel: schedule+0x42/0xb0 kernel: schedule_preempt_disabled+0xe/0x10 kernel: __mutex_lock.isra.0+0x182/0x4f0 kernel: ? __switch_to_asm+0x34/0x70 kernel: ? select_task_rq_fair+0x1aa/0x5c0 kernel: ? kvm_sched_clock_read+0x11/0x20 kernel: ? sched_clock+0x9/0x10 kernel: __mutex_lock_slowpath+0x13/0x20 kernel: mutex_lock+0x2e/0x40 kernel: nvme_read_ana_log+0x3a/0x100 [nvme_core] kernel: nvme_ana_work+0x15/0x20 [nvme_core] kernel: process_one_work+0x1db/0x380 kernel: worker_thread+0x4d/0x400 kernel: kthread+0x104/0x140 kernel: ? process_one_work+0x380/0x380 kernel: ? kthread_park+0x80/0x80 kernel: ret_from_fork+0x35/0x40
--- drivers/nvme/host/multipath.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/nvme/host/multipath.c +16 -8
@@ -641,26 +641,34 @@ static ssize_t ana_state_show(struct device *dev, struct device_attribute *attr, }DEVICE_ATTR_RO (ana_state); -static int nvme_set_ns_ana_state (struct nvme_ctrl *ctrl, +static int nvme_lookup_ana_group_desc (struct nvme_ctrl *ctrl,struct nvme_ana_group_desc *desc,void *data) { -struct nvme_ns *ns = data; +struct nvme_ana_group_desc *dst = data; -if (ns->ana_grpid ==le32_to_cpu (desc->grpid)) { -nvme_update_ns_ana_state (desc, ns); -return -ENXIO ;/* just break out of the loop */ - } +if (desc->grpid != dst->grpid) +return 0 ; -return 0 ; + *dst = *desc; +return -ENXIO ;/* just break out of the loop */ }void nvme_mpath_add_disk (struct nvme_ns *ns,struct nvme_id_ns *id) {if (nvme_ctrl_use_ana (ns->ctrl)) { +struct nvme_ana_group_desc desc = { + .grpid = id->anagrpid, + .state =0 , + }; +mutex_lock (&ns->ctrl->ana_lock); ns->ana_grpid =le32_to_cpu (id->anagrpid); -nvme_parse_ana_log (ns->ctrl, ns, nvme_set_ns_ana_state); +nvme_parse_ana_log (ns->ctrl, &desc, nvme_lookup_ana_group_desc);mutex_unlock (&ns->ctrl->ana_lock); +if (desc.state) { +/* found the group desc: update */ +nvme_update_ns_ana_state (&desc, ns); + } }else {mutex_lock (&ns->head->lock); ns->ana_state =NVME_ANA_OPTIMIZED ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 107/178 nvme: don't protect ns mutation with ns->head->lock
In reply to Sasha LevinFrom: Sagi Grimberg <[email protected]>
[ Upstream commit e164471dcf19308d154adb69e7760d8ba426a77f ]
Right now ns->head->lock is protecting namespace mutation which is wrong and unneeded. Move it to only protect against head mutations. While we're at it, remove unnecessary ns->head reference as we already have head pointer.
The problem with this is that the head->lock spans mpath disk node I/O that may block under some conditions (if for example the controller is disconnecting or the path became inaccessible), The locking scheme does not allow any other path to enable itself, preventing blocked I/O to complete and forward-progress from there.
This is a preparation patch for the fix in a subsequent patch where the disk I/O will also be done outside the head->lock.
--- drivers/nvme/host/multipath.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/nvme/host/multipath.c +4 -8
@@ -414,11 +414,10 @@ static void nvme_mpath_set_live(struct nvme_ns *ns) {struct nvme_ns_head *head = ns->head; -lockdep_assert_held (&ns->head->lock); -if (!head->disk)return ; +mutex_lock (&head->lock);if (!(head->disk->flags &GENHD_FL_UP ))device_add_disk (&head->subsys->dev, head->disk, nvme_ns_id_attr_groups);
@@ -431,9 +430,10 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)__nvme_find_path (head, node);srcu_read_unlock (&head->srcu, srcu_idx); } +mutex_unlock (&head->lock); -synchronize_srcu (&ns->head->srcu); -kblockd_schedule_work (&ns->head->requeue_work); +synchronize_srcu (&head->srcu); +kblockd_schedule_work (&head->requeue_work); } static int nvme_parse_ana_log(struct nvme_ctrl *ctrl, void *data,
@@ -484,14 +484,12 @@ static inline bool nvme_state_is_live(enum nvme_ana_state state)static void nvme_update_ns_ana_state (struct nvme_ana_group_desc *desc,struct nvme_ns *ns) { -mutex_lock (&ns->head->lock); ns->ana_grpid =le32_to_cpu (desc->grpid); ns->ana_state = desc->state;clear_bit (NVME_NS_ANA_PENDING , &ns->flags);if (nvme_state_is_live (ns->ana_state))nvme_mpath_set_live (ns); -mutex_unlock (&ns->head->lock); } static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
@@ -670,10 +668,8 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id)nvme_update_ns_ana_state (&desc, ns); } }else { -mutex_lock (&ns->head->lock); ns->ana_state =NVME_ANA_OPTIMIZED ;nvme_mpath_set_live (ns); -mutex_unlock (&ns->head->lock); }if (bdi_cap_stable_pages_required (ns->queue->backing_dev_info)) {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 108/178 nvme-multipath: fix deadlock due to head->lock
In reply to Sasha LevinFrom: Anton Eidelman <[email protected]>
[ Upstream commit d8a22f85609fadb46ba699e0136cc3ebdeebff79 ]
In the following scenario scan_work and ana_work will deadlock:
When scan_work calls nvme_mpath_add_disk() this holds ana_lock and invokes nvme_parse_ana_log(), which may issue IO in device_add_disk() and hang waiting for an accessible path.
While nvme_mpath_set_live() only called when nvme_state_is_live(), a transition may cause NVME_SC_ANA_TRANSITION and requeue the IO.
Since nvme_mpath_set_live() holds ns->head->lock, an ana_work on ANY ctrl will not be able to complete nvme_mpath_set_live() on the same ns->head, which is required in order to update the new accessible path and remove NVME_NS_ANA_PENDING.. Therefore IO never completes: deadlock [1].
Fix:
Move device_add_disk out of the head->lock and protect it with an atomic test_and_set for a new NVME_NS_HEAD_HAS_DISK bit.
[1]:
kernel: INFO: task kworker/u8:2:160 blocked for more than 120 seconds. kernel: Tainted: G OE 5.3.5-050305-generic #201910071830 kernel: "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. kernel: kworker/u8:2 D 0 160 2 0x80004000 kernel: Workqueue: nvme-wq nvme_ana_work [nvme_core] kernel: Call Trace: kernel: __schedule+0x2b9/0x6c0 kernel: schedule+0x42/0xb0 kernel: schedule_preempt_disabled+0xe/0x10 kernel: __mutex_lock.isra.0+0x182/0x4f0 kernel: __mutex_lock_slowpath+0x13/0x20 kernel: mutex_lock+0x2e/0x40 kernel: nvme_update_ns_ana_state+0x22/0x60 [nvme_core] kernel: nvme_update_ana_state+0xca/0xe0 [nvme_core] kernel: nvme_parse_ana_log+0xa1/0x180 [nvme_core] kernel: nvme_read_ana_log+0x76/0x100 [nvme_core] kernel: nvme_ana_work+0x15/0x20 [nvme_core] kernel: process_one_work+0x1db/0x380 kernel: worker_thread+0x4d/0x400 kernel: kthread+0x104/0x140 kernel: ret_from_fork+0x35/0x40 kernel: INFO: task kworker/u8:4:439 blocked for more than 120 seconds. kernel: Tainted: G OE 5.3.5-050305-generic #201910071830 kernel: "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. kernel: kworker/u8:4 D 0 439 2 0x80004000 kernel: Workqueue: nvme-wq nvme_scan_work [nvme_core] kernel: Call Trace: kernel: __schedule+0x2b9/0x6c0 kernel: schedule+0x42/0xb0 kernel: io_schedule+0x16/0x40 kernel: do_read_cache_page+0x438/0x830 kernel: read_cache_page+0x12/0x20 kernel: read_dev_sector+0x27/0xc0 kernel: read_lba+0xc1/0x220 kernel: efi_partition+0x1e6/0x708 kernel: check_partition+0x154/0x244 kernel: rescan_partitions+0xae/0x280 kernel: __blkdev_get+0x40f/0x560 kernel: blkdev_get+0x3d/0x140 kernel: __device_add_disk+0x388/0x480 kernel: device_add_disk+0x13/0x20 kernel: nvme_mpath_set_live+0x119/0x140 [nvme_core] kernel: nvme_update_ns_ana_state+0x5c/0x60 [nvme_core] kernel: nvme_mpath_add_disk+0xbe/0x100 [nvme_core] kernel: nvme_validate_ns+0x396/0x940 [nvme_core] kernel: nvme_scan_work+0x256/0x390 [nvme_core] kernel: process_one_work+0x1db/0x380 kernel: worker_thread+0x4d/0x400 kernel: kthread+0x104/0x140 kernel: ret_from_fork+0x35/0x40
--- drivers/nvme/host/multipath.c | 4 ++-- drivers/nvme/host/nvme.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/nvme/host/multipath.c +2 -2
@@ -417,11 +417,11 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)if (!head->disk)return ; -mutex_lock (&head->lock); -if (!(head->disk->flags &GENHD_FL_UP )) +if (!test_and_set_bit (NVME_NSHEAD_DISK_LIVE , &head->flags))device_add_disk (&head->subsys->dev, head->disk, nvme_ns_id_attr_groups); +mutex_lock (&head->lock);if (nvme_path_is_optimized (ns)) {int node, srcu_idx;
drivers/nvme/host/nvme.h +2 -0
@@ -345,6 +345,8 @@ struct nvme_ns_head {spinlock_t requeue_lock;struct work_struct requeue_work;struct mutex lock; +unsigned long flags; +#define NVME_NSHEAD_DISK_LIVE 0struct nvme_ns __rcu *current_path[];#endif };
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 109/178 netfilter: ipset: fix unaligned atomic access
In reply to Sasha LevinFrom: Russell King <[email protected]>
[ Upstream commit 715028460082d07a7ec6fcd87b14b46784346a72 ]
When using ip_set with counters and comment, traffic causes the kernel to panic on 32-bit ARM:
Alignment trap: not handling instruction e1b82f9f at [<bf01b0dc>] Unhandled fault: alignment exception (0x221) at 0xea08133c PC is at ip_set_match_extensions+0xe0/0x224 [ip_set]
The problem occurs when we try to update the 64-bit counters - the faulting address above is not 64-bit aligned. The problem occurs due to the way elements are allocated, for example:
set->dsize = ip_set_elem_len(set, tb, 0, 0); map = ip_set_alloc(sizeof(*map) + elements * set->dsize);
If the element has a requirement for a member to be 64-bit aligned, and set->dsize is not a multiple of 8, but is a multiple of four, then every odd numbered elements will be misaligned - and hitting an atomic64_add() on that element will cause the kernel to panic.
ip_set_elem_len() must return a size that is rounded to the maximum alignment of any extension field stored in the element. This change ensures that is the case.
--- net/netfilter/ipset/ip_set_core.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/ipset/ip_set_core.c +2 -0
@@ -382,6 +382,8 @@ ip_set_elem_len(struct ip_set *set, struct nlattr *tb[], size_t len,for (id =0 ; id <IPSET_EXT_ID_MAX ; id++) {if (!add_extension (id, cadt_flags, tb))continue ; +if (align < ip_set_extensions[id].align) + align = ip_set_extensions[id].align; len =ALIGN (len, ip_set_extensions[id].align); set->offset[id] = len; set->extensions |= ip_set_extensions[id].type;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 110/178 net: bcmgenet: use hardware padding of runt frames
In reply to Sasha LevinFrom: Doug Berger <[email protected]>
[ Upstream commit 20d1f2d1b024f6be199a3bedf1578a1d21592bc5 ]
When commit 474ea9cafc45 ("net: bcmgenet: correctly pad short packets") added the call to skb_padto() it should have been located before the nr_frags parameter was read since that value could be changed when padding packets with lengths between 55 and 59 bytes (inclusive).
The use of a stale nr_frags value can cause corruption of the pad data when tx-scatter-gather is enabled. This corruption of the pad can cause invalid checksum computation when hardware offload of tx-checksum is also enabled.
Since the original reason for the padding was corrected by commit 7dd399130efb ("net: bcmgenet: fix skb_len in bcmgenet_xmit_single()") we can remove the software padding all together and make use of hardware padding of short frames as long as the hardware also always appends the FCS value to the frame.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +3 -5
@@ -1591,11 +1591,6 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev) goto out; } -if (skb_padto (skb,ETH_ZLEN )) { - ret =NETDEV_TX_OK ; - goto out; - } -/* Retain how many bytes will be sent on the wire, without TSB inserted * by transmit checksum offload */
@@ -1644,6 +1639,9 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev) len_stat = (size <<DMA_BUFLENGTH_SHIFT ) | (priv->hw_params->qtag_mask <<DMA_TX_QTAG_SHIFT ); +/* Note: if we ever change from DMA_TX_APPEND_CRC below we +* will need to restore software padding of "runt" packets +*/ if (!i) { len_stat |=DMA_TX_APPEND_CRC |DMA_SOP ;if (skb->ip_summed ==CHECKSUM_PARTIAL )
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 111/178 clk: sifive: allocate sufficient memory for struct __prci_data
In reply to Sasha LevinFrom: Vincent Chen <[email protected]>
[ Upstream commit d0a5fdf4cc83dabcdea668f971b8a2e916437711 ]
The (struct __prci_data).hw_clks.hws is an array with dynamic elements. Using struct_size(pd, hw_clks.hws, ARRAY_SIZE(__prci_init_clocks)) instead of sizeof(*pd) to get the correct memory size of struct __prci_data for sifive/fu540-prci. After applying this modifications, the kernel runs smoothly with CONFIG_SLAB_FREELIST_RANDOM enabled on the HiFive unleashed board.
--- drivers/clk/sifive/fu540-prci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/sifive/fu540-prci.c +4 -1
@@ -586,7 +586,10 @@ static int sifive_fu540_prci_probe(struct platform_device *pdev)struct __prci_data *pd;int r; - pd =devm_kzalloc (dev,sizeof (*pd),GFP_KERNEL ); + pd =devm_kzalloc (dev, +struct_size (pd, hw_clks.hws, +ARRAY_SIZE (__prci_init_clocks)), +GFP_KERNEL );if (!pd)return -ENOMEM ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 112/178 i2c: fsi: Fix the port number field in status register
In reply to Sasha LevinFrom: Eddie James <[email protected]>
[ Upstream commit 502035e284cc7e9efef22b01771d822d49698ab9 ]
The port number field in the status register was not correct, so fix it.
--- drivers/i2c/busses/i2c-fsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-fsi.c +1 -1
@@ -98,7 +98,7 @@#define I2C_STAT_DAT_REQ BIT(25)#define I2C_STAT_CMD_COMP BIT(24)#define I2C_STAT_STOP_ERR BIT(23) -#define I2C_STAT_MAX_PORT GENMASK(19, 16) +#define I2C_STAT_MAX_PORT GENMASK(22, 16)#define I2C_STAT_ANY_INT BIT(15)#define I2C_STAT_SCL_IN BIT(11)#define I2C_STAT_SDA_IN BIT(10)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 113/178 i2c: core: check returned size of emulated smbus block read
In reply to Sasha LevinFrom: Mans Rullgard <[email protected]>
[ Upstream commit 40e05200593af06633f64ab0effff052eee6f076 ]
If the i2c bus driver ignores the I2C_M_RECV_LEN flag (as some of them do), it is possible for an I2C_SMBUS_BLOCK_DATA read issued on some random device to return an arbitrary value in the first byte (and nothing else). When this happens, i2c_smbus_xfer_emulated() will happily write past the end of the supplied data buffer, thus causing Bad Things to happen. To prevent this, check the size before copying the data block and return an error if it is too large.
--- drivers/i2c/i2c-core-smbus.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/i2c/i2c-core-smbus.c +7 -0
@@ -495,6 +495,13 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter *adapter, u16 addr,break ;case I2C_SMBUS_BLOCK_DATA :case I2C_SMBUS_BLOCK_PROC_CALL : +if (msg[1 ].buf[0 ] >I2C_SMBUS_BLOCK_MAX ) { +dev_err (&adapter->dev, +"Invalid block size returned: %d\n" , + msg[1 ].buf[0 ]); + status = -EPROTO ; + goto cleanup; + }for (i =0 ; i < msg[1 ].buf[0 ] +1 ; i++) data->block[i] = msg[1 ].buf[i];break ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 114/178 afs: Fix storage of cell names
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit 719fdd32921fb7e3208db8832d32ae1c2d68900f ]
The cell name stored in the afs_cell struct is a 64-char + NUL buffer - when it needs to be able to handle up to AFS_MAXCELLNAME (256 chars) + NUL.
Fix this by changing the array to a pointer and allocating the string.
Found using Coverity.
--- fs/afs/cell.c | 9 +++++++++ fs/afs/internal.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-)
fs/afs/cell.c +9 -0
@@ -154,10 +154,17 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net,return ERR_PTR (-ENOMEM ); } + cell->name =kmalloc (namelen +1 ,GFP_KERNEL ); +if (!cell->name) { +kfree (cell); +return ERR_PTR (-ENOMEM ); + } + cell->net = net; cell->name_len = namelen;for (i =0 ; i < namelen; i++) cell->name[i] =tolower (name[i]); + cell->name[i] =0 ;atomic_set (&cell->usage,2 );INIT_WORK (&cell->manager, afs_manage_cell);
@@ -203,6 +210,7 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net,if (ret == -EINVAL )printk (KERN_ERR "kAFS: bad VL server IP address\n" ); error: +kfree (cell->name);kfree (cell);_leave (" = %d" , ret);return ERR_PTR (ret);
@@ -483,6 +491,7 @@ static void afs_cell_destroy(struct rcu_head *rcu)afs_put_vlserverlist (cell->net,rcu_access_pointer (cell->vl_servers));key_put (cell->anonymous_key); +kfree (cell->name);kfree (cell);_leave (" [destroyed]" );
fs/afs/internal.h +1 -1
@@ -397,7 +397,7 @@ struct afs_cell {struct afs_vlserver_list __rcu *vl_servers;u8 name_len;/* Length of name */ -char name[64 +1 ];/* Cell name, case-flattened and NUL-padded */ +char *name;/* Cell name, case-flattened and NUL-padded */ };/*
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 115/178 sched/deadline: Initialize ->dl_boosted
In reply to Sasha LevinFrom: Juri Lelli <[email protected]>
[ Upstream commit ce9bc3b27f2a21a7969b41ffb04df8cf61bd1592 ]
syzbot reported the following warning triggered via SYSC_sched_setattr():
WARNING: CPU: 0 PID: 6973 at kernel/sched/deadline.c:593 setup_new_dl_entity /kernel/sched/deadline.c:594 [inline] WARNING: CPU: 0 PID: 6973 at kernel/sched/deadline.c:593 enqueue_dl_entity /kernel/sched/deadline.c:1370 [inline] WARNING: CPU: 0 PID: 6973 at kernel/sched/deadline.c:593 enqueue_task_dl+0x1c17/0x2ba0 /kernel/sched/deadline.c:1441
This happens because the ->dl_boosted flag is currently not initialized by __dl_clear_params() (unlike the other flags) and setup_new_dl_entity() rightfully complains about it.
Initialize dl_boosted to 0.
--- kernel/sched/deadline.c | 1 + 1 file changed, 1 insertion(+)
kernel/sched/deadline.c +1 -0
@@ -2693,6 +2693,7 @@ void __dl_clear_params(struct task_struct *p) dl_se->dl_bw =0 ; dl_se->dl_density =0 ; + dl_se->dl_boosted =0 ; dl_se->dl_throttled =0 ; dl_se->dl_yielded =0 ; dl_se->dl_non_contending =0 ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 116/178 sched/core: Fix PI boosting between RT and DEADLINE tasks
In reply to Sasha LevinFrom: Juri Lelli <[email protected]>
[ Upstream commit 740797ce3a124b7dd22b7fb832d87bc8fba1cf6f ]
syzbot reported the following warning:
WARNING: CPU: 1 PID: 6351 at kernel/sched/deadline.c:628 enqueue_task_dl+0x22da/0x38a0 kernel/sched/deadline.c:1504
At deadline.c:628 we have:
623 static inline void setup_new_dl_entity(struct sched_dl_entity *dl_se) 624 {
625 struct dl_rq *dl_rq = dl_rq_of_se(dl_se);
626 struct rq *rq = rq_of_dl_rq(dl_rq);
627
628 WARN_ON(dl_se->dl_boosted);
629 WARN_ON(dl_time_before(rq_clock(rq), dl_se->deadline));
[...]
}Which means that setup_new_dl_entity() has been called on a task currently boosted. This shouldn't happen though, as setup_new_dl_entity() is only called when the 'dynamic' deadline of the new entity is in the past w.r.t. rq_clock and boosted tasks shouldn't verify this condition.
Digging through the PI code I noticed that what above might in fact happen if an RT tasks blocks on an rt_mutex hold by a DEADLINE task. In the first branch of boosting conditions we check only if a pi_task 'dynamic' deadline is earlier than mutex holder's and in this case we set mutex holder to be dl_boosted. However, since RT 'dynamic' deadlines are only initialized if such tasks get boosted at some point (or if they become DEADLINE of course), in general RT 'dynamic' deadlines are usually equal to 0 and this verifies the aforementioned condition.
Fix it by checking that the potential donor task is actually (even if temporary because in turn boosted) running at DEADLINE priority before using its 'dynamic' deadline value.
--- kernel/sched/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sched/core.c +2 -1
@@ -4447,7 +4447,8 @@ void rt_mutex_setprio(struct task_struct *p, struct task_struct *pi_task)*/ if (dl_prio (prio)) {if (!dl_prio (p->normal_prio) || - (pi_task &&dl_entity_preempt (&pi_task->dl, &p->dl))) { + (pi_task &&dl_prio (pi_task->prio) && +dl_entity_preempt (&pi_task->dl, &p->dl))) { p->dl.dl_boosted =1 ; queue_flag |=ENQUEUE_REPLENISH ; }else
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 117/178 sata_rcar: handle pm_runtime_get_sync failure cases
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit eea1238867205b9e48a67c1a63219529a73c46fd ]
Calling pm_runtime_get_sync increments the counter even in case of failure, causing incorrect ref count. Call pm_runtime_put if pm_runtime_get_sync fails.
--- drivers/ata/sata_rcar.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/ata/sata_rcar.c +7 -4
@@ -905,7 +905,7 @@ static int sata_rcar_probe(struct platform_device *pdev)pm_runtime_enable (dev); ret =pm_runtime_get_sync (dev);if (ret <0 ) - goto err_pm_disable; + goto err_pm_put; host =ata_host_alloc (dev,1 );if (!host) {
@@ -935,7 +935,6 @@ static int sata_rcar_probe(struct platform_device *pdev) err_pm_put:pm_runtime_put (dev); -err_pm_disable:pm_runtime_disable (dev);return ret; }
@@ -989,8 +988,10 @@ static int sata_rcar_resume(struct device *dev)int ret; ret =pm_runtime_get_sync (dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put (dev);return ret; + }if (priv->type ==RCAR_GEN3_SATA ) {sata_rcar_init_module (priv);
@@ -1015,8 +1016,10 @@ static int sata_rcar_restore(struct device *dev)int ret; ret =pm_runtime_get_sync (dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put (dev);return ret; + }sata_rcar_setup_port (host);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 118/178 ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function
In reply to Sasha LevinFrom: Ye Bin <[email protected]>
[ Upstream commit f650ef61e040bcb175dd8762164b00a5d627f20e ]
BUG: KASAN: use-after-free in ata_scsi_mode_select_xlat+0x10bd/0x10f0 drivers/ata/libata-scsi.c:4045 Read of size 1 at addr ffff88803b8cd003 by task syz-executor.6/12621 CPU: 1 PID: 12621 Comm: syz-executor.6 Not tainted 4.19.95 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xac/0xee lib/dump_stack.c:118 print_address_description+0x60/0x223 mm/kasan/report.c:253 kasan_report_error mm/kasan/report.c:351 [inline] kasan_report mm/kasan/report.c:409 [inline] kasan_report.cold+0xae/0x2d8 mm/kasan/report.c:393 ata_scsi_mode_select_xlat+0x10bd/0x10f0 drivers/ata/libata-scsi.c:4045 ata_scsi_translate+0x2da/0x680 drivers/ata/libata-scsi.c:2035 __ata_scsi_queuecmd drivers/ata/libata-scsi.c:4360 [inline] ata_scsi_queuecmd+0x2e4/0x790 drivers/ata/libata-scsi.c:4409 scsi_dispatch_cmd+0x2ee/0x6c0 drivers/scsi/scsi_lib.c:1867 scsi_queue_rq+0xfd7/0x1990 drivers/scsi/scsi_lib.c:2170 blk_mq_dispatch_rq_list+0x1e1/0x19a0 block/blk-mq.c:1186 blk_mq_do_dispatch_sched+0x147/0x3d0 block/blk-mq-sched.c:108 blk_mq_sched_dispatch_requests+0x427/0x680 block/blk-mq-sched.c:204 __blk_mq_run_hw_queue+0xbc/0x200 block/blk-mq.c:1308 __blk_mq_delay_run_hw_queue+0x3c0/0x460 block/blk-mq.c:1376 blk_mq_run_hw_queue+0x152/0x310 block/blk-mq.c:1413 blk_mq_sched_insert_request+0x337/0x6c0 block/blk-mq-sched.c:397 blk_execute_rq_nowait+0x124/0x320 block/blk-exec.c:64 blk_execute_rq+0xc5/0x112 block/blk-exec.c:101 sg_scsi_ioctl+0x3b0/0x6a0 block/scsi_ioctl.c:507 sg_ioctl+0xd37/0x23f0 drivers/scsi/sg.c:1106 vfs_ioctl fs/ioctl.c:46 [inline] file_ioctl fs/ioctl.c:501 [inline] do_vfs_ioctl+0xae6/0x1030 fs/ioctl.c:688 ksys_ioctl+0x76/0xa0 fs/ioctl.c:705 __do_sys_ioctl fs/ioctl.c:712 [inline] __se_sys_ioctl fs/ioctl.c:710 [inline] __x64_sys_ioctl+0x6f/0xb0 fs/ioctl.c:710 do_syscall_64+0xa0/0x2e0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x45c479 Code: ad b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89
f7 48
89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f
83 7b b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00
RSP: 002b:00007fb0e9602c78 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00007fb0e96036d4 RCX: 000000000045c479
RDX: 0000000020000040 RSI: 0000000000000001 RDI: 0000000000000003
RBP: 000000000076bfc0 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00000000ffffffff
R13: 000000000000046d R14: 00000000004c6e1a R15: 000000000076bfcc
Allocated by task 12577: set_track mm/kasan/kasan.c:460 [inline] kasan_kmalloc mm/kasan/kasan.c:553 [inline] kasan_kmalloc+0xbf/0xe0 mm/kasan/kasan.c:531 __kmalloc+0xf3/0x1e0 mm/slub.c:3749 kmalloc include/linux/slab.h:520 [inline] load_elf_phdrs+0x118/0x1b0 fs/binfmt_elf.c:441 load_elf_binary+0x2de/0x4610 fs/binfmt_elf.c:737 search_binary_handler fs/exec.c:1654 [inline] search_binary_handler+0x15c/0x4e0 fs/exec.c:1632 exec_binprm fs/exec.c:1696 [inline] __do_execve_file.isra.0+0xf52/0x1a90 fs/exec.c:1820 do_execveat_common fs/exec.c:1866 [inline] do_execve fs/exec.c:1883 [inline] __do_sys_execve fs/exec.c:1964 [inline] __se_sys_execve fs/exec.c:1959 [inline] __x64_sys_execve+0x8a/0xb0 fs/exec.c:1959 do_syscall_64+0xa0/0x2e0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Freed by task 12577: set_track mm/kasan/kasan.c:460 [inline] __kasan_slab_free+0x129/0x170 mm/kasan/kasan.c:521 slab_free_hook mm/slub.c:1370 [inline] slab_free_freelist_hook mm/slub.c:1397 [inline] slab_free mm/slub.c:2952 [inline] kfree+0x8b/0x1a0 mm/slub.c:3904 load_elf_binary+0x1be7/0x4610 fs/binfmt_elf.c:1118 search_binary_handler fs/exec.c:1654 [inline] search_binary_handler+0x15c/0x4e0 fs/exec.c:1632 exec_binprm fs/exec.c:1696 [inline] __do_execve_file.isra.0+0xf52/0x1a90 fs/exec.c:1820 do_execveat_common fs/exec.c:1866 [inline] do_execve fs/exec.c:1883 [inline] __do_sys_execve fs/exec.c:1964 [inline] __se_sys_execve fs/exec.c:1959 [inline] __x64_sys_execve+0x8a/0xb0 fs/exec.c:1959 do_syscall_64+0xa0/0x2e0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x44/0xa9 The buggy address belongs to the object at ffff88803b8ccf00 which belongs to the cache kmalloc-512 of size 512 The buggy address is located 259 bytes inside of 512-byte region [ffff88803b8ccf00, ffff88803b8cd100) The buggy address belongs to the page: page:ffffea0000ee3300 count:1 mapcount:0 mapping:ffff88806cc03080 index:0xffff88803b8cc780 compound_mapcount: 0 flags: 0x100000000008100(slab|head) raw: 0100000000008100 ffffea0001104080 0000000200000002 ffff88806cc03080 raw: ffff88803b8cc780 00000000800c000b 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff88803b8ccf00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff88803b8ccf80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb >ffff88803b8cd000: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^ffff88803b8cd080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fbffff88803b8cd100: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
You can refer to "https://www.lkml.org/lkml/2019/1/17/474" reproduce this error.
The exception code is "bd_len = p[3];", "p" value is ffff88803b8cd000
which belongs to the cache kmalloc-512 of size 512. The "page_address(sg_page(scsi_sglist(scmd)))" maybe from sg_scsi_ioctl function "buffer" which allocated by kzalloc, so "buffer" may not page aligned.
This also looks completely buggy on highmem systems and really needs to use akmap_atomic. --Christoph Hellwig
To address above bugs, Paolo Bonzini advise to simpler to just make a char array of size CACHE_MPAGE_LEN+8+8+4-2(or just 64 to make it easy), use sg_copy_to_buffer to copy from the sglist into the buffer, and workthere.
--- drivers/ata/libata-scsi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/ata/libata-scsi.c +6 -3
@@ -3978,12 +3978,13 @@ static unsigned int ata_scsi_mode_select_xlat(struct ata_queued_cmd *qc) {struct scsi_cmnd *scmd = qc->scsicmd;const u8 *cdb = scmd->cmnd; -const u8 *p;u8 pg, spg;unsigned six_byte, pg_len, hdr_len, bd_len;int len;u16 fp = (u16)-1 ;u8 bp =0xff ; +u8 buffer[64 ]; +const u8 *p = buffer;VPRINTK ("ENTER\n" );
@@ -4017,12 +4018,14 @@ static unsigned int ata_scsi_mode_select_xlat(struct ata_queued_cmd *qc)if (!scsi_sg_count (scmd) ||scsi_sglist (scmd)->length < len) goto invalid_param_len; - p =page_address (sg_page (scsi_sglist (scmd))); -/* Move past header and block descriptors. */ if (len < hdr_len) goto invalid_param_len; +if (!sg_copy_to_buffer (scsi_sglist (scmd),scsi_sg_count (scmd), + buffer,sizeof (buffer))) + goto invalid_param_len; +if (six_byte) bd_len = p[3 ];else
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 119/178 drm/amd/display: Use kfree() to free rgb_user in calculate_user_regamma_ramp()
In reply to Sasha LevinFrom: Denis Efremov <[email protected]>
[ Upstream commit 43a562774fceba867e8eebba977d7d42f8a2eac7 ]
Use kfree() instead of kvfree() to free rgb_user in calculate_user_regamma_ramp() because the memory is allocated with kcalloc().
--- drivers/gpu/drm/amd/display/modules/color/color_gamma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/modules/color/color_gamma.c +1 -1
@@ -1862,7 +1862,7 @@ bool calculate_user_regamma_ramp(struct dc_transfer_func *output_tf,kfree (rgb_regamma); rgb_regamma_alloc_fail: -kvfree (rgb_user); +kfree (rgb_user); rgb_user_alloc_fail:return ret; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 120/178 riscv/atomic: Fix sign extension for RV64I
In reply to Sasha LevinFrom: Nathan Huckleberry <[email protected]>
[ Upstream commit 6c58f25e6938c073198af8b1e1832f83f8f0df33 ]
The argument passed to cmpxchg is not guaranteed to be sign extended, but lr.w sign extends on RV64I. This makes cmpxchg fail on clang built kernels when __old is negative.
To fix this, we just cast __old to long which sign extends on RV64I. With this fix, clang built RISC-V kernels now boot.
--- arch/riscv/include/asm/cmpxchg.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/riscv/include/asm/cmpxchg.h +4 -4
@@ -179,7 +179,7 @@" bnez %1, 0b\n" \"1:\n" \ : "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr) \ -: " rJ" (__old), " rJ" (__new) \ +: " rJ" ((long)__old), " rJ" (__new) \ : "memory"); \ break; \ case 8: \
@@ -224,7 +224,7 @@RISCV_ACQUIRE_BARRIER \"1:\n" \ : "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr) \ -: " rJ" (__old), " rJ" (__new) \ +: " rJ" ((long)__old), " rJ" (__new) \ : "memory"); \ break; \ case 8: \
@@ -270,7 +270,7 @@" bnez %1, 0b\n" \"1:\n" \ : "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr) \ -: " rJ" (__old), " rJ" (__new) \ +: " rJ" ((long)__old), " rJ" (__new) \ : "memory"); \ break; \ case 8: \
@@ -316,7 +316,7 @@" fence rw, rw\n" \"1:\n" \ : "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr) \ -: " rJ" (__old), " rJ" (__new) \ +: " rJ" ((long)__old), " rJ" (__new) \ : "memory"); \ break; \ case 8: \
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 121/178 hwrng: ks-sa - Fix runtime PM imbalance on error
In reply to Sasha LevinFrom: Dinghao Liu <[email protected]>
[ Upstream commit 95459261c99f1621d90bc628c2a48e60b7cf9a88 ]
pm_runtime_get_sync() increments the runtime PM usage counter even the call returns an error code. Thus a pairing decrement is needed on the error handling path to keep the counter balanced.
--- drivers/char/hw_random/ks-sa-rng.c | 1 + 1 file changed, 1 insertion(+)
drivers/char/hw_random/ks-sa-rng.c +1 -0
@@ -208,6 +208,7 @@ static int ks_sa_rng_probe(struct platform_device *pdev) ret =pm_runtime_get_sync (dev);if (ret <0 ) {dev_err (dev,"Failed to enable SA power-domain\n" ); +pm_runtime_put_noidle (dev);pm_runtime_disable (dev);return ret; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 122/178 arm64/sve: Eliminate data races on sve_default_vl
In reply to Sasha LevinFrom: Dave Martin <[email protected]>
[ Upstream commit 1e570f512cbdc5e9e401ba640d9827985c1bea1e ]
sve_default_vl can be modified via the /proc/sys/abi/sve_default_vl sysctl concurrently with use, and modified concurrently by multiple threads.
Adding a lock for this seems overkill, and I don't want to think any more than necessary, so just define wrappers using READ_ONCE()/ WRITE_ONCE().
This will avoid the possibility of torn accesses and repeated loads and stores.
There's no evidence yet that this is going wrong in practice: this is just hygiene. For generic sysctl users, it would be better to build this kind of thing into the sysctl common code somehow.
--- arch/arm64/kernel/fpsimd.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
arch/arm64/kernel/fpsimd.c +18 -7
@@ -12,6 +12,7 @@#include <linux/bug.h> #include <linux/cache.h> #include <linux/compat.h> +#include <linux/compiler.h> #include <linux/cpu.h> #include <linux/cpu_pm.h> #include <linux/kernel.h>
@@ -119,10 +120,20 @@ struct fpsimd_last_state_struct { static DEFINE_PER_CPU(struct fpsimd_last_state_struct, fpsimd_last_state);/* Default VL for tasks that don't set it explicitly: */ -static int sve_default_vl =-1 ; +static int __sve_default_vl =-1 ; + +static int get_sve_default_vl (void ) +{ +return READ_ONCE (__sve_default_vl); +}#ifdef CONFIG_ARM64_SVE +static void set_sve_default_vl (int val) +{ +WRITE_ONCE (__sve_default_vl, val); +} +/* Maximum supported vector length across all CPUs (initially poisoned) */ int __ro_after_init sve_max_vl =SVE_VL_MIN ;int __ro_after_init sve_max_virtualisable_vl =SVE_VL_MIN ;
@@ -345,7 +356,7 @@ static int sve_proc_do_default_vl(struct ctl_table *table, int write, loff_t *ppos) {int ret; -int vl = sve_default_vl; +int vl =get_sve_default_vl ();struct ctl_table tmp_table = { .data = &vl, .maxlen =sizeof (vl),
@@ -362,7 +373,7 @@ static int sve_proc_do_default_vl(struct ctl_table *table, int write,if (!sve_vl_valid (vl))return -EINVAL ; - sve_default_vl =find_supported_vector_length (vl); +set_sve_default_vl (find_supported_vector_length (vl));return 0 ; }
@@ -869,7 +880,7 @@ void __init sve_setup(void)* For the default VL, pick the maximum supported value <= 64. * VL == 64 is guaranteed not to grow the signal frame. */ - sve_default_vl =find_supported_vector_length (64 ); +set_sve_default_vl (find_supported_vector_length (64 ));bitmap_andnot (tmp_map, sve_vq_partial_map, sve_vq_map,SVE_VQ_MAX );
@@ -890,7 +901,7 @@ void __init sve_setup(void)pr_info ("SVE: maximum available vector length %u bytes per vector\n" , sve_max_vl);pr_info ("SVE: default vector length %u bytes per vector\n" , - sve_default_vl); +get_sve_default_vl ());/* KVM decides whether to support mismatched systems. Just warn here: */ if (sve_max_virtualisable_vl < sve_max_vl)
@@ -1030,13 +1041,13 @@ void fpsimd_flush_thread(void)* vector length configured: no kernel task can become a user * task without an exec and hence a call to this function. * By the time the first call to this function is made, all -* early hardware probing is complete, so sve_default_vl +* early hardware probing is complete, so __sve_default_vl * should be valid. * If a bug causes this to go wrong, we make some noise and * try to fudge thread.sve_vl to a safe value here. */ vl = current->thread.sve_vl_onexec ? - current->thread.sve_vl_onexec : sve_default_vl; + current->thread.sve_vl_onexec :get_sve_default_vl ();if (WARN_ON (!sve_vl_valid (vl))) vl =SVE_VL_MIN ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 123/178 ibmvnic: Harden device login requests
In reply to Sasha LevinFrom: Thomas Falcon <[email protected]>
[ Upstream commit dff515a3e71dc8ab3b9dcc2e23a9b5fca88b3c18 ]
The VNIC driver's "login" command sequence is the final step in the driver's initialization process with device firmware, confirming the available device queue resources to be utilized by the driver. Under high system load, firmware may not respond to the request in a timely manner or may abort the request. In such cases, the driver should reattempt the login command sequence. In case of a device error, the number of retries is bounded.
--- drivers/net/ethernet/ibm/ibmvnic.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +17 -4
@@ -779,12 +779,13 @@ static int ibmvnic_login(struct net_device *netdev)struct ibmvnic_adapter *adapter =netdev_priv (netdev);unsigned long timeout =msecs_to_jiffies (30000 );int retry_count =0 ; +int retries =10 ;bool retry;int rc; do { retry = false; - if (retry_count > IBMVNIC_MAX_QUEUES) { + if (retry_count > retries) { netdev_warn(netdev, "Login attempts exceeded\n"); return -1; }
@@ -799,11 +800,23 @@ static int ibmvnic_login(struct net_device *netdev)if (!wait_for_completion_timeout (&adapter->init_done, timeout)) { -netdev_warn (netdev,"Login timed out\n" ); -return -1 ; +netdev_warn (netdev,"Login timed out, retrying...\n" ); + retry = true; + adapter->init_done_rc =0 ; + retry_count++; +continue ; } -if (adapter->init_done_rc ==PARTIALSUCCESS ) { +if (adapter->init_done_rc ==ABORTED ) { +netdev_warn (netdev,"Login aborted, retrying...\n" ); + retry = true; + adapter->init_done_rc =0 ; + retry_count++; +/* FW or device may be busy, so +* wait a bit before retrying login +*/ +msleep (500 ); + }else if (adapter->init_done_rc ==PARTIALSUCCESS ) { retry_count++;release_sub_crqs (adapter,1 );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 124/178 net: alx: fix race condition in alx_remove
In reply to Sasha LevinFrom: Zekun Shen <[email protected]>
[ Upstream commit e89df5c4322c1bf495f62d74745895b5fd2a4393 ]
There is a race condition exist during termination. The path is alx_stop and then alx_remove. An alx_schedule_link_check could be called before alx_stop by interrupt handler and invoke alx_link_check later. Alx_stop frees the napis, and alx_remove cancels any pending works. If any of the work is scheduled before termination and invoked before alx_remove, a null-ptr-deref occurs because both expect alx->napis[i].
This patch fix the race condition by moving cancel_work_sync functions before alx_free_napis inside alx_stop. Because interrupt handler can call alx_schedule_link_check again, alx_free_irq is moved before cancel_work_sync calls too.
--- drivers/net/ethernet/atheros/alx/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/atheros/alx/main.c +5 -4
@@ -1249,8 +1249,12 @@ static int __alx_open(struct alx_priv *alx, bool resume)static void __alx_stop (struct alx_priv *alx) { -alx_halt (alx);alx_free_irq (alx); + +cancel_work_sync (&alx->link_check_wk); +cancel_work_sync (&alx->reset_wk); + +alx_halt (alx);alx_free_rings (alx);alx_free_napis (alx); }
@@ -1858,9 +1862,6 @@ static void alx_remove(struct pci_dev *pdev)struct alx_priv *alx =pci_get_drvdata (pdev);struct alx_hw *hw = &alx->hw; -cancel_work_sync (&alx->link_check_wk); -cancel_work_sync (&alx->reset_wk); -/* restore permanent mac address */ alx_set_macaddr (hw, hw->perm_addr);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 125/178 test_objagg: Fix potential memory leak in error handling
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit a6379f0ad6375a707e915518ecd5c2270afcd395 ]
In case of failure of check_expect_hints_stats(), the resources allocated by objagg_hints_get should be freed. The patch fixes this issue.
--- lib/test_objagg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/test_objagg.c +2 -2
@@ -979,10 +979,10 @@ static int test_hints_case(const struct hints_case *hints_case) err_world2_obj_get:for (i--; i >=0 ; i--)world_obj_put (&world2, objagg, hints_case->key_ids[i]); -objagg_hints_put (hints); -objagg_destroy (objagg2); i = hints_case->key_ids_count; +objagg_destroy (objagg2); err_check_expect_hints_stats: +objagg_hints_put (hints); err_hints_get: err_check_expect_stats: err_world_obj_get:
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 126/178 pinctrl: qcom: spmi-gpio: fix warning about irq chip reusage
In reply to Sasha LevinFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 5e50311556c9f409a85740e3cb4c4511e7e27da0 ]
Fix the following warnings caused by reusage of the same irq_chip instance for all spmi-gpio gpio_irq_chip instances. Instead embed irq_chip into pmic_gpio_state struct.
gpio gpiochip2: (c440000.qcom,spmi:pmic@2:gpio@c000): detected irqchip that is shared with multiple gpiochips: please fix the driver. gpio gpiochip3: (c440000.qcom,spmi:pmic@4:gpio@c000): detected irqchip that is shared with multiple gpiochips: please fix the driver. gpio gpiochip4: (c440000.qcom,spmi:pmic@a:gpio@c000): detected irqchip that is shared with multiple gpiochips: please fix the driver.
--- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +10 -11
@@ -170,6 +170,7 @@ struct pmic_gpio_state {struct regmap *map;struct pinctrl_dev *ctrl;struct gpio_chip chip; +struct irq_chip irq; };static const struct pinconf_generic_params pmic_gpio_bindings[] = {
@@ -917,16 +918,6 @@ static int pmic_gpio_populate(struct pmic_gpio_state *state,return 0 ; } -static struct irq_chip pmic_gpio_irq_chip = { - .name ="spmi-gpio" , - .irq_ack = irq_chip_ack_parent, - .irq_mask = irq_chip_mask_parent, - .irq_unmask = irq_chip_unmask_parent, - .irq_set_type = irq_chip_set_type_parent, - .irq_set_wake = irq_chip_set_wake_parent, - .flags =IRQCHIP_MASK_ON_SUSPEND , -}; - static int pmic_gpio_domain_translate(struct irq_domain *domain, struct irq_fwspec *fwspec, unsigned long *hwirq,
@@ -1053,8 +1044,16 @@ static int pmic_gpio_probe(struct platform_device *pdev)if (!parent_domain)return -ENXIO ; + state->irq.name ="spmi-gpio" , + state->irq.irq_ack = irq_chip_ack_parent, + state->irq.irq_mask = irq_chip_mask_parent, + state->irq.irq_unmask = irq_chip_unmask_parent, + state->irq.irq_set_type = irq_chip_set_type_parent, + state->irq.irq_set_wake = irq_chip_set_wake_parent, + state->irq.flags =IRQCHIP_MASK_ON_SUSPEND , + girq = &state->chip.irq; - girq->chip = &pmic_gpio_irq_chip; + girq->chip = &state->irq; girq->default_type =IRQ_TYPE_NONE ; girq->handler = handle_level_irq; girq->fwnode =of_node_to_fwnode (state->dev->of_node);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 127/178 pinctrl: tegra: Use noirq suspend/resume callbacks
In reply to Sasha LevinFrom: Vidya Sagar <[email protected]>
[ Upstream commit 782b6b69847f34dda330530493ea62b7de3fd06a ]
Use noirq suspend/resume callbacks as other drivers which implement noirq suspend/resume callbacks (Ex:- PCIe) depend on pinctrl driver to configure the signals used by their respective devices in the noirq phase.
--- drivers/pinctrl/tegra/pinctrl-tegra.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/tegra/pinctrl-tegra.c +2 -2
@@ -685,8 +685,8 @@ static int tegra_pinctrl_resume(struct device *dev) }const struct dev_pm_ops tegra_pinctrl_pm = { - .suspend = &tegra_pinctrl_suspend, - .resume = &tegra_pinctrl_resume + .suspend_noirq = &tegra_pinctrl_suspend, + .resume_noirq = &tegra_pinctrl_resume };static bool gpio_node_has_range (const char *compatible)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 128/178 s390/ptrace: pass invalid syscall numbers to tracing
In reply to Sasha LevinFrom: Sven Schnelle <[email protected]>
[ Upstream commit 00332c16b1604242a56289ff2b26e283dbad0812 ]
tracing expects to see invalid syscalls, so pass it through. The syscall path in entry.S checks the syscall number before looking up the handler, so it is still safe.
--- arch/s390/kernel/entry.S | 2 +- arch/s390/kernel/ptrace.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-)
arch/s390/kernel/entry.S +1 -1
@@ -368,9 +368,9 @@ ENTRY(system_call) jnz .Lsysc_nr_ok # svc 0: system call number in %r1 llgfr %r1,%r1 # clear high word in r1 + sth %r1,__PT_INT_CODE+2(%r11) cghi %r1,NR_syscalls jnl .Lsysc_nr_ok - sth %r1,__PT_INT_CODE+2(%r11) slag %r8,%r1,3 .Lsysc_nr_ok: xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
arch/s390/kernel/ptrace.c +2 -4
@@ -844,11 +844,9 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)* call number to gprs[2]. */ if (test_thread_flag (TIF_SYSCALL_TRACE ) && - (tracehook_report_syscall_entry (regs) || - regs->gprs[2 ] >= NR_syscalls)) { +tracehook_report_syscall_entry (regs)) {/* -* Tracing decided this syscall should not happen or the -* debugger stored an invalid system call number. Skip +* Tracing decided this syscall should not happen. Skip * the system call and the system call restart handling. */ clear_pt_regs_flag (regs,PIF_SYSCALL );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 129/178 s390/ptrace: fix setting syscall number
In reply to Sasha LevinFrom: Sven Schnelle <[email protected]>
[ Upstream commit 873e5a763d604c32988c4a78913a8dab3862d2f9 ]
When strace wants to update the syscall number, it sets GPR2 to the desired number and updates the GPR via PTRACE_SETREGSET. It doesn't update regs->int_code which would cause the old syscall executed on syscall restart. As we cannot change the ptrace ABI and don't have a field for the interruption code, check whether the tracee is in a syscall and the last instruction was svc. In that case assume that the tracer wants to update the syscall number and copy the GPR2 value to regs->int_code.
--- arch/s390/kernel/ptrace.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)
arch/s390/kernel/ptrace.c +30 -1
@@ -324,6 +324,25 @@ static inline void __poke_user_per(struct task_struct *child, child->thread.per_user.end = data; } +static void fixup_int_code (struct task_struct *child,addr_t data) +{ +struct pt_regs *regs =task_pt_regs (child); +int ilc = regs->int_code >>16 ; +u16 insn; + +if (ilc >6 ) +return ; + +if (ptrace_access_vm (child, regs->psw.addr - (regs->int_code >>16 ), + &insn,sizeof (insn),FOLL_FORCE ) !=sizeof (insn)) +return ; + +/* double check that tracee stopped on svc instruction */ +if ((insn >>8 ) !=0xa ) +return ; + + regs->int_code =0x20000 | (data &0xffff ); +}/* * Write a word to the user area of a process at location addr. This * operation does have an additional problem compared to peek_user.
@@ -335,7 +354,9 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data)struct user *dummy =NULL ;addr_t offset; +if (addr < (addr_t) &dummy->regs.acrs) { +struct pt_regs *regs =task_pt_regs (child);/* * psw and gprs are stored on the stack */
@@ -353,7 +374,11 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data)/* Invalid addressing mode bits */ return -EINVAL ; } - *(addr_t *)((addr_t ) &task_pt_regs (child)->psw + addr) = data; + +if (test_pt_regs_flag (regs,PIF_SYSCALL ) && + addr == offsetof(struct user, regs.gprs[2])) +fixup_int_code (child, data); + *(addr_t *)((addr_t ) ®s->psw + addr) = data; }else if (addr < (addr_t) (&dummy->regs.orig_gpr2)) {/*
@@ -719,6 +744,10 @@ static int __poke_user_compat(struct task_struct *child, regs->psw.mask = (regs->psw.mask & ~PSW_MASK_BA ) | (__u64)(tmp &PSW32_ADDR_AMODE ); }else { + +if (test_pt_regs_flag (regs,PIF_SYSCALL ) && + addr == offsetof(struct compat_user, regs.gprs[2])) +fixup_int_code (child, data);/* gpr 0-15 */ *(__u32 *)((addr_t ) ®s->psw + addr*2 +4 ) = tmp; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 130/178 s390/vdso: Use $(LD) instead of $(CC) to link vDSO
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 2b2a25845d534ac6d55086e35c033961fdd83a26 ]
Currently, the VDSO is being linked through $(CC). This does not match how the rest of the kernel links objects, which is through the $(LD) variable.
When clang is built in a default configuration, it first attempts to use the target triple's default linker, which is just ld. However, the user can override this through the CLANG_DEFAULT_LINKER cmake define so that clang uses another linker by default, such as LLVM's own linker, ld.lld. This can be useful to get more optimized links across various different projects.
However, this is problematic for the s390 vDSO because ld.lld does not have any s390 emulatiom support:
https://github.com/llvm/llvm-project/blob/llvmorg-10.0.1-rc1/lld/ELF/Driver.cpp#L132-L150
Thus, if a user is using a toolchain with ld.lld as the default, they will see an error, even if they have specified ld.bfd through the LD make variable:
$ make -j"$(nproc)" -s ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- LLVM=1 \
LD=s390x-linux-gnu-ld \
defconfig arch/s390/kernel/vdso64/
ld.lld: error: unknown emulation: elf64_s390
clang-11: error: linker command failed with exit code 1 (use -v to see invocation)Normally, '-fuse-ld=bfd' could be used to get around this; however, this can be fragile, depending on paths and variable naming. The cleaner solution for the kernel is to take advantage of the fact that $(LD) can be invoked directly, which bypasses the heuristics of $(CC) and respects the user's choice. Similar changes have been done for ARM, ARM64, and MIPS.
--- arch/s390/kernel/vdso64/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
arch/s390/kernel/vdso64/Makefile +4 -6
@@ -18,8 +18,8 @@ KBUILD_AFLAGS_64 += -m64 -s KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS)) KBUILD_CFLAGS_64 += -m64 -fPIC -shared -fno-common -fno-builtin -KBUILD_CFLAGS_64 += -nostdlib -Wl,-soname=linux-vdso64.so.1 \ - -Wl,--hash-style=both +ldflags-y := -fPIC -shared -nostdlib -soname=linux-vdso64.so.1 \ + --hash-style=both --build-id -T $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64) $(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_64)
@@ -37,8 +37,8 @@ KASAN_SANITIZE := n $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so # link rule for the .so file, .lds has to be first -$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) FORCE - $(call if_changed,vdso64ld) +$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) FORCE + $(call if_changed,ld) # strip rule for the .so file $(obj)/%.so: OBJCOPYFLAGS := -S
@@ -50,8 +50,6 @@ $(obj-vdso64): %.o: %.S FORCE $(call if_changed_dep,vdso64as) # actual build commands -quiet_cmd_vdso64ld = VDSO64L $@ - cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@ quiet_cmd_vdso64as = VDSO64A $@ cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 131/178 s390/vdso: fix vDSO clock_getres()
In reply to Sasha LevinFrom: Vincenzo Frascino <[email protected]>
[ Upstream commit 478237a595120a18e9b52fd2c57a6e8b7a01e411 ]
clock_getres in the vDSO library has to preserve the same behaviour of posix_get_hrtimer_res().
In particular, posix_get_hrtimer_res() does:
sec = 0;
ns = hrtimer_resolution;and hrtimer_resolution depends on the enablement of the high resolution timers that can happen either at compile or at run time.
Fix the s390 vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly.
--- arch/s390/include/asm/vdso.h | 1 + arch/s390/kernel/asm-offsets.c | 2 +- arch/s390/kernel/time.c | 1 + arch/s390/kernel/vdso64/clock_getres.S | 10 +++++----- 4 files changed, 8 insertions(+), 6 deletions(-)
arch/s390/include/asm/vdso.h +1 -0
@@ -36,6 +36,7 @@ struct vdso_data {__u32 tk_shift;/* Shift used for xtime_nsec 0x60 */ __u32 ts_dir;/* TOD steering direction 0x64 */ __u64 ts_end;/* TOD steering end 0x68 */ +__u32 hrtimer_res;/* hrtimer resolution 0x70 */ };struct vdso_per_cpu_data {
arch/s390/kernel/asm-offsets.c +1 -1
@@ -76,6 +76,7 @@ int main(void)OFFSET (__VDSO_TK_SHIFT, vdso_data, tk_shift);OFFSET (__VDSO_TS_DIR, vdso_data, ts_dir);OFFSET (__VDSO_TS_END, vdso_data, ts_end); +OFFSET (__VDSO_CLOCK_REALTIME_RES, vdso_data, hrtimer_res);OFFSET (__VDSO_ECTG_BASE, vdso_per_cpu_data, ectg_timer_base);OFFSET (__VDSO_ECTG_USER, vdso_per_cpu_data, ectg_user_time);OFFSET (__VDSO_CPU_NR, vdso_per_cpu_data, cpu_nr);
@@ -87,7 +88,6 @@ int main(void)DEFINE (__CLOCK_REALTIME_COARSE,CLOCK_REALTIME_COARSE );DEFINE (__CLOCK_MONOTONIC_COARSE,CLOCK_MONOTONIC_COARSE );DEFINE (__CLOCK_THREAD_CPUTIME_ID,CLOCK_THREAD_CPUTIME_ID ); -DEFINE (__CLOCK_REALTIME_RES,MONOTONIC_RES_NSEC );DEFINE (__CLOCK_COARSE_RES,LOW_RES_NSEC );BLANK ();/* idle data offsets */
arch/s390/kernel/time.c +1 -0
@@ -310,6 +310,7 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->tk_mult = tk->tkr_mono.mult; vdso_data->tk_shift = tk->tkr_mono.shift; + vdso_data->hrtimer_res = hrtimer_resolution;smp_wmb (); ++vdso_data->tb_update_count; }
arch/s390/kernel/vdso64/clock_getres.S +5 -5
@@ -17,12 +17,14 @@ .type __kernel_clock_getres,@function __kernel_clock_getres: CFI_STARTPROC - larl %r1,4f + larl %r1,3f + lg %r0,0(%r1) cghi %r2,__CLOCK_REALTIME_COARSE je 0f cghi %r2,__CLOCK_MONOTONIC_COARSE je 0f - larl %r1,3f + larl %r1,_vdso_data + llgf %r0,__VDSO_CLOCK_REALTIME_RES(%r1) cghi %r2,__CLOCK_REALTIME je 0f cghi %r2,__CLOCK_MONOTONIC
@@ -36,7 +38,6 @@ __kernel_clock_getres: jz 2f 0: ltgr %r3,%r3 jz 1f /* res == NULL */ - lg %r0,0(%r1) xc 0(8,%r3),0(%r3) /* set tp->tv_sec to zero */ stg %r0,8(%r3) /* store tp->tv_usec */ 1: lghi %r2,0
@@ -45,6 +46,5 @@ __kernel_clock_getres: svc 0 br %r14 CFI_ENDPROC -3: .quad __CLOCK_REALTIME_RES -4: .quad __CLOCK_COARSE_RES +3: .quad __CLOCK_COARSE_RES .size __kernel_clock_getres,.-__kernel_clock_getres
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 132/178 arm64: sve: Fix build failure when ARM64_SVE=y and SYSCTL=n
In reply to Sasha LevinFrom: Will Deacon <[email protected]>
[ Upstream commit e575fb9e76c8e33440fb859572a8b7d430f053d6 ]
When I squashed the 'allnoconfig' compiler warning about the set_sve_default_vl() function being defined but not used in commit 1e570f512cbd ("arm64/sve: Eliminate data races on sve_default_vl"), I accidentally broke the build for configs where ARM64_SVE is enabled, but SYSCTL is not.
Fix this by only compiling the SVE sysctl support if both CONFIG_SVE=y and CONFIG_SYSCTL=y.
--- arch/arm64/kernel/fpsimd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/kernel/fpsimd.c +3 -3
@@ -349,7 +349,7 @@ static unsigned int find_supported_vector_length(unsigned int vl)return sve_vl_from_vq (__bit_to_vq (bit)); } -#ifdef CONFIG_SYSCTL +#if defined(CONFIG_ARM64_SVE ) && defined(CONFIG_SYSCTL ) static int sve_proc_do_default_vl(struct ctl_table *table, int write, void __user *buffer, size_t *lenp,
@@ -395,9 +395,9 @@ static int __init sve_sysctl_init(void) return 0; } -#else /* ! CONFIG_SYSCTL */ +#else /* ! (CONFIG_ARM64_SVE && CONFIG_SYSCTL) */ static int __init sve_sysctl_init (void ) {return 0 ; } -#endif /* ! CONFIG_SYSCTL */ +#endif /* ! (CONFIG_ARM64_SVE && CONFIG_SYSCTL) */ #define ZREG (sve_state, vq, n) ((char *)(sve_state) + \ (SVE_SIG_ZREG_OFFSET(vq, n) - SVE_SIG_REGS_OFFSET))
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 133/178 kbuild: improve cc-option to clean up all temporary files
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit f2f02ebd8f3833626642688b2d2c6a7b3c141fa9 ]
When cc-option and friends evaluate compiler flags, the temporary file $$TMP is created as an output object, and automatically cleaned up. The actual file path of $$TMP is .<pid>.tmp, here <pid> is the process ID of $(shell ...) invoked from cc-option. (Please note $$$$ is the escape sequence of $$).
Such garbage files are cleaned up in most cases, but some compiler flags create additional output files.
For example, -gsplit-dwarf creates a .dwo file.
When CONFIG_DEBUG_INFO_SPLIT=y, you will see a bunch of .<pid>.dwo files left in the top of build directories. You may not notice them unless you do 'ls -a', but the garbage files will increase every time you run 'make'.
This commit changes the temporary object path to .tmp_<pid>/tmp, and removes .tmp_<pid> directory when exiting. Separate build artifacts such as *.dwo will be cleaned up all together because their file paths are usually determined based on the base name of the object.
Another example is -ftest-coverage, which outputs the coverage data into <base-name-of-object>.gcno
--- scripts/Kbuild.include | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
scripts/Kbuild.include +6 -5
@@ -82,20 +82,21 @@ cc-cross-prefix = $(firstword $(foreach c, $(1), \ $(if $(shell command -v -- $(c)gcc 2>/dev/null), $(c)))) # output directory for tests below -TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/) +TMPOUT = $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_$$$$ # try-run # Usage: option = $(call try-run, $(CC)...-o "$$TMP",option-ok,otherwise) # Exit code chooses option. "$$TMP" serves as a temporary file and is # automatically cleaned up. try-run = $(shell set -e; \ - TMP="$(TMPOUT).$$$$.tmp"; \ - TMPO="$(TMPOUT).$$$$.o"; \ + TMP=$(TMPOUT)/tmp; \ + TMPO=$(TMPOUT)/tmp.o; \ + mkdir -p $(TMPOUT); \ + trap "rm -rf $(TMPOUT)" EXIT; \ if ($(1)) >/dev/null 2>&1; \ then echo "$(2)"; \ else echo "$(3)"; \ - fi; \ - rm -f "$$TMP" "$$TMPO") + fi) # as-option # Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 134/178 recordmcount: support >64k sections
In reply to Sasha LevinFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 4ef57b21d6fb49d2b25c47e4cff467a0c2c8b6b7 ]
When compiling a kernel with Clang and LTO, we need to run recordmcount on vmlinux.o with a large number of sections, which currently fails as the program doesn't understand extended section indexes. This change adds support for processing binaries with >64k sections.
--- scripts/recordmcount.h | 98 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 92 insertions(+), 6 deletions(-)
scripts/recordmcount.h +92 -6
@@ -29,6 +29,11 @@#undef has_rel_mcount#undef tot_relsize#undef get_mcountsym +#undef find_symtab +#undef get_shnum +#undef set_shnum +#undef get_shstrndx +#undef get_symindex#undef get_sym_str_and_relp#undef do_func#undef Elf_Addr
@@ -58,6 +63,11 @@# define __has_rel_mcount __has64_rel_mcount# define has_rel_mcount has64_rel_mcount# define tot_relsize tot64_relsize +# define find_symtab find_symtab64 +# define get_shnum get_shnum64 +# define set_shnum set_shnum64 +# define get_shstrndx get_shstrndx64 +# define get_symindex get_symindex64# define get_sym_str_and_relp get_sym_str_and_relp_64# define do_func do64# define get_mcountsym get_mcountsym_64
@@ -91,6 +101,11 @@# define __has_rel_mcount __has32_rel_mcount# define has_rel_mcount has32_rel_mcount# define tot_relsize tot32_relsize +# define find_symtab find_symtab32 +# define get_shnum get_shnum32 +# define set_shnum set_shnum32 +# define get_shstrndx get_shstrndx32 +# define get_symindex get_symindex32# define get_sym_str_and_relp get_sym_str_and_relp_32# define do_func do32# define get_mcountsym get_mcountsym_32
@@ -173,6 +188,67 @@ static int MIPS_is_fake_mcount(Elf_Rel const *rp)return is_fake; } +static unsigned int get_symindex (Elf_Sym const *sym,Elf32_Word const *symtab, +Elf32_Word const *symtab_shndx) +{ +unsigned long offset; +int index; + +if (sym->st_shndx !=SHN_XINDEX ) +return w2 (sym->st_shndx); + + offset = (unsigned long )sym - (unsigned long )symtab; + index = offset /sizeof (*sym); + +return w (symtab_shndx[index]); +} + +static unsigned int get_shnum (Elf_Ehdr const *ehdr,Elf_Shdr const *shdr0) +{ +if (shdr0 && !ehdr->e_shnum) +return w (shdr0->sh_size); + +return w2 (ehdr->e_shnum); +} + +static void set_shnum (Elf_Ehdr *ehdr,Elf_Shdr *shdr0,unsigned int new_shnum) +{ +if (new_shnum >=SHN_LORESERVE ) { + ehdr->e_shnum =0 ; + shdr0->sh_size =w (new_shnum); + }else + ehdr->e_shnum =w2 (new_shnum); +} + +static int get_shstrndx (Elf_Ehdr const *ehdr,Elf_Shdr const *shdr0) +{ +if (ehdr->e_shstrndx !=SHN_XINDEX ) +return w2 (ehdr->e_shstrndx); + +return w (shdr0->sh_link); +} + +static void find_symtab (Elf_Ehdr *const ehdr,Elf_Shdr const *shdr0, +unsigned const nhdr,Elf32_Word **symtab, +Elf32_Word **symtab_shndx) +{ +Elf_Shdr const *relhdr; +unsigned k; + + *symtab =NULL ; + *symtab_shndx =NULL ; + +for (relhdr = shdr0, k = nhdr; k; --k, ++relhdr) { +if (relhdr->sh_type ==SHT_SYMTAB ) + *symtab = (void *)ehdr + relhdr->sh_offset; +else if (relhdr->sh_type ==SHT_SYMTAB_SHNDX ) + *symtab_shndx = (void *)ehdr + relhdr->sh_offset; + +if (*symtab && *symtab_shndx) +break ; + } +} +/* Append the new shstrtab, Elf_Shdr[], __mcount_loc and its relocations. */ static int append_func(Elf_Ehdr *const ehdr, Elf_Shdr *const shstr,
@@ -188,10 +264,12 @@ static int append_func(Elf_Ehdr *const ehdr,char const *mc_name = (sizeof (Elf_Rela) == rel_entsize) ?".rela__mcount_loc" :".rel__mcount_loc" ; -unsigned const old_shnum =w2 (ehdr->e_shnum);uint_t const old_shoff =_w (ehdr->e_shoff);uint_t const old_shstr_sh_size =_w (shstr->sh_size);uint_t const old_shstr_sh_offset =_w (shstr->sh_offset); +Elf_Shdr *const shdr0 = (Elf_Shdr *)(old_shoff + (void *)ehdr); +unsigned int const old_shnum =get_shnum (ehdr, shdr0); +unsigned int const new_shnum =2 + old_shnum;/* {.rel,}__mcount_loc */ uint_t t =1 +strlen (mc_name) +_w (shstr->sh_size);uint_t new_e_shoff;
@@ -201,6 +279,8 @@ static int append_func(Elf_Ehdr *const ehdr, t += (_align & -t);/* word-byte align */ new_e_shoff = t; +set_shnum (ehdr, shdr0, new_shnum); +/* body for new shstrtab */ if (ulseek (sb.st_size,SEEK_SET ) <0 )return -1 ;
@@ -255,7 +335,6 @@ static int append_func(Elf_Ehdr *const ehdr,return -1 ; ehdr->e_shoff =_w (new_e_shoff); - ehdr->e_shnum =w2 (2 +w2 (ehdr->e_shnum));/* {.rel,}__mcount_loc */ if (ulseek (0 ,SEEK_SET ) <0 )return -1 ;if (uwrite (ehdr,sizeof (*ehdr)) <0 )
@@ -434,6 +513,8 @@ static int find_secsym_ndx(unsigned const txtndx,uint_t *const recvalp, unsigned int *sym_index, Elf_Shdr const *const symhdr, + Elf32_Word const *symtab, + Elf32_Word const *symtab_shndx, Elf_Ehdr const *const ehdr) { Elf_Sym const *const sym0 = (Elf_Sym const *)(_w(symhdr->sh_offset)
@@ -445,7 +526,7 @@ static int find_secsym_ndx(unsigned const txtndx,for (symp = sym0, t = nsym; t; --t, ++symp) {unsigned int const st_bind =ELF_ST_BIND (symp->st_info); -if (txtndx ==w2 (symp->st_shndx) +if (txtndx ==get_symindex (symp, symtab, symtab_shndx)/* avoid STB_WEAK */ && (STB_LOCAL == st_bind ||STB_GLOBAL == st_bind)) {/* function symbols on ARM have quirks, avoid them */
@@ -516,21 +597,23 @@ static unsigned tot_relsize(Elf_Shdr const *const shdr0,return totrelsz; } -/* Overall supervision for Elf32 ET_REL file. */ static int do_func (Elf_Ehdr *const ehdr,char const *const fname,unsigned const reltype) {Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w (ehdr->e_shoff) + (void *)ehdr); -unsigned const nhdr =w2 (ehdr->e_shnum); -Elf_Shdr *const shstr = &shdr0[w2 (ehdr->e_shstrndx)]; +unsigned const nhdr =get_shnum (ehdr, shdr0); +Elf_Shdr *const shstr = &shdr0[get_shstrndx (ehdr, shdr0)];char const *const shstrtab = (char const *)(_w (shstr->sh_offset) + (void *)ehdr);Elf_Shdr const *relhdr;unsigned k; +Elf32_Word *symtab; +Elf32_Word *symtab_shndx; +/* Upper bound on space: assume all relevant relocs are for mcount. */ unsigned totrelsz;
@@ -561,6 +644,8 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const fname,return -1 ; } +find_symtab (ehdr, shdr0, nhdr, &symtab, &symtab_shndx); +for (relhdr = shdr0, k = nhdr; k; --k, ++relhdr) {char const *const txtname =has_rel_mcount (relhdr, shdr0, shstrtab, fname);
@@ -577,6 +662,7 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const fname, result =find_secsym_ndx (w (relhdr->sh_info), txtname, &recval, &recsym, &shdr0[symsec_sh_link], + symtab, symtab_shndx, ehdr);if (result) goto out;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 135/178 kprobes: Suppress the suspicious RCU warning on kprobes
In reply to Sasha LevinFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 6743ad432ec92e680cd0d9db86cb17b949cf5a43 ]
Anders reported that the lockdep warns that suspicious RCU list usage in register_kprobe() (detected by CONFIG_PROVE_RCU_LIST.) This is because get_kprobe() access kprobe_table[] by hlist_for_each_entry_rcu() without rcu_read_lock.
If we call get_kprobe() from the breakpoint handler context, it is run with preempt disabled, so this is not a problem. But in other cases, instead of rcu_read_lock(), we locks kprobe_mutex so that the kprobe_table[] is not updated. So, current code is safe, but still not good from the view point of RCU.
Joel suggested that we can silent that warning by passing lockdep_is_held() to the last argument of hlist_for_each_entry_rcu().
Add lockdep_is_held(&kprobe_mutex) at the end of the hlist_for_each_entry_rcu() to suppress the warning.
--- kernel/kprobes.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/kprobes.c +2 -1
@@ -326,7 +326,8 @@ struct kprobe *get_kprobe(void *addr)struct kprobe *p; head = &kprobe_table[hash_ptr (addr,KPROBE_HASH_BITS )]; -hlist_for_each_entry_rcu (p, head, hlist) { +hlist_for_each_entry_rcu (p, head, hlist, +lockdep_is_held (&kprobe_mutex)) {if (p->addr == addr)return p; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 136/178 blktrace: break out of blktrace setup on concurrent calls
In reply to Sasha LevinFrom: Luis Chamberlain <[email protected]>
[ Upstream commit 1b0b283648163dae2a214ca28ed5a99f62a77319 ]
We use one blktrace per request_queue, that means one per the entire disk. So we cannot run one blktrace on say /dev/vda and then /dev/vda1, or just two calls on /dev/vda.
We check for concurrent setup only at the very end of the blktrace setup though.
If we try to run two concurrent blktraces on the same block device the second one will fail, and the first one seems to go on. However when one tries to kill the first one one will see things like this:
The kernel will show these:
``` debugfs: File 'dropped' in directory 'nvme1n1' already present! debugfs: File 'msg' in directory 'nvme1n1' already present! debugfs: File 'trace0' in directory 'nvme1n1' already present! `` And userspace just sees this error message for the second call: ```
blktrace /dev/nvme1n1
BLKTRACESETUP(2) /dev/nvme1n1 failed: 5/Input/output error ```
The first userspace process #1 will also claim that the files were taken underneath their nose as well. The files are taken away form the first process given that when the second blktrace fails, it will follow up with a BLKTRACESTOP and BLKTRACETEARDOWN. This means that even if go-happy process #1 is waiting for blktrace data, we *have* been asked to take teardown the blktrace.
This can easily be reproduced with break-blktrace [0] run_0005.sh test.
Just break out early if we know we're already going to fail, this will prevent trying to create the files all over again, which we know still exist.
[0] https://github.com/mcgrof/break-blktrace
--- kernel/trace/blktrace.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
kernel/trace/blktrace.c +13 -0
@@ -3,6 +3,9 @@* Copyright (C) 2006 Jens Axboe <[email protected]> * */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/kernel.h> #include <linux/blkdev.h> #include <linux/blktrace_api.h>
@@ -495,6 +498,16 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,*/ strreplace (buts->name,'/' ,'_' ); +/* +* bdev can be NULL, as with scsi-generic, this is a helpful as +* we can be. +*/ +if (q->blk_trace) { +pr_warn ("Concurrent blktraces are not allowed on %s\n" , + buts->name); +return -EBUSY ; + } + bt =kzalloc (sizeof (*bt),GFP_KERNEL );if (!bt)return -ENOMEM ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 137/178 block: update hctx map when use multiple maps
In reply to Sasha LevinFrom: Weiping Zhang <[email protected]>
[ Upstream commit fe35ec58f0d339221643287bbb7cee15c93a5389 ]
There is an issue when tune the number for read and write queues, if the total queue count was not changed. The hctx->type cannot be updated, since __blk_mq_update_nr_hw_queues will return directly if the total queue count has not been changed.
Reproduce:
dmesg | grep "default/read/poll"
[ 2.607459] nvme nvme0: 48/0/0 default/read/poll queues
cat /sys/kernel/debug/block/nvme0n1/hctx*/type | sort | uniq -c
48 default
tune the write queues to 24:
echo 24 > /sys/module/nvme/parameters/write_queues echo 1 > /sys/block/nvme0n1/device/reset_controller
dmesg | grep "default/read/poll"
[ 433.547235] nvme nvme0: 24/24/0 default/read/poll queues
cat /sys/kernel/debug/block/nvme0n1/hctx*/type | sort | uniq -c
48 default
The driver's hardware queue mapping is not same as block layer.
--- block/blk-mq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
block/blk-mq.c +3 -1
@@ -3279,7 +3279,9 @@ static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set,if (set->nr_maps ==1 && nr_hw_queues > nr_cpu_ids) nr_hw_queues = nr_cpu_ids; -if (nr_hw_queues <1 || nr_hw_queues == set->nr_hw_queues) +if (nr_hw_queues <1 ) +return ; +if (set->nr_maps ==1 && nr_hw_queues == set->nr_hw_queues)return ;list_for_each_entry (q, &set->tag_list, tag_set_list)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 138/178 RISC-V: Don't allow write+exec only page mapping request in mmap
In reply to Sasha LevinFrom: Yash Shah <[email protected]>
[ Upstream commit e0d17c842c0f824fd4df9f4688709fc6907201e1 ]
As per the table 4.4 of version "20190608-Priv-MSU-Ratified" of the RISC-V instruction set manual[0], the PTE permission bit combination of "write+exec only" is reserved for future use. Hence, don't allow such mapping request in mmap call.
An issue is been reported by David Abdurachmanov, that while running stress-ng with "sysbadaddr" argument, RCU stalls are observed on RISC-V specific kernel.
This issue arises when the stress-sysbadaddr request for pages with "write+exec only" permission bits and then passes the address obtain from this mmap call to various system call. For the riscv kernel, the mmap call should fail for this particular combination of permission bits since it's not valid.
[0]: http://dabbelt.com/~palmer/keep/riscv-isa-manual/riscv-privileged-20190608-1.pdf
[Palmer: Refer to the latest ISA specification at the only link I could find, and update the terminology.]
--- arch/riscv/kernel/sys_riscv.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/riscv/kernel/sys_riscv.c +6 -0
@@ -8,6 +8,7 @@#include <linux/syscalls.h> #include <asm/unistd.h> #include <asm/cacheflush.h> +#include <asm-generic/mman-common.h> static long riscv_sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags,
@@ -16,6 +17,11 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len, {if (unlikely (offset & (~PAGE_MASK >> page_shift_offset)))return -EINVAL ; + +if ((prot &PROT_WRITE ) && (prot &PROT_EXEC )) +if (unlikely (!(prot &PROT_READ ))) +return -EINVAL ; +return ksys_mmap_pgoff (addr, len, prot, flags, fd, offset >> (PAGE_SHIFT - page_shift_offset)); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 139/178 ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table
In reply to Sasha LevinFrom: Aaron Plattner <[email protected]>
commit adb36a8203831e40494a92095dacd566b2ad4a69 upstream.
These IDs are for upcoming NVIDIA chips with audio functions that are largely similar to the existing ones.
--- sound/pci/hda/patch_hdmi.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/pci/hda/patch_hdmi.c +5 -0
@@ -4146,6 +4146,11 @@ HDA_CODEC_ENTRY(0x10de0095, "GPU 95 HDMI/DP", patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0097 ,"GPU 97 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0098 ,"GPU 98 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0099 ,"GPU 99 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de009a ,"GPU 9a HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de009d ,"GPU 9d HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de009e ,"GPU 9e HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de009f ,"GPU 9f HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00a0 ,"GPU a0 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de8001 ,"MCP73 HDMI" , patch_nvhdmi_2ch),HDA_CODEC_ENTRY (0x10de8067 ,"MCP67/68 HDMI" , patch_nvhdmi_2ch), HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP", patch_via_hdmi),
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 140/178 ALSA: hda/realtek - Add quirk for MSI GE63 laptop
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
commit a0b03952a797591d4b6d6fa7b9b7872e27783729 upstream.
MSI GE63 laptop with ALC1220 codec requires the very same quirk (ALC1220_FIXUP_CLEVO_P950) as other MSI devices for the proper sound output.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -2460,6 +2460,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {SND_PCI_QUIRK (0x1458 ,0xa0b8 ,"Gigabyte AZ370-Gaming" ,ALC1220_FIXUP_GB_DUAL_CODECS ),SND_PCI_QUIRK (0x1458 ,0xa0cd ,"Gigabyte X570 Aorus Master" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1458 ,0xa0ce ,"Gigabyte X570 Aorus Xtreme" ,ALC1220_FIXUP_CLEVO_P950 ), +SND_PCI_QUIRK (0x1462 ,0x11f7 ,"MSI-GE63" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1462 ,0x1228 ,"MSI-GP63" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1462 ,0x1275 ,"MSI-GL63" ,ALC1220_FIXUP_CLEVO_P950 ), SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950),
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 141/178 ALSA: hda/realtek: Add mute LED and micmute LED support for HP systems
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
commit b2c22910fe5aae10b7e17b0721e63a3edf0c9553 upstream.
There are two more HP systems control mute LED from HDA codec and need to expose micmute led class so SoF can control micmute LED.
Add quirks to support them.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -7436,6 +7436,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x83b9 ,"HP Spectre x360" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x8497 ,"HP Envy x360" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x84e7 ,"HP Pavilion 15" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ), +SND_PCI_QUIRK (0x103c ,0x869d ,"HP" ,ALC236_FIXUP_HP_MUTE_LED ), +SND_PCI_QUIRK (0x103c ,0x8729 ,"HP" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8736 ,"HP" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x877a ,"HP" ,ALC285_FIXUP_HP_MUTE_LED ), SND_PCI_QUIRK(0x103c, 0x877d, "HP", ALC236_FIXUP_HP_MUTE_LED),
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 142/178 ACPI: sysfs: Fix pm_profile_attr type
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
commit e6d701dca9893990d999fd145e3e07223c002b06 upstream.
When running a kernel with Clang's Control Flow Integrity implemented, there is a violation that happens when accessing /sys/firmware/acpi/pm_profile:
$ cat /sys/firmware/acpi/pm_profile 0
$ dmesg ... [ 17.352564] ------------[ cut here ]------------ [ 17.352568] CFI failure (target: acpi_show_profile+0x0/0x8): [ 17.352572] WARNING: CPU: 3 PID: 497 at kernel/cfi.c:29 __cfi_check_fail+0x33/0x40 [ 17.352573] Modules linked in: [ 17.352575] CPU: 3 PID: 497 Comm: cat Tainted: G W 5.7.0-microsoft-standard+ #1 [ 17.352576] RIP: 0010:__cfi_check_fail+0x33/0x40 [ 17.352577] Code: 48 c7 c7 50 b3 85 84 48 c7 c6 50 0a 4e 84 e8 a4 d8 60 00 85 c0 75 02 5b c3 48 c7 c7 dc 5e 49 84 48 89 de 31 c0 e8 7d 06 eb ff <0f> 0b 5b c3 00 00 cc cc 00 00 cc cc 00 85 f6 74 25 41 b9 ea ff ff [ 17.352577] RSP: 0018:ffffaa6dc3c53d30 EFLAGS: 00010246 [ 17.352578] RAX: 331267e0c06cee00 RBX: ffffffff83d85890 RCX: ffffffff8483a6f8 [ 17.352579] RDX: ffff9cceabbb37c0 RSI: 0000000000000082 RDI: ffffffff84bb9e1c [ 17.352579] RBP: ffffffff845b2bc8 R08: 0000000000000001 R09: ffff9cceabbba200 [ 17.352579] R10: 000000000000019d R11: 0000000000000000 R12: ffff9cc947766f00 [ 17.352580] R13: ffffffff83d6bd50 R14: ffff9ccc6fa80000 R15: ffffffff845bd328 [ 17.352582] FS: 00007fdbc8d13580(0000) GS:ffff9cce91ac0000(0000) knlGS:0000000000000000 [ 17.352582] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 17.352583] CR2: 00007fdbc858e000 CR3: 00000005174d0000 CR4: 0000000000340ea0 [ 17.352584] Call Trace: [ 17.352586] ? rev_id_show+0x8/0x8 [ 17.352587] ? __cfi_check+0x45bac/0x4b640 [ 17.352589] ? kobj_attr_show+0x73/0x80 [ 17.352590] ? sysfs_kf_seq_show+0xc1/0x140 [ 17.352592] ? ext4_seq_options_show.cfi_jt+0x8/0x8 [ 17.352593] ? seq_read+0x180/0x600 [ 17.352595] ? sysfs_create_file_ns.cfi_jt+0x10/0x10 [ 17.352596] ? tlbflush_read_file+0x8/0x8 [ 17.352597] ? __vfs_read+0x6b/0x220 [ 17.352598] ? handle_mm_fault+0xa23/0x11b0 [ 17.352599] ? vfs_read+0xa2/0x130 [ 17.352599] ? ksys_read+0x6a/0xd0 [ 17.352601] ? __do_sys_getpgrp+0x8/0x8 [ 17.352602] ? do_syscall_64+0x72/0x120 [ 17.352603] ? entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 17.352604] ---[ end trace 7b1fa81dc897e419 ]---
When /sys/firmware/acpi/pm_profile is read, sysfs_kf_seq_show is called, which in turn calls kobj_attr_show, which gets the ->show callback member by calling container_of on attr (casting it to struct kobj_attribute) then calls it.
There is a CFI violation because pm_profile_attr is of type struct device_attribute but kobj_attr_show calls ->show expecting it to be from struct kobj_attribute. CFI checking ensures that function pointer types match when doing indirect calls. Fix pm_profile_attr to be defined in terms of kobj_attribute so there is no violation or mismatch.
--- drivers/acpi/sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/sysfs.c +2 -2
@@ -938,13 +938,13 @@ static void __exit interrupt_stats_exit(void) }static ssize_t -acpi_show_profile (struct device *dev,struct device_attribute *attr, +acpi_show_profile (struct kobject *kobj,struct kobj_attribute *attr,char *buf) {return sprintf (buf,"%d\n" , acpi_gbl_FADT.preferred_profile); } -static const struct device_attribute pm_profile_attr = +static const struct kobj_attribute pm_profile_attr =__ATTR (pm_profile,S_IRUGO , acpi_show_profile,NULL ); static ssize_t hotplug_enabled_show(struct kobject *kobj,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 143/178 ACPI: configfs: Disallow loading ACPI tables when locked down
In reply to Sasha LevinFrom: "Jason A. Donenfeld" <[email protected]>
commit 75b0cea7bf307f362057cc778efe89af4c615354 upstream.
Like other vectors already patched, this one here allows the root user to load ACPI tables, which enables arbitrary physical address writes, which in turn makes it possible to disable lockdown.
Prevents this by checking the lockdown status before allowing a new ACPI table to be installed. The link in the trailer shows a PoC of how this might be used.
--- drivers/acpi/acpi_configfs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/acpi/acpi_configfs.c +5 -1
@@ -11,6 +11,7 @@#include <linux/module.h> #include <linux/configfs.h> #include <linux/acpi.h> +#include <linux/security.h> #include "acpica/accommon.h" #include "acpica/actables.h"
@@ -28,7 +29,10 @@ static ssize_t acpi_table_aml_write(struct config_item *cfg, {const struct acpi_table_header *header = data;struct acpi_table *table; -int ret; +int ret =security_locked_down (LOCKDOWN_ACPI_TABLES ); + +if (ret) +return ret; table = container_of(cfg, struct acpi_table, cfg);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 144/178 erofs: fix partially uninitialized misuse in z_erofs_onlinepage_fixup
In reply to Sasha LevinFrom: Gao Xiang <[email protected]>
commit 3c597282887fd55181578996dca52ce697d985a5 upstream.
Hongyu reported "id != index" in z_erofs_onlinepage_fixup() with specific aarch64 environment easily, which wasn't shown before.
After digging into that, I found that high 32 bits of page->private was set to 0xaaaaaaaa rather than 0 (due to z_erofs_onlinepage_init behavior with specific compiler options). Actually we only use low 32 bits to keep the page information since page->private is only 4 bytes on most 32-bit platforms. However z_erofs_onlinepage_fixup() uses the upper 32 bits by mistake.
Let's fix it now.
--- fs/erofs/zdata.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
fs/erofs/zdata.h +10 -10
@@ -148,22 +148,22 @@ static inline void z_erofs_onlinepage_init(struct page *page)static inline void z_erofs_onlinepage_fixup (struct page *page,uintptr_t index,bool down) { -unsigned long *p, o, v, id; -repeat: - p = &page_private (page); - o =READ_ONCE (*p); +union z_erofs_onlinepage_converter u = { .v = &page_private (page) }; +int orig, orig_index, val; - id = o >>Z_EROFS_ONLINEPAGE_INDEX_SHIFT ; -if (id) { +repeat: + orig =atomic_read (u.o); + orig_index = orig >>Z_EROFS_ONLINEPAGE_INDEX_SHIFT ; +if (orig_index) {if (!index)return ; -DBG_BUGON (id != index); +DBG_BUGON (orig_index != index); } - v = (index <<Z_EROFS_ONLINEPAGE_INDEX_SHIFT ) | - ((o &Z_EROFS_ONLINEPAGE_COUNT_MASK ) + (unsigned int )down); -if (cmpxchg (p, o, v) != o) + val = (index <<Z_EROFS_ONLINEPAGE_INDEX_SHIFT ) | + ((orig &Z_EROFS_ONLINEPAGE_COUNT_MASK ) + (unsigned int )down); +if (atomic_cmpxchg (u.o, orig, val) != orig) goto repeat; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 145/178 KVM: X86: Fix MSR range of APIC registers in X2APIC mode
In reply to Sasha LevinFrom: Xiaoyao Li <[email protected]>
commit bf10bd0be53282183f374af23577b18b5fbf7801 upstream.
Only MSR address range 0x800 through 0x8ff is architecturally reserved and dedicated for accessing APIC registers in x2APIC mode.
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
@@ -2753,7 +2753,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)return kvm_mtrr_set_msr (vcpu, msr, data);case MSR_IA32_APICBASE :return kvm_set_apic_base (vcpu, msr_info); - case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: + case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:return kvm_x2apic_msr_write (vcpu, msr, data);case MSR_IA32_TSCDEADLINE :kvm_set_lapic_tscdeadline_msr (vcpu, data);
@@ -3057,7 +3057,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)case MSR_IA32_APICBASE : msr_info->data =kvm_get_apic_base (vcpu);break ; - case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: + case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:return kvm_x2apic_msr_read (vcpu, msr_info->index, &msr_info->data);break ;case MSR_IA32_TSCDEADLINE :
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 146/178 KVM: nVMX: Plumb L2 GPA through to PML emulation
In reply to Sasha LevinFrom: Sean Christopherson <[email protected]>
commit 2dbebf7ae1ed9a420d954305e2c9d5ed39ec57c3 upstream.
Explicitly pass the L2 GPA to kvm_arch_write_log_dirty(), which for all intents and purposes is vmx_write_pml_buffer(), instead of having the latter pull the GPA from vmcs.GUEST_PHYSICAL_ADDRESS. If the dirty bit update is the result of KVM emulation (rare for L2), then the GPA in the VMCS may be stale and/or hold a completely unrelated GPA.
Message-Id: <[email protected]>
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/mmu.c | 4 ++-- arch/x86/kvm/mmu.h | 2 +- arch/x86/kvm/paging_tmpl.h | 7 ++++--- arch/x86/kvm/vmx/vmx.c | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1160,7 +1160,7 @@ struct kvm_x86_ops {void (*enable_log_dirty_pt_masked)(struct kvm *kvm,struct kvm_memory_slot *slot,gfn_t offset,unsigned long mask); -int (*write_log_dirty)(struct kvm_vcpu *vcpu); +int (*write_log_dirty)(struct kvm_vcpu *vcpu,gpa_t l2_gpa);/* pmu operations of sub-arch */ const struct kvm_pmu_ops *pmu_ops;
arch/x86/kvm/mmu.c +2 -2
@@ -1819,10 +1819,10 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm,* Emulate arch specific page modification logging for the * nested hypervisor */ -int kvm_arch_write_log_dirty (struct kvm_vcpu *vcpu) +int kvm_arch_write_log_dirty (struct kvm_vcpu *vcpu,gpa_t l2_gpa) {if (kvm_x86_ops->write_log_dirty) -return kvm_x86_ops->write_log_dirty (vcpu); +return kvm_x86_ops->write_log_dirty (vcpu, l2_gpa);return 0 ; }
arch/x86/kvm/mmu.h +1 -1
@@ -209,7 +209,7 @@ void kvm_mmu_gfn_disallow_lpage(struct kvm_memory_slot *slot, gfn_t gfn);void kvm_mmu_gfn_allow_lpage (struct kvm_memory_slot *slot,gfn_t gfn);bool kvm_mmu_slot_gfn_write_protect (struct kvm *kvm,struct kvm_memory_slot *slot,u64 gfn); -int kvm_arch_write_log_dirty (struct kvm_vcpu *vcpu); +int kvm_arch_write_log_dirty (struct kvm_vcpu *vcpu,gpa_t l2_gpa);int kvm_mmu_post_init_vm (struct kvm *kvm);void kvm_mmu_pre_destroy_vm (struct kvm *kvm);
arch/x86/kvm/paging_tmpl.h +4 -3
@@ -220,7 +220,7 @@ static inline unsigned FNAME(gpte_access)(u64 gpte)static int FNAME (update_accessed_dirty_bits )(struct kvm_vcpu *vcpu,struct kvm_mmu *mmu,struct guest_walker *walker, -int write_fault) +gpa_t addr,int write_fault) {unsigned level, index;pt_element_t pte, orig_pte;
@@ -245,7 +245,7 @@ static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, !(pte & PT_GUEST_DIRTY_MASK)) {trace_kvm_mmu_set_dirty_bit (table_gfn, index,sizeof (pte));#if PTTYPE ==PTTYPE_EPT -if (kvm_arch_write_log_dirty (vcpu)) +if (kvm_arch_write_log_dirty (vcpu, addr))return -EINVAL ;#endif pte |=PT_GUEST_DIRTY_MASK ;
@@ -442,7 +442,8 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, (PT_GUEST_DIRTY_SHIFT -PT_GUEST_ACCESSED_SHIFT );if (unlikely (!accessed_dirty)) { - ret =FNAME (update_accessed_dirty_bits)(vcpu, mmu, walker, write_fault); + ret =FNAME (update_accessed_dirty_bits)(vcpu, mmu, walker, + addr, write_fault);if (unlikely (ret <0 )) goto error;else if (ret)
arch/x86/kvm/vmx/vmx.c +3 -3
@@ -7272,11 +7272,11 @@ static void vmx_flush_log_dirty(struct kvm *kvm)kvm_flush_pml_buffers (kvm); } -static int vmx_write_pml_buffer (struct kvm_vcpu *vcpu) +static int vmx_write_pml_buffer (struct kvm_vcpu *vcpu,gpa_t gpa) {struct vmcs12 *vmcs12;struct vcpu_vmx *vmx =to_vmx (vcpu); -gpa_t gpa, dst; +gpa_t dst;if (is_guest_mode (vcpu)) {WARN_ON_ONCE (vmx->nested.pml_full);
@@ -7295,7 +7295,7 @@ static int vmx_write_pml_buffer(struct kvm_vcpu *vcpu)return 1 ; } - gpa =vmcs_read64 (GUEST_PHYSICAL_ADDRESS ) & ~0xFFFull ; + gpa &= ~0xFFFull ; dst = vmcs12->pml_address +sizeof (u64) * vmcs12->guest_pml_index; if (kvm_write_guest_page(vcpu->kvm, gpa_to_gfn(dst), &gpa,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 147/178 KVM: VMX: Stop context switching MSR_IA32_UMWAIT_CONTROL
In reply to Sasha LevinFrom: Sean Christopherson <[email protected]>
commit bf09fb6cba4f7099620cc9ed32d94c27c4af992e upstream.
Remove support for context switching between the guest's and host's desired UMWAIT_CONTROL. Propagating the guest's value to hardware isn't required for correct functionality, e.g. KVM intercepts reads and writes to the MSR, and the latency effects of the settings controlled by the MSR are not architecturally visible.
As a general rule, KVM should not allow the guest to control power management settings unless explicitly enabled by userspace, e.g. see KVM_CAP_X86_DISABLE_EXITS. E.g. Intel's SDM explicitly states that C0.2 can improve the performance of SMT siblings. A devious guest could disable C0.2 so as to improve the performance of their workloads at the detriment to workloads running in the host or on other VMs.
Wholesale removal of UMWAIT_CONTROL context switching also fixes a race condition where updates from the host may cause KVM to enter the guest with the incorrect value. Because updates are are propagated to all CPUs via IPI (SMP function callback), the value in hardware may be stale with respect to the cached value and KVM could enter the guest with the wrong value in hardware. As above, the guest can't observe the bad value, but it's a weird and confusing wart in the implementation.
Removal also fixes the unnecessary usage of VMX's atomic load/store MSR lists. Using the lists is only necessary for MSRs that are required for correct functionality immediately upon VM-Enter/VM-Exit, e.g. EFER on old hardware, or for MSRs that need to-the-uop precision, e.g. perf related MSRs. For UMWAIT_CONTROL, the effects are only visible in the kernel via TPAUSE/delay(), and KVM doesn't do any form of delay in vcpu_vmx_run(). Using the atomic lists is undesirable as they are more expensive than direct RDMSR/WRMSR.
Furthermore, even if giving the guest control of the MSR is legitimate, e.g. in pass-through scenarios, it's not clear that the benefits would outweigh the overhead. E.g. saving and restoring an MSR across a VMX roundtrip costs ~250 cycles, and if the guest diverged from the host that cost would be paid on every run of the guest. In other words, if there is a legitimate use case then it should be enabled by a new per-VM capability.
Note, KVM still needs to emulate MSR_IA32_UMWAIT_CONTROL so that it can correctly expose other WAITPKG features to the guest, e.g. TPAUSE, UMWAIT and UMONITOR.
Message-Id: <[email protected]>
--- arch/x86/kernel/cpu/umwait.c | 6 ------ arch/x86/kvm/vmx/vmx.c | 18 ------------------ arch/x86/kvm/vmx/vmx.h | 2 -- 3 files changed, 26 deletions(-)
arch/x86/kernel/cpu/umwait.c +0 -6
@@ -17,12 +17,6 @@*/ static u32 umwait_control_cached =UMWAIT_CTRL_VAL (100000 ,UMWAIT_C02_ENABLE ); -u32 get_umwait_control_msr (void ) -{ -return umwait_control_cached; -} -EXPORT_SYMBOL_GPL (get_umwait_control_msr); -/* * Cache the original IA32_UMWAIT_CONTROL MSR value which is configured by * hardware or BIOS before kernel boot.
arch/x86/kvm/vmx/vmx.c +0 -18
@@ -6427,23 +6427,6 @@ static void atomic_switch_perf_msrs(struct vcpu_vmx *vmx) msrs[i].host, false); } -static void atomic_switch_umwait_control_msr (struct vcpu_vmx *vmx) -{ -u32 host_umwait_control; - -if (!vmx_has_waitpkg (vmx)) -return ; - - host_umwait_control =get_umwait_control_msr (); - -if (vmx->msr_ia32_umwait_control != host_umwait_control) -add_atomic_switch_msr (vmx,MSR_IA32_UMWAIT_CONTROL , - vmx->msr_ia32_umwait_control, - host_umwait_control, false); -else -clear_atomic_switch_msr (vmx,MSR_IA32_UMWAIT_CONTROL ); -} -static void vmx_update_hv_timer (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);
@@ -6533,7 +6516,6 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)pt_guest_enter (vmx);atomic_switch_perf_msrs (vmx); -atomic_switch_umwait_control_msr (vmx);if (enable_preemption_timer)vmx_update_hv_timer (vcpu);
arch/x86/kvm/vmx/vmx.h +0 -2
@@ -14,8 +14,6 @@extern const u32 vmx_msr_index[];extern u64 host_efer; -extern u32 get_umwait_control_msr (void ); -#define MSR_TYPE_R 1#define MSR_TYPE_W 2#define MSR_TYPE_RW 3
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 148/178 x86/cpu: Use pinning mask for CR4 bits needing to be 0
In reply to Sasha LevinFrom: Kees Cook <[email protected]>
commit a13b9d0b97211579ea63b96c606de79b963c0f47 upstream.
The X86_CR4_FSGSBASE bit of CR4 should not change after boot[1]. Older kernels should enforce this bit to zero, and newer kernels need to enforce it depending on boot-time configuration (e.g. "nofsgsbase"). To support a pinned bit being either 1 or 0, use an explicit mask in combination with the expected pinned bit values.
[1] https://lore.kernel.org/lkml/[email protected]
--- arch/x86/kernel/cpu/common.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
arch/x86/kernel/cpu/common.c +12 -12
@@ -366,6 +366,9 @@ static __always_inline void setup_umip(struct cpuinfo_x86 *c)cr4_clear_bits (X86_CR4_UMIP ); } +/* These bits should not change their value after CPU init is finished. */ +static const unsigned long cr4_pinned_mask = +X86_CR4_SMEP |X86_CR4_SMAP |X86_CR4_UMIP |X86_CR4_FSGSBASE ;static DEFINE_STATIC_KEY_FALSE_RO (cr_pinning);static unsigned long cr4_pinned_bits__ro_after_init ;
@@ -390,20 +393,20 @@ EXPORT_SYMBOL(native_write_cr0);void native_write_cr4 (unsigned long val) { -unsigned long bits_missing =0 ; +unsigned long bits_changed =0 ; set_register: asmvolatile ("mov %0,%%cr4" :"+r" (val),"+m" (cr4_pinned_bits));if (static_branch_likely (&cr_pinning)) { -if (unlikely ((val & cr4_pinned_bits) != cr4_pinned_bits)) { - bits_missing = ~val & cr4_pinned_bits; - val |= bits_missing; +if (unlikely ((val & cr4_pinned_mask) != cr4_pinned_bits)) { + bits_changed = (val & cr4_pinned_mask) ^ cr4_pinned_bits; + val = (val & ~cr4_pinned_mask) | cr4_pinned_bits; goto set_register; } -/* Warn after we've set the missing bits. */ -WARN_ONCE (bits_missing,"CR4 bits went missing: %lx!?\n" , - bits_missing); +/* Warn after we've corrected the changed bits. */ +WARN_ONCE (bits_changed,"pinned CR4 bits changed: 0x%lx!?\n" , + bits_changed); } }EXPORT_SYMBOL (native_write_cr4);
@@ -415,7 +418,7 @@ void cr4_init(void)if (boot_cpu_has (X86_FEATURE_PCID )) cr4 |=X86_CR4_PCIDE ;if (static_branch_likely (&cr_pinning)) - cr4 |= cr4_pinned_bits; + cr4 = (cr4 & ~cr4_pinned_mask) | cr4_pinned_bits;__write_cr4 (cr4);
@@ -430,10 +433,7 @@ void cr4_init(void)*/ static void __init setup_cr_pinning (void ) { -unsigned long mask; - - mask = (X86_CR4_SMEP |X86_CR4_SMAP |X86_CR4_UMIP ); - cr4_pinned_bits =this_cpu_read (cpu_tlbstate.cr4) & mask; + cr4_pinned_bits =this_cpu_read (cpu_tlbstate.cr4) & cr4_pinned_mask;static_key_enable (&cr_pinning.key); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 149/178 x86/asm/64: Align start of __clear_user() loop to 16-bytes
In reply to Sasha LevinFrom: Matt Fleming <[email protected]>
commit bb5570ad3b54e7930997aec76ab68256d5236d94 upstream.
x86 CPUs can suffer severe performance drops if a tight loop, such as the ones in __clear_user(), straddles a 16-byte instruction fetch window, or worse, a 64-byte cacheline. This issues was discovered in the SUSE kernel with the following commit,
1153933703d9 ("x86/asm/64: Micro-optimize __clear_user() - Use immediate constants")
which increased the code object size from 10 bytes to 15 bytes and caused the 8-byte copy loop in __clear_user() to be split across a 64-byte cacheline.
Aligning the start of the loop to 16-bytes makes this fit neatly inside a single instruction fetch window again and restores the performance of __clear_user() which is used heavily when reading from /dev/zero.
Here are some numbers from running libmicro's read_z* and pread_z* microbenchmarks which read from /dev/zero:
Zen 1 (Naples)
libmicro-file
5.7.0-rc6 5.7.0-rc6 5.7.0-rc6
revert-1153933703d9+ align16+
Time mean95-pread_z100k 9.9195 ( 0.00%) 5.9856 ( 39.66%) 5.9938 ( 39.58%)
Time mean95-pread_z10k 1.1378 ( 0.00%) 0.7450 ( 34.52%) 0.7467 ( 34.38%)
Time mean95-pread_z1k 0.2623 ( 0.00%) 0.2251 ( 14.18%) 0.2252 ( 14.15%)
Time mean95-pread_zw100k 9.9974 ( 0.00%) 6.0648 ( 39.34%) 6.0756 ( 39.23%)
Time mean95-read_z100k 9.8940 ( 0.00%) 5.9885 ( 39.47%) 5.9994 ( 39.36%)
Time mean95-read_z10k 1.1394 ( 0.00%) 0.7483 ( 34.33%) 0.7482 ( 34.33%)Note that this doesn't affect Haswell or Broadwell microarchitectures which seem to avoid the alignment issue by executing the loop straight out of the Loop Stream Detector (verified using perf events).
--- arch/x86/lib/usercopy_64.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/lib/usercopy_64.c +1 -0
@@ -24,6 +24,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size) asmvolatile (" testq %[size8],%[size8]\n" " jz 4f\n" +" .align 16\n" "0: movq $0,(%[dst])\n" " addq $8,%[dst]\n" " decl %%ecx ; jnz 0b\n"
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 150/178 btrfs: fix bytes_may_use underflow when running balance and scrub in parallel
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
commit 6bd335b469f945f75474c11e3f577f85409f39c3 upstream.
When balance and scrub are running in parallel it is possible to end up with an underflow of the bytes_may_use counter of the data space_info object, which triggers a warning like the following:
[134243.793196] BTRFS info (device sdc): relocating block group 1104150528 flags data [134243.806891] ------------[ cut here ]------------ [134243.807561] WARNING: CPU: 1 PID: 26884 at fs/btrfs/space-info.h:125 btrfs_add_reserved_bytes+0x1da/0x280 [btrfs] [134243.808819] Modules linked in: btrfs blake2b_generic xor (...) [134243.815779] CPU: 1 PID: 26884 Comm: kworker/u8:8 Tainted: G W 5.6.0-rc7-btrfs-next-58 #5 [134243.816944] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 [134243.818389] Workqueue: writeback wb_workfn (flush-btrfs-108483) [134243.819186] RIP: 0010:btrfs_add_reserved_bytes+0x1da/0x280 [btrfs] [134243.819963] Code: 0b f2 85 (...) [134243.822271] RSP: 0018:ffffa4160aae7510 EFLAGS: 00010287 [134243.822929] RAX: 000000000000c000 RBX: ffff96159a8c1000 RCX: 0000000000000000 [134243.823816] RDX: 0000000000008000 RSI: 0000000000000000 RDI: ffff96158067a810 [134243.824742] RBP: ffff96158067a800 R08: 0000000000000001 R09: 0000000000000000 [134243.825636] R10: ffff961501432a40 R11: 0000000000000000 R12: 000000000000c000 [134243.826532] R13: 0000000000000001 R14: ffffffffffff4000 R15: ffff96158067a810 [134243.827432] FS: 0000000000000000(0000) GS:ffff9615baa00000(0000) knlGS:0000000000000000 [134243.828451] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [134243.829184] CR2: 000055bd7e414000 CR3: 00000001077be004 CR4: 00000000003606e0 [134243.830083] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [134243.830975] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [134243.831867] Call Trace: [134243.832211] find_free_extent+0x4a0/0x16c0 [btrfs] [134243.832846] btrfs_reserve_extent+0x91/0x180 [btrfs] [134243.833487] cow_file_range+0x12d/0x490 [btrfs] [134243.834080] fallback_to_cow+0x82/0x1b0 [btrfs] [134243.834689] ? release_extent_buffer+0x121/0x170 [btrfs] [134243.835370] run_delalloc_nocow+0x33f/0xa30 [btrfs] [134243.836032] btrfs_run_delalloc_range+0x1ea/0x6d0 [btrfs] [134243.836725] ? find_lock_delalloc_range+0x221/0x250 [btrfs] [134243.837450] writepage_delalloc+0xe8/0x150 [btrfs] [134243.838059] __extent_writepage+0xe8/0x4c0 [btrfs] [134243.838674] extent_write_cache_pages+0x237/0x530 [btrfs] [134243.839364] extent_writepages+0x44/0xa0 [btrfs] [134243.839946] do_writepages+0x23/0x80 [134243.840401] __writeback_single_inode+0x59/0x700 [134243.841006] writeback_sb_inodes+0x267/0x5f0 [134243.841548] __writeback_inodes_wb+0x87/0xe0 [134243.842091] wb_writeback+0x382/0x590 [134243.842574] ? wb_workfn+0x4a2/0x6c0 [134243.843030] wb_workfn+0x4a2/0x6c0 [134243.843468] process_one_work+0x26d/0x6a0 [134243.843978] worker_thread+0x4f/0x3e0 [134243.844452] ? process_one_work+0x6a0/0x6a0 [134243.844981] kthread+0x103/0x140 [134243.845400] ? kthread_create_worker_on_cpu+0x70/0x70 [134243.846030] ret_from_fork+0x3a/0x50 [134243.846494] irq event stamp: 0 [134243.846892] hardirqs last enabled at (0): [<0000000000000000>] 0x0 [134243.847682] hardirqs last disabled at (0): [<ffffffffb2abdedf>] copy_process+0x74f/0x2020 [134243.848687] softirqs last enabled at (0): [<ffffffffb2abdedf>] copy_process+0x74f/0x2020 [134243.849913] softirqs last disabled at (0): [<0000000000000000>] 0x0 [134243.850698] ---[ end trace bd7c03622e0b0a96 ]--- [134243.851335] ------------[ cut here ]------------
When relocating a data block group, for each extent allocated in the block group we preallocate another extent with the same size for the data relocation inode (we do it at prealloc_file_extent_cluster()). We reserve space by calling btrfs_check_data_free_space(), which ends up incrementing the data space_info's bytes_may_use counter, and then call btrfs_prealloc_file_range() to allocate the extent, which always decrements the bytes_may_use counter by the same amount.
The expectation is that writeback of the data relocation inode always follows a NOCOW path, by writing into the preallocated extents. However, when starting writeback we might end up falling back into the COW path, because the block group that contains the preallocated extent was turned into RO mode by a scrub running in parallel. The COW path then calls the extent allocator which ends up calling btrfs_add_reserved_bytes(), and this function decrements the bytes_may_use counter of the data space_info object by an amount corresponding to the size of the allocated extent, despite we haven't previously incremented it. When the counter currently has a value smaller then the allocated extent we reset the counter to 0 and emit a warning, otherwise we just decrement it and slowly mess up with this counter which is crucial for space reservation, the end result can be granting reserved space to tasks when there isn't really enough free space, and having the tasks fail later in critical places where error handling consists of a transaction abort or hitting a BUG_ON().
Fix this by making sure that if we fallback to the COW path for a data relocation inode, we increment the bytes_may_use counter of the data space_info object. The COW path will then decrement it at btrfs_add_reserved_bytes() on success or through its error handling part by a call to extent_clear_unlock_delalloc() (which ends up calling btrfs_clear_delalloc_extent() that does the decrement operation) in case of an error.
Test case btrfs/061 from fstests could sporadically trigger this.
--- fs/btrfs/inode.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
fs/btrfs/inode.c +12 -5
@@ -1328,6 +1328,8 @@ static int fallback_to_cow(struct inode *inode, struct page *locked_page, int *page_started, unsigned long *nr_written) { const bool is_space_ino = btrfs_is_free_space_inode(BTRFS_I(inode)); +const bool is_reloc_ino = (BTRFS_I (inode)->root->root_key.objectid == +BTRFS_DATA_RELOC_TREE_OBJECTID );const u64 range_bytes = end +1 - start;struct extent_io_tree *io_tree = &BTRFS_I (inode)->io_tree;u64 range_start = start;
@@ -1358,18 +1360,23 @@ static int fallback_to_cow(struct inode *inode, struct page *locked_page,* data space info, which we incremented in the step above. * * If we need to fallback to cow and the inode corresponds to a free -* space cache inode, we must also increment bytes_may_use of the data -* space_info for the same reason. Space caches always get a prealloc +* space cache inode or an inode of the data relocation tree, we must +* also increment bytes_may_use of the data space_info for the same +* reason. Space caches and relocated data extents always get a prealloc * extent for them, however scrub or balance may have set the block -* group that contains that extent to RO mode. +* group that contains that extent to RO mode and therefore force COW +* when starting writeback. */ count =count_range_bits (io_tree, &range_start, end, range_bytes,EXTENT_NORESERVE ,0 ); -if (count >0 || is_space_ino) { -const u64 bytes = is_space_ino ? range_bytes : count; +if (count >0 || is_space_ino || is_reloc_ino) { +u64 bytes = count;struct btrfs_fs_info *fs_info =BTRFS_I (inode)->root->fs_info;struct btrfs_space_info *sinfo = fs_info->data_sinfo; +if (is_space_ino || is_reloc_ino) + bytes = range_bytes; +spin_lock (&sinfo->lock);btrfs_space_info_update_bytes_may_use (fs_info, sinfo, bytes);spin_unlock (&sinfo->lock);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 151/178 btrfs: fix data block group relocation failure due to concurrent scrub
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
commit 432cd2a10f1c10cead91fe706ff5dc52f06d642a upstream.
When running relocation of a data block group while scrub is running in parallel, it is possible that the relocation will fail and abort the current transaction with an -EINVAL error:
[134243.988595] BTRFS info (device sdc): found 14 extents, stage: move data extents [134243.999871] ------------[ cut here ]------------ [134244.000741] BTRFS: Transaction aborted (error -22) [134244.001692] WARNING: CPU: 0 PID: 26954 at fs/btrfs/ctree.c:1071 __btrfs_cow_block+0x6a7/0x790 [btrfs] [134244.003380] Modules linked in: btrfs blake2b_generic xor raid6_pq (...) [134244.012577] CPU: 0 PID: 26954 Comm: btrfs Tainted: G W 5.6.0-rc7-btrfs-next-58 #5 [134244.014162] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 [134244.016184] RIP: 0010:__btrfs_cow_block+0x6a7/0x790 [btrfs] [134244.017151] Code: 48 c7 c7 (...) [134244.020549] RSP: 0018:ffffa41607863888 EFLAGS: 00010286 [134244.021515] RAX: 0000000000000000 RBX: ffff9614bdfe09c8 RCX: 0000000000000000 [134244.022822] RDX: 0000000000000001 RSI: ffffffffb3d63980 RDI: 0000000000000001 [134244.024124] RBP: ffff961589e8c000 R08: 0000000000000000 R09: 0000000000000001 [134244.025424] R10: ffffffffc0ae5955 R11: 0000000000000000 R12: ffff9614bd530d08 [134244.026725] R13: ffff9614ced41b88 R14: ffff9614bdfe2a48 R15: 0000000000000000 [134244.028024] FS: 00007f29b63c08c0(0000) GS:ffff9615ba600000(0000) knlGS:0000000000000000 [134244.029491] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [134244.030560] CR2: 00007f4eb339b000 CR3: 0000000130d6e006 CR4: 00000000003606f0 [134244.031997] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [134244.033153] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [134244.034484] Call Trace: [134244.034984] btrfs_cow_block+0x12b/0x2b0 [btrfs] [134244.035859] do_relocation+0x30b/0x790 [btrfs] [134244.036681] ? do_raw_spin_unlock+0x49/0xc0 [134244.037460] ? _raw_spin_unlock+0x29/0x40 [134244.038235] relocate_tree_blocks+0x37b/0x730 [btrfs] [134244.039245] relocate_block_group+0x388/0x770 [btrfs] [134244.040228] btrfs_relocate_block_group+0x161/0x2e0 [btrfs] [134244.041323] btrfs_relocate_chunk+0x36/0x110 [btrfs] [134244.041345] btrfs_balance+0xc06/0x1860 [btrfs] [134244.043382] ? btrfs_ioctl_balance+0x27c/0x310 [btrfs] [134244.045586] btrfs_ioctl_balance+0x1ed/0x310 [btrfs] [134244.045611] btrfs_ioctl+0x1880/0x3760 [btrfs] [134244.049043] ? do_raw_spin_unlock+0x49/0xc0 [134244.049838] ? _raw_spin_unlock+0x29/0x40 [134244.050587] ? __handle_mm_fault+0x11b3/0x14b0 [134244.051417] ? ksys_ioctl+0x92/0xb0 [134244.052070] ksys_ioctl+0x92/0xb0 [134244.052701] ? trace_hardirqs_off_thunk+0x1a/0x1c [134244.053511] __x64_sys_ioctl+0x16/0x20 [134244.054206] do_syscall_64+0x5c/0x280 [134244.054891] entry_SYSCALL_64_after_hwframe+0x49/0xbe [134244.055819] RIP: 0033:0x7f29b51c9dd7 [134244.056491] Code: 00 00 00 (...) [134244.059767] RSP: 002b:00007ffcccc1dd08 EFLAGS: 00000202 ORIG_RAX: 0000000000000010 [134244.061168] RAX: ffffffffffffffda RBX: 0000000000000001 RCX: 00007f29b51c9dd7 [134244.062474] RDX: 00007ffcccc1dda0 RSI: 00000000c4009420 RDI: 0000000000000003 [134244.063771] RBP: 0000000000000003 R08: 00005565cea4b000 R09: 0000000000000000 [134244.065032] R10: 0000000000000541 R11: 0000000000000202 R12: 00007ffcccc2060a [134244.066327] R13: 00007ffcccc1dda0 R14: 0000000000000002 R15: 00007ffcccc1dec0 [134244.067626] irq event stamp: 0 [134244.068202] hardirqs last enabled at (0): [<0000000000000000>] 0x0 [134244.069351] hardirqs last disabled at (0): [<ffffffffb2abdedf>] copy_process+0x74f/0x2020 [134244.070909] softirqs last enabled at (0): [<ffffffffb2abdedf>] copy_process+0x74f/0x2020 [134244.072392] softirqs last disabled at (0): [<0000000000000000>] 0x0 [134244.073432] ---[ end trace bd7c03622e0b0a99 ]---
The -EINVAL error comes from the following chain of function calls:
__btrfs_cow_block() <-- aborts the transaction
btrfs_reloc_cow_block()
replace_file_extents()
get_new_location() <-- returns -EINVAL
When relocating a data block group, for each allocated extent of the block group, we preallocate another extent (at prealloc_file_extent_cluster()), associated with the data relocation inode, and then dirty all its pages. These preallocated extents have, and must have, the same size that extents from the data block group being relocated have.
Later before we start the relocation stage that updates pointers (bytenr field of file extent items) to point to the the new extents, we trigger writeback for the data relocation inode. The expectation is that writeback will write the pages to the previously preallocated extents, that it follows the NOCOW path. That is generally the case, however, if a scrub is running it may have turned the block group that contains those extents into RO mode, in which case writeback falls back to the COW path.
However in the COW path instead of allocating exactly one extent with the expected size, the allocator may end up allocating several smaller extents due to free space fragmentation - because we tell it at cow_file_range() that the minimum allocation size can match the filesystem's sector size. This later breaks the relocation's expectation that an extent associated to a file extent item in the data relocation inode has the same size as the respective extent pointed by a file extent item in another tree - in this case the extent to which the relocation inode poins to is smaller, causing relocation.c:get_new_location() to return -EINVAL.
For example, if we are relocating a data block group X that has a logical address of X and the block group has an extent allocated at the logical address X + 128KiB with a size of 64KiB:
1) At prealloc_file_extent_cluster() we allocate an extent for the data relocation inode with a size of 64KiB and associate it to the file offset 128KiB (X + 128KiB - X) of the data relocation inode. This preallocated extent was allocated at block group Z;
2) A scrub running in parallel turns block group Z into RO mode and starts scrubing its extents;
3) Relocation triggers writeback for the data relocation inode;
4) When running delalloc (btrfs_run_delalloc_range()), we try first the NOCOW path because the data relocation inode has BTRFS_INODE_PREALLOC set in its flags. However, because block group Z is in RO mode, the NOCOW path (run_delalloc_nocow()) falls back into the COW path, by calling cow_file_range();
5) At cow_file_range(), in the first iteration of the while loop we call btrfs_reserve_extent() to allocate a 64KiB extent and pass it a minimum allocation size of 4KiB (fs_info->sectorsize). Due to free space fragmentation, btrfs_reserve_extent() ends up allocating two extents of 32KiB each, each one on a different iteration of that while loop;
6) Writeback of the data relocation inode completes;
7) Relocation proceeds and ends up at relocation.c:replace_file_extents(), with a leaf which has a file extent item that points to the data extent from block group X, that has a logical address (bytenr) of X + 128KiB and a size of 64KiB. Then it calls get_new_location(), which does a lookup in the data relocation tree for a file extent item starting at offset 128KiB (X + 128KiB - X) and belonging to the data relocation inode. It finds a corresponding file extent item, however that item points to an extent that has a size of 32KiB, which doesn't match the expected size of 64KiB, resuling in -EINVAL being returned from this function and propagated up to __btrfs_cow_block(), which aborts the current transaction.
To fix this make sure that at cow_file_range() when we call the allocator we pass it a minimum allocation size corresponding the desired extent size if the inode belongs to the data relocation tree, otherwise pass it the filesystem's sector size as the minimum allocation size.
--- fs/btrfs/inode.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
fs/btrfs/inode.c +18 -1
@@ -975,6 +975,7 @@ static noinline int cow_file_range(struct inode *inode,u64 num_bytes;unsigned long ram_size;u64 cur_alloc_size =0 ; +u64 min_alloc_size;u64 blocksize = fs_info->sectorsize;struct btrfs_key ins;struct extent_map *em;
@@ -1025,10 +1026,26 @@ static noinline int cow_file_range(struct inode *inode,btrfs_drop_extent_cache (BTRFS_I (inode), start, start + num_bytes -1 ,0 ); +/* +* Relocation relies on the relocated extents to have exactly the same +* size as the original extents. Normally writeback for relocation data +* extents follows a NOCOW path because relocation preallocates the +* extents. However, due to an operation such as scrub turning a block +* group to RO mode, it may fallback to COW mode, so we must make sure +* an extent allocated during COW has exactly the requested size and can +* not be split into smaller extents, otherwise relocation breaks and +* fails during the stage where it updates the bytenr of file extent +* items. +*/ +if (root->root_key.objectid ==BTRFS_DATA_RELOC_TREE_OBJECTID ) + min_alloc_size = num_bytes; +else + min_alloc_size = fs_info->sectorsize; +while (num_bytes >0 ) { cur_alloc_size = num_bytes; ret =btrfs_reserve_extent (root, cur_alloc_size, cur_alloc_size, - fs_info->sectorsize,0 , alloc_hint, + min_alloc_size,0 , alloc_hint, &ins,1 ,1 );if (ret <0 ) goto out_unlock;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 152/178 btrfs: check if a log root exists before locking the log_mutex on unlink
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
commit e7a79811d0db136dc2d336b56d54cf1b774ce972 upstream.
This brings back an optimization that commit e678934cbe5f02 ("btrfs:
Remove unnecessary check from join_running_log_trans") removed, but in a different form. So it's almost equivalent to a revert.
That commit removed an optimization where we avoid locking a root's log_mutex when there is no log tree created in the current transaction. The affected code path is triggered through unlink operations.
That commit was based on the assumption that the optimization was not necessary because we used to have the following checks when the patch was authored:
int btrfs_del_dir_entries_in_log(...)
{
(...)
if (dir->logged_trans < trans->transid)
return 0; ret = join_running_log_trans(root);
(...)}
int btrfs_del_inode_ref_in_log(...)
{
(...)
if (inode->logged_trans < trans->transid)
return 0; ret = join_running_log_trans(root);
(...)}
However before that patch was merged, another patch was merged first which replaced those checks because they were buggy.
That other patch corresponds to commit 803f0f64d17769 ("Btrfs: fix fsync not persisting dentry deletions due to inode evictions"). The assumption that if the logged_trans field of an inode had a smaller value then the current transaction's generation (transid) meant that the inode was not logged in the current transaction was only correct if the inode was not evicted and reloaded in the current transaction. So the corresponding bug fix changed those checks and replaced them with the following helper function:
static bool inode_logged(struct btrfs_trans_handle *trans,
struct btrfs_inode *inode)
{
if (inode->logged_trans == trans->transid)
return true;
if (inode->last_trans == trans->transid &&
test_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &inode->runtime_flags) &&
!test_bit(BTRFS_FS_LOG_RECOVERING, &trans->fs_info->flags))
return true;
return false;}
So if we have a subvolume without a log tree in the current transaction (because we had no fsyncs), every time we unlink an inode we can end up trying to lock the log_mutex of the root through join_running_log_trans() twice, once for the inode being unlinked (by btrfs_del_inode_ref_in_log()) and once for the parent directory (with btrfs_del_dir_entries_in_log()).
This means if we have several unlink operations happening in parallel for inodes in the same subvolume, and the those inodes and/or their parent inode were changed in the current transaction, we end up having a lot of contention on the log_mutex.
The test robots from intel reported a -30.7% performance regression for a REAIM test after commit e678934cbe5f02 ("btrfs: Remove unnecessary check from join_running_log_trans").
So just bring back the optimization to join_running_log_trans() where we check first if a log root exists before trying to lock the log_mutex. This is done by checking for a bit that is set on the root when a log tree is created and removed when a log tree is freed (at transaction commit time).
Commit e678934cbe5f02 ("btrfs: Remove unnecessary check from join_running_log_trans") was merged in the 5.4 merge window while commit 803f0f64d17769 ("Btrfs: fix fsync not persisting dentry deletions due to inode evictions") was merged in the 5.3 merge window. But the first commit was actually authored before the second commit (May 23 2019 vs June 19 2019).
--- fs/btrfs/ctree.h | 2 ++ fs/btrfs/tree-log.c | 5 +++++ 2 files changed, 7 insertions(+)
fs/btrfs/ctree.h +2 -0
@@ -940,6 +940,8 @@ enum {BTRFS_ROOT_DEAD_RELOC_TREE ,/* Mark dead root stored on device whose cleanup needs to be resumed */ BTRFS_ROOT_DEAD_TREE , +/* The root has a log tree. Used only for subvolume roots. */ + BTRFS_ROOT_HAS_LOG_TREE, };/*
fs/btrfs/tree-log.c +5 -0
@@ -167,6 +167,7 @@ static int start_log_trans(struct btrfs_trans_handle *trans,if (ret) goto out; +set_bit (BTRFS_ROOT_HAS_LOG_TREE , &root->state);clear_bit (BTRFS_ROOT_MULTI_LOG_TASKS , &root->state); root->log_start_pid = current->pid; }
@@ -193,6 +194,9 @@ static int join_running_log_trans(struct btrfs_root *root) {int ret = -ENOENT ; +if (!test_bit (BTRFS_ROOT_HAS_LOG_TREE , &root->state)) +return ret; +mutex_lock (&root->log_mutex);if (root->log_root) { ret =0 ;
@@ -3327,6 +3331,7 @@ int btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root)if (root->log_root) {free_log_tree (trans, root->log_root); root->log_root =NULL ; +clear_bit (BTRFS_ROOT_HAS_LOG_TREE , &root->state); }return 0 ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 153/178 btrfs: fix failure of RWF_NOWAIT write into prealloc extent beyond eof
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
commit 4b1946284dd6641afdb9457101056d9e6ee6204c upstream.
If we attempt to write to prealloc extent located after eof using a RWF_NOWAIT write, we always fail with -EAGAIN.
We do actually check if we have an allocated extent for the write at the start of btrfs_file_write_iter() through a call to check_can_nocow(), but later when we go into the actual direct IO write path we simply return -EAGAIN if the write starts at or beyond EOF.
Trivial to reproduce:
$ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt
$ touch /mnt/foo $ chattr +C /mnt/foo
$ xfs_io -d -c "pwrite -S 0xab 0 64K" /mnt/foo wrote 65536/65536 bytes at offset 0 64 KiB, 16 ops; 0.0004 sec (135.575 MiB/sec and 34707.1584 ops/sec)
$ xfs_io -c "falloc -k 64K 1M" /mnt/foo
$ xfs_io -d -c "pwrite -N -V 1 -S 0xfe -b 64K 64K 64K" /mnt/foo pwrite: Resource temporarily unavailable
On xfs and ext4 the write succeeds, as expected.
Fix this by removing the wrong check at btrfs_direct_IO().
--- fs/btrfs/inode.c | 3 --- 1 file changed, 3 deletions(-)
fs/btrfs/inode.c +0 -3
@@ -8857,9 +8857,6 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) dio_data.overwrite =1 ;inode_unlock (inode); relock = true; - }else if (iocb->ki_flags &IOCB_NOWAIT ) { - ret = -EAGAIN ; - goto out; } ret =btrfs_delalloc_reserve_space (inode, &data_reserved, offset, count);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 154/178 mm/slab: use memzero_explicit() in kzfree()
In reply to Sasha LevinFrom: Waiman Long <[email protected]>
commit 8982ae527fbef170ef298650c15d55a9ccd33973 upstream.
The kzfree() function is normally used to clear some sensitive information, like encryption keys, in the buffer before freeing it back to the pool. Memset() is currently used for buffer clearing. However unlikely, there is still a non-zero probability that the compiler may choose to optimize away the memory clearing especially if LTO is being used in the future.
To make sure that this optimization will never happen, memzero_explicit(), which is introduced in v3.18, is now used in kzfree() to future-proof it.
--- mm/slab_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/slab_common.c +1 -1
@@ -1740,7 +1740,7 @@ void kzfree(const void *p)if (unlikely (ZERO_OR_NULL_PTR (mem)))return ; ks =ksize (mem); -memset (mem,0 , ks); +memzero_explicit (mem, ks);kfree (mem); }EXPORT_SYMBOL (kzfree);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 155/178 ocfs2: avoid inode removal while nfsd is accessing it
In reply to Sasha LevinFrom: Junxiao Bi <[email protected]>
commit 4cd9973f9ff69e37dd0ba2bd6e6423f8179c329a upstream.
Patch series "ocfs2: fix nfsd over ocfs2 issues", v2.
This is a series of patches to fix issues on nfsd over ocfs2. patch 1 is to avoid inode removed while nfsd access it patch 2 & 3 is to fix a panic issue.
This patch (of 4):
When nfsd is getting file dentry using handle or parent dentry of some dentry, one cluster lock is used to avoid inode removed from other node, but it still could be removed from local node, so use a rw lock to avoid this.
--- fs/ocfs2/dlmglue.c | 17 ++++++++++++++++- fs/ocfs2/ocfs2.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-)
fs/ocfs2/dlmglue.c +16 -1
@@ -689,6 +689,12 @@ static void ocfs2_nfs_sync_lock_res_init(struct ocfs2_lock_res *res, &ocfs2_nfs_sync_lops, osb); } +static void ocfs2_nfs_sync_lock_init (struct ocfs2_super *osb) +{ +ocfs2_nfs_sync_lock_res_init (&osb->osb_nfs_sync_lockres, osb); +init_rwsem (&osb->nfs_sync_rwlock); +} +void ocfs2_trim_fs_lock_res_init (struct ocfs2_super *osb) {struct ocfs2_lock_res *lockres = &osb->osb_trim_fs_lockres;
@@ -2855,6 +2861,11 @@ int ocfs2_nfs_sync_lock(struct ocfs2_super *osb, int ex)if (ocfs2_is_hard_readonly (osb))return -EROFS ; +if (ex) +down_write (&osb->nfs_sync_rwlock); +else +down_read (&osb->nfs_sync_rwlock); +if (ocfs2_mount_local (osb))return 0 ;
@@ -2873,6 +2884,10 @@ void ocfs2_nfs_sync_unlock(struct ocfs2_super *osb, int ex)if (!ocfs2_mount_local (osb))ocfs2_cluster_unlock (osb, lockres, ex ?LKM_EXMODE :LKM_PRMODE ); +if (ex) +up_write (&osb->nfs_sync_rwlock); +else +up_read (&osb->nfs_sync_rwlock); } int ocfs2_trim_fs_lock(struct ocfs2_super *osb,
@@ -3340,7 +3355,7 @@ int ocfs2_dlm_init(struct ocfs2_super *osb) local:ocfs2_super_lock_res_init (&osb->osb_super_lockres, osb);ocfs2_rename_lock_res_init (&osb->osb_rename_lockres, osb); -ocfs2_nfs_sync_lock_res_init (&osb->osb_nfs_sync_lockres, osb); +ocfs2_nfs_sync_lock_init (osb);ocfs2_orphan_scan_lock_res_init (&osb->osb_orphan_scan.os_lockres, osb); osb->cconn = conn;
fs/ocfs2/ocfs2.h +1 -0
@@ -394,6 +394,7 @@ struct ocfs2_superstruct ocfs2_lock_res osb_super_lockres;struct ocfs2_lock_res osb_rename_lockres;struct ocfs2_lock_res osb_nfs_sync_lockres; +struct rw_semaphore nfs_sync_rwlock;struct ocfs2_lock_res osb_trim_fs_lockres;struct mutex obs_trim_fs_mutex;struct ocfs2_dlm_debug *osb_dlm_debug;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 156/178 ocfs2: load global_inode_alloc
In reply to Sasha LevinFrom: Junxiao Bi <[email protected]>
commit 7569d3c754e452769a5747eeeba488179e38a5da upstream.
Set global_inode_alloc as OCFS2_FIRST_ONLINE_SYSTEM_INODE, that will make it load during mount. It can be used to test whether some global/system inodes are valid. One use case is that nfsd will test whether root inode is valid.
--- fs/ocfs2/ocfs2_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/ocfs2_fs.h +1 -1
@@ -326,8 +326,8 @@ struct ocfs2_system_inode_info {enum {BAD_BLOCK_SYSTEM_INODE =0 ,GLOBAL_INODE_ALLOC_SYSTEM_INODE , +#define OCFS2_FIRST_ONLINE_SYSTEM_INODE GLOBAL_INODE_ALLOC_SYSTEM_INODE SLOT_MAP_SYSTEM_INODE, -#define OCFS2_FIRST_ONLINE_SYSTEM_INODE SLOT_MAP_SYSTEM_INODEHEARTBEAT_SYSTEM_INODE ,GLOBAL_BITMAP_SYSTEM_INODE ,USER_QUOTA_SYSTEM_INODE ,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 157/178 ocfs2: fix value of OCFS2_INVALID_SLOT
In reply to Sasha LevinFrom: Junxiao Bi <[email protected]>
commit 9277f8334ffc719fe922d776444d6e4e884dbf30 upstream.
In the ocfs2 disk layout, slot number is 16 bits, but in ocfs2 implementation, slot number is 32 bits. Usually this will not cause any issue, because slot number is converted from u16 to u32, but OCFS2_INVALID_SLOT was defined as -1, when an invalid slot number from disk was obtained, its value was (u16)-1, and it was converted to u32. Then the following checking in get_local_system_inode will be always skipped:
static struct inode **get_local_system_inode(struct ocfs2_super *osb,
int type,
u32 slot)
{
BUG_ON(slot == OCFS2_INVALID_SLOT);
...}
--- fs/ocfs2/ocfs2_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/ocfs2_fs.h +1 -1
@@ -290,7 +290,7 @@#define OCFS2_MAX_SLOTS 255/* Slot map indicator for an empty slot */ -#define OCFS2_INVALID_SLOT -1 +#define OCFS2_INVALID_SLOT ((u16)-1)#define OCFS2_VOL_UUID_LEN 16#define OCFS2_MAX_VOL_LABEL_LEN 64
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 158/178 ocfs2: fix panic on nfs server over ocfs2
In reply to Sasha LevinFrom: Junxiao Bi <[email protected]>
commit e5a15e17a78d58f933d17cafedfcf7486a29f5b4 upstream.
The following kernel panic was captured when running nfs server over ocfs2, at that time ocfs2_test_inode_bit() was checking whether one inode locating at "blkno" 5 was valid, that is ocfs2 root inode, its "suballoc_slot" was OCFS2_INVALID_SLOT(65535) and it was allocted from //global_inode_alloc, but here it wrongly assumed that it was got from per slot inode alloctor which would cause array overflow and trigger kernel panic.
BUG: unable to handle kernel paging request at 0000000000001088
IP: [<ffffffff816f6898>] _raw_spin_lock+0x18/0xf0
PGD 1e06ba067 PUD 1e9e7d067 PMD 0
Oops: 0002 [#1] SMP
CPU: 6 PID: 24873 Comm: nfsd Not tainted 4.1.12-124.36.1.el6uek.x86_64 #2
Hardware name: Huawei CH121 V3/IT11SGCA1, BIOS 3.87 02/02/2018
RIP: _raw_spin_lock+0x18/0xf0
RSP: e02b:ffff88005ae97908 EFLAGS: 00010206
RAX: ffff88005ae98000 RBX: 0000000000001088 RCX: 0000000000000000
RDX: 0000000000020000 RSI: 0000000000000009 RDI: 0000000000001088
RBP: ffff88005ae97928 R08: 0000000000000000 R09: ffff880212878e00
R10: 0000000000007ff0 R11: 0000000000000000 R12: 0000000000001088
R13: ffff8800063c0aa8 R14: ffff8800650c27d0 R15: 000000000000ffff
FS: 0000000000000000(0000) GS:ffff880218180000(0000) knlGS:ffff880218180000
CS: e033 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000001088 CR3: 00000002033d0000 CR4: 0000000000042660
Call Trace:
igrab+0x1e/0x60
ocfs2_get_system_file_inode+0x63/0x3a0 [ocfs2]
ocfs2_test_inode_bit+0x328/0xa00 [ocfs2]
ocfs2_get_parent+0xba/0x3e0 [ocfs2]
reconnect_path+0xb5/0x300
exportfs_decode_fh+0xf6/0x2b0
fh_verify+0x350/0x660 [nfsd]
nfsd4_putfh+0x4d/0x60 [nfsd]
nfsd4_proc_compound+0x3d3/0x6f0 [nfsd]
nfsd_dispatch+0xe0/0x290 [nfsd]
svc_process_common+0x412/0x6a0 [sunrpc]
svc_process+0x123/0x210 [sunrpc]
nfsd+0xff/0x170 [nfsd]
kthread+0xcb/0xf0
ret_from_fork+0x61/0x90
Code: 83 c2 02 0f b7 f2 e8 18 dc 91 ff 66 90 eb bf 0f 1f 40 00 55 48 89 e5 41 56 41 55 41 54 53 0f 1f 44 00 00 48 89 fb ba 00 00 02 00 <f0> 0f c1 17 89 d0 45 31 e4 45 31 ed c1 e8 10 66 39 d0 41 89 c6
RIP _raw_spin_lock+0x18/0xf0
CR2: 0000000000001088
---[ end trace 7264463cd1aac8f9 ]---
Kernel panic - not syncing: Fatal exception--- fs/ocfs2/suballoc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
fs/ocfs2/suballoc.c +6 -3
@@ -2827,9 +2827,12 @@ int ocfs2_test_inode_bit(struct ocfs2_super *osb, u64 blkno, int *res) goto bail; } - inode_alloc_inode = -ocfs2_get_system_file_inode (osb,INODE_ALLOC_SYSTEM_INODE , - suballoc_slot); +if (suballoc_slot == (u16 )OCFS2_INVALID_SLOT ) + inode_alloc_inode =ocfs2_get_system_file_inode (osb, +GLOBAL_INODE_ALLOC_SYSTEM_INODE , suballoc_slot); +else + inode_alloc_inode =ocfs2_get_system_file_inode (osb, +INODE_ALLOC_SYSTEM_INODE , suballoc_slot);if (!inode_alloc_inode) {/* the error code could be inaccurate, but we are not able to * get the correct one. */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 159/178 mm/memcontrol.c: add missed css_put()
In reply to Sasha LevinFrom: Muchun Song <[email protected]>
commit 3a98990ae2150277ed34d3b248c60e68bf2244b2 upstream.
We should put the css reference when memory allocation failed.
--- mm/memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/memcontrol.c +3 -1
@@ -2895,8 +2895,10 @@ static void memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg,return ; cw =kmalloc (sizeof (*cw),GFP_NOWAIT | __GFP_NOWARN); -if (!cw) +if (!cw) { +css_put (&memcg->css);return ; + } cw->memcg = memcg; cw->cachep = cachep;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 160/178 arm64: perf: Report the PC value in REGS_ABI_32 mode
In reply to Sasha LevinFrom: Jiping Ma <[email protected]>
commit 8dfe804a4031ca6ba3a3efb2048534249b64f3a5 upstream.
A 32-bit perf querying the registers of a compat task using REGS_ABI_32 will receive zeroes from w15, when it expects to find the PC.
Return the PC value for register dwarf register 15 when returning register values for a compat task to perf.
--- arch/arm64/kernel/perf_regs.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
arch/arm64/kernel/perf_regs.c +22 -3
@@ -15,15 +15,34 @@ u64 perf_reg_value(struct pt_regs *regs, int idx)return 0 ;/* -* Compat (i.e. 32 bit) mode: -* - PC has been set in the pt_regs struct in kernel_entry, -* - Handle SP and LR here. +* Our handling of compat tasks (PERF_SAMPLE_REGS_ABI_32) is weird, but +* we're stuck with it for ABI compatability reasons. +* +* For a 32-bit consumer inspecting a 32-bit task, then it will look at +* the first 16 registers (see arch/arm/include/uapi/asm/perf_regs.h). +* These correspond directly to a prefix of the registers saved in our +* 'struct pt_regs', with the exception of the PC, so we copy that down +* (x15 corresponds to SP_hyp in the architecture). +* +* So far, so good. +* +* The oddity arises when a 64-bit consumer looks at a 32-bit task and +* asks for registers beyond PERF_REG_ARM_MAX. In this case, we return +* SP_usr, LR_usr and PC in the positions where the AArch64 SP, LR and +* PC registers would normally live. The initial idea was to allow a +* 64-bit unwinder to unwind a 32-bit task and, although it's not clear +* how well that works in practice, somebody might be relying on it. +* +* At the time we make a sample, we don't know whether the consumer is +* 32-bit or 64-bit, so we have to cater for both possibilities. */ if (compat_user_mode (regs)) {if ((u32 )idx ==PERF_REG_ARM64_SP )return regs->compat_sp;if ((u32 )idx ==PERF_REG_ARM64_LR )return regs->compat_lr; +if (idx ==15 ) +return regs->pc; }if ((u32 )idx ==PERF_REG_ARM64_SP )
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 161/178 arm64: dts: imx8mm-evk: correct ldo1/ldo2 voltage range
In reply to Sasha LevinFrom: Robin Gong <[email protected]>
commit 4fd6b5735c03c0955d93960d31f17d7144f5578f upstream.
Correct ldo1 voltage range from wrong high group(3.0V~3.3V) to low group (1.6V~1.9V) because the ldo1 should be 1.8V. Actually, two voltage groups have been supported at bd718x7-regulator driver, hence, just corrrect the voltage range to 1.6V~3.3V. For [email protected], correct voltage range too. Otherwise, ldo1 would be kept @3.0V and [email protected] which violate i.mx8mm datasheet as the below warning log in kernel:
[ 0.995524] LDO1: Bringing 1800000uV into 3000000-3000000uV [ 0.999196] LDO2: Bringing 800000uV into 900000-900000uV
--- arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm-evk.dts +2 -2
@@ -231,7 +231,7 @@ ldo1_reg: LDO1 { regulator-name = "LDO1"; - regulator-min-microvolt = <3000000>; + regulator-min-microvolt = <1600000>; regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on;
@@ -239,7 +239,7 @@ ldo2_reg: LDO2 { regulator-name = "LDO2"; - regulator-min-microvolt = <900000>; + regulator-min-microvolt = <800000>; regulator-max-microvolt = <900000>; regulator-boot-on; regulator-always-on;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 162/178 arm64: dts: imx8mn-ddr4-evk: correct ldo1/ldo2 voltage range
In reply to Sasha LevinFrom: Robin Gong <[email protected]>
commit cfb12c8952f617df58d73d24161e539a035d82b0 upstream.
Correct ldo1 voltage range from wrong high group(3.0V~3.3V) to low group (1.6V~1.9V) because the ldo1 should be 1.8V. Actually, two voltage groups have been supported at bd718x7-regulator driver, hence, just corrrect the voltage range to 1.6V~3.3V. For [email protected], correct voltage range too. Otherwise, ldo1 would be kept @3.0V and [email protected] which violate i.mx8mn datasheet as the below warning log in kernel:
[ 0.995524] LDO1: Bringing 1800000uV into 3000000-3000000uV [ 0.999196] LDO2: Bringing 800000uV into 900000-900000uV
--- arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts +2 -2
@@ -268,7 +268,7 @@ ldo1_reg: LDO1 { regulator-name = "LDO1"; - regulator-min-microvolt = <3000000>; + regulator-min-microvolt = <1600000>; regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on;
@@ -276,7 +276,7 @@ ldo2_reg: LDO2 { regulator-name = "LDO2"; - regulator-min-microvolt = <900000>; + regulator-min-microvolt = <800000>; regulator-max-microvolt = <900000>; regulator-boot-on; regulator-always-on;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 163/178 tracing: Fix event trigger to accept redundant spaces
In reply to Sasha LevinFrom: Masami Hiramatsu <[email protected]>
commit 6784beada631800f2c5afd567e5628c843362cee upstream.
Fix the event trigger to accept redundant spaces in the trigger input.
For example, these return -EINVAL
echo " traceon" > events/ftrace/print/trigger
echo "traceon if common_pid == 0" > events/ftrace/print/trigger echo "disable_event:kmem:kmalloc " > events/ftrace/print/trigger
But these are hard to find what is wrong.
To fix this issue, use skip_spaces() to remove spaces in front of actual tokens, and set NULL if there is no token.
--- kernel/trace/trace_events_trigger.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
kernel/trace/trace_events_trigger.c +19 -2
@@ -216,11 +216,17 @@ static int event_trigger_regex_open(struct inode *inode, struct file *file)static int trigger_process_regex (struct trace_event_file *file,char *buff) { -char *command, *next = buff; +char *command, *next;struct event_command *p;int ret = -EINVAL ; + next = buff =skip_spaces (buff); command =strsep (&next,": \t" ); +if (next) { + next =skip_spaces (next); +if (!*next) + next =NULL ; + } command = (command[0 ] !='!' ) ? command : command +1 ;mutex_lock (&trigger_cmd_mutex);
@@ -630,8 +636,14 @@ event_trigger_callback(struct event_command *cmd_ops,int ret;/* separate the trigger from the filter (t:n [if filter]) */ -if (param &&isdigit (param[0 ])) +if (param &&isdigit (param[0 ])) { trigger =strsep (¶m," \t" ); +if (param) { + param =skip_spaces (param); +if (!*param) + param =NULL ; + } + } trigger_ops = cmd_ops->get_trigger_ops (cmd, trigger);
@@ -1368,6 +1380,11 @@ int event_enable_trigger_func(struct event_command *cmd_ops, trigger =strsep (¶m," \t" );if (!trigger)return -EINVAL ; +if (param) { + param =skip_spaces (param); +if (!*param) + param =NULL ; + } system =strsep (&trigger,":" );if (!trigger)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 164/178 ring-buffer: Zero out time extend if it is nested and not absolute
In reply to Sasha LevinFrom: "Steven Rostedt (VMware)" <[email protected]>
commit 097350d1c6e1f5808cae142006f18a0bbc57018d upstream.
Currently the ring buffer makes events that happen in interrupts that preempt another event have a delta of zero. (Hopefully we can change this soon). But this is to deal with the races of updating a global counter with lockless and nesting functions updating deltas.
With the addition of absolute time stamps, the time extend didn't follow this rule. A time extend can happen if two events happen longer than 2^27 nanoseconds appart, as the delta time field in each event is only 27 bits. If that happens, then a time extend is injected with 2^59 bits of nanoseconds to use (18 years). But if the 2^27 nanoseconds happen between two events, and as it is writing the event, an interrupt triggers, it will see the 2^27 difference as well and inject a time extend of its own. But a recent change made the time extend logic not take into account the nesting, and this can cause two time extend deltas to happen moving the time stamp much further ahead than the current time. This gets all reset when the ring buffer moves to the next page, but that can cause time to appear to go backwards.
This was observed in a trace-cmd recording, and since the data is saved in a file, with trace-cmd report --debug, it was possible to see that this indeed did happen!
bash-52501 110d... 81778.908247: sched_switch: bash:52501 [120] S ==> swapper/110:0 [120] [12770284:0x2e8:64] <idle>-0 110d... 81778.908757: sched_switch: swapper/110:0 [120] R ==> bash:52501 [120] [509947:0x32c:64]
TIME EXTEND: delta:306454770 length:0
bash-52501 110.... 81779.215212: sched_swap_numa: src_pid=52501 src_tgid=52388 src_ngid=52501 src_cpu=110 src_nid=2 dst_pid=52509 dst_tgid=52388 dst_ngid=52501 dst_cpu=49 dst_nid=1 [0:0x378:48]
TIME EXTEND: delta:306458165 length:0
bash-52501 110dNh. 81779.521670: sched_wakeup: migration/110:565 [0] success=1 CPU:110 [0:0x3b4:40]
and at the next page, caused the time to go backwards:
bash-52504 110d... 81779.685411: sched_switch: bash:52504 [120] S ==> swapper/110:0 [120] [8347057:0xfb4:64]
CPU:110 [SUBBUFFER START] [81779379165886:0x1320000]
<idle>-0 110dN.. 81779.379166: sched_wakeup: bash:52504 [120] success=1 CPU:110 [0:0x10:40] <idle>-0 110d... 81779.379167: sched_switch: swapper/110:0 [120] R ==> bash:52504 [120] [1168:0x3c:64]
--- kernel/trace/ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ring_buffer.c +1 -1
@@ -2358,7 +2358,7 @@ rb_update_event(struct ring_buffer_per_cpu *cpu_buffer,if (unlikely (info->add_timestamp)) {bool abs =ring_buffer_time_stamp_abs (cpu_buffer->buffer); - event =rb_add_time_stamp (event, info->delta, abs); + event =rb_add_time_stamp (event, abs ? info->delta : delta, abs); length -=RB_LEN_TIME_EXTEND ; delta =0 ; }
Signature · 1 line
2.25.1