5.17.10-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 5.17.10-rc1 review
This is the start of the stable review cycle for the 5.17.10 release. There are 158 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, 25 May 2022 16:56:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.17.10-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.17.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.17.10-rc1
David Howells <[email protected]>
afs: Fix afs_getattr() to refetch file status if callback break occurred
Yang Yingliang <[email protected]>
i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe()
Jae Hyun Yoo <[email protected]>
dt-bindings: pinctrl: aspeed-g6: remove FWQSPID group
Marek Vasut <[email protected]>
Input: ili210x - fix reset timing
Shreyas K K <[email protected]>
arm64: Enable repeat tlbi workaround on KRYO4XX gold CPUs
Grant Grundler <[email protected]>
net: atlantic: verify hw_head_ lies within TX buffer ring
Grant Grundler <[email protected]>
net: atlantic: add check for MAX_SKB_FRAGS
Grant Grundler <[email protected]>
net: atlantic: reduce scope of is_rsc_complete
Grant Grundler <[email protected]>
net: atlantic: fix "frag[0] not initialized"
Yang Yingliang <[email protected]>
net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe()
Yang Yingliang <[email protected]>
ethernet: tulip: fix missing pci_disable_device() on error in tulip_init_one()
Johannes Berg <[email protected]>
nl80211: fix locking in nl80211_set_tx_bitrate_mask()
Lina Wang <[email protected]>
net: fix wrong network header length
Eric Yang <[email protected]>
drm/amd/display: undo clearing of z10 related function pointers
Maximilian Luz <[email protected]>
platform/surface: gpe: Add support for Surface Pro 8
Prarit Bhargava <[email protected]>
platform/x86/intel: Fix 'rmmod pmt_telemetry' panic
Mark Pearson <[email protected]>
platform/x86: thinkpad_acpi: Correct dual fan probe
Mario Limonciello <[email protected]>
platform/x86: thinkpad_acpi: Convert btusb DMI list to quirks
Daniel Vetter <[email protected]>
fbdev: Prevent possible use-after-free in fb_release()
Javier Martinez Canillas <[email protected]>
Revert "fbdev: Make fb_release() return -ENODEV if fbdev was unregistered"
Nicolas Dichtel <[email protected]>
selftests: add ping test with ping_group_range tuned
Kieran Frewen <[email protected]>
cfg80211: retrieve S1G operating channel number
Kieran Frewen <[email protected]>
nl80211: validate S1G channel width
Felix Fietkau <[email protected]>
mac80211: fix rx reordering with non explicit / psmp ack policy
Gleb Chesnokov <[email protected]>
scsi: qla2xxx: Fix missed DMA unmap for aborted commands
Brian Bunker <[email protected]>
scsi: scsi_dh_alua: Properly handle the ALUA transitioning state
Athira Rajeev <[email protected]>
perf test bpf: Skip test if clang is not present
Thomas Richter <[email protected]>
perf bench numa: Address compiler error on s390
Kan Liang <[email protected]>
perf regs x86: Fix arch__intr_reg_mask() for the hybrid platform
Athira Rajeev <[email protected]>
perf test: Fix "all PMU test" to skip hv_24x7/hv_gpci tests on powerpc
Uwe Kleine-König <[email protected]>
gpio: mvebu/pwm: Refuse requests with inverted polarity
Haibo Chen <[email protected]>
gpio: gpio-vf610: do not touch other bits when set the target bit
Ian Rogers <[email protected]>
perf stat: Fix and validate CPU map inputs in synthetic PERF_RECORD_STAT events
Arnaldo Carvalho de Melo <[email protected]>
perf build: Fix check for btf__load_from_kernel_by_id() in libbpf
Aaron Lewis <[email protected]>
kvm: x86/pmu: Fix the compare function used by the pmu event filter
Daejun Park <[email protected]>
scsi: ufs: core: Fix referencing invalid rsp field
Krzysztof Kozlowski <[email protected]>
riscv: dts: sifive: fu540-c000: align dma node name with dtschema
Andrew Lunn <[email protected]>
net: bridge: Clear offload_fwd_mark when passing frame up bridge interface.
Eli Cohen <[email protected]>
vdpa/mlx5: Use consistent RQT size
Ritaro Takenaka <[email protected]>
netfilter: flowtable: move dst_check to packet path
Pablo Neira Ayuso <[email protected]>
netfilter: flowtable: pass flowtable to nf_flow_table_iterate()
Pablo Neira Ayuso <[email protected]>
netfilter: flowtable: fix TCP flow teardown
Kevin Mitchell <[email protected]>
igb: skip phy status check where unavailable
Mat Martineau <[email protected]>
mptcp: Do TCP fallback on early DSS checksum failure
Paolo Abeni <[email protected]>
mptcp: strict local address ID selection
Paolo Abeni <[email protected]>
mptcp: fix checksum byte order
Ard Biesheuvel <[email protected]>
ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2
Ard Biesheuvel <[email protected]>
ARM: 9196/1: spectre-bhb: enable for Cortex-A15
Jiasheng Jiang <[email protected]>
net: af_key: add check for pfkey_broadcast in function pfkey_process
Shay Drory <[email protected]>
net/mlx5: Drain fw_reset when removing device
Gal Pressman <[email protected]>
net/mlx5e: Remove HW-GRO from reported features
Maxim Mikityanskiy <[email protected]>
net/mlx5e: Properly block HW GRO when XDP is enabled
Maxim Mikityanskiy <[email protected]>
net/mlx5e: Properly block LRO when XDP is enabled
Aya Levin <[email protected]>
net/mlx5e: Block rx-gro-hw feature in switchdev mode
Yevgeny Kliteynik <[email protected]>
net/mlx5: DR, Ignore modify TTL on RX if device doesn't support it
Shay Drory <[email protected]>
net/mlx5: Initialize flow steering during driver probe
Maor Dickman <[email protected]>
net/mlx5: DR, Fix missing flow_source when creating multi-destination FW table
Duoming Zhou <[email protected]>
NFC: nci: fix sleep in atomic context bugs caused by nci_skb_alloc
Christophe JAILLET <[email protected]>
net/qla3xxx: Fix a test in ql_reset_work()
Codrin Ciubotariu <[email protected]>
clk: at91: generated: consider range when calculating best rate
Michal Wilczynski <[email protected]>
ice: Fix interrupt moderation settings getting cleared
Paul Greenwalt <[email protected]>
ice: fix possible under reporting of ethtool Tx and Rx statistics
Arkadiusz Kubalewski <[email protected]>
ice: fix crash when writing timestamp on RX rings
Mark Rutland <[email protected]>
arm64: kexec: load from kimage prior to clobbering
Zixuan Fu <[email protected]>
net: vmxnet3: fix possible NULL pointer dereference in vmxnet3_rq_cleanup()
Zixuan Fu <[email protected]>
net: vmxnet3: fix possible use-after-free bugs in vmxnet3_rq_alloc_rx_buf()
Christophe JAILLET <[email protected]>
net: systemport: Fix an error handling path in bcm_sysport_probe()
Horatiu Vultur <[email protected]>
net: lan966x: Fix assignment of the MAC address
Pali Rohár <[email protected]>
Revert "PCI: aardvark: Rewrite IRQ code to chained IRQ handler"
Jonathan Lemon <[email protected]>
ptp: ocp: have adjtime handle negative delta_ns correctly
Felix Fietkau <[email protected]>
netfilter: nft_flow_offload: fix offload with pppoe + vlan
Felix Fietkau <[email protected]>
net: fix dev_fill_forward_path with pppoe + bridge
Felix Fietkau <[email protected]>
netfilter: nft_flow_offload: skip dst neigh lookup for ppp devices
Felix Fietkau <[email protected]>
netfilter: flowtable: fix excessive hw offload attempts after failure
Paolo Abeni <[email protected]>
net/sched: act_pedit: sanitize shift argument before usage
Eyal Birger <[email protected]>
xfrm: fix "disable_policy" flag use when arriving from different devices
Nicolas Dichtel <[email protected]>
xfrm: rework default policy structure
Umesh Nerlige Ramappa <[email protected]>
i915/guc/reset: Make __guc_reset_context aware of guilty engines
Harini Katakam <[email protected]>
net: macb: Increment rx bd head after allocating skb and buffer
Paolo Abeni <[email protected]>
mptcp: fix subflow accounting on close
Bart Van Assche <[email protected]>
block/mq-deadline: Set the fifo_time member also if inserting at head
Alex Elder <[email protected]>
net: ipa: record proper RX transaction count
Alex Elder <[email protected]>
net: ipa: certain dropped packets aren't accounted for
Randy Dunlap <[email protected]>
ALSA: hda - fix unused Realtek function when PM is not enabled
Mattijs Korpershoek <[email protected]>
pinctrl: mediatek: mt8365: fix IES control pins
Horatiu Vultur <[email protected]>
pinctrl: ocelot: Fix for lan966x alt mode
Howard Chiu <[email protected]>
ARM: dts: aspeed: Add video engine to g6
Jae Hyun Yoo <[email protected]>
ARM: dts: aspeed-g6: fix SPI1/SPI2 quad pin group
Jae Hyun Yoo <[email protected]>
pinctrl: pinctrl-aspeed-g6: remove FWQSPID group in pinctrl
Jae Hyun Yoo <[email protected]>
ARM: dts: aspeed-g6: remove FWQSPID group in pinctrl dtsi
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm8250: don't enable rx/tx macro by default
Charan Teja Kalla <[email protected]>
dma-buf: ensure unique directory name for dmabuf stats
Jérôme Pouiller <[email protected]>
dma-buf: fix use of DMA_BUF_SET_NAME_{A,B} in userspace
Hangyu Hua <[email protected]>
drm/dp/mst: fix a possible memory leak in fetch_monitor_name()
Anusha Srivatsa <[email protected]>
drm/i915/dmc: Add MMIO range restrictions
Mario Limonciello <[email protected]>
drm/amd: Don't reset dGPUs if the system is going to s2idle
Ilya Dryomov <[email protected]>
libceph: fix potential use-after-free on linger ping and resends
Ulf Hansson <[email protected]>
mmc: core: Fix busy polling for MMC_SEND_OP_COND again
Ondrej Mosnacek <[email protected]>
crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ
Catalin Marinas <[email protected]>
arm64: mte: Ensure the cleared tags are visible before setting the PTE
Prakruthi Deepak Heragu <[email protected]>
arm64: paravirt: Use RCU read locks to guard stolen_time
Sean Christopherson <[email protected]>
KVM: Free new dirty bitmap if creating a new memslot fails
Sean Christopherson <[email protected]>
KVM: x86/mmu: Update number of zapped pages even if page list is stable
Marc Zyngier <[email protected]>
KVM: arm64: vgic-v3: Consistently populate ID_AA64PFR0_EL1.GIC
Jarkko Nikula <[email protected]>
Revert "can: m_can: pci: use custom bit timings for Elkhart Lake"
Rafael J. Wysocki <[email protected]>
PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold
Al Viro <[email protected]>
Fix double fget() in vhost_net_set_backend()
Julian Orth <[email protected]>
audit,io_uring,io-wq: call __audit_uring_exit for dummy contexts
Ondrej Mosnacek <[email protected]>
selinux: fix bad cleanup on error in hashtab_duplicate()
Peter Zijlstra <[email protected]>
perf: Fix sys_perf_event_open() race against self
Werner Sembach <[email protected]>
ALSA: hda/realtek: Add quirk for TongFang devices with pop noise
Takashi Iwai <[email protected]>
ALSA: wavefront: Proper check of get_user() error
Takashi Iwai <[email protected]>
ALSA: usb-audio: Restore Rane SL-1 quirk
Ryusuke Konishi <[email protected]>
nilfs2: fix lockdep warnings during disk space reclamation
Ryusuke Konishi <[email protected]>
nilfs2: fix lockdep warnings in page operations for btree nodes
linyujun <[email protected]>
ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()
Tzung-Bi Shih <[email protected]>
platform/chrome: cros_ec_debugfs: detach log reader wq from devm
Jakob Koschel <[email protected]>
drbd: remove usage of list iterator variable after loop
Xiaoke Wang <[email protected]>
MIPS: lantiq: check the return value of kzalloc()
Guo Xuenan <[email protected]>
fs: fix an infinite loop in iomap_fiemap
Mario Limonciello <[email protected]>
rtc: mc146818-lib: Fix the AltCentury for AMD platforms
Anton Eidelman <[email protected]>
nvme-multipath: fix hang when disk goes live over reconnect
Sagi Grimberg <[email protected]>
nvmet: use a private workqueue instead of the system workqueue
Steve French <[email protected]>
smb3: cleanup and clarify status of tree connections
Michael S. Tsirkin <[email protected]>
tools/virtio: compile with -pthread
Zhu Lingshan <[email protected]>
vhost_vdpa: don't setup irq offloading when irq_num < 0
Niklas Schnelle <[email protected]>
s390/pci: improve zpci_dev reference counting
Heiko Carstens <[email protected]>
s390/traps: improve panic message for translation-specification exception
Kai-Heng Feng <[email protected]>
ALSA: hda/realtek: Enable headset mic on Lenovo P360
Peter Zijlstra <[email protected]>
crypto: x86/chacha20 - Avoid spurious jumps to other functions
Zheng Yongjun <[email protected]>
crypto: stm32 - fix reference leak in stm32_crc_remove
Andre Przywara <[email protected]>
rtc: sun6i: Fix time overflow handling
Andreas Gruenbacher <[email protected]>
gfs2: Disable page faults during lockless buffered reads
Monish Kumar R <[email protected]>
nvme-pci: add quirks for Samsung X5 SSDs
Zheng Yongjun <[email protected]>
Input: stmfts - fix reference leak in stmfts_input_open
Jeff LaBundy <[email protected]>
Input: add bounds checking to input_set_capability()
David Gow <[email protected]>
um: Cleanup syscall_handler_t definition/cast, fix warning
Masahiro Yamada <[email protected]>
kconfig: add fflush() before ferror() check
Hugo Villeneuve <[email protected]>
rtc: pcf2127: fix bug when reading alarm registers
Vincent Whitchurch <[email protected]>
rtc: fix use-after-free on device removal
Andreas Gruenbacher <[email protected]>
gfs2: Switch lock order of inode and iopen glock
Andreas Gruenbacher <[email protected]>
gfs2: cancel timed-out glock requests
Greg Thelen <[email protected]>
Revert "drm/i915/opregion: check port number bounds for SWSCI display power state"
Terry Bowman <[email protected]>
Watchdog: sp5100_tco: Enable Family 17h+ CPUs
Terry Bowman <[email protected]>
Watchdog: sp5100_tco: Add initialization using EFCH MMIO
Terry Bowman <[email protected]>
Watchdog: sp5100_tco: Refactor MMIO base address initialization
Terry Bowman <[email protected]>
Watchdog: sp5100_tco: Move timer initialization into function
Terry Bowman <[email protected]>
i2c: piix4: Enable EFCH MMIO for Family 17h+
Terry Bowman <[email protected]>
i2c: piix4: Add EFCH MMIO support for SMBus port select
Terry Bowman <[email protected]>
i2c: piix4: Add EFCH MMIO support to SMBus base address detect
Terry Bowman <[email protected]>
i2c: piix4: Add EFCH MMIO support to region request and release
Terry Bowman <[email protected]>
i2c: piix4: Move SMBus port selection into function
Terry Bowman <[email protected]>
i2c: piix4: Move SMBus controller base address detect into function
Terry Bowman <[email protected]>
i2c: piix4: Move port I/O region request/release code into functions
Terry Bowman <[email protected]>
i2c: piix4: Replace hardcoded memory map size with a #define
Terry Bowman <[email protected]>
kernel/resource: Introduce request_mem_region_muxed()
Willy Tarreau <[email protected]>
floppy: use a statically allocated error counter
Schspa Shi <[email protected]>
usb: gadget: fix race when gadget driver register via ioctl
-------------
Diffstat:
Documentation/arm64/silicon-errata.rst | 3 + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 2 +- Makefile | 4 +- arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 9 +- arch/arm/boot/dts/aspeed-g6.dtsi | 10 + arch/arm/kernel/entry-armv.S | 2 +- arch/arm/kernel/stacktrace.c | 10 +- arch/arm/mm/proc-v7-bugs.c | 1 + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 12 + arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 + arch/arm64/kernel/cpu_errata.c | 2 + arch/arm64/kernel/mte.c | 3 + arch/arm64/kernel/paravirt.c | 29 +- arch/arm64/kernel/relocate_kernel.S | 22 +- arch/arm64/kvm/sys_regs.c | 3 +- arch/mips/lantiq/falcon/sysctrl.c | 2 + arch/mips/lantiq/xway/gptu.c | 2 + arch/mips/lantiq/xway/sysctrl.c | 46 ++- arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 2 +- arch/s390/kernel/traps.c | 6 +- arch/s390/pci/pci.c | 1 + arch/s390/pci/pci_bus.h | 3 +- arch/s390/pci/pci_clp.c | 9 +- arch/s390/pci/pci_event.c | 7 +- arch/x86/crypto/chacha-avx512vl-x86_64.S | 4 +- arch/x86/kvm/mmu/mmu.c | 10 +- arch/x86/kvm/pmu.c | 7 +- arch/x86/um/shared/sysdep/syscalls_64.h | 5 +- block/mq-deadline.c | 1 + drivers/block/drbd/drbd_main.c | 7 +- drivers/block/floppy.c | 18 +- drivers/clk/at91/clk-generated.c | 4 + drivers/crypto/qcom-rng.c | 1 + drivers/crypto/stm32/stm32-crc32.c | 4 +- drivers/dma-buf/dma-buf.c | 8 + drivers/gpio/gpio-mvebu.c | 3 + drivers/gpio/gpio-vf610.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 14 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 5 - drivers/gpu/drm/drm_dp_mst_topology.c | 1 + drivers/gpu/drm/i915/display/intel_dmc.c | 44 +++ drivers/gpu/drm/i915/display/intel_opregion.c | 15 - drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 16 +- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc.h | 2 +- drivers/gpu/drm/i915/i915_reg.h | 16 + drivers/i2c/busses/i2c-mt7621.c | 10 +- drivers/i2c/busses/i2c-piix4.c | 213 ++++++++++--- drivers/input/input.c | 19 ++ drivers/input/touchscreen/ili210x.c | 4 +- drivers/input/touchscreen/stmfts.c | 8 +- drivers/mmc/core/mmc_ops.c | 2 +- drivers/net/can/m_can/m_can_pci.c | 48 +-- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 20 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 7 + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- drivers/net/ethernet/cadence/macb_main.c | 2 +- drivers/net/ethernet/dec/tulip/tulip_core.c | 5 +- drivers/net/ethernet/intel/ice/ice_lib.c | 16 +- drivers/net/ethernet/intel/ice/ice_main.c | 7 +- drivers/net/ethernet/intel/ice/ice_ptp.c | 19 +- drivers/net/ethernet/intel/ice/ice_txrx.h | 11 +- drivers/net/ethernet/intel/igb/igb_main.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 27 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 131 ++++---- drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 6 +- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 25 +- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 19 +- .../mellanox/mlx5/core/steering/dr_action.c | 71 +++-- .../ethernet/mellanox/mlx5/core/steering/dr_fw.c | 4 +- .../mellanox/mlx5/core/steering/dr_ste_v0.c | 4 +- .../mellanox/mlx5/core/steering/dr_types.h | 3 +- .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 4 +- .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 3 +- .../net/ethernet/microchip/lan966x/lan966x_main.c | 28 ++ drivers/net/ethernet/qlogic/qla3xxx.c | 3 +- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +- drivers/net/ipa/gsi.c | 6 +- drivers/net/ipa/ipa_endpoint.c | 13 +- drivers/net/ppp/pppoe.c | 1 + drivers/net/vmxnet3/vmxnet3_drv.c | 6 + drivers/nvme/host/core.c | 1 + drivers/nvme/host/multipath.c | 25 +- drivers/nvme/host/nvme.h | 4 + drivers/nvme/host/pci.c | 5 +- drivers/nvme/target/admin-cmd.c | 2 +- drivers/nvme/target/configfs.c | 2 +- drivers/nvme/target/core.c | 24 +- drivers/nvme/target/fc.c | 8 +- drivers/nvme/target/fcloop.c | 16 +- drivers/nvme/target/io-cmd-file.c | 6 +- drivers/nvme/target/loop.c | 4 +- drivers/nvme/target/nvmet.h | 1 + drivers/nvme/target/passthru.c | 2 +- drivers/nvme/target/rdma.c | 12 +- drivers/nvme/target/tcp.c | 10 +- drivers/pci/controller/pci-aardvark.c | 48 ++- drivers/pci/pci.c | 10 + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 14 +- drivers/pinctrl/mediatek/pinctrl-mt8365.c | 2 +- drivers/pinctrl/pinctrl-ocelot.c | 4 +- drivers/platform/chrome/cros_ec_debugfs.c | 12 +- drivers/platform/surface/surface_gpe.c | 8 + drivers/platform/x86/intel/pmt/telemetry.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 49 ++- drivers/ptp/ptp_ocp.c | 5 +- drivers/rtc/class.c | 9 + drivers/rtc/rtc-mc146818-lib.c | 16 +- drivers/rtc/rtc-pcf2127.c | 3 +- drivers/rtc/rtc-sun6i.c | 14 +- drivers/scsi/device_handler/scsi_dh_alua.c | 3 +- drivers/scsi/qla2xxx/qla_target.c | 3 + drivers/scsi/ufs/ufshpb.c | 19 +- drivers/usb/gadget/legacy/raw_gadget.c | 2 + drivers/vdpa/mlx5/net/mlx5_vnet.c | 61 ++-- drivers/vhost/net.c | 15 +- drivers/vhost/vdpa.c | 5 +- drivers/video/fbdev/core/fbmem.c | 5 +- drivers/video/fbdev/core/fbsysfs.c | 4 + drivers/watchdog/sp5100_tco.c | 334 ++++++++++++++------- drivers/watchdog/sp5100_tco.h | 7 + fs/afs/inode.c | 14 +- fs/cifs/cifs_debug.c | 2 +- fs/cifs/cifsfs.c | 4 +- fs/cifs/cifsglob.h | 18 +- fs/cifs/cifssmb.c | 11 +- fs/cifs/connect.c | 32 +- fs/cifs/misc.c | 2 +- fs/cifs/smb2pdu.c | 4 +- fs/gfs2/file.c | 4 +- fs/gfs2/glock.c | 10 + fs/gfs2/inode.c | 49 +-- fs/ioctl.c | 2 +- fs/nilfs2/btnode.c | 23 +- fs/nilfs2/btnode.h | 1 + fs/nilfs2/btree.c | 27 +- fs/nilfs2/dat.c | 4 +- fs/nilfs2/gcinode.c | 7 +- fs/nilfs2/inode.c | 159 +++++++++- fs/nilfs2/mdt.c | 43 ++- fs/nilfs2/mdt.h | 6 +- fs/nilfs2/nilfs.h | 16 +- fs/nilfs2/page.c | 7 +- fs/nilfs2/segment.c | 9 +- fs/nilfs2/super.c | 5 +- include/linux/audit.h | 2 +- include/linux/ceph/osd_client.h | 3 + include/linux/ioport.h | 2 + include/linux/mc146818rtc.h | 2 + include/linux/netdevice.h | 2 +- include/net/ip.h | 1 + include/net/netns/xfrm.h | 6 +- include/net/xfrm.h | 58 ++-- include/uapi/linux/dma-buf.h | 4 +- kernel/auditsc.c | 6 + kernel/events/core.c | 14 + net/bridge/br_input.c | 7 + net/ceph/osd_client.c | 302 ++++++++----------- net/core/dev.c | 2 +- net/core/skbuff.c | 4 +- net/ipv4/route.c | 23 +- net/key/af_key.c | 6 +- net/mac80211/rx.c | 3 +- net/mptcp/options.c | 36 ++- net/mptcp/pm.c | 5 +- net/mptcp/pm_netlink.c | 13 - net/mptcp/protocol.c | 3 + net/mptcp/protocol.h | 20 +- net/mptcp/subflow.c | 102 ++++++- net/netfilter/nf_flow_table_core.c | 80 ++--- net/netfilter/nf_flow_table_ip.c | 19 ++ net/netfilter/nft_flow_offload.c | 28 +- net/nfc/nci/data.c | 2 +- net/nfc/nci/hci.c | 4 +- net/sched/act_pedit.c | 4 + net/wireless/nl80211.c | 18 +- net/wireless/scan.c | 2 +- net/xfrm/xfrm_policy.c | 10 +- net/xfrm/xfrm_user.c | 43 ++- scripts/kconfig/confdata.c | 2 + security/selinux/ss/hashtab.c | 3 +- sound/isa/wavefront/wavefront_synth.c | 3 +- sound/pci/hda/patch_realtek.c | 17 +- sound/usb/quirks-table.h | 9 + tools/build/Makefile.feature | 1 + tools/build/feature/Makefile | 4 + .../test-libbpf-btf__load_from_kernel_by_id.c | 7 + tools/perf/Makefile.config | 7 + tools/perf/arch/x86/util/perf_regs.c | 12 + tools/perf/bench/numa.c | 2 +- tools/perf/tests/bpf.c | 10 +- tools/perf/tests/shell/stat_all_pmu.sh | 10 + tools/perf/util/bpf-event.c | 4 +- tools/perf/util/stat.c | 17 +- tools/testing/selftests/net/fcnal-test.sh | 12 + tools/virtio/Makefile | 3 +- virt/kvm/kvm_main.c | 2 +- 202 files changed, 2181 insertions(+), 1171 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/158 usb: gadget: fix race when gadget driver register via ioctl
From: Schspa Shi <[email protected]>
commit 5f0b5f4d50fa0faa8c76ef9d42a42e8d43f98b44 upstream.
The usb_gadget_register_driver can be called multi time by to threads via USB_RAW_IOCTL_RUN ioctl syscall, which will lead to multiple registrations.
Call trace:
driver_register+0x220/0x3a0 drivers/base/driver.c:171
usb_gadget_register_driver_owner+0xfb/0x1e0
drivers/usb/gadget/udc/core.c:1546
raw_ioctl_run drivers/usb/gadget/legacy/raw_gadget.c:513 [inline]
raw_ioctl+0x1883/0x2730 drivers/usb/gadget/legacy/raw_gadget.c:1220
ioctl USB_RAW_IOCTL_RUNThis routine allows two processes to register the same driver instance via ioctl syscall. which lead to a race condition.
Please refer to the following scenarios.
T1 T2
------------------------------------------------------------------usb_gadget_register_driver_owner
driver_register driver_register
driver_find driver_find
bus_add_driver bus_add_driver
priv alloced <context switch>
drv->p = priv;
<schedule out>
kobject_init_and_add // refcount = 1;
//couldn't find an available UDC or it's busy
<context switch>
priv alloced
drv->priv = priv;
kobject_init_and_add
---> refcount = 1 <------
// register success
<context switch>
===================== another ioctl/process ======================
driver_register
driver_find
k = kset_find_obj()
---> refcount = 2 <------
<context out>
driver_unregister
// drv->p become T2's priv
---> refcount = 1 <------
<context switch>
kobject_put(k)
---> refcount = 0 <------
return priv->driver;
--------UAF here----------There will be UAF in this scenario.
We can fix it by adding a new STATE_DEV_REGISTERING device state to avoid double register.
--- drivers/usb/gadget/legacy/raw_gadget.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/gadget/legacy/raw_gadget.c +2 -0
@@ -145,6 +145,7 @@ enum dev_state {STATE_DEV_INVALID =0 ,STATE_DEV_OPENED ,STATE_DEV_INITIALIZED , +STATE_DEV_REGISTERING ,STATE_DEV_RUNNING ,STATE_DEV_CLOSED ,STATE_DEV_FAILED
@@ -508,6 +509,7 @@ static int raw_ioctl_run(struct raw_dev ret = -EINVAL ; goto out_unlock; } + dev->state =STATE_DEV_REGISTERING ;spin_unlock_irqrestore (&dev->lock, flags); ret =usb_gadget_probe_driver (&dev->driver);
Greg Kroah-Hartman
maintainerPATCH 2/158 floppy: use a statically allocated error counter
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
commit f71f01394f742fc4558b3f9f4c7ef4c4cf3b07c8 upstream.
Interrupt handler bad_flp_intr() may cause a UAF on the recently freed request just to increment the error count. There's no point keeping that one in the request anyway, and since the interrupt handler uses a static pointer to the error which cannot be kept in sync with the pending request, better make it use a static error counter that's reset for each new request. This reset now happens when entering redo_fd_request() for a new request via set_next_request().
One initial concern about a single error counter was that errors on one floppy drive could be reported on another one, but this problem is not real given that the driver uses a single drive at a time, as that PC-compatible controllers also have this limitation by using shared signals. As such the error count is always for the "current" drive.
--- drivers/block/floppy.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/block/floppy.c +8 -10
@@ -509,8 +509,8 @@ static unsigned long fdc_busy;static DECLARE_WAIT_QUEUE_HEAD (fdc_wait);static DECLARE_WAIT_QUEUE_HEAD (command_done); -/* Errors during formatting are counted here. */ -static int format_errors; +/* errors encountered on the current (or last) request */ +static int floppy_errors;/* Format request descriptor. */ static struct format_descr format_req;
@@ -530,7 +530,6 @@ static struct format_descr format_req;static char *floppy_track_buffer;static int max_buffer_sectors; -static int *errors;typedef void (*done_f )(int ); static const struct cont_t { void (*interrupt)(void);
@@ -1455,7 +1454,7 @@ static int interpret_errors(void)if (drive_params[current_drive].flags &FTD_MSG )DPRINT ("Over/Underrun - retrying\n" ); bad =0 ; - }else if (*errors >= drive_params[current_drive].max_errors.reporting) { + }else if (floppy_errors >= drive_params[current_drive].max_errors.reporting) {print_errors (); }if (reply_buffer[ST2 ] &ST2_WC || reply_buffer[ST2 ] &ST2_BC )
@@ -2095,7 +2094,7 @@ static void bad_flp_intr(void)if (!next_valid_format (current_drive))return ; } - err_count = ++(*errors); + err_count = ++floppy_errors;INFBOUND (write_errors[current_drive].badness, err_count);if (err_count > drive_params[current_drive].max_errors.abort) cont->done (0 );
@@ -2241,9 +2240,8 @@ static int do_format(int drive, struct freturn -EINVAL ; } format_req = *tmp_format_req; - format_errors =0 ; cont = &format_cont; - errors = &format_errors; + floppy_errors =0 ; ret =wait_til_done (redo_format, true);if (ret == -EINTR )return -EINTR ;
@@ -2761,10 +2759,11 @@ static int set_next_request(void) current_req = list_first_entry_or_null(&floppy_reqs, struct request, queuelist);if (current_req) { - current_req->error_count =0 ; + floppy_errors =0 ;list_del_init (¤t_req->queuelist); +return 1 ; } -return current_req !=NULL ; +return 0 ; }/* Starts or continues processing request. Will automatically unlock the
@@ -2823,7 +2822,6 @@ do_request: _floppy = floppy_type + drive_params[current_drive].autodetect[drive_state[current_drive].probed_format]; }else probing =0 ; - errors = &(current_req->error_count); tmp =make_raw_rw_request ();if (tmp <2 ) {request_done (tmp);
Greg Kroah-Hartman
maintainerPATCH 3/158 kernel/resource: Introduce request_mem_region_muxed()
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit 27c196c7b73cb70bbed3a9df46563bab60e63415 upstream.
Support for requesting muxed memory region is implemented but not currently callable as a macro. Add the request muxed memory region macro.
MMIO memory accesses can be synchronized using request_mem_region() which is already available. This call will return failure if the resource is busy. The 'muxed' version of this macro will handle a busy resource by using a wait queue to retry until the resource is available.
--- include/linux/ioport.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/ioport.h +2 -0
@@ -262,6 +262,8 @@ resource_union(struct resource *r1, stru#define request_muxed_region (start,n,name) __request_region(&ioport_resource, (start), (n), (name), IORESOURCE_MUXED)#define __request_mem_region (start,n,name, excl) __request_region(&iomem_resource, (start), (n), (name), excl)#define request_mem_region (start,n,name) __request_region(&iomem_resource, (start), (n), (name), 0) +#define request_mem_region_muxed (start, n, name) \ + __request_region(&iomem_resource, (start), (n), (name), IORESOURCE_MUXED)#define request_mem_region_exclusive (start,n,name) \ __request_region(&iomem_resource, (start), (n), (name), IORESOURCE_EXCLUSIVE)#define rename_region (region, newname) do { (region)->name = (newname); } while (0)
Greg Kroah-Hartman
maintainerPATCH 4/158 i2c: piix4: Replace hardcoded memory map size with a #define
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit 93102cb449780f7b4eecf713451627b78373ce49 upstream.
Replace number constant with #define to improve readability and maintainability.
--- drivers/i2c/busses/i2c-piix4.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-piix4.c +10 -6
@@ -77,6 +77,7 @@/* SB800 constants */ #define SB800_PIIX4_SMB_IDX 0xcd6 +#define SB800_PIIX4_SMB_MAP_SIZE 2#define KERNCZ_IMC_IDX 0x3e#define KERNCZ_IMC_DATA 0x3f
@@ -290,7 +291,8 @@ static int piix4_setup_sb800(struct pci_else smb_en = (aux) ?0x28 :0x2c ; -if (!request_muxed_region (SB800_PIIX4_SMB_IDX ,2 ,"sb800_piix4_smb" )) { +if (!request_muxed_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE , +"sb800_piix4_smb" )) {dev_err (&PIIX4_dev->dev,"SMB base address index region 0x%x already in use.\n" ,SB800_PIIX4_SMB_IDX );
@@ -302,7 +304,7 @@ static int piix4_setup_sb800(struct pci_outb_p (smb_en +1 ,SB800_PIIX4_SMB_IDX ); smba_en_hi =inb_p (SB800_PIIX4_SMB_IDX +1 ); -release_region (SB800_PIIX4_SMB_IDX ,2 ); +release_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE );if (!smb_en) { smb_en_status = smba_en_lo &0x10 ;
@@ -371,7 +373,8 @@ static int piix4_setup_sb800(struct pci_ piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ; } }else { -if (!request_muxed_region (SB800_PIIX4_SMB_IDX ,2 , +if (!request_muxed_region (SB800_PIIX4_SMB_IDX , +SB800_PIIX4_SMB_MAP_SIZE ,"sb800_piix4_smb" )) {release_region (piix4_smba,SMBIOSIZE );return -EBUSY ;
@@ -384,7 +387,7 @@ static int piix4_setup_sb800(struct pci_SB800_PIIX4_PORT_IDX ; piix4_port_mask_sb800 =SB800_PIIX4_PORT_IDX_MASK ; piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ; -release_region (SB800_PIIX4_SMB_IDX ,2 ); +release_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE ); } dev_info(&PIIX4_dev->dev,
@@ -682,7 +685,8 @@ static s32 piix4_access_sb800(struct i2cu8 port;int retval; -if (!request_muxed_region (SB800_PIIX4_SMB_IDX ,2 ,"sb800_piix4_smb" )) +if (!request_muxed_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE , +"sb800_piix4_smb" ))return -EBUSY ;/* Request the SMBUS semaphore, avoid conflicts with the IMC */
@@ -758,7 +762,7 @@ static s32 piix4_access_sb800(struct i2cpiix4_imc_wakeup (); release: -release_region (SB800_PIIX4_SMB_IDX ,2 ); +release_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE );return retval; }
Greg Kroah-Hartman
maintainerPATCH 5/158 i2c: piix4: Move port I/O region request/release code into functions
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit a3325d225b00889f4b7fdb25d83033cae1048a92 upstream.
Move duplicated region request and release code into a function. Move is in preparation for following MMIO changes.
--- drivers/i2c/busses/i2c-piix4.c | 48 ++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 17 deletions(-)
drivers/i2c/busses/i2c-piix4.c +31 -17
@@ -165,6 +165,24 @@ struct i2c_piix4_adapdata {u8 port;/* Port number, shifted */ }; +static int piix4_sb800_region_request (struct device *dev) +{ +if (!request_muxed_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE , +"sb800_piix4_smb" )) { +dev_err (dev, +"SMBus base address index region 0x%x already in use.\n" , +SB800_PIIX4_SMB_IDX ); +return -EBUSY ; + } + +return 0 ; +} + +static void piix4_sb800_region_release (struct device *dev) +{ +release_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE ); +} +static int piix4_setup (struct pci_dev *PIIX4_dev,const struct pci_device_id *id) {
@@ -270,6 +288,7 @@ static int piix4_setup_sb800(struct pci_unsigned short piix4_smba;u8 smba_en_lo, smba_en_hi, smb_en, smb_en_status, port_sel;u8 i2ccfg, i2ccfg_offset =0x10 ; +int retval;/* SB800 and later SMBus does not support forcing address */ if (force || force_addr) {
@@ -291,20 +310,16 @@ static int piix4_setup_sb800(struct pci_else smb_en = (aux) ?0x28 :0x2c ; -if (!request_muxed_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE , -"sb800_piix4_smb" )) { -dev_err (&PIIX4_dev->dev, -"SMB base address index region 0x%x already in use.\n" , -SB800_PIIX4_SMB_IDX ); -return -EBUSY ; - } + retval =piix4_sb800_region_request (&PIIX4_dev->dev); +if (retval) +return retval;outb_p (smb_en,SB800_PIIX4_SMB_IDX ); smba_en_lo =inb_p (SB800_PIIX4_SMB_IDX +1 );outb_p (smb_en +1 ,SB800_PIIX4_SMB_IDX ); smba_en_hi =inb_p (SB800_PIIX4_SMB_IDX +1 ); -release_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE ); +piix4_sb800_region_release (&PIIX4_dev->dev);if (!smb_en) { smb_en_status = smba_en_lo &0x10 ;
@@ -373,11 +388,10 @@ static int piix4_setup_sb800(struct pci_ piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ; } }else { -if (!request_muxed_region (SB800_PIIX4_SMB_IDX , -SB800_PIIX4_SMB_MAP_SIZE , -"sb800_piix4_smb" )) { + retval =piix4_sb800_region_request (&PIIX4_dev->dev); +if (retval) {release_region (piix4_smba,SMBIOSIZE ); -return -EBUSY ; +return retval; }outb_p (SB800_PIIX4_PORT_IDX_SEL ,SB800_PIIX4_SMB_IDX );
@@ -387,7 +401,7 @@ static int piix4_setup_sb800(struct pci_SB800_PIIX4_PORT_IDX ; piix4_port_mask_sb800 =SB800_PIIX4_PORT_IDX_MASK ; piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ; -release_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE ); +piix4_sb800_region_release (&PIIX4_dev->dev); } dev_info(&PIIX4_dev->dev,
@@ -685,9 +699,9 @@ static s32 piix4_access_sb800(struct i2cu8 port;int retval; -if (!request_muxed_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE , -"sb800_piix4_smb" )) -return -EBUSY ; + retval =piix4_sb800_region_request (&adap->dev); +if (retval) +return retval;/* Request the SMBUS semaphore, avoid conflicts with the IMC */ smbslvcnt =inb_p (SMBSLVCNT );
@@ -762,7 +776,7 @@ static s32 piix4_access_sb800(struct i2cpiix4_imc_wakeup (); release: -release_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE ); +piix4_sb800_region_release (&adap->dev);return retval; }
Greg Kroah-Hartman
maintainerPATCH 6/158 i2c: piix4: Move SMBus controller base address detect into function
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit 0a59a24e14e9b21dcbb6b8ea41422e2fdfa437fd upstream.
Move SMBus controller base address detection into function. Refactor is in preparation for following MMIO changes.
--- drivers/i2c/busses/i2c-piix4.c | 69 ++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 25 deletions(-)
drivers/i2c/busses/i2c-piix4.c +44 -25
@@ -282,11 +282,51 @@ static int piix4_setup(struct pci_dev *Preturn piix4_smba; } +static int piix4_setup_sb800_smba (struct pci_dev *PIIX4_dev, +u8 smb_en, +u8 aux, +u8 *smb_en_status, +unsigned short *piix4_smba) +{ +u8 smba_en_lo; +u8 smba_en_hi; +int retval; + + retval =piix4_sb800_region_request (&PIIX4_dev->dev); +if (retval) +return retval; + +outb_p (smb_en,SB800_PIIX4_SMB_IDX ); + smba_en_lo =inb_p (SB800_PIIX4_SMB_IDX +1 ); +outb_p (smb_en +1 ,SB800_PIIX4_SMB_IDX ); + smba_en_hi =inb_p (SB800_PIIX4_SMB_IDX +1 ); + +piix4_sb800_region_release (&PIIX4_dev->dev); + +if (!smb_en) { + *smb_en_status = smba_en_lo &0x10 ; + *piix4_smba = smba_en_hi <<8 ; +if (aux) + *piix4_smba |=0x20 ; + }else { + *smb_en_status = smba_en_lo &0x01 ; + *piix4_smba = ((smba_en_hi <<8 ) | smba_en_lo) &0xffe0 ; + } + +if (!*smb_en_status) { +dev_err (&PIIX4_dev->dev, +"SMBus Host Controller not enabled!\n" ); +return -ENODEV ; + } + +return 0 ; +} +static int piix4_setup_sb800 (struct pci_dev *PIIX4_dev,const struct pci_device_id *id,u8 aux) {unsigned short piix4_smba; -u8 smba_en_lo, smba_en_hi, smb_en, smb_en_status, port_sel; +u8 smb_en, smb_en_status, port_sel;u8 i2ccfg, i2ccfg_offset =0x10 ;int retval;
@@ -310,33 +350,12 @@ static int piix4_setup_sb800(struct pci_else smb_en = (aux) ?0x28 :0x2c ; - retval =piix4_sb800_region_request (&PIIX4_dev->dev); + retval =piix4_setup_sb800_smba (PIIX4_dev, smb_en, aux, &smb_en_status, + &piix4_smba); +if (retval)return retval; -outb_p (smb_en,SB800_PIIX4_SMB_IDX ); - smba_en_lo =inb_p (SB800_PIIX4_SMB_IDX +1 ); -outb_p (smb_en +1 ,SB800_PIIX4_SMB_IDX ); - smba_en_hi =inb_p (SB800_PIIX4_SMB_IDX +1 ); - -piix4_sb800_region_release (&PIIX4_dev->dev); - -if (!smb_en) { - smb_en_status = smba_en_lo &0x10 ; - piix4_smba = smba_en_hi <<8 ; -if (aux) - piix4_smba |=0x20 ; - }else { - smb_en_status = smba_en_lo &0x01 ; - piix4_smba = ((smba_en_hi <<8 ) | smba_en_lo) &0xffe0 ; - } - -if (!smb_en_status) { -dev_err (&PIIX4_dev->dev, -"SMBus Host Controller not enabled!\n" ); -return -ENODEV ; - } -if (acpi_check_region (piix4_smba,SMBIOSIZE , piix4_driver.name))return -ENODEV ;
Greg Kroah-Hartman
maintainerPATCH 7/158 i2c: piix4: Move SMBus port selection into function
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit fbafbd51bff52cb3a920fd98d4dae2a78dd433d0 upstream.
Move port selection code into a separate function. Refactor is in preparation for following MMIO changes.
--- drivers/i2c/busses/i2c-piix4.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/i2c/busses/i2c-piix4.c +17 -10
@@ -698,6 +698,20 @@ static void piix4_imc_wakeup(void)release_region (KERNCZ_IMC_IDX ,2 ); } +static int piix4_sb800_port_sel (u8 port) +{ +u8 smba_en_lo, val; + +outb_p (piix4_port_sel_sb800,SB800_PIIX4_SMB_IDX ); + smba_en_lo =inb_p (SB800_PIIX4_SMB_IDX +1 ); + + val = (smba_en_lo & ~piix4_port_mask_sb800) | port; +if (smba_en_lo != val) +outb_p (val,SB800_PIIX4_SMB_IDX +1 ); + +return (smba_en_lo & piix4_port_mask_sb800); +} +/* * Handles access to multiple SMBus ports on the SB800. * The port is selected by bits 2:1 of the smb_en register (0x2c).
@@ -714,8 +728,7 @@ static s32 piix4_access_sb800(struct i2cunsigned short piix4_smba = adapdata->smba;int retries =MAX_TIMEOUT ;int smbslvcnt; -u8 smba_en_lo; -u8 port; +u8 prev_port;int retval; retval =piix4_sb800_region_request (&adap->dev);
@@ -775,18 +788,12 @@ static s32 piix4_access_sb800(struct i2c } } -outb_p (piix4_port_sel_sb800,SB800_PIIX4_SMB_IDX ); - smba_en_lo =inb_p (SB800_PIIX4_SMB_IDX +1 ); - - port = adapdata->port; -if ((smba_en_lo & piix4_port_mask_sb800) != port) -outb_p ((smba_en_lo & ~piix4_port_mask_sb800) | port, -SB800_PIIX4_SMB_IDX +1 ); + prev_port =piix4_sb800_port_sel (adapdata->port); retval =piix4_access (adap, addr, flags, read_write, command, size, data); -outb_p (smba_en_lo,SB800_PIIX4_SMB_IDX +1 ); +piix4_sb800_port_sel (prev_port);/* Release the semaphore */ outb_p (smbslvcnt |0x20 ,SMBSLVCNT );
Greg Kroah-Hartman
maintainerPATCH 8/158 i2c: piix4: Add EFCH MMIO support to region request and release
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit 7c148722d074c29fb998578eea5de3c14b9608c9 upstream.
EFCH cd6h/cd7h port I/O may no longer be available on later AMD processors and it is recommended to use MMIO instead. Update the request and release functions to support MMIO.
MMIO request/release and mmapping require details during cleanup. Add a MMIO configuration structure containing resource and vaddress details for mapping the region, accessing the region, and releasing the region.
--- drivers/i2c/busses/i2c-piix4.c | 66 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 8 deletions(-)
drivers/i2c/busses/i2c-piix4.c +58 -8
@@ -98,6 +98,9 @@#define SB800_PIIX4_PORT_IDX_MASK_KERNCZ 0x18#define SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ 3 +#define SB800_PIIX4_FCH_PM_ADDR 0xFED80300 +#define SB800_PIIX4_FCH_PM_SIZE 8 +/* insmod parameters */ /* If force is set to anything different from 0, we forcibly enable the
@@ -156,6 +159,12 @@ static const char *piix4_main_port_names };static const char *piix4_aux_port_name_sb800 =" port 1" ; +struct sb800_mmio_cfg { +void __iomem *addr; +struct resource *res; +bool use_mmio; +}; +struct i2c_piix4_adapdata {unsigned short smba;
@@ -163,10 +172,40 @@ struct i2c_piix4_adapdata {bool sb800_main;bool notify_imc;u8 port;/* Port number, shifted */ +struct sb800_mmio_cfg mmio_cfg; }; -static int piix4_sb800_region_request (struct device *dev) +static int piix4_sb800_region_request (struct device *dev, +struct sb800_mmio_cfg *mmio_cfg) { +if (mmio_cfg->use_mmio) { +struct resource *res; +void __iomem *addr; + + res =request_mem_region_muxed (SB800_PIIX4_FCH_PM_ADDR , +SB800_PIIX4_FCH_PM_SIZE , +"sb800_piix4_smb" ); +if (!res) { +dev_err (dev, +"SMBus base address memory region 0x%x already in use.\n" , +SB800_PIIX4_FCH_PM_ADDR ); +return -EBUSY ; + } + + addr =ioremap (SB800_PIIX4_FCH_PM_ADDR , +SB800_PIIX4_FCH_PM_SIZE ); +if (!addr) { +release_resource (res); +dev_err (dev,"SMBus base address mapping failed.\n" ); +return -ENOMEM ; + } + + mmio_cfg->res = res; + mmio_cfg->addr = addr; + +return 0 ; + } +if (!request_muxed_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE ,"sb800_piix4_smb" )) { dev_err(dev,
@@ -178,8 +217,15 @@ static int piix4_sb800_region_request(streturn 0 ; } -static void piix4_sb800_region_release (struct device *dev) +static void piix4_sb800_region_release (struct device *dev, +struct sb800_mmio_cfg *mmio_cfg) { +if (mmio_cfg->use_mmio) { +iounmap (mmio_cfg->addr); +release_resource (mmio_cfg->res); +return ; + } +release_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE ); }
@@ -288,11 +334,13 @@ static int piix4_setup_sb800_smba(structu8 *smb_en_status, unsigned short *piix4_smba) { + struct sb800_mmio_cfg mmio_cfg;u8 smba_en_lo;u8 smba_en_hi;int retval; - retval =piix4_sb800_region_request (&PIIX4_dev->dev); + mmio_cfg.use_mmio =0 ; + retval =piix4_sb800_region_request (&PIIX4_dev->dev, &mmio_cfg);if (retval)return retval;
@@ -301,7 +349,7 @@ static int piix4_setup_sb800_smba(structoutb_p (smb_en +1 ,SB800_PIIX4_SMB_IDX ); smba_en_hi =inb_p (SB800_PIIX4_SMB_IDX +1 ); -piix4_sb800_region_release (&PIIX4_dev->dev); +piix4_sb800_region_release (&PIIX4_dev->dev, &mmio_cfg);if (!smb_en) { *smb_en_status = smba_en_lo &0x10 ;
@@ -328,6 +376,7 @@ static int piix4_setup_sb800(struct pci_unsigned short piix4_smba;u8 smb_en, smb_en_status, port_sel;u8 i2ccfg, i2ccfg_offset =0x10 ; +struct sb800_mmio_cfg mmio_cfg;int retval;/* SB800 and later SMBus does not support forcing address */
@@ -407,7 +456,8 @@ static int piix4_setup_sb800(struct pci_ piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ; } }else { - retval =piix4_sb800_region_request (&PIIX4_dev->dev); + mmio_cfg.use_mmio =0 ; + retval =piix4_sb800_region_request (&PIIX4_dev->dev, &mmio_cfg);if (retval) {release_region (piix4_smba,SMBIOSIZE );return retval;
@@ -420,7 +470,7 @@ static int piix4_setup_sb800(struct pci_SB800_PIIX4_PORT_IDX ; piix4_port_mask_sb800 =SB800_PIIX4_PORT_IDX_MASK ; piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ; -piix4_sb800_region_release (&PIIX4_dev->dev); +piix4_sb800_region_release (&PIIX4_dev->dev, &mmio_cfg); } dev_info(&PIIX4_dev->dev,
@@ -731,7 +781,7 @@ static s32 piix4_access_sb800(struct i2cu8 prev_port;int retval; - retval =piix4_sb800_region_request (&adap->dev); + retval =piix4_sb800_region_request (&adap->dev, &adapdata->mmio_cfg);if (retval)return retval;
@@ -802,7 +852,7 @@ static s32 piix4_access_sb800(struct i2cpiix4_imc_wakeup (); release: -piix4_sb800_region_release (&adap->dev); +piix4_sb800_region_release (&adap->dev, &adapdata->mmio_cfg);return retval; }
Greg Kroah-Hartman
maintainerPATCH 9/158 i2c: piix4: Add EFCH MMIO support to SMBus base address detect
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit 46967bc1ee93acd1d8953c87dc16f43de4076f93 upstream.
The EFCH SMBus controller's base address is determined using details in FCH::PM::DECODEEN[smbusasfiobase] and FCH::PM::DECODEEN[smbusasfioen].These register fields were accessed using cd6h/cd7h port I/O. cd6h/cd7h port I/O is no longer available in later AMD processors. Change base address detection to use MMIO instead of port I/O cd6h/cd7h.
--- drivers/i2c/busses/i2c-piix4.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-piix4.c +9 -4
@@ -344,10 +344,15 @@ static int piix4_setup_sb800_smba(structif (retval)return retval; -outb_p (smb_en,SB800_PIIX4_SMB_IDX ); - smba_en_lo =inb_p (SB800_PIIX4_SMB_IDX +1 ); -outb_p (smb_en +1 ,SB800_PIIX4_SMB_IDX ); - smba_en_hi =inb_p (SB800_PIIX4_SMB_IDX +1 ); +if (mmio_cfg.use_mmio) { + smba_en_lo =ioread8 (mmio_cfg.addr); + smba_en_hi =ioread8 (mmio_cfg.addr +1 ); + }else { +outb_p (smb_en,SB800_PIIX4_SMB_IDX ); + smba_en_lo =inb_p (SB800_PIIX4_SMB_IDX +1 ); +outb_p (smb_en +1 ,SB800_PIIX4_SMB_IDX ); + smba_en_hi =inb_p (SB800_PIIX4_SMB_IDX +1 ); + }piix4_sb800_region_release (&PIIX4_dev->dev, &mmio_cfg);
Greg Kroah-Hartman
maintainerPATCH 10/158 i2c: piix4: Add EFCH MMIO support for SMBus port select
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit 381a3083c6747ae5cdbef9b176d57d1b966db49f upstream.
AMD processors include registers capable of selecting between 2 SMBus ports. Port selection is made during each user access by writing to FCH::PM::DECODEEN[smbus0sel]. Change the driver to use MMIO during SMBus port selection because cd6h/cd7h port I/O is not available on later AMD processors.
--- drivers/i2c/busses/i2c-piix4.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-piix4.c +12 -3
@@ -753,10 +753,19 @@ static void piix4_imc_wakeup(void)release_region (KERNCZ_IMC_IDX ,2 ); } -static int piix4_sb800_port_sel (u8 port) +static int piix4_sb800_port_sel (u8 port,struct sb800_mmio_cfg *mmio_cfg) {u8 smba_en_lo, val; +if (mmio_cfg->use_mmio) { + smba_en_lo =ioread8 (mmio_cfg->addr + piix4_port_sel_sb800); + val = (smba_en_lo & ~piix4_port_mask_sb800) | port; +if (smba_en_lo != val) +iowrite8 (val, mmio_cfg->addr + piix4_port_sel_sb800); + +return (smba_en_lo & piix4_port_mask_sb800); + } +outb_p (piix4_port_sel_sb800,SB800_PIIX4_SMB_IDX ); smba_en_lo =inb_p (SB800_PIIX4_SMB_IDX +1 );
@@ -843,12 +852,12 @@ static s32 piix4_access_sb800(struct i2c } } - prev_port =piix4_sb800_port_sel (adapdata->port); + prev_port =piix4_sb800_port_sel (adapdata->port, &adapdata->mmio_cfg); retval =piix4_access (adap, addr, flags, read_write, command, size, data); -piix4_sb800_port_sel (prev_port); +piix4_sb800_port_sel (prev_port, &adapdata->mmio_cfg);/* Release the semaphore */ outb_p (smbslvcnt |0x20 ,SMBSLVCNT );
Greg Kroah-Hartman
maintainerPATCH 11/158 i2c: piix4: Enable EFCH MMIO for Family 17h+
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit 6cf72f41808ab5db1d7718b999b3ff0166e67e45 upstream.
Enable EFCH MMIO using check for SMBus PCI revision ID value 0x51 or greater. This PCI revision ID check will enable family 17h and future AMD processors with the same EFCH SMBus controller HW.
--- drivers/i2c/busses/i2c-piix4.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-piix4.c +15 -2
@@ -229,6 +229,18 @@ static void piix4_sb800_region_release(srelease_region (SB800_PIIX4_SMB_IDX ,SB800_PIIX4_SMB_MAP_SIZE ); } +static bool piix4_sb800_use_mmio (struct pci_dev *PIIX4_dev) +{ +/* +* cd6h/cd7h port I/O accesses can be disabled on AMD processors +* w/ SMBus PCI revision ID 0x51 or greater. MMIO is supported on +* the same processors and is the recommended access method. +*/ +return (PIIX4_dev->vendor ==PCI_VENDOR_ID_AMD && + PIIX4_dev->device ==PCI_DEVICE_ID_AMD_KERNCZ_SMBUS && + PIIX4_dev->revision >=0x51 ); +} +static int piix4_setup (struct pci_dev *PIIX4_dev,const struct pci_device_id *id) {
@@ -339,7 +351,7 @@ static int piix4_setup_sb800_smba(structu8 smba_en_hi;int retval; - mmio_cfg.use_mmio =0 ; + mmio_cfg.use_mmio =piix4_sb800_use_mmio (PIIX4_dev); retval =piix4_sb800_region_request (&PIIX4_dev->dev, &mmio_cfg);if (retval)return retval;
@@ -461,7 +473,7 @@ static int piix4_setup_sb800(struct pci_ piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ; } }else { - mmio_cfg.use_mmio =0 ; + mmio_cfg.use_mmio =piix4_sb800_use_mmio (PIIX4_dev); retval =piix4_sb800_region_request (&PIIX4_dev->dev, &mmio_cfg);if (retval) {release_region (piix4_smba,SMBIOSIZE );
@@ -944,6 +956,7 @@ static int piix4_add_adapter(struct pci_return -ENOMEM ; } + adapdata->mmio_cfg.use_mmio =piix4_sb800_use_mmio (dev); adapdata->smba = smba; adapdata->sb800_main = sb800_main; adapdata->port = port << piix4_port_shift_sb800;
Greg Kroah-Hartman
maintainerPATCH 12/158 Watchdog: sp5100_tco: Move timer initialization into function
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit abd71a948f7aab47ca49d3e7fe6afa6c48c8aae0 upstream.
Refactor driver's timer initialization into new function. This is needed inorder to support adding new device layouts while using common timer initialization.
--- drivers/watchdog/sp5100_tco.c | 65 +++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 29 deletions(-)
drivers/watchdog/sp5100_tco.c +36 -29
@@ -223,6 +223,41 @@ static u32 sp5100_tco_read_pm_reg32(u8 ireturn val; } +static int sp5100_tco_timer_init (struct sp5100_tco *tco) +{ +struct watchdog_device *wdd = &tco->wdd; +struct device *dev = wdd->parent; +u32 val; + + val =readl (SP5100_WDT_CONTROL (tco->tcobase)); +if (val &SP5100_WDT_DISABLED ) { +dev_err (dev,"Watchdog hardware is disabled\n" ); +return -ENODEV ; + } + +/* +* Save WatchDogFired status, because WatchDogFired flag is +* cleared here. +*/ +if (val &SP5100_WDT_FIRED ) + wdd->bootstatus =WDIOF_CARDRESET ; + +/* Set watchdog action to reset the system */ + val &= ~SP5100_WDT_ACTION_RESET ; +writel (val,SP5100_WDT_CONTROL (tco->tcobase)); + +/* Set a reasonable heartbeat before we stop the timer */ +tco_timer_set_timeout (wdd, wdd->timeout); + +/* +* Stop the TCO before we change anything so we don't race with +* a zeroed timer. +*/ +tco_timer_stop (wdd); + +return 0 ; +} +static int sp5100_tco_setupdevice (struct device *dev,struct watchdog_device *wdd) {
@@ -348,35 +383,7 @@ static int sp5100_tco_setupdevice(struct/* Setup the watchdog timer */ tco_timer_enable (tco); - val =readl (SP5100_WDT_CONTROL (tco->tcobase)); -if (val &SP5100_WDT_DISABLED ) { -dev_err (dev,"Watchdog hardware is disabled\n" ); - ret = -ENODEV ; - goto unreg_region; - } - -/* -* Save WatchDogFired status, because WatchDogFired flag is -* cleared here. -*/ -if (val &SP5100_WDT_FIRED ) - wdd->bootstatus =WDIOF_CARDRESET ; -/* Set watchdog action to reset the system */ - val &= ~SP5100_WDT_ACTION_RESET ; -writel (val,SP5100_WDT_CONTROL (tco->tcobase)); - -/* Set a reasonable heartbeat before we stop the timer */ -tco_timer_set_timeout (wdd, wdd->timeout); - -/* -* Stop the TCO before we change anything so we don't race with -* a zeroed timer. -*/ -tco_timer_stop (wdd); - -release_region (SP5100_IO_PM_INDEX_REG ,SP5100_PM_IOPORTS_SIZE ); - -return 0 ; + ret =sp5100_tco_timer_init (tco); unreg_region:release_region (SP5100_IO_PM_INDEX_REG ,SP5100_PM_IOPORTS_SIZE );
Greg Kroah-Hartman
maintainerPATCH 13/158 Watchdog: sp5100_tco: Refactor MMIO base address initialization
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit 1f182aca230086d4a4469c0f9136a6ea762d6385 upstream.
Combine MMIO base address and alternate base address detection. Combine based on layout type. This will simplify the function by eliminating a switch case.
Move existing request/release code into functions. This currently only supports port I/O request/release. The move into a separate function will make it ready for adding MMIO region support.
--- drivers/watchdog/sp5100_tco.c | 155 +++++++++++++++++++++--------------------- drivers/watchdog/sp5100_tco.h | 1 2 files changed, 82 insertions(+), 74 deletions(-)
drivers/watchdog/sp5100_tco.c +81 -74
@@ -223,6 +223,55 @@ static u32 sp5100_tco_read_pm_reg32(u8 ireturn val; } +static u32 sp5100_tco_request_region (struct device *dev, +u32 mmio_addr, +const char *dev_name) +{ +if (!devm_request_mem_region (dev, mmio_addr,SP5100_WDT_MEM_MAP_SIZE , + dev_name)) { +dev_dbg (dev,"MMIO address 0x%08x already in use\n" , mmio_addr); +return 0 ; + } + +return mmio_addr; +} + +static u32 sp5100_tco_prepare_base (struct sp5100_tco *tco, +u32 mmio_addr, +u32 alt_mmio_addr, +const char *dev_name) +{ +struct device *dev = tco->wdd.parent; + +dev_dbg (dev,"Got 0x%08x from SBResource_MMIO register\n" , mmio_addr); + +if (!mmio_addr && !alt_mmio_addr) +return -ENODEV ; + +/* Check for MMIO address and alternate MMIO address conflicts */ +if (mmio_addr) + mmio_addr =sp5100_tco_request_region (dev, mmio_addr, dev_name); + +if (!mmio_addr && alt_mmio_addr) + mmio_addr =sp5100_tco_request_region (dev, alt_mmio_addr, dev_name); + +if (!mmio_addr) { +dev_err (dev,"Failed to reserve MMIO or alternate MMIO region\n" ); +return -EBUSY ; + } + + tco->tcobase =devm_ioremap (dev, mmio_addr,SP5100_WDT_MEM_MAP_SIZE ); +if (!tco->tcobase) { +dev_err (dev,"MMIO address 0x%08x failed mapping\n" , mmio_addr); +devm_release_mem_region (dev, mmio_addr,SP5100_WDT_MEM_MAP_SIZE ); +return -ENOMEM ; + } + +dev_info (dev,"Using 0x%08x for watchdog MMIO address\n" , mmio_addr); + +return 0 ; +} +static int sp5100_tco_timer_init (struct sp5100_tco *tco) {struct watchdog_device *wdd = &tco->wdd;
@@ -264,6 +313,7 @@ static int sp5100_tco_setupdevice(structstruct sp5100_tco *tco =watchdog_get_drvdata (wdd);const char *dev_name;u32 mmio_addr =0 , val; +u32 alt_mmio_addr =0 ;int ret;/* Request the IO ports used by this driver */
@@ -282,11 +332,32 @@ static int sp5100_tco_setupdevice(struct dev_name =SP5100_DEVNAME ; mmio_addr =sp5100_tco_read_pm_reg32 (SP5100_PM_WATCHDOG_BASE ) &0xfffffff8 ; + +/* +* Secondly, find the watchdog timer MMIO address +* from SBResource_MMIO register. +*/ + +/* Read SBResource_MMIO from PCI config(PCI_Reg: 9Ch) */ +pci_read_config_dword (sp5100_tco_pci, +SP5100_SB_RESOURCE_MMIO_BASE , + &val); + +/* Verify MMIO is enabled and using bar0 */ +if ((val &SB800_ACPI_MMIO_MASK ) ==SB800_ACPI_MMIO_DECODE_EN ) + alt_mmio_addr = (val & ~0xfff ) +SB800_PM_WDT_MMIO_OFFSET ;break ;case sb800: dev_name =SB800_DEVNAME ; mmio_addr =sp5100_tco_read_pm_reg32 (SB800_PM_WATCHDOG_BASE ) &0xfffffff8 ; + +/* Read SBResource_MMIO from AcpiMmioEn(PM_Reg: 24h) */ + val =sp5100_tco_read_pm_reg32 (SB800_PM_ACPI_MMIO_EN ); + +/* Verify MMIO is enabled and using bar0 */ +if ((val &SB800_ACPI_MMIO_MASK ) ==SB800_ACPI_MMIO_DECODE_EN ) + alt_mmio_addr = (val & ~0xfff ) +SB800_PM_WDT_MMIO_OFFSET ;break ;case efch: dev_name =SB800_DEVNAME ;
@@ -305,87 +376,23 @@ static int sp5100_tco_setupdevice(struct val =sp5100_tco_read_pm_reg8 (EFCH_PM_DECODEEN );if (val &EFCH_PM_DECODEEN_WDT_TMREN ) mmio_addr =EFCH_PM_WDT_ADDR ; + + val =sp5100_tco_read_pm_reg8 (EFCH_PM_ISACONTROL ); +if (val &EFCH_PM_ISACONTROL_MMIOEN ) + alt_mmio_addr =EFCH_PM_ACPI_MMIO_ADDR + +EFCH_PM_ACPI_MMIO_WDT_OFFSET ;break ;default :return -ENODEV ; } -/* Check MMIO address conflict */ -if (!mmio_addr || - !devm_request_mem_region (dev, mmio_addr,SP5100_WDT_MEM_MAP_SIZE , - dev_name)) { -if (mmio_addr) -dev_dbg (dev,"MMIO address 0x%08x already in use\n" , - mmio_addr); -switch (tco->tco_reg_layout) { -case sp5100: -/* -* Secondly, Find the watchdog timer MMIO address -* from SBResource_MMIO register. -*/ -/* Read SBResource_MMIO from PCI config(PCI_Reg: 9Ch) */ -pci_read_config_dword (sp5100_tco_pci, -SP5100_SB_RESOURCE_MMIO_BASE , - &mmio_addr); -if ((mmio_addr & (SB800_ACPI_MMIO_DECODE_EN | -SB800_ACPI_MMIO_SEL )) != -SB800_ACPI_MMIO_DECODE_EN ) { - ret = -ENODEV ; - goto unreg_region; - } - mmio_addr &= ~0xFFF ; - mmio_addr +=SB800_PM_WDT_MMIO_OFFSET ; -break ; -case sb800: -/* Read SBResource_MMIO from AcpiMmioEn(PM_Reg: 24h) */ - mmio_addr = -sp5100_tco_read_pm_reg32 (SB800_PM_ACPI_MMIO_EN ); -if ((mmio_addr & (SB800_ACPI_MMIO_DECODE_EN | -SB800_ACPI_MMIO_SEL )) != -SB800_ACPI_MMIO_DECODE_EN ) { - ret = -ENODEV ; - goto unreg_region; - } - mmio_addr &= ~0xFFF ; - mmio_addr +=SB800_PM_WDT_MMIO_OFFSET ; -break ; -case efch: - val =sp5100_tco_read_pm_reg8 (EFCH_PM_ISACONTROL ); -if (!(val &EFCH_PM_ISACONTROL_MMIOEN )) { - ret = -ENODEV ; - goto unreg_region; - } - mmio_addr =EFCH_PM_ACPI_MMIO_ADDR + -EFCH_PM_ACPI_MMIO_WDT_OFFSET ; -break ; - } -dev_dbg (dev,"Got 0x%08x from SBResource_MMIO register\n" , - mmio_addr); -if (!devm_request_mem_region (dev, mmio_addr, -SP5100_WDT_MEM_MAP_SIZE , - dev_name)) { -dev_dbg (dev,"MMIO address 0x%08x already in use\n" , - mmio_addr); - ret = -EBUSY ; - goto unreg_region; - } + ret =sp5100_tco_prepare_base (tco, mmio_addr, alt_mmio_addr, dev_name); +if (!ret) { +/* Setup the watchdog timer */ +tco_timer_enable (tco); + ret =sp5100_tco_timer_init (tco); } - tco->tcobase =devm_ioremap (dev, mmio_addr,SP5100_WDT_MEM_MAP_SIZE ); -if (!tco->tcobase) { -dev_err (dev,"failed to get tcobase address\n" ); - ret = -ENOMEM ; - goto unreg_region; - } - -dev_info (dev,"Using 0x%08x for watchdog MMIO address\n" , mmio_addr); - -/* Setup the watchdog timer */ -tco_timer_enable (tco); - - ret =sp5100_tco_timer_init (tco); - -unreg_region:release_region (SP5100_IO_PM_INDEX_REG ,SP5100_PM_IOPORTS_SIZE );return ret; }
drivers/watchdog/sp5100_tco.h +1 -0
@@ -58,6 +58,7 @@#define SB800_PM_WATCHDOG_SECOND_RES GENMASK(1, 0)#define SB800_ACPI_MMIO_DECODE_EN BIT(0)#define SB800_ACPI_MMIO_SEL BIT(1) +#define SB800_ACPI_MMIO_MASK GENMASK(1, 0)#define SB800_PM_WDT_MMIO_OFFSET 0xB00
Greg Kroah-Hartman
maintainerPATCH 14/158 Watchdog: sp5100_tco: Add initialization using EFCH MMIO
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit 0578fff4aae5bce3f09875f58e68e9ffbab8daf5 upstream.
cd6h/cd7h port I/O can be disabled on recent AMD hardware. Read accesses to disabled cd6h/cd7h port I/O will return F's and written data is dropped. It is recommended to replace the cd6h/cd7h port I/O with MMIO.
--- drivers/watchdog/sp5100_tco.c | 100 +++++++++++++++++++++++++++++++++++++++++- drivers/watchdog/sp5100_tco.h | 5 ++ 2 files changed, 104 insertions(+), 1 deletion(-)
drivers/watchdog/sp5100_tco.c +99 -1
@@ -49,7 +49,7 @@/* internal variables */ enum tco_reg_layout { - sp5100, sb800, efch + sp5100, sb800, efch, efch_mmio };struct sp5100_tco {
@@ -209,6 +209,8 @@ static void tco_timer_enable(struct sp51 ~EFCH_PM_WATCHDOG_DISABLE , EFCH_PM_DECODEEN_SECOND_RES);break ; +default : +break ; } }
@@ -307,6 +309,99 @@ static int sp5100_tco_timer_init(structreturn 0 ; } +static u8 efch_read_pm_reg8 (void __iomem *addr,u8 index) +{ +return readb (addr + index); +} + +static void efch_update_pm_reg8 (void __iomem *addr,u8 index,u8 reset,u8 set) +{ +u8 val; + + val =readb (addr + index); + val &= reset; + val |= set; +writeb (val, addr + index); +} + +static void tco_timer_enable_mmio (void __iomem *addr) +{ +efch_update_pm_reg8 (addr,EFCH_PM_DECODEEN3 , + ~EFCH_PM_WATCHDOG_DISABLE , +EFCH_PM_DECODEEN_SECOND_RES ); +} + +static int sp5100_tco_setupdevice_mmio (struct device *dev, +struct watchdog_device *wdd) +{ +struct sp5100_tco *tco =watchdog_get_drvdata (wdd); +const char *dev_name =SB800_DEVNAME ; +u32 mmio_addr =0 , alt_mmio_addr =0 ; +struct resource *res; +void __iomem *addr; +int ret; +u32 val; + + res =request_mem_region_muxed (EFCH_PM_ACPI_MMIO_PM_ADDR , +EFCH_PM_ACPI_MMIO_PM_SIZE , +"sp5100_tco" ); + +if (!res) { +dev_err (dev, +"Memory region 0x%08x already in use\n" , +EFCH_PM_ACPI_MMIO_PM_ADDR ); +return -EBUSY ; + } + + addr =ioremap (EFCH_PM_ACPI_MMIO_PM_ADDR ,EFCH_PM_ACPI_MMIO_PM_SIZE ); +if (!addr) { +dev_err (dev,"Address mapping failed\n" ); + ret = -ENOMEM ; + goto out; + } + +/* +* EFCH_PM_DECODEEN_WDT_TMREN is dual purpose. This bitfield +* enables sp5100_tco register MMIO space decoding. The bitfield +* also starts the timer operation. Enable if not already enabled. +*/ + val =efch_read_pm_reg8 (addr,EFCH_PM_DECODEEN ); +if (!(val &EFCH_PM_DECODEEN_WDT_TMREN )) { +efch_update_pm_reg8 (addr,EFCH_PM_DECODEEN ,0xff , +EFCH_PM_DECODEEN_WDT_TMREN ); + } + +/* Error if the timer could not be enabled */ + val =efch_read_pm_reg8 (addr,EFCH_PM_DECODEEN ); +if (!(val &EFCH_PM_DECODEEN_WDT_TMREN )) { +dev_err (dev,"Failed to enable the timer\n" ); + ret = -EFAULT ; + goto out; + } + + mmio_addr =EFCH_PM_WDT_ADDR ; + +/* Determine alternate MMIO base address */ + val =efch_read_pm_reg8 (addr,EFCH_PM_ISACONTROL ); +if (val &EFCH_PM_ISACONTROL_MMIOEN ) + alt_mmio_addr =EFCH_PM_ACPI_MMIO_ADDR + +EFCH_PM_ACPI_MMIO_WDT_OFFSET ; + + ret =sp5100_tco_prepare_base (tco, mmio_addr, alt_mmio_addr, dev_name); +if (!ret) { +tco_timer_enable_mmio (addr); + ret =sp5100_tco_timer_init (tco); + } + +out: +if (addr) +iounmap (addr); + +release_resource (res); + +return ret; +} +static int sp5100_tco_setupdevice (struct device *dev,struct watchdog_device *wdd) {
@@ -316,6 +411,9 @@ static int sp5100_tco_setupdevice(structu32 alt_mmio_addr =0 ;int ret; +if (tco->tco_reg_layout == efch_mmio) +return sp5100_tco_setupdevice_mmio (dev, wdd); +/* Request the IO ports used by this driver */ if (!request_muxed_region (SP5100_IO_PM_INDEX_REG ,SP5100_PM_IOPORTS_SIZE ,"sp5100_tco" )) {
drivers/watchdog/sp5100_tco.h +5 -0
@@ -83,4 +83,9 @@#define EFCH_PM_ISACONTROL_MMIOEN BIT(1)#define EFCH_PM_ACPI_MMIO_ADDR 0xfed80000 +#define EFCH_PM_ACPI_MMIO_PM_OFFSET 0x00000300#define EFCH_PM_ACPI_MMIO_WDT_OFFSET 0x00000b00 + +#define EFCH_PM_ACPI_MMIO_PM_ADDR (EFCH_PM_ACPI_MMIO_ADDR + \ + EFCH_PM_ACPI_MMIO_PM_OFFSET) +#define EFCH_PM_ACPI_MMIO_PM_SIZE 8
Greg Kroah-Hartman
maintainerPATCH 15/158 Watchdog: sp5100_tco: Enable Family 17h+ CPUs
In reply to Greg Kroah-HartmanFrom: Terry Bowman <[email protected]>
commit 826270373f17fd8ebd10753ca0a5fd2ceb1dc38e upstream.
The driver currently uses a CPU family match of 17h to determine EFCH_PM_DECODEEN_WDT_TMREN register support. This family check will not support future AMD CPUs and instead will require driver updates to add support.
Remove the family 17h family check and add a check for SMBus PCI revision ID 0x51 or greater. The MMIO access method has been available since at least SMBus controllers using PCI revision 0x51. This revision check will support family 17h and future AMD processors including EFCH functionality without requiring driver changes.
--- drivers/watchdog/sp5100_tco.c | 16 ++++------------ drivers/watchdog/sp5100_tco.h | 1 + 2 files changed, 5 insertions(+), 12 deletions(-)
drivers/watchdog/sp5100_tco.c +4 -12
@@ -87,6 +87,10 @@ static enum tco_reg_layout tco_reg_layou dev->revision < 0x40) {return sp5100; } else if (dev->vendor == PCI_VENDOR_ID_AMD && + sp5100_tco_pci->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS && + sp5100_tco_pci->revision >= AMD_ZEN_SMBUS_PCI_REV) { +return efch_mmio; + } else if (dev->vendor == PCI_VENDOR_ID_AMD && ((dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS && dev->revision >= 0x41) || (dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS &&
@@ -459,18 +463,6 @@ static int sp5100_tco_setupdevice(structbreak ;case efch: dev_name =SB800_DEVNAME ; -/* -* On Family 17h devices, the EFCH_PM_DECODEEN_WDT_TMREN bit of -* EFCH_PM_DECODEEN not only enables the EFCH_PM_WDT_ADDR memory -* region, it also enables the watchdog itself. -*/ -if (boot_cpu_data.x86 ==0x17 ) { - val =sp5100_tco_read_pm_reg8 (EFCH_PM_DECODEEN ); -if (!(val &EFCH_PM_DECODEEN_WDT_TMREN )) { -sp5100_tco_update_pm_reg8 (EFCH_PM_DECODEEN ,0xff , -EFCH_PM_DECODEEN_WDT_TMREN ); - } - } val =sp5100_tco_read_pm_reg8 (EFCH_PM_DECODEEN );if (val &EFCH_PM_DECODEEN_WDT_TMREN ) mmio_addr =EFCH_PM_WDT_ADDR ;
drivers/watchdog/sp5100_tco.h +1 -0
@@ -89,3 +89,4 @@#define EFCH_PM_ACPI_MMIO_PM_ADDR (EFCH_PM_ACPI_MMIO_ADDR + \ EFCH_PM_ACPI_MMIO_PM_OFFSET)#define EFCH_PM_ACPI_MMIO_PM_SIZE 8 +#define AMD_ZEN_SMBUS_PCI_REV 0x51
Greg Kroah-Hartman
maintainerPATCH 16/158 Revert "drm/i915/opregion: check port number bounds for SWSCI display power state"
In reply to Greg Kroah-HartmanFrom: Greg Thelen <[email protected]>
This reverts commit b84857c06ef9e72d09fadafdbb3ce9af64af954f.
5.10 stable contains 2 identical commits:
1. commit eb7bf11e8ef1 ("drm/i915/opregion: check port number bounds for SWSCI display power state")
2. commit b84857c06ef9 ("drm/i915/opregion: check port number bounds for SWSCI display power state")
Both commits add separate checks for the same condition. Revert the 2nd redundant check to match upstream, which only has one check.
--- drivers/gpu/drm/i915/display/intel_opregion.c | 15 --------------- 1 file changed, 15 deletions(-)
drivers/gpu/drm/i915/display/intel_opregion.c +0 -15
@@ -375,21 +375,6 @@ int intel_opregion_notify_encoder(structreturn -EINVAL ; } -/* -* The port numbering and mapping here is bizarre. The now-obsolete -* swsci spec supports ports numbered [0..4]. Port E is handled as a -* special case, but port F and beyond are not. The functionality is -* supposed to be obsolete for new platforms. Just bail out if the port -* number is out of bounds after mapping. -*/ -if (port >4 ) { -drm_dbg_kms (&dev_priv->drm, -"[ENCODER:%d:%s] port %c (index %u) out of bounds for display power state notification\n" , - intel_encoder->base.base.id, intel_encoder->base.name, -port_name (intel_encoder->port), port); -return -EINVAL ; - } -if (!enable) parm |=4 <<8 ;
Greg Kroah-Hartman
maintainerPATCH 17/158 gfs2: cancel timed-out glock requests
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
[ Upstream commit 1fc05c8d8426d4085a219c23f8855c4aaf9e3ffb ]
The gfs2 evict code tries to upgrade the iopen glock from SH to EX. If the attempt to upgrade times out, gfs2 needs to tell dlm to cancel the lock request or it can deadlock. We also need to wake up the process waiting for the lock when dlm sends its AST back to gfs2.
--- fs/gfs2/glock.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/gfs2/glock.c +10 -0
@@ -669,6 +669,8 @@ static void finish_xmote(struct gfs2_glock *gl, unsigned int ret)/* Check for state != intended state */ if (unlikely (state != gl->gl_target)) { +if (gh && (ret &LM_OUT_CANCELED )) +gfs2_holder_wake (gh);if (gh && !test_bit (GLF_DEMOTE_IN_PROGRESS , &gl->gl_flags)) {/* move to back of queue and try next entry */ if (ret &LM_OUT_CANCELED ) {
@@ -1691,6 +1693,14 @@ void gfs2_glock_dq(struct gfs2_holder *gh)struct gfs2_glock *gl = gh->gh_gl;spin_lock (&gl->gl_lockref.lock); +if (list_is_first (&gh->gh_list, &gl->gl_holders) && + !test_bit (HIF_HOLDER , &gh->gh_iflags)) { +spin_unlock (&gl->gl_lockref.lock); + gl->gl_name.ln_sbd->sd_lockstruct.ls_ops->lm_cancel (gl); +wait_on_bit (&gh->gh_iflags,HIF_WAIT ,TASK_UNINTERRUPTIBLE ); +spin_lock (&gl->gl_lockref.lock); + } +__gfs2_glock_dq (gh);spin_unlock (&gl->gl_lockref.lock); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 18/158 gfs2: Switch lock order of inode and iopen glock
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
[ Upstream commit 29464ee36bcaaee2691249f49b9592b8d5c97ece ]
This patch tries to fix the continual ABBA deadlocks we keep having between the iopen and inode glocks. This switches the lock order in gfs2_inode_lookup and gfs2_create_inode so the iopen glock is always locked first.
--- fs/gfs2/inode.c | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-)
fs/gfs2/inode.c +27 -22
@@ -131,7 +131,21 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned int type,struct gfs2_sbd *sdp =GFS2_SB (inode);struct gfs2_glock *io_gl; - error =gfs2_glock_get (sdp, no_addr, &gfs2_inode_glops,CREATE , &ip->i_gl); + error =gfs2_glock_get (sdp, no_addr, &gfs2_inode_glops,CREATE , + &ip->i_gl); +if (unlikely (error)) + goto fail; + + error =gfs2_glock_get (sdp, no_addr, &gfs2_iopen_glops,CREATE , + &io_gl); +if (unlikely (error)) + goto fail; + +if (blktype !=GFS2_BLKST_UNLINKED ) +gfs2_cancel_delete_work (io_gl); + error =gfs2_glock_nq_init (io_gl,LM_ST_SHARED ,GL_EXACT , + &ip->i_iopen_gh); +gfs2_glock_put (io_gl);if (unlikely (error)) goto fail;
@@ -161,16 +175,6 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned int type,set_bit (GLF_INSTANTIATE_NEEDED , &ip->i_gl->gl_flags); - error =gfs2_glock_get (sdp, no_addr, &gfs2_iopen_glops,CREATE , &io_gl); -if (unlikely (error)) - goto fail; -if (blktype !=GFS2_BLKST_UNLINKED ) -gfs2_cancel_delete_work (io_gl); - error =gfs2_glock_nq_init (io_gl,LM_ST_SHARED ,GL_EXACT , &ip->i_iopen_gh); -gfs2_glock_put (io_gl); -if (unlikely (error)) - goto fail; -/* Lowest possible timestamp; will be overwritten in gfs2_dinode_in. */ inode->i_atime.tv_sec =1LL << (8 *sizeof (inode->i_atime.tv_sec) -1 ); inode->i_atime.tv_nsec =0 ;
@@ -716,13 +720,17 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, error =insert_inode_locked4 (inode, ip->i_no_addr, iget_test, &ip->i_no_addr);BUG_ON (error); - error =gfs2_glock_nq_init (ip->i_gl,LM_ST_EXCLUSIVE ,GL_SKIP , ghs +1 ); + error =gfs2_glock_nq_init (io_gl,LM_ST_SHARED ,GL_EXACT , &ip->i_iopen_gh);if (error) goto fail_gunlock2; + error =gfs2_glock_nq_init (ip->i_gl,LM_ST_EXCLUSIVE ,GL_SKIP , ghs +1 ); +if (error) + goto fail_gunlock3; + error =gfs2_trans_begin (sdp, blocks,0 );if (error) - goto fail_gunlock2; + goto fail_gunlock3;if (blocks >1 ) { ip->i_eattr = ip->i_no_addr +1 ;
@@ -731,10 +739,6 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,init_dinode (dip, ip, symname);gfs2_trans_end (sdp); - error =gfs2_glock_nq_init (io_gl,LM_ST_SHARED ,GL_EXACT , &ip->i_iopen_gh); -if (error) - goto fail_gunlock2; -glock_set_object (ip->i_gl, ip);glock_set_object (io_gl, ip);gfs2_set_iop (inode);
@@ -745,14 +749,14 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,if (default_acl) { error =__gfs2_set_acl (inode, default_acl,ACL_TYPE_DEFAULT );if (error) - goto fail_gunlock3; + goto fail_gunlock4;posix_acl_release (default_acl); default_acl =NULL ; }if (acl) { error =__gfs2_set_acl (inode, acl,ACL_TYPE_ACCESS );if (error) - goto fail_gunlock3; + goto fail_gunlock4;posix_acl_release (acl); acl =NULL ; }
@@ -760,11 +764,11 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, error =security_inode_init_security (&ip->i_inode, &dip->i_inode, name, &gfs2_initxattrs,NULL );if (error) - goto fail_gunlock3; + goto fail_gunlock4; error =link_dinode (dip, name, ip, &da);if (error) - goto fail_gunlock3; + goto fail_gunlock4;mark_inode_dirty (inode);d_instantiate (dentry, inode);
@@ -782,9 +786,10 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,unlock_new_inode (inode);return error; -fail_gunlock3: +fail_gunlock4:glock_clear_object (ip->i_gl, ip);glock_clear_object (io_gl, ip); +fail_gunlock3:gfs2_glock_dq_uninit (&ip->i_iopen_gh); fail_gunlock2:gfs2_glock_put (io_gl);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 19/158 rtc: fix use-after-free on device removal
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
[ Upstream commit c8fa17d9f08a448184f03d352145099b5beb618e ]
If the irqwork is still scheduled or running while the RTC device is removed, a use-after-free occurs in rtc_timer_do_work(). Cleanup the timerqueue and ensure the work is stopped to fix this.
BUG: KASAN: use-after-free in mutex_lock+0x94/0x110 Write of size 8 at addr ffffff801d846338 by task kworker/3:1/41 Workqueue: events rtc_timer_do_work Call trace: mutex_lock+0x94/0x110 rtc_timer_do_work+0xec/0x630 process_one_work+0x5fc/0x1344 ... Allocated by task 551: kmem_cache_alloc_trace+0x384/0x6e0 devm_rtc_allocate_device+0xf0/0x574 devm_rtc_device_register+0x2c/0x12c ... Freed by task 572: kfree+0x114/0x4d0 rtc_device_release+0x64/0x80 device_release+0x8c/0x1f4 kobject_put+0x1c4/0x4b0 put_device+0x20/0x30 devm_rtc_release_device+0x1c/0x30 devm_action_release+0x54/0x90 release_nodes+0x124/0x310 devres_release_group+0x170/0x240 i2c_device_remove+0xd8/0x314 ... Last potentially related work creation: insert_work+0x5c/0x330 queue_work_on+0xcc/0x154 rtc_set_time+0x188/0x5bc rtc_dev_ioctl+0x2ac/0xbd0 ...
--- drivers/rtc/class.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/rtc/class.c +9 -0
@@ -26,6 +26,15 @@ struct class *rtc_class;static void rtc_device_release (struct device *dev) {struct rtc_device *rtc =to_rtc_device (dev); +struct timerqueue_head *head = &rtc->timerqueue; +struct timerqueue_node *node; + +mutex_lock (&rtc->ops_lock); +while ((node =timerqueue_getnext (head))) +timerqueue_del (head, node); +mutex_unlock (&rtc->ops_lock); + +cancel_work_sync (&rtc->irqwork);ida_simple_remove (&rtc_ida, rtc->id);mutex_destroy (&rtc->ops_lock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 20/158 rtc: pcf2127: fix bug when reading alarm registers
In reply to Greg Kroah-HartmanFrom: Hugo Villeneuve <[email protected]>
[ Upstream commit 73ce05302007eece23a6acb7dc124c92a2209087 ]
The first bug is that reading the 5 alarm registers results in a read operation of 20 bytes. The reason is because the destination buffer is defined as an array of "unsigned int", and we use the sizeof() operator on this array to define the bulk read count.
The second bug is that the read value is invalid, because we are indexing the destination buffer as integers (4 bytes), instead of indexing it as u8.
Changing the destination buffer type to u8 fixes both problems.
--- drivers/rtc/rtc-pcf2127.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rtc/rtc-pcf2127.c +2 -1
@@ -374,7 +374,8 @@ static int pcf2127_watchdog_init(struct device *dev, struct pcf2127 *pcf2127)static int pcf2127_rtc_read_alarm (struct device *dev,struct rtc_wkalrm *alrm) {struct pcf2127 *pcf2127 =dev_get_drvdata (dev); -unsigned int buf[5 ], ctrl2; +u8 buf[5 ]; +unsigned int ctrl2;int ret; ret =regmap_read (pcf2127->regmap,PCF2127_REG_CTRL2 , &ctrl2);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 21/158 kconfig: add fflush() before ferror() check
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 868653f421cd37e8ec3880da19f0aac93f5c46cc ]
As David Laight pointed out, there is not much point in calling ferror() unless you call fflush() first.
--- scripts/kconfig/confdata.c | 2 ++ 1 file changed, 2 insertions(+)
scripts/kconfig/confdata.c +2 -0
@@ -979,6 +979,7 @@ static int conf_write_autoconf_cmd(const char *autoconf_name)fprintf (out,"\n$(deps_config): ;\n" ); +fflush (out); ret =ferror (out);/* error check for all fprintf() calls */ fclose (out);if (ret)
@@ -1097,6 +1098,7 @@ static int __conf_write_autoconf(const char *filename,if ((sym->flags &SYMBOL_WRITE ) && sym->name)print_symbol (file, sym); +fflush (file);/* check possible errors in conf_write_heading() and print_symbol() */ ret =ferror (file);fclose (file);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 22/158 um: Cleanup syscall_handler_t definition/cast, fix warning
In reply to Greg Kroah-HartmanFrom: David Gow <[email protected]>
[ Upstream commit f4f03f299a56ce4d73c5431e0327b3b6cb55ebb9 ]
The syscall_handler_t type for x86_64 was defined as 'long (*)(void)', but always cast to 'long (*)(long, long, long, long, long, long)' before use. This now triggers a warning (see below).
Define syscall_handler_t as the latter instead, and remove the cast. This simplifies the code, and fixes the warning.
Warning:
In file included from ../arch/um/include/asm/processor-generic.h:13
from ../arch/x86/um/asm/processor.h:41
from ../include/linux/rcupdate.h:30
from ../include/linux/rculist.h:11
from ../include/linux/pid.h:5
from ../include/linux/sched.h:14
from ../include/linux/ptrace.h:6
from ../arch/um/kernel/skas/syscall.c:7:../arch/um/kernel/skas/syscall.c: In function ‘handle_syscall’:../arch/x86/um/shared/sysdep/syscalls_64.h:18:11: warning: cast between incompatible function types from ‘long int (*)(void)’ to ‘long int (*)(long int, long int, long int, long int, long int, long int)’ [ -Wcast-function-type]
18 | (((long (*)(long, long, long, long, long, long)) \
| ^../arch/x86/um/asm/ptrace.h:36:62: note: in definition of macro ‘PT_REGS_SET_SYSCALL_RETURN’
36 | #define PT_REGS_SET_SYSCALL_RETURN(r, res) (PT_REGS_AX(r) = (res))
| ^~~../arch/um/kernel/skas/syscall.c:46:33: note: in expansion of macro ‘EXECUTE_SYSCALL’
46 | EXECUTE_SYSCALL(syscall, regs));
| ^~~~~~~~~~~~~~~--- arch/x86/um/shared/sysdep/syscalls_64.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/um/shared/sysdep/syscalls_64.h +2 -3
@@ -10,13 +10,12 @@#include <linux/msg.h> #include <linux/shm.h> -typedef long syscall_handler_t (void ); +typedef long syscall_handler_t (long ,long ,long ,long ,long ,long );extern syscall_handler_t *sys_call_table[];#define EXECUTE_SYSCALL (syscall, regs) \ - (((long (*)(long, long, long, long, long, long)) \ - (*sys_call_table[syscall]))(UPT_SYSCALL_ARG1(®s->regs), \ + (((*sys_call_table[syscall]))(UPT_SYSCALL_ARG1(®s->regs), \ UPT_SYSCALL_ARG2(®s->regs), \ UPT_SYSCALL_ARG3(®s->regs), \ UPT_SYSCALL_ARG4(®s->regs), \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 23/158 Input: add bounds checking to input_set_capability()
In reply to Greg Kroah-HartmanFrom: Jeff LaBundy <[email protected]>
[ Upstream commit 409353cbe9fe48f6bc196114c442b1cff05a39bc ]
Update input_set_capability() to prevent kernel panic in case the event code exceeds the bitmap for the given event type.
--- drivers/input/input.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/input/input.c +19 -0
@@ -47,6 +47,17 @@ static DEFINE_MUTEX(input_mutex);static const struct input_value input_value_sync = {EV_SYN ,SYN_REPORT ,1 }; +static const unsigned int input_max_code[EV_CNT ] = { + [EV_KEY ] =KEY_MAX , + [EV_REL ] =REL_MAX , + [EV_ABS ] =ABS_MAX , + [EV_MSC ] =MSC_MAX , + [EV_SW ] =SW_MAX , + [EV_LED ] =LED_MAX , + [EV_SND ] =SND_MAX , + [EV_FF ] =FF_MAX , +}; +static inline int is_event_supported (unsigned int code,unsigned long *bm,unsigned int max) {
@@ -2074,6 +2085,14 @@ EXPORT_SYMBOL(input_get_timestamp);*/ void input_set_capability (struct input_dev *dev,unsigned int type,unsigned int code) { +if (type <EV_CNT && input_max_code[type] && + code > input_max_code[type]) { +pr_err ("%s: invalid code %u for type %u\n" , __func__, code, + type); +dump_stack (); +return ; + } +switch (type) {case EV_KEY :__set_bit (code, dev->keybit);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 24/158 Input: stmfts - fix reference leak in stmfts_input_open
In reply to Greg Kroah-HartmanFrom: Zheng Yongjun <[email protected]>
[ Upstream commit 26623eea0da3476446909af96c980768df07bbd9 ]
pm_runtime_get_sync() will increment pm usage counter even it failed. Forgetting to call pm_runtime_put_noidle will result in reference leak in stmfts_input_open, so we should fix it.
--- drivers/input/touchscreen/stmfts.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/input/touchscreen/stmfts.c +5 -3
@@ -339,11 +339,11 @@ static int stmfts_input_open(struct input_dev *dev) err =pm_runtime_get_sync (&sdata->client->dev);if (err <0 ) -return err; + goto out; err =i2c_smbus_write_byte (sdata->client,STMFTS_MS_MT_SENSE_ON );if (err) -return err; + goto out;mutex_lock (&sdata->mutex); sdata->running = true;
@@ -366,7 +366,9 @@ static int stmfts_input_open(struct input_dev *dev) "failed to enable touchkey\n"); } -return 0 ; +out: +pm_runtime_put_noidle (&sdata->client->dev); +return err; }static void stmfts_input_close (struct input_dev *dev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 25/158 nvme-pci: add quirks for Samsung X5 SSDs
In reply to Greg Kroah-HartmanFrom: Monish Kumar R <[email protected]>
[ Upstream commit bc360b0b1611566e1bd47384daf49af6a1c51837 ]
Add quirks to not fail the initialization and to have quick resume latency after cold/warm reboot.
--- drivers/nvme/host/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +4 -1
@@ -3470,7 +3470,10 @@ static const struct pci_device_id nvme_id_table[] = { NVME_QUIRK_128_BYTES_SQES | NVME_QUIRK_SHARED_TAGS | NVME_QUIRK_SKIP_CID_GEN }, - + { PCI_DEVICE(0x144d, 0xa808), /* Samsung X5 */ + .driver_data =NVME_QUIRK_DELAY_BEFORE_CHK_RDY | +NVME_QUIRK_NO_DEEPEST_PS | + NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, { 0, } };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 26/158 gfs2: Disable page faults during lockless buffered reads
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
[ Upstream commit 52f3f033a5dbd023307520af1ff551cadfd7f037 ]
During lockless buffered reads, filemap_read() holds page cache page references while trying to copy data to the user-space buffer. The calling process isn't holding the inode glock, but the page references it holds prevent those pages from being removed from the page cache, and that prevents the underlying inode glock from being moved to another node. Thus, we can end up in the same kinds of distributed deadlock situations as with normal (non-lockless) buffered reads.
Fix that by disabling page faults during lockless reads as well.
--- fs/gfs2/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/gfs2/file.c +3 -1
@@ -956,14 +956,16 @@ static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to)return ret; iocb->ki_flags &= ~IOCB_DIRECT ; } +pagefault_disable (); iocb->ki_flags |=IOCB_NOIO ; ret =generic_file_read_iter (iocb, to); iocb->ki_flags &= ~IOCB_NOIO ; +pagefault_enable ();if (ret >=0 ) {if (!iov_iter_count (to))return ret; written = ret; - }else { + }else if (ret != -EFAULT ) {if (ret != -EAGAIN )return ret;if (iocb->ki_flags &IOCB_NOWAIT )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 27/158 rtc: sun6i: Fix time overflow handling
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit 9f6cd82eca7e91a0d0311242a87c6aa3c2737968 ]
Using "unsigned long" for UNIX timestamps is never a good idea, and comparing the value of such a variable against U32_MAX does not do anything useful on 32-bit systems.
Use the proper time64_t type when dealing with timestamps, and avoid cutting down the time range unnecessarily. This also fixes the flawed check for the alarm time being too far into the future.
The check for this condition is actually somewhat theoretical, as the RTC counts till 2033 only anyways, and 2^32 seconds from now is not before the year 2157 - at which point I hope nobody will be using this hardware anymore.
--- drivers/rtc/rtc-sun6i.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/rtc/rtc-sun6i.c +5 -9
@@ -138,7 +138,7 @@ struct sun6i_rtc_dev {const struct sun6i_rtc_clk_data *data;void __iomem *base;int irq; -unsigned long alarm; +time64_t alarm;struct clk_hw hw;struct clk_hw *int_osc;
@@ -510,10 +510,8 @@ static int sun6i_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm)struct sun6i_rtc_dev *chip =dev_get_drvdata (dev);struct rtc_time *alrm_tm = &wkalrm->time;struct rtc_time tm_now; -unsigned long time_now =0 ; -unsigned long time_set =0 ; -unsigned long time_gap =0 ; -int ret =0 ; +time64_t time_now, time_set; +int ret; ret =sun6i_rtc_gettime (dev, &tm_now);if (ret <0 ) {
@@ -528,9 +526,7 @@ static int sun6i_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm)return -EINVAL ; } - time_gap = time_set - time_now; - -if (time_gap >U32_MAX ) { +if ((time_set - time_now) >U32_MAX ) {dev_err (dev,"Date too far in the future\n" );return -EINVAL ; }
@@ -539,7 +535,7 @@ static int sun6i_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm)writel (0 , chip->base +SUN6I_ALRM_COUNTER );usleep_range (100 ,300 ); -writel (time_gap, chip->base +SUN6I_ALRM_COUNTER ); +writel (time_set - time_now, chip->base +SUN6I_ALRM_COUNTER ); chip->alarm = time_set;sun6i_rtc_setaie (wkalrm->enabled, chip);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 28/158 crypto: stm32 - fix reference leak in stm32_crc_remove
In reply to Greg Kroah-HartmanFrom: Zheng Yongjun <[email protected]>
[ Upstream commit e9a36feecee0ee5845f2e0656f50f9942dd0bed3 ]
pm_runtime_get_sync() will increment pm usage counter even it failed. Forgetting to call pm_runtime_put_noidle will result in reference leak in stm32_crc_remove, so we should fix it.
--- drivers/crypto/stm32/stm32-crc32.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/crypto/stm32/stm32-crc32.c +3 -1
@@ -384,8 +384,10 @@ static int stm32_crc_remove(struct platform_device *pdev)struct stm32_crc *crc =platform_get_drvdata (pdev);int ret =pm_runtime_get_sync (crc->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_noidle (crc->dev);return ret; + }spin_lock (&crc_list.lock);list_del (&crc->list);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 29/158 crypto: x86/chacha20 - Avoid spurious jumps to other functions
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 4327d168515fd8b5b92fa1efdf1d219fb6514460 ]
The chacha_Nblock_xor_avx512vl() functions all have their own, identical, .LdoneN label, however in one particular spot {2,4} jump to the 8 version instead of their own. Resulting in:
arch/x86/crypto/chacha-x86_64.o: warning: objtool: chacha_2block_xor_avx512vl() falls through to next function chacha_8block_xor_avx512vl() arch/x86/crypto/chacha-x86_64.o: warning: objtool: chacha_4block_xor_avx512vl() falls through to next function chacha_8block_xor_avx512vl()
Make each function consistently use its own done label.
--- arch/x86/crypto/chacha-avx512vl-x86_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/crypto/chacha-avx512vl-x86_64.S +2 -2
@@ -172,7 +172,7 @@ SYM_FUNC_START(chacha_2block_xor_avx512vl) # xor remaining bytes from partial register into output mov %rcx,%rax and $0xf,%rcx - jz .Ldone8 + jz .Ldone2 mov %rax,%r9 and $~0xf,%r9
@@ -438,7 +438,7 @@ SYM_FUNC_START(chacha_4block_xor_avx512vl) # xor remaining bytes from partial register into output mov %rcx,%rax and $0xf,%rcx - jz .Ldone8 + jz .Ldone4 mov %rax,%r9 and $~0xf,%r9
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 30/158 ALSA: hda/realtek: Enable headset mic on Lenovo P360
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 5a8738571747c1e275a40b69a608657603867b7e ]
Lenovo P360 is another platform equipped with ALC897, and it needs ALC897_FIXUP_HEADSET_MIC_PIN quirk to make its headset mic work.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -11106,6 +11106,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {SND_PCI_QUIRK (0x144d ,0xc051 ,"Samsung R720" ,ALC662_FIXUP_IDEAPAD ),SND_PCI_QUIRK (0x14cd ,0x5003 ,"USI" ,ALC662_FIXUP_USI_HEADSET_MODE ),SND_PCI_QUIRK (0x17aa ,0x1036 ,"Lenovo P520" ,ALC662_FIXUP_LENOVO_MULTI_CODECS ), +SND_PCI_QUIRK (0x17aa ,0x1057 ,"Lenovo P360" ,ALC897_FIXUP_HEADSET_MIC_PIN ),SND_PCI_QUIRK (0x17aa ,0x32ca ,"Lenovo ThinkCentre M80" ,ALC897_FIXUP_HEADSET_MIC_PIN ),SND_PCI_QUIRK (0x17aa ,0x32cb ,"Lenovo ThinkCentre M70" ,ALC897_FIXUP_HEADSET_MIC_PIN ), SND_PCI_QUIRK(0x17aa, 0x32cf, "Lenovo ThinkCentre M950", ALC897_FIXUP_HEADSET_MIC_PIN),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 31/158 s390/traps: improve panic message for translation-specification exception
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
[ Upstream commit f09354ffd84eef3c88efa8ba6df05efe50cfd16a ]
There are many different types of translation exceptions but only a translation-specification exception leads to a kernel panic since it indicates corrupted page tables, which must never happen.
Improve the panic message so it is a bit more obvious what this is about.
--- arch/s390/kernel/traps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/s390/kernel/traps.c +3 -3
@@ -142,10 +142,10 @@ static inline void do_fp_trap(struct pt_regs *regs, __u32 fpc)do_trap (regs,SIGFPE , si_code,"floating point exception" ); } -static void translation_exception (struct pt_regs *regs) +static void translation_specification_exception (struct pt_regs *regs) {/* May never happen. */ -panic ("Translation exception" ); +panic ("Translation-Specification Exception" ); }static void illegal_op (struct pt_regs *regs)
@@ -374,7 +374,7 @@ static void (*pgm_check_table[128])(struct pt_regs *regs) = { [0x0f] = hfp_divide_exception, [0x10] = do_dat_exception, [0x11] = do_dat_exception, - [0x12] = translation_exception, + [0x12] = translation_specification_exception, [0x13] = special_op_exception, [0x14] = default_trap_handler, [0x15] = operand_exception,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 32/158 s390/pci: improve zpci_dev reference counting
In reply to Greg Kroah-HartmanFrom: Niklas Schnelle <[email protected]>
[ Upstream commit c122383d221dfa2f41cfe5e672540595de986fde ]
Currently zpci_dev uses kref based reference counting but only accounts for one original reference plus one reference from an added pci_dev to its underlying zpci_dev. Counting just the original reference worked until the pci_dev reference was added in commit 2a671f77ee49 ("s390/pci:
fix use after free of zpci_dev") because once a zpci_dev goes away, i.e. enters the reserved state, it would immediately get released. However with the pci_dev reference this is no longer the case and the zpci_dev may still appear in multiple availability events indicating that it was reserved. This was solved by detecting when the zpci_dev is already on its way out but still hanging around. This has however shown some light on how unusual our zpci_dev reference counting is.
Improve upon this by modelling zpci_dev reference counting on pci_dev. Analogous to pci_get_slot() increment the reference count in get_zdev_by_fid(). Thus all users of get_zdev_by_fid() must drop the reference once they are done with the zpci_dev.
Similar to pci_scan_single_device(), zpci_create_device() returns the device with an initial count of 1 and the device added to the zpci_list (analogous to the PCI bus' device_list). In turn users of zpci_create_device() must only drop the reference once the device is gone from the point of view of the zPCI subsystem, it might still be referenced by the common PCI subsystem though.
--- arch/s390/pci/pci.c | 1 + arch/s390/pci/pci_bus.h | 3 ++- arch/s390/pci/pci_clp.c | 9 +++++++-- arch/s390/pci/pci_event.c | 7 ++++++- 4 files changed, 16 insertions(+), 4 deletions(-)
arch/s390/pci/pci.c +1 -0
@@ -69,6 +69,7 @@ struct zpci_dev *get_zdev_by_fid(u32 fid)list_for_each_entry (tmp, &zpci_list, entry) {if (tmp->fid == fid) { zdev = tmp; +zpci_zdev_get (zdev);break ; } }
arch/s390/pci/pci_bus.h +2 -1
@@ -19,7 +19,8 @@ void zpci_bus_remove_device(struct zpci_dev *zdev, bool set_error);void zpci_release_device (struct kref *kref);static inline void zpci_zdev_put (struct zpci_dev *zdev) { -kref_put (&zdev->kref, zpci_release_device); +if (zdev) +kref_put (&zdev->kref, zpci_release_device); }static inline void zpci_zdev_get (struct zpci_dev *zdev)
arch/s390/pci/pci_clp.c +7 -2
@@ -22,6 +22,8 @@#include <asm/clp.h> #include <uapi/asm/clp.h> +#include "pci_bus.h" +bool zpci_unique_uid;void update_uid_checking (bool new)
@@ -403,8 +405,11 @@ static void __clp_add(struct clp_fh_list_entry *entry, void *data)return ; zdev =get_zdev_by_fid (entry->fid); -if (!zdev) -zpci_create_device (entry->fid, entry->fh, entry->config_state); +if (zdev) { +zpci_zdev_put (zdev); +return ; + } +zpci_create_device (entry->fid, entry->fh, entry->config_state); }int clp_scan_pci_devices (void )
arch/s390/pci/pci_event.c +6 -1
@@ -269,7 +269,7 @@ static void __zpci_event_error(struct zpci_ccdf_err *ccdf) pdev ? pci_name(pdev) : "n/a", ccdf->pec, ccdf->fid);if (!pdev) -return ; + goto no_pdev;switch (ccdf->pec) {case 0x003a :/* Service Action or Error Recovery Successful */
@@ -286,6 +286,8 @@ static void __zpci_event_error(struct zpci_ccdf_err *ccdf)break ; }pci_dev_put (pdev); +no_pdev: +zpci_zdev_put (zdev); }void zpci_event_error (void *data)
@@ -314,6 +316,7 @@ static void zpci_event_hard_deconfigured(struct zpci_dev *zdev, u32 fh)static void __zpci_event_availability (struct zpci_ccdf_avail *ccdf) {struct zpci_dev *zdev =get_zdev_by_fid (ccdf->fid); +bool existing_zdev = !!zdev;enum zpci_state state; zpci_dbg(3, "avl fid:%x, fh:%x, pec:%x\n",
@@ -378,6 +381,8 @@ static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf)default :break ; } +if (existing_zdev) +zpci_zdev_put (zdev); }void zpci_event_availability (void *data)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 33/158 vhost_vdpa: dont setup irq offloading when irq_num < 0
In reply to Greg Kroah-HartmanFrom: Zhu Lingshan <[email protected]>
[ Upstream commit cce0ab2b2a39072d81f98017f7b076f3410ef740 ]
When irq number is negative(e.g., -EINVAL), the virtqueue may be disabled or the virtqueues are sharing a device irq. In such case, we should not setup irq offloading for a virtqueue.
--- drivers/vhost/vdpa.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/vhost/vdpa.c +4 -1
@@ -97,8 +97,11 @@ static void vhost_vdpa_setup_vq_irq(struct vhost_vdpa *v, u16 qid)return ; irq = ops->get_vq_irq (vdpa, qid); +if (irq <0 ) +return ; +irq_bypass_unregister_producer (&vq->call_ctx.producer); -if (!vq->call_ctx.ctx || irq <0 ) +if (!vq->call_ctx.ctx)return ; vq->call_ctx.producer.token = vq->call_ctx.ctx;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 34/158 tools/virtio: compile with -pthread
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit f03560a57c1f60db6ac23ffd9714e1c69e2f95c7 ]
When using pthreads, one has to compile and link with -lpthread, otherwise e.g. glibc is not guaranteed to be reentrant.
This replaces -lpthread.
--- tools/virtio/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/virtio/Makefile +2 -1
@@ -5,7 +5,8 @@ virtio_test: virtio_ring.o virtio_test.o vringh_test: vringh_test.o vringh.o virtio_ring.o CFLAGS += -g -O2 -Werror -Wno-maybe-uninitialized -Wall -I. -I../include/ -I ../../usr/include/ -Wno-pointer-sign -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD -U_FORTIFY_SOURCE -include ../../include/linux/kconfig.h -LDFLAGS += -lpthread +CFLAGS += -pthread +LDFLAGS += -pthread vpath %.c ../../drivers/virtio ../../drivers/vhost mod: ${MAKE} -C `pwd`/../.. M=`pwd`/vhost_test V=${V}
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 35/158 smb3: cleanup and clarify status of tree connections
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
[ Upstream commit fdf59eb548e51bce81382c39f1a5fd4cb9403b78 ]
Currently the way the tid (tree connection) status is tracked is confusing. The same enum is used for structs cifs_tcon and cifs_ses and TCP_Server_info, but each of these three has different states that they transition among. The current code also unnecessarily uses camelCase.
Convert from use of statusEnum to a new tid_status_enum for tree connections. The valid states for a tid are:
TID_NEW = 0,
TID_GOOD,
TID_EXITING,
TID_NEED_RECON,
TID_NEED_TCON,
TID_IN_TCON,
TID_NEED_FILES_INVALIDATE, /* unused, considering removing in future */ TID_IN_FILES_INVALIDATE
It also removes CifsNeedTcon, CifsInTcon, CifsNeedFilesInvalidate and CifsInFilesInvalidate from the statusEnum used for session and TCP_Server_Info since they are not relevant for those.
A follow on patch will fix the places where we use the tcon->need_reconnect flag to be more consistent with the tid->status.
Also fixes a bug that was:
--- fs/cifs/cifs_debug.c | 2 +- fs/cifs/cifsfs.c | 4 ++-- fs/cifs/cifsglob.h | 18 +++++++++++++----- fs/cifs/cifssmb.c | 11 +++++------ fs/cifs/connect.c | 32 ++++++++++++++++---------------- fs/cifs/misc.c | 2 +- fs/cifs/smb2pdu.c | 4 ++-- 7 files changed, 40 insertions(+), 33 deletions(-)
fs/cifs/cifs_debug.c +1 -1
@@ -94,7 +94,7 @@ static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon)le32_to_cpu (tcon->fsDevInfo.DeviceCharacteristics),le32_to_cpu (tcon->fsAttrInfo.Attributes),le32_to_cpu (tcon->fsAttrInfo.MaxPathNameComponentLength), - tcon->tidStatus); + tcon->status);if (dev_type ==FILE_DEVICE_DISK )seq_puts (m," type: DISK " );else if (dev_type ==FILE_DEVICE_CD_ROM )
fs/cifs/cifsfs.c +2 -2
@@ -701,14 +701,14 @@ static void cifs_umount_begin(struct super_block *sb) tcon =cifs_sb_master_tcon (cifs_sb);spin_lock (&cifs_tcp_ses_lock); -if ((tcon->tc_count >1 ) || (tcon->tidStatus == CifsExiting)) { +if ((tcon->tc_count >1 ) || (tcon->status ==TID_EXITING )) {/* we have other mounts to same share or we have already tried to force umount this and woken up all waiting network requests, nothing to do */ spin_unlock (&cifs_tcp_ses_lock);return ; }else if (tcon->tc_count ==1 ) - tcon->tidStatus = CifsExiting; + tcon->status =TID_EXITING ;spin_unlock (&cifs_tcp_ses_lock);/* cancel_brl_requests(tcon); */ /* BB mark all brl mids as exiting */
fs/cifs/cifsglob.h +13 -5
@@ -115,10 +115,18 @@ enum statusEnum { CifsInNegotiate, CifsNeedSessSetup, CifsInSessSetup, - CifsNeedTcon, - CifsInTcon, - CifsNeedFilesInvalidate, - CifsInFilesInvalidate +}; + +/* associated with each tree connection to the server */ +enum tid_status_enum { +TID_NEW =0 , +TID_GOOD , +TID_EXITING , +TID_NEED_RECON , +TID_NEED_TCON , +TID_IN_TCON , +TID_NEED_FILES_INVALIDATE ,/* currently unused */ +TID_IN_FILES_INVALIDATE }; enum securityEnum {
@@ -1038,7 +1046,7 @@ struct cifs_tcon {char *password;/* for share-level security */ __u32 tid;/* The 4 byte tree id */ __u16 Flags;/* optional support bits */ -enum statusEnum tidStatus; +enum tid_status_enum status;atomic_t num_smbs_sent; union { struct {
fs/cifs/cifssmb.c +5 -6
@@ -75,12 +75,11 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon)/* only send once per connect */ spin_lock (&cifs_tcp_ses_lock); -if (tcon->ses->status != CifsGood || - tcon->tidStatus != CifsNeedReconnect) { +if ((tcon->ses->status != CifsGood) || (tcon->status !=TID_NEED_RECON )) {spin_unlock (&cifs_tcp_ses_lock);return ; } - tcon->tidStatus = CifsInFilesInvalidate; + tcon->status =TID_IN_FILES_INVALIDATE ;spin_unlock (&cifs_tcp_ses_lock);/* list all files open on tree connection and mark them invalid */
@@ -100,8 +99,8 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon)mutex_unlock (&tcon->crfid.fid_mutex);spin_lock (&cifs_tcp_ses_lock); -if (tcon->tidStatus == CifsInFilesInvalidate) - tcon->tidStatus = CifsNeedTcon; +if (tcon->status ==TID_IN_FILES_INVALIDATE ) + tcon->status =TID_NEED_TCON ;spin_unlock (&cifs_tcp_ses_lock);/*
@@ -136,7 +135,7 @@ cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command)* have tcon) are allowed as we start force umount */ spin_lock (&cifs_tcp_ses_lock); -if (tcon->tidStatus == CifsExiting) { +if (tcon->status ==TID_EXITING ) {if (smb_command !=SMB_COM_WRITE_ANDX && smb_command !=SMB_COM_OPEN_ANDX && smb_command !=SMB_COM_TREE_DISCONNECT ) {
fs/cifs/connect.c +16 -16
@@ -245,7 +245,7 @@ cifs_mark_tcp_ses_conns_for_reconnect(struct TCP_Server_Info *server,list_for_each_entry (tcon, &ses->tcon_list, tcon_list) { tcon->need_reconnect = true; - tcon->tidStatus = CifsNeedReconnect; + tcon->status =TID_NEED_RECON ; }if (ses->tcon_ipc) ses->tcon_ipc->need_reconnect = true;
@@ -2217,7 +2217,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb3_fs_context *ctx)static int match_tcon (struct cifs_tcon *tcon,struct smb3_fs_context *ctx) { -if (tcon->tidStatus == CifsExiting) +if (tcon->status ==TID_EXITING )return 0 ;if (strncmp (tcon->treeName, ctx->UNC,MAX_TREE_SIZE ))return 0 ;
@@ -4498,12 +4498,12 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru/* only send once per connect */ spin_lock (&cifs_tcp_ses_lock);if (tcon->ses->status != CifsGood || - (tcon->tidStatus != CifsNew && - tcon->tidStatus != CifsNeedTcon)) { + (tcon->status !=TID_NEW && + tcon->status !=TID_NEED_TCON )) {spin_unlock (&cifs_tcp_ses_lock);return 0 ; } - tcon->tidStatus = CifsInTcon; + tcon->status =TID_IN_TCON ;spin_unlock (&cifs_tcp_ses_lock); tree =kzalloc (MAX_TREE_SIZE ,GFP_KERNEL );
@@ -4544,13 +4544,13 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const struif (rc) {spin_lock (&cifs_tcp_ses_lock); -if (tcon->tidStatus == CifsInTcon) - tcon->tidStatus = CifsNeedTcon; +if (tcon->status ==TID_IN_TCON ) + tcon->status =TID_NEED_TCON ;spin_unlock (&cifs_tcp_ses_lock); }else {spin_lock (&cifs_tcp_ses_lock); -if (tcon->tidStatus == CifsInTcon) - tcon->tidStatus = CifsGood; +if (tcon->status ==TID_IN_TCON ) + tcon->status =TID_GOOD ;spin_unlock (&cifs_tcp_ses_lock); tcon->need_reconnect = false; }
@@ -4566,24 +4566,24 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru/* only send once per connect */ spin_lock (&cifs_tcp_ses_lock);if (tcon->ses->status != CifsGood || - (tcon->tidStatus != CifsNew && - tcon->tidStatus != CifsNeedTcon)) { + (tcon->status !=TID_NEW && + tcon->status !=TID_NEED_TCON )) {spin_unlock (&cifs_tcp_ses_lock);return 0 ; } - tcon->tidStatus = CifsInTcon; + tcon->status =TID_IN_TCON ;spin_unlock (&cifs_tcp_ses_lock); rc = ops->tree_connect (xid, tcon->ses, tcon->treeName, tcon, nlsc);if (rc) {spin_lock (&cifs_tcp_ses_lock); -if (tcon->tidStatus == CifsInTcon) - tcon->tidStatus = CifsNeedTcon; +if (tcon->status ==TID_IN_TCON ) + tcon->status =TID_NEED_TCON ;spin_unlock (&cifs_tcp_ses_lock); }else {spin_lock (&cifs_tcp_ses_lock); -if (tcon->tidStatus == CifsInTcon) - tcon->tidStatus = CifsGood; +if (tcon->status ==TID_IN_TCON ) + tcon->status =TID_GOOD ;spin_unlock (&cifs_tcp_ses_lock); tcon->need_reconnect = false; }
fs/cifs/misc.c +1 -1
@@ -116,7 +116,7 @@ tconInfoAlloc(void) }atomic_inc (&tconInfoAllocCount); - ret_buf->tidStatus = CifsNew; + ret_buf->status =TID_NEW ; ++ret_buf->tc_count;INIT_LIST_HEAD (&ret_buf->openFileList);INIT_LIST_HEAD (&ret_buf->tcon_list);
fs/cifs/smb2pdu.c +2 -2
@@ -163,7 +163,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon,return 0 ;spin_lock (&cifs_tcp_ses_lock); -if (tcon->tidStatus == CifsExiting) { +if (tcon->status ==TID_EXITING ) {/* * only tree disconnect, open, and write, * (and ulogoff which does not have tcon)
@@ -3865,7 +3865,7 @@ void smb2_reconnect_server(struct work_struct *work) goto done; } - tcon->tidStatus = CifsGood; + tcon->status =TID_GOOD ; tcon->retry = false; tcon->need_reconnect = false;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 36/158 nvmet: use a private workqueue instead of the system workqueue
In reply to Greg Kroah-HartmanFrom: Sagi Grimberg <[email protected]>
[ Upstream commit 8832cf922151e9dfa2821736beb0ae2dd3968b6e ]
Any attempt to flush kernel-global WQs has possibility of deadlock so we should simply stop using them, instead introduce nvmet_wq which is the generic nvmet workqueue for work elements that don't explicitly require a dedicated workqueue (by the mere fact that they are using the system_wq).
Changes were done using the following replaces:
- s/schedule_work(/queue_work(nvmet_wq, /g
- s/schedule_delayed_work(/queue_delayed_work(nvmet_wq, /g
- s/flush_scheduled_work()/flush_workqueue(nvmet_wq)/g
--- drivers/nvme/target/admin-cmd.c | 2 +- drivers/nvme/target/configfs.c | 2 +- drivers/nvme/target/core.c | 24 ++++++++++++++++++------ drivers/nvme/target/fc.c | 8 ++++---- drivers/nvme/target/fcloop.c | 16 ++++++++-------- drivers/nvme/target/io-cmd-file.c | 6 +++--- drivers/nvme/target/loop.c | 4 ++-- drivers/nvme/target/nvmet.h | 1 + drivers/nvme/target/passthru.c | 2 +- drivers/nvme/target/rdma.c | 12 ++++++------ drivers/nvme/target/tcp.c | 10 +++++----- 11 files changed, 50 insertions(+), 37 deletions(-)
drivers/nvme/target/admin-cmd.c +1 -1
@@ -984,7 +984,7 @@ void nvmet_execute_async_event(struct nvmet_req *req) ctrl->async_event_cmds[ctrl->nr_async_event_cmds++] = req;mutex_unlock (&ctrl->lock); -schedule_work (&ctrl->async_event_work); +queue_work (nvmet_wq, &ctrl->async_event_work); }void nvmet_execute_keep_alive (struct nvmet_req *req)
drivers/nvme/target/configfs.c +1 -1
@@ -1554,7 +1554,7 @@ static void nvmet_port_release(struct config_item *item)struct nvmet_port *port =to_nvmet_port (item);/* Let inflight controllers teardown complete */ -flush_scheduled_work (); +flush_workqueue (nvmet_wq);list_del (&port->global_entry);kfree (port->ana_state);
drivers/nvme/target/core.c +18 -6
@@ -20,6 +20,9 @@ struct workqueue_struct *zbd_wq;static const struct nvmet_fabrics_ops *nvmet_transports[NVMF_TRTYPE_MAX ];static DEFINE_IDA (cntlid_ida); +struct workqueue_struct *nvmet_wq; +EXPORT_SYMBOL_GPL (nvmet_wq); +/* * This read/write semaphore is used to synchronize access to configuration * information on a target system that will result in discovery log page
@@ -205,7 +208,7 @@ void nvmet_add_async_event(struct nvmet_ctrl *ctrl, u8 event_type,list_add_tail (&aen->entry, &ctrl->async_events);mutex_unlock (&ctrl->lock); -schedule_work (&ctrl->async_event_work); +queue_work (nvmet_wq, &ctrl->async_event_work); }static void nvmet_add_to_changed_ns_log (struct nvmet_ctrl *ctrl,__le32 nsid)
@@ -385,7 +388,7 @@ static void nvmet_keep_alive_timer(struct work_struct *work)if (reset_tbkas) {pr_debug ("ctrl %d reschedule traffic based keep-alive timer\n" , ctrl->cntlid); -schedule_delayed_work (&ctrl->ka_work, ctrl->kato *HZ ); +queue_delayed_work (nvmet_wq, &ctrl->ka_work, ctrl->kato *HZ );return ; }
@@ -403,7 +406,7 @@ void nvmet_start_keep_alive_timer(struct nvmet_ctrl *ctrl)pr_debug ("ctrl %d start keep-alive timer for %d secs\n" , ctrl->cntlid, ctrl->kato); -schedule_delayed_work (&ctrl->ka_work, ctrl->kato *HZ ); +queue_delayed_work (nvmet_wq, &ctrl->ka_work, ctrl->kato *HZ ); }void nvmet_stop_keep_alive_timer (struct nvmet_ctrl *ctrl)
@@ -1479,7 +1482,7 @@ void nvmet_ctrl_fatal_error(struct nvmet_ctrl *ctrl)mutex_lock (&ctrl->lock);if (!(ctrl->csts &NVME_CSTS_CFS )) { ctrl->csts |=NVME_CSTS_CFS ; -schedule_work (&ctrl->fatal_err_work); +queue_work (nvmet_wq, &ctrl->fatal_err_work); }mutex_unlock (&ctrl->lock); }
@@ -1620,9 +1623,15 @@ static int __init nvmet_init(void) goto out_free_zbd_work_queue; } + nvmet_wq =alloc_workqueue ("nvmet-wq" ,WQ_MEM_RECLAIM ,0 ); +if (!nvmet_wq) { + error = -ENOMEM ; + goto out_free_buffered_work_queue; + } + error =nvmet_init_discovery ();if (error) - goto out_free_work_queue; + goto out_free_nvmet_work_queue; error =nvmet_init_configfs ();if (error)
@@ -1631,7 +1640,9 @@ static int __init nvmet_init(void) out_exit_discovery:nvmet_exit_discovery (); -out_free_work_queue: +out_free_nvmet_work_queue: +destroy_workqueue (nvmet_wq); +out_free_buffered_work_queue:destroy_workqueue (buffered_io_wq); out_free_zbd_work_queue:destroy_workqueue (zbd_wq);
@@ -1643,6 +1654,7 @@ static void __exit nvmet_exit(void)nvmet_exit_configfs ();nvmet_exit_discovery ();ida_destroy (&cntlid_ida); +destroy_workqueue (nvmet_wq);destroy_workqueue (buffered_io_wq);destroy_workqueue (zbd_wq);
drivers/nvme/target/fc.c +4 -4
@@ -1491,7 +1491,7 @@ __nvmet_fc_free_assocs(struct nvmet_fc_tgtport *tgtport)list_for_each_entry_rcu (assoc, &tgtport->assoc_list, a_list) {if (!nvmet_fc_tgt_a_get (assoc))continue ; -if (!schedule_work (&assoc->del_work)) +if (!queue_work (nvmet_wq, &assoc->del_work))/* already deleting - release local reference */ nvmet_fc_tgt_a_put (assoc); }
@@ -1546,7 +1546,7 @@ nvmet_fc_invalidate_host(struct nvmet_fc_target_port *target_port,continue ; assoc->hostport->invalid =1 ; noassoc = false; -if (!schedule_work (&assoc->del_work)) +if (!queue_work (nvmet_wq, &assoc->del_work))/* already deleting - release local reference */ nvmet_fc_tgt_a_put (assoc); }
@@ -1592,7 +1592,7 @@ nvmet_fc_delete_ctrl(struct nvmet_ctrl *ctrl)nvmet_fc_tgtport_put (tgtport);if (found_ctrl) { -if (!schedule_work (&assoc->del_work)) +if (!queue_work (nvmet_wq, &assoc->del_work))/* already deleting - release local reference */ nvmet_fc_tgt_a_put (assoc);return ;
@@ -2060,7 +2060,7 @@ nvmet_fc_rcv_ls_req(struct nvmet_fc_target_port *target_port, iod->rqstdatalen = lsreqbuf_len; iod->hosthandle = hosthandle; -schedule_work (&iod->work); +queue_work (nvmet_wq, &iod->work);return 0 ; }
drivers/nvme/target/fcloop.c +8 -8
@@ -360,7 +360,7 @@ fcloop_h2t_ls_req(struct nvme_fc_local_port *localport,spin_lock (&rport->lock);list_add_tail (&rport->ls_list, &tls_req->ls_list);spin_unlock (&rport->lock); -schedule_work (&rport->ls_work); +queue_work (nvmet_wq, &rport->ls_work);return ret; }
@@ -393,7 +393,7 @@ fcloop_h2t_xmt_ls_rsp(struct nvmet_fc_target_port *targetport,spin_lock (&rport->lock);list_add_tail (&rport->ls_list, &tls_req->ls_list);spin_unlock (&rport->lock); -schedule_work (&rport->ls_work); +queue_work (nvmet_wq, &rport->ls_work); }return 0 ;
@@ -448,7 +448,7 @@ fcloop_t2h_ls_req(struct nvmet_fc_target_port *targetport, void *hosthandle,spin_lock (&tport->lock);list_add_tail (&tport->ls_list, &tls_req->ls_list);spin_unlock (&tport->lock); -schedule_work (&tport->ls_work); +queue_work (nvmet_wq, &tport->ls_work);return ret; }
@@ -480,7 +480,7 @@ fcloop_t2h_xmt_ls_rsp(struct nvme_fc_local_port *localport,spin_lock (&tport->lock);list_add_tail (&tport->ls_list, &tls_req->ls_list);spin_unlock (&tport->lock); -schedule_work (&tport->ls_work); +queue_work (nvmet_wq, &tport->ls_work); }return 0 ;
@@ -520,7 +520,7 @@ fcloop_tgt_discovery_evt(struct nvmet_fc_target_port *tgtport) tgt_rscn->tport = tgtport->private;INIT_WORK (&tgt_rscn->work, fcloop_tgt_rscn_work); -schedule_work (&tgt_rscn->work); +queue_work (nvmet_wq, &tgt_rscn->work); } static void
@@ -739,7 +739,7 @@ fcloop_fcp_req(struct nvme_fc_local_port *localport,INIT_WORK (&tfcp_req->tio_done_work, fcloop_tgt_fcprqst_done_work);kref_init (&tfcp_req->ref); -schedule_work (&tfcp_req->fcp_rcv_work); +queue_work (nvmet_wq, &tfcp_req->fcp_rcv_work);return 0 ; }
@@ -921,7 +921,7 @@ fcloop_fcp_req_release(struct nvmet_fc_target_port *tgtport, {struct fcloop_fcpreq *tfcp_req =tgt_fcp_req_to_fcpreq (tgt_fcpreq); -schedule_work (&tfcp_req->tio_done_work); +queue_work (nvmet_wq, &tfcp_req->tio_done_work); } static void
@@ -976,7 +976,7 @@ fcloop_fcp_abort(struct nvme_fc_local_port *localport,if (abortio)/* leave the reference while the work item is scheduled */ -WARN_ON (!schedule_work (&tfcp_req->abort_rcv_work)); +WARN_ON (!queue_work (nvmet_wq, &tfcp_req->abort_rcv_work));else {/* * as the io has already had the done callback made,
drivers/nvme/target/io-cmd-file.c +3 -3
@@ -292,7 +292,7 @@ static void nvmet_file_execute_flush(struct nvmet_req *req)if (!nvmet_check_transfer_len (req,0 ))return ;INIT_WORK (&req->f.work, nvmet_file_flush_work); -schedule_work (&req->f.work); +queue_work (nvmet_wq, &req->f.work); }static void nvmet_file_execute_discard (struct nvmet_req *req)
@@ -352,7 +352,7 @@ static void nvmet_file_execute_dsm(struct nvmet_req *req)if (!nvmet_check_data_len_lte (req,nvmet_dsm_len (req)))return ;INIT_WORK (&req->f.work, nvmet_file_dsm_work); -schedule_work (&req->f.work); +queue_work (nvmet_wq, &req->f.work); }static void nvmet_file_write_zeroes_work (struct work_struct *w)
@@ -382,7 +382,7 @@ static void nvmet_file_execute_write_zeroes(struct nvmet_req *req)if (!nvmet_check_transfer_len (req,0 ))return ;INIT_WORK (&req->f.work, nvmet_file_write_zeroes_work); -schedule_work (&req->f.work); +queue_work (nvmet_wq, &req->f.work); }u16 nvmet_file_parse_io_cmd (struct nvmet_req *req)
drivers/nvme/target/loop.c +2 -2
@@ -166,7 +166,7 @@ static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx, iod->req.transfer_len =blk_rq_payload_bytes (req); } -schedule_work (&iod->work); +queue_work (nvmet_wq, &iod->work);return BLK_STS_OK ; }
@@ -187,7 +187,7 @@ static void nvme_loop_submit_async_event(struct nvme_ctrl *arg)return ; } -schedule_work (&iod->work); +queue_work (nvmet_wq, &iod->work); } static int nvme_loop_init_iod(struct nvme_loop_ctrl *ctrl,
drivers/nvme/target/nvmet.h +1 -0
@@ -366,6 +366,7 @@ struct nvmet_req {extern struct workqueue_struct *buffered_io_wq;extern struct workqueue_struct *zbd_wq; +extern struct workqueue_struct *nvmet_wq;static inline void nvmet_set_result (struct nvmet_req *req,u32 result) {
drivers/nvme/target/passthru.c +1 -1
@@ -281,7 +281,7 @@ static void nvmet_passthru_execute_cmd(struct nvmet_req *req)if (req->p.use_workqueue || effects) {INIT_WORK (&req->p.work, nvmet_passthru_execute_cmd_work); req->p.rq = rq; -schedule_work (&req->p.work); +queue_work (nvmet_wq, &req->p.work); }else { rq->end_io_data = req;blk_execute_rq_nowait (rq, false, nvmet_passthru_req_done);
drivers/nvme/target/rdma.c +6 -6
@@ -1584,7 +1584,7 @@ static int nvmet_rdma_queue_connect(struct rdma_cm_id *cm_id,if (queue->host_qid ==0 ) {/* Let inflight controller teardown complete */ -flush_scheduled_work (); +flush_workqueue (nvmet_wq); } ret =nvmet_rdma_cm_accept (cm_id, queue, &event->param.conn);
@@ -1669,7 +1669,7 @@ static void __nvmet_rdma_queue_disconnect(struct nvmet_rdma_queue *queue)if (disconnect) {rdma_disconnect (queue->cm_id); -schedule_work (&queue->release_work); +queue_work (nvmet_wq, &queue->release_work); } }
@@ -1699,7 +1699,7 @@ static void nvmet_rdma_queue_connect_fail(struct rdma_cm_id *cm_id,mutex_unlock (&nvmet_rdma_queue_mutex);pr_err ("failed to connect queue %d\n" , queue->idx); -schedule_work (&queue->release_work); +queue_work (nvmet_wq, &queue->release_work); }/**
@@ -1773,7 +1773,7 @@ static int nvmet_rdma_cm_handler(struct rdma_cm_id *cm_id,if (!queue) {struct nvmet_rdma_port *port = cm_id->context; -schedule_delayed_work (&port->repair_work,0 ); +queue_delayed_work (nvmet_wq, &port->repair_work,0 );break ; } fallthrough;
@@ -1903,7 +1903,7 @@ static void nvmet_rdma_repair_port_work(struct work_struct *w)nvmet_rdma_disable_port (port); ret =nvmet_rdma_enable_port (port);if (ret) -schedule_delayed_work (&port->repair_work,5 *HZ ); +queue_delayed_work (nvmet_wq, &port->repair_work,5 *HZ ); }static int nvmet_rdma_add_port (struct nvmet_port *nport)
@@ -2053,7 +2053,7 @@ static void nvmet_rdma_remove_one(struct ib_device *ib_device, void *client_data }mutex_unlock (&nvmet_rdma_queue_mutex); -flush_scheduled_work (); +flush_workqueue (nvmet_wq); }static struct ib_client nvmet_rdma_ib_client = {
drivers/nvme/target/tcp.c +5 -5
@@ -1269,7 +1269,7 @@ static void nvmet_tcp_schedule_release_queue(struct nvmet_tcp_queue *queue)spin_lock (&queue->state_lock);if (queue->state !=NVMET_TCP_Q_DISCONNECTING ) { queue->state =NVMET_TCP_Q_DISCONNECTING ; -schedule_work (&queue->release_work); +queue_work (nvmet_wq, &queue->release_work); }spin_unlock (&queue->state_lock); }
@@ -1684,7 +1684,7 @@ static void nvmet_tcp_listen_data_ready(struct sock *sk) goto out;if (sk->sk_state ==TCP_LISTEN ) -schedule_work (&port->accept_work); +queue_work (nvmet_wq, &port->accept_work); out:read_unlock_bh (&sk->sk_callback_lock); }
@@ -1815,7 +1815,7 @@ static u16 nvmet_tcp_install_queue(struct nvmet_sq *sq)if (sq->qid ==0 ) {/* Let inflight controller teardown complete */ -flush_scheduled_work (); +flush_workqueue (nvmet_wq); } queue->nr_cmds = sq->size *2 ;
@@ -1876,12 +1876,12 @@ static void __exit nvmet_tcp_exit(void)nvmet_unregister_transport (&nvmet_tcp_ops); -flush_scheduled_work (); +flush_workqueue (nvmet_wq);mutex_lock (&nvmet_tcp_queue_mutex);list_for_each_entry (queue, &nvmet_tcp_queue_list, queue_list)kernel_sock_shutdown (queue->sock,SHUT_RDWR );mutex_unlock (&nvmet_tcp_queue_mutex); -flush_scheduled_work (); +flush_workqueue (nvmet_wq);destroy_workqueue (nvmet_tcp_wq); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 37/158 nvme-multipath: fix hang when disk goes live over reconnect
In reply to Greg Kroah-HartmanFrom: Anton Eidelman <[email protected]>
[ Upstream commit a4a6f3c8f61c3cfbda4998ad94596059ad7e4332 ]
nvme_mpath_init_identify() invoked from nvme_init_identify() fetches a fresh ANA log from the ctrl. This is essential to have an up to date path states for both existing namespaces and for those scan_work may discover once the ctrl is up.
This happens in the following cases:
1) A new ctrl is being connected.
2) An existing ctrl is successfully reconnected.
3) An existing ctrl is being reset.
While in (1) ctrl->namespaces is empty, (2 & 3) may have namespaces, and nvme_read_ana_log() may call nvme_update_ns_ana_state().
This result in a hang when the ANA state of an existing namespace changes and makes the disk live: nvme_mpath_set_live() issues IO to the namespace through the ctrl, which does NOT have IO queues yet.
See sample hang below.
Solution:
- nvme_update_ns_ana_state() to call set_live only if ctrl is live
- nvme_read_ana_log() call from nvme_mpath_init_identify() therefore only fetches and parses the ANA log;
any erros in this process will fail the ctrl setup as appropriate;
- a separate function nvme_mpath_update()
is called in nvme_start_ctrl();
this parses the ANA log without fetching it.
At this point the ctrl is live,
therefore, disks can be set live normally.
Sample failure:
nvme nvme0: starting error recovery
nvme nvme0: Reconnecting in 10 seconds...
block nvme0n6: no usable path - requeuing I/O
INFO: task kworker/u8:3:312 blocked for more than 122 seconds.
Tainted: G E 5.14.5-1.el7.elrepo.x86_64 #1
Workqueue: nvme-wq nvme_tcp_reconnect_ctrl_work [nvme_tcp]
Call Trace:
__schedule+0x2a2/0x7e0
schedule+0x4e/0xb0
io_schedule+0x16/0x40
wait_on_page_bit_common+0x15c/0x3e0
do_read_cache_page+0x1e0/0x410
read_cache_page+0x12/0x20
read_part_sector+0x46/0x100
read_lba+0x121/0x240
efi_partition+0x1d2/0x6a0
bdev_disk_changed.part.0+0x1df/0x430
bdev_disk_changed+0x18/0x20
blkdev_get_whole+0x77/0xe0
blkdev_get_by_dev+0xd2/0x3a0
__device_add_disk+0x1ed/0x310
device_add_disk+0x13/0x20
nvme_mpath_set_live+0x138/0x1b0 [nvme_core]
nvme_update_ns_ana_state+0x2b/0x30 [nvme_core]
nvme_update_ana_state+0xca/0xe0 [nvme_core]
nvme_parse_ana_log+0xac/0x170 [nvme_core]
nvme_read_ana_log+0x7d/0xe0 [nvme_core]
nvme_mpath_init_identify+0x105/0x150 [nvme_core]
nvme_init_identify+0x2df/0x4d0 [nvme_core]
nvme_init_ctrl_finish+0x8d/0x3b0 [nvme_core]
nvme_tcp_setup_ctrl+0x337/0x390 [nvme_tcp]
nvme_tcp_reconnect_ctrl_work+0x24/0x40 [nvme_tcp]
process_one_work+0x1bd/0x360
worker_thread+0x50/0x3d0--- drivers/nvme/host/core.c | 1 + drivers/nvme/host/multipath.c | 25 +++++++++++++++++++++++-- drivers/nvme/host/nvme.h | 4 ++++ 3 files changed, 28 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +1 -0
@@ -4422,6 +4422,7 @@ void nvme_start_ctrl(struct nvme_ctrl *ctrl)if (ctrl->queue_count >1 ) {nvme_queue_scan (ctrl);nvme_start_queues (ctrl); +nvme_mpath_update (ctrl); } }EXPORT_SYMBOL_GPL (nvme_start_ctrl);
drivers/nvme/host/multipath.c +23 -2
@@ -635,8 +635,17 @@ static void nvme_update_ns_ana_state(struct nvme_ana_group_desc *desc, 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() will trigger I/O to the multipath path device +* and in turn to this path device. However we cannot accept this I/O +* if the controller is not live. This may deadlock if called from +* nvme_mpath_init_identify() and the ctrl will never complete +* initialization, preventing I/O from completing. For this case we +* will reprocess the ANA log page in nvme_mpath_update() once the +* controller is ready. +*/ +if (nvme_state_is_live (ns->ana_state) && + ns->ctrl->state ==NVME_CTRL_LIVE )nvme_mpath_set_live (ns); }
@@ -723,6 +732,18 @@ static void nvme_ana_work(struct work_struct *work)nvme_read_ana_log (ctrl); } +void nvme_mpath_update (struct nvme_ctrl *ctrl) +{ +u32 nr_change_groups =0 ; + +if (!ctrl->ana_log_buf) +return ; + +mutex_lock (&ctrl->ana_lock); +nvme_parse_ana_log (ctrl, &nr_change_groups, nvme_update_ana_state); +mutex_unlock (&ctrl->ana_lock); +} +static void nvme_anatt_timeout (struct timer_list *t) {struct nvme_ctrl *ctrl =from_timer (ctrl, t, anatt_timer);
drivers/nvme/host/nvme.h +4 -0
@@ -800,6 +800,7 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id);void nvme_mpath_remove_disk (struct nvme_ns_head *head);int nvme_mpath_init_identify (struct nvme_ctrl *ctrl,struct nvme_id_ctrl *id);void nvme_mpath_init_ctrl (struct nvme_ctrl *ctrl); +void nvme_mpath_update (struct nvme_ctrl *ctrl);void nvme_mpath_uninit (struct nvme_ctrl *ctrl);void nvme_mpath_stop (struct nvme_ctrl *ctrl);bool nvme_mpath_clear_current_path (struct nvme_ns *ns);
@@ -874,6 +875,9 @@ static inline int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, "Please enable CONFIG_NVME_MULTIPATH for full support of multi-port devices.\n");return 0 ; } +static inline void nvme_mpath_update (struct nvme_ctrl *ctrl) +{ +}static inline void nvme_mpath_uninit (struct nvme_ctrl *ctrl) { }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 38/158 rtc: mc146818-lib: Fix the AltCentury for AMD platforms
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
[ Upstream commit 3ae8fd41573af4fb3a490c9ed947fc936ba87190 ]
Setting the century forward has been failing on AMD platforms. There was a previous attempt at fixing this for family 0x17 as part of commit 7ad295d5196a ("rtc: Fix the AltCentury value on AMD/Hygon platform") but this was later reverted due to some problems reported that appeared to stem from an FW bug on a family 0x17 desktop system.
The same comments mentioned in the previous commit continue to apply to the newer platforms as well.
``` MC146818 driver use function mc146818_set_time() to set register RTC_FREQ_SELECT(RTC_REG_A)'s bit4-bit6 field which means divider stage reset value on Intel platform to 0x7. While AMD/Hygon RTC_REG_A(0Ah)'s bit4 is defined as DV0 [Reference]: DV0 = 0 selects Bank 0, DV0 = 1 selects Bank 1. Bit5-bit6 is defined as reserved. DV0 is set to 1, it will select Bank 1, which will disable AltCentury register(0x32) access. As UEFI pass acpi_gbl_FADT.century 0x32 (AltCentury), the CMOS write will be failed on code: CMOS_WRITE(century, acpi_gbl_FADT.century). Correct RTC_REG_A bank select bit(DV0) to 0 on AMD/Hygon CPUs, it will enable AltCentury(0x32) register writing and finally setup century as expected. ```
However in closer examination the change previously submitted was also modifying bits 5 & 6 which are declared reserved in the AMD documentation. So instead modify just the DV0 bank selection bit.
Being cognizant that there was a failure reported before, split the code change out to a static function that can also be used for exclusions if any regressions such as Mikhail's pop up again.
--- drivers/rtc/rtc-mc146818-lib.c | 16 +++++++++++++++- include/linux/mc146818rtc.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/rtc/rtc-mc146818-lib.c +15 -1
@@ -176,6 +176,17 @@ int mc146818_get_time(struct rtc_time *time) }EXPORT_SYMBOL_GPL (mc146818_get_time); +/* AMD systems don't allow access to AltCentury with DV1 */ +static bool apply_amd_register_a_behavior (void ) +{ +#ifdef CONFIG_X86 +if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) +return true; +#endif +return false; +} +/* Set the current date and time in the real time clock. */ int mc146818_set_time (struct rtc_time *time) {
@@ -249,7 +260,10 @@ int mc146818_set_time(struct rtc_time *time) save_control =CMOS_READ (RTC_CONTROL );CMOS_WRITE ((save_control|RTC_SET ),RTC_CONTROL ); save_freq_select =CMOS_READ (RTC_FREQ_SELECT ); -CMOS_WRITE ((save_freq_select|RTC_DIV_RESET2 ),RTC_FREQ_SELECT ); +if (apply_amd_register_a_behavior ()) +CMOS_WRITE ((save_freq_select & ~RTC_AMD_BANK_SELECT ),RTC_FREQ_SELECT ); +else +CMOS_WRITE ((save_freq_select|RTC_DIV_RESET2 ),RTC_FREQ_SELECT );#ifdef CONFIG_MACH_DECSTATION CMOS_WRITE (real_yrs,RTC_DEC_YEAR );
include/linux/mc146818rtc.h +2 -0
@@ -86,6 +86,8 @@ struct cmos_rtc_board_info {/* 2 values for divider stage reset, others for "testing purposes only" */ # define RTC_DIV_RESET1 0x60# define RTC_DIV_RESET2 0x70 +/* In AMD BKDG bit 5 and 6 are reserved, bit 4 is for select dv0 bank */ +# define RTC_AMD_BANK_SELECT 0x10/* Periodic intr. / Square wave rate select. 0=none, 1=32.8kHz,... 15=2Hz */ # define RTC_RATE_SELECT 0x0F
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 39/158 fs: fix an infinite loop in iomap_fiemap
In reply to Greg Kroah-HartmanFrom: Guo Xuenan <[email protected]>
[ Upstream commit 49df34221804cfd6384135b28b03c9461a31d024 ]
when get fiemap starting from MAX_LFS_FILESIZE, (maxbytes - *len) < start will always true , then *len set zero. because of start offset is beyond file size, for erofs filesystem it will always return iomap.length with zero,iomap iterate will enter infinite loop. it is necessary cover this corner case to avoid this situation.
------------[ cut here ]------------ WARNING: CPU: 7 PID: 905 at fs/iomap/iter.c:35 iomap_iter+0x97f/0xc70 Modules linked in: xfs erofs CPU: 7 PID: 905 Comm: iomap Tainted: G W 5.17.0-rc8 #27 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 RIP: 0010:iomap_iter+0x97f/0xc70 Code: 85 a1 fc ff ff e8 71 be 9c ff 0f 1f 44 00 00 e9 92 fc ff ff e8 62 be 9c ff 0f 0b b8 fb ff ff ff e9 fc f8 ff ff e8 51 be 9c ff <0f> 0b e9 2b fc ff ff e8 45 be 9c ff 0f 0b e9 e1 fb ff ff e8 39 be RSP: 0018:ffff888060a37ab0 EFLAGS: 00010293 RAX: 0000000000000000 RBX: ffff888060a37bb0 RCX: 0000000000000000 RDX: ffff88807e19a900 RSI: ffffffff81a7da7f RDI: ffff888060a37be0 RBP: 7fffffffffffffff R08: 0000000000000000 R09: ffff888060a37c20 R10: ffff888060a37c67 R11: ffffed100c146f8c R12: 7fffffffffffffff R13: 0000000000000000 R14: ffff888060a37bd8 R15: ffff888060a37c20 FS: 00007fd3cca01540(0000) GS:ffff888108780000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020010820 CR3: 0000000054b92000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> iomap_fiemap+0x1c9/0x2f0 erofs_fiemap+0x64/0x90 [erofs] do_vfs_ioctl+0x40d/0x12e0 __x64_sys_ioctl+0xaa/0x1c0 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xae </TASK> ---[ end trace 0000000000000000 ]--- watchdog: BUG: soft lockup - CPU#7 stuck for 26s! [iomap:905]
--- fs/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ioctl.c +1 -1
@@ -173,7 +173,7 @@ int fiemap_prep(struct inode *inode, struct fiemap_extent_info *fieinfo,if (*len ==0 )return -EINVAL ; -if (start > maxbytes) +if (start >= maxbytes)return -EFBIG ;/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 40/158 MIPS: lantiq: check the return value of kzalloc()
In reply to Greg Kroah-HartmanFrom: Xiaoke Wang <[email protected]>
[ Upstream commit 34123208bbcc8c884a0489f543a23fe9eebb5514 ]
kzalloc() is a memory allocation function which can return NULL when some internal memory errors happen. So it is better to check the return value of it to prevent potential wrong memory access or memory leak.
--- arch/mips/lantiq/falcon/sysctrl.c | 2 ++ arch/mips/lantiq/xway/gptu.c | 2 ++ arch/mips/lantiq/xway/sysctrl.c | 46 ++++++++++++++++++++----------- 3 files changed, 34 insertions(+), 16 deletions(-)
arch/mips/lantiq/falcon/sysctrl.c +2 -0
@@ -167,6 +167,8 @@ static inline void clkdev_add_sys(const char *dev, unsigned int module, {struct clk *clk =kzalloc (sizeof (struct clk ),GFP_KERNEL ); +if (!clk) +return ; clk->cl.dev_id = dev; clk->cl.con_id =NULL ; clk->cl.clk = clk;
arch/mips/lantiq/xway/gptu.c +2 -0
@@ -122,6 +122,8 @@ static inline void clkdev_add_gptu(struct device *dev, const char *con, {struct clk *clk =kzalloc (sizeof (struct clk ),GFP_KERNEL ); +if (!clk) +return ; clk->cl.dev_id =dev_name (dev); clk->cl.con_id = con; clk->cl.clk = clk;
arch/mips/lantiq/xway/sysctrl.c +30 -16
75 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 41/158 drbd: remove usage of list iterator variable after loop
In reply to Greg Kroah-HartmanFrom: Jakob Koschel <[email protected]>
[ Upstream commit 901aeda62efa21f2eae937bccb71b49ae531be06 ]
In preparation to limit the scope of a list iterator to the list traversal loop, use a dedicated pointer to iterate through the list [1].
Since that variable should not be used past the loop iteration, a separate variable is used to 'remember the current location within the loop'.
To either continue iterating from that position or skip the iteration (if the previous iteration was complete) list_prepare_entry() is used.
--- drivers/block/drbd/drbd_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/block/drbd/drbd_main.c +5 -2
@@ -171,7 +171,7 @@ void tl_release(struct drbd_connection *connection, unsigned int barrier_nr, unsigned int set_size) {struct drbd_request *r; -struct drbd_request *req =NULL ; +struct drbd_request *req =NULL , *tmp =NULL ;int expect_epoch =0 ;int expect_size =0 ;
@@ -225,8 +225,11 @@ void tl_release(struct drbd_connection *connection, unsigned int barrier_nr,* to catch requests being barrier-acked "unexpectedly". * It usually should find the same req again, or some READ preceding it. */ list_for_each_entry (req, &connection->transfer_log, tl_requests) -if (req->epoch == expect_epoch) +if (req->epoch == expect_epoch) { + tmp = req;break ; + } + req =list_prepare_entry (tmp, &connection->transfer_log, tl_requests);list_for_each_entry_safe_from (req, r, &connection->transfer_log, tl_requests) {if (req->epoch != expect_epoch)break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 42/158 platform/chrome: cros_ec_debugfs: detach log reader wq from devm
In reply to Greg Kroah-HartmanFrom: Tzung-Bi Shih <[email protected]>
[ Upstream commit 0e8eb5e8acbad19ac2e1856b2fb2320184299b33 ]
Debugfs console_log uses devm memory (e.g. debug_info in cros_ec_console_log_poll()). However, lifecycles of device and debugfs are independent. An use-after-free issue is observed if userland program operates the debugfs after the memory has been freed.
The call trace:
do_raw_spin_lock
_raw_spin_lock_irqsave
remove_wait_queue
ep_unregister_pollwait
ep_remove
do_epoll_ctl
A Python example to reproduce the issue:
... import select
... p = select.epoll()
... f = open('/sys/kernel/debug/cros_scp/console_log') ... p.register(f, select.POLLIN)
... p.poll(1)
[(4, 1)] # 4=fd, 1=select.POLLIN
[ shutdown cros_scp at the point ]
... p.poll(1)
[(4, 16)] # 4=fd, 16=select.POLLHUP
... p.unregister(f)
An use-after-free issue raises here. It called epoll_ctl with EPOLL_CTL_DEL which in turn to use the workqueue in the devm (i.e. log_wq).
Detaches log reader's workqueue from devm to make sure it is persistent even if the device has been removed.
--- drivers/platform/chrome/cros_ec_debugfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/platform/chrome/cros_ec_debugfs.c +6 -6
@@ -25,6 +25,9 @@#define CIRC_ADD (idx, size, value) (((idx) + (value)) & ((size) - 1)) +/* waitqueue for log readers */ +static DECLARE_WAIT_QUEUE_HEAD (cros_ec_debugfs_log_wq); +/** * struct cros_ec_debugfs - EC debugging information. *
@@ -33,7 +36,6 @@* @log_buffer: circular buffer for console log information * @read_msg: preallocated EC command and buffer to read console log * @log_mutex: mutex to protect circular buffer -* @log_wq: waitqueue for log readers * @log_poll_work: recurring task to poll EC for new console log data * @panicinfo_blob: panicinfo debugfs blob */
@@ -44,7 +46,6 @@ struct cros_ec_debugfs {struct circ_buf log_buffer;struct cros_ec_command *read_msg;struct mutex log_mutex; -wait_queue_head_t log_wq;struct delayed_work log_poll_work;/* EC panicinfo */ struct debugfs_blob_wrapper panicinfo_blob;
@@ -107,7 +108,7 @@ static void cros_ec_console_log_work(struct work_struct *__work) buf_space--; } -wake_up (&debug_info->log_wq); +wake_up (&cros_ec_debugfs_log_wq); }mutex_unlock (&debug_info->log_mutex);
@@ -141,7 +142,7 @@ static ssize_t cros_ec_console_log_read(struct file *file, char __user *buf,mutex_unlock (&debug_info->log_mutex); - ret =wait_event_interruptible (debug_info->log_wq, + ret =wait_event_interruptible (cros_ec_debugfs_log_wq,CIRC_CNT (cb->head, cb->tail,LOG_SIZE ));if (ret <0 )return ret;
@@ -173,7 +174,7 @@ static __poll_t cros_ec_console_log_poll(struct file *file,struct cros_ec_debugfs *debug_info = file->private_data;__poll_t mask =0 ; -poll_wait (file, &debug_info->log_wq, wait); +poll_wait (file, &cros_ec_debugfs_log_wq, wait);mutex_lock (&debug_info->log_mutex); if (CIRC_CNT(debug_info->log_buffer.head,
@@ -377,7 +378,6 @@ static int cros_ec_create_console_log(struct cros_ec_debugfs *debug_info) debug_info->log_buffer.tail =0 ;mutex_init (&debug_info->log_mutex); -init_waitqueue_head (&debug_info->log_wq);debugfs_create_file ("console_log" ,S_IFREG |0444 , debug_info->dir, debug_info, &cros_ec_console_log_fops);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 43/158 ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()
In reply to Greg Kroah-HartmanFrom: linyujun <[email protected]>
[ Upstream commit 9be4c88bb7924f68f88cfd47d925c2d046f51a73 ]
The following KASAN warning is detected by QEMU.
==================================================================
BUG: KASAN: stack-out-of-bounds in unwind_frame+0x508/0x870 Read of size 4 at addr c36bba90 by task cat/163 CPU: 1 PID: 163 Comm: cat Not tainted 5.10.0-rc1 #40 Hardware name: ARM-Versatile Express [<c0113fac>] (unwind_backtrace) from [<c010e71c>] (show_stack+0x10/0x14) [<c010e71c>] (show_stack) from [<c0b805b4>] (dump_stack+0x98/0xb0) [<c0b805b4>] (dump_stack) from [<c0b7d658>] (print_address_description.constprop.0+0x58/0x4bc) [<c0b7d658>] (print_address_description.constprop.0) from [<c031435c>] (kasan_report+0x154/0x170) [<c031435c>] (kasan_report) from [<c0113c44>] (unwind_frame+0x508/0x870) [<c0113c44>] (unwind_frame) from [<c010e298>] (__save_stack_trace+0x110/0x134) [<c010e298>] (__save_stack_trace) from [<c01ce0d8>] (stack_trace_save+0x8c/0xb4) [<c01ce0d8>] (stack_trace_save) from [<c0313520>] (kasan_set_track+0x38/0x60) [<c0313520>] (kasan_set_track) from [<c0314cb8>] (kasan_set_free_info+0x20/0x2c) [<c0314cb8>] (kasan_set_free_info) from [<c0313474>] (__kasan_slab_free+0xec/0x120) [<c0313474>] (__kasan_slab_free) from [<c0311e20>] (kmem_cache_free+0x7c/0x334) [<c0311e20>] (kmem_cache_free) from [<c01c35dc>] (rcu_core+0x390/0xccc) [<c01c35dc>] (rcu_core) from [<c01013a8>] (__do_softirq+0x180/0x518) [<c01013a8>] (__do_softirq) from [<c0135214>] (irq_exit+0x9c/0xe0) [<c0135214>] (irq_exit) from [<c01a40e4>] (__handle_domain_irq+0xb0/0x110) [<c01a40e4>] (__handle_domain_irq) from [<c0691248>] (gic_handle_irq+0xa0/0xb8) [<c0691248>] (gic_handle_irq) from [<c0100b0c>] (__irq_svc+0x6c/0x94) Exception stack(0xc36bb928 to 0xc36bb970)
b920: c36bb9c0 00000000 c0126919 c0101228 c36bb9c0 b76d7730
b940: c36b8000 c36bb9a0 c3335b00 c01ce0d8 00000003 c36bba3c c36bb940 c36bb978
b960: c010e298 c011373c 60000013 ffffffff
[<c0100b0c>] (__irq_svc) from [<c011373c>] (unwind_frame+0x0/0x870) [<c011373c>] (unwind_frame) from [<00000000>] (0x0)
The buggy address belongs to the page: page:(ptrval) refcount:0 mapcount:0 mapping:00000000 index:0x0 pfn:0x636bb flags: 0x0() raw: 00000000 00000000 ef867764 00000000 00000000 00000000 ffffffff 00000000 page dumped because: kasan: bad access detected
addr c36bba90 is located in stack of task cat/163 at offset 48 in frame:
stack_trace_save+0x0/0xb4
this frame has 1 object:
[32, 48) 'trace'
Memory state around the buggy address:
c36bb980: f1 f1 f1 f1 00 04 f2 f2 00 00 f3 f3 00 00 00 00
c36bba00: 00 00 00 00 00 00 00 00 00 00 00 00 f1 f1 f1 f1
>c36bba80: 00 00 f3 f3 00 00 00 00 00 00 00 00 00 00 00 00
^
c36bbb00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
c36bbb80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
==================================================================There is a same issue on x86 and has been resolved by the commit f7d27c35ddff ("x86/mm, kasan: Silence KASAN warnings in get_wchan()").
The solution could be applied to arm architecture too.
--- arch/arm/kernel/stacktrace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/kernel/stacktrace.c +5 -5
@@ -54,17 +54,17 @@ int notrace unwind_frame(struct stackframe *frame)return -EINVAL ; frame->sp = frame->fp; - frame->fp = *(unsigned long *)(fp); - frame->pc = *(unsigned long *)(fp +4 ); + frame->fp =READ_ONCE_NOCHECK (*(unsigned long *)(fp)); + frame->pc =READ_ONCE_NOCHECK (*(unsigned long *)(fp +4 ));#else /* check current frame pointer is within bounds */ if (fp < low +12 || fp > high -4 )return -EINVAL ;/* restore the registers from the stack frame */ - frame->fp = *(unsigned long *)(fp -12 ); - frame->sp = *(unsigned long *)(fp -8 ); - frame->pc = *(unsigned long *)(fp -4 ); + frame->fp =READ_ONCE_NOCHECK (*(unsigned long *)(fp -12 )); + frame->sp =READ_ONCE_NOCHECK (*(unsigned long *)(fp -8 )); + frame->pc =READ_ONCE_NOCHECK (*(unsigned long *)(fp -4 ));#endif #ifdef CONFIG_KRETPROBES if (is_kretprobe_trampoline (frame->pc))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 44/158 nilfs2: fix lockdep warnings in page operations for btree nodes
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
[ Upstream commit e897be17a441fa637cd166fc3de1445131e57692 ]
Patch series "nilfs2 lockdep warning fixes".
The first two are to resolve the lockdep warning issue, and the last one is the accompanying cleanup and low priority.
Based on your comment, this series solves the issue by separating inode object as needed. Since I was worried about the impact of the object composition changes, I tested the series carefully not to cause regressions especially for delicate functions such like disk space reclamation and snapshots.
This patch (of 3):
If CONFIG_LOCKDEP is enabled, nilfs2 hits lockdep warnings at inode_to_wb() during page/folio operations for btree nodes:
WARNING: CPU: 0 PID: 6575 at include/linux/backing-dev.h:269 inode_to_wb include/linux/backing-dev.h:269 [inline]
WARNING: CPU: 0 PID: 6575 at include/linux/backing-dev.h:269 folio_account_dirtied mm/page-writeback.c:2460 [inline]
WARNING: CPU: 0 PID: 6575 at include/linux/backing-dev.h:269 __folio_mark_dirty+0xa7c/0xe30 mm/page-writeback.c:2509
Modules linked in:
...
RIP: 0010:inode_to_wb include/linux/backing-dev.h:269 [inline]
RIP: 0010:folio_account_dirtied mm/page-writeback.c:2460 [inline]
RIP: 0010:__folio_mark_dirty+0xa7c/0xe30 mm/page-writeback.c:2509
...
Call Trace:
__set_page_dirty include/linux/pagemap.h:834 [inline]
mark_buffer_dirty+0x4e6/0x650 fs/buffer.c:1145
nilfs_btree_propagate_p fs/nilfs2/btree.c:1889 [inline]
nilfs_btree_propagate+0x4ae/0xea0 fs/nilfs2/btree.c:2085
nilfs_bmap_propagate+0x73/0x170 fs/nilfs2/bmap.c:337
nilfs_collect_dat_data+0x45/0xd0 fs/nilfs2/segment.c:625
nilfs_segctor_apply_buffers+0x14a/0x470 fs/nilfs2/segment.c:1009
nilfs_segctor_scan_file+0x47a/0x700 fs/nilfs2/segment.c:1048
nilfs_segctor_collect_blocks fs/nilfs2/segment.c:1224 [inline]
nilfs_segctor_collect fs/nilfs2/segment.c:1494 [inline]
nilfs_segctor_do_construct+0x14f3/0x6c60 fs/nilfs2/segment.c:2036
nilfs_segctor_construct+0x7a7/0xb30 fs/nilfs2/segment.c:2372
nilfs_segctor_thread_construct fs/nilfs2/segment.c:2480 [inline]
nilfs_segctor_thread+0x3c3/0xf90 fs/nilfs2/segment.c:2563
kthread+0x405/0x4f0 kernel/kthread.c:327
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295This is because nilfs2 uses two page caches for each inode and inode->i_mapping never points to one of them, the btree node cache.
This causes inode_to_wb(inode) to refer to a different page cache than the caller page/folio operations such like __folio_start_writeback(), __folio_end_writeback(), or __folio_mark_dirty() acquired the lock.
This patch resolves the issue by allocating and using an additional inode to hold the page cache of btree nodes. The inode is attached one-to-one to the traditional nilfs2 inode if it requires a block mapping with b-tree. This setup change is in memory only and does not affect the disk format.
--- fs/nilfs2/btnode.c | 23 ++++++++-- fs/nilfs2/btnode.h | 1 + fs/nilfs2/btree.c | 27 ++++++++---- fs/nilfs2/gcinode.c | 7 +-- fs/nilfs2/inode.c | 104 ++++++++++++++++++++++++++++++++++++++------ fs/nilfs2/mdt.c | 7 +-- fs/nilfs2/nilfs.h | 14 +++--- fs/nilfs2/page.c | 7 ++- fs/nilfs2/segment.c | 9 ++-- fs/nilfs2/super.c | 5 +-- 10 files changed, 154 insertions(+), 50 deletions(-)
fs/nilfs2/btnode.c +20 -3
@@ -20,6 +20,23 @@#include "page.h" #include "btnode.h" + +/** +* nilfs_init_btnc_inode - initialize B-tree node cache inode +* @btnc_inode: inode to be initialized +* +* nilfs_init_btnc_inode() sets up an inode for B-tree node cache. +*/ +void nilfs_init_btnc_inode (struct inode *btnc_inode) +{ +struct nilfs_inode_info *ii =NILFS_I (btnc_inode); + + btnc_inode->i_mode =S_IFREG ; + ii->i_flags =0 ; +memset (&ii->i_bmap_data,0 ,sizeof (struct nilfs_bmap )); +mapping_set_gfp_mask (btnc_inode->i_mapping,GFP_NOFS ); +} +void nilfs_btnode_cache_clear (struct address_space *btnc) {invalidate_mapping_pages (btnc,0 ,-1 );
@@ -29,7 +46,7 @@ void nilfs_btnode_cache_clear(struct address_space *btnc)struct buffer_head *nilfs_btnode_create_block (struct address_space *btnc,__u64 blocknr) { -struct inode *inode =NILFS_BTNC_I (btnc); +struct inode *inode = btnc->host;struct buffer_head *bh; bh =nilfs_grab_buffer (inode, btnc, blocknr,BIT (BH_NILFS_Node));
@@ -57,7 +74,7 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, struct buffer_head **pbh, sector_t *submit_ptr) { struct buffer_head *bh; -struct inode *inode =NILFS_BTNC_I (btnc); +struct inode *inode = btnc->host;struct page *page;int err;
@@ -157,7 +174,7 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc, struct nilfs_btnode_chkey_ctxt *ctxt) {struct buffer_head *obh, *nbh; -struct inode *inode =NILFS_BTNC_I (btnc); +struct inode *inode = btnc->host;__u64 oldkey = ctxt->oldkey, newkey = ctxt->newkey;int err;
fs/nilfs2/btnode.h +1 -0
@@ -30,6 +30,7 @@ struct nilfs_btnode_chkey_ctxt {struct buffer_head *newbh; }; +void nilfs_init_btnc_inode (struct inode *btnc_inode);void nilfs_btnode_cache_clear (struct address_space *);struct buffer_head *nilfs_btnode_create_block (struct address_space *btnc,__u64 blocknr);
fs/nilfs2/btree.c +19 -8
@@ -58,7 +58,8 @@ static void nilfs_btree_free_path(struct nilfs_btree_path *path)static int nilfs_btree_get_new_block (const struct nilfs_bmap *btree,__u64 ptr,struct buffer_head **bhp) { -struct address_space *btnc = &NILFS_BMAP_I (btree)->i_btnode_cache; +struct inode *btnc_inode =NILFS_BMAP_I (btree)->i_assoc_inode; +struct address_space *btnc = btnc_inode->i_mapping;struct buffer_head *bh; bh =nilfs_btnode_create_block (btnc, ptr);
@@ -470,7 +471,8 @@ static int __nilfs_btree_get_block(const struct nilfs_bmap *btree, __u64 ptr,struct buffer_head **bhp, const struct nilfs_btree_readahead_info *ra) { - struct address_space *btnc = &NILFS_BMAP_I(btree)->i_btnode_cache; + struct inode *btnc_inode = NILFS_BMAP_I(btree)->i_assoc_inode; +struct address_space *btnc = btnc_inode->i_mapping;struct buffer_head *bh, *ra_bh;sector_t submit_ptr =0 ;int ret;
@@ -1741,6 +1743,10 @@ nilfs_btree_prepare_convert_and_insert(struct nilfs_bmap *btree, __u64 key, dat =nilfs_bmap_get_dat (btree); } + ret =nilfs_attach_btree_node_cache (&NILFS_BMAP_I (btree)->vfs_inode); +if (ret <0 ) +return ret; + ret =nilfs_bmap_prepare_alloc_ptr (btree, dreq, dat);if (ret <0 )return ret;
@@ -1913,7 +1919,7 @@ static int nilfs_btree_prepare_update_v(struct nilfs_bmap *btree, path[level].bp_ctxt.newkey = path[level].bp_newreq.bpr_ptr; path[level].bp_ctxt.bh = path[level].bp_bh; ret =nilfs_btnode_prepare_change_key ( - &NILFS_BMAP_I (btree)->i_btnode_cache, +NILFS_BMAP_I (btree)->i_assoc_inode->i_mapping, &path[level].bp_ctxt);if (ret <0 ) { nilfs_dat_abort_update(dat,
@@ -1939,7 +1945,7 @@ static void nilfs_btree_commit_update_v(struct nilfs_bmap *btree,if (buffer_nilfs_node (path[level].bp_bh)) {nilfs_btnode_commit_change_key ( - &NILFS_BMAP_I (btree)->i_btnode_cache, +NILFS_BMAP_I (btree)->i_assoc_inode->i_mapping, &path[level].bp_ctxt); path[level].bp_bh = path[level].bp_ctxt.bh; }
@@ -1958,7 +1964,7 @@ static void nilfs_btree_abort_update_v(struct nilfs_bmap *btree, &path[level].bp_newreq.bpr_req);if (buffer_nilfs_node (path[level].bp_bh))nilfs_btnode_abort_change_key ( - &NILFS_BMAP_I (btree)->i_btnode_cache, +NILFS_BMAP_I (btree)->i_assoc_inode->i_mapping, &path[level].bp_ctxt); }
@@ -2134,7 +2140,8 @@ static void nilfs_btree_add_dirty_buffer(struct nilfs_bmap *btree,static void nilfs_btree_lookup_dirty_buffers (struct nilfs_bmap *btree,struct list_head *listp) { -struct address_space *btcache = &NILFS_BMAP_I (btree)->i_btnode_cache; +struct inode *btnc_inode =NILFS_BMAP_I (btree)->i_assoc_inode; +struct address_space *btcache = btnc_inode->i_mapping;struct list_head lists[NILFS_BTREE_LEVEL_MAX ];struct pagevec pvec;struct buffer_head *bh, *head;
@@ -2188,12 +2195,12 @@ static int nilfs_btree_assign_p(struct nilfs_bmap *btree, path[level].bp_ctxt.newkey = blocknr; path[level].bp_ctxt.bh = *bh; ret =nilfs_btnode_prepare_change_key ( - &NILFS_BMAP_I (btree)->i_btnode_cache, +NILFS_BMAP_I (btree)->i_assoc_inode->i_mapping, &path[level].bp_ctxt);if (ret <0 )return ret;nilfs_btnode_commit_change_key ( - &NILFS_BMAP_I (btree)->i_btnode_cache, +NILFS_BMAP_I (btree)->i_assoc_inode->i_mapping, &path[level].bp_ctxt); *bh = path[level].bp_ctxt.bh; }
@@ -2398,6 +2405,10 @@ int nilfs_btree_init(struct nilfs_bmap *bmap)if (nilfs_btree_root_broken (nilfs_btree_get_root (bmap), bmap->b_inode)) ret = -EIO ; +else + ret =nilfs_attach_btree_node_cache ( + &NILFS_BMAP_I (bmap)->vfs_inode); +return ret; }
fs/nilfs2/gcinode.c +4 -3
@@ -126,9 +126,10 @@ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff,int nilfs_gccache_submit_read_node (struct inode *inode,sector_t pbn,__u64 vbn,struct buffer_head **out_bh) { +struct inode *btnc_inode =NILFS_I (inode)->i_assoc_inode;int ret; - ret =nilfs_btnode_submit_block (&NILFS_I (inode)->i_btnode_cache, + ret =nilfs_btnode_submit_block (btnc_inode->i_mapping, vbn ? : pbn, pbn,REQ_OP_READ ,0 , out_bh, &pbn);if (ret == -EEXIST )/* internal code (cache hit) */
@@ -170,7 +171,7 @@ int nilfs_init_gcinode(struct inode *inode) ii->i_flags =0 ;nilfs_bmap_init_gc (ii->i_bmap); -return 0 ; +return nilfs_attach_btree_node_cache (inode); }/**
@@ -185,7 +186,7 @@ void nilfs_remove_all_gcinodes(struct the_nilfs *nilfs) ii = list_first_entry(head, struct nilfs_inode_info, i_dirty);list_del_init (&ii->i_dirty);truncate_inode_pages (&ii->vfs_inode.i_data,0 ); -nilfs_btnode_cache_clear (&ii->i_btnode_cache); +nilfs_btnode_cache_clear (ii->i_assoc_inode->i_mapping);iput (&ii->vfs_inode); } }
fs/nilfs2/inode.c +90 -14
164 lines not on this page · raw message
fs/nilfs2/mdt.c +4 -3
@@ -532,7 +532,7 @@ int nilfs_mdt_save_to_shadow_map(struct inode *inode) goto out; ret =nilfs_copy_dirty_pages (&shadow->frozen_btnodes, - &ii->i_btnode_cache); + ii->i_assoc_inode->i_mapping);if (ret) goto out;
@@ -623,8 +623,9 @@ void nilfs_mdt_restore_from_shadow_map(struct inode *inode)nilfs_clear_dirty_pages (inode->i_mapping, true);nilfs_copy_back_pages (inode->i_mapping, &shadow->frozen_data); -nilfs_clear_dirty_pages (&ii->i_btnode_cache, true); -nilfs_copy_back_pages (&ii->i_btnode_cache, &shadow->frozen_btnodes); +nilfs_clear_dirty_pages (ii->i_assoc_inode->i_mapping, true); +nilfs_copy_back_pages (ii->i_assoc_inode->i_mapping, + &shadow->frozen_btnodes);nilfs_bmap_restore (ii->i_bmap, &shadow->bmap_store);
fs/nilfs2/nilfs.h +5 -9
@@ -28,7 +28,7 @@* @i_xattr: <TODO> * @i_dir_start_lookup: page index of last successful search * @i_cno: checkpoint number for GC inode -* @i_btnode_cache: cached pages of b-tree nodes +* @i_assoc_inode: associated inode (B-tree node cache holder or back pointer) * @i_dirty: list for connecting dirty files * @xattr_sem: semaphore for extended attributes processing * @i_bh: buffer contains disk inode
@@ -43,7 +43,7 @@ struct nilfs_inode_info {__u64 i_xattr;/* sector_t ??? */ __u32 i_dir_start_lookup;__u64 i_cno;/* check point number for GC inode */ -struct address_space i_btnode_cache; +struct inode *i_assoc_inode;struct list_head i_dirty;/* List for connecting dirty files */ #ifdef CONFIG_NILFS_XATTR
@@ -75,13 +75,6 @@ NILFS_BMAP_I(const struct nilfs_bmap *bmap) return container_of(bmap, struct nilfs_inode_info, i_bmap_data); } -static inline struct inode *NILFS_BTNC_I (struct address_space *btnc) -{ -struct nilfs_inode_info *ii = - container_of(btnc, struct nilfs_inode_info, i_btnode_cache); -return &ii->vfs_inode; -} -/* * Dynamic state flags of NILFS on-memory inode (i_state) */
@@ -98,6 +91,7 @@ enum {NILFS_I_INODE_SYNC ,/* dsync is not allowed for inode */ NILFS_I_BMAP ,/* has bmap and btnode_cache */ NILFS_I_GCINODE ,/* inode for GC, on memory only */ + NILFS_I_BTNC, /* inode for btree node cache */ };/*
@@ -267,6 +261,8 @@ struct inode *nilfs_iget(struct super_block *sb, struct nilfs_root *root, unsigned long ino);extern struct inode *nilfs_iget_for_gc (struct super_block *sb,unsigned long ino,__u64 cno); +int nilfs_attach_btree_node_cache (struct inode *inode); +void nilfs_detach_btree_node_cache (struct inode *inode);extern void nilfs_update_inode (struct inode *,struct buffer_head *,int );extern void nilfs_truncate (struct inode *);extern void nilfs_evict_inode (struct inode *);
fs/nilfs2/page.c +3 -4
@@ -448,10 +448,9 @@ void nilfs_mapping_init(struct address_space *mapping, struct inode *inode)/* * NILFS2 needs clear_page_dirty() in the following two cases: * -* 1) For B-tree node pages and data pages of the dat/gcdat, NILFS2 clears -* page dirty flags when it copies back pages from the shadow cache -* (gcdat->{i_mapping,i_btnode_cache}) to its original cache -* (dat->{i_mapping,i_btnode_cache}). +* 1) For B-tree node pages and data pages of DAT file, NILFS2 clears dirty +* flag of pages when it copies back pages from shadow cache to the +* original cache. * * 2) Some B-tree operations like insertion or deletion may dispose buffers * in dirty state, and this needs to cancel the dirty state of their pages.
fs/nilfs2/segment.c +6 -3
@@ -733,15 +733,18 @@ static void nilfs_lookup_dirty_node_buffers(struct inode *inode, struct list_head *listp) {struct nilfs_inode_info *ii =NILFS_I (inode); -struct address_space *mapping = &ii->i_btnode_cache; +struct inode *btnc_inode = ii->i_assoc_inode;struct pagevec pvec;struct buffer_head *bh, *head;unsigned int i;pgoff_t index =0 ; +if (!btnc_inode) +return ; +pagevec_init (&pvec); -while (pagevec_lookup_tag (&pvec, mapping, &index, +while (pagevec_lookup_tag (&pvec, btnc_inode->i_mapping, &index,PAGECACHE_TAG_DIRTY )) {for (i =0 ; i <pagevec_count (&pvec); i++) { bh = head =page_buffers (pvec.pages[i]);
@@ -2410,7 +2413,7 @@ nilfs_remove_written_gcinodes(struct the_nilfs *nilfs, struct list_head *head)continue ;list_del_init (&ii->i_dirty);truncate_inode_pages (&ii->vfs_inode.i_data,0 ); -nilfs_btnode_cache_clear (&ii->i_btnode_cache); +nilfs_btnode_cache_clear (ii->i_assoc_inode->i_mapping);iput (&ii->vfs_inode); } }
fs/nilfs2/super.c +2 -3
@@ -157,7 +157,8 @@ struct inode *nilfs_alloc_inode(struct super_block *sb) ii->i_bh =NULL ; ii->i_state =0 ; ii->i_cno =0 ; -nilfs_mapping_init (&ii->i_btnode_cache, &ii->vfs_inode); + ii->i_assoc_inode =NULL ; + ii->i_bmap = &ii->i_bmap_data;return &ii->vfs_inode; }
@@ -1377,8 +1378,6 @@ static void nilfs_inode_init_once(void *obj)#ifdef CONFIG_NILFS_XATTR init_rwsem (&ii->xattr_sem);#endif -address_space_init_once (&ii->i_btnode_cache); - ii->i_bmap = &ii->i_bmap_data;inode_init_once (&ii->vfs_inode); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 45/158 nilfs2: fix lockdep warnings during disk space reclamation
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
[ Upstream commit 6e211930f79aa45d422009a5f2e5467d2369ffe5 ]
During disk space reclamation, nilfs2 still emits the following lockdep warning due to page/folio operations on shadowed page caches that nilfs2 uses to get a snapshot of DAT file in memory:
WARNING: CPU: 0 PID: 2643 at include/linux/backing-dev.h:272 __folio_mark_dirty+0x645/0x670
...
RIP: 0010:__folio_mark_dirty+0x645/0x670
...
Call Trace:
filemap_dirty_folio+0x74/0xd0
__set_page_dirty_nobuffers+0x85/0xb0
nilfs_copy_dirty_pages+0x288/0x510 [nilfs2]
nilfs_mdt_save_to_shadow_map+0x50/0xe0 [nilfs2]
nilfs_clean_segments+0xee/0x5d0 [nilfs2]
nilfs_ioctl_clean_segments.isra.19+0xb08/0xf40 [nilfs2]
nilfs_ioctl+0xc52/0xfb0 [nilfs2]
__x64_sys_ioctl+0x11d/0x170This fixes the remaining warning by using inode objects to hold those page caches.
--- fs/nilfs2/dat.c | 4 ++- fs/nilfs2/inode.c | 63 ++++++++++++++++++++++++++++++++++++++++++++--- fs/nilfs2/mdt.c | 38 +++++++++++++++++++--------- fs/nilfs2/mdt.h | 6 ++--- fs/nilfs2/nilfs.h | 2 ++ 5 files changed, 92 insertions(+), 21 deletions(-)
fs/nilfs2/dat.c +3 -1
@@ -497,7 +497,9 @@ int nilfs_dat_read(struct super_block *sb, size_t entry_size, di =NILFS_DAT_I (dat);lockdep_set_class (&di->mi.mi_sem, &dat_lock_key);nilfs_palloc_setup_cache (dat, &di->palloc_cache); -nilfs_mdt_setup_shadow_map (dat, &di->shadow); + err =nilfs_mdt_setup_shadow_map (dat, &di->shadow); +if (err) + goto failed; err =nilfs_read_inode_common (dat, raw_inode);if (err)
fs/nilfs2/inode.c +59 -4
123 lines not on this page · raw message
fs/nilfs2/mdt.c +26 -12
@@ -470,9 +470,18 @@ int nilfs_mdt_init(struct inode *inode, gfp_t gfp_mask, size_t objsz)void nilfs_mdt_clear (struct inode *inode) {struct nilfs_mdt_info *mdi =NILFS_MDT (inode); +struct nilfs_shadow_map *shadow = mdi->mi_shadow;if (mdi->mi_palloc_cache)nilfs_palloc_destroy_cache (inode); + +if (shadow) { +struct inode *s_inode = shadow->inode; + + shadow->inode =NULL ; +iput (s_inode); + mdi->mi_shadow =NULL ; + } }/**
@@ -506,12 +515,15 @@ int nilfs_mdt_setup_shadow_map(struct inode *inode, struct nilfs_shadow_map *shadow) {struct nilfs_mdt_info *mi =NILFS_MDT (inode); +struct inode *s_inode;INIT_LIST_HEAD (&shadow->frozen_buffers); -address_space_init_once (&shadow->frozen_data); -nilfs_mapping_init (&shadow->frozen_data, inode); -address_space_init_once (&shadow->frozen_btnodes); -nilfs_mapping_init (&shadow->frozen_btnodes, inode); + + s_inode =nilfs_iget_for_shadow (inode); +if (IS_ERR (s_inode)) +return PTR_ERR (s_inode); + + shadow->inode = s_inode; mi->mi_shadow = shadow;return 0 ; }
@@ -525,13 +537,14 @@ int nilfs_mdt_save_to_shadow_map(struct inode *inode)struct nilfs_mdt_info *mi =NILFS_MDT (inode);struct nilfs_inode_info *ii =NILFS_I (inode);struct nilfs_shadow_map *shadow = mi->mi_shadow; +struct inode *s_inode = shadow->inode;int ret; - ret =nilfs_copy_dirty_pages (&shadow->frozen_data, inode->i_mapping); + ret =nilfs_copy_dirty_pages (s_inode->i_mapping, inode->i_mapping);if (ret) goto out; - ret =nilfs_copy_dirty_pages (&shadow->frozen_btnodes, + ret =nilfs_copy_dirty_pages (NILFS_I (s_inode)->i_assoc_inode->i_mapping, ii->i_assoc_inode->i_mapping);if (ret) goto out;
@@ -548,7 +561,7 @@ int nilfs_mdt_freeze_buffer(struct inode *inode, struct buffer_head *bh)struct page *page;int blkbits = inode->i_blkbits; - page =grab_cache_page (&shadow->frozen_data, bh->b_page->index); + page =grab_cache_page (shadow->inode->i_mapping, bh->b_page->index);if (!page)return -ENOMEM ;
@@ -580,7 +593,7 @@ nilfs_mdt_get_frozen_buffer(struct inode *inode, struct buffer_head *bh)struct page *page;int n; - page =find_lock_page (&shadow->frozen_data, bh->b_page->index); + page =find_lock_page (shadow->inode->i_mapping, bh->b_page->index);if (page) {if (page_has_buffers (page)) { n =bh_offset (bh) >> inode->i_blkbits;
@@ -621,11 +634,11 @@ void nilfs_mdt_restore_from_shadow_map(struct inode *inode)nilfs_palloc_clear_cache (inode);nilfs_clear_dirty_pages (inode->i_mapping, true); -nilfs_copy_back_pages (inode->i_mapping, &shadow->frozen_data); +nilfs_copy_back_pages (inode->i_mapping, shadow->inode->i_mapping);nilfs_clear_dirty_pages (ii->i_assoc_inode->i_mapping, true);nilfs_copy_back_pages (ii->i_assoc_inode->i_mapping, - &shadow->frozen_btnodes); +NILFS_I (shadow->inode)->i_assoc_inode->i_mapping);nilfs_bmap_restore (ii->i_bmap, &shadow->bmap_store);
@@ -640,10 +653,11 @@ void nilfs_mdt_clear_shadow_map(struct inode *inode) {struct nilfs_mdt_info *mi =NILFS_MDT (inode);struct nilfs_shadow_map *shadow = mi->mi_shadow; +struct inode *shadow_btnc_inode =NILFS_I (shadow->inode)->i_assoc_inode;down_write (&mi->mi_sem);nilfs_release_frozen_buffers (shadow); -truncate_inode_pages (&shadow->frozen_data,0 ); -truncate_inode_pages (&shadow->frozen_btnodes,0 ); +truncate_inode_pages (shadow->inode->i_mapping,0 ); +truncate_inode_pages (shadow_btnc_inode->i_mapping,0 );up_write (&mi->mi_sem); }
fs/nilfs2/mdt.h +2 -4
@@ -18,14 +18,12 @@/** * struct nilfs_shadow_map - shadow mapping of meta data file * @bmap_store: shadow copy of bmap state -* @frozen_data: shadowed dirty data pages -* @frozen_btnodes: shadowed dirty b-tree nodes' pages +* @inode: holder of page caches used in shadow mapping * @frozen_buffers: list of frozen buffers */ struct nilfs_shadow_map {struct nilfs_bmap_store bmap_store; -struct address_space frozen_data; -struct address_space frozen_btnodes; +struct inode *inode;struct list_head frozen_buffers; };
fs/nilfs2/nilfs.h +2 -0
@@ -92,6 +92,7 @@ enum {NILFS_I_BMAP ,/* has bmap and btnode_cache */ NILFS_I_GCINODE ,/* inode for GC, on memory only */ NILFS_I_BTNC ,/* inode for btree node cache */ + NILFS_I_SHADOW, /* inode for shadowed page cache */ };/*
@@ -263,6 +264,7 @@ extern struct inode *nilfs_iget_for_gc(struct super_block *sb, unsigned long ino, __u64 cno);int nilfs_attach_btree_node_cache (struct inode *inode);void nilfs_detach_btree_node_cache (struct inode *inode); +struct inode *nilfs_iget_for_shadow (struct inode *inode);extern void nilfs_update_inode (struct inode *,struct buffer_head *,int );extern void nilfs_truncate (struct inode *);extern void nilfs_evict_inode (struct inode *);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 46/158 ALSA: usb-audio: Restore Rane SL-1 quirk
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 5c62383c06837b5719cd5447a5758b791279e653 upstream.
At cleaning up and moving the device rename from the quirk table to its own table, we removed the entry for Rane SL-1 as we thought it's only for renaming. It turned out, however, that the quirk is required for matching with the device that declares itself as no standard audio but only as vendor-specific.
Restore the quirk entry for Rane SL-1 to fix the regression.
--- sound/usb/quirks-table.h | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/usb/quirks-table.h +9 -0
@@ -3235,6 +3235,15 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, +/* Rane SL-1 */ +{ + USB_DEVICE(0x13e5, 0x0001), + .driver_info = (unsigned long ) & (const struct snd_usb_audio_quirk ) { + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + } +}, +/* disabled due to regression for other devices; * see https://bugzilla.kernel.org/show_bug.cgi?id=199905 */
Greg Kroah-Hartman
maintainerPATCH 47/158 ALSA: wavefront: Proper check of get_user() error
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit a34ae6c0660d3b96b0055f68ef74dc9478852245 upstream.
The antient ISA wavefront driver reads its sample patch data (uploaded over an ioctl) via __get_user() with no good reason; likely just for some performance optimizations in the past. Let's change this to the standard get_user() and the error check for handling the fault case properly.
--- sound/isa/wavefront/wavefront_synth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/isa/wavefront/wavefront_synth.c +2 -1
@@ -1094,7 +1094,8 @@ wavefront_send_sample (snd_wavefront_t *if (dataptr < data_end) { -__get_user (sample_short, dataptr); +if (get_user (sample_short, dataptr)) +return -EFAULT ; dataptr += skip;if (data_is_unsigned) {/* GUS ? */
Greg Kroah-Hartman
maintainerPATCH 48/158 ALSA: hda/realtek: Add quirk for TongFang devices with pop noise
In reply to Greg Kroah-HartmanFrom: Werner Sembach <[email protected]>
commit 8b3b2392ed68bcd17c7eb84ca615ce1e5f115b99 upstream.
When audio stops playing there is an audible "pop"-noise when using headphones on the TongFang GMxMRxx, GKxNRxx, GMxZGxx, GMxTGxx and GMxAGxx.
This quirk fixes this mostly.
--- sound/pci/hda/patch_realtek.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/pci/hda/patch_realtek.c +8 -0
@@ -9236,6 +9236,14 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1c06 ,0x2013 ,"Lemote A1802" ,ALC269_FIXUP_LEMOTE_A1802 ),SND_PCI_QUIRK (0x1c06 ,0x2015 ,"Lemote A190X" ,ALC269_FIXUP_LEMOTE_A190X ),SND_PCI_QUIRK (0x1d05 ,0x1132 ,"TongFang PHxTxX1" ,ALC256_FIXUP_SET_COEF_DEFAULTS ), +SND_PCI_QUIRK (0x1d05 ,0x1096 ,"TongFang GMxMRxx" ,ALC269_FIXUP_NO_SHUTUP ), +SND_PCI_QUIRK (0x1d05 ,0x1100 ,"TongFang GKxNRxx" ,ALC269_FIXUP_NO_SHUTUP ), +SND_PCI_QUIRK (0x1d05 ,0x1111 ,"TongFang GMxZGxx" ,ALC269_FIXUP_NO_SHUTUP ), +SND_PCI_QUIRK (0x1d05 ,0x1119 ,"TongFang GMxZGxx" ,ALC269_FIXUP_NO_SHUTUP ), +SND_PCI_QUIRK (0x1d05 ,0x1129 ,"TongFang GMxZGxx" ,ALC269_FIXUP_NO_SHUTUP ), +SND_PCI_QUIRK (0x1d05 ,0x1147 ,"TongFang GMxTGxx" ,ALC269_FIXUP_NO_SHUTUP ), +SND_PCI_QUIRK (0x1d05 ,0x115c ,"TongFang GMxTGxx" ,ALC269_FIXUP_NO_SHUTUP ), +SND_PCI_QUIRK (0x1d05 ,0x121b ,"TongFang GMxAGxx" ,ALC269_FIXUP_NO_SHUTUP ),SND_PCI_QUIRK (0x1d72 ,0x1602 ,"RedmiBook" ,ALC255_FIXUP_XIAOMI_HEADSET_MIC ),SND_PCI_QUIRK (0x1d72 ,0x1701 ,"XiaomiNotebook Pro" ,ALC298_FIXUP_DELL1_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),
Greg Kroah-Hartman
maintainerPATCH 49/158 perf: Fix sys_perf_event_open() race against self
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
commit 3ac6487e584a1eb54071dbe1212e05b884136704 upstream.
Norbert reported that it's possible to race sys_perf_event_open() such that the looser ends up in another context from the group leader, triggering many WARNs.
The move_group case checks for races against itself, but the !move_group case doesn't, seemingly relying on the previous group_leader->ctx == ctx check. However, that check is racy due to not holding any locks at that time.
Therefore, re-check the result after acquiring locks and bailing if they no longer match.
Additionally, clarify the not_move_group case from the move_group-vs-move_group race.
--- kernel/events/core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
kernel/events/core.c +14 -0
@@ -12327,6 +12327,9 @@ SYSCALL_DEFINE5(perf_event_open,* Do not allow to attach to a group in a different task * or CPU context. If we're moving SW events, we'll fix * this up later, so allow that. +* +* Racy, not holding group_leader->ctx->mutex, see comment with +* perf_event_ctx_lock(). */ if (!move_group && group_leader->ctx != ctx) goto err_context;
@@ -12392,6 +12395,7 @@ SYSCALL_DEFINE5(perf_event_open, }else {perf_event_ctx_unlock (group_leader, gctx); move_group =0 ; + goto not_move_group; } }
@@ -12408,7 +12412,17 @@ SYSCALL_DEFINE5(perf_event_open, } }else {mutex_lock (&ctx->mutex); + +/* +* Now that we hold ctx->lock, (re)validate group_leader->ctx == ctx, +* see the group_leader && !move_group test earlier. +*/ +if (group_leader && group_leader->ctx != ctx) { + err = -EINVAL ; + goto err_locked; + } } +not_move_group:if (ctx->task ==TASK_TOMBSTONE ) { err = -ESRCH ;
Greg Kroah-Hartman
maintainerPATCH 50/158 selinux: fix bad cleanup on error in hashtab_duplicate()
In reply to Greg Kroah-HartmanFrom: Ondrej Mosnacek <[email protected]>
commit 6254bd3db316c9ccb3b05caa8b438be63245466f upstream.
The code attempts to free the 'new' pointer using kmem_cache_free(), which is wrong because this function isn't responsible of freeing it. Instead, the function should free new->htable and clear the contents of *new (to prevent double-free).
--- security/selinux/ss/hashtab.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
security/selinux/ss/hashtab.c +2 -1
@@ -179,7 +179,8 @@ int hashtab_duplicate(struct hashtab *nekmem_cache_free (hashtab_node_cachep, cur); } } -kmem_cache_free (hashtab_node_cachep, new); +kfree (new->htable); +memset (new,0 ,sizeof (*new));return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 51/158 audit,io_uring,io-wq: call __audit_uring_exit for dummy contexts
In reply to Greg Kroah-HartmanFrom: Julian Orth <[email protected]>
commit 69e9cd66ae1392437234a63a3a1d60b6655f92ef upstream.
Not calling the function for dummy contexts will cause the context to not be reset. During the next syscall, this will cause an error in __audit_syscall_entry:
WARN_ON(context->context != AUDIT_CTX_UNUSED);
WARN_ON(context->name_count);
if (context->context != AUDIT_CTX_UNUSED || context->name_count) {
audit_panic("unrecoverable error in audit_syscall_entry()");
return;
}These problematic dummy contexts are created via the following call chain:
exit_to_user_mode_prepare
-> arch_do_signal_or_restart
-> get_signal
-> task_work_run
-> tctx_task_work
-> io_req_task_submit
-> io_issue_sqe
-> audit_uring_entry--- include/linux/audit.h | 2 +- kernel/auditsc.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
include/linux/audit.h +1 -1
@@ -339,7 +339,7 @@ static inline void audit_uring_entry(u8 }static inline void audit_uring_exit (int success,long code) { -if (unlikely (!audit_dummy_context ())) +if (unlikely (audit_context ()))__audit_uring_exit (success, code); } static inline void audit_syscall_entry(int major, unsigned long a0,
kernel/auditsc.c +6 -0
@@ -1959,6 +1959,12 @@ void __audit_uring_exit(int success, lon {struct audit_context *ctx =audit_context (); +if (ctx->dummy) { +if (ctx->context !=AUDIT_CTX_URING ) +return ; + goto out; + } +if (ctx->context ==AUDIT_CTX_SYSCALL ) {/* * NOTE: See the note in __audit_uring_entry() about the case
Greg Kroah-Hartman
maintainerPATCH 52/158 Fix double fget() in vhost_net_set_backend()
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit fb4554c2232e44d595920f4d5c66cf8f7d13f9bc upstream.
Descriptor table is a shared resource; two fget() on the same descriptor may return different struct file references. get_tap_ptr_ring() is called after we'd found (and pinned) the socket we'll be using and it tries to find the private tun/tap data structures associated with it. Redoing the lookup by the same file descriptor we'd used to get the socket is racy - we need to same struct file.
Thanks to Jason for spotting a braino in the original variant of patch - I'd missed the use of fd == -1 for disabling backend, and in that case we can end up with sock == NULL and sock != oldsock.
--- drivers/vhost/net.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/vhost/net.c +7 -8
@@ -1450,13 +1450,9 @@ err:return ERR_PTR (r); } -static struct ptr_ring *get_tap_ptr_ring (int fd) +static struct ptr_ring *get_tap_ptr_ring (struct file *file) {struct ptr_ring *ring; -struct file *file =fget (fd); - -if (!file) -return NULL ; ring =tun_get_tx_ring (file);if (!IS_ERR (ring)) goto out;
@@ -1465,7 +1461,6 @@ static struct ptr_ring *get_tap_ptr_ring goto out; ring =NULL ; out: -fput (file);return ring; }
@@ -1552,8 +1547,12 @@ static long vhost_net_set_backend(struct r =vhost_net_enable_vq (n, vq);if (r) goto err_used; -if (index ==VHOST_NET_VQ_RX ) - nvq->rx_ring =get_tap_ptr_ring (fd); +if (index ==VHOST_NET_VQ_RX ) { +if (sock) + nvq->rx_ring =get_tap_ptr_ring (sock->file); +else + nvq->rx_ring =NULL ; + } oldubufs = nvq->ubufs; nvq->ubufs = ubufs;
Greg Kroah-Hartman
maintainerPATCH 53/158 PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 92597f97a40bf661bebceb92e26ff87c76d562d4 upstream.
If a Root Port on Elo i2 is put into D3cold and then back into D0, the downstream device becomes permanently inaccessible, so add a bridge D3 DMI quirk for that system.
This was exposed by 14858dcc3b35 ("PCI: Use pci_update_current_state() in pci_enable_device_flags()"), but before that commit the Root Port in question had never been put into D3cold for real due to a mismatch between its power state retrieved from the PCI_PM_CTRL register (which was accessible even though the platform firmware indicated that the port was in D3cold) and the state of an ACPI power resource involved in its power management.
--- drivers/pci/pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pci/pci.c +10 -0
@@ -2920,6 +2920,16 @@ static const struct dmi_system_id bridgeDMI_MATCH (DMI_BOARD_VENDOR ,"Gigabyte Technology Co., Ltd." ), DMI_MATCH(DMI_BOARD_NAME, "X299 DESIGNARE EX-CF"), }, +/* +* Downstream device is not accessible after putting a root port +* into D3cold and back into D0 on Elo i2. +*/ + .ident ="Elo i2" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Elo Touch Solutions" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Elo i2" ), + DMI_MATCH(DMI_PRODUCT_VERSION, "RevB"), + }, }, #endif { }
Greg Kroah-Hartman
maintainerPATCH 54/158 Revert "can: m_can: pci: use custom bit timings for Elkhart Lake"
In reply to Greg Kroah-HartmanFrom: Jarkko Nikula <[email protected]>
commit 14ea4a470494528c7e88da5c4116c24eb027059f upstream.
This reverts commit 0e8ffdf3b86dfd44b651f91b12fcae76c25c453b.
Commit 0e8ffdf3b86d ("can: m_can: pci: use custom bit timings for Elkhart Lake") broke the test case using bitrate switching.
| ip link set can0 up type can bitrate 500000 dbitrate 4000000 fd on | ip link set can1 up type can bitrate 500000 dbitrate 4000000 fd on | candump can0 & | cangen can1 -I 0x800 -L 64 -e -fb \ | -D 11223344deadbeef55667788feedf00daabbccdd44332211 -n 1 -v -v
Above commit does everything correctly according to the datasheet. However datasheet wasn't correct.
I got confirmation from hardware engineers that the actual CAN hardware on Intel Elkhart Lake is based on M_CAN version v3.2.0. Datasheet was mirroring values from an another specification which was based on earlier M_CAN version leading to wrong bit timings.
Therefore revert the commit and switch back to common bit timings.
--- drivers/net/can/m_can/m_can_pci.c | 48 +++----------------------------------- 1 file changed, 4 insertions(+), 44 deletions(-)
drivers/net/can/m_can/m_can_pci.c +4 -44
@@ -18,14 +18,9 @@#define M_CAN_PCI_MMIO_BAR 0 +#define M_CAN_CLOCK_FREQ_EHL 200000000#define CTL_CSR_INT_CTL_OFFSET 0x508 -struct m_can_pci_config { -const struct can_bittiming_const *bit_timing; -const struct can_bittiming_const *data_timing; -unsigned int clock_freq; -}; -struct m_can_pci_priv {struct m_can_classdev cdev;
@@ -89,40 +84,9 @@ static struct m_can_ops m_can_pci_ops = .read_fifo = iomap_read_fifo, }; -static const struct can_bittiming_const m_can_bittiming_const_ehl = { - .name =KBUILD_MODNAME , - .tseg1_min =2 ,/* Time segment 1 = prop_seg + phase_seg1 */ - .tseg1_max =64 , - .tseg2_min =1 ,/* Time segment 2 = phase_seg2 */ - .tseg2_max =128 , - .sjw_max =128 , - .brp_min =1 , - .brp_max =512 , - .brp_inc =1 , -}; - -static const struct can_bittiming_const m_can_data_bittiming_const_ehl = { - .name =KBUILD_MODNAME , - .tseg1_min =2 ,/* Time segment 1 = prop_seg + phase_seg1 */ - .tseg1_max =16 , - .tseg2_min =1 ,/* Time segment 2 = phase_seg2 */ - .tseg2_max =8 , - .sjw_max =4 , - .brp_min =1 , - .brp_max =32 , - .brp_inc =1 , -}; - -static const struct m_can_pci_config m_can_pci_ehl = { - .bit_timing = &m_can_bittiming_const_ehl, - .data_timing = &m_can_data_bittiming_const_ehl, - .clock_freq =200000000 , -}; -static int m_can_pci_probe (struct pci_dev *pci,const struct pci_device_id *id) {struct device *dev = &pci->dev; -const struct m_can_pci_config *cfg;struct m_can_classdev *mcan_class;struct m_can_pci_priv *priv;void __iomem *base;
@@ -150,8 +114,6 @@ static int m_can_pci_probe(struct pci_deif (!mcan_class)return -ENOMEM ; - cfg = (const struct m_can_pci_config *)id->driver_data; - priv =cdev_to_priv (mcan_class); priv->base = base;
@@ -163,9 +125,7 @@ static int m_can_pci_probe(struct pci_de mcan_class->dev = &pci->dev; mcan_class->net->irq =pci_irq_vector (pci,0 ); mcan_class->pm_clock_support =1 ; - mcan_class->bit_timing = cfg->bit_timing; - mcan_class->data_timing = cfg->data_timing; - mcan_class->can.clock.freq = cfg->clock_freq; + mcan_class->can.clock.freq = id->driver_data; mcan_class->ops = &m_can_pci_ops;pci_set_drvdata (pci, mcan_class);
@@ -218,8 +178,8 @@ static SIMPLE_DEV_PM_OPS(m_can_pci_pm_op m_can_pci_suspend, m_can_pci_resume);static const struct pci_device_id m_can_pci_id_table[] = { - {PCI_VDEVICE (INTEL ,0x4bc1 ), (kernel_ulong_t)&m_can_pci_ehl, }, - {PCI_VDEVICE (INTEL ,0x4bc2 ), (kernel_ulong_t)&m_can_pci_ehl, }, + {PCI_VDEVICE (INTEL ,0x4bc1 ),M_CAN_CLOCK_FREQ_EHL , }, + {PCI_VDEVICE (INTEL ,0x4bc2 ),M_CAN_CLOCK_FREQ_EHL , }, { }/* Terminating Entry */ };MODULE_DEVICE_TABLE (pci, m_can_pci_id_table);
Greg Kroah-Hartman
maintainerPATCH 55/158 KVM: arm64: vgic-v3: Consistently populate ID_AA64PFR0_EL1.GIC
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
commit 5163373af195f10e0d99a8de3465c4ed36bdc337 upstream.
When adding support for the slightly wonky Apple M1, we had to populate ID_AA64PFR0_EL1.GIC==1 to present something to the guest, as the HW itself doesn't advertise the feature.
However, we gated this on the in-kernel irqchip being created. This causes some trouble for QEMU, which snapshots the state of the registers before creating a virtual GIC, and then tries to restore these registers once the GIC has been created. Obviously, between the two stages, ID_AA64PFR0_EL1.GIC has changed value, and the write fails.
The fix is to actually emulate the HW, and always populate the field if the HW is capable of it.
--- arch/arm64/kvm/sys_regs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/kvm/sys_regs.c +1 -2
@@ -1080,8 +1080,7 @@ static u64 read_id_reg(const struct kvm_ val |=FIELD_PREP (ARM64_FEATURE_MASK (ID_AA64PFR0_CSV2 ), (u64 )vcpu->kvm->arch.pfr0_csv2); val &= ~ARM64_FEATURE_MASK (ID_AA64PFR0_CSV3 ); val |=FIELD_PREP (ARM64_FEATURE_MASK (ID_AA64PFR0_CSV3 ), (u64 )vcpu->kvm->arch.pfr0_csv3); -if (irqchip_in_kernel (vcpu->kvm) && - vcpu->kvm->arch.vgic.vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V3 ) { +if (kvm_vgic_global_state.type ==VGIC_V3 ) { val &= ~ARM64_FEATURE_MASK (ID_AA64PFR0_GIC ); val |=FIELD_PREP (ARM64_FEATURE_MASK (ID_AA64PFR0_GIC ),1 ); }
Greg Kroah-Hartman
maintainerPATCH 56/158 KVM: x86/mmu: Update number of zapped pages even if page list is stable
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit b28cb0cd2c5e80a8c0feb408a0e4b0dbb6d132c5 upstream.
When zapping obsolete pages, update the running count of zapped pages regardless of whether or not the list has become unstable due to zapping a shadow page with its own child shadow pages. If the VM is backed by mostly 4kb pages, KVM can zap an absurd number of SPTEs without bumping the batch count and thus without yielding. In the worst case scenario, this can cause a soft lokcup.
watchdog: BUG: soft lockup - CPU#12 stuck for 22s! [dirty_log_perf_:13020] RIP: 0010:workingset_activation+0x19/0x130 mark_page_accessed+0x266/0x2e0 kvm_set_pfn_accessed+0x31/0x40 mmu_spte_clear_track_bits+0x136/0x1c0 drop_spte+0x1a/0xc0 mmu_page_zap_pte+0xef/0x120 __kvm_mmu_prepare_zap_page+0x205/0x5e0 kvm_mmu_zap_all_fast+0xd7/0x190 kvm_mmu_invalidate_zap_pages_in_memslot+0xe/0x10 kvm_page_track_flush_slot+0x5c/0x80 kvm_arch_flush_shadow_memslot+0xe/0x10 kvm_set_memslot+0x1a8/0x5d0 __kvm_set_memory_region+0x337/0x590 kvm_vm_ioctl+0xb08/0x1040
Message-Id: <[email protected]>
--- arch/x86/kvm/mmu/mmu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/x86/kvm/mmu/mmu.c +6 -4
@@ -5611,6 +5611,7 @@ static void kvm_zap_obsolete_pages(struc {struct kvm_mmu_page *sp, *node;int nr_zapped, batch =0 ; +bool unstable; restart: list_for_each_entry_safe_reverse(sp, node,
@@ -5642,11 +5643,12 @@ restart: goto restart; } -if (__kvm_mmu_prepare_zap_page (kvm, sp, - &kvm->arch.zapped_obsolete_pages, &nr_zapped)) { - batch += nr_zapped; + unstable =__kvm_mmu_prepare_zap_page (kvm, sp, + &kvm->arch.zapped_obsolete_pages, &nr_zapped); + batch += nr_zapped; + +if (unstable) goto restart; - } }/*
Greg Kroah-Hartman
maintainerPATCH 57/158 KVM: Free new dirty bitmap if creating a new memslot fails
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit c87661f855c3f2023e40ddc364002601ee234367 upstream.
Fix a goof in kvm_prepare_memory_region() where KVM fails to free the new memslot's dirty bitmap during a CREATE action if kvm_arch_prepare_memory_region() fails. The logic is supposed to detect if the bitmap was allocated and thus needs to be freed, versus if the bitmap was inherited from the old memslot and thus needs to be kept. If there is no old memslot, then obviously the bitmap can't have been inherited
The bug was exposed by commit 86931ff7207b ("KVM: x86/mmu: Do not create SPTEs for GFNs that exceed host.MAXPHYADDR"), which made it trivally easy for syzkaller to trigger failure during kvm_arch_prepare_memory_region(), but the bug can be hit other ways too, e.g. due to -ENOMEM when allocating x86's memslot metadata.
The backtrace from kmemleak:
__vmalloc_node_range+0xb40/0xbd0 mm/vmalloc.c:3195 __vmalloc_node mm/vmalloc.c:3232 [inline] __vmalloc+0x49/0x50 mm/vmalloc.c:3246 __vmalloc_array mm/util.c:671 [inline] __vcalloc+0x49/0x70 mm/util.c:694 kvm_alloc_dirty_bitmap virt/kvm/kvm_main.c:1319 kvm_prepare_memory_region virt/kvm/kvm_main.c:1551 kvm_set_memslot+0x1bd/0x690 virt/kvm/kvm_main.c:1782 __kvm_set_memory_region+0x689/0x750 virt/kvm/kvm_main.c:1949 kvm_set_memory_region virt/kvm/kvm_main.c:1962 kvm_vm_ioctl_set_memory_region virt/kvm/kvm_main.c:1974 kvm_vm_ioctl+0x377/0x13a0 virt/kvm/kvm_main.c:4528 vfs_ioctl fs/ioctl.c:51 __do_sys_ioctl fs/ioctl.c:870 __se_sys_ioctl fs/ioctl.c:856 __x64_sys_ioctl+0xfc/0x140 fs/ioctl.c:856 do_syscall_x64 arch/x86/entry/common.c:50 do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
And the relevant sequence of KVM events:
ioctl(3, KVM_CREATE_VM, 0) = 4
ioctl(4, KVM_SET_USER_MEMORY_REGION, {slot=0,
flags=KVM_MEM_LOG_DIRTY_PAGES,
guest_phys_addr=0x10000000000000,
memory_size=4096,
userspace_addr=0x20fe8000}
) = -1 EINVAL (Invalid argument)Message-Id: <[email protected]>
--- virt/kvm/kvm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
virt/kvm/kvm_main.c +1 -1
@@ -1539,7 +1539,7 @@ static int kvm_prepare_memory_region(str r =kvm_arch_prepare_memory_region (kvm, old, new, change);/* Free the bitmap on failure if it was allocated above. */ -if (r && new && new->dirty_bitmap && old && !old->dirty_bitmap) +if (r && new && new->dirty_bitmap && (!old || !old->dirty_bitmap))kvm_destroy_dirty_bitmap (new);return r;
Greg Kroah-Hartman
maintainerPATCH 58/158 arm64: paravirt: Use RCU read locks to guard stolen_time
In reply to Greg Kroah-HartmanFrom: Prakruthi Deepak Heragu <[email protected]>
commit 19bef63f951e47dd4ba54810e6f7c7ff9344a3ef upstream.
During hotplug, the stolen time data structure is unmapped and memset. There is a possibility of the timer IRQ being triggered before memset and stolen time is getting updated as part of this timer IRQ handler. This causes the below crash in timer handler -
[ 3457.473139][ C5] Unable to handle kernel paging request at virtual address ffffffc03df05148 ... [ 3458.154398][ C5] Call trace: [ 3458.157648][ C5] para_steal_clock+0x30/0x50 [ 3458.162319][ C5] irqtime_account_process_tick+0x30/0x194 [ 3458.168148][ C5] account_process_tick+0x3c/0x280 [ 3458.173274][ C5] update_process_times+0x5c/0xf4 [ 3458.178311][ C5] tick_sched_timer+0x180/0x384 [ 3458.183164][ C5] __run_hrtimer+0x160/0x57c [ 3458.187744][ C5] hrtimer_interrupt+0x258/0x684 [ 3458.192698][ C5] arch_timer_handler_virt+0x5c/0xa0 [ 3458.198002][ C5] handle_percpu_devid_irq+0xdc/0x414 [ 3458.203385][ C5] handle_domain_irq+0xa8/0x168 [ 3458.208241][ C5] gic_handle_irq.34493+0x54/0x244 [ 3458.213359][ C5] call_on_irq_stack+0x40/0x70 [ 3458.218125][ C5] do_interrupt_handler+0x60/0x9c [ 3458.223156][ C5] el1_interrupt+0x34/0x64 [ 3458.227560][ C5] el1h_64_irq_handler+0x1c/0x2c [ 3458.232503][ C5] el1h_64_irq+0x7c/0x80 [ 3458.236736][ C5] free_vmap_area_noflush+0x108/0x39c [ 3458.242126][ C5] remove_vm_area+0xbc/0x118 [ 3458.246714][ C5] vm_remove_mappings+0x48/0x2a4 [ 3458.251656][ C5] __vunmap+0x154/0x278 [ 3458.255796][ C5] stolen_time_cpu_down_prepare+0xc0/0xd8 [ 3458.261542][ C5] cpuhp_invoke_callback+0x248/0xc34 [ 3458.266842][ C5] cpuhp_thread_fun+0x1c4/0x248 [ 3458.271696][ C5] smpboot_thread_fn+0x1b0/0x400 [ 3458.276638][ C5] kthread+0x17c/0x1e0 [ 3458.280691][ C5] ret_from_fork+0x10/0x20
As a fix, introduce rcu lock to update stolen time structure.
--- arch/arm64/kernel/paravirt.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
arch/arm64/kernel/paravirt.c +21 -8
@@ -35,7 +35,7 @@ static u64 native_steal_clock(int cpu)DEFINE_STATIC_CALL (pv_steal_clock, native_steal_clock);struct pv_time_stolen_time_region { -struct pvclock_vcpu_stolen_time *kaddr; +struct pvclock_vcpu_stolen_time __rcu *kaddr; }; static DEFINE_PER_CPU(struct pv_time_stolen_time_region, stolen_time_region);
@@ -52,7 +52,9 @@ early_param("no-steal-acc", parse_no_ste/* return stolen time in ns by asking the hypervisor */ static u64 para_steal_clock (int cpu) { +struct pvclock_vcpu_stolen_time *kaddr =NULL ;struct pv_time_stolen_time_region *reg; +u64 ret =0 ; reg =per_cpu_ptr (&stolen_time_region, cpu);
@@ -61,28 +63,37 @@ static u64 para_steal_clock(int cpu)* online notification callback runs. Until the callback * has run we just return zero. */ -if (!reg->kaddr) +rcu_read_lock (); + kaddr =rcu_dereference (reg->kaddr); +if (!kaddr) { +rcu_read_unlock ();return 0 ; + } -return le64_to_cpu (READ_ONCE (reg->kaddr->stolen_time)); + ret =le64_to_cpu (READ_ONCE (kaddr->stolen_time)); +rcu_read_unlock (); +return ret; }static int stolen_time_cpu_down_prepare (unsigned int cpu) { +struct pvclock_vcpu_stolen_time *kaddr =NULL ;struct pv_time_stolen_time_region *reg; reg =this_cpu_ptr (&stolen_time_region);if (!reg->kaddr)return 0 ; -memunmap (reg->kaddr); -memset (reg,0 ,sizeof (*reg)); + kaddr =rcu_replace_pointer (reg->kaddr,NULL , true); +synchronize_rcu (); +memunmap (kaddr);return 0 ; }static int stolen_time_cpu_online (unsigned int cpu) { +struct pvclock_vcpu_stolen_time *kaddr =NULL ;struct pv_time_stolen_time_region *reg;struct arm_smccc_res res;
@@ -93,17 +104,19 @@ static int stolen_time_cpu_online(unsignif (res.a0 ==SMCCC_RET_NOT_SUPPORTED )return -EINVAL ; - reg->kaddr =memremap (res.a0, + kaddr =memremap (res.a0,sizeof (struct pvclock_vcpu_stolen_time ),MEMREMAP_WB ); +rcu_assign_pointer (reg->kaddr, kaddr); +if (!reg->kaddr) {pr_warn ("Failed to map stolen time data structure\n" );return -ENOMEM ; } -if (le32_to_cpu (reg->kaddr->revision) !=0 || -le32_to_cpu (reg->kaddr->attributes) !=0 ) { +if (le32_to_cpu (kaddr->revision) !=0 || +le32_to_cpu (kaddr->attributes) !=0 ) {pr_warn_once ("Unexpected revision or attributes in stolen time data\n" );return -ENXIO ; }
Greg Kroah-Hartman
maintainerPATCH 59/158 arm64: mte: Ensure the cleared tags are visible before setting the PTE
In reply to Greg Kroah-HartmanFrom: Catalin Marinas <[email protected]>
commit 1d0cb4c8864addc362bae98e8ffa5500c87e1227 upstream.
As an optimisation, only pages mapped with PROT_MTE in user space have the MTE tags zeroed. This is done lazily at the set_pte_at() time via mte_sync_tags(). However, this function is missing a barrier and another CPU may see the PTE updated before the zeroed tags are visible. Add an smp_wmb() barrier if the mapping is Normal Tagged.
--- arch/arm64/kernel/mte.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/kernel/mte.c +3 -0
@@ -76,6 +76,9 @@ void mte_sync_tags(pte_t old_pte, pte_tmte_sync_page_tags (page, old_pte, check_swap, pte_is_tagged); } + +/* ensure the tags are visible before the PTE is set */ +smp_wmb (); }int memcmp_pages (struct page *page1,struct page *page2)
Greg Kroah-Hartman
maintainerPATCH 60/158 crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ
In reply to Greg Kroah-HartmanFrom: Ondrej Mosnacek <[email protected]>
commit 16287397ec5c08aa58db6acf7dbc55470d78087d upstream.
The commit referenced in the Fixes tag removed the 'break' from the else branch in qcom_rng_read(), causing an infinite loop whenever 'max' is not a multiple of WORD_SZ. This can be reproduced e.g. by running:
kcapi-rng -b 67 >/dev/null
There are many ways to fix this without adding back the 'break', but they all seem more awkward than simply adding it back, so do just that.
Tested on a machine with Qualcomm Amberwing processor.
--- drivers/crypto/qcom-rng.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/qcom-rng.c +1 -0
@@ -65,6 +65,7 @@ static int qcom_rng_read(struct qcom_rng }else {/* copy only remaining bytes */ memcpy (data, &val, max - currsize); +break ; } }while (currsize < max);
Greg Kroah-Hartman
maintainerPATCH 61/158 mmc: core: Fix busy polling for MMC_SEND_OP_COND again
In reply to Greg Kroah-HartmanFrom: Ulf Hansson <[email protected]>
commit e949dee3625e1b0ef2e40d9aa09c2995281b12f6 upstream.
It turned out that polling period for MMC_SEND_OP_COND, that currently is set to 1ms, still isn't sufficient. In particular a Micron eMMC on a Beaglebone platform, is reported to sometimes fail to initialize.
Additional test, shows that extending the period to 4ms is working fine, so let's make that change.
--- drivers/mmc/core/mmc_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/core/mmc_ops.c +1 -1
@@ -21,7 +21,7 @@#define MMC_BKOPS_TIMEOUT_MS (120 * 1000)/* 120s */ #define MMC_SANITIZE_TIMEOUT_MS (240 * 1000)/* 240s */ -#define MMC_OP_COND_PERIOD_US (1 * 1000)/* 1ms */ +#define MMC_OP_COND_PERIOD_US (4 * 1000)/* 4ms */ #define MMC_OP_COND_TIMEOUT_MS 1000/* 1s */ static const u8 tuning_blk_pattern_4bit[] = {
Greg Kroah-Hartman
maintainerPATCH 62/158 libceph: fix potential use-after-free on linger ping and resends
In reply to Greg Kroah-HartmanFrom: Ilya Dryomov <[email protected]>
commit 75dbb685f4e8786c33ddef8279bab0eadfb0731f upstream.
request_reinit() is not only ugly as the comment rightfully suggests, but also unsafe. Even though it is called with osdc->lock held for write in all cases, resetting the OSD request refcount can still race with handle_reply() and result in use-after-free. Taking linger ping as an example:
handle_timeout thread handle_reply thread
down_read(&osdc->lock)
req = lookup_request(...)
...
finish_request(req) # unregisters
up_read(&osdc->lock)
__complete_request(req)
linger_ping_cb(req)
# req->r_kref == 2 because handle_reply still holds its ref
down_write(&osdc->lock)
send_linger_ping(lreq)
req = lreq->ping_req # same req
# cancel_linger_request is NOT
# called - handle_reply already
# unregistered
request_reinit(req)
WARN_ON(req->r_kref != 1) # fires
request_init(req)
kref_init(req->r_kref)
# req->r_kref == 1 after kref_init
ceph_osdc_put_request(req)
kref_put(req->r_kref)
# req->r_kref == 0 after kref_put, req is freed
<further req initialization/use> !!!This happens because send_linger_ping() always (re)uses the same OSD request for watch ping requests, relying on cancel_linger_request() to unregister it from the OSD client and rip its messages out from the messenger. send_linger() does the same for watch/notify registration and watch reconnect requests. Unfortunately cancel_request() doesn't guarantee that after it returns the OSD client would be completely done with the OSD request -- a ref could still be held and the callback (if specified) could still be invoked too.
The original motivation for request_reinit() was inability to deal with allocation failures in send_linger() and send_linger_ping(). Switching to using osdc->req_mempool (currently only used by CephFS) respects that and allows us to get rid of request_reinit().
--- include/linux/ceph/osd_client.h | 3 net/ceph/osd_client.c | 302 +++++++++++++++------------------------- 2 files changed, 122 insertions(+), 183 deletions(-)
include/linux/ceph/osd_client.h +3 -0
@@ -287,6 +287,9 @@ struct ceph_osd_linger_request {rados_watcherrcb_t errcb;void *data; +struct ceph_pagelist *request_pl; +struct page **notify_id_pages; +struct page ***preply_pages;size_t *preply_len; };
net/ceph/osd_client.c +119 -183
462 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 63/158 drm/amd: Dont reset dGPUs if the system is going to s2idle
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
commit 7123d39dc24dcd21ff23d75f46f926b15269b9da upstream.
An A+A configuration on ASUS ROG Strix G513QY proves that the ASIC reset for handling aborted suspend can't work with s2idle.
This functionality was introduced in commit daf8de0874ab5b ("drm/amdgpu:
always reset the asic in suspend (v2)"). A few other commits have gone on top of the ASIC reset, but this still doesn't work on the A+A configuration in s2idle.
Avoid doing the reset on dGPUs specifically when using s2idle.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 14 ++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -1422,9 +1422,11 @@ static inline int amdgpu_acpi_smart_shif#if defined(CONFIG_ACPI ) && defined(CONFIG_SUSPEND )bool amdgpu_acpi_is_s3_active (struct amdgpu_device *adev); +bool amdgpu_acpi_should_gpu_reset (struct amdgpu_device *adev);bool amdgpu_acpi_is_s0ix_active (struct amdgpu_device *adev);#else static inline bool amdgpu_acpi_is_s0ix_active (struct amdgpu_device *adev) {return false; } +static inline bool amdgpu_acpi_should_gpu_reset (struct amdgpu_device *adev) {return false; }static inline bool amdgpu_acpi_is_s3_active (struct amdgpu_device *adev) {return false; }#endif
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +14 -0
@@ -1046,6 +1046,20 @@ bool amdgpu_acpi_is_s3_active(struct amd }/** +* amdgpu_acpi_should_gpu_reset +* +* @adev: amdgpu_device_pointer +* +* returns true if should reset GPU, false if not +*/ +bool amdgpu_acpi_should_gpu_reset (struct amdgpu_device *adev) +{ +if (adev->flags &AMD_IS_APU ) +return false; +return pm_suspend_target_state !=PM_SUSPEND_TO_IDLE ; +} + +/** * amdgpu_acpi_is_s0ix_active * * @adev: amdgpu_device_pointer
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
@@ -2289,7 +2289,7 @@ static int amdgpu_pmops_suspend_noirq(ststruct drm_device *drm_dev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (drm_dev); -if (!adev->in_s0ix) +if (amdgpu_acpi_should_gpu_reset (adev))return amdgpu_asic_reset (adev);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 64/158 drm/i915/dmc: Add MMIO range restrictions
In reply to Greg Kroah-HartmanFrom: Anusha Srivatsa <[email protected]>
commit 54395a33718af1c04b5098203335b25382291a16 upstream.
Bspec has added some steps that check forDMC MMIO range before programming them
v2: Fix for CI
v3: move register defines to .h (Anusha)
- Check MMIO restrictions per pipe
- Add MMIO restricton for v1 dmc header as well (Lucas)
v4: s/_PICK/_PICK_EVEN and use it only for Pipe DMC scenario.
- clean up sanity check logic.(Lucas)
- Add MMIO range for RKL as well.(Anusha)
v5: Use DISPLAY_VER instead of per platform check (Lucas)
BSpec: 49193
--- drivers/gpu/drm/i915/display/intel_dmc.c | 44 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 16 +++++++++++ 2 files changed, 60 insertions(+)
drivers/gpu/drm/i915/display/intel_dmc.c +44 -0
@@ -367,6 +367,44 @@ static void dmc_set_fw_offset(struct int } } +static bool dmc_mmio_addr_sanity_check (struct intel_dmc *dmc, +const u32 *mmioaddr,u32 mmio_count, +int header_ver,u8 dmc_id) +{ +struct drm_i915_private *i915 =container_of (dmc,typeof (*i915), dmc); +u32 start_range, end_range; +int i; + +if (dmc_id >=DMC_FW_MAX ) { +drm_warn (&i915->drm,"Unsupported firmware id %u\n" , dmc_id); +return false; + } + +if (header_ver ==1 ) { + start_range =DMC_MMIO_START_RANGE ; + end_range =DMC_MMIO_END_RANGE ; + }else if (dmc_id ==DMC_FW_MAIN ) { + start_range =TGL_MAIN_MMIO_START ; + end_range =TGL_MAIN_MMIO_END ; + }else if (DISPLAY_VER (i915) >=13 ) { + start_range =ADLP_PIPE_MMIO_START ; + end_range =ADLP_PIPE_MMIO_END ; + }else if (DISPLAY_VER (i915) >=12 ) { + start_range =TGL_PIPE_MMIO_START (dmc_id); + end_range =TGL_PIPE_MMIO_END (dmc_id); + }else { +drm_warn (&i915->drm,"Unknown mmio range for sanity check" ); +return false; + } + +for (i =0 ; i < mmio_count; i++) { +if (mmioaddr[i] < start_range || mmioaddr[i] > end_range) +return false; + } + +return true; +} +static u32 parse_dmc_fw_header (struct intel_dmc *dmc,const struct intel_dmc_header_base *dmc_header,size_t rem_size,u8 dmc_id)
@@ -436,6 +474,12 @@ static u32 parse_dmc_fw_header(struct inreturn 0 ; } +if (!dmc_mmio_addr_sanity_check (dmc, mmioaddr, mmio_count, + dmc_header->header_ver, dmc_id)) { +drm_err (&i915->drm,"DMC firmware has Wrong MMIO Addresses\n" ); +return 0 ; + } +for (i =0 ; i < mmio_count; i++) { dmc_info->mmioaddr[i] =_MMIO (mmioaddr[i]); dmc_info->mmiodata[i] = mmiodata[i];
drivers/gpu/drm/i915/i915_reg.h +16 -0
@@ -7938,6 +7938,22 @@ enum {/* MMIO address range for DMC program (0x80000 - 0x82FFF) */ #define DMC_MMIO_START_RANGE 0x80000#define DMC_MMIO_END_RANGE 0x8FFFF +#define DMC_V1_MMIO_START_RANGE 0x80000 +#define TGL_MAIN_MMIO_START 0x8F000 +#define TGL_MAIN_MMIO_END 0x8FFFF +#define _TGL_PIPEA_MMIO_START 0x92000 +#define _TGL_PIPEA_MMIO_END 0x93FFF +#define _TGL_PIPEB_MMIO_START 0x96000 +#define _TGL_PIPEB_MMIO_END 0x97FFF +#define ADLP_PIPE_MMIO_START 0x5F000 +#define ADLP_PIPE_MMIO_END 0x5FFFF + +#define TGL_PIPE_MMIO_START (dmc_id) _PICK_EVEN(((dmc_id) - 1), _TGL_PIPEA_MMIO_START,\ + _TGL_PIPEB_MMIO_START) + +#define TGL_PIPE_MMIO_END (dmc_id) _PICK_EVEN(((dmc_id) - 1), _TGL_PIPEA_MMIO_END,\ + _TGL_PIPEB_MMIO_END) +#define SKL_DMC_DC3_DC5_COUNT _MMIO(0x80030)#define SKL_DMC_DC5_DC6_COUNT _MMIO(0x8002C)#define BXT_DMC_DC3_DC5_COUNT _MMIO(0x80038)
Greg Kroah-Hartman
maintainerPATCH 65/158 drm/dp/mst: fix a possible memory leak in fetch_monitor_name()
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
commit 6e03b13cc7d9427c2c77feed1549191015615202 upstream.
drm_dp_mst_get_edid call kmemdup to create mst_edid. So mst_edid need to be freed after use.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_dp_mst_topology.c +1 -0
@@ -4852,6 +4852,7 @@ static void fetch_monitor_name(struct dr mst_edid =drm_dp_mst_get_edid (port->connector, mgr, port);drm_edid_get_monitor_name (mst_edid, name, namelen); +kfree (mst_edid); }/**
Greg Kroah-Hartman
maintainerPATCH 66/158 dma-buf: fix use of DMA_BUF_SET_NAME_{A,B} in userspace
In reply to Greg Kroah-HartmanFrom: Jérôme Pouiller <[email protected]>
commit 7c3e9fcad9c7d8bb5d69a576044fb16b1d2e8a01 upstream.
The typedefs u32 and u64 are not available in userspace. Thus user get an error he try to use DMA_BUF_SET_NAME_A or DMA_BUF_SET_NAME_B:
$ gcc -Wall -c -MMD -c -o ioctls_list.o ioctls_list.c
In file included from /usr/include/x86_64-linux-gnu/asm/ioctl.h:1,
from /usr/include/linux/ioctl.h:5,
from /usr/include/asm-generic/ioctls.h:5,
from ioctls_list.c:11:
ioctls_list.c:463:29: error: ‘u32’ undeclared here (not in a function)
463 | { "DMA_BUF_SET_NAME_A", DMA_BUF_SET_NAME_A, -1, -1 }, // linux/dma-buf.h
| ^~~~~~~~~~~~~~~~~~
ioctls_list.c:464:29: error: ‘u64’ undeclared here (not in a function)
464 | { "DMA_BUF_SET_NAME_B", DMA_BUF_SET_NAME_B, -1, -1 }, // linux/dma-buf.h
| ^~~~~~~~~~~~~~~~~~The issue was initially reported here[1].
[1]: https://github.com/jerome-pouiller/ioctl/pull/14
--- include/uapi/linux/dma-buf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/dma-buf.h +2 -2
@@ -92,7 +92,7 @@ struct dma_buf_sync {* between them in actual uapi, they're just different numbers. */ #define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *) -#define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, u32) -#define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, u64) +#define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, __u32) +#define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, __u64)#endif
Greg Kroah-Hartman
maintainerPATCH 67/158 dma-buf: ensure unique directory name for dmabuf stats
In reply to Greg Kroah-HartmanFrom: Charan Teja Kalla <[email protected]>
commit 370704e707a5f2d3c9a1d4ed8bd8cd67507d7bb5 upstream.
The dmabuf file uses get_next_ino()(through dma_buf_getfile() -> alloc_anon_inode()) to get an inode number and uses the same as a directory name under /sys/kernel/dmabuf/buffers/<ino>. This directory is used to collect the dmabuf stats and it is created through dma_buf_stats_setup(). At current, failure to create this directory entry can make the dma_buf_export() to fail.
Now, as the get_next_ino() can definitely give a repetitive inode no causing the directory entry creation to fail with -EEXIST. This is a problem on the systems where dmabuf stats functionality is enabled on the production builds can make the dma_buf_export(), though the dmabuf memory is allocated successfully, to fail just because it couldn't create stats entry.
This issue we are able to see on the snapdragon system within 13 days where there already exists a directory with inode no "122602" so dma_buf_stats_setup() failed with -EEXIST as it is trying to create the same directory entry.
To make the dentry name as unique, use the dmabuf fs specific inode which is based on the simple atomic variable increment. There is tmpfs subsystem too which relies on its own inode generation rather than relying on the get_next_ino() for the same reason of avoiding the duplicate inodes[1].
--- drivers/dma-buf/dma-buf.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/dma-buf/dma-buf.c +8 -0
@@ -407,6 +407,7 @@ static inline int is_dma_buf_file(structstatic struct file *dma_buf_getfile (struct dma_buf *dmabuf,int flags) { +static atomic64_t dmabuf_inode =ATOMIC64_INIT (0 );struct file *file;struct inode *inode =alloc_anon_inode (dma_buf_mnt->mnt_sb);
@@ -416,6 +417,13 @@ static struct file *dma_buf_getfile(stru inode->i_size = dmabuf->size;inode_set_bytes (inode, dmabuf->size); +/* +* The ->i_ino acquired from get_next_ino() is not unique thus +* not suitable for using it as dentry name by dmabuf stats. +* Override ->i_ino with the unique and dmabuffs specific +* value. +*/ + inode->i_ino =atomic64_add_return (1 , &dmabuf_inode); file =alloc_file_pseudo (inode, dma_buf_mnt,"dmabuf" , flags, &dma_buf_fops);if (IS_ERR (file))
Greg Kroah-Hartman
maintainerPATCH 68/158 arm64: dts: qcom: sm8250: dont enable rx/tx macro by default
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 18019eb62efb68c9b365acca9c4fcb2e0d459487 ]
Enabling rxmacro and txmacro nodes by defaults makes Qualcomm RB5 to crash and reboot while probing audio devices. Disable these device tree nodes by default and enabled them only when necessary (for the SM8250-MTP board).
--- arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 12 ++++++++++++ arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 ++++ 2 files changed, 16 insertions(+)
arch/arm64/boot/dts/qcom/sm8250-mtp.dts +12 -0
@@ -622,6 +622,10 @@ &qupv3_id_2 { status = "okay"; }; +&rxmacro { + status = "okay"; +}; + &slpi { status = "okay"; firmware-name = "qcom/sm8250/slpi.mbn";
@@ -773,6 +777,8 @@ right_spkr: wsa8810-left@0,4{ }; &swr1 { + status = "okay"; + wcd_rx: wcd9380-rx@0,4 { compatible = "sdw20217010d00"; reg = <0 4>;
@@ -781,6 +787,8 @@ wcd_rx: wcd9380-rx@0,4 { }; &swr2 { + status = "okay"; + wcd_tx: wcd9380-tx@0,3 { compatible = "sdw20217010d00"; reg = <0 3>;
@@ -819,6 +827,10 @@ config { }; }; +&txmacro { + status = "okay"; +}; + &uart12 { status = "okay"; };
arch/arm64/boot/dts/qcom/sm8250.dtsi +4 -0
@@ -2150,6 +2150,7 @@ rxmacro: rxmacro@3200000 { pinctrl-0 = <&rx_swr_active>; compatible = "qcom,sm8250-lpass-rx-macro"; reg = <0 0x3200000 0 0x1000>; + status = "disabled"; clocks = <&q6afecc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>, <&q6afecc LPASS_CLK_ID_TX_CORE_NPL_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
@@ -2168,6 +2169,7 @@ rxmacro: rxmacro@3200000 { swr1: soundwire-controller@3210000 { reg = <0 0x3210000 0 0x2000>; compatible = "qcom,soundwire-v1.5.1"; + status = "disabled"; interrupts = <GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>; clocks = <&rxmacro>; clock-names = "iface";
@@ -2195,6 +2197,7 @@ txmacro: txmacro@3220000 { pinctrl-0 = <&tx_swr_active>; compatible = "qcom,sm8250-lpass-tx-macro"; reg = <0 0x3220000 0 0x1000>; + status = "disabled"; clocks = <&q6afecc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>, <&q6afecc LPASS_CLK_ID_TX_CORE_NPL_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
@@ -2218,6 +2221,7 @@ swr2: soundwire-controller@3230000 { compatible = "qcom,soundwire-v1.5.1"; interrupts-extended = <&intc GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "core"; + status = "disabled"; clocks = <&txmacro>; clock-names = "iface";
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 69/158 ARM: dts: aspeed-g6: remove FWQSPID group in pinctrl dtsi
In reply to Greg Kroah-HartmanFrom: Jae Hyun Yoo <[email protected]>
[ Upstream commit efddaa397cceefb61476e383c26fafd1f8ab6356 ]
FWSPIDQ2 and FWSPIDQ3 are not part of FWSPI18 interface so remove FWQSPID group in pinctrl dtsi. These pins must be used with the FWSPI pins that are dedicated for boot SPI interface which provides same 3.3v logic level.
--- arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 5 ----- 1 file changed, 5 deletions(-)
arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi +0 -5
@@ -117,11 +117,6 @@ pinctrl_fwspid_default: fwspid_default { groups = "FWSPID"; }; - pinctrl_fwqspid_default: fwqspid_default { - function = "FWSPID"; - groups = "FWQSPID"; - }; - pinctrl_fwspiwp_default: fwspiwp_default { function = "FWSPIWP"; groups = "FWSPIWP";
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 70/158 pinctrl: pinctrl-aspeed-g6: remove FWQSPID group in pinctrl
In reply to Greg Kroah-HartmanFrom: Jae Hyun Yoo <[email protected]>
[ Upstream commit 3eef2f48ba0933ba995529f522554ad5c276c39b ]
FWSPIDQ2 and FWSPIDQ3 are not part of FWSPI18 interface so remove FWQSPID group in pinctrl. These pins must be used with the FWSPI pins that are dedicated for boot SPI interface which provides same 3.3v logic level.
--- drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c +3 -11
@@ -1236,18 +1236,12 @@ FUNC_GROUP_DECL(SALT8, AA12);FUNC_GROUP_DECL (WDTRST4 ,AA12 );#define AE12 196 -SIG_EXPR_LIST_DECL_SEMG (AE12 ,FWSPIDQ2 ,FWQSPID ,FWSPID , -SIG_DESC_SET (SCU438 ,4 ));SIG_EXPR_LIST_DECL_SESG (AE12 ,GPIOY4 ,GPIOY4 ); -PIN_DECL_ (AE12 ,SIG_EXPR_LIST_PTR (AE12 ,FWSPIDQ2 ), -SIG_EXPR_LIST_PTR (AE12 ,GPIOY4 )); +PIN_DECL_ (AE12 ,SIG_EXPR_LIST_PTR (AE12 ,GPIOY4 ));#define AF12 197 -SIG_EXPR_LIST_DECL_SEMG (AF12 ,FWSPIDQ3 ,FWQSPID ,FWSPID , -SIG_DESC_SET (SCU438 ,5 ));SIG_EXPR_LIST_DECL_SESG (AF12 ,GPIOY5 ,GPIOY5 ); -PIN_DECL_ (AF12 ,SIG_EXPR_LIST_PTR (AF12 ,FWSPIDQ3 ), -SIG_EXPR_LIST_PTR (AF12 ,GPIOY5 )); +PIN_DECL_ (AF12 ,SIG_EXPR_LIST_PTR (AF12 ,GPIOY5 ));#define AC12 198SSSF_PIN_DECL (AC12 ,GPIOY6 ,FWSPIABR ,SIG_DESC_SET (SCU438 ,6 ));
@@ -1520,9 +1514,8 @@ SIG_EXPR_LIST_DECL_SEMG(Y4, EMMCDAT7, EMMCG8, EMMC, SIG_DESC_SET(SCU404, 3));PIN_DECL_3 (Y4 ,GPIO18E3 ,FWSPIDMISO ,VBMISO ,EMMCDAT7 );GROUP_DECL (FWSPID ,Y1 ,Y2 ,Y3 ,Y4 ); -GROUP_DECL (FWQSPID ,Y1 ,Y2 ,Y3 ,Y4 ,AE12 ,AF12 );GROUP_DECL (EMMCG8 ,AB4 ,AA4 ,AC4 ,AA5 ,Y5 ,AB5 ,AB6 ,AC5 ,Y1 ,Y2 ,Y3 ,Y4 ); -FUNC_DECL_2 (FWSPID ,FWSPID ,FWQSPID ); +FUNC_DECL_1 (FWSPID ,FWSPID );FUNC_GROUP_DECL (VB ,Y1 ,Y2 ,Y3 ,Y4 );FUNC_DECL_3 (EMMC ,EMMCG1 ,EMMCG4 ,EMMCG8 );/*
@@ -1918,7 +1911,6 @@ static const struct aspeed_pin_group aspeed_g6_groups[] = {ASPEED_PINCTRL_GROUP (FSI2 ),ASPEED_PINCTRL_GROUP (FWSPIABR ),ASPEED_PINCTRL_GROUP (FWSPID ), -ASPEED_PINCTRL_GROUP (FWQSPID ),ASPEED_PINCTRL_GROUP (FWSPIWP ),ASPEED_PINCTRL_GROUP (GPIT0 ), ASPEED_PINCTRL_GROUP(GPIT1),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 71/158 ARM: dts: aspeed-g6: fix SPI1/SPI2 quad pin group
In reply to Greg Kroah-HartmanFrom: Jae Hyun Yoo <[email protected]>
[ Upstream commit 890362d41b244536ab63591f813393f5fdf59ed7 ]
Fix incorrect function mappings in pinctrl_qspi1_default and pinctrl_qspi2_default since their function should be SPI1 and SPI2 respectively.
--- arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi +2 -2
@@ -648,12 +648,12 @@ pinctrl_pwm9g1_default: pwm9g1_default { }; pinctrl_qspi1_default: qspi1_default { - function = "QSPI1"; + function = "SPI1"; groups = "QSPI1"; }; pinctrl_qspi2_default: qspi2_default { - function = "QSPI2"; + function = "SPI2"; groups = "QSPI2"; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 72/158 ARM: dts: aspeed: Add video engine to g6
In reply to Greg Kroah-HartmanFrom: Howard Chiu <[email protected]>
[ Upstream commit 32e62d1beab70d485980013312e747a25c4e13f7 ]
This node was accidentally removed by commit 645afe73f951 ("ARM: dts:
aspeed: ast2600: Update XDMA engine node").
--- arch/arm/boot/dts/aspeed-g6.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/boot/dts/aspeed-g6.dtsi +10 -0
@@ -389,6 +389,16 @@ sbc: secure-boot-controller@1e6f2000 { reg = <0x1e6f2000 0x1000>; }; + video: video@1e700000 { + compatible = "aspeed,ast2600-video-engine"; + reg = <0x1e700000 0x1000>; + clocks = <&syscon ASPEED_CLK_GATE_VCLK>, + <&syscon ASPEED_CLK_GATE_ECLK>; + clock-names = "vclk", "eclk"; + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + gpio0: gpio@1e780000 { #gpio-cells = <2>; gpio-controller;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 73/158 pinctrl: ocelot: Fix for lan966x alt mode
In reply to Greg Kroah-HartmanFrom: Horatiu Vultur <[email protected]>
[ Upstream commit d3683eeb9d2b4aa5256f830721655ef2ee97e324 ]
For lan966x, the GPIO 35 has the wrong function for alternate mode 2. The mode is not none but is PTP sync.
--- drivers/pinctrl/pinctrl-ocelot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/pinctrl-ocelot.c +3 -1
@@ -129,6 +129,7 @@ enum {FUNC_PTP1 ,FUNC_PTP2 ,FUNC_PTP3 , +FUNC_PTPSYNC_0 ,FUNC_PTPSYNC_1 ,FUNC_PTPSYNC_2 , FUNC_PTPSYNC_3,
@@ -252,6 +253,7 @@ static const char *const ocelot_function_names[] = { [FUNC_PTP1] = "ptp1", [FUNC_PTP2] = "ptp2", [FUNC_PTP3] = "ptp3", + [FUNC_PTPSYNC_0] = "ptpsync_0", [FUNC_PTPSYNC_1] = "ptpsync_1", [FUNC_PTPSYNC_2] = "ptpsync_2", [FUNC_PTPSYNC_3] = "ptpsync_3",
@@ -891,7 +893,7 @@ LAN966X_P(31, GPIO, FC3_c, CAN1, NONE, OB_TRG, RECO_b, NONLAN966X_P (32 ,GPIO , FC3_c,NONE , SGPIO_a,NONE , MIIM_Sa,NONE ,R );LAN966X_P (33 ,GPIO , FC1_b,NONE , SGPIO_a,NONE , MIIM_Sa, MIIM_b,R );LAN966X_P (34 ,GPIO , FC1_b,NONE , SGPIO_a,NONE , MIIM_Sa, MIIM_b,R ); -LAN966X_P (35 ,GPIO , FC1_b,NONE , SGPIO_a, CAN0_b,NONE ,NONE ,R ); +LAN966X_P (35 ,GPIO , FC1_b,PTPSYNC_0 , SGPIO_a, CAN0_b,NONE ,NONE ,R );LAN966X_P (36 ,GPIO ,NONE ,PTPSYNC_1 ,NONE , CAN0_b,NONE ,NONE ,R );LAN966X_P (37 ,GPIO ,FC_SHRD0 ,PTPSYNC_2 ,TWI_SLC_GATE_AD ,NONE ,NONE ,NONE ,R );LAN966X_P (38 ,GPIO ,NONE ,PTPSYNC_3 ,NONE ,NONE ,NONE ,NONE ,R );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 74/158 pinctrl: mediatek: mt8365: fix IES control pins
In reply to Greg Kroah-HartmanFrom: Mattijs Korpershoek <[email protected]>
[ Upstream commit f680058f406863b55ac226d1c157701939c63db4 ]
IES26 (BIT 16 of IES1_CFG_ADDR) controls the following pads:
- PAD_I2S_DATA_IN (GPIO114)
- PAD_I2S_LRCK (GPIO115)
- PAD_I2S_BCK (GPIO116)
The pinctrl table is wrong since it lists pins 114 to 112.
Update the table with the correct values.
--- drivers/pinctrl/mediatek/pinctrl-mt8365.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/mediatek/pinctrl-mt8365.c +1 -1
@@ -259,7 +259,7 @@ static const struct mtk_pin_ies_smt_set mt8365_ies_set[] = {MTK_PIN_IES_SMT_SPEC (104 ,104 ,0x420 ,13 ),MTK_PIN_IES_SMT_SPEC (105 ,109 ,0x420 ,14 ),MTK_PIN_IES_SMT_SPEC (110 ,113 ,0x420 ,15 ), -MTK_PIN_IES_SMT_SPEC (114 ,112 ,0x420 ,16 ), +MTK_PIN_IES_SMT_SPEC (114 ,116 ,0x420 ,16 ),MTK_PIN_IES_SMT_SPEC (117 ,119 ,0x420 ,17 ),MTK_PIN_IES_SMT_SPEC (120 ,122 ,0x420 ,18 ), MTK_PIN_IES_SMT_SPEC(123, 125, 0x420, 19),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 75/158 ALSA: hda - fix unused Realtek function when PM is not enabled
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit c3d9ca93f1e3bd3d1adfc4479a12c82fed424c87 ]
When CONFIG_PM is not enabled, alc_shutup() is not needed, so move it inside the #ifdef CONFIG_PM guard.
Also drop some contiguous #endif / #ifdef CONFIG_PM for simplicity.
Fixes this build warning:sound/pci/hda/patch_realtek.c:886:20: warning: unused function 'alc_shutup'
--- sound/pci/hda/patch_realtek.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
sound/pci/hda/patch_realtek.c +3 -5
@@ -937,6 +937,9 @@ static int alc_init(struct hda_codec *codec)return 0 ; } +#define alc_free snd_hda_gen_free + +#ifdef CONFIG_PM static inline void alc_shutup (struct hda_codec *codec) {struct alc_spec *spec = codec->spec;
@@ -950,9 +953,6 @@ static inline void alc_shutup(struct hda_codec *codec)alc_shutup_pins (codec); } -#define alc_free snd_hda_gen_free - -#ifdef CONFIG_PM static void alc_power_eapd (struct hda_codec *codec) {alc_auto_setup_eapd (codec, false);
@@ -966,9 +966,7 @@ static int alc_suspend(struct hda_codec *codec) spec->power_hook (codec);return 0 ; } -#endif -#ifdef CONFIG_PM static int alc_resume (struct hda_codec *codec) {struct alc_spec *spec = codec->spec;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 76/158 net: ipa: certain dropped packets arent accounted for
In reply to Greg Kroah-HartmanFrom: Alex Elder <[email protected]>
[ Upstream commit 30b338ff7998b6ed7a90815870cd5db725f87168 ]
If an RX endpoint receives packets containing status headers, and a packet in the buffer is not dropped, ipa_endpoint_skb_copy() is responsible for wrapping the packet data in an SKB and forwarding it to ipa_modem_skb_rx() for further processing.
If ipa_endpoint_skb_copy() gets a null pointer from build_skb(), it just returns early. But in the process it doesn't record that as a dropped packet in the network device statistics.
Instead, call ipa_modem_skb_rx() whether or not the SKB pointer is NULL; that function ensures the statistics are properly updated.
--- drivers/net/ipa/ipa_endpoint.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/ipa/ipa_endpoint.c +6 -7
@@ -1169,13 +1169,12 @@ static void ipa_endpoint_skb_copy(struct ipa_endpoint *endpoint,return ; skb =__dev_alloc_skb (len,GFP_ATOMIC ); -if (!skb) -return ; - -/* Copy the data into the socket buffer and receive it */ -skb_put (skb, len); -memcpy (skb->data, data, len); - skb->truesize += extra; +if (skb) { +/* Copy the data into the socket buffer and receive it */ +skb_put (skb, len); +memcpy (skb->data, data, len); + skb->truesize += extra; + }ipa_modem_skb_rx (endpoint->netdev, skb); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 77/158 net: ipa: record proper RX transaction count
In reply to Greg Kroah-HartmanFrom: Alex Elder <[email protected]>
[ Upstream commit d8290cbe1111105f92f0c8ab455bec8bf98d0630 ]
Each time we are notified that some number of transactions on an RX channel has completed, we record the number of bytes that have been transferred since the previous notification. We also track the number of transactions completed, but that is not currently being calculated correctly; we're currently counting the number of such notifications, but each notification can represent many transaction completions. Fix this.
--- drivers/net/ipa/gsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ipa/gsi.c +4 -2
@@ -1367,9 +1367,10 @@ static void gsi_evt_ring_rx_update(struct gsi_evt_ring *evt_ring, u32 index)struct gsi_event *event_done;struct gsi_event *event;struct gsi_trans *trans; +u32 trans_count =0 ;u32 byte_count =0 ; -u32 old_index;u32 event_avail; +u32 old_index; trans_info = &channel->trans_info;
@@ -1390,6 +1391,7 @@ static void gsi_evt_ring_rx_update(struct gsi_evt_ring *evt_ring, u32 index) do { trans->len = __le16_to_cpu(event->len); byte_count += trans->len; + trans_count++; /* Move on to the next event and transaction */ if (--event_avail)
@@ -1401,7 +1403,7 @@ static void gsi_evt_ring_rx_update(struct gsi_evt_ring *evt_ring, u32 index)/* We record RX bytes when they are received */ channel->byte_count += byte_count; - channel->trans_count++; + channel->trans_count += trans_count; }/* Initialize a ring, including allocating DMA memory for its entries */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 78/158 block/mq-deadline: Set the fifo_time member also if inserting at head
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 725f22a1477c9c15aa67ad3af96fe28ec4fe72d2 ]
Before commit 322cff70d46c the fifo_time member of requests on a dispatch list was not used. Commit 322cff70d46c introduces code that reads the fifo_time member of requests on dispatch lists. Hence this patch that sets the fifo_time member when adding a request to a dispatch list.
--- block/mq-deadline.c | 1 + 1 file changed, 1 insertion(+)
block/mq-deadline.c +1 -0
@@ -742,6 +742,7 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,if (at_head) {list_add (&rq->queuelist, &per_prio->dispatch); + rq->fifo_time = jiffies; }else {deadline_add_rq_rb (per_prio, rq);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 79/158 mptcp: fix subflow accounting on close
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 95d686517884a403412b000361cee2b08b2ed1e6 ]
If the PM closes a fully established MPJ subflow or the subflow creation errors out in it's early stage the subflows counter is not bumped accordingly.
This change adds the missing accounting, additionally taking care of updating accordingly the 'accept_subflow' flag.
--- net/mptcp/pm.c | 5 ++--- net/mptcp/protocol.h | 14 ++++++++++++++ net/mptcp/subflow.c | 12 +++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-)
net/mptcp/pm.c +2 -3
@@ -178,14 +178,13 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,struct mptcp_pm_data *pm = &msk->pm;bool update_subflows; - update_subflows = (ssk->sk_state ==TCP_CLOSE ) && - (subflow->request_join || subflow->mp_join); + update_subflows = subflow->request_join || subflow->mp_join;if (!READ_ONCE (pm->work_pending) && !update_subflows)return ;spin_lock_bh (&pm->lock);if (update_subflows) - pm->subflows--; +__mptcp_pm_close_subflow (msk);/* Even if this subflow is not really established, tell the PM to try * to pick the next ones, if possible.
net/mptcp/protocol.h +14 -0
@@ -835,6 +835,20 @@ unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk);unsigned int mptcp_pm_get_subflows_max (struct mptcp_sock *msk);unsigned int mptcp_pm_get_local_addr_max (struct mptcp_sock *msk); +/* called under PM lock */ +static inline void __mptcp_pm_close_subflow (struct mptcp_sock *msk) +{ +if (--msk->pm.subflows <mptcp_pm_get_subflows_max (msk)) +WRITE_ONCE (msk->pm.accept_subflow, true); +} + +static inline void mptcp_pm_close_subflow (struct mptcp_sock *msk) +{ +spin_lock_bh (&msk->pm.lock); +__mptcp_pm_close_subflow (msk); +spin_unlock_bh (&msk->pm.lock); +} +void mptcp_sockopt_sync (struct mptcp_sock *msk,struct sock *ssk);void mptcp_sockopt_sync_locked (struct mptcp_sock *msk,struct sock *ssk);
net/mptcp/subflow.c +9 -3
@@ -1380,20 +1380,20 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,struct sockaddr_storage addr;int remote_id = remote->id;int local_id = loc->id; +int err = -ENOTCONN ;struct socket *sf;struct sock *ssk;u32 remote_token;int addrlen;int ifindex;u8 flags; -int err;if (!mptcp_is_fully_established (sk)) -return -ENOTCONN ; + goto err_out; err =mptcp_subflow_create_socket (sk, &sf);if (err) -return err; + goto err_out; ssk = sf->sk; subflow =mptcp_subflow_ctx (ssk);
@@ -1456,6 +1456,12 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, failed: subflow->disposable =1 ;sock_release (sf); + +err_out: +/* we account subflows before the creation, and this failures will not +* be caught by sk_state_change() +*/ +mptcp_pm_close_subflow (msk);return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 80/158 net: macb: Increment rx bd head after allocating skb and buffer
In reply to Greg Kroah-HartmanFrom: Harini Katakam <[email protected]>
[ Upstream commit 9500acc631dbb8b73166e25700e656b11f6007b6 ]
In gem_rx_refill rx_prepared_head is incremented at the beginning of the while loop preparing the skb and data buffers. If the skb or data buffer allocation fails, this BD will be unusable BDs until the head loops back to the same BD (and obviously buffer allocation succeeds). In the unlikely event that there's a string of allocation failures, there will be an equal number of unusable BDs and an inconsistent RX BD chain. Hence increment the head at the end of the while loop to be clean.
--- drivers/net/ethernet/cadence/macb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/cadence/macb_main.c +1 -1
@@ -1217,7 +1217,6 @@ static void gem_rx_refill(struct macb_queue *queue)/* Make hw descriptor updates visible to CPU */ rmb (); - queue->rx_prepared_head++; desc =macb_rx_desc (queue, entry);if (!queue->rx_skbuff[entry]) {
@@ -1256,6 +1255,7 @@ static void gem_rx_refill(struct macb_queue *queue)dma_wmb (); desc->addr &= ~MACB_BIT (RX_USED ); } + queue->rx_prepared_head++; }/* Make descriptor updates visible to hardware */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 81/158 i915/guc/reset: Make __guc_reset_context aware of guilty engines
In reply to Greg Kroah-HartmanFrom: Umesh Nerlige Ramappa <[email protected]>
[ Upstream commit 89e96d822bd51f7afe2d3e95a34099480b5c3d55 ]
There are 2 ways an engine can get reset in i915 and the method of reset affects how KMD labels a context as guilty/innocent.
(1) GuC initiated engine-reset: GuC resets a hung engine and notifies KMD. The context that hung on the engine is marked guilty and all other contexts are innocent. The innocent contexts are resubmitted.
(2) GT based reset: When an engine heartbeat fails to tick, KMD initiates a gt/chip reset. All active contexts are marked as guilty and discarded.
In order to correctly mark the contexts as guilty/innocent, pass a mask of engines that were reset to __guc_reset_context.
--- drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 16 ++++++++-------- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/gt/intel_reset.c +1 -1
@@ -791,7 +791,7 @@ static int gt_reset(struct intel_gt *gt, intel_engine_mask_t stalled_mask)__intel_engine_reset (engine, stalled_mask & engine->mask);local_bh_enable (); -intel_uc_reset (>->uc, true); +intel_uc_reset (>->uc,ALL_ENGINES );intel_ggtt_restore_fences (gt->ggtt);
drivers/gpu/drm/i915/gt/uc/intel_guc.h +1 -1
@@ -417,7 +417,7 @@ int intel_guc_global_policies_update(struct intel_guc *guc);void intel_guc_context_ban (struct intel_context *ce,struct i915_request *rq);void intel_guc_submission_reset_prepare (struct intel_guc *guc); -void intel_guc_submission_reset (struct intel_guc *guc,bool stalled); +void intel_guc_submission_reset (struct intel_guc *guc,intel_engine_mask_t stalled);void intel_guc_submission_reset_finish (struct intel_guc *guc);void intel_guc_submission_cancel_requests (struct intel_guc *guc);
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +8 -8
@@ -1603,9 +1603,9 @@ __unwind_incomplete_requests(struct intel_context *ce)spin_unlock_irqrestore (&sched_engine->lock, flags); } -static void __guc_reset_context (struct intel_context *ce,bool stalled) +static void __guc_reset_context (struct intel_context *ce,intel_engine_mask_t stalled) { -bool local_stalled; +bool guilty;struct i915_request *rq;unsigned long flags;u32 head;
@@ -1647,7 +1647,7 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled)if (!intel_context_is_pinned (ce)) goto next_context; - local_stalled = false; + guilty = false; rq =intel_context_find_active_request (ce);if (!rq) { head = ce->ring->tail;
@@ -1655,14 +1655,14 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled) }if (i915_request_started (rq)) - local_stalled = true; + guilty = stalled & ce->engine->mask;GEM_BUG_ON (i915_active_is_idle (&ce->active)); head =intel_ring_wrap (ce->ring, rq->head); -__i915_request_reset (rq, local_stalled && stalled); +__i915_request_reset (rq, guilty); out_replay: -guc_reset_state (ce, head, local_stalled && stalled); +guc_reset_state (ce, head, guilty); next_context:if (i != number_children) ce =list_next_entry (ce, parallel.child_link);
@@ -1673,7 +1673,7 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled)intel_context_put (parent); } -void intel_guc_submission_reset (struct intel_guc *guc,bool stalled) +void intel_guc_submission_reset (struct intel_guc *guc,intel_engine_mask_t stalled) {struct intel_context *ce;unsigned long index;
@@ -4042,7 +4042,7 @@ static void guc_context_replay(struct intel_context *ce) {struct i915_sched_engine *sched_engine = ce->engine->sched_engine; -__guc_reset_context (ce, true); +__guc_reset_context (ce, ce->engine->mask);tasklet_hi_schedule (&sched_engine->tasklet); }
drivers/gpu/drm/i915/gt/uc/intel_uc.c +1 -1
@@ -592,7 +592,7 @@ void intel_uc_reset_prepare(struct intel_uc *uc)__uc_sanitize (uc); } -void intel_uc_reset (struct intel_uc *uc,bool stalled) +void intel_uc_reset (struct intel_uc *uc,intel_engine_mask_t stalled) {struct intel_guc *guc = &uc->guc;
drivers/gpu/drm/i915/gt/uc/intel_uc.h +1 -1
@@ -42,7 +42,7 @@ void intel_uc_driver_late_release(struct intel_uc *uc);void intel_uc_driver_remove (struct intel_uc *uc);void intel_uc_init_mmio (struct intel_uc *uc);void intel_uc_reset_prepare (struct intel_uc *uc); -void intel_uc_reset (struct intel_uc *uc,bool stalled); +void intel_uc_reset (struct intel_uc *uc,intel_engine_mask_t stalled);void intel_uc_reset_finish (struct intel_uc *uc);void intel_uc_cancel_requests (struct intel_uc *uc);void intel_uc_suspend (struct intel_uc *uc);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 82/158 xfrm: rework default policy structure
In reply to Greg Kroah-HartmanFrom: Nicolas Dichtel <[email protected]>
[ Upstream commit b58b1f563ab78955d37e9e43e02790a85c66ac05 ]
This is a follow up of commit f8d858e607b2 ("xfrm: make user policy API complete"). The goal is to align userland API to the internal structures.
--- include/net/netns/xfrm.h | 6 +---- include/net/xfrm.h | 48 +++++++++++++++------------------------- net/xfrm/xfrm_policy.c | 10 ++++++--- net/xfrm/xfrm_user.c | 43 +++++++++++++++-------------------- 4 files changed, 44 insertions(+), 63 deletions(-)
include/net/netns/xfrm.h +1 -5
@@ -66,11 +66,7 @@ struct netns_xfrm {int sysctl_larval_drop;u32 sysctl_acq_expires; -u8 policy_default; -#define XFRM_POL_DEFAULT_IN 1 -#define XFRM_POL_DEFAULT_OUT 2 -#define XFRM_POL_DEFAULT_FWD 4 -#define XFRM_POL_DEFAULT_MASK 7 +u8 policy_default[XFRM_POLICY_MAX ];#ifdef CONFIG_SYSCTL struct ctl_table_header *sysctl_hdr;
include/net/xfrm.h +18 -30
69 lines not on this page · raw message
net/xfrm/xfrm_policy.c +7 -3
@@ -3158,7 +3158,7 @@ struct dst_entry *xfrm_lookup_with_ifid(struct net *net, nopol:if (!(dst_orig->dev->flags &IFF_LOOPBACK ) && - !xfrm_default_allow (net, dir)) { + net->xfrm.policy_default[dir] ==XFRM_USERPOLICY_BLOCK ) { err = -EPERM ; goto error; }
@@ -3569,7 +3569,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, }if (!pol) { -if (!xfrm_default_allow (net, dir)) { +if (net->xfrm.policy_default[dir] ==XFRM_USERPOLICY_BLOCK ) {XFRM_INC_STATS (net,LINUX_MIB_XFRMINNOPOLS );return 0 ; }
@@ -3629,7 +3629,8 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, } xfrm_nr = ti; -if (!xfrm_default_allow (net, dir) && !xfrm_nr) { +if (net->xfrm.policy_default[dir] ==XFRM_USERPOLICY_BLOCK && + !xfrm_nr) {XFRM_INC_STATS (net,LINUX_MIB_XFRMINNOSTATES ); goto reject; }
@@ -4118,6 +4119,9 @@ static int __net_init xfrm_net_init(struct net *net)spin_lock_init (&net->xfrm.xfrm_policy_lock);seqcount_spinlock_init (&net->xfrm.xfrm_policy_hash_generation, &net->xfrm.xfrm_policy_lock);mutex_init (&net->xfrm.xfrm_cfg_mutex); + net->xfrm.policy_default[XFRM_POLICY_IN ] =XFRM_USERPOLICY_ACCEPT ; + net->xfrm.policy_default[XFRM_POLICY_FWD ] =XFRM_USERPOLICY_ACCEPT ; + net->xfrm.policy_default[XFRM_POLICY_OUT ] =XFRM_USERPOLICY_ACCEPT ; rv =xfrm_statistics_init (net);if (rv <0 )
net/xfrm/xfrm_user.c +18 -25
69 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 83/158 xfrm: fix "disable_policy" flag use when arriving from different devices
In reply to Greg Kroah-HartmanFrom: Eyal Birger <[email protected]>
[ Upstream commit e6175a2ed1f18bf2f649625bf725e07adcfa6a28 ]
In IPv4 setting the "disable_policy" flag on a device means no policy should be enforced for traffic originating from the device. This was implemented by seting the DST_NOPOLICY flag in the dst based on the originating device.
However, dsts are cached in nexthops regardless of the originating devices, in which case, the DST_NOPOLICY flag value may be incorrect.
Consider the following setup:
+------------------------------+
| ROUTER |
+-------------+ | +-----------------+ |
| ipsec src |----|-|ipsec0 | |
+-------------+ | |disable_policy=0 | +----+ |
| +-----------------+ |eth1|-|-----
+-------------+ | +-----------------+ +----+ |
| noipsec src |----|-|eth0 | |
+-------------+ | |disable_policy=1 | |
| +-----------------+ |
+------------------------------+Where ROUTER has a default route towards eth1.
dst entries for traffic arriving from eth0 would have DST_NOPOLICY and would be cached and therefore can be reused by traffic originating from ipsec0, skipping policy check.
Fix by setting a IPSKB_NOPOLICY flag in IPCB and observing it instead of the DST in IN/FWD IPv4 policy checks.
--- include/net/ip.h | 1 + include/net/xfrm.h | 14 +++++++++++++- net/ipv4/route.c | 23 ++++++++++++++++++----- 3 files changed, 32 insertions(+), 6 deletions(-)
include/net/ip.h +1 -0
@@ -56,6 +56,7 @@ struct inet_skb_parm {#define IPSKB_DOREDIRECT BIT(5)#define IPSKB_FRAG_PMTU BIT(6)#define IPSKB_L3SLAVE BIT(7) +#define IPSKB_NOPOLICY BIT(8)u16 frag_max_size; };
include/net/xfrm.h +13 -1
@@ -1093,6 +1093,18 @@ static inline bool __xfrm_check_nopolicy(struct net *net, struct sk_buff *skb,return false; } +static inline bool __xfrm_check_dev_nopolicy (struct sk_buff *skb, +int dir,unsigned short family) +{ +if (dir !=XFRM_POLICY_OUT && family ==AF_INET ) { +/* same dst may be used for traffic originating from +* devices with different policy settings. +*/ +return IPCB (skb)->flags &IPSKB_NOPOLICY ; + } +return skb_dst (skb) && (skb_dst (skb)->flags &DST_NOPOLICY ); +} +static inline int __xfrm_policy_check2 (struct sock *sk,int dir,struct sk_buff *skb,unsigned int family,int reverse)
@@ -1104,7 +1116,7 @@ static inline int __xfrm_policy_check2(struct sock *sk, int dir,return __xfrm_policy_check (sk, ndir, skb, family);return __xfrm_check_nopolicy (net, skb, dir) || - (skb_dst (skb) && (skb_dst (skb)->flags &DST_NOPOLICY )) || +__xfrm_check_dev_nopolicy (skb, dir, family) ||__xfrm_policy_check (sk, ndir, skb, family); }
net/ipv4/route.c +18 -5
@@ -1721,6 +1721,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,struct in_device *in_dev =__in_dev_get_rcu (dev);unsigned int flags =RTCF_MULTICAST ;struct rtable *rth; +bool no_policy;u32 itag =0 ;int err;
@@ -1731,8 +1732,12 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,if (our) flags |=RTCF_LOCAL ; + no_policy =IN_DEV_ORCONF (in_dev,NOPOLICY ); +if (no_policy) +IPCB (skb)->flags |=IPSKB_NOPOLICY ; + rth =rt_dst_alloc (dev_net (dev)->loopback_dev, flags,RTN_MULTICAST , -IN_DEV_ORCONF (in_dev,NOPOLICY ), false); + no_policy, false);if (!rth)return -ENOBUFS ;
@@ -1791,7 +1796,7 @@ static int __mkroute_input(struct sk_buff *skb,struct rtable *rth;int err;struct in_device *out_dev; -bool do_cache; +bool do_cache, no_policy;u32 itag =0 ;/* get a working reference to the output device */
@@ -1836,6 +1841,10 @@ static int __mkroute_input(struct sk_buff *skb, } } + no_policy =IN_DEV_ORCONF (in_dev,NOPOLICY ); +if (no_policy) +IPCB (skb)->flags |=IPSKB_NOPOLICY ; + fnhe =find_exception (nhc, daddr);if (do_cache) {if (fnhe)
@@ -1848,8 +1857,7 @@ static int __mkroute_input(struct sk_buff *skb, } } - rth =rt_dst_alloc (out_dev->dev,0 , res->type, -IN_DEV_ORCONF (in_dev,NOPOLICY ), + rth =rt_dst_alloc (out_dev->dev,0 , res->type, no_policy,IN_DEV_ORCONF (out_dev,NOXFRM ));if (!rth) { err = -ENOBUFS ;
@@ -2224,6 +2232,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,struct rtable *rth;struct flowi4 fl4;bool do_cache = true; +bool no_policy;/* IP on this device is disabled. */
@@ -2341,6 +2350,10 @@ out: return err;RT_CACHE_STAT_INC (in_brd); local_input: + no_policy =IN_DEV_ORCONF (in_dev,NOPOLICY ); +if (no_policy) +IPCB (skb)->flags |=IPSKB_NOPOLICY ; + do_cache &= res->fi && !itag;if (do_cache) {struct fib_nh_common *nhc =FIB_RES_NHC (*res);
@@ -2355,7 +2368,7 @@ out: return err; rth =rt_dst_alloc (ip_rt_get_dev (net, res), flags |RTCF_LOCAL , res->type, -IN_DEV_ORCONF (in_dev,NOPOLICY ), false); + no_policy, false);if (!rth) goto e_nobufs;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 84/158 net/sched: act_pedit: sanitize shift argument before usage
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 4d42d54a7d6aa6d29221d3fd4f2ae9503e94f011 ]
syzbot was able to trigger an Out-of-Bound on the pedit action:
UBSAN: shift-out-of-bounds in net/sched/act_pedit.c:238:43 shift exponent 1400735974 is too large for 32-bit type 'unsigned int' CPU: 0 PID: 3606 Comm: syz-executor151 Not tainted 5.18.0-rc5-syzkaller-00165-g810c2f0a3f86 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 ubsan_epilogue+0xb/0x50 lib/ubsan.c:151 __ubsan_handle_shift_out_of_bounds.cold+0xb1/0x187 lib/ubsan.c:322 tcf_pedit_init.cold+0x1a/0x1f net/sched/act_pedit.c:238 tcf_action_init_1+0x414/0x690 net/sched/act_api.c:1367 tcf_action_init+0x530/0x8d0 net/sched/act_api.c:1432 tcf_action_add+0xf9/0x480 net/sched/act_api.c:1956 tc_ctl_action+0x346/0x470 net/sched/act_api.c:2015 rtnetlink_rcv_msg+0x413/0xb80 net/core/rtnetlink.c:5993 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2502 netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline] netlink_unicast+0x543/0x7f0 net/netlink/af_netlink.c:1345 netlink_sendmsg+0x904/0xe00 net/netlink/af_netlink.c:1921 sock_sendmsg_nosec net/socket.c:705 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:725 ____sys_sendmsg+0x6e2/0x800 net/socket.c:2413 ___sys_sendmsg+0xf3/0x170 net/socket.c:2467 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2496 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7fe36e9e1b59 Code: 28 c3 e8 2a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 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 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffef796fe88 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007fe36e9e1b59 RDX: 0000000000000000 RSI: 0000000020000300 RDI: 0000000000000003 RBP: 00007fe36e9a5d00 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007fe36e9a5d90 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 </TASK>
The 'shift' field is not validated, and any value above 31 will trigger out-of-bounds. The issue predates the git history, but syzbot was able to trigger it only after the commit mentioned in the fixes tag, and this change only applies on top of such commit.
Address the issue bounding the 'shift' value to the maximum allowed by the relevant operator.
--- net/sched/act_pedit.c | 4 ++++ 1 file changed, 4 insertions(+)
net/sched/act_pedit.c +4 -0
@@ -232,6 +232,10 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,for (i =0 ; i < p->tcfp_nkeys; ++i) {u32 cur = p->tcfp_keys[i].off; +/* sanitize the shift value for any later use */ + p->tcfp_keys[i].shift =min_t (size_t,BITS_PER_TYPE (int) -1 , + p->tcfp_keys[i].shift); +/* The AT option can read a single byte, we can bound the actual * value with uchar max. */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 85/158 netfilter: flowtable: fix excessive hw offload attempts after failure
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit 396ef64113a8ba01c46315d67a99db8dde3eef51 ]
If a flow cannot be offloaded, the code currently repeatedly tries again as quickly as possible, which can significantly increase system load. Fix this by limiting flow timeout update and hardware offload retry to once per second.
--- net/netfilter/nf_flow_table_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/netfilter/nf_flow_table_core.c +3 -1
@@ -329,8 +329,10 @@ void flow_offload_refresh(struct nf_flowtable *flow_table,u32 timeout; timeout = nf_flowtable_time_stamp +flow_offload_get_timeout (flow); -if (READ_ONCE (flow->timeout) != timeout) +if (timeout -READ_ONCE (flow->timeout) >HZ )WRITE_ONCE (flow->timeout, timeout); +else +return ;if (likely (!nf_flowtable_hw_offload (flow_table)))return ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 86/158 netfilter: nft_flow_offload: skip dst neigh lookup for ppp devices
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit 45ca3e61999e9a30ca2b7cfbf9da8a9f8d13be31 ]
The dst entry does not contain a valid hardware address, so skip the lookup in order to avoid running into errors here.
The proper hardware address is filled in from nft_dev_path_info
--- net/netfilter/nft_flow_offload.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
net/netfilter/nft_flow_offload.c +13 -9
@@ -36,6 +36,15 @@ static void nft_default_forward_path(struct nf_flow_route *route, route->tuple[dir].xmit_type =nft_xmit_type (dst_cache); } +static bool nft_is_valid_ether_device (const struct net_device *dev) +{ +if (!dev || (dev->flags &IFF_LOOPBACK ) || dev->type !=ARPHRD_ETHER || + dev->addr_len !=ETH_ALEN || !is_valid_ether_addr (dev->dev_addr)) +return false; + +return true; +} + static int nft_dev_fill_forward_path(const struct nf_flow_route *route, const struct dst_entry *dst_cache, const struct nf_conn *ct,
@@ -47,6 +56,9 @@ static int nft_dev_fill_forward_path(const struct nf_flow_route *route,struct neighbour *n;u8 nud_state; +if (!nft_is_valid_ether_device (dev)) + goto out; + n =dst_neigh_lookup (dst_cache, daddr);if (!n)return -1 ;
@@ -60,6 +72,7 @@ static int nft_dev_fill_forward_path(const struct nf_flow_route *route,if (!(nud_state &NUD_VALID ))return -1 ; +out:return dev_fill_forward_path (dev, ha, stack); }
@@ -78,15 +91,6 @@ struct nft_forward_info {enum flow_offload_xmit_type xmit_type; }; -static bool nft_is_valid_ether_device (const struct net_device *dev) -{ -if (!dev || (dev->flags &IFF_LOOPBACK ) || dev->type !=ARPHRD_ETHER || - dev->addr_len !=ETH_ALEN || !is_valid_ether_addr (dev->dev_addr)) -return false; - -return true; -} -static void nft_dev_path_info (const struct net_device_path_stack *stack,struct nft_forward_info *info,unsigned char *ha,struct nf_flowtable *flowtable)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 87/158 net: fix dev_fill_forward_path with pppoe + bridge
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit cf2df74e202d81b09f09d84c2d8903e0e87e9274 ]
When calling dev_fill_forward_path on a pppoe device, the provided destination address is invalid. In order for the bridge fdb lookup to succeed, the pppoe code needs to update ctx->daddr to the correct value.
Fix this by storing the address inside struct net_device_path_ctx
--- drivers/net/ppp/pppoe.c | 1 + include/linux/netdevice.h | 2 +- net/core/dev.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/ppp/pppoe.c +1 -0
@@ -988,6 +988,7 @@ static int pppoe_fill_forward_path(struct net_device_path_ctx *ctx, path->encap.proto =htons (ETH_P_PPP_SES ); path->encap.id =be16_to_cpu (po->num);memcpy (path->encap.h_dest, po->pppoe_pa.remote,ETH_ALEN ); +memcpy (ctx->daddr, po->pppoe_pa.remote,ETH_ALEN ); path->dev = ctx->dev; ctx->dev = dev;
include/linux/netdevice.h +1 -1
@@ -891,7 +891,7 @@ struct net_device_path_stack {struct net_device_path_ctx {const struct net_device *dev; -const u8 *daddr; +u8 daddr[ETH_ALEN ];int num_vlans;struct {
net/core/dev.c +1 -1
@@ -663,11 +663,11 @@ int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,const struct net_device *last_dev;struct net_device_path_ctx ctx = { .dev = dev, - .daddr = daddr, };struct net_device_path *path;int ret =0 ; +memcpy (ctx.daddr, daddr,sizeof (ctx.daddr)); stack->num_paths =0 ;while (ctx.dev && ctx.dev->netdev_ops->ndo_fill_forward_path) { last_dev = ctx.dev;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 88/158 netfilter: nft_flow_offload: fix offload with pppoe + vlan
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit 2456074935003b66c40f78df6adfc722435d43ea ]
When running a combination of PPPoE on top of a VLAN, we need to set info->outdev to the PPPoE device, otherwise PPPoE encap is skipped during software offload.
--- net/netfilter/nft_flow_offload.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nft_flow_offload.c +2 -1
@@ -123,7 +123,8 @@ static void nft_dev_path_info(const struct net_device_path_stack *stack, info->indev =NULL ;break ; } - info->outdev = path->dev; +if (!info->outdev) + info->outdev = path->dev; info->encap[info->num_encaps].id = path->encap.id; info->encap[info->num_encaps].proto = path->encap.proto; info->num_encaps++;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 89/158 ptp: ocp: have adjtime handle negative delta_ns correctly
In reply to Greg Kroah-HartmanFrom: Jonathan Lemon <[email protected]>
[ Upstream commit da2172a9bfec858ceeb0271b9d444378490398c8 ]
delta_ns is a s64, but it was being passed ptp_ocp_adjtime_coarse as an u64. Also, it turns out that timespec64_add_ns() only handles positive values, so perform the math with set_normalized_timespec().
--- drivers/ptp/ptp_ocp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/ptp/ptp_ocp.c +3 -2
@@ -625,7 +625,7 @@ __ptp_ocp_adjtime_locked(struct ptp_ocp *bp, u32 adj_val) }static void -ptp_ocp_adjtime_coarse (struct ptp_ocp *bp,u64 delta_ns) +ptp_ocp_adjtime_coarse (struct ptp_ocp *bp,s64 delta_ns) {struct timespec64 ts;unsigned long flags;
@@ -634,7 +634,8 @@ ptp_ocp_adjtime_coarse(struct ptp_ocp *bp, u64 delta_ns)spin_lock_irqsave (&bp->lock, flags); err =__ptp_ocp_gettime_locked (bp, &ts,NULL );if (likely (!err)) { -timespec64_add_ns (&ts, delta_ns); +set_normalized_timespec64 (&ts, ts.tv_sec, + ts.tv_nsec + delta_ns);__ptp_ocp_settime_locked (bp, &ts); }spin_unlock_irqrestore (&bp->lock, flags);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 90/158 Revert "PCI: aardvark: Rewrite IRQ code to chained IRQ handler"
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit a3b69dd0ad6265c29c4b6fb381cd76fb3bebdf8c ]
This reverts commit 1571d67dc190e50c6c56e8f88cdc39f7cc53166e.
This commit broke support for setting interrupt affinity. It looks like that it is related to the chained IRQ handler. Revert this commit until issue with setting interrupt affinity is fixed.
--- drivers/pci/controller/pci-aardvark.c | 48 ++++++++++++--------------- 1 file changed, 22 insertions(+), 26 deletions(-)
drivers/pci/controller/pci-aardvark.c +22 -26
@@ -272,7 +272,6 @@ struct advk_pcie {u32 actions; } wins[OB_WIN_COUNT ];u8 wins_count; -int irq;struct irq_domain *rp_irq_domain;struct irq_domain *irq_domain;struct irq_chip irq_chip;
@@ -1570,26 +1569,21 @@ static void advk_pcie_handle_int(struct advk_pcie *pcie) } } -static void advk_pcie_irq_handler (struct irq_desc *desc) +static irqreturn_t advk_pcie_irq_handler (int irq,void *arg) { -struct advk_pcie *pcie =irq_desc_get_handler_data (desc); -struct irq_chip *chip =irq_desc_get_chip (desc); -u32 val, mask, status; +struct advk_pcie *pcie = arg; +u32 status; -chained_irq_enter (chip, desc); + status =advk_readl (pcie,HOST_CTRL_INT_STATUS_REG ); +if (!(status &PCIE_IRQ_CORE_INT )) +return IRQ_NONE ; - val =advk_readl (pcie,HOST_CTRL_INT_STATUS_REG ); - mask =advk_readl (pcie,HOST_CTRL_INT_MASK_REG ); - status = val & ((~mask) &PCIE_IRQ_ALL_MASK ); +advk_pcie_handle_int (pcie); -if (status &PCIE_IRQ_CORE_INT ) { -advk_pcie_handle_int (pcie); +/* Clear interrupt */ +advk_writel (pcie,PCIE_IRQ_CORE_INT ,HOST_CTRL_INT_STATUS_REG ); -/* Clear interrupt */ -advk_writel (pcie,PCIE_IRQ_CORE_INT ,HOST_CTRL_INT_STATUS_REG ); - } - -chained_irq_exit (chip, desc); +return IRQ_HANDLED ; }static int advk_pcie_map_irq (const struct pci_dev *dev,u8 slot,u8 pin)
@@ -1671,7 +1665,7 @@ static int advk_pcie_probe(struct platform_device *pdev)struct advk_pcie *pcie;struct pci_host_bridge *bridge;struct resource_entry *entry; -int ret; +int ret, irq; bridge =devm_pci_alloc_host_bridge (dev,sizeof (struct advk_pcie ));if (!bridge)
@@ -1757,9 +1751,17 @@ static int advk_pcie_probe(struct platform_device *pdev)if (IS_ERR (pcie->base))return PTR_ERR (pcie->base); - pcie->irq =platform_get_irq (pdev,0 ); -if (pcie->irq <0 ) -return pcie->irq; + irq =platform_get_irq (pdev,0 ); +if (irq <0 ) +return irq; + + ret =devm_request_irq (dev, irq, advk_pcie_irq_handler, +IRQF_SHARED |IRQF_NO_THREAD ,"advk-pcie" , + pcie); +if (ret) { +dev_err (dev,"Failed to register interrupt\n" ); +return ret; + } pcie->reset_gpio = devm_gpiod_get_from_of_node(dev, dev->of_node, "reset-gpios", 0,
@@ -1816,15 +1818,12 @@ static int advk_pcie_probe(struct platform_device *pdev)return ret; } -irq_set_chained_handler_and_data (pcie->irq, advk_pcie_irq_handler, pcie); - bridge->sysdata = pcie; bridge->ops = &advk_pcie_ops; bridge->map_irq = advk_pcie_map_irq; ret =pci_host_probe (bridge);if (ret <0 ) { -irq_set_chained_handler_and_data (pcie->irq,NULL ,NULL );advk_pcie_remove_rp_irq_domain (pcie);advk_pcie_remove_msi_irq_domain (pcie);advk_pcie_remove_irq_domain (pcie);
@@ -1873,9 +1872,6 @@ static int advk_pcie_remove(struct platform_device *pdev)advk_writel (pcie,PCIE_ISR1_ALL_MASK ,PCIE_ISR1_REG );advk_writel (pcie,PCIE_IRQ_ALL_MASK ,HOST_CTRL_INT_STATUS_REG ); -/* Remove IRQ handler */ -irq_set_chained_handler_and_data (pcie->irq,NULL ,NULL ); -/* Remove IRQ domains */ advk_pcie_remove_rp_irq_domain (pcie);advk_pcie_remove_msi_irq_domain (pcie);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 91/158 net: lan966x: Fix assignment of the MAC address
In reply to Greg Kroah-HartmanFrom: Horatiu Vultur <[email protected]>
[ Upstream commit af8ca6eaa9b24a90484218e356f959a94bff22fa ]
The following two scenarios were failing for lan966x.
1. If the port had the address X and then trying to assign the same address, then the HW was just removing this address because first it tries to learn new address and then delete the old one. As they are the same the HW remove it.
2. If the port eth0 was assigned the same address as one of the other ports eth1 then when assigning back the address to eth0 then the HW was deleting the address of eth1.
The case 1. is fixed by checking if the port has already the same address while case 2. is fixed by checking if the address is used by any other port.
--- .../ethernet/microchip/lan966x/lan966x_main.c | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/net/ethernet/microchip/lan966x/lan966x_main.c +28 -0
@@ -100,6 +100,24 @@ static int lan966x_create_targets(struct platform_device *pdev,return 0 ; } +static bool lan966x_port_unique_address (struct net_device *dev) +{ +struct lan966x_port *port =netdev_priv (dev); +struct lan966x *lan966x = port->lan966x; +int p; + +for (p =0 ; p < lan966x->num_phys_ports; ++p) { + port = lan966x->ports[p]; +if (!port || port->dev == dev) +continue ; + +if (ether_addr_equal (dev->dev_addr, port->dev->dev_addr)) +return false; + } + +return true; +} +static int lan966x_port_set_mac_address (struct net_device *dev,void *p) {struct lan966x_port *port =netdev_priv (dev);
@@ -107,16 +125,26 @@ static int lan966x_port_set_mac_address(struct net_device *dev, void *p)const struct sockaddr *addr = p;int ret; +if (ether_addr_equal (addr->sa_data, dev->dev_addr)) +return 0 ; +/* Learn the new net device MAC address in the mac table. */ ret =lan966x_mac_cpu_learn (lan966x, addr->sa_data,HOST_PVID );if (ret)return ret; +/* If there is another port with the same address as the dev, then don't +* delete it from the MAC table +*/ +if (!lan966x_port_unique_address (dev)) + goto out; +/* Then forget the previous one. */ ret =lan966x_mac_cpu_forget (lan966x, dev->dev_addr,HOST_PVID );if (ret)return ret; +out:eth_hw_addr_set (dev, addr->sa_data);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 92/158 net: systemport: Fix an error handling path in bcm_sysport_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit ef6b1cd11962aec21c58d137006ab122dbc8d6fd ]
if devm_clk_get_optional() fails, we still need to go through the error handling path.
Add the missing goto.
--- drivers/net/ethernet/broadcom/bcmsysport.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bcmsysport.c +4 -2
@@ -2585,8 +2585,10 @@ static int bcm_sysport_probe(struct platform_device *pdev)device_set_wakeup_capable (&pdev->dev,1 ); priv->wol_clk =devm_clk_get_optional (&pdev->dev,"sw_sysportwol" ); -if (IS_ERR (priv->wol_clk)) -return PTR_ERR (priv->wol_clk); +if (IS_ERR (priv->wol_clk)) { + ret =PTR_ERR (priv->wol_clk); + goto err_deregister_fixed_link; + }/* Set the needed headroom once and for all */ BUILD_BUG_ON (sizeof (struct bcm_tsb ) !=8 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 93/158 net: vmxnet3: fix possible use-after-free bugs in vmxnet3_rq_alloc_rx_buf()
In reply to Greg Kroah-HartmanFrom: Zixuan Fu <[email protected]>
[ Upstream commit 9e7fef9521e73ca8afd7da9e58c14654b02dfad8 ]
In vmxnet3_rq_alloc_rx_buf(), when dma_map_single() fails, rbi->skb is freed immediately. Similarly, in another branch, when dma_map_page() fails, rbi->page is also freed. In the two cases, vmxnet3_rq_alloc_rx_buf() returns an error to its callers vmxnet3_rq_init() -> vmxnet3_rq_init_all() -> vmxnet3_activate_dev(). Then vmxnet3_activate_dev() calls vmxnet3_rq_cleanup_all() in error handling code, and rbi->skb or rbi->page are freed again in vmxnet3_rq_cleanup_all(), causing use-after-free bugs.
To fix these possible bugs, rbi->skb and rbi->page should be cleared after they are freed.
The error log in our fault-injection testing is shown as follows:
[ 14.319016] BUG: KASAN: use-after-free in consume_skb+0x2f/0x150 ... [ 14.321586] Call Trace: ... [ 14.325357] consume_skb+0x2f/0x150 [ 14.325671] vmxnet3_rq_cleanup_all+0x33a/0x4e0 [vmxnet3] [ 14.326150] vmxnet3_activate_dev+0xb9d/0x2ca0 [vmxnet3] [ 14.326616] vmxnet3_open+0x387/0x470 [vmxnet3] ... [ 14.361675] Allocated by task 351: ... [ 14.362688] __netdev_alloc_skb+0x1b3/0x6f0 [ 14.362960] vmxnet3_rq_alloc_rx_buf+0x1b0/0x8d0 [vmxnet3] [ 14.363317] vmxnet3_activate_dev+0x3e3/0x2ca0 [vmxnet3] [ 14.363661] vmxnet3_open+0x387/0x470 [vmxnet3] ... [ 14.367309] [ 14.367412] Freed by task 351: ... [ 14.368932] __dev_kfree_skb_any+0xd2/0xe0 [ 14.369193] vmxnet3_rq_alloc_rx_buf+0x71e/0x8d0 [vmxnet3] [ 14.369544] vmxnet3_activate_dev+0x3e3/0x2ca0 [vmxnet3] [ 14.369883] vmxnet3_open+0x387/0x470 [vmxnet3] [ 14.370174] __dev_open+0x28a/0x420 [ 14.370399] __dev_change_flags+0x192/0x590 [ 14.370667] dev_change_flags+0x7a/0x180 [ 14.370919] do_setlink+0xb28/0x3570 [ 14.371150] rtnl_newlink+0x1160/0x1740 [ 14.371399] rtnetlink_rcv_msg+0x5bf/0xa50 [ 14.371661] netlink_rcv_skb+0x1cd/0x3e0 [ 14.371913] netlink_unicast+0x5dc/0x840 [ 14.372169] netlink_sendmsg+0x856/0xc40 [ 14.372420] ____sys_sendmsg+0x8a7/0x8d0 [ 14.372673] __sys_sendmsg+0x1c2/0x270 [ 14.372914] do_syscall_64+0x41/0x90 [ 14.373145] entry_SYSCALL_64_after_hwframe+0x44/0xae
...
--- drivers/net/vmxnet3/vmxnet3_drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/vmxnet3/vmxnet3_drv.c +2 -0
@@ -589,6 +589,7 @@ vmxnet3_rq_alloc_rx_buf(struct vmxnet3_rx_queue *rq, u32 ring_idx,if (dma_mapping_error (&adapter->pdev->dev, rbi->dma_addr)) {dev_kfree_skb_any (rbi->skb); + rbi->skb =NULL ; rq->stats.rx_buf_alloc_failure++;break ; }
@@ -613,6 +614,7 @@ vmxnet3_rq_alloc_rx_buf(struct vmxnet3_rx_queue *rq, u32 ring_idx,if (dma_mapping_error (&adapter->pdev->dev, rbi->dma_addr)) {put_page (rbi->page); + rbi->page =NULL ; rq->stats.rx_buf_alloc_failure++;break ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 94/158 net: vmxnet3: fix possible NULL pointer dereference in vmxnet3_rq_cleanup()
In reply to Greg Kroah-HartmanFrom: Zixuan Fu <[email protected]>
[ Upstream commit edf410cb74dc612fd47ef5be319c5a0bcd6e6ccd ]
In vmxnet3_rq_create(), when dma_alloc_coherent() fails, vmxnet3_rq_destroy() is called. It sets rq->rx_ring[i].base to NULL. Then vmxnet3_rq_create() returns an error to its callers mxnet3_rq_create_all() -> vmxnet3_change_mtu(). Then vmxnet3_change_mtu() calls vmxnet3_force_close() -> dev_close() in error handling code. And the driver calls vmxnet3_close() -> vmxnet3_quiesce_dev() -> vmxnet3_rq_cleanup_all() -> vmxnet3_rq_cleanup(). In vmxnet3_rq_cleanup(), rq->rx_ring[ring_idx].base is accessed, but this variable is NULL, causing a NULL pointer dereference.
To fix this possible bug, an if statement is added to check whether rq->rx_ring[0].base is NULL in vmxnet3_rq_cleanup() and exit early if so.
The error log in our fault-injection testing is shown as follows:
[ 65.220135] BUG: kernel NULL pointer dereference, address: 0000000000000008 ... [ 65.222633] RIP: 0010:vmxnet3_rq_cleanup_all+0x396/0x4e0 [vmxnet3] ... [ 65.227977] Call Trace: ... [ 65.228262] vmxnet3_quiesce_dev+0x80f/0x8a0 [vmxnet3] [ 65.228580] vmxnet3_close+0x2c4/0x3f0 [vmxnet3] [ 65.228866] __dev_close_many+0x288/0x350 [ 65.229607] dev_close_many+0xa4/0x480 [ 65.231124] dev_close+0x138/0x230 [ 65.231933] vmxnet3_force_close+0x1f0/0x240 [vmxnet3] [ 65.232248] vmxnet3_change_mtu+0x75d/0x920 [vmxnet3]
...
--- drivers/net/vmxnet3/vmxnet3_drv.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/vmxnet3/vmxnet3_drv.c +4 -0
@@ -1668,6 +1668,10 @@ vmxnet3_rq_cleanup(struct vmxnet3_rx_queue *rq,u32 i, ring_idx;struct Vmxnet3_RxDesc *rxd; +/* ring has already been cleaned up */ +if (!rq->rx_ring[0 ].base) +return ; +for (ring_idx =0 ; ring_idx <2 ; ring_idx++) {for (i =0 ; i < rq->rx_ring[ring_idx].size; i++) {#ifdef __BIG_ENDIAN_BITFIELD
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 95/158 arm64: kexec: load from kimage prior to clobbering
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
[ Upstream commit eb3d8ea3e1f03f4b0b72d8f5ed9eb7c3165862e8 ]
In arm64_relocate_new_kernel() we load some fields out of the kimage structure after relocation has occurred. As the kimage structure isn't allocated to be relocation-safe, it may be clobbered during relocation, and we may load junk values out of the structure.
Due to this, kexec may fail when the kimage allocation happens to fall within a PA range that an object will be relocated to. This has been observed to occur for regular kexec on a QEMU TCG 'virt' machine with 2GiB of RAM, where the PA range of the new kernel image overlaps the kimage structure.
Avoid this by ensuring we load all values from the kimage structure prior to relocation.
I've tested this atop v5.16 and v5.18-rc6.
--- arch/arm64/kernel/relocate_kernel.S | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
arch/arm64/kernel/relocate_kernel.S +15 -7
@@ -37,6 +37,15 @@ * safe memory that has been set up to be preserved during the copy operation. */ SYM_CODE_START(arm64_relocate_new_kernel) + /* + * The kimage structure isn't allocated specially and may be clobbered + * during relocation. We must load any values we need from it prior to + * any relocation occurring. + */ + ldr x28, [x0, #KIMAGE_START] + ldr x27, [x0, #KIMAGE_ARCH_EL2_VECTORS] + ldr x26, [x0, #KIMAGE_ARCH_DTB_MEM] + /* Setup the list loop variables. */ ldr x18, [x0, #KIMAGE_ARCH_ZERO_PAGE] /* x18 = zero page for BBM */ ldr x17, [x0, #KIMAGE_ARCH_TTBR1] /* x17 = linear map copy */
@@ -72,21 +81,20 @@ SYM_CODE_START(arm64_relocate_new_kernel) ic iallu dsb nsh isb - ldr x4, [x0, #KIMAGE_START] /* relocation start */ - ldr x1, [x0, #KIMAGE_ARCH_EL2_VECTORS] /* relocation start */ - ldr x0, [x0, #KIMAGE_ARCH_DTB_MEM] /* dtb address */ turn_off_mmu x12, x13 /* Start new image. */ - cbz x1, .Lel1 - mov x1, x4 /* relocation start */ - mov x2, x0 /* dtb address */ + cbz x27, .Lel1 + mov x1, x28 /* kernel entry point */ + mov x2, x26 /* dtb address */ mov x3, xzr mov x4, xzr mov x0, #HVC_SOFT_RESTART hvc #0 /* Jumps from el2 */ .Lel1: + mov x0, x26 /* dtb address */ + mov x1, xzr mov x2, xzr mov x3, xzr - br x4 /* Jumps from el1 */ + br x28 /* Jumps from el1 */ SYM_CODE_END(arm64_relocate_new_kernel)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 96/158 ice: fix crash when writing timestamp on RX rings
In reply to Greg Kroah-HartmanFrom: Arkadiusz Kubalewski <[email protected]>
[ Upstream commit 4503cc7fdf9a84cd631b0cb8ecb3c9b1bdbf3594 ]
Do not allow to write timestamps on RX rings if PF is being configured. When PF is being configured RX rings can be freed or rebuilt. If at the same time timestamps are updated, the kernel will crash by dereferencing null RX ring pointer.
PID: 1449 TASK: ff187d28ed658040 CPU: 34 COMMAND: "ice-ptp-0000:51"
#0 [ff1966a94a713bb0] machine_kexec at ffffffff9d05a0be #1 [ff1966a94a713c08] __crash_kexec at ffffffff9d192e9d #2 [ff1966a94a713cd0] crash_kexec at ffffffff9d1941bd #3 [ff1966a94a713ce8] oops_end at ffffffff9d01bd54
#4 [ff1966a94a713d08] no_context at ffffffff9d06bda4 #5 [ff1966a94a713d60] __bad_area_nosemaphore at ffffffff9d06c10c #6 [ff1966a94a713da8] do_page_fault at ffffffff9d06cae4 #7 [ff1966a94a713de0] page_fault at ffffffff9da0107e
[exception RIP: ice_ptp_update_cached_phctime+91]
RIP: ffffffffc076db8b RSP: ff1966a94a713e98 RFLAGS: 00010246
RAX: 16e3db9c6b7ccae4 RBX: ff187d269dd3c180 RCX: ff187d269cd4d018
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
RBP: ff187d269cfcc644 R8: ff187d339b9641b0 R9: 0000000000000000
R10: 0000000000000002 R11: 0000000000000000 R12: ff187d269cfcc648
R13: ffffffff9f128784 R14: ffffffff9d101b70 R15: ff187d269cfcc640
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 #8 [ff1966a94a713ea0] ice_ptp_periodic_work at ffffffffc076dbef [ice] #9 [ff1966a94a713ee0] kthread_worker_fn at ffffffff9d101c1b #10 [ff1966a94a713f10] kthread at ffffffff9d101b4d
#11 [ff1966a94a713f50] ret_from_fork at ffffffff9da0023f
--- drivers/net/ethernet/intel/ice/ice_ptp.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_ptp.c +15 -4
@@ -499,12 +499,19 @@ ice_ptp_read_src_clk_reg(struct ice_pf *pf, struct ptp_system_timestamp *sts)* This function must be called periodically to ensure that the cached value * is never more than 2 seconds old. It must also be called whenever the PHC * time has been changed. +* +* Return: +* * 0 - OK, successfully updated +* * -EAGAIN - PF was busy, need to reschedule the update */ -static void ice_ptp_update_cached_phctime (struct ice_pf *pf) +static int ice_ptp_update_cached_phctime (struct ice_pf *pf) {u64 systime;int i; +if (test_and_set_bit (ICE_CFG_BUSY , pf->state)) +return -EAGAIN ; +/* Read the current PHC time */ systime =ice_ptp_read_src_clk_reg (pf,NULL );
@@ -527,6 +534,9 @@ static void ice_ptp_update_cached_phctime(struct ice_pf *pf)WRITE_ONCE (vsi->rx_rings[j]->cached_phctime, systime); } } +clear_bit (ICE_CFG_BUSY , pf->state); + +return 0 ; }/**
@@ -2322,17 +2332,18 @@ static void ice_ptp_periodic_work(struct kthread_work *work) { struct ice_ptp *ptp = container_of(work, struct ice_ptp, work.work); struct ice_pf *pf = container_of(ptp, struct ice_pf, ptp); +int err;if (!test_bit (ICE_FLAG_PTP , pf->flags))return ; -ice_ptp_update_cached_phctime (pf); + err =ice_ptp_update_cached_phctime (pf);ice_ptp_tx_tstamp_cleanup (&pf->hw, &pf->ptp.port.tx); -/* Run twice a second */ +/* Run twice a second or reschedule if phc update failed */ kthread_queue_delayed_work (ptp->kworker, &ptp->work, -msecs_to_jiffies (500 )); +msecs_to_jiffies (err ?10 :500 )); }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 97/158 ice: fix possible under reporting of ethtool Tx and Rx statistics
In reply to Greg Kroah-HartmanFrom: Paul Greenwalt <[email protected]>
[ Upstream commit 31b6298fd8e29effe9ed6b77351ac5969be56ce0 ]
The hardware statistics counters are not cleared during resets so the drivers first access is to initialize the baseline and then subsequent reads are for reporting the counters. The statistics counters are read during the watchdog subtask when the interface is up. If the baseline is not initialized before the interface is up, then there can be a brief window in which some traffic can be transmitted/received before the initial baseline reading takes place.
Directly initialize ethtool statistics in driver open so the baseline will be initialized when the interface is up, and any dropped packets incremented before the interface is up won't be reported.
--- drivers/net/ethernet/intel/ice/ice_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +4 -3
@@ -5907,9 +5907,10 @@ static int ice_up_complete(struct ice_vsi *vsi)ice_ptp_link_change (pf, pf->hw.pf_id, true); } -/* clear this now, and the first stats read will be used as baseline */ - vsi->stat_offsets_loaded = false; - +/* Perform an initial read of the statistics registers now to +* set the baseline so counters are ready when interface is up +*/ +ice_update_eth_stats (vsi);ice_service_task_schedule (pf);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 98/158 ice: Fix interrupt moderation settings getting cleared
In reply to Greg Kroah-HartmanFrom: Michal Wilczynski <[email protected]>
[ Upstream commit bf13502ed5f941b0777b3fd1e24dac5d93f3886c ]
Adaptive-rx and Adaptive-tx are interrupt moderation settings that can be enabled/disabled using ethtool:
ethtool -C ethX adaptive-rx on/off adaptive-tx on/off
Unfortunately those settings are getting cleared after changing number of queues, or in ethtool world 'channels':
ethtool -L ethX rx 1 tx 1
Clearing was happening due to introduction of bit fields in ice_ring_container struct. This way only itr_setting bits were rebuilt during ice_vsi_rebuild_set_coalesce().
Introduce an anonymous struct of bitfields and create a union to refer to them as a single variable. This way variable can be easily saved and restored.
--- drivers/net/ethernet/intel/ice/ice_lib.c | 16 ++++++++-------- drivers/net/ethernet/intel/ice/ice_txrx.h | 11 ++++++++--- 2 files changed, 16 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/ice/ice_lib.c +8 -8
@@ -3207,8 +3207,8 @@ ice_vsi_rebuild_get_coalesce(struct ice_vsi *vsi,ice_for_each_q_vector (vsi, i) {struct ice_q_vector *q_vector = vsi->q_vectors[i]; - coalesce[i].itr_tx = q_vector->tx.itr_setting; - coalesce[i].itr_rx = q_vector->rx.itr_setting; + coalesce[i].itr_tx = q_vector->tx.itr_settings; + coalesce[i].itr_rx = q_vector->rx.itr_settings; coalesce[i].intrl = q_vector->intrl;if (i < vsi->num_txq)
@@ -3264,21 +3264,21 @@ ice_vsi_rebuild_set_coalesce(struct ice_vsi *vsi,*/ if (i < vsi->alloc_rxq && coalesce[i].rx_valid) { rc = &vsi->q_vectors[i]->rx; - rc->itr_setting = coalesce[i].itr_rx; + rc->itr_settings = coalesce[i].itr_rx;ice_write_itr (rc, rc->itr_setting); }else if (i < vsi->alloc_rxq) { rc = &vsi->q_vectors[i]->rx; - rc->itr_setting = coalesce[0 ].itr_rx; + rc->itr_settings = coalesce[0 ].itr_rx;ice_write_itr (rc, rc->itr_setting); }if (i < vsi->alloc_txq && coalesce[i].tx_valid) { rc = &vsi->q_vectors[i]->tx; - rc->itr_setting = coalesce[i].itr_tx; + rc->itr_settings = coalesce[i].itr_tx;ice_write_itr (rc, rc->itr_setting); }else if (i < vsi->alloc_txq) { rc = &vsi->q_vectors[i]->tx; - rc->itr_setting = coalesce[0 ].itr_tx; + rc->itr_settings = coalesce[0 ].itr_tx;ice_write_itr (rc, rc->itr_setting); }
@@ -3292,12 +3292,12 @@ ice_vsi_rebuild_set_coalesce(struct ice_vsi *vsi,for (; i < vsi->num_q_vectors; i++) {/* transmit */ rc = &vsi->q_vectors[i]->tx; - rc->itr_setting = coalesce[0 ].itr_tx; + rc->itr_settings = coalesce[0 ].itr_tx;ice_write_itr (rc, rc->itr_setting);/* receive */ rc = &vsi->q_vectors[i]->rx; - rc->itr_setting = coalesce[0 ].itr_rx; + rc->itr_settings = coalesce[0 ].itr_rx;ice_write_itr (rc, rc->itr_setting); vsi->q_vectors[i]->intrl = coalesce[0 ].intrl;
drivers/net/ethernet/intel/ice/ice_txrx.h +8 -3
@@ -379,9 +379,14 @@ struct ice_ring_container {/* this matches the maximum number of ITR bits, but in usec * values, so it is shifted left one bit (bit zero is ignored) */ - u16 itr_setting:13; - u16 itr_reserved:2; - u16 itr_mode:1; +union { +struct { +u16 itr_setting:13 ; +u16 itr_reserved:2 ; +u16 itr_mode:1 ; + }; +u16 itr_settings; + };enum ice_container_type type; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 99/158 clk: at91: generated: consider range when calculating best rate
In reply to Greg Kroah-HartmanFrom: Codrin Ciubotariu <[email protected]>
[ Upstream commit d0031e6fbed955ff8d5f5bbc8fe7382482559cec ]
clk_generated_best_diff() helps in finding the parent and the divisor to compute a rate closest to the required one. However, it doesn't take into account the request's range for the new rate. Make sure the new rate is within the required range.
--- drivers/clk/at91/clk-generated.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clk/at91/clk-generated.c +4 -0
@@ -117,6 +117,10 @@ static void clk_generated_best_diff(struct clk_rate_request *req, tmp_rate = parent_rate; else tmp_rate = parent_rate / div; + +if (tmp_rate < req->min_rate || tmp_rate > req->max_rate) +return ; + tmp_diff =abs (req->rate - tmp_rate);if (*best_diff <0 || *best_diff >= tmp_diff) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 100/158 net/qla3xxx: Fix a test in ql_reset_work()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 5361448e45fac6fb96738df748229432a62d78b6 ]
test_bit() tests if one bit is set or not.
Here the logic seems to check of bit QL_RESET_PER_SCSI (i.e. 4) OR bit QL_RESET_START (i.e. 3) is set.
In fact, it checks if bit 7 (4 | 3 = 7) is set, that is to say QL_ADAPTER_UP.
This looks harmless, because this bit is likely be set, and when the ql_reset_work() delayed work is scheduled in ql3xxx_isr() (the only place that schedule this work), QL_RESET_START or QL_RESET_PER_SCSI is set.
This has been spotted by smatch.
--- drivers/net/ethernet/qlogic/qla3xxx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qla3xxx.c +2 -1
@@ -3614,7 +3614,8 @@ static void ql_reset_work(struct work_struct *work) qdev->mem_map_registers;unsigned long hw_flags; -if (test_bit ((QL_RESET_PER_SCSI |QL_RESET_START ), &qdev->flags)) { +if (test_bit (QL_RESET_PER_SCSI , &qdev->flags) || +test_bit (QL_RESET_START , &qdev->flags)) {clear_bit (QL_LINK_MASTER , &qdev->flags);/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 101/158 NFC: nci: fix sleep in atomic context bugs caused by nci_skb_alloc
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit 23dd4581350d4ffa23d58976ec46408f8f4c1e16 ]
There are sleep in atomic context bugs when the request to secure element of st-nci is timeout. The root cause is that nci_skb_alloc with GFP_KERNEL parameter is called in st_nci_se_wt_timeout which is a timer handler. The call paths that could trigger bugs are shown below:
(interrupt context 1)st_nci_se_wt_timeout
nci_hci_send_event
nci_hci_send_data
nci_skb_alloc(..., GFP_KERNEL) //may sleep (interrupt context 2)st_nci_se_wt_timeout
nci_hci_send_event
nci_hci_send_data
nci_send_data
nci_queue_tx_data_frags
nci_skb_alloc(..., GFP_KERNEL) //may sleepThis patch changes allocation mode of nci_skb_alloc from GFP_KERNEL to GFP_ATOMIC in order to prevent atomic context sleeping. The GFP_ATOMIC flag makes memory allocation operation could be used in atomic context.
--- net/nfc/nci/data.c | 2 +- net/nfc/nci/hci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
net/nfc/nci/data.c +1 -1
@@ -118,7 +118,7 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev, skb_frag =nci_skb_alloc (ndev, (NCI_DATA_HDR_SIZE + frag_len), -GFP_KERNEL ); +GFP_ATOMIC );if (skb_frag ==NULL ) { rc = -ENOMEM ; goto free_exit;
net/nfc/nci/hci.c +2 -2
@@ -153,7 +153,7 @@ static int nci_hci_send_data(struct nci_dev *ndev, u8 pipe, i =0 ; skb =nci_skb_alloc (ndev, conn_info->max_pkt_payload_len + -NCI_DATA_HDR_SIZE ,GFP_KERNEL ); +NCI_DATA_HDR_SIZE ,GFP_ATOMIC );if (!skb)return -ENOMEM ;
@@ -184,7 +184,7 @@ static int nci_hci_send_data(struct nci_dev *ndev, u8 pipe,if (i < data_len) { skb =nci_skb_alloc (ndev, conn_info->max_pkt_payload_len + -NCI_DATA_HDR_SIZE ,GFP_KERNEL ); +NCI_DATA_HDR_SIZE ,GFP_ATOMIC );if (!skb)return -ENOMEM ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 102/158 net/mlx5: DR, Fix missing flow_source when creating multi-destination FW table
In reply to Greg Kroah-HartmanFrom: Maor Dickman <[email protected]>
[ Upstream commit 2c5fc6cd269ad3476da99dad02521d2af4a8e906 ]
In order to support multiple destination FTEs with SW steering FW table is created with single FTE with multiple actions and SW steering rule forward to it. When creating this table, flow source isn't set according to the original FTE.
Fix this by passing the original FTE flow source to the created FW table.
--- .../net/ethernet/mellanox/mlx5/core/steering/dr_action.c | 6 ++++-- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_fw.c | 4 +++- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h | 3 ++- drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c | 4 +++- drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 3 ++- 5 files changed, 14 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c +4 -2
@@ -847,7 +847,8 @@ struct mlx5dr_action * mlx5dr_action_create_mult_dest_tbl(struct mlx5dr_domain *dmn, struct mlx5dr_action_dest *dests, u32 num_of_dests, - bool ignore_flow_level) + bool ignore_flow_level, + u32 flow_source) { struct mlx5dr_cmd_flow_destination_hw_info *hw_dests;struct mlx5dr_action **ref_actions;
@@ -919,7 +920,8 @@ mlx5dr_action_create_mult_dest_tbl(struct mlx5dr_domain *dmn, reformat_req, &action->dest_tbl->fw_tbl.id, &action->dest_tbl->fw_tbl.group_id, - ignore_flow_level); + ignore_flow_level, + flow_source);if (ret) goto free_action;
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_fw.c +3 -1
@@ -104,7 +104,8 @@ int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn,bool reformat_req, u32 *tbl_id, u32 *group_id, - bool ignore_flow_level) + bool ignore_flow_level, + u32 flow_source) { struct mlx5dr_cmd_create_flow_table_attr ft_attr = {};struct mlx5dr_cmd_fte_info fte_info = {};
@@ -139,6 +140,7 @@ int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn, fte_info.val = val; fte_info.dest_arr = dest; fte_info.ignore_flow_level = ignore_flow_level; + fte_info.flow_context.flow_source = flow_source; ret =mlx5dr_cmd_set_fte (dmn->mdev,0 ,0 , &ft_info, *group_id, &fte_info);if (ret) {
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h +2 -1
@@ -1463,7 +1463,8 @@ int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn,bool reformat_req, u32 *tbl_id, u32 *group_id, - bool ignore_flow_level); + bool ignore_flow_level, + u32 flow_source);void mlx5dr_fw_destroy_md_tbl (struct mlx5dr_domain *dmn,u32 tbl_id,u32 group_id);#endif /* _DR_TYPES_H_ */
drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c +3 -1
@@ -520,6 +520,7 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns, }else if (num_term_actions >1 ) {bool ignore_flow_level = !!(fte->action.flags &FLOW_ACT_IGNORE_FLOW_LEVEL ); +u32 flow_source = fte->flow_context.flow_source;if (num_actions ==MLX5_FLOW_CONTEXT_ACTION_MAX || fs_dr_num_actions ==MLX5_FLOW_CONTEXT_ACTION_MAX ) {
@@ -529,7 +530,8 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns, tmp_action =mlx5dr_action_create_mult_dest_tbl (domain, term_actions, num_term_actions, - ignore_flow_level); + ignore_flow_level, + flow_source);if (!tmp_action) { err = -EOPNOTSUPP ; goto free_actions;
drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h +2 -1
@@ -96,7 +96,8 @@ struct mlx5dr_action * mlx5dr_action_create_mult_dest_tbl(struct mlx5dr_domain *dmn, struct mlx5dr_action_dest *dests, u32 num_of_dests, - bool ignore_flow_level); + bool ignore_flow_level, + u32 flow_source);struct mlx5dr_action *mlx5dr_action_create_drop (void );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 103/158 net/mlx5: Initialize flow steering during driver probe
In reply to Greg Kroah-HartmanFrom: Shay Drory <[email protected]>
[ Upstream commit b33886971dbc4a86d1ec5369a2aaefc60a7cd72d ]
Currently, software objects of flow steering are created and destroyed during reload flow. In case a device is unloaded, the following error is printed during grace period:
mlx5_core 0000:00:0b.0: mlx5_fw_fatal_reporter_err_work:690:(pid 95):
Driver is in error state. Unloading
As a solution to fix use-after-free bugs, where we try to access these objects, when reading the value of flow_steering_mode devlink param[1], let's split flow steering creation and destruction into two routines:
* init and cleanup: memory, cache, and pools allocation/free.
* create and destroy: namespaces initialization and cleanup.
While at it, re-order the cleanup function to mirror the init function.
[1]
Kasan trace:
[ 385.119849 ] BUG: KASAN: use-after-free in mlx5_devlink_fs_mode_get+0x3b/0xa0 [ 385.119849 ] Read of size 4 at addr ffff888104b79308 by task bash/291 [ 385.119849 ] [ 385.119849 ] CPU: 1 PID: 291 Comm: bash Not tainted 5.17.0-rc1+ #2 [ 385.119849 ] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-2.fc32 04/01/2014 [ 385.119849 ] Call Trace: [ 385.119849 ] <TASK> [ 385.119849 ] dump_stack_lvl+0x6e/0x91 [ 385.119849 ] print_address_description.constprop.0+0x1f/0x160 [ 385.119849 ] ? mlx5_devlink_fs_mode_get+0x3b/0xa0 [ 385.119849 ] ? mlx5_devlink_fs_mode_get+0x3b/0xa0 [ 385.119849 ] kasan_report.cold+0x83/0xdf [ 385.119849 ] ? devlink_param_notify+0x20/0x190 [ 385.119849 ] ? mlx5_devlink_fs_mode_get+0x3b/0xa0 [ 385.119849 ] mlx5_devlink_fs_mode_get+0x3b/0xa0 [ 385.119849 ] devlink_nl_param_fill+0x18a/0xa50 [ 385.119849 ] ? _raw_spin_lock_irqsave+0x8d/0xe0 [ 385.119849 ] ? devlink_flash_update_timeout_notify+0xf0/0xf0 [ 385.119849 ] ? __wake_up_common+0x4b/0x1e0 [ 385.119849 ] ? preempt_count_sub+0x14/0xc0 [ 385.119849 ] ? _raw_spin_unlock_irqrestore+0x28/0x40 [ 385.119849 ] ? __wake_up_common_lock+0xe3/0x140 [ 385.119849 ] ? __wake_up_common+0x1e0/0x1e0 [ 385.119849 ] ? __sanitizer_cov_trace_const_cmp8+0x27/0x80 [ 385.119849 ] ? __rcu_read_unlock+0x48/0x70 [ 385.119849 ] ? kasan_unpoison+0x23/0x50 [ 385.119849 ] ? __kasan_slab_alloc+0x2c/0x80 [ 385.119849 ] ? memset+0x20/0x40 [ 385.119849 ] ? __sanitizer_cov_trace_const_cmp4+0x25/0x80 [ 385.119849 ] devlink_param_notify+0xce/0x190 [ 385.119849 ] devlink_unregister+0x92/0x2b0 [ 385.119849 ] remove_one+0x41/0x140 [ 385.119849 ] pci_device_remove+0x68/0x140 [ 385.119849 ] ? pcibios_free_irq+0x10/0x10 [ 385.119849 ] __device_release_driver+0x294/0x3f0 [ 385.119849 ] device_driver_detach+0x82/0x130 [ 385.119849 ] unbind_store+0x193/0x1b0 [ 385.119849 ] ? subsys_interface_unregister+0x270/0x270 [ 385.119849 ] drv_attr_store+0x4e/0x70 [ 385.119849 ] ? drv_attr_show+0x60/0x60 [ 385.119849 ] sysfs_kf_write+0xa7/0xc0 [ 385.119849 ] kernfs_fop_write_iter+0x23a/0x2f0 [ 385.119849 ] ? sysfs_kf_bin_read+0x160/0x160 [ 385.119849 ] new_sync_write+0x311/0x430 [ 385.119849 ] ? new_sync_read+0x480/0x480 [ 385.119849 ] ? _raw_spin_lock+0x87/0xe0 [ 385.119849 ] ? __sanitizer_cov_trace_cmp4+0x25/0x80 [ 385.119849 ] ? security_file_permission+0x94/0xa0 [ 385.119849 ] vfs_write+0x4c7/0x590 [ 385.119849 ] ksys_write+0xf6/0x1e0 [ 385.119849 ] ? __x64_sys_read+0x50/0x50 [ 385.119849 ] ? fpregs_assert_state_consistent+0x99/0xa0 [ 385.119849 ] do_syscall_64+0x3d/0x90 [ 385.119849 ] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 385.119849 ] RIP: 0033:0x7fc36ef38504 [ 385.119849 ] Code: 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b3 0f 1f 80 00 00 00 00 48 8d 05 f9 61 0d 00 8b 00 85 c0 75 13 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 54 c3 0f 1f 00 41 54 49 89 d4 55 48 89 f5 53 [ 385.119849 ] RSP: 002b:00007ffde0ff3d08 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 385.119849 ] RAX: ffffffffffffffda RBX: 000000000000000c RCX: 00007fc36ef38504 [ 385.119849 ] RDX: 000000000000000c RSI: 00007fc370521040 RDI: 0000000000000001 [ 385.119849 ] RBP: 00007fc370521040 R08: 00007fc36f00b8c0 R09: 00007fc36ee4b740 [ 385.119849 ] R10: 0000000000000000 R11: 0000000000000246 R12: 00007fc36f00a760 [ 385.119849 ] R13: 000000000000000c R14: 00007fc36f005760 R15: 000000000000000c [ 385.119849 ] </TASK> [ 385.119849 ] [ 385.119849 ] Allocated by task 65: [ 385.119849 ] kasan_save_stack+0x1e/0x40 [ 385.119849 ] __kasan_kmalloc+0x81/0xa0 [ 385.119849 ] mlx5_init_fs+0x11b/0x1160 [ 385.119849 ] mlx5_load+0x13c/0x220 [ 385.119849 ] mlx5_load_one+0xda/0x160 [ 385.119849 ] mlx5_recover_device+0xb8/0x100 [ 385.119849 ] mlx5_health_try_recover+0x2f9/0x3a1 [ 385.119849 ] devlink_health_reporter_recover+0x75/0x100 [ 385.119849 ] devlink_health_report+0x26c/0x4b0 [ 385.275909 ] mlx5_fw_fatal_reporter_err_work+0x11e/0x1b0 [ 385.275909 ] process_one_work+0x520/0x970 [ 385.275909 ] worker_thread+0x378/0x950 [ 385.275909 ] kthread+0x1bb/0x200 [ 385.275909 ] ret_from_fork+0x1f/0x30 [ 385.275909 ] [ 385.275909 ] Freed by task 65: [ 385.275909 ] kasan_save_stack+0x1e/0x40 [ 385.275909 ] kasan_set_track+0x21/0x30 [ 385.275909 ] kasan_set_free_info+0x20/0x30 [ 385.275909 ] __kasan_slab_free+0xfc/0x140 [ 385.275909 ] kfree+0xa5/0x3b0 [ 385.275909 ] mlx5_unload+0x2e/0xb0 [ 385.275909 ] mlx5_unload_one+0x86/0xb0 [ 385.275909 ] mlx5_fw_fatal_reporter_err_work.cold+0xca/0xcf [ 385.275909 ] process_one_work+0x520/0x970 [ 385.275909 ] worker_thread+0x378/0x950 [ 385.275909 ] kthread+0x1bb/0x200 [ 385.275909 ] ret_from_fork+0x1f/0x30 [ 385.275909 ] [ 385.275909 ] The buggy address belongs to the object at ffff888104b79300 [ 385.275909 ] which belongs to the cache kmalloc-128 of size 128 [ 385.275909 ] The buggy address is located 8 bytes inside of [ 385.275909 ] 128-byte region [ffff888104b79300, ffff888104b79380) [ 385.275909 ] The buggy address belongs to the page: [ 385.275909 ] page:00000000de44dd39 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x104b78 [ 385.275909 ] head:00000000de44dd39 order:1 compound_mapcount:0 [ 385.275909 ] flags: 0x8000000000010200(slab|head|zone=2) [ 385.275909 ] raw: 8000000000010200 0000000000000000 dead000000000122 ffff8881000428c0 [ 385.275909 ] raw: 0000000000000000 0000000080200020 00000001ffffffff 0000000000000000 [ 385.275909 ] page dumped because: kasan: bad access detected [ 385.275909 ] [ 385.275909 ] Memory state around the buggy address: [ 385.275909 ] ffff888104b79200: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 fc fc [ 385.275909 ] ffff888104b79280: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 385.275909 ] >ffff888104b79300: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 385.275909 ] ^ [ 385.275909 ] ffff888104b79380: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 385.275909 ] ffff888104b79400: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 385.275909 ]]
--- .../net/ethernet/mellanox/mlx5/core/fs_core.c | 131 ++++++++++-------- .../net/ethernet/mellanox/mlx5/core/fs_core.h | 6 +- .../net/ethernet/mellanox/mlx5/core/main.c | 15 +- 3 files changed, 91 insertions(+), 61 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +75 -56
@@ -2656,28 +2656,6 @@ static void cleanup_root_ns(struct mlx5_flow_root_namespace *root_ns)clean_tree (&root_ns->ns.node); } -void mlx5_cleanup_fs (struct mlx5_core_dev *dev) -{ -struct mlx5_flow_steering *steering = dev->priv.steering; - -cleanup_root_ns (steering->root_ns); -cleanup_root_ns (steering->fdb_root_ns); - steering->fdb_root_ns =NULL ; -kfree (steering->fdb_sub_ns); - steering->fdb_sub_ns =NULL ; -cleanup_root_ns (steering->port_sel_root_ns); -cleanup_root_ns (steering->sniffer_rx_root_ns); -cleanup_root_ns (steering->sniffer_tx_root_ns); -cleanup_root_ns (steering->rdma_rx_root_ns); -cleanup_root_ns (steering->rdma_tx_root_ns); -cleanup_root_ns (steering->egress_root_ns); -mlx5_cleanup_fc_stats (dev); -kmem_cache_destroy (steering->ftes_cache); -kmem_cache_destroy (steering->fgs_cache); -mlx5_ft_pool_destroy (dev); -kfree (steering); -} -static int init_sniffer_tx_root_ns (struct mlx5_flow_steering *steering) {struct fs_prio *prio;
@@ -3063,42 +3041,27 @@ static int init_egress_root_ns(struct mlx5_flow_steering *steering)return err; } -int mlx5_init_fs (struct mlx5_core_dev *dev) +void mlx5_fs_core_cleanup (struct mlx5_core_dev *dev) { -struct mlx5_flow_steering *steering; -int err =0 ; - - err =mlx5_init_fc_stats (dev); -if (err) -return err; - - err =mlx5_ft_pool_init (dev); -if (err) -return err; - - steering =kzalloc (sizeof (*steering),GFP_KERNEL ); -if (!steering) { - err = -ENOMEM ; - goto err; - } - - steering->dev = dev; - dev->priv.steering = steering; +struct mlx5_flow_steering *steering = dev->priv.steering; -if (mlx5_fs_dr_is_supported (dev)) - steering->mode =MLX5_FLOW_STEERING_MODE_SMFS ; -else - steering->mode =MLX5_FLOW_STEERING_MODE_DMFS ; +cleanup_root_ns (steering->root_ns); +cleanup_root_ns (steering->fdb_root_ns); + steering->fdb_root_ns =NULL ; +kfree (steering->fdb_sub_ns); + steering->fdb_sub_ns =NULL ; +cleanup_root_ns (steering->port_sel_root_ns); +cleanup_root_ns (steering->sniffer_rx_root_ns); +cleanup_root_ns (steering->sniffer_tx_root_ns); +cleanup_root_ns (steering->rdma_rx_root_ns); +cleanup_root_ns (steering->rdma_tx_root_ns); +cleanup_root_ns (steering->egress_root_ns); +} - steering->fgs_cache =kmem_cache_create ("mlx5_fs_fgs" , -sizeof (struct mlx5_flow_group ),0 , -0 ,NULL ); - steering->ftes_cache =kmem_cache_create ("mlx5_fs_ftes" ,sizeof (struct fs_fte ),0 , -0 ,NULL ); -if (!steering->ftes_cache || !steering->fgs_cache) { - err = -ENOMEM ; - goto err; - } +int mlx5_fs_core_init (struct mlx5_core_dev *dev) +{ +struct mlx5_flow_steering *steering = dev->priv.steering; +int err =0 ; if ((((MLX5_CAP_GEN(dev, port_type) == MLX5_CAP_PORT_TYPE_ETH) && (MLX5_CAP_GEN(dev, nic_flow_table))) ||
@@ -3157,8 +3120,64 @@ int mlx5_init_fs(struct mlx5_core_dev *dev) }return 0 ; + +err: +mlx5_fs_core_cleanup (dev); +return err; +} + +void mlx5_fs_core_free (struct mlx5_core_dev *dev) +{ +struct mlx5_flow_steering *steering = dev->priv.steering; + +kmem_cache_destroy (steering->ftes_cache); +kmem_cache_destroy (steering->fgs_cache); +kfree (steering); +mlx5_ft_pool_destroy (dev); +mlx5_cleanup_fc_stats (dev); +} + +int mlx5_fs_core_alloc (struct mlx5_core_dev *dev) +{ +struct mlx5_flow_steering *steering; +int err =0 ; + + err =mlx5_init_fc_stats (dev); +if (err) +return err; + + err =mlx5_ft_pool_init (dev); +if (err) + goto err; + + steering =kzalloc (sizeof (*steering),GFP_KERNEL ); +if (!steering) { + err = -ENOMEM ; + goto err; + } + + steering->dev = dev; + dev->priv.steering = steering; + +if (mlx5_fs_dr_is_supported (dev)) + steering->mode =MLX5_FLOW_STEERING_MODE_SMFS ; +else + steering->mode =MLX5_FLOW_STEERING_MODE_DMFS ; + + steering->fgs_cache =kmem_cache_create ("mlx5_fs_fgs" , +sizeof (struct mlx5_flow_group ),0 , +0 ,NULL ); + steering->ftes_cache =kmem_cache_create ("mlx5_fs_ftes" ,sizeof (struct fs_fte ),0 , +0 ,NULL ); +if (!steering->ftes_cache || !steering->fgs_cache) { + err = -ENOMEM ; + goto err; + } + +return 0 ; + err: -mlx5_cleanup_fs (dev); +mlx5_fs_core_free (dev);return err; }
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h +4 -2
@@ -293,8 +293,10 @@ int mlx5_flow_namespace_set_peer(struct mlx5_flow_root_namespace *ns,int mlx5_flow_namespace_set_mode (struct mlx5_flow_namespace *ns,enum mlx5_flow_steering_mode mode); -int mlx5_init_fs (struct mlx5_core_dev *dev); -void mlx5_cleanup_fs (struct mlx5_core_dev *dev); +int mlx5_fs_core_alloc (struct mlx5_core_dev *dev); +void mlx5_fs_core_free (struct mlx5_core_dev *dev); +int mlx5_fs_core_init (struct mlx5_core_dev *dev); +void mlx5_fs_core_cleanup (struct mlx5_core_dev *dev);int mlx5_fs_egress_acls_init (struct mlx5_core_dev *dev,int total_vports);void mlx5_fs_egress_acls_cleanup (struct mlx5_core_dev *dev);
drivers/net/ethernet/mellanox/mlx5/core/main.c +12 -3
@@ -939,6 +939,12 @@ static int mlx5_init_once(struct mlx5_core_dev *dev) goto err_sf_table_cleanup; } + err =mlx5_fs_core_alloc (dev); +if (err) { +mlx5_core_err (dev,"Failed to alloc flow steering\n" ); + goto err_fs; + } + dev->dm =mlx5_dm_create (dev);if (IS_ERR (dev->dm))mlx5_core_warn (dev,"Failed to init device memory%d\n" , err);
@@ -949,6 +955,8 @@ static int mlx5_init_once(struct mlx5_core_dev *dev)return 0 ; +err_fs: +mlx5_sf_table_cleanup (dev); err_sf_table_cleanup:mlx5_sf_hw_table_cleanup (dev); err_sf_hw_table_cleanup:
@@ -986,6 +994,7 @@ static void mlx5_cleanup_once(struct mlx5_core_dev *dev)mlx5_hv_vhca_destroy (dev->hv_vhca);mlx5_fw_tracer_destroy (dev->tracer);mlx5_dm_cleanup (dev); +mlx5_fs_core_free (dev);mlx5_sf_table_cleanup (dev);mlx5_sf_hw_table_cleanup (dev);mlx5_vhca_event_cleanup (dev);
@@ -1192,7 +1201,7 @@ static int mlx5_load(struct mlx5_core_dev *dev) goto err_tls_start; } - err =mlx5_init_fs (dev); + err =mlx5_fs_core_init (dev);if (err) {mlx5_core_err (dev,"Failed to init flow steering\n" ); goto err_fs;
@@ -1237,7 +1246,7 @@ static int mlx5_load(struct mlx5_core_dev *dev) err_vhca:mlx5_vhca_event_stop (dev); err_set_hca: -mlx5_cleanup_fs (dev); +mlx5_fs_core_cleanup (dev); err_fs:mlx5_accel_tls_cleanup (dev); err_tls_start:
@@ -1266,7 +1275,7 @@ static void mlx5_unload(struct mlx5_core_dev *dev)mlx5_ec_cleanup (dev);mlx5_sf_hw_table_destroy (dev);mlx5_vhca_event_stop (dev); -mlx5_cleanup_fs (dev); +mlx5_fs_core_cleanup (dev);mlx5_accel_ipsec_cleanup (dev);mlx5_accel_tls_cleanup (dev);mlx5_fpga_device_stop (dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 104/158 net/mlx5: DR, Ignore modify TTL on RX if device doesnt support it
In reply to Greg Kroah-HartmanFrom: Yevgeny Kliteynik <[email protected]>
[ Upstream commit 785d7ed295513bd3374095304b7034fd65c123b0 ]
When modifying TTL, packet's csum has to be recalculated. Due to HW issue in ConnectX-5, csum recalculation for modify TTL on RX is supported through a work-around that is specifically enabled by configuration.
If the work-around isn't enabled, rather than adding an unsupported action the modify TTL action on RX should be ignored. Ignoring modify TTL action might result in zero actions, so in such cases we will not convert the match STE to modify STE, as it is done by FW in DMFS.
This patch fixes an issue where modify TTL action was ignored both on RX and TX instead of only on RX.
--- .../mellanox/mlx5/core/steering/dr_action.c | 65 +++++++++++++------ .../mellanox/mlx5/core/steering/dr_ste_v0.c | 4 +- 2 files changed, 48 insertions(+), 21 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c +46 -19
@@ -530,6 +530,37 @@ static int dr_action_handle_cs_recalc(struct mlx5dr_domain *dmn,return 0 ; } +static void dr_action_modify_ttl_adjust (struct mlx5dr_domain *dmn, +struct mlx5dr_ste_actions_attr *attr, +bool rx_rule, +bool *recalc_cs_required) +{ + *recalc_cs_required = false; + +/* if device supports csum recalculation - no adjustment needed */ +if (mlx5dr_ste_supp_ttl_cs_recalc (&dmn->info.caps)) +return ; + +/* no adjustment needed on TX rules */ +if (!rx_rule) +return ; + +if (!MLX5_CAP_ESW_FLOWTABLE (dmn->mdev, fdb_ipv4_ttl_modify)) { +/* Ignore the modify TTL action. +* It is always kept as last HW action. +*/ + attr->modify_actions--; +return ; + } + +if (dmn->type ==MLX5DR_DOMAIN_TYPE_FDB ) +/* Due to a HW bug on some devices, modifying TTL on RX flows +* will cause an incorrect checksum calculation. In such cases +* we will use a FW table to recalculate the checksum. +*/ + *recalc_cs_required = true; +} +static void dr_action_print_sequence (struct mlx5dr_domain *dmn,struct mlx5dr_action *actions[],int last_idx)
@@ -649,8 +680,9 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher,case DR_ACTION_TYP_MODIFY_HDR : attr.modify_index = action->rewrite->index; attr.modify_actions = action->rewrite->num_of_actions; - recalc_cs_required = action->rewrite->modify_ttl && - !mlx5dr_ste_supp_ttl_cs_recalc (&dmn->info.caps); +if (action->rewrite->modify_ttl) +dr_action_modify_ttl_adjust (dmn, &attr, rx_rule, + &recalc_cs_required);break ;case DR_ACTION_TYP_L2_TO_TNL_L2 :case DR_ACTION_TYP_L2_TO_TNL_L3 :
@@ -737,12 +769,7 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, *new_hw_ste_arr_sz = nic_matcher->num_of_builders; last_ste = ste_arr +DR_STE_SIZE * (nic_matcher->num_of_builders -1 ); -/* Due to a HW bug in some devices, modifying TTL on RX flows will -* cause an incorrect checksum calculation. In this case we will -* use a FW table to recalculate. -*/ -if (dmn->type ==MLX5DR_DOMAIN_TYPE_FDB && - rx_rule && recalc_cs_required && dest_action) { +if (recalc_cs_required && dest_action) { ret =dr_action_handle_cs_recalc (dmn, dest_action, &attr.final_icm_addr);if (ret) { mlx5dr_err(dmn,
@@ -1562,12 +1589,6 @@ dr_action_modify_check_is_ttl_modify(const void *sw_action)return sw_field ==MLX5_ACTION_IN_FIELD_OUT_IP_TTL ; } -static bool dr_action_modify_ttl_ignore (struct mlx5dr_domain *dmn) -{ -return !mlx5dr_ste_supp_ttl_cs_recalc (&dmn->info.caps) && - !MLX5_CAP_ESW_FLOWTABLE (dmn->mdev, fdb_ipv4_ttl_modify); -} - static int dr_actions_convert_modify_header(struct mlx5dr_action *action, u32 max_hw_actions, u32 num_sw_actions,
@@ -1579,6 +1600,7 @@ static int dr_actions_convert_modify_header(struct mlx5dr_action *action,const struct mlx5dr_ste_action_modify_field *hw_dst_action_info;const struct mlx5dr_ste_action_modify_field *hw_src_action_info;struct mlx5dr_domain *dmn = action->rewrite->dmn; +__be64 *modify_ttl_sw_action =NULL ;int ret, i, hw_idx =0 ;__be64 *sw_action;__be64 hw_action;
@@ -1591,8 +1613,14 @@ static int dr_actions_convert_modify_header(struct mlx5dr_action *action, action->rewrite->allow_rx =1 ; action->rewrite->allow_tx =1 ; -for (i =0 ; i < num_sw_actions; i++) { - sw_action = &sw_actions[i]; +for (i =0 ; i < num_sw_actions || modify_ttl_sw_action; i++) { +/* modify TTL is handled separately, as a last action */ +if (i == num_sw_actions) { + sw_action = modify_ttl_sw_action; + modify_ttl_sw_action =NULL ; + }else { + sw_action = &sw_actions[i]; + } ret =dr_action_modify_check_field_limitation (action, sw_action);
@@ -1601,10 +1629,9 @@ static int dr_actions_convert_modify_header(struct mlx5dr_action *action,if (!(*modify_ttl) &&dr_action_modify_check_is_ttl_modify (sw_action)) { -if (dr_action_modify_ttl_ignore (dmn)) -continue ; - + modify_ttl_sw_action = sw_action; *modify_ttl = true; +continue ; }/* Convert SW action to HW action */
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c +2 -2
@@ -419,7 +419,7 @@ dr_ste_v0_set_actions_tx(struct mlx5dr_domain *dmn,* encapsulation. The reason for that is that we support * modify headers for outer headers only */ -if (action_type_set[DR_ACTION_TYP_MODIFY_HDR ]) { +if (action_type_set[DR_ACTION_TYP_MODIFY_HDR ] && attr->modify_actions) {dr_ste_v0_set_entry_type (last_ste,DR_STE_TYPE_MODIFY_PKT ); dr_ste_v0_set_rewrite_actions(last_ste, attr->modify_actions,
@@ -511,7 +511,7 @@ dr_ste_v0_set_actions_rx(struct mlx5dr_domain *dmn, } } -if (action_type_set[DR_ACTION_TYP_MODIFY_HDR ]) { +if (action_type_set[DR_ACTION_TYP_MODIFY_HDR ] && attr->modify_actions) {if (dr_ste_v0_get_entry_type (last_ste) ==DR_STE_TYPE_MODIFY_PKT ) dr_ste_v0_arr_init_next(&last_ste, added_stes,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 105/158 net/mlx5e: Block rx-gro-hw feature in switchdev mode
In reply to Greg Kroah-HartmanFrom: Aya Levin <[email protected]>
[ Upstream commit 15a5078cab30d7aa02ad14bfadebf247d95fc239 ]
When the driver is in switchdev mode and rx-gro-hw is set, the RQ needs special CQE handling. Till then, block setting of rx-gro-hw feature in switchdev mode, to avoid failure while setting the feature due to failure while opening the RQ.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +4 -0
@@ -3829,6 +3829,10 @@ static netdev_features_t mlx5e_fix_uplink_rep_features(struct net_device *netdevif (netdev->features &NETIF_F_NTUPLE )netdev_warn (netdev,"Disabling ntuple, not supported in switchdev mode\n" ); + features &= ~NETIF_F_GRO_HW ; +if (netdev->features &NETIF_F_GRO_HW ) +netdev_warn (netdev,"Disabling HW_GRO, not supported in switchdev mode\n" ); +return features; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 106/158 net/mlx5e: Properly block LRO when XDP is enabled
In reply to Greg Kroah-HartmanFrom: Maxim Mikityanskiy <[email protected]>
[ Upstream commit cf6e34c8c22fba66bd21244b95ea47e235f68974 ]
LRO is incompatible and mutually exclusive with XDP. However, the needed checks are only made when enabling XDP. If LRO is enabled when XDP is already active, the command will succeed, and XDP will be skipped in the data path, although still enabled.
This commit fixes the bug by checking the XDP status in mlx5e_fix_features and disabling LRO if XDP is enabled.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +7 -0
@@ -3865,6 +3865,13 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev, } } +if (params->xdp_prog) { +if (features &NETIF_F_LRO ) { +netdev_warn (netdev,"LRO is incompatible with XDP\n" ); + features &= ~NETIF_F_LRO ; + } + } +if (MLX5E_GET_PFLAG (params,MLX5E_PFLAG_RX_CQE_COMPRESS )) { features &= ~NETIF_F_RXHASH ;if (netdev->features &NETIF_F_RXHASH )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 107/158 net/mlx5e: Properly block HW GRO when XDP is enabled
In reply to Greg Kroah-HartmanFrom: Maxim Mikityanskiy <[email protected]>
[ Upstream commit b0617e7b35001c92c8fa777e1a095d3e693813df ]
HW GRO is incompatible and mutually exclusive with XDP and XSK. However, the needed checks are only made when enabling XDP. If HW GRO is enabled when XDP is already active, the command will succeed, and XDP will be skipped in the data path, although still enabled.
This commit fixes the bug by checking the XDP and XSK status in mlx5e_fix_features and disabling HW GRO if XDP is enabled.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +12 -0
@@ -3870,6 +3870,18 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev,netdev_warn (netdev,"LRO is incompatible with XDP\n" ); features &= ~NETIF_F_LRO ; } +if (features &NETIF_F_GRO_HW ) { +netdev_warn (netdev,"HW GRO is incompatible with XDP\n" ); + features &= ~NETIF_F_GRO_HW ; + } + } + +if (priv->xsk.refcnt) { +if (features &NETIF_F_GRO_HW ) { +netdev_warn (netdev,"HW GRO is incompatible with AF_XDP (%u XSKs are active)\n" , + priv->xsk.refcnt); + features &= ~NETIF_F_GRO_HW ; + } }if (MLX5E_GET_PFLAG (params,MLX5E_PFLAG_RX_CQE_COMPRESS )) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 108/158 net/mlx5e: Remove HW-GRO from reported features
In reply to Greg Kroah-HartmanFrom: Gal Pressman <[email protected]>
[ Upstream commit 6bbd723035badafe4a8eb17ccdecd96eae7a96d5 ]
We got reports of certain HW-GRO flows causing kernel call traces, which might be related to firmware. To be on the safe side, disable the feature for now and re-enable it once a driver/firmware fix is found.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +0 -4
@@ -4828,10 +4828,6 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) netdev->hw_features |=NETIF_F_HW_VLAN_CTAG_FILTER ; netdev->hw_features |=NETIF_F_HW_VLAN_STAG_TX ; -if (!!MLX5_CAP_GEN (mdev, shampo) && -mlx5e_check_fragmented_striding_rq_cap (mdev)) - netdev->hw_features |=NETIF_F_GRO_HW ; -if (mlx5e_tunnel_any_tx_proto_supported (mdev)) { netdev->hw_enc_features |=NETIF_F_HW_CSUM ; netdev->hw_enc_features |=NETIF_F_TSO ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 109/158 net/mlx5: Drain fw_reset when removing device
In reply to Greg Kroah-HartmanFrom: Shay Drory <[email protected]>
[ Upstream commit 16d42d313350946f4b9a8b74a13c99f0461a6572 ]
In case fw sync reset is called in parallel to device removal, device might stuck in the following deadlock:
CPU 0 CPU 1
----- -----
remove_one
uninit_one (locks intf_state_mutex)mlx5_sync_reset_now_event()
work in fw_reset->wq.
mlx5_enter_error_state()
mutex_lock (intf_state_mutex)
cleanup_once
fw_reset_cleanup()
destroy_workqueue(fw_reset->wq)Drain the fw_reset WQ, and make sure no new work is being queued, before entering uninit_one().
The Drain is done before devlink_unregister() since fw_reset, in some flows, is using devlink API devlink_remote_reload_actions_performed().
--- .../ethernet/mellanox/mlx5/core/fw_reset.c | 25 ++++++++++++++++--- .../ethernet/mellanox/mlx5/core/fw_reset.h | 1 + .../net/ethernet/mellanox/mlx5/core/main.c | 4 +++ 3 files changed, 27 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +22 -3
@@ -8,7 +8,8 @@enum {MLX5_FW_RESET_FLAGS_RESET_REQUESTED ,MLX5_FW_RESET_FLAGS_NACK_RESET_REQUEST , -MLX5_FW_RESET_FLAGS_PENDING_COMP +MLX5_FW_RESET_FLAGS_PENDING_COMP , +MLX5_FW_RESET_FLAGS_DROP_NEW_REQUESTS };struct mlx5_fw_reset {
@@ -165,7 +166,10 @@ static void poll_sync_reset(struct timer_list *t)if (fatal_error) {mlx5_core_warn (dev,"Got Device Reset\n" ); -queue_work (fw_reset->wq, &fw_reset->reset_reload_work); +if (!test_bit (MLX5_FW_RESET_FLAGS_DROP_NEW_REQUESTS , &fw_reset->reset_flags)) +queue_work (fw_reset->wq, &fw_reset->reset_reload_work); +else +mlx5_core_err (dev,"Device is being removed, Drop new reset work\n" );return ; }
@@ -390,9 +394,12 @@ static int fw_reset_event_notifier(struct notifier_block *nb, unsigned long acti struct mlx5_fw_reset *fw_reset = mlx5_nb_cof(nb, struct mlx5_fw_reset, nb);struct mlx5_eqe *eqe = data; +if (test_bit (MLX5_FW_RESET_FLAGS_DROP_NEW_REQUESTS , &fw_reset->reset_flags)) +return NOTIFY_DONE ; +switch (eqe->sub_type) {case MLX5_GENERAL_SUBTYPE_FW_LIVE_PATCH_EVENT : -queue_work (fw_reset->wq, &fw_reset->fw_live_patch_work); +queue_work (fw_reset->wq, &fw_reset->fw_live_patch_work);break ;case MLX5_GENERAL_SUBTYPE_PCI_SYNC_FOR_FW_UPDATE_EVENT :mlx5_sync_reset_events_handle (fw_reset, eqe);
@@ -436,6 +443,18 @@ void mlx5_fw_reset_events_stop(struct mlx5_core_dev *dev)mlx5_eq_notifier_unregister (dev, &dev->priv.fw_reset->nb); } +void mlx5_drain_fw_reset (struct mlx5_core_dev *dev) +{ +struct mlx5_fw_reset *fw_reset = dev->priv.fw_reset; + +set_bit (MLX5_FW_RESET_FLAGS_DROP_NEW_REQUESTS , &fw_reset->reset_flags); +cancel_work_sync (&fw_reset->fw_live_patch_work); +cancel_work_sync (&fw_reset->reset_request_work); +cancel_work_sync (&fw_reset->reset_reload_work); +cancel_work_sync (&fw_reset->reset_now_work); +cancel_work_sync (&fw_reset->reset_abort_work); +} +int mlx5_fw_reset_init (struct mlx5_core_dev *dev) {struct mlx5_fw_reset *fw_reset =kzalloc (sizeof (*fw_reset),GFP_KERNEL );
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h +1 -0
@@ -15,6 +15,7 @@ int mlx5_fw_reset_set_live_patch(struct mlx5_core_dev *dev);int mlx5_fw_reset_wait_reset_done (struct mlx5_core_dev *dev);void mlx5_fw_reset_events_start (struct mlx5_core_dev *dev);void mlx5_fw_reset_events_stop (struct mlx5_core_dev *dev); +void mlx5_drain_fw_reset (struct mlx5_core_dev *dev);int mlx5_fw_reset_init (struct mlx5_core_dev *dev);void mlx5_fw_reset_cleanup (struct mlx5_core_dev *dev);
drivers/net/ethernet/mellanox/mlx5/core/main.c +4 -0
@@ -1628,6 +1628,10 @@ static void remove_one(struct pci_dev *pdev)struct mlx5_core_dev *dev =pci_get_drvdata (pdev);struct devlink *devlink =priv_to_devlink (dev); +/* mlx5_drain_fw_reset() is using devlink APIs. Hence, we must drain +* fw_reset before unregistering the devlink. +*/ +mlx5_drain_fw_reset (dev);devlink_unregister (devlink);mlx5_crdump_disable (dev);mlx5_drain_health_wq (dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 110/158 net: af_key: add check for pfkey_broadcast in function pfkey_process
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 4dc2a5a8f6754492180741facf2a8787f2c415d7 ]
If skb_clone() returns null pointer, pfkey_broadcast() will return error.
Therefore, it should be better to check the return value of pfkey_broadcast() and return error if fails.
--- net/key/af_key.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/key/af_key.c +4 -2
@@ -2826,8 +2826,10 @@ static int pfkey_process(struct sock *sk, struct sk_buff *skb, const struct sadbvoid *ext_hdrs[SADB_EXT_MAX ];int err; -pfkey_broadcast (skb_clone (skb,GFP_KERNEL ),GFP_KERNEL , -BROADCAST_PROMISC_ONLY ,NULL ,sock_net (sk)); + err =pfkey_broadcast (skb_clone (skb,GFP_KERNEL ),GFP_KERNEL , +BROADCAST_PROMISC_ONLY ,NULL ,sock_net (sk)); +if (err) +return err;memset (ext_hdrs,0 ,sizeof (ext_hdrs)); err =parse_exthdrs (skb, hdr, ext_hdrs);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 111/158 ARM: 9196/1: spectre-bhb: enable for Cortex-A15
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 0dc14aa94ccd8ba35eb17a0f9b123d1566efd39e ]
The Spectre-BHB mitigations were inadvertently left disabled for Cortex-A15, due to the fact that cpu_v7_bugs_init() is not called in that case. So fix that.
--- arch/arm/mm/proc-v7-bugs.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mm/proc-v7-bugs.c +1 -0
@@ -288,6 +288,7 @@ void cpu_v7_ca15_ibe(void) {if (check_spectre_auxcr (this_cpu_ptr (&spectre_warned),BIT (0 )))cpu_v7_spectre_v2_init (); +cpu_v7_spectre_bhb_init (); }void cpu_v7_bugs_init (void )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 112/158 ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 3cfb3019979666bdf33a1010147363cf05e0f17b ]
In Thumb2, 'b . + 4' produces a branch instruction that uses a narrow encoding, and so it does not jump to the following instruction as expected. So use W(b) instead.
--- arch/arm/kernel/entry-armv.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/kernel/entry-armv.S +1 -1
@@ -1040,7 +1040,7 @@ vector_bhb_loop8_\name: @ bhb workaround mov r0, #8 -3: b . + 4 +3: W(b) . + 4 subs r0, r0, #1 bne 3b dsb
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 113/158 mptcp: fix checksum byte order
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit ba2c89e0ea74a904d5231643245753d77422e7f5 ]
The MPTCP code typecasts the checksum value to u16 and then converts it to big endian while storing the value into the MPTCP option.
As a result, the wire encoding for little endian host is wrong, and that causes interoperabilty interoperability issues with other implementation or host with different endianness.
Address the issue writing in the packet the unmodified __sum16 value.
MPTCP checksum is disabled by default, interoperating with systems with bad mptcp-level csum encoding should cause fallback to TCP.
--- net/mptcp/options.c | 36 ++++++++++++++++++++++++------------ net/mptcp/protocol.h | 2 +- net/mptcp/subflow.c | 2 +- 3 files changed, 26 insertions(+), 14 deletions(-)
net/mptcp/options.c +24 -12
@@ -107,7 +107,7 @@ static void mptcp_parse_option(const struct sk_buff *skb, ptr +=2 ; }if (opsize ==TCPOLEN_MPTCP_MPC_ACK_DATA_CSUM ) { - mp_opt->csum = (__force __sum16 )get_unaligned_be16 (ptr); + mp_opt->csum =get_unaligned ((__force __sum16 *)ptr); mp_opt->suboptions |=OPTION_MPTCP_CSUMREQD ; ptr +=2 ; }
@@ -221,7 +221,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,if (opsize == expected_opsize +TCPOLEN_MPTCP_DSS_CHECKSUM ) { mp_opt->suboptions |=OPTION_MPTCP_CSUMREQD ; - mp_opt->csum = (__force __sum16 )get_unaligned_be16 (ptr); + mp_opt->csum =get_unaligned ((__force __sum16 *)ptr); ptr +=2 ; }
@@ -1236,7 +1236,7 @@ static void mptcp_set_rwin(const struct tcp_sock *tp)WRITE_ONCE (msk->rcv_wnd_sent, ack_seq); } -u16 __mptcp_make_csum (u64 data_seq,u32 subflow_seq,u16 data_len,__wsum sum) +__sum16 __mptcp_make_csum (u64 data_seq,u32 subflow_seq,u16 data_len,__wsum sum) {struct csum_pseudo_header header;__wsum csum;
@@ -1252,15 +1252,25 @@ u16 __mptcp_make_csum(u64 data_seq, u32 subflow_seq, u16 data_len, __wsum sum) header.csum =0 ; csum =csum_partial (&header,sizeof (header), sum); -return (__force u16 )csum_fold (csum); +return csum_fold (csum); } -static u16 mptcp_make_csum (const struct mptcp_ext *mpext) +static __sum16 mptcp_make_csum (const struct mptcp_ext *mpext) {return __mptcp_make_csum (mpext->data_seq, mpext->subflow_seq, mpext->data_len, ~csum_unfold (mpext->csum)); } +static void put_len_csum (u16 len,__sum16 csum,void *data) +{ +__sum16 *sumptr = data +2 ; +__be16 *ptr = data; + +put_unaligned_be16 (len, ptr); + +put_unaligned (csum, sumptr); +} +void mptcp_write_options (__be32 *ptr,const struct tcp_sock *tp,struct mptcp_out_options *opts) {
@@ -1328,8 +1338,9 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,put_unaligned_be32 (mpext->subflow_seq, ptr); ptr +=1 ;if (opts->csum_reqd) { -put_unaligned_be32 (mpext->data_len <<16 | -mptcp_make_csum (mpext), ptr); +put_len_csum (mpext->data_len, +mptcp_make_csum (mpext), + ptr); }else {put_unaligned_be32 (mpext->data_len <<16 |TCPOPT_NOP <<8 |TCPOPT_NOP , ptr);
@@ -1376,11 +1387,12 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, goto mp_capable_done;if (opts->csum_reqd) { -put_unaligned_be32 (opts->data_len <<16 | -__mptcp_make_csum (opts->data_seq, - opts->subflow_seq, - opts->data_len, - ~csum_unfold (opts->csum)), ptr); +put_len_csum (opts->data_len, +__mptcp_make_csum (opts->data_seq, + opts->subflow_seq, + opts->data_len, + ~csum_unfold (opts->csum)), + ptr); }else {put_unaligned_be32 (opts->data_len <<16 |TCPOPT_NOP <<8 |TCPOPT_NOP , ptr);
net/mptcp/protocol.h +1 -1
@@ -725,7 +725,7 @@ void mptcp_token_destroy(struct mptcp_sock *msk);void mptcp_crypto_key_sha (u64 key,u32 *token,u64 *idsn);void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u8 *msg,int len,void *hmac); -u16 __mptcp_make_csum (u64 data_seq,u32 subflow_seq,u16 data_len,__wsum sum); +__sum16 __mptcp_make_csum (u64 data_seq,u32 subflow_seq,u16 data_len,__wsum sum);void __init mptcp_pm_init (void );void mptcp_pm_data_init (struct mptcp_sock *msk);
net/mptcp/subflow.c +1 -1
@@ -846,7 +846,7 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff * {struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk);u32 offset, seq, delta; -u16 csum; +__sum16 csum;int len;if (!csum_reqd)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 114/158 mptcp: strict local address ID selection
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 4cf86ae84c718333928fd2d43168a1e359a28329 ]
The address ID selection for MPJ subflows created in response to incoming ADD_ADDR option is currently unreliable: it happens at MPJ socket creation time, when the local address could be unknown.
Additionally, if the no local endpoint is available for the local address, a new dummy endpoint is created, confusing the user-land.
This change refactor the code to move the address ID selection inside the rebuild_header() helper, when the local address eventually selected by the route lookup is finally known. If the address used is not mapped by any endpoint - and thus can't be advertised/removed pick the id 0 instead of allocate a new endpoint.
--- net/mptcp/pm_netlink.c | 13 -------- net/mptcp/protocol.c | 3 ++ net/mptcp/protocol.h | 3 +- net/mptcp/subflow.c | 67 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 63 insertions(+), 23 deletions(-)
net/mptcp/pm_netlink.c +0 -13
@@ -83,16 +83,6 @@ static bool addresses_equal(const struct mptcp_addr_info *a,return a->port == b->port; } -static bool address_zero (const struct mptcp_addr_info *addr) -{ -struct mptcp_addr_info zero; - -memset (&zero,0 ,sizeof (zero)); - zero.family = addr->family; - -return addresses_equal (addr, &zero, true); -} -static void local_address (const struct sock_common *skc,struct mptcp_addr_info *addr) {
@@ -1011,9 +1001,6 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)if (addresses_equal (&msk_local, &skc_local, false))return 0 ; -if (address_zero (&skc_local)) -return 0 ; - pernet =net_generic (sock_net ((struct sock *)msk), pm_nl_pernet_id);rcu_read_lock ();
net/mptcp/protocol.c +3 -0
@@ -117,6 +117,9 @@ static int __mptcp_socket_create(struct mptcp_sock *msk)list_add (&subflow->node, &msk->conn_list);sock_hold (ssock->sk); subflow->request_mptcp =1 ; + +/* This is the first subflow, always with id 0 */ + subflow->local_id_valid =1 ;mptcp_sock_graft (msk->first, sk->sk_socket);return 0 ;
net/mptcp/protocol.h +2 -1
@@ -442,7 +442,8 @@ struct mptcp_subflow_context { rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1, /* ctx can be free at ulp release time */ - stale : 1; /* unable to snd/rcv data, do not use for xmit */ + stale : 1, /* unable to snd/rcv data, do not use for xmit */ + local_id_valid : 1; /* local_id is correctly initialized */enum mptcp_data_avail data_avail;u32 remote_nonce;u64 thmac;
net/mptcp/subflow.c +58 -9
117 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH 5.17 114/158] mptcp: strict local address ID selection
Quoted 22 lines · Greg Kroah-Hartman
From: Paolo Abeni <[email protected]>
[ Upstream commit
4cf86ae84c718333928fd2d43168a1e359a28329]The address ID selection for MPJ subflows created in response to incoming
ADD_ADDRoption is currently unreliable: it happens at MPJ socket creation time, when the local address could be unknown.Additionally, if the no local endpoint is available for the local address, a new dummy endpoint is created, confusing the user-land.
This change refactor the code to move the address ID selection inside the
rebuild_header()helper, when the local address eventually selected by the route lookup is finally known. If the address used is not mapped by any endpoint - and thus can't be advertised/removed pick the id 0 instead of allocate a new endpoint.Signed-off-by Paolo Abeni <[email protected]>Signed-off-by Mat Martineau <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 7 lines
---
net/mptcp/pm_netlink.c | 13 -------- net/mptcp/protocol.c | 3 ++ net/mptcp/protocol.h | 3 +- net/mptcp/subflow.c | 67 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 63 insertions(+), 23 deletions(-)
Greg, Sasha -
Is it possible to drop this one patch? It makes one of the mptcp selftests fail (mptcp_join.sh, "single address, backup").
Looks like this patch has been included in stable because of this single hunk that helps "mptcp: Do TCP fallback on early DSS checksum failure" apply cleanly:
Quoted 5 lines
net/mptcp/protocol.h +0
-0
net/mptcp/protocol.h struct mptcp_subflow_context { · line 449
Quoted 9 lines
net/mptcp/protocol.h +2
-1@@ -442,7 +442,8 @@ struct mptcp_subflow_context { rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1, /* ctx can be free at ulp release time */ - stale : 1; /* unable to snd/rcv data, do not use for xmit */ + stale : 1, /* unable to snd/rcv data, do not use for xmit */ + local_id_valid : 1; /* local_id is correctly initialized */enum mptcp_data_avail data_avail;u32 remote_nonce;u64 thmac;
"mptcp: Do TCP fallback on early DSS checksum failure" also adds a bit to that bitfield, but there is no functional dependency between the patches.
If you need to drop the "mptcp: Do TCP fallback..." patch too, I can send a backported version tomorrow that accounts for that bitfield change.
Thanks!
--
Mat Martineau
Intel
Greg Kroah-Hartman
maintainerRe: [PATCH 5.17 114/158] mptcp: strict local address ID selection
Quoted 32 lines · Mat Martineau
Quoted 22 lines · Greg Kroah-Hartman
From: Paolo Abeni <[email protected]>
[ Upstream commit
4cf86ae84c718333928fd2d43168a1e359a28329]The address ID selection for MPJ subflows created in response to incoming
ADD_ADDRoption is currently unreliable: it happens at MPJ socket creation time, when the local address could be unknown.Additionally, if the no local endpoint is available for the local address, a new dummy endpoint is created, confusing the user-land.
This change refactor the code to move the address ID selection inside the
rebuild_header()helper, when the local address eventually selected by the route lookup is finally known. If the address used is not mapped by any endpoint - and thus can't be advertised/removed pick the id 0 instead of allocate a new endpoint.Signed-off-by Paolo Abeni <[email protected]>Signed-off-by Mat Martineau <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>Quoted 7 lines
---
net/mptcp/pm_netlink.c | 13 -------- net/mptcp/protocol.c | 3 ++ net/mptcp/protocol.h | 3 +- net/mptcp/subflow.c | 67 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 63 insertions(+), 23 deletions(-)
Quoted 4 lines
Greg, Sasha -
Is it possible to drop this one patch? It makes one of the mptcp selftests fail (
mptcp_join.sh, "single address, backup").
Does that mean the backport is incorrect, or that the selftest is wrong?
Quoted 22 lines
Looks like this patch has been included in stable because of this single hunk that helps "mptcp: Do TCP fallback on early DSS checksum failure" apply cleanly:
Quoted 5 lines
net/mptcp/protocol.h +0
-0net/mptcp/protocol.h struct mptcp_subflow_context { · line 449
Quoted 9 lines
net/mptcp/protocol.h +2
-1@@ -442,7 +442,8 @@ struct mptcp_subflow_context { rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1, /* ctx can be free at ulp release time */ - stale : 1; /* unable to snd/rcv data, do not use for xmit */ + stale : 1, /* unable to snd/rcv data, do not use for xmit */ + local_id_valid : 1; /* local_id is correctly initialized */enum mptcp_data_avail data_avail;u32 remote_nonce;u64 thmac;"mptcp: Do TCP fallback on early DSS checksum failure" also adds a bit to that bitfield, but there is no functional dependency between the patches.
Quoted 2 lines
If you need to drop the "mptcp: Do TCP fallback..." patch too, I can send a backported version tomorrow that accounts for that bitfield change.
Yes, I had to drop that second patch because of this. Both are now dropped from 5.15 and 5.17, can you provide a working backport?
thanks,
greg k-h
Re: [PATCH 5.17 114/158] mptcp: strict local address ID selection
Hi Greg, Mat,
Quoted 33 lines · Greg Kroah-Hartman
Quoted 32 lines · Mat Martineau
Quoted 29 lines · Greg Kroah-Hartman
From: Paolo Abeni <[email protected]>
[ Upstream commit
4cf86ae84c718333928fd2d43168a1e359a28329]The address ID selection for MPJ subflows created in response to incoming
ADD_ADDRoption is currently unreliable: it happens at MPJ socket creation time, when the local address could be unknown.Additionally, if the no local endpoint is available for the local address, a new dummy endpoint is created, confusing the user-land.
This change refactor the code to move the address ID selection inside the
rebuild_header()helper, when the local address eventually selected by the route lookup is finally known. If the address used is not mapped by any endpoint - and thus can't be advertised/removed pick the id 0 instead of allocate a new endpoint.Signed-off-by Paolo Abeni <[email protected]>Signed-off-by Mat Martineau <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>---
net/mptcp/pm_netlink.c | 13 -------- net/mptcp/protocol.c | 3 ++ net/mptcp/protocol.h | 3 +- net/mptcp/subflow.c | 67 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 63 insertions(+), 23 deletions(-)
Quoted 6 lines
Quoted 4 lines
Greg, Sasha -
Is it possible to drop this one patch? It makes one of the mptcp selftests fail (
mptcp_join.sh, "single address, backup").Does that mean the backport is incorrect, or that the selftest is wrong?
The backport is correct but the commit that is backported here was part of a series that was changing the behaviour. This modification is visible in the selftests.
If I'm not mistaken, we would need these two commits to fix the regression in the selftests:
69c6ce7b6eca selftests: mptcp: add implicit endpoint test case
d045b9eb95a9 mptcp: introduce implicit endpoints
But we don't want to change the behaviour in stable and it is better to drop this patch ("mptcp: strict local address ID selection"), it is not needed for stable from what I see.
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Greg Kroah-Hartman
maintainerPATCH 115/158 mptcp: Do TCP fallback on early DSS checksum failure
In reply to Greg Kroah-HartmanFrom: Mat Martineau <[email protected]>
[ Upstream commit ae66fb2ba6c3dcaf8b9612b65aa949a1a4bed150 ]
RFC 8684 section 3.7 describes several opportunities for a MPTCP connection to "fall back" to regular TCP early in the connection process, before it has been confirmed that MPTCP options can be successfully propagated on all SYN, SYN/ACK, and data packets. If a peer acknowledges the first received data packet with a regular TCP header (no MPTCP options), fallback is allowed.
If the recipient of that first data packet finds a MPTCP DSS checksum error, this provides an opportunity to fail gracefully with a TCP fallback rather than resetting the connection (as might happen if a checksum failure were detected later).
This commit modifies the checksum failure code to attempt fallback on the initial subflow of a MPTCP connection, only if it's a failure in the first data mapping. In cases where the peer initiates the connection, requests checksums, is the first to send data, and the peer is sending incorrect checksums (see
https://github.com/multipath-tcp/mptcp_net-next/issues/275), this allows the connection to proceed as TCP rather than reset.
--- net/mptcp/protocol.h | 3 ++- net/mptcp/subflow.c | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-)
net/mptcp/protocol.h +2 -1
@@ -443,7 +443,8 @@ struct mptcp_subflow_context { can_ack : 1, /* only after processing the remote a key */ disposable : 1, /* ctx can be free at ulp release time */ stale : 1, /* unable to snd/rcv data, do not use for xmit */ - local_id_valid : 1; /* local_id is correctly initialized */ + local_id_valid : 1, /* local_id is correctly initialized */ + valid_csum_seen : 1; /* at least one csum validated */enum mptcp_data_avail data_avail;u32 remote_nonce;u64 thmac;
net/mptcp/subflow.c +18 -3
@@ -958,11 +958,14 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff * subflow->map_data_csum);if (unlikely (csum)) {MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_DATACSUMERR ); - subflow->send_mp_fail =1 ; -MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_MPFAILTX ); +if (subflow->mp_join || subflow->valid_csum_seen) { + subflow->send_mp_fail =1 ; +MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_MPFAILTX ); + }return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; } + subflow->valid_csum_seen =1 ;return MAPPING_OK ; }
@@ -1144,6 +1147,18 @@ static void subflow_sched_work_if_closed(struct mptcp_sock *msk, struct sock *ss } } +static bool subflow_can_fallback (struct mptcp_subflow_context *subflow) +{ +struct mptcp_sock *msk =mptcp_sk (subflow->conn); + +if (subflow->mp_join) +return false; +else if (READ_ONCE (msk->csum_enabled)) +return !subflow->valid_csum_seen; +else +return !subflow->fully_established; +} +static bool subflow_check_data_avail (struct sock *ssk) {struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk);
@@ -1221,7 +1236,7 @@ static bool subflow_check_data_avail(struct sock *ssk)return true; } -if (subflow->mp_join || subflow->fully_established) { +if (!subflow_can_fallback (subflow)) {/* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriers */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 116/158 igb: skip phy status check where unavailable
In reply to Greg Kroah-HartmanFrom: Kevin Mitchell <[email protected]>
[ Upstream commit 942d2ad5d2e0df758a645ddfadffde2795322728 ]
igb_read_phy_reg() will silently return, leaving phy_data untouched, if hw->ops.read_reg isn't set. Depending on the uninitialized value of phy_data, this led to the phy status check either succeeding immediately or looping continuously for 2 seconds before emitting a noisy err-level timeout. This message went out to the console even though there was no actual problem.
Instead, first check if there is read_reg function pointer. If not, proceed without trying to check the phy status register.
--- drivers/net/ethernet/intel/igb/igb_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igb/igb_main.c +2 -1
@@ -5512,7 +5512,8 @@ static void igb_watchdog_task(struct work_struct *work)break ; } -if (adapter->link_speed !=SPEED_1000 ) +if (adapter->link_speed !=SPEED_1000 || + !hw->phy.ops.read_reg) goto no_wait;/* wait for Remote receiver status OK */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 117/158 netfilter: flowtable: fix TCP flow teardown
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit e5eaac2beb54f0a16ff851125082d9faeb475572 ]
This patch addresses three possible problems:
1. ct gc may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
2. ct gc removes the ct because the IPS_OFFLOAD_BIT is not set and the CLOSE timeout is reached before the flow offload del.
3. tcp ct is always set to ESTABLISHED with a very long timeout in flow offload teardown/delete even though the state might be already CLOSED. Also as a remark we cannot assume that the FIN or RST packet is hitting flow table teardown as the packet might get bumped to the slow path in nftables.
This patch resets IPS_OFFLOAD_BIT from flow_offload_teardown(), so conntrack handles the tcp rst/fin packet which triggers the CLOSE/FIN state transition.
Moreover, teturn the connection's ownership to conntrack upon teardown by clearing the offload flag and fixing the established timeout value. The flow table GC thread will asynchonrnously free the flow table and hardware offload entries.
Before this patch, the IPS_OFFLOAD_BIT remained set for expired flows on which is also misleading since the flow is back to classic conntrack path.
If nf_ct_delete() removes the entry from the conntrack table, then it calls nf_ct_put() which decrements the refcnt. This is not a problem because the flowtable holds a reference to the conntrack object from flow_offload_alloc() path which is released via flow_offload_free().
This patch also updates nft_flow_offload to skip packets in SYN_RECV state. Since we might miss or bump packets to slow path, we do not know what will happen there while we are still in SYN_RECV, this patch postpones offload up to the next packet which also aligns to the existing behaviour in tc-ct.
flow_offload_teardown() does not reset the existing tcp state from flow_offload_fixup_tcp() to ESTABLISHED anymore, packets bump to slow path might have already update the state to CLOSE/FIN.
Joint work with Oz and Sven.
--- net/netfilter/nf_flow_table_core.c | 33 +++++++----------------------- net/netfilter/nft_flow_offload.c | 3 ++- 2 files changed, 9 insertions(+), 27 deletions(-)
net/netfilter/nf_flow_table_core.c +7 -26
@@ -173,12 +173,11 @@ EXPORT_SYMBOL_GPL(flow_offload_route_init);static void flow_offload_fixup_tcp (struct ip_ct_tcp *tcp) { - tcp->state =TCP_CONNTRACK_ESTABLISHED ; tcp->seen[0 ].td_maxwin =0 ; tcp->seen[1 ].td_maxwin =0 ; } -static void flow_offload_fixup_ct_timeout (struct nf_conn *ct) +static void flow_offload_fixup_ct (struct nf_conn *ct) {struct net *net =nf_ct_net (ct);int l4num =nf_ct_protonum (ct);
@@ -187,7 +186,9 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)if (l4num ==IPPROTO_TCP ) {struct nf_tcp_net *tn =nf_tcp_pernet (net); - timeout = tn->timeouts[TCP_CONNTRACK_ESTABLISHED ]; +flow_offload_fixup_tcp (&ct->proto.tcp); + + timeout = tn->timeouts[ct->proto.tcp.state]; timeout -= tn->offload_timeout; }else if (l4num ==IPPROTO_UDP ) {struct nf_udp_net *tn =nf_udp_pernet (net);
@@ -205,18 +206,6 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)WRITE_ONCE (ct->timeout, nfct_time_stamp + timeout); } -static void flow_offload_fixup_ct_state (struct nf_conn *ct) -{ -if (nf_ct_protonum (ct) ==IPPROTO_TCP ) -flow_offload_fixup_tcp (&ct->proto.tcp); -} - -static void flow_offload_fixup_ct (struct nf_conn *ct) -{ -flow_offload_fixup_ct_state (ct); -flow_offload_fixup_ct_timeout (ct); -} -static void flow_offload_route_release (struct flow_offload *flow) {nft_flow_dst_release (flow,FLOW_OFFLOAD_DIR_ORIGINAL );
@@ -355,22 +344,14 @@ static void flow_offload_del(struct nf_flowtable *flow_table,rhashtable_remove_fast (&flow_table->rhashtable, &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params); - -clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); - -if (nf_flow_has_expired (flow)) -flow_offload_fixup_ct (flow->ct); -else -flow_offload_fixup_ct_timeout (flow->ct); -flow_offload_free (flow); }void flow_offload_teardown (struct flow_offload *flow) { +clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status);set_bit (NF_FLOW_TEARDOWN , &flow->flags); - -flow_offload_fixup_ct_state (flow->ct); +flow_offload_fixup_ct (flow->ct); }EXPORT_SYMBOL_GPL (flow_offload_teardown);
@@ -460,7 +441,7 @@ static void nf_flow_offload_gc_step(struct flow_offload *flow, void *data)if (nf_flow_has_expired (flow) ||nf_ct_is_dying (flow->ct) ||nf_flow_has_stale_dst (flow)) -set_bit (NF_FLOW_TEARDOWN , &flow->flags); +flow_offload_teardown (flow);if (test_bit (NF_FLOW_TEARDOWN , &flow->flags)) {if (test_bit (NF_FLOW_HW , &flow->flags)) {
net/netfilter/nft_flow_offload.c +2 -1
@@ -298,7 +298,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,case IPPROTO_TCP : tcph =skb_header_pointer (pkt->skb,nft_thoff (pkt),sizeof (_tcph), &_tcph); -if (unlikely (!tcph || tcph->fin || tcph->rst)) +if (unlikely (!tcph || tcph->fin || tcph->rst || + !nf_conntrack_tcp_established (ct))) goto out;break ;case IPPROTO_UDP :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 118/158 netfilter: flowtable: pass flowtable to nf_flow_table_iterate()
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 217cff36e885627c41a14e803fc44f9cbc945767 ]
The flowtable object is already passed as argument to nf_flow_table_iterate(), do use not data pointer to pass flowtable.
--- net/netfilter/nf_flow_table_core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
net/netfilter/nf_flow_table_core.c +10 -10
@@ -382,7 +382,8 @@ EXPORT_SYMBOL_GPL(flow_offload_lookup);static int nf_flow_table_iterate (struct nf_flowtable *flow_table, -void (*iter)(struct flow_offload *flow,void *data), +void (*iter)(struct nf_flowtable *flowtable, +struct flow_offload *flow,void *data),void *data) {struct flow_offload_tuple_rhash *tuplehash;
@@ -406,7 +407,7 @@ nf_flow_table_iterate(struct nf_flowtable *flow_table, flow = container_of(tuplehash, struct flow_offload, tuplehash[0]); -iter (flow, data); +iter (flow_table, flow, data); }rhashtable_walk_stop (&hti);rhashtable_walk_exit (&hti);
@@ -434,10 +435,9 @@ static bool nf_flow_has_stale_dst(struct flow_offload *flow)flow_offload_stale_dst (&flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].tuple); } -static void nf_flow_offload_gc_step (struct flow_offload *flow,void *data) +static void nf_flow_offload_gc_step (struct nf_flowtable *flow_table, +struct flow_offload *flow,void *data) { -struct nf_flowtable *flow_table = data; -if (nf_flow_has_expired (flow) ||nf_ct_is_dying (flow->ct) ||nf_flow_has_stale_dst (flow))
@@ -462,7 +462,7 @@ static void nf_flow_offload_work_gc(struct work_struct *work)struct nf_flowtable *flow_table; flow_table = container_of(work, struct nf_flowtable, gc_work.work); -nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step, flow_table); +nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step,NULL );queue_delayed_work (system_power_efficient_wq, &flow_table->gc_work,HZ ); }
@@ -578,7 +578,8 @@ int nf_flow_table_init(struct nf_flowtable *flowtable) }EXPORT_SYMBOL_GPL (nf_flow_table_init); -static void nf_flow_table_do_cleanup (struct flow_offload *flow,void *data) +static void nf_flow_table_do_cleanup (struct nf_flowtable *flow_table, +struct flow_offload *flow,void *data) {struct net_device *dev = data;
@@ -620,11 +621,10 @@ void nf_flow_table_free(struct nf_flowtable *flow_table)cancel_delayed_work_sync (&flow_table->gc_work);nf_flow_table_iterate (flow_table, nf_flow_table_do_cleanup,NULL ); -nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step, flow_table); +nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step,NULL );nf_flow_table_offload_flush (flow_table);if (nf_flowtable_hw_offload (flow_table)) -nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step, - flow_table); +nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step,NULL );rhashtable_destroy (&flow_table->rhashtable); }EXPORT_SYMBOL_GPL (nf_flow_table_free);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 119/158 netfilter: flowtable: move dst_check to packet path
In reply to Greg Kroah-HartmanFrom: Ritaro Takenaka <[email protected]>
[ Upstream commit 2738d9d963bd1f06d5114c2b4fa5771a95703991 ]
Fixes sporadic IPv6 packet loss when flow offloading is enabled.
IPv6 route GC and flowtable GC are not synchronized.
When dst_cache becomes stale and a packet passes through the flow before the flowtable GC teardowns it, the packet can be dropped. So, it is necessary to check dst every time in packet path.
--- net/netfilter/nf_flow_table_core.c | 23 +---------------------- net/netfilter/nf_flow_table_ip.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 22 deletions(-)
net/netfilter/nf_flow_table_core.c +1 -22
@@ -415,32 +415,11 @@ nf_flow_table_iterate(struct nf_flowtable *flow_table,return err; } -static bool flow_offload_stale_dst (struct flow_offload_tuple *tuple) -{ -struct dst_entry *dst; - -if (tuple->xmit_type ==FLOW_OFFLOAD_XMIT_NEIGH || - tuple->xmit_type ==FLOW_OFFLOAD_XMIT_XFRM ) { - dst = tuple->dst_cache; -if (!dst_check (dst, tuple->dst_cookie)) -return true; - } - -return false; -} - -static bool nf_flow_has_stale_dst (struct flow_offload *flow) -{ -return flow_offload_stale_dst (&flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL ].tuple) || -flow_offload_stale_dst (&flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].tuple); -} -static void nf_flow_offload_gc_step (struct nf_flowtable *flow_table,struct flow_offload *flow,void *data) {if (nf_flow_has_expired (flow) || -nf_ct_is_dying (flow->ct) || -nf_flow_has_stale_dst (flow)) +nf_ct_is_dying (flow->ct))flow_offload_teardown (flow);if (test_bit (NF_FLOW_TEARDOWN , &flow->flags)) {
net/netfilter/nf_flow_table_ip.c +19 -0
@@ -227,6 +227,15 @@ static bool nf_flow_exceeds_mtu(const struct sk_buff *skb, unsigned int mtu)return true; } +static inline bool nf_flow_dst_check (struct flow_offload_tuple *tuple) +{ +if (tuple->xmit_type !=FLOW_OFFLOAD_XMIT_NEIGH && + tuple->xmit_type !=FLOW_OFFLOAD_XMIT_XFRM ) +return true; + +return dst_check (tuple->dst_cache, tuple->dst_cookie); +} +static unsigned int nf_flow_xmit_xfrm (struct sk_buff *skb,const struct nf_hook_state *state,struct dst_entry *dst)
@@ -346,6 +355,11 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,if (nf_flow_state_check (flow, iph->protocol, skb, thoff))return NF_ACCEPT ; +if (!nf_flow_dst_check (&tuplehash->tuple)) { +flow_offload_teardown (flow); +return NF_ACCEPT ; + } +if (skb_try_make_writable (skb, thoff + hdrsize))return NF_DROP ;
@@ -582,6 +596,11 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,if (nf_flow_state_check (flow, ip6h->nexthdr, skb, thoff))return NF_ACCEPT ; +if (!nf_flow_dst_check (&tuplehash->tuple)) { +flow_offload_teardown (flow); +return NF_ACCEPT ; + } +if (skb_try_make_writable (skb, thoff + hdrsize))return NF_DROP ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 120/158 vdpa/mlx5: Use consistent RQT size
In reply to Greg Kroah-HartmanFrom: Eli Cohen <[email protected]>
[ Upstream commit acde3929492bcb9ceb0df1270230c422b1013798 ]
The current code evaluates RQT size based on the configured number of virtqueues. This can raise an issue in the following scenario:
Assume MQ was negotiated.
1. mlx5_vdpa_set_map() gets called.
2. handle_ctrl_mq() is called setting cur_num_vqs to some value, lower than the configured max VQs.
3. A second set_map gets called, but now a smaller number of VQs is used to evaluate the size of the RQT.
4. handle_ctrl_mq() is called with a value larger than what the RQT can hold. This will emit errors and the driver state is compromised.
To fix this, we use a new field in struct mlx5_vdpa_net to hold the required number of entries in the RQT. This value is evaluated in mlx5_vdpa_set_driver_features() where we have the negotiated features all set up.
In addition to that, we take into consideration the max capability of RQT entries early when the device is added so we don't need to take consider it when creating the RQT.
Last, we remove the use of mlx5_vdpa_max_qps() which just returns the max_vas / 2 and make the code clearer.
--- drivers/vdpa/mlx5/net/mlx5_vnet.c | 61 +++++++++++-------------------- 1 file changed, 21 insertions(+), 40 deletions(-)
drivers/vdpa/mlx5/net/mlx5_vnet.c +21 -40
@@ -161,6 +161,7 @@ struct mlx5_vdpa_net {struct mlx5_flow_handle *rx_rule_mcast;bool setup;u32 cur_num_vqs; +u32 rqt_size;struct notifier_block nb;struct vdpa_callback config_cb;struct mlx5_vdpa_wq_ent cvq_ent;
@@ -204,17 +205,12 @@ static __virtio16 cpu_to_mlx5vdpa16(struct mlx5_vdpa_dev *mvdev, u16 val)return __cpu_to_virtio16 (mlx5_vdpa_is_little_endian (mvdev), val); } -static inline u32 mlx5_vdpa_max_qps (int max_vqs) -{ -return max_vqs /2 ; -} -static u16 ctrl_vq_idx (struct mlx5_vdpa_dev *mvdev) {if (!(mvdev->actual_features &BIT_ULL (VIRTIO_NET_F_MQ )))return 2 ; -return 2 *mlx5_vdpa_max_qps (mvdev->max_vqs); +return mvdev->max_vqs; }static bool is_ctrl_vq_idx (struct mlx5_vdpa_dev *mvdev,u16 idx)
@@ -1236,25 +1232,13 @@ static void teardown_vq(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *static int create_rqt (struct mlx5_vdpa_net *ndev) {__be32 *list; -int max_rqt;void *rqtc;int inlen;void *in;int i, j;int err; -int num; - -if (!(ndev->mvdev.actual_features &BIT_ULL (VIRTIO_NET_F_MQ ))) - num =1 ; -else - num = ndev->cur_num_vqs /2 ; - max_rqt =min_t (int,roundup_pow_of_two (num), -1 <<MLX5_CAP_GEN (ndev->mvdev.mdev, log_max_rqt_size)); -if (max_rqt <1 ) -return -EOPNOTSUPP ; - - inlen =MLX5_ST_SZ_BYTES (create_rqt_in) + max_rqt *MLX5_ST_SZ_BYTES (rq_num); + inlen =MLX5_ST_SZ_BYTES (create_rqt_in) + ndev->rqt_size *MLX5_ST_SZ_BYTES (rq_num); in =kzalloc (inlen,GFP_KERNEL );if (!in)return -ENOMEM ;
@@ -1263,12 +1247,12 @@ static int create_rqt(struct mlx5_vdpa_net *ndev) rqtc =MLX5_ADDR_OF (create_rqt_in, in, rqt_context);MLX5_SET (rqtc, rqtc, list_q_type,MLX5_RQTC_LIST_Q_TYPE_VIRTIO_NET_Q ); -MLX5_SET (rqtc, rqtc, rqt_max_size, max_rqt); +MLX5_SET (rqtc, rqtc, rqt_max_size, ndev->rqt_size); list =MLX5_ADDR_OF (rqtc, rqtc, rq_num[0 ]); -for (i =0 , j =0 ; i < max_rqt; i++, j +=2 ) - list[i] =cpu_to_be32 (ndev->vqs[j % (2 * num)].virtq_id); +for (i =0 , j =0 ; i < ndev->rqt_size; i++, j +=2 ) + list[i] =cpu_to_be32 (ndev->vqs[j % ndev->cur_num_vqs].virtq_id); -MLX5_SET (rqtc, rqtc, rqt_actual_size, max_rqt); +MLX5_SET (rqtc, rqtc, rqt_actual_size, ndev->rqt_size); err =mlx5_vdpa_create_rqt (&ndev->mvdev, in, inlen, &ndev->res.rqtn);kfree (in);if (err)
@@ -1282,19 +1266,13 @@ static int create_rqt(struct mlx5_vdpa_net *ndev)static int modify_rqt (struct mlx5_vdpa_net *ndev,int num) {__be32 *list; -int max_rqt;void *rqtc;int inlen;void *in;int i, j;int err; - max_rqt =min_t (int,roundup_pow_of_two (ndev->cur_num_vqs /2 ), -1 <<MLX5_CAP_GEN (ndev->mvdev.mdev, log_max_rqt_size)); -if (max_rqt <1 ) -return -EOPNOTSUPP ; - - inlen =MLX5_ST_SZ_BYTES (modify_rqt_in) + max_rqt *MLX5_ST_SZ_BYTES (rq_num); + inlen =MLX5_ST_SZ_BYTES (modify_rqt_in) + ndev->rqt_size *MLX5_ST_SZ_BYTES (rq_num); in =kzalloc (inlen,GFP_KERNEL );if (!in)return -ENOMEM ;
@@ -1305,10 +1283,10 @@ static int modify_rqt(struct mlx5_vdpa_net *ndev, int num)MLX5_SET (rqtc, rqtc, list_q_type,MLX5_RQTC_LIST_Q_TYPE_VIRTIO_NET_Q ); list =MLX5_ADDR_OF (rqtc, rqtc, rq_num[0 ]); -for (i =0 , j =0 ; i < max_rqt; i++, j +=2 ) +for (i =0 , j =0 ; i < ndev->rqt_size; i++, j +=2 ) list[i] =cpu_to_be32 (ndev->vqs[j % num].virtq_id); -MLX5_SET (rqtc, rqtc, rqt_actual_size, max_rqt); +MLX5_SET (rqtc, rqtc, rqt_actual_size, ndev->rqt_size); err =mlx5_vdpa_modify_rqt (&ndev->mvdev, in, inlen, ndev->res.rqtn);kfree (in);if (err)
@@ -1582,7 +1560,7 @@ static virtio_net_ctrl_ack handle_ctrl_mq(struct mlx5_vdpa_dev *mvdev, u8 cmd) newqps =mlx5vdpa16_to_cpu (mvdev, mq.virtqueue_pairs);if (newqps <VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN || - newqps >mlx5_vdpa_max_qps (mvdev->max_vqs)) + newqps > ndev->rqt_size)break ;if (ndev->cur_num_vqs ==2 * newqps) {
@@ -1937,7 +1915,7 @@ static int setup_virtqueues(struct mlx5_vdpa_dev *mvdev)int err;int i; -for (i =0 ; i <2 *mlx5_vdpa_max_qps (mvdev->max_vqs); i++) { +for (i =0 ; i < mvdev->max_vqs; i++) { err =setup_vq (ndev, &ndev->vqs[i]);if (err) goto err_vq;
@@ -2008,9 +1986,11 @@ static int mlx5_vdpa_set_driver_features(struct vdpa_device *vdev, u64 features) ndev->mvdev.actual_features = features & ndev->mvdev.mlx_features;if (ndev->mvdev.actual_features &BIT_ULL (VIRTIO_NET_F_MQ )) - ndev->cur_num_vqs =2 *mlx5vdpa16_to_cpu (mvdev, ndev->config.max_virtqueue_pairs); + ndev->rqt_size =mlx5vdpa16_to_cpu (mvdev, ndev->config.max_virtqueue_pairs);else - ndev->cur_num_vqs =2 ; + ndev->rqt_size =1 ; + + ndev->cur_num_vqs =2 * ndev->rqt_size;update_cvq_info (mvdev);return err;
@@ -2463,7 +2443,7 @@ static void init_mvqs(struct mlx5_vdpa_net *ndev)struct mlx5_vdpa_virtqueue *mvq;int i; -for (i =0 ; i <2 *mlx5_vdpa_max_qps (ndev->mvdev.max_vqs); ++i) { +for (i =0 ; i < ndev->mvdev.max_vqs; ++i) { mvq = &ndev->vqs[i];memset (mvq,0 , offsetof(struct mlx5_vdpa_virtqueue , ri)); mvq->index = i;
@@ -2583,7 +2563,8 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,return -EOPNOTSUPP ; } - max_vqs =MLX5_CAP_DEV_VDPA_EMULATION (mdev, max_num_virtio_queues); + max_vqs =min_t (int,MLX5_CAP_DEV_VDPA_EMULATION (mdev, max_num_virtio_queues), +1 <<MLX5_CAP_GEN (mdev, log_max_rqt_size));if (max_vqs <2 ) { dev_warn(mdev->device, "%d virtqueues are supported. At least 2 are required\n",
@@ -2647,7 +2628,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, ndev->mvdev.mlx_features |=BIT_ULL (VIRTIO_NET_F_MAC ); } - config->max_virtqueue_pairs =cpu_to_mlx5vdpa16 (mvdev,mlx5_vdpa_max_qps (max_vqs)); + config->max_virtqueue_pairs =cpu_to_mlx5vdpa16 (mvdev, max_vqs /2 ); mvdev->vdev.dma_dev = &mdev->pdev->dev; err =mlx5_vdpa_alloc_resources (&ndev->mvdev);if (err)
@@ -2674,7 +2655,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, ndev->nb.notifier_call = event_handler;mlx5_notifier_register (mdev, &ndev->nb); mvdev->vdev.mdev = &mgtdev->mgtdev; - err =_vdpa_register_device (&mvdev->vdev,2 *mlx5_vdpa_max_qps (max_vqs) +1 ); + err =_vdpa_register_device (&mvdev->vdev, max_vqs +1 );if (err) goto err_reg;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 121/158 net: bridge: Clear offload_fwd_mark when passing frame up bridge interface.
In reply to Greg Kroah-HartmanFrom: Andrew Lunn <[email protected]>
[ Upstream commit fbb3abdf2223cd0dfc07de85fe5a43ba7f435bdf ]
It is possible to stack bridges on top of each other. Consider the following which makes use of an Ethernet switch:
br1
/ \
/ \ / \
br0.11 wlan0
|
br0
/ | \
p1 p2 p3
br0 is offloaded to the switch. Above br0 is a vlan interface, for vlan 11. This vlan interface is then a slave of br1. br1 also has a wireless interface as a slave. This setup trunks wireless lan traffic over the copper network inside a VLAN.
A frame received on p1 which is passed up to the bridge has the skb->offload_fwd_mark flag set to true, indicating that the switch has dealt with forwarding the frame out ports p2 and p3 as needed. This flag instructs the software bridge it does not need to pass the frame back down again. However, the flag is not getting reset when the frame is passed upwards. As a result br1 sees the flag, wrongly interprets it, and fails to forward the frame to wlan0.
When passing a frame upwards, clear the flag. This is the Rx equivalent of br_switchdev_frame_unmark() in br_dev_xmit().
--- net/bridge/br_input.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/bridge/br_input.c +7 -0
@@ -39,6 +39,13 @@ static int br_pass_frame_up(struct sk_buff *skb)dev_sw_netstats_rx_add (brdev, skb->len); vg =br_vlan_group_rcu (br); + +/* Reset the offload_fwd_mark because there could be a stacked +* bridge above, and it should not think this bridge it doing +* that bridge's work forwarding out its ports. +*/ +br_switchdev_frame_unmark (skb); +/* Bridge is just like any other port. Make sure the * packet is allowed except in promisc mode when someone * may be running packet capture.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 122/158 riscv: dts: sifive: fu540-c000: align dma node name with dtschema
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit b17410182b6f98191fbf7f42d3b4a78512769d29 ]
Fixes dtbs_check warnings like:
dma@3000000: $nodename:0: 'dma@3000000' does not match '^dma-controller(@.*)?$'
--- arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/boot/dts/sifive/fu540-c000.dtsi +1 -1
@@ -167,7 +167,7 @@ uart0: serial@10010000 { clocks = <&prci PRCI_CLK_TLCLK>; status = "disabled"; }; - dma: dma@3000000 { + dma: dma-controller@3000000 { compatible = "sifive,fu540-c000-pdma"; reg = <0x0 0x3000000 0x0 0x8000>; interrupt-parent = <&plic0>;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 123/158 scsi: ufs: core: Fix referencing invalid rsp field
In reply to Greg Kroah-HartmanFrom: Daejun Park <[email protected]>
[ Upstream commit d5d92b64408443e113b9742f8f1c35278910dd4d ]
Fix referencing sense data when it is invalid. When the length of the data segment is 0, there is no valid information in the rsp field, so ufshpb_rsp_upiu() is returned without additional operation.
--- drivers/scsi/ufs/ufshpb.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/scsi/ufs/ufshpb.c +7 -12
@@ -1256,6 +1256,13 @@ void ufshpb_rsp_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)struct utp_hpb_rsp *rsp_field = &lrbp->ucd_rsp_ptr->hr;int data_seg_len; + data_seg_len =be32_to_cpu (lrbp->ucd_rsp_ptr->header.dword_2) + &MASK_RSP_UPIU_DATA_SEG_LEN ; + +/* If data segment length is zero, rsp_field is not valid */ +if (!data_seg_len) +return ; +if (unlikely (lrbp->lun != rsp_field->lun)) {struct scsi_device *sdev;bool found = false;
@@ -1290,18 +1297,6 @@ void ufshpb_rsp_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)return ; } - data_seg_len =be32_to_cpu (lrbp->ucd_rsp_ptr->header.dword_2) - &MASK_RSP_UPIU_DATA_SEG_LEN ; - -/* To flush remained rsp_list, we queue the map_work task */ -if (!data_seg_len) { -if (!ufshpb_is_general_lun (hpb->lun)) -return ; - -ufshpb_kick_map_work (hpb); -return ; - } -BUILD_BUG_ON (sizeof (struct utp_hpb_rsp ) !=UTP_HPB_RSP_SIZE );if (!ufshpb_is_hpb_rsp_valid (hba, lrbp, rsp_field))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 124/158 kvm: x86/pmu: Fix the compare function used by the pmu event filter
In reply to Greg Kroah-HartmanFrom: Aaron Lewis <[email protected]>
[ Upstream commit 4ac19ead0dfbabd8e0bfc731f507cfb0b95d6c99 ]
When returning from the compare function the u64 is truncated to an int. This results in a loss of the high nybble[1] in the event select and its sign if that nybble is in use. Switch from using a result that can end up being truncated to a result that can only be: 1, 0, -1.
[1] bits 35:32 in the event select register and bits 11:8 in the event select.
Message-Id: <[email protected]>
--- arch/x86/kvm/pmu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kvm/pmu.c +5 -2
@@ -171,9 +171,12 @@ static bool pmc_resume_counter(struct kvm_pmc *pmc)return true; } -static int cmp_u64 (const void *a,const void *b) +static int cmp_u64 (const void *pa,const void *pb) { -return *(__u64 *)a - *(__u64 *)b; +u64 a = *(u64 *)pa; +u64 b = *(u64 *)pb; + +return (a > b) - (a < b); }void reprogram_gp_counter (struct kvm_pmc *pmc,u64 eventsel)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 125/158 perf build: Fix check for btf__load_from_kernel_by_id() in libbpf
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 0ae065a5d265bc5ada13e350015458e0c5e5c351 ]
Avi Kivity reported a problem where the __weak btf__load_from_kernel_by_id() in tools/perf/util/bpf-event.c was being used and it called btf__get_from_id() in tools/lib/bpf/btf.c that in turn called back to btf__load_from_kernel_by_id(), resulting in an endless loop.
Fix this by adding a feature test to check if btf__load_from_kernel_by_id() is available when building perf with LIBBPF_DYNAMIC=1, and if not then provide the fallback to the old btf__get_from_id(), that doesn't call back to btf__load_from_kernel_by_id() since at that time it didn't exist at all.
Tested on Fedora 35 where we have libbpf-devel 0.4.0 with LIBBPF_DYNAMIC where we don't have btf__load_from_kernel_by_id() and thus its feature test fail, not defining HAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID:
$ cat /tmp/build/perf-urgent/feature/test-libbpf-btf__load_from_kernel_by_id.make.output
test-libbpf-btf__load_from_kernel_by_id.c: In function ‘main’:
test-libbpf-btf__load_from_kernel_by_id.c:6:16: error: implicit declaration of function ‘btf__load_from_kernel_by_id’ [-Werror=implicit-function-declaration]
6 | return btf__load_from_kernel_by_id(20151128, NULL);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
$$ nm /tmp/build/perf-urgent/perf | grep btf__load_from_kernel_by_id 00000000005ba180 T btf__load_from_kernel_by_id $
$ objdump --disassemble=btf__load_from_kernel_by_id -S /tmp/build/perf-urgent/perf
/tmp/build/perf-urgent/perf: file format elf64-x86-64
<SNIP>
00000000005ba180 <btf__load_from_kernel_by_id>:
#include "record.h"
#include "util/synthetic-events.h"
#ifndef HAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID
struct btf *btf__load_from_kernel_by_id(__u32 id)
{
5ba180: 55 push %rbp
5ba181: 48 89 e5 mov %rsp,%rbp
5ba184: 48 83 ec 10 sub $0x10,%rsp
5ba188: 64 48 8b 04 25 28 00 mov %fs:0x28,%rax
5ba18f: 00 00
5ba191: 48 89 45 f8 mov %rax,-0x8(%rbp)
5ba195: 31 c0 xor %eax,%eax
struct btf *btf;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
int err = btf__get_from_id(id, &btf);
5ba197: 48 8d 75 f0 lea -0x10(%rbp),%rsi
5ba19b: e8 a0 57 e5 ff call 40f940 <btf__get_from_id@plt>
5ba1a0: 89 c2 mov %eax,%edx
#pragma GCC diagnostic pop return err ? ERR_PTR(err) : btf;
5ba1a2: 48 98 cltq
5ba1a4: 85 d2 test %edx,%edx
5ba1a6: 48 0f 44 45 f0 cmove -0x10(%rbp),%rax }
<SNIP>
--- tools/build/Makefile.feature | 1 + tools/build/feature/Makefile | 4 ++++ .../feature/test-libbpf-btf__load_from_kernel_by_id.c | 7 +++++++ tools/perf/Makefile.config | 7 +++++++ tools/perf/util/bpf-event.c | 4 +++- 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c
tools/build/Makefile.feature +1 -0
@@ -98,6 +98,7 @@ FEATURE_TESTS_EXTRA := \ llvm-version \ clang \ libbpf \ + libbpf-btf__load_from_kernel_by_id \ libpfm4 \ libdebuginfod \ clang-bpf-co-re
tools/build/feature/Makefile +4 -0
@@ -57,6 +57,7 @@ FILES= \ test-lzma.bin \ test-bpf.bin \ test-libbpf.bin \ + test-libbpf-btf__load_from_kernel_by_id.bin \ test-get_cpuid.bin \ test-sdt.bin \ test-cxx.bin \
@@ -287,6 +288,9 @@ $(OUTPUT)test-bpf.bin: $(OUTPUT)test-libbpf.bin: $(BUILD) -lbpf +$(OUTPUT)test-libbpf-btf__load_from_kernel_by_id.bin: + $(BUILD) -lbpf + $(OUTPUT)test-sdt.bin: $(BUILD)
tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c new file +7 -0
@@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <bpf/libbpf.h> + +int main (void ) +{ +return btf__load_from_kernel_by_id (20151128 ,NULL ); +}
tools/perf/Makefile.config +7 -0
@@ -553,9 +553,16 @@ ifndef NO_LIBELF ifeq ($(feature-libbpf), 1) EXTLIBS += -lbpf $(call detected,CONFIG_LIBBPF_DYNAMIC) + + $(call feature_check,libbpf-btf__load_from_kernel_by_id) + ifeq ($(feature-libbpf-btf__load_from_kernel_by_id), 1) + CFLAGS += -DHAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID + endif else dummy := $(error Error: No libbpf devel library found, please install libbpf-devel); endif + else + CFLAGS += -DHAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID endif endif
tools/perf/util/bpf-event.c +3 -1
@@ -22,7 +22,8 @@#include "record.h" #include "util/synthetic-events.h" -struct btf *__weak btf__load_from_kernel_by_id (__u32 id) +#ifndef HAVE_LIBBPF_BTF__LOAD_FROM_KERNEL_BY_ID +struct btf *btf__load_from_kernel_by_id (__u32 id) {struct btf *btf;#pragma GCC diagnostic push
@@ -32,6 +33,7 @@ struct btf * __weak btf__load_from_kernel_by_id(__u32 id) return err ? ERR_PTR(err) : btf; } +#endif struct bpf_program *__weak bpf_object__next_program (const struct bpf_object *obj,struct bpf_program *prev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 126/158 perf stat: Fix and validate CPU map inputs in synthetic PERF_RECORD_STAT events
In reply to Greg Kroah-HartmanFrom: Ian Rogers <[email protected]>
[ Upstream commit 92d579ea3279aa87392b862df5810f0a7e30fcc6 ]
Stat events can come from disk and so need a degree of validation. They contain a CPU which needs looking up via CPU map to access a counter.
Add the CPU to index translation, alongside validity checking.
Discussion thread:
--- tools/perf/util/stat.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
tools/perf/util/stat.c +14 -3
@@ -471,9 +471,10 @@ int perf_stat_process_counter(struct perf_stat_config *config,int perf_event__process_stat_event (struct perf_session *session,union perf_event *event) { -struct perf_counts_values count; +struct perf_counts_values count, *ptr;struct perf_record_stat *st = &event->stat;struct evsel *counter; +int cpu_map_idx; count.val = st->val; count.ena = st->ena;
@@ -484,8 +485,18 @@ int perf_event__process_stat_event(struct perf_session *session,pr_err ("Failed to resolve counter for stat event.\n" );return -EINVAL ; } - - *perf_counts (counter->counts, st->cpu, st->thread) = count; + cpu_map_idx =perf_cpu_map__idx (evsel__cpus (counter), (struct perf_cpu ){.cpu = st->cpu}); +if (cpu_map_idx ==-1 ) { +pr_err ("Invalid CPU %d for event %s.\n" , st->cpu,evsel__name (counter)); +return -EINVAL ; + } + ptr =perf_counts (counter->counts, cpu_map_idx, st->thread); +if (ptr ==NULL ) { +pr_err ("Failed to find perf count for CPU %d thread %d on event %s.\n" , + st->cpu, st->thread,evsel__name (counter)); +return -EINVAL ; + } + *ptr = count; counter->supported = true;return 0 ; }
Signature · 1 line
2.35.1
Re: [PATCH 5.17 126/158] perf stat: Fix and validate CPU map inputs in synthetic PERF_RECORD_STAT events
This patch was applied to netdev/net.git (master) by Arnaldo Carvalho de Melo <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Arnaldo Carvalho de Melo <[email protected]>:
Quoted 8 lines · On Mon, 23 May 2022 19:04:43 +0200 you wrote:
From: Ian Rogers <[email protected]>
[ Upstream commit
92d579ea3279aa87392b862df5810f0a7e30fcc6]Stat events can come from disk and so need a degree of validation. They contain a CPU which needs looking up via CPU map to access a counter.
[...]
Here is the summary with links:
- [5.17,126/158] perf stat: Fix and validate CPU map inputs in synthetic PERF_RECORD_STAT events
https://git.kernel.org/netdev/net/c/92d579ea3279
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Greg Kroah-Hartman
maintainerPATCH 127/158 gpio: gpio-vf610: do not touch other bits when set the target bit
In reply to Greg Kroah-HartmanFrom: Haibo Chen <[email protected]>
[ Upstream commit 9bf3ac466faa83d51a8fe9212131701e58fdef74 ]
For gpio controller contain register PDDR, when set one target bit, current logic will clear all other bits, this is wrong. Use operator '|=' to fix it.
--- drivers/gpio/gpio-vf610.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpio/gpio-vf610.c +6 -2
@@ -125,9 +125,13 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, {struct vf610_gpio_port *port =gpiochip_get_data (chip);unsigned long mask =BIT (gpio); +u32 val; -if (port->sdata && port->sdata->have_paddr) -vf610_gpio_writel (mask, port->gpio_base +GPIO_PDDR ); +if (port->sdata && port->sdata->have_paddr) { + val =vf610_gpio_readl (port->gpio_base +GPIO_PDDR ); + val |= mask; +vf610_gpio_writel (val, port->gpio_base +GPIO_PDDR ); + }vf610_gpio_set (chip, gpio, value);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 128/158 gpio: mvebu/pwm: Refuse requests with inverted polarity
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 3ecb10175b1f776f076553c24e2689e42953fef5 ]
The driver doesn't take struct pwm_state::polarity into account when configuring the hardware, so refuse requests for inverted polarity.
--- drivers/gpio/gpio-mvebu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpio/gpio-mvebu.c +3 -0
@@ -707,6 +707,9 @@ static int mvebu_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,unsigned long flags;unsigned int on, off; +if (state->polarity !=PWM_POLARITY_NORMAL ) +return -EINVAL ; + val = (unsigned long long ) mvpwm->clk_rate * state->duty_cycle;do_div (val,NSEC_PER_SEC );if (val >UINT_MAX +1ULL )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 129/158 perf test: Fix "all PMU test" to skip hv_24x7/hv_gpci tests on powerpc
In reply to Greg Kroah-HartmanFrom: Athira Rajeev <[email protected]>
[ Upstream commit 451ed8058c69a3fee29fa9e2967a4e22a221fe75 ]
"perf all PMU test" picks the input events from "perf list --raw-dump pmu" list and runs "perf stat -e" for each of the event in the list. In case of powerpc, the PowerVM environment supports events from hv_24x7 and hv_gpci PMU which is of example format like below:
- hv_24x7/CPM_ADJUNCT_INST,domain=?,core=?/
- hv_gpci/event,partition_id=?/
The value for "?" needs to be filled in depending on system and respective event. CPM_ADJUNCT_INST needs have core value and domain value. hv_gpci event needs partition_id. Similarly, there are other events for hv_24x7 and hv_gpci having "?" in event format. Hence skip these events on powerpc platform since values like partition_id, domain is specific to system and event.
--- tools/perf/tests/shell/stat_all_pmu.sh | 10 ++++++++++ 1 file changed, 10 insertions(+)
tools/perf/tests/shell/stat_all_pmu.sh +10 -0
@@ -5,6 +5,16 @@ set -e for p in $(perf list --raw-dump pmu); do + # In powerpc, skip the events for hv_24x7 and hv_gpci. + # These events needs input values to be filled in for + # core, chip, partition id based on system. + # Example: hv_24x7/CPM_ADJUNCT_INST,domain=?,core=?/ + # hv_gpci/event,partition_id=?/ + # Hence skip these events for ppc. + if echo "$p" |grep -Eq 'hv_24x7|hv_gpci' ; then + echo "Skipping: Event '$p' in powerpc" + continue + fi echo "Testing $p" result=$(perf stat -e "$p" true 2>&1) if ! echo "$result" | grep -q "$p" && ! echo "$result" | grep -q "<not supported>" ; then
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 130/158 perf regs x86: Fix arch__intr_reg_mask() for the hybrid platform
In reply to Greg Kroah-HartmanFrom: Kan Liang <[email protected]>
[ Upstream commit 01b28e4a58152e8906eeb5f1b55a0c404c48c7c8 ]
The X86 specific arch__intr_reg_mask() is to check whether the kernel and hardware can collect XMM registers. But it doesn't work on some hybrid platform.
Without the patch on ADL-N:
$ perf record -I? available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15
The config of the test event doesn't contain the PMU information. The kernel may fail to initialize it on the correct hybrid PMU and return the wrong non-supported information.
Add the PMU information into the config for the hybrid platform. The same register set is supported among different hybrid PMUs. Checking the first available one is good enough.
With the patch on ADL-N:
$ perf record -I? available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 XMM9 XMM10 XMM11 XMM12 XMM13 XMM14 XMM15
--- tools/perf/arch/x86/util/perf_regs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
tools/perf/arch/x86/util/perf_regs.c +12 -0
@@ -9,6 +9,8 @@#include "../../../util/perf_regs.h" #include "../../../util/debug.h" #include "../../../util/event.h" +#include "../../../util/pmu.h" +#include "../../../util/pmu-hybrid.h" const struct sample_reg sample_reg_masks[] = {SMPL_REG (AX ,PERF_REG_X86_AX ),
@@ -284,12 +286,22 @@ uint64_t arch__intr_reg_mask(void) .disabled = 1, .exclude_kernel = 1, }; +struct perf_pmu *pmu;int fd;/* * In an unnamed union, init it here to build on older gcc versions */ attr.sample_period =1 ; +if (perf_pmu__has_hybrid ()) { +/* +* The same register set is supported among different hybrid PMUs. +* Only check the first available one. +*/ + pmu =list_first_entry (&perf_pmu__hybrid_pmus,typeof (*pmu), hybrid_list); + attr.config |= (__u64 )pmu->type <<PERF_PMU_TYPE_SHIFT ; + } +event_attr_init (&attr); fd =sys_perf_event_open (&attr,0 ,-1 ,-1 ,0 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 131/158 perf bench numa: Address compiler error on s390
In reply to Greg Kroah-HartmanFrom: Thomas Richter <[email protected]>
[ Upstream commit f8ac1c478424a9a14669b8cef7389b1e14e5229d ]
The compilation on s390 results in this error:
# make DEBUG=y bench/numa.o
...
bench/numa.c: In function ‘__bench_numa’:
bench/numa.c:1749:81: error: ‘%d’ directive output may be truncated
writing between 1 and 11 bytes into a region of size between
10 and 20 [-Werror=format-truncation=]
1749 | snprintf(tname, sizeof(tname), "process%d:thread%d", p, t);
^~
...
bench/numa.c:1749:64: note: directive argument in the range
[-2147483647, 2147483646]
...
#The maximum length of the %d replacement is 11 characters because of the negative sign. Therefore extend the array by two more characters.
Output after:
# make DEBUG=y bench/numa.o > /dev/null 2>&1; ll bench/numa.o -rw-r--r-- 1 root root 418320 May 19 09:11 bench/numa.o #
--- tools/perf/bench/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/bench/numa.c +1 -1
@@ -1672,7 +1672,7 @@ static int __bench_numa(const char *name) "GB/sec,", "total-speed", "GB/sec total speed");if (g->p.show_details >=2 ) { -char tname[14 +2 *10 +1 ]; +char tname[14 +2 *11 +1 ];struct thread_data *td;for (p =0 ; p < g->p.nr_proc; p++) {for (t =0 ; t < g->p.nr_threads; t++) {
Signature · 1 line
2.35.1