5.10.198-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainercover 5.10.198-rc1 review
This is the start of the stable review cycle for the 5.10.198 release. There are 226 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, 11 Oct 2023 13:00: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.10.198-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.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.10.198-rc1
Florian Westphal <[email protected]>
netfilter: nftables: exthdr: fix 4-byte stack OOB write
Florian Westphal <[email protected]>
netfilter: nf_tables: fix kdoc warnings after gc rework
John David Anglin <[email protected]>
parisc: Restore __ldcw_align for PA-RISC 2.0 processors
Shay Drory <[email protected]>
RDMA/mlx5: Fix NULL string error
Bernard Metzler <[email protected]>
RDMA/siw: Fix connection failure handling
Konstantin Meskhidze <[email protected]>
RDMA/uverbs: Fix typo of sizeof argument
Leon Romanovsky <[email protected]>
RDMA/cma: Fix truncation compilation warning in make_cma_ports
Mark Zhang <[email protected]>
RDMA/cma: Initialize ib_sa_multicast structure to 0 when join
Duje Mihanović <[email protected]>
gpio: pxa: disable pinctrl calls for MMP_GPIO
Bartosz Golaszewski <[email protected]>
gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config()
Christophe JAILLET <[email protected]>
IB/mlx4: Fix the size of a buffer in add_port_entries()
Dan Carpenter <[email protected]>
of: dynamic: Fix potential memory leak in of_changeset_action()
Leon Romanovsky <[email protected]>
RDMA/core: Require admin capabilities to set system parameters
Fedor Pchelkin <[email protected]>
dm zoned: free dmz->ddev array in dmz_put_zoned_devices
Ivan Babrou <[email protected]>
cpupower: add Makefile dependencies for install targets
Xin Long <[email protected]>
sctp: update hb timer immediately after users change hb_interval
Xin Long <[email protected]>
sctp: update transport state when processing a dupcook packet
Neal Cardwell <[email protected]>
tcp: fix delayed ACKs for MSS boundary condition
Neal Cardwell <[email protected]>
tcp: fix quick-ack counting to count actual ACKs of new data
Chengfeng Ye <[email protected]>
tipc: fix a potential deadlock on &tx->lock
Ben Wolsieffer <[email protected]>
net: stmmac: dwmac-stm32: fix resume on STM32 MCU
Florian Westphal <[email protected]>
netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure
Xin Long <[email protected]>
netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp
Dan Carpenter <[email protected]>
net: ethernet: ti: am65-cpsw: Fix error code in am65_cpsw_nuss_init_tx_chns()
Jeremy Cline <[email protected]>
net: nfc: llcp: Add lock when modifying device list
Shigeru Yoshida <[email protected]>
net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
Fabio Estevam <[email protected]>
net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent
David Howells <[email protected]>
ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data()
Eric Dumazet <[email protected]>
net: fix possible store tearing in neigh_periodic_work()
Mauricio Faria de Oliveira <[email protected]>
modpost: add missing else to the "of" check
Trond Myklebust <[email protected]>
NFSv4: Fix a nfs4_state_manager() race
Arnd Bergmann <[email protected]>
ima: rework CONFIG_IMA dependency block
Junxiao Bi <[email protected]>
scsi: target: core: Fix deadlock due to recursive locking
Oleksandr Tymoshenko <[email protected]>
ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig
Richard Fitzgerald <[email protected]>
regmap: rbtree: Fix wrong register marked as in-cache when creating new node
Felix Fietkau <[email protected]>
wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling
Alexandra Diupina <[email protected]>
drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close()
Leon Hwang <[email protected]>
bpf: Fix tr dereferencing
Pin-yen Lin <[email protected]>
wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet
Arnd Bergmann <[email protected]>
wifi: iwlwifi: dbg_ini: fix structure packing
Zhihao Cheng <[email protected]>
ubi: Refuse attaching if mtd's erasesize is 0
Rob Herring <[email protected]>
arm64: Add Cortex-A520 CPU part definition
Jordan Rife <[email protected]>
net: prevent rewrite of msg_name in sock_sendmsg()
Qu Wenruo <[email protected]>
btrfs: reject unknown mount options early
Jordan Rife <[email protected]>
net: replace calls to sock->ops->connect() with kernel_connect()
Gustavo A. R. Silva <[email protected]>
wifi: mwifiex: Fix tlv_buf_left calculation
Gustavo A. R. Silva <[email protected]>
qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info
Dinghao Liu <[email protected]>
scsi: zfcp: Fix a double put in zfcp_port_enqueue()
Greg Kroah-Hartman <[email protected]>
Revert "PCI: qcom: Disable write access to read only registers for IP v2.3.3"
Greg Kroah-Hartman <[email protected]>
Revert "clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz"
Ming Lei <[email protected]>
block: fix use-after-free of q->q_usage_counter
Ilya Dryomov <[email protected]>
rbd: take header_rwsem in rbd_dev_refresh() only when updating
Ilya Dryomov <[email protected]>
rbd: decouple parent info read-in from updating rbd_dev
Ilya Dryomov <[email protected]>
rbd: decouple header read-in from updating rbd_dev->header
Ilya Dryomov <[email protected]>
rbd: move rbd_dev_refresh() definition
Nathan Chancellor <[email protected]>
drm/mediatek: Fix backport issue in mtk_drm_gem_prime_vmap()
Zheng Yejian <[email protected]>
ring-buffer: Fix bytes info in per_cpu buffer stats
Vlastimil Babka <[email protected]>
ring-buffer: remove obsolete comment for free_buffer_page()
Trond Myklebust <[email protected]>
NFSv4: Fix a state manager thread deadlock regression
Benjamin Coddington <[email protected]>
NFS: rename nfs_client_kset to nfs_kset
Benjamin Coddington <[email protected]>
NFS: Cleanup unused rpc_clnt variable
Johan Hovold <[email protected]>
spi: zynqmp-gqspi: fix clock imbalance on probe failure
Dinghao Liu <[email protected]>
spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe
Greg Ungerer <[email protected]>
fs: binfmt_elf_efpic: fix personality for ELF-FDPIC
Matthias Schiffer <[email protected]>
ata: libata-sata: increase PMP SRST timeout to 10s
Damien Le Moal <[email protected]>
ata: libata-core: Do not register PM operations for SAS ports
Damien Le Moal <[email protected]>
ata: libata-core: Fix port and device removal
Damien Le Moal <[email protected]>
ata: libata-core: Fix ata_port_request_pm() locking
Mika Westerberg <[email protected]>
net: thunderbolt: Fix TCPv6 GSO checksum calculation
Nick Desaulniers <[email protected]>
bpf: Fix BTF_ID symbol generation collision in tools/
Jiri Olsa <[email protected]>
bpf: Fix BTF_ID symbol generation collision
Josef Bacik <[email protected]>
btrfs: properly report 0 avail for very full file systems
Steven Rostedt (Google) <[email protected]>
ring-buffer: Update "shortest_full" in polling
Ben Wolsieffer <[email protected]>
proc: nommu: /proc/<pid>/maps: release mmap read lock
Trond Myklebust <[email protected]>
Revert "SUNRPC dont update timeout value on connection reset"
Heiner Kallweit <[email protected]>
i2c: i801: unregister tco_pdev in i801_probe() error path
Niklas Cassel <[email protected]>
ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES
Kailang Yang <[email protected]>
ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: disallow rule removal from chain binding
Pan Bian <[email protected]>
nilfs2: fix potential use after free in nilfs_gccache_submit_read_data()
Andy Shevchenko <[email protected]>
serial: 8250_port: Check IRQ data before use
Daniel Starke <[email protected]>
Revert "tty: n_gsm: fix UAF in gsm_cleanup_mux"
Vishal Goel <[email protected]>
Smack:- Use overlay inode label in smack_inode_copy_up()
Roberto Sassu <[email protected]>
smack: Retrieve transmuting information in smack_inode_getsecurity()
Roberto Sassu <[email protected]>
smack: Record transmuting in smk_transmuted
Irvin Cote <[email protected]>
nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev
Phil Sutter <[email protected]>
netfilter: nft_exthdr: Fix for unsafe packet data read
Phil Sutter <[email protected]>
netfilter: nft_exthdr: Search chunks in SCTP packets only
Mika Westerberg <[email protected]>
watchdog: iTCO_wdt: Set NO_REBOOT if the watchdog is not already running
Mika Westerberg <[email protected]>
watchdog: iTCO_wdt: No need to stop the timer in probe
Pratyush Yadav <[email protected]>
nvme-pci: do not set the NUMA node of device if it has none
Christoph Hellwig <[email protected]>
nvme-pci: factor out a nvme_pci_alloc_dev helper
Christoph Hellwig <[email protected]>
nvme-pci: factor the iod mempool creation into a helper
Mario Limonciello <[email protected]>
ACPI: Check StorageD3Enable _DSD property in ACPI code
Chengming Zhou <[email protected]>
cgroup: Fix suspicious rcu_dereference_check() usage warning
Chengming Zhou <[email protected]>
sched/cpuacct: Optimize away RCU read lock
Chengming Zhou <[email protected]>
sched/cpuacct: Fix charge percpu cpuusage
Andrey Ryabinin <[email protected]>
sched/cpuacct: Fix user/system in shown cpuacct.usage*
Arnaldo Carvalho de Melo <[email protected]>
perf build: Define YYNOMEM as YYNOABORT for bison < 3.81
Thomas Zimmermann <[email protected]>
fbdev/sh7760fb: Depend on FB=y
Johnathan Mantey <[email protected]>
ncsi: Propagate carrier gain/loss events to the NCSI controller
Benjamin Gray <[email protected]>
powerpc/watchpoints: Disable preemption in thread_change_pc()
Hans Verkuil <[email protected]>
media: vb2: frame_vector.c: replace WARN_ONCE with a comment
Stanislav Fomichev <[email protected]>
bpf: Clarify error expectations from bpf_clone_redirect
Han Xu <[email protected]>
spi: nxp-fspi: reset the FLSHxCR1 registers
Niklas Cassel <[email protected]>
ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset()
Michal Grzedzicki <[email protected]>
scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command
Michal Grzedzicki <[email protected]>
scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command
David Thompson <[email protected]>
platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig
Steven Rostedt (Google) <[email protected]>
ring-buffer: Do not attempt to read past "commit"
Ricardo B. Marliere <[email protected]>
selftests: fix dependency checker script
Zheng Yejian <[email protected]>
ring-buffer: Avoid softlockup in ring_buffer_resize()
Zheng Yejian <[email protected]>
selftests/ftrace: Correctly enable event in instance-event.tc
Javed Hasan <[email protected]>
scsi: qedf: Add synchronization between I/O completions and abort
Helge Deller <[email protected]>
parisc: irq: Make irq_stack_union static to avoid sparse warning
Helge Deller <[email protected]>
parisc: drivers: Fix sparse warning
Helge Deller <[email protected]>
parisc: iosapic.c: Fix sparse warnings
Helge Deller <[email protected]>
parisc: sba: Fix compile warning wrt list of SBA devices
Sergey Senozhatsky <[email protected]>
dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock
William A. Kennington III <[email protected]>
i2c: npcm7xx: Fix callback completion ordering
Wenhua Lin <[email protected]>
gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip
Max Filippov <[email protected]>
xtensa: boot/lib: fix function prototypes
Randy Dunlap <[email protected]>
xtensa: boot: don't add include-dirs
Randy Dunlap <[email protected]>
xtensa: iss/network: make functions static
Max Filippov <[email protected]>
xtensa: add default definition for XCHAL_HAVE_DIV32
Dan Carpenter <[email protected]>
power: supply: ucs1002: fix error code in ucs1002_get_property()
Tony Lindgren <[email protected]>
bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up
Tony Lindgren <[email protected]>
ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot
Tony Lindgren <[email protected]>
ARM: dts: Unify pwm-omap-dmtimer node names
Gireesh Hiremath <[email protected]>
ARM: dts: am335x: Guardian: Update beeper label
Geert Uytterhoeven <[email protected]>
ARM: dts: motorola-mapphone: Drop second ti,wlcore compatible value
Carl Philipp Klemm <[email protected]>
ARM: dts: motorola-mapphone: Add 1.2GHz OPP
Tony Lindgren <[email protected]>
ARM: dts: motorola-mapphone: Configure lower temperature passive cooling
Tony Lindgren <[email protected]>
ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4
Krzysztof Kozlowski <[email protected]>
ARM: dts: omap: correct indentation
Timo Alho <[email protected]>
clk: tegra: fix error return case for recalc_rate
Adam Ford <[email protected]>
bus: ti-sysc: Fix missing AM35xx SoC matching
Julien Panis <[email protected]>
bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset()
Christoph Hellwig <[email protected]>
MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled
Qu Wenruo <[email protected]>
btrfs: reset destination buffer when read_extent_buffer() gets invalid range
Werner Fischer <[email protected]>
ata: ahci: Add Elkhart Lake AHCI controller
Mario Limonciello <[email protected]>
ata: ahci: Rename board_ahci_mobile
Paul Menzel <[email protected]>
ata: ahci: Add support for AMD A85 FCH (Hudson D4)
Paul Menzel <[email protected]>
ata: libata: Rename link flag ATA_LFLAG_NO_DB_DELAY
Xiao Liang <[email protected]>
netfilter: nft_exthdr: Fix non-linear header modification
Florian Westphal <[email protected]>
netfilter: exthdr: add support for tcp option removal
Pablo Neira Ayuso <[email protected]>
netfilter: nft_exthdr: break evaluation if setting TCP option fails
Florian Westphal <[email protected]>
netfilter: nf_tables: add and use nft_thoff helper
Florian Westphal <[email protected]>
netfilter: nf_tables: add and use nft_sk helper
Phil Sutter <[email protected]>
netfilter: nft_exthdr: Support SCTP chunks
Jan Engelhardt <[email protected]>
netfilter: use actual socket sk for REJECT action
Konrad Dybcio <[email protected]>
media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts
Dikshita Agarwal <[email protected]>
media: venus: hfi: Add a 6xx boot logic
Bryan O'Donoghue <[email protected]>
media: venus: core: Add differentiator IS_V6(core)
Dikshita Agarwal <[email protected]>
media: venus: hfi: Define additional 6xx registers
Bryan O'Donoghue <[email protected]>
media: venus: hfi,pm,firmware: Convert to block relative addressing
Bryan O'Donoghue <[email protected]>
media: venus: core: Add io base variables for each block
Wolfram Sang <[email protected]>
mmc: renesas_sdhi: register irqs before registering controller
Wolfram Sang <[email protected]>
mmc: tmio: support custom irq masks
Wolfram Sang <[email protected]>
mmc: renesas_sdhi: populate SCC pointer at the proper place
Wolfram Sang <[email protected]>
mmc: renesas_sdhi: probe into TMIO after SCC parameters have been setup
Werner Sembach <[email protected]>
Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN
Huacai Chen <[email protected]>
Input: i8042 - rename i8042-x86ia64io.h to i8042-acpipnpio.h
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: double hook unregistration in netns path
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: unregister flowtable hooks on netns exit
Xiaoke Wang <[email protected]>
i2c: mux: demux-pinctrl: check the return value of devm_kstrdup()
Christophe JAILLET <[email protected]>
gpio: tb10x: Fix an error handling path in tb10x_gpio_probe()
Artem Chernyshev <[email protected]>
net: rds: Fix possible NULL-pointer dereference
Sebastian Andrzej Siewior <[email protected]>
bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI
Sebastian Andrzej Siewior <[email protected]>
locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()
Ahmed S. Darwish <[email protected]>
seqlock: Prefix internal seqcount_t-only macros with a "do_"
Peter Zijlstra <[email protected]>
seqlock: Rename __seqprop() users
Arnd Bergmann <[email protected]>
seqlock: avoid -Wshadow warnings
Jozsef Kadlecsik <[email protected]>
netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
Ziyang Xuan <[email protected]>
team: fix null-ptr-deref when team device type is changed
Eric Dumazet <[email protected]>
net: bridge: use DEV_STATS_INC()
Jie Wang <[email protected]>
net: hns3: add 5ms delay before clear firmware reset irq source
Jian Shen <[email protected]>
net: hns3: only enable unicast promisc when mac table full
Josh Poimboeuf <[email protected]>
x86/srso: Fix SBPB enablement for spec_rstack_overflow=off
Josh Poimboeuf <[email protected]>
x86/srso: Fix srso_show_state() side effect
Stephen Boyd <[email protected]>
platform/x86: intel_scu_ipc: Fail IPC send if still busy
Stephen Boyd <[email protected]>
platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command()
Stephen Boyd <[email protected]>
platform/x86: intel_scu_ipc: Check status upon timeout in ipc_wait_for_interrupt()
Stephen Boyd <[email protected]>
platform/x86: intel_scu_ipc: Check status after timeout in busy_loop()
Eric Dumazet <[email protected]>
dccp: fix dccp_v4_err()/dccp_v6_err() again
Kajol Jain <[email protected]>
powerpc/perf/hv-24x7: Update domain value check
Kyle Zeng <[email protected]>
ipv4: fix null-deref in ipv4_link_failure
Ivan Vecera <[email protected]>
i40e: Fix VF VLAN offloading when port VLAN is configured
Shengjiu Wang <[email protected]>
ASoC: imx-audmix: Fix return error with devm_clk_get()
Sabrina Dubroca <[email protected]>
selftests: tls: swap the TX and RX sockets in some tests
Kees Cook <[email protected]>
selftests/tls: Add {} to avoid static checker warning
Toke Høiland-Jørgensen <[email protected]>
bpf: Avoid deadlock when using queue and stack maps from NMI
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: disallow element removal on anonymous sets
Jerome Brunet <[email protected]>
ASoC: meson: spdifin: start hw on dai probe
Florian Westphal <[email protected]>
netfilter: nf_tables: fix memleak when more than 255 elements expired
Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration
Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails
Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention
Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction
Florian Westphal <[email protected]>
netfilter: nf_tables: defer gc run if previous batch is still pending
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: use correct lock to protect gc_list
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: GC transaction race with abort path
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: GC transaction race with netns dismantle
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path
Florian Westphal <[email protected]>
netfilter: nf_tables: don't fail inserts if duplicate has expired
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: remove busy mark and gc batch API
Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_hash: mark set element as dead when deleting from packet path
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: adapt set backend to use GC transaction API
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: GC transaction API to avoid race with control plane
Florian Westphal <[email protected]>
netfilter: nf_tables: don't skip expired elements during walk
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: integrate pipapo into commit protocol
Steven Rostedt (Google) <[email protected]>
tracing: Have event inject files inc the trace array ref count
Jan Kara <[email protected]>
ext4: do not let fstrim block system suspend
Jan Kara <[email protected]>
ext4: move setting of trimmed bit into ext4_try_to_trim_range()
Kemeng Shi <[email protected]>
ext4: replace the traditional ternary conditional operator with with max()/min()
Dmitry Monakhov <[email protected]>
ext4: mark group as trimmed only if it was fully scanned
Lukas Czerner <[email protected]>
ext4: change s_last_trim_minblks type to unsigned long
Lukas Bulwahn <[email protected]>
ext4: scope ret locally in ext4_try_to_trim_range()
Wang Jianchao <[email protected]>
ext4: add new helper interface ext4_try_to_trim_range()
Wang Jianchao <[email protected]>
ext4: remove the 'group' parameter of ext4_trim_extent
Szuying Chen <[email protected]>
ata: libahci: clear pending interrupt status
Hannes Reinecke <[email protected]>
ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones
Steven Rostedt (Google) <[email protected]>
tracing: Increase trace array ref count on enable and filter files
Trond Myklebust <[email protected]>
SUNRPC: Mark the cred for revalidation if the server rejects it
Trond Myklebust <[email protected]>
NFS/pNFS: Report EINVAL errors from connect() to the server
Trond Myklebust <[email protected]>
NFS: Use the correct commit info in nfs_join_page_group()
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/am335x-guardian.dts | 9 +-
arch/arm/boot/dts/am3517-evm.dts | 2 +-
arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 2 +-
arch/arm/boot/dts/motorola-mapphone-common.dtsi | 33 +-
arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 6 +-
arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 6 +-
arch/arm/boot/dts/omap3-cm-t3517.dts | 12 +-
arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 3 +-
arch/arm/boot/dts/omap3-gta04.dtsi | 8 +-
arch/arm/boot/dts/omap3-ldp.dts | 2 +-
arch/arm/boot/dts/omap3-n900.dts | 40 +-
arch/arm/boot/dts/omap3-zoom3.dts | 44 +--
arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 29 +-
arch/arm/boot/dts/omap443x.dtsi | 1 +
arch/arm/boot/dts/omap4460.dtsi | 1 +
arch/arm/boot/dts/omap5-cm-t54.dts | 64 +--
arch/arm64/include/asm/cputype.h | 2 +
arch/mips/alchemy/devboards/db1000.c | 4 +
arch/mips/alchemy/devboards/db1200.c | 6 +
arch/mips/alchemy/devboards/db1300.c | 4 +
arch/parisc/include/asm/ldcw.h | 36 +-
arch/parisc/include/asm/ropes.h | 3 +
arch/parisc/include/asm/spinlock_types.h | 5 -
arch/parisc/kernel/drivers.c | 2 +-
arch/parisc/kernel/irq.c | 2 +-
arch/powerpc/kernel/hw_breakpoint.c | 7 +-
arch/powerpc/perf/hv-24x7.c | 2 +-
arch/x86/kernel/cpu/bugs.c | 4 +-
arch/xtensa/boot/Makefile | 3 +-
arch/xtensa/boot/lib/zmem.c | 5 +-
arch/xtensa/include/asm/core.h | 4 +
arch/xtensa/platforms/iss/network.c | 4 +-
block/blk-core.c | 2 -
block/blk-sysfs.c | 2 +
drivers/acpi/device_pm.c | 29 ++
drivers/ata/ahci.c | 111 +++---
drivers/ata/ahci_brcm.c | 2 +-
drivers/ata/ahci_xgene.c | 4 -
drivers/ata/libahci.c | 49 +--
drivers/ata/libata-core.c | 41 +-
drivers/ata/libata-eh.c | 13 +-
drivers/ata/libata-sata.c | 2 +-
drivers/ata/libata-scsi.c | 2 +-
drivers/ata/libata-transport.c | 9 +-
drivers/ata/libata.h | 2 +
drivers/base/regmap/regcache-rbtree.c | 3 +-
drivers/block/rbd.c | 412 ++++++++++---------
drivers/bus/ti-sysc.c | 31 +-
drivers/char/agp/parisc-agp.c | 2 -
drivers/clk/imx/clk-pll14xx.c | 2 +
drivers/clk/tegra/clk-bpmp.c | 2 +-
drivers/gpio/gpio-aspeed.c | 2 +-
drivers/gpio/gpio-pmic-eic-sprd.c | 1 +
drivers/gpio/gpio-pxa.c | 1 +
drivers/gpio/gpio-tb10x.c | 6 +-
drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +-
drivers/i2c/busses/i2c-i801.c | 1 +
drivers/i2c/busses/i2c-npcm7xx.c | 17 +-
drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 +
drivers/infiniband/core/cma.c | 2 +-
drivers/infiniband/core/cma_configfs.c | 2 +-
drivers/infiniband/core/nldev.c | 1 +
drivers/infiniband/core/uverbs_main.c | 2 +-
drivers/infiniband/hw/mlx4/sysfs.c | 2 +-
drivers/infiniband/hw/mlx5/main.c | 2 +-
drivers/infiniband/sw/siw/siw_cm.c | 16 +-
.../serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} | 13 +-
drivers/input/serio/i8042.h | 2 +-
drivers/md/dm-zoned-target.c | 15 +-
drivers/media/platform/qcom/venus/core.c | 12 +
drivers/media/platform/qcom/venus/core.h | 11 +
drivers/media/platform/qcom/venus/firmware.c | 28 +-
drivers/media/platform/qcom/venus/hfi_venus.c | 94 +++--
drivers/media/platform/qcom/venus/hfi_venus_io.h | 114 ++++--
drivers/media/platform/qcom/venus/pm_helpers.c | 12 +-
drivers/mmc/host/renesas_sdhi_core.c | 19 +-
drivers/mmc/host/tmio_mmc.h | 1 +
drivers/mmc/host/tmio_mmc_core.c | 8 +-
drivers/mtd/ubi/build.c | 7 +
drivers/net/dsa/mv88e6xxx/chip.c | 6 +-
drivers/net/dsa/mv88e6xxx/global1.c | 31 --
drivers/net/dsa/mv88e6xxx/global1.h | 1 -
drivers/net/dsa/mv88e6xxx/global2.c | 2 +-
drivers/net/dsa/mv88e6xxx/global2.h | 1 +
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 +-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 +-
drivers/net/ethernet/qlogic/qed/qed_ll2.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 7 +-
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 1 +
drivers/net/team/team.c | 10 +-
drivers/net/thunderbolt.c | 3 +-
drivers/net/usb/smsc75xx.c | 4 +-
drivers/net/wan/fsl_ucc_hdlc.c | 12 +-
drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 6 +-
.../net/wireless/marvell/mwifiex/11n_rxreorder.c | 4 +-
drivers/net/wireless/marvell/mwifiex/sta_rx.c | 16 +-
.../net/wireless/mediatek/mt76/mt76x02_eeprom.c | 7 -
drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 13 +-
drivers/nvme/host/pci.c | 149 +++----
drivers/of/dynamic.c | 6 +-
drivers/parisc/iosapic.c | 4 +-
drivers/parisc/iosapic_private.h | 4 +-
drivers/pci/controller/dwc/pcie-qcom.c | 2 -
drivers/platform/mellanox/Kconfig | 1 +
drivers/platform/x86/intel_scu_ipc.c | 66 ++--
drivers/power/supply/ucs1002_power.c | 3 +-
drivers/s390/scsi/zfcp_aux.c | 9 +-
drivers/scsi/pm8001/pm8001_hwi.c | 2 +-
drivers/scsi/pm8001/pm80xx_hwi.c | 4 +-
drivers/scsi/qedf/qedf_io.c | 10 +-
drivers/scsi/qedf/qedf_main.c | 7 +-
drivers/spi/spi-nxp-fspi.c | 7 +
drivers/spi/spi-zynqmp-gqspi.c | 24 +-
drivers/target/target_core_device.c | 11 +-
drivers/tty/n_gsm.c | 4 +-
drivers/tty/serial/8250/8250_port.c | 5 +-
drivers/video/fbdev/Kconfig | 2 +-
drivers/watchdog/iTCO_wdt.c | 26 +-
fs/binfmt_elf_fdpic.c | 5 +-
fs/btrfs/extent_io.c | 8 +-
fs/btrfs/super.c | 6 +-
fs/ext4/ext4.h | 2 +-
fs/ext4/mballoc.c | 138 ++++---
fs/nfs/direct.c | 8 +-
fs/nfs/flexfilelayout/flexfilelayout.c | 1 +
fs/nfs/nfs4proc.c | 4 +-
fs/nfs/nfs4state.c | 47 ++-
fs/nfs/sysfs.c | 16 +-
fs/nfs/write.c | 23 +-
fs/nilfs2/gcinode.c | 6 +-
fs/proc/task_nommu.c | 27 +-
include/linux/acpi.h | 5 +
include/linux/bpf.h | 2 +-
include/linux/btf_ids.h | 2 +-
include/linux/cgroup.h | 3 +-
include/linux/if_team.h | 2 +
include/linux/libata.h | 4 +-
include/linux/netfilter/nf_conntrack_sctp.h | 1 +
include/linux/nfs_page.h | 4 +-
include/linux/seqlock.h | 104 ++---
include/net/netfilter/ipv4/nf_reject.h | 4 +-
include/net/netfilter/ipv6/nf_reject.h | 5 +-
include/net/netfilter/nf_tables.h | 136 +++----
include/net/tcp.h | 6 +-
include/uapi/linux/bpf.h | 4 +-
include/uapi/linux/netfilter/nf_tables.h | 2 +
kernel/bpf/queue_stack_maps.c | 21 +-
kernel/dma/debug.c | 20 +-
kernel/sched/cpuacct.c | 84 ++--
kernel/trace/ring_buffer.c | 42 +-
kernel/trace/trace.c | 27 ++
kernel/trace/trace.h | 2 +
kernel/trace/trace_events.c | 6 +-
kernel/trace/trace_events_inject.c | 3 +-
mm/frame_vector.c | 6 +-
net/bridge/br_forward.c | 4 +-
net/bridge/br_input.c | 4 +-
net/core/neighbour.c | 4 +-
net/dccp/ipv4.c | 9 +-
net/dccp/ipv6.c | 9 +-
net/ipv4/netfilter/ipt_REJECT.c | 3 +-
net/ipv4/netfilter/nf_reject_ipv4.c | 6 +-
net/ipv4/netfilter/nft_reject_ipv4.c | 3 +-
net/ipv4/route.c | 4 +-
net/ipv4/tcp_input.c | 13 +
net/ipv4/tcp_output.c | 7 +-
net/ipv6/netfilter/ip6t_REJECT.c | 2 +-
net/ipv6/netfilter/nf_reject_ipv6.c | 5 +-
net/ipv6/netfilter/nft_reject_ipv6.c | 3 +-
net/l2tp/l2tp_ip6.c | 2 +-
net/ncsi/ncsi-aen.c | 5 +
net/netfilter/ipset/ip_set_core.c | 12 +-
net/netfilter/ipvs/ip_vs_sync.c | 4 +-
net/netfilter/nf_conntrack_proto_sctp.c | 43 +-
net/netfilter/nf_tables_api.c | 436 ++++++++++++++++++---
net/netfilter/nf_tables_core.c | 2 +-
net/netfilter/nf_tables_trace.c | 6 +-
net/netfilter/nft_exthdr.c | 193 ++++++++-
net/netfilter/nft_flow_offload.c | 2 +-
net/netfilter/nft_payload.c | 10 +-
net/netfilter/nft_reject_inet.c | 6 +-
net/netfilter/nft_set_hash.c | 87 ++--
net/netfilter/nft_set_pipapo.c | 115 ++++--
net/netfilter/nft_set_rbtree.c | 199 ++++++----
net/netfilter/nft_synproxy.c | 4 +-
net/netfilter/nft_tproxy.c | 4 +-
net/nfc/llcp_core.c | 2 +
net/rds/rdma_transport.c | 8 +-
net/rds/tcp_connect.c | 2 +-
net/sctp/associola.c | 3 +-
net/sctp/socket.c | 1 +
net/socket.c | 29 +-
net/sunrpc/clnt.c | 4 +-
net/tipc/crypto.c | 4 +-
scripts/mod/file2alias.c | 2 +-
security/integrity/ima/Kconfig | 21 +-
security/smack/smack.h | 1 +
security/smack/smack_lsm.c | 65 ++-
sound/pci/hda/hda_intel.c | 1 +
sound/soc/fsl/imx-audmix.c | 2 +-
sound/soc/meson/axg-spdifin.c | 49 +--
tools/include/linux/btf_ids.h | 2 +-
tools/include/uapi/linux/bpf.h | 4 +-
tools/perf/util/Build | 6 +
tools/power/cpupower/Makefile | 8 +-
tools/power/cpupower/bench/Makefile | 2 +-
.../ftrace/test.d/instances/instance-event.tc | 2 +-
tools/testing/selftests/kselftest_deps.sh | 77 +++-
tools/testing/selftests/net/tls.c | 11 +-
211 files changed, 2713 insertions(+), 1552 deletions(-)Greg Kroah-Hartman
maintainerPATCH 1/226 NFS: Use the correct commit info in nfs_join_page_group()
5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit b193a78ddb5ee7dba074d3f28dc050069ba083c0 ]
Ensure that nfs_clear_request_commit() updates the correct counters when it removes them from the commit list.
--- fs/nfs/direct.c | 8 +++++--- fs/nfs/write.c | 23 ++++++++++++----------- include/linux/nfs_page.h | 4 +++- 3 files changed, 20 insertions(+), 15 deletions(-)
fs/nfs/direct.c +5 -3
@@ -525,7 +525,9 @@ static void nfs_direct_add_page_head(struct list_head *list,kref_get (&head->wb_kref); } -static void nfs_direct_join_group (struct list_head *list,struct inode *inode) +static void nfs_direct_join_group (struct list_head *list, +struct nfs_commit_info *cinfo, +struct inode *inode) {struct nfs_page *req, *subreq;
@@ -547,7 +549,7 @@ static void nfs_direct_join_group(struct list_head *list, struct inode *inode)nfs_release_request (subreq); } }while ((subreq = subreq->wb_this_page) != req); -nfs_join_page_group (req, inode); +nfs_join_page_group (req, cinfo, inode); } }
@@ -573,7 +575,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)nfs_init_cinfo_from_dreq (&cinfo, dreq);nfs_direct_write_scan_commit_list (dreq->inode, &reqs, &cinfo); -nfs_direct_join_group (&reqs, dreq->inode); +nfs_direct_join_group (&reqs, &cinfo, dreq->inode); dreq->count =0 ; dreq->max_count =0 ;
fs/nfs/write.c +12 -11
@@ -58,7 +58,8 @@ static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops;static const struct nfs_commit_completion_ops nfs_commit_completion_ops;static const struct nfs_rw_ops nfs_rw_write_ops;static void nfs_inode_remove_request (struct nfs_page *req); -static void nfs_clear_request_commit (struct nfs_page *req); +static void nfs_clear_request_commit (struct nfs_commit_info *cinfo, +struct nfs_page *req);static void nfs_init_cinfo_from_inode (struct nfs_commit_info *cinfo,struct inode *inode); static struct nfs_page *
@@ -500,8 +501,8 @@ nfs_destroy_unlinked_subrequests(struct nfs_page *destroy_list,* the (former) group. All subrequests are removed from any write or commit * lists, unlinked from the group and destroyed. */ -void -nfs_join_page_group (struct nfs_page *head,struct inode *inode) +void nfs_join_page_group (struct nfs_page *head,struct nfs_commit_info *cinfo, +struct inode *inode) {struct nfs_page *subreq;struct nfs_page *destroy_list =NULL ;
@@ -531,7 +532,7 @@ nfs_join_page_group(struct nfs_page *head, struct inode *inode)* Commit list removal accounting is done after locks are dropped */ subreq = head;do { -nfs_clear_request_commit (subreq); +nfs_clear_request_commit (cinfo, subreq); subreq = subreq->wb_this_page; }while (subreq != head);
@@ -565,8 +566,10 @@ nfs_lock_and_join_requests(struct page *page) {struct inode *inode =page_file_mapping (page)->host;struct nfs_page *head; +struct nfs_commit_info cinfo;int ret; +nfs_init_cinfo_from_inode (&cinfo, inode);/* * A reference is taken only on the head request which acts as a * reference to the whole page group - the group will not be destroyed
@@ -583,7 +586,7 @@ nfs_lock_and_join_requests(struct page *page)return ERR_PTR (ret); } -nfs_join_page_group (head, inode); +nfs_join_page_group (head, &cinfo, inode);return head; }
@@ -944,18 +947,16 @@ nfs_clear_page_commit(struct page *page) }/* Called holding the request lock on @req */ -static void -nfs_clear_request_commit (struct nfs_page *req) +static void nfs_clear_request_commit (struct nfs_commit_info *cinfo, +struct nfs_page *req) {if (test_bit (PG_CLEAN , &req->wb_flags)) {struct nfs_open_context *ctx =nfs_req_openctx (req);struct inode *inode =d_inode (ctx->dentry); -struct nfs_commit_info cinfo; -nfs_init_cinfo_from_inode (&cinfo, inode);mutex_lock (&NFS_I (inode)->commit_mutex); -if (!pnfs_clear_request_commit (req, &cinfo)) { -nfs_request_remove_commit_list (req, &cinfo); +if (!pnfs_clear_request_commit (req, cinfo)) { +nfs_request_remove_commit_list (req, cinfo); }mutex_unlock (&NFS_I (inode)->commit_mutex);nfs_clear_page_commit (req->wb_page);
include/linux/nfs_page.h +3 -1
@@ -145,7 +145,9 @@ extern void nfs_unlock_request(struct nfs_page *req);extern void nfs_unlock_and_release_request (struct nfs_page *);extern struct nfs_page *nfs_page_group_lock_head (struct nfs_page *req);extern int nfs_page_group_lock_subrequests (struct nfs_page *head); -extern void nfs_join_page_group (struct nfs_page *head,struct inode *inode); +extern void nfs_join_page_group (struct nfs_page *head, +struct nfs_commit_info *cinfo, +struct inode *inode);extern int nfs_page_group_lock (struct nfs_page *);extern void nfs_page_group_unlock (struct nfs_page *);extern bool nfs_page_group_sync_on_bit (struct nfs_page *,unsigned int );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 2/226 NFS/pNFS: Report EINVAL errors from connect() to the server
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit dd7d7ee3ba2a70d12d02defb478790cf57d5b87b ]
With IPv6, connect() can occasionally return EINVAL if a route is unavailable. If this happens during I/O to a data server, we want to report it using LAYOUTERROR as an inability to connect.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 1 + 1 file changed, 1 insertion(+)
fs/nfs/flexfilelayout/flexfilelayout.c +1 -0
@@ -1240,6 +1240,7 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,case -EPFNOSUPPORT :case -EPROTONOSUPPORT :case -EOPNOTSUPP : +case -EINVAL :case -ECONNREFUSED :case -ECONNRESET :case -EHOSTDOWN :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 3/226 SUNRPC: Mark the cred for revalidation if the server rejects it
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit 611fa42dfa9d2f3918ac5f4dd5705dfad81b323d ]
If the server rejects the credential as being stale, or bad, then we should mark it for revalidation before retransmitting.
--- net/sunrpc/clnt.c | 1 + 1 file changed, 1 insertion(+)
net/sunrpc/clnt.c +1 -0
@@ -2630,6 +2630,7 @@ rpc_decode_header(struct rpc_task *task, struct xdr_stream *xdr)case rpc_autherr_rejectedverf:case rpcsec_gsserr_credproblem:case rpcsec_gsserr_ctxproblem: +rpcauth_invalcred (task);if (!task->tk_cred_retry)break ; task->tk_cred_retry--;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 4/226 tracing: Increase trace array ref count on enable and filter files
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit f5ca233e2e66dc1c249bf07eefa37e34a6c9346a ]
When the trace event enable and filter files are opened, increment the trace array ref counter, otherwise they can be accessed when the trace array is being deleted. The ref counter keeps the trace array from being deleted while those files are opened.
--- kernel/trace/trace.c | 27 +++++++++++++++++++++++++++ kernel/trace/trace.h | 2 ++ kernel/trace/trace_events.c | 6 ++++-- 3 files changed, 33 insertions(+), 2 deletions(-)
kernel/trace/trace.c +27 -0
@@ -4559,6 +4559,33 @@ int tracing_open_generic_tr(struct inode *inode, struct file *filp)return 0 ; } +/* +* The private pointer of the inode is the trace_event_file. +* Update the tr ref count associated to it. +*/ +int tracing_open_file_tr (struct inode *inode,struct file *filp) +{ +struct trace_event_file *file = inode->i_private; +int ret; + + ret =tracing_check_open_get_tr (file->tr); +if (ret) +return ret; + + filp->private_data = inode->i_private; + +return 0 ; +} + +int tracing_release_file_tr (struct inode *inode,struct file *filp) +{ +struct trace_event_file *file = inode->i_private; + +trace_array_put (file->tr); + +return 0 ; +} +static int tracing_release (struct inode *inode,struct file *file) {struct trace_array *tr = inode->i_private;
kernel/trace/trace.h +2 -0
@@ -730,6 +730,8 @@ void tracing_reset_all_online_cpus(void);void tracing_reset_all_online_cpus_unlocked (void );int tracing_open_generic (struct inode *inode,struct file *filp);int tracing_open_generic_tr (struct inode *inode,struct file *filp); +int tracing_open_file_tr (struct inode *inode,struct file *filp); +int tracing_release_file_tr (struct inode *inode,struct file *filp);bool tracing_is_disabled (void );bool tracer_tracing_is_on (struct trace_array *tr);void tracer_tracing_on (struct trace_array *tr);
kernel/trace/trace_events.c +4 -2
@@ -1855,9 +1855,10 @@ static const struct file_operations ftrace_set_event_notrace_pid_fops = { };static const struct file_operations ftrace_enable_fops = { - .open = tracing_open_generic, + .open = tracing_open_file_tr, .read = event_enable_read, .write = event_enable_write, + .release = tracing_release_file_tr, .llseek = default_llseek, };
@@ -1874,9 +1875,10 @@ static const struct file_operations ftrace_event_id_fops = { };static const struct file_operations ftrace_event_filter_fops = { - .open = tracing_open_generic, + .open = tracing_open_file_tr, .read = event_filter_read, .write = event_filter_write, + .release = tracing_release_file_tr, .llseek = default_llseek, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 5/226 ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Reinecke <[email protected]>
[ Upstream commit 93c7711494f47f9c829321e2a8711671b02f6e4c ]
Drop pointless VPRINTK() calls for entering and existing interrupt routines and convert the remaining calls to dev_dbg().
Stable-dep-of: 737dd811a3db ("ata: libahci: clear pending interrupt status")
--- drivers/ata/ahci.c | 4 +--- drivers/ata/ahci_xgene.c | 4 ---- drivers/ata/libahci.c | 18 ++++-------------- 3 files changed, 5 insertions(+), 21 deletions(-)
drivers/ata/ahci.c +1 -3
@@ -703,7 +703,7 @@ static void ahci_pci_init_controller(struct ata_host *host)/* clear port IRQ */ tmp =readl (port_mmio +PORT_IRQ_STAT ); -VPRINTK ("PORT_IRQ_STAT 0x%x\n" , tmp); +dev_dbg (&pdev->dev,"PORT_IRQ_STAT 0x%x\n" , tmp);if (tmp)writel (tmp, port_mmio +PORT_IRQ_STAT ); }
@@ -1495,7 +1495,6 @@ static irqreturn_t ahci_thunderx_irq_handler(int irq, void *dev_instance)u32 irq_stat, irq_masked;unsigned int handled =1 ; -VPRINTK ("ENTER\n" ); hpriv = host->private_data; mmio = hpriv->mmio; irq_stat =readl (mmio +HOST_IRQ_STAT );
@@ -1512,7 +1511,6 @@ static irqreturn_t ahci_thunderx_irq_handler(int irq, void *dev_instance) irq_stat =readl (mmio +HOST_IRQ_STAT );spin_unlock (&host->lock); }while (irq_stat); -VPRINTK ("EXIT\n" );return IRQ_RETVAL (handled); }
drivers/ata/ahci_xgene.c +0 -4
@@ -588,8 +588,6 @@ static irqreturn_t xgene_ahci_irq_intr(int irq, void *dev_instance)void __iomem *mmio;u32 irq_stat, irq_masked; -VPRINTK ("ENTER\n" ); - hpriv = host->private_data; mmio = hpriv->mmio;
@@ -612,8 +610,6 @@ static irqreturn_t xgene_ahci_irq_intr(int irq, void *dev_instance)spin_unlock (&host->lock); -VPRINTK ("EXIT\n" ); -return IRQ_RETVAL (rc); }
drivers/ata/libahci.c +4 -14
@@ -1215,12 +1215,12 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap,/* clear SError */ tmp =readl (port_mmio +PORT_SCR_ERR ); -VPRINTK ("PORT_SCR_ERR 0x%x\n" , tmp); +dev_dbg (dev,"PORT_SCR_ERR 0x%x\n" , tmp);writel (tmp, port_mmio +PORT_SCR_ERR );/* clear port IRQ */ tmp =readl (port_mmio +PORT_IRQ_STAT ); -VPRINTK ("PORT_IRQ_STAT 0x%x\n" , tmp); +dev_dbg (dev,"PORT_IRQ_STAT 0x%x\n" , tmp);if (tmp)writel (tmp, port_mmio +PORT_IRQ_STAT );
@@ -1251,10 +1251,10 @@ void ahci_init_controller(struct ata_host *host) } tmp =readl (mmio +HOST_CTL ); -VPRINTK ("HOST_CTL 0x%x\n" , tmp); +dev_dbg (host->dev,"HOST_CTL 0x%x\n" , tmp);writel (tmp |HOST_IRQ_EN , mmio +HOST_CTL ); tmp =readl (mmio +HOST_CTL ); -VPRINTK ("HOST_CTL 0x%x\n" , tmp); +dev_dbg (host->dev,"HOST_CTL 0x%x\n" , tmp); }EXPORT_SYMBOL_GPL (ahci_init_controller);
@@ -1905,8 +1905,6 @@ static irqreturn_t ahci_multi_irqs_intr_hard(int irq, void *dev_instance)void __iomem *port_mmio =ahci_port_base (ap);u32 status; -VPRINTK ("ENTER\n" ); - status =readl (port_mmio +PORT_IRQ_STAT );writel (status, port_mmio +PORT_IRQ_STAT );
@@ -1914,8 +1912,6 @@ static irqreturn_t ahci_multi_irqs_intr_hard(int irq, void *dev_instance)ahci_handle_port_interrupt (ap, port_mmio, status);spin_unlock (ap->lock); -VPRINTK ("EXIT\n" ); -return IRQ_HANDLED ; }
@@ -1932,9 +1928,7 @@ u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked) ap = host->ports[i];if (ap) {ahci_port_intr (ap); -VPRINTK ("port %u\n" , i); }else { -VPRINTK ("port %u (no irq)\n" , i);if (ata_ratelimit ())dev_warn (host->dev,"interrupt on disabled port %u\n" , i);
@@ -1955,8 +1949,6 @@ static irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance)void __iomem *mmio;u32 irq_stat, irq_masked; -VPRINTK ("ENTER\n" ); - hpriv = host->private_data; mmio = hpriv->mmio;
@@ -1984,8 +1976,6 @@ static irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance)spin_unlock (&host->lock); -VPRINTK ("EXIT\n" ); -return IRQ_RETVAL (rc); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 6/226 ata: libahci: clear pending interrupt status
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Szuying Chen <[email protected]>
[ Upstream commit 737dd811a3dbfd7edd4ad2ba5152e93d99074f83 ]
When a CRC error occurs, the HBA asserts an interrupt to indicate an interface fatal error (PxIS.IFS). The ISR clears PxIE and PxIS, then does error recovery. If the adapter receives another SDB FIS with an error (PxIS.TFES) from the device before the start of the EH recovery process, the interrupt signaling the new SDB cannot be serviced as PxIE was cleared already. This in turn results in the HBA inability to issue any command during the error recovery process after setting PxCMD.ST to 1 because PxIS.TFES is still set.
According to AHCI 1.3.1 specifications section 6.2.2, fatal errors notified by setting PxIS.HBFS, PxIS.HBDS, PxIS.IFS or PxIS.TFES will cause the HBA to enter the ERR:Fatal state. In this state, the HBA shall not issue any new commands.
To avoid this situation, introduce the function ahci_port_clear_pending_irq() to clear pending interrupts before executing a COMRESET. This follows the AHCI 1.3.1 - section 6.2.2.2 specification.
--- drivers/ata/libahci.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-)
drivers/ata/libahci.c +23 -12
@@ -1199,6 +1199,26 @@ static ssize_t ahci_activity_show(struct ata_device *dev, char *buf)return sprintf (buf,"%d\n" , emp->blink_policy); } +static void ahci_port_clear_pending_irq (struct ata_port *ap) +{ +struct ahci_host_priv *hpriv = ap->host->private_data; +void __iomem *port_mmio =ahci_port_base (ap); +u32 tmp; + +/* clear SError */ + tmp =readl (port_mmio +PORT_SCR_ERR ); +dev_dbg (ap->host->dev,"PORT_SCR_ERR 0x%x\n" , tmp); +writel (tmp, port_mmio +PORT_SCR_ERR ); + +/* clear port IRQ */ + tmp =readl (port_mmio +PORT_IRQ_STAT ); +dev_dbg (ap->host->dev,"PORT_IRQ_STAT 0x%x\n" , tmp); +if (tmp) +writel (tmp, port_mmio +PORT_IRQ_STAT ); + +writel (1 << ap->port_no, hpriv->mmio +HOST_IRQ_STAT ); +} +static void ahci_port_init (struct device *dev,struct ata_port *ap,int port_no,void __iomem *mmio,void __iomem *port_mmio)
@@ -1213,18 +1233,7 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap,if (rc)dev_warn (dev,"%s (%d)\n" , emsg, rc); -/* clear SError */ - tmp =readl (port_mmio +PORT_SCR_ERR ); -dev_dbg (dev,"PORT_SCR_ERR 0x%x\n" , tmp); -writel (tmp, port_mmio +PORT_SCR_ERR ); - -/* clear port IRQ */ - tmp =readl (port_mmio +PORT_IRQ_STAT ); -dev_dbg (dev,"PORT_IRQ_STAT 0x%x\n" , tmp); -if (tmp) -writel (tmp, port_mmio +PORT_IRQ_STAT ); - -writel (1 << port_no, mmio +HOST_IRQ_STAT ); +ahci_port_clear_pending_irq (ap);/* mark esata ports */ tmp =readl (port_mmio +PORT_CMD );
@@ -1554,6 +1563,8 @@ int ahci_do_hardreset(struct ata_link *link, unsigned int *class, tf.command =ATA_BUSY ;ata_tf_to_fis (&tf,0 ,0 , d2h_fis); +ahci_port_clear_pending_irq (ap); + rc =sata_link_hardreset (link, timing, deadline, online, ahci_check_ready);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 7/226 ext4: remove the group parameter of ext4_trim_extent
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Jianchao <[email protected]>
[ Upstream commit bd2eea8d0a6b6a9aca22f20bf74f73b71d8808af ]
Get rid of the 'group' parameter of ext4_trim_extent as we can get it from the 'e4b'.
Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
--- fs/ext4/mballoc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
fs/ext4/mballoc.c +4 -5
@@ -5859,19 +5859,19 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,* @sb: super block for the file system * @start: starting block of the free extent in the alloc. group * @count: number of blocks to TRIM -* @group: alloc. group we are working with * @e4b: ext4 buddy for the group * * Trim "count" blocks starting at "start" in the "group". To assure that no * one will allocate those blocks, mark it as used in buddy bitmap. This must * be called with under the group lock. */ -static int ext4_trim_extent (struct super_block *sb,int start,int count, -ext4_group_t group,struct ext4_buddy *e4b) +static int ext4_trim_extent (struct super_block *sb, +int start,int count,struct ext4_buddy *e4b)__releases (bitlock)__acquires (bitlock) {struct ext4_free_extent ex; +ext4_group_t group = e4b->bd_group;int ret =0 ;trace_ext4_trim_extent (sb, group, start, count);
@@ -5947,8 +5947,7 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group, next =mb_find_next_bit (bitmap, max +1 , start);if ((next - start) >= minblocks) { - ret =ext4_trim_extent (sb, start, - next - start, group, &e4b); + ret =ext4_trim_extent (sb, start, next - start, &e4b);if (ret && ret != -EOPNOTSUPP )break ; ret =0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 8/226 ext4: add new helper interface ext4_try_to_trim_range()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Jianchao <[email protected]>
[ Upstream commit 6920b3913235f517728bb69abe9b39047a987113 ]
There is no functional change in this patch but just split the codes, which serachs free block and does trim, into a new function ext4_try_to_trim_range. This is preparing for the following async backgroup discard.
Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
--- fs/ext4/mballoc.c | 102 ++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 45 deletions(-)
fs/ext4/mballoc.c +57 -45
@@ -5894,6 +5894,54 @@ __acquires(bitlock)return ret; } +static int ext4_try_to_trim_range (struct super_block *sb, +struct ext4_buddy *e4b,ext4_grpblk_t start, +ext4_grpblk_t max,ext4_grpblk_t minblocks) +{ +ext4_grpblk_t next, count, free_count; +void *bitmap; +int ret =0 ; + + bitmap = e4b->bd_bitmap; + start = (e4b->bd_info->bb_first_free > start) ? + e4b->bd_info->bb_first_free : start; + count =0 ; + free_count =0 ; + +while (start <= max) { + start =mb_find_next_zero_bit (bitmap, max +1 , start); +if (start > max) +break ; + next =mb_find_next_bit (bitmap, max +1 , start); + +if ((next - start) >= minblocks) { + ret =ext4_trim_extent (sb, start, next - start, e4b); +if (ret && ret != -EOPNOTSUPP ) +break ; + ret =0 ; + count += next - start; + } + free_count += next - start; + start = next +1 ; + +if (fatal_signal_pending (current)) { + count = -ERESTARTSYS ; +break ; + } + +if (need_resched ()) { +ext4_unlock_group (sb, e4b->bd_group); +cond_resched (); +ext4_lock_group (sb, e4b->bd_group); + } + +if ((e4b->bd_info->bb_free - free_count) < minblocks) +break ; + } + +return count; +} +/** * ext4_trim_all_free -- function to trim all free space in alloc. group * @sb: super block for file system
@@ -5917,10 +5965,8 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group, ext4_grpblk_t start, ext4_grpblk_t max, ext4_grpblk_t minblocks) { - void *bitmap; -ext4_grpblk_t next, count =0 , free_count =0 ; struct ext4_buddy e4b; -int ret =0 ; +int ret;trace_ext4_trim_all_free (sb, group, start, max);
@@ -5930,57 +5976,23 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group, ret, group);return ret; } - bitmap = e4b.bd_bitmap;ext4_lock_group (sb, group); -if (EXT4_MB_GRP_WAS_TRIMMED (e4b.bd_info) && - minblocks >=atomic_read (&EXT4_SB (sb)->s_last_trim_minblks)) - goto out; - - start = (e4b.bd_info->bb_first_free > start) ? - e4b.bd_info->bb_first_free : start; -while (start <= max) { - start =mb_find_next_zero_bit (bitmap, max +1 , start); -if (start > max) -break ; - next =mb_find_next_bit (bitmap, max +1 , start); - -if ((next - start) >= minblocks) { - ret =ext4_trim_extent (sb, start, next - start, &e4b); -if (ret && ret != -EOPNOTSUPP ) -break ; - ret =0 ; - count += next - start; - } - free_count += next - start; - start = next +1 ; - -if (fatal_signal_pending (current)) { - count = -ERESTARTSYS ; -break ; - } - -if (need_resched ()) { -ext4_unlock_group (sb, group); -cond_resched (); -ext4_lock_group (sb, group); - } - -if ((e4b.bd_info->bb_free - free_count) < minblocks) -break ; +if (!EXT4_MB_GRP_WAS_TRIMMED (e4b.bd_info) || + minblocks <atomic_read (&EXT4_SB (sb)->s_last_trim_minblks)) { + ret =ext4_try_to_trim_range (sb, &e4b, start, max, minblocks); +if (ret >=0 ) +EXT4_MB_GRP_SET_TRIMMED (e4b.bd_info); + }else { + ret =0 ; } -if (!ret) { - ret = count; -EXT4_MB_GRP_SET_TRIMMED (e4b.bd_info); - } -out:ext4_unlock_group (sb, group);ext4_mb_unload_buddy (&e4b);ext4_debug ("trimmed %d blocks in the group %d\n" , - count, group); + ret, group);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 9/226 ext4: scope ret locally in ext4_try_to_trim_range()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Bulwahn <[email protected]>
[ Upstream commit afcc4e32f606dbfb47aa7309172c89174b86e74c ]
As commit 6920b3913235 ("ext4: add new helper interface ext4_try_to_trim_range()") moves some code into the separate function ext4_try_to_trim_range(), the use of the variable ret within that function is more limited and can be adjusted as well.
Scope the use of the variable ret locally and drop dead assignments.
No functional change.
Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
--- fs/ext4/mballoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/ext4/mballoc.c +2 -3
@@ -5900,7 +5900,6 @@ static int ext4_try_to_trim_range(struct super_block *sb, {ext4_grpblk_t next, count, free_count;void *bitmap; -int ret =0 ; bitmap = e4b->bd_bitmap; start = (e4b->bd_info->bb_first_free > start) ?
@@ -5915,10 +5914,10 @@ static int ext4_try_to_trim_range(struct super_block *sb, next =mb_find_next_bit (bitmap, max +1 , start);if ((next - start) >= minblocks) { - ret =ext4_trim_extent (sb, start, next - start, e4b); +int ret =ext4_trim_extent (sb, start, next - start, e4b); +if (ret && ret != -EOPNOTSUPP )break ; - ret =0 ; count += next - start; } free_count += next - start;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 10/226 ext4: change s_last_trim_minblks type to unsigned long
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Czerner <[email protected]>
[ Upstream commit 2327fb2e23416cfb2795ccca2f77d4d65925be99 ]
There is no good reason for the s_last_trim_minblks to be atomic. There is no data integrity needed and there is no real danger in setting and reading it in a racy manner. Change it to be unsigned long, the same type as s_clusters_per_group which is the maximum that's allowed.
Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
--- fs/ext4/ext4.h | 2 +- fs/ext4/mballoc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
fs/ext4/ext4.h +1 -1
@@ -1580,7 +1580,7 @@ struct ext4_sb_info {struct task_struct *s_mmp_tsk;/* record the last minlen when FITRIM is called. */ -atomic_t s_last_trim_minblks; +unsigned long s_last_trim_minblks;/* Reference to checksum algorithm driver via cryptoapi */ struct crypto_shash *s_chksum_driver;
fs/ext4/mballoc.c +2 -2
@@ -5979,7 +5979,7 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group,ext4_lock_group (sb, group);if (!EXT4_MB_GRP_WAS_TRIMMED (e4b.bd_info) || - minblocks <atomic_read (&EXT4_SB (sb)->s_last_trim_minblks)) { + minblocks <EXT4_SB (sb)->s_last_trim_minblks) { ret =ext4_try_to_trim_range (sb, &e4b, start, max, minblocks);if (ret >=0 )EXT4_MB_GRP_SET_TRIMMED (e4b.bd_info);
@@ -6090,7 +6090,7 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) }if (!ret) -atomic_set (&EXT4_SB (sb)->s_last_trim_minblks, minlen); +EXT4_SB (sb)->s_last_trim_minblks = minlen; out: range->len =EXT4_C2B (EXT4_SB (sb), trimmed) << sb->s_blocksize_bits;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 11/226 ext4: mark group as trimmed only if it was fully scanned
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Monakhov <[email protected]>
[ Upstream commit d63c00ea435a5352f486c259665a4ced60399421 ]
Otherwise nonaligned fstrim calls will works inconveniently for iterative scanners, for example:
// trim [0,16MB] for group-1, but mark full group as trimmed
fstrim -o $((1024*1024*128)) -l $((1024*1024*16)) ./m
// handle [16MB,16MB] for group-1, do nothing because group already has the flag. fstrim -o $((1024*1024*144)) -l $((1024*1024*16)) ./m
[ Update function documentation for ext4_trim_all_free -- TYT ]
Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
--- fs/ext4/mballoc.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
fs/ext4/mballoc.c +12 -6
@@ -5948,6 +5948,7 @@ static int ext4_try_to_trim_range(struct super_block *sb,* @start: first group block to examine * @max: last group block to examine * @minblocks: minimum extent block count +* @set_trimmed: set the trimmed flag if at least one block is trimmed * * ext4_trim_all_free walks through group's buddy bitmap searching for free * extents. When the free block is found, ext4_trim_extent is called to TRIM
@@ -5962,7 +5963,7 @@ static int ext4_try_to_trim_range(struct super_block *sb,static ext4_grpblk_t ext4_trim_all_free (struct super_block *sb,ext4_group_t group,ext4_grpblk_t start,ext4_grpblk_t max, -ext4_grpblk_t minblocks) +ext4_grpblk_t minblocks,bool set_trimmed) {struct ext4_buddy e4b;int ret;
@@ -5981,7 +5982,7 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group,if (!EXT4_MB_GRP_WAS_TRIMMED (e4b.bd_info) || minblocks <EXT4_SB (sb)->s_last_trim_minblks) { ret =ext4_try_to_trim_range (sb, &e4b, start, max, minblocks); -if (ret >=0 ) +if (ret >=0 && set_trimmed)EXT4_MB_GRP_SET_TRIMMED (e4b.bd_info); }else { ret =0 ;
@@ -6018,6 +6019,7 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)ext4_fsblk_t first_data_blk =le32_to_cpu (EXT4_SB (sb)->s_es->s_first_data_block);ext4_fsblk_t max_blks =ext4_blocks_count (EXT4_SB (sb)->s_es); +bool whole_group, eof = false;int ret =0 ; start = range->start >> sb->s_blocksize_bits;
@@ -6036,8 +6038,10 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)if (minlen >EXT4_CLUSTERS_PER_GROUP (sb)) goto out; } -if (end >= max_blks) +if (end >= max_blks -1 ) { end = max_blks -1 ; + eof = true; + }if (end <= first_data_blk) goto out;if (start < first_data_blk)
@@ -6051,6 +6055,7 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)/* end now represents the last cluster to discard in this group */ end =EXT4_CLUSTERS_PER_GROUP (sb) -1 ; + whole_group = true;for (group = first_group; group <= last_group; group++) { grp =ext4_get_group_info (sb, group);
@@ -6069,12 +6074,13 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)* change it for the last group, note that last_cluster is * already computed earlier by ext4_get_group_no_and_offset() */ -if (group == last_group) +if (group == last_group) { end = last_cluster; - + whole_group = eof ? true : end ==EXT4_CLUSTERS_PER_GROUP (sb) -1 ; + }if (grp->bb_free >= minlen) { cnt =ext4_trim_all_free (sb, group, first_cluster, - end, minlen); + end, minlen, whole_group);if (cnt <0 ) { ret = cnt;break ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 12/226 ext4: replace the traditional ternary conditional operator with with max()/min()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kemeng Shi <[email protected]>
[ Upstream commit de8bf0e5ee7482585450357c6d4eddec8efc5cb7 ]
Replace the traditional ternary conditional operator with with max()/min()
Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
--- fs/ext4/mballoc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/ext4/mballoc.c +2 -4
@@ -5902,8 +5902,7 @@ static int ext4_try_to_trim_range(struct super_block *sb,void *bitmap; bitmap = e4b->bd_bitmap; - start = (e4b->bd_info->bb_first_free > start) ? - e4b->bd_info->bb_first_free : start; + start =max (e4b->bd_info->bb_first_free, start); count =0 ; free_count =0 ;
@@ -6125,8 +6124,7 @@ ext4_mballoc_query_range(ext4_lock_group (sb, group); - start = (e4b.bd_info->bb_first_free > start) ? - e4b.bd_info->bb_first_free : start; + start =max (e4b.bd_info->bb_first_free, start);if (end >=EXT4_CLUSTERS_PER_GROUP (sb)) end =EXT4_CLUSTERS_PER_GROUP (sb) -1 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 13/226 ext4: move setting of trimmed bit into ext4_try_to_trim_range()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 45e4ab320c9b5fa67b1fc3b6a9b381cfcc0c8488 ]
Currently we set the group's trimmed bit in ext4_trim_all_free() based on return value of ext4_try_to_trim_range(). However when we will want to abort trimming because of suspend attempt, we want to return success from ext4_try_to_trim_range() but not set the trimmed bit. Instead implementing awkward propagation of this information, just move setting of trimmed bit into ext4_try_to_trim_range() when the whole group is trimmed.
--- fs/ext4/mballoc.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-)
fs/ext4/mballoc.c +25 -21
@@ -5894,14 +5894,27 @@ __acquires(bitlock)return ret; } +static ext4_grpblk_t ext4_last_grp_cluster (struct super_block *sb, +ext4_group_t grp) +{ +if (grp <ext4_get_groups_count (sb)) +return EXT4_CLUSTERS_PER_GROUP (sb) -1 ; +return (ext4_blocks_count (EXT4_SB (sb)->s_es) - +ext4_group_first_block_no (sb, grp) -1 ) >> +EXT4_CLUSTER_BITS (sb); +} +static int ext4_try_to_trim_range (struct super_block *sb,struct ext4_buddy *e4b,ext4_grpblk_t start,ext4_grpblk_t max,ext4_grpblk_t minblocks) {ext4_grpblk_t next, count, free_count; +bool set_trimmed = false;void *bitmap; bitmap = e4b->bd_bitmap; +if (start ==0 && max >=ext4_last_grp_cluster (sb, e4b->bd_group)) + set_trimmed = true; start =max (e4b->bd_info->bb_first_free, start); count =0 ; free_count =0 ;
@@ -5916,16 +5929,14 @@ static int ext4_try_to_trim_range(struct super_block *sb,int ret =ext4_trim_extent (sb, start, next - start, e4b);if (ret && ret != -EOPNOTSUPP ) -break ; +return count; count += next - start; } free_count += next - start; start = next +1 ; -if (fatal_signal_pending (current)) { - count = -ERESTARTSYS ; -break ; - } +if (fatal_signal_pending (current)) +return -ERESTARTSYS ;if (need_resched ()) {ext4_unlock_group (sb, e4b->bd_group);
@@ -5937,6 +5948,9 @@ static int ext4_try_to_trim_range(struct super_block *sb,break ; } +if (set_trimmed) +EXT4_MB_GRP_SET_TRIMMED (e4b->bd_info); +return count; }
@@ -5947,7 +5961,6 @@ static int ext4_try_to_trim_range(struct super_block *sb,* @start: first group block to examine * @max: last group block to examine * @minblocks: minimum extent block count -* @set_trimmed: set the trimmed flag if at least one block is trimmed * * ext4_trim_all_free walks through group's buddy bitmap searching for free * extents. When the free block is found, ext4_trim_extent is called to TRIM
@@ -5962,7 +5975,7 @@ static int ext4_try_to_trim_range(struct super_block *sb,static ext4_grpblk_t ext4_trim_all_free (struct super_block *sb,ext4_group_t group,ext4_grpblk_t start,ext4_grpblk_t max, -ext4_grpblk_t minblocks,bool set_trimmed) +ext4_grpblk_t minblocks) {struct ext4_buddy e4b;int ret;
@@ -5979,13 +5992,10 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group,ext4_lock_group (sb, group);if (!EXT4_MB_GRP_WAS_TRIMMED (e4b.bd_info) || - minblocks <EXT4_SB (sb)->s_last_trim_minblks) { + minblocks <EXT4_SB (sb)->s_last_trim_minblks) ret =ext4_try_to_trim_range (sb, &e4b, start, max, minblocks); -if (ret >=0 && set_trimmed) -EXT4_MB_GRP_SET_TRIMMED (e4b.bd_info); - }else { +else ret =0 ; - }ext4_unlock_group (sb, group);ext4_mb_unload_buddy (&e4b);
@@ -6018,7 +6028,6 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)ext4_fsblk_t first_data_blk =le32_to_cpu (EXT4_SB (sb)->s_es->s_first_data_block);ext4_fsblk_t max_blks =ext4_blocks_count (EXT4_SB (sb)->s_es); -bool whole_group, eof = false;int ret =0 ; start = range->start >> sb->s_blocksize_bits;
@@ -6037,10 +6046,8 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)if (minlen >EXT4_CLUSTERS_PER_GROUP (sb)) goto out; } -if (end >= max_blks -1 ) { +if (end >= max_blks -1 ) end = max_blks -1 ; - eof = true; - }if (end <= first_data_blk) goto out;if (start < first_data_blk)
@@ -6054,7 +6061,6 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)/* end now represents the last cluster to discard in this group */ end =EXT4_CLUSTERS_PER_GROUP (sb) -1 ; - whole_group = true;for (group = first_group; group <= last_group; group++) { grp =ext4_get_group_info (sb, group);
@@ -6073,13 +6079,11 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)* change it for the last group, note that last_cluster is * already computed earlier by ext4_get_group_no_and_offset() */ -if (group == last_group) { +if (group == last_group) end = last_cluster; - whole_group = eof ? true : end ==EXT4_CLUSTERS_PER_GROUP (sb) -1 ; - }if (grp->bb_free >= minlen) { cnt =ext4_trim_all_free (sb, group, first_cluster, - end, minlen, whole_group); + end, minlen);if (cnt <0 ) { ret = cnt;break ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 14/226 ext4: do not let fstrim block system suspend
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 5229a658f6453362fbb9da6bf96872ef25a7097e ]
Len Brown has reported that system suspend sometimes fail due to inability to freeze a task working in ext4_trim_fs() for one minute. Trimming a large filesystem on a disk that slowly processes discard requests can indeed take a long time. Since discard is just an advisory call, it is perfectly fine to interrupt it at any time and the return number of discarded blocks until that moment. Do that when we detect the task is being frozen.
References: https://bugzilla.kernel.org/show_bug.cgi?id=216322
--- fs/ext4/mballoc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/ext4/mballoc.c +10 -2
@@ -16,6 +16,7 @@#include <linux/slab.h> #include <linux/nospec.h> #include <linux/backing-dev.h> +#include <linux/freezer.h> #include <trace/events/ext4.h> /*
@@ -5904,6 +5905,11 @@ static ext4_grpblk_t ext4_last_grp_cluster(struct super_block *sb,EXT4_CLUSTER_BITS (sb); } +static bool ext4_trim_interrupted (void ) +{ +return fatal_signal_pending (current) ||freezing (current); +} +static int ext4_try_to_trim_range (struct super_block *sb,struct ext4_buddy *e4b,ext4_grpblk_t start,ext4_grpblk_t max,ext4_grpblk_t minblocks)
@@ -5935,8 +5941,8 @@ static int ext4_try_to_trim_range(struct super_block *sb, free_count += next - start; start = next +1 ; -if (fatal_signal_pending (current)) -return -ERESTARTSYS ; +if (ext4_trim_interrupted ()) +return count;if (need_resched ()) {ext4_unlock_group (sb, e4b->bd_group);
@@ -6063,6 +6069,8 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) end =EXT4_CLUSTERS_PER_GROUP (sb) -1 ;for (group = first_group; group <= last_group; group++) { +if (ext4_trim_interrupted ()) +break ; grp =ext4_get_group_info (sb, group);if (!grp)continue ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 15/226 tracing: Have event inject files inc the trace array ref count
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit e5c624f027ac74f97e97c8f36c69228ac9f1102d ]
The event inject files add events for a specific trace array. For an instance, if the file is opened and the instance is deleted, reading or writing to the file will cause a use after free.
Up the ref count of the trace_array when a event inject file is opened.
--- kernel/trace/trace_events_inject.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/trace_events_inject.c +2 -1
@@ -323,7 +323,8 @@ event_inject_read(struct file *file, char __user *buf, size_t size, }const struct file_operations event_inject_fops = { - .open = tracing_open_generic, + .open = tracing_open_file_tr, .read = event_inject_read, .write = event_inject_write, + .release = tracing_release_file_tr, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 16/226 netfilter: nf_tables: integrate pipapo into commit protocol
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 212ed75dc5fb9d1423b3942c8f872a868cda3466 upstream.
The pipapo set backend follows copy-on-update approach, maintaining one clone of the existing datastructure that is being updated. The clone and current datastructures are swapped via rcu from the commit step.
The existing integration with the commit protocol is flawed because there is no operation to clean up the clone if the transaction is aborted. Moreover, the datastructure swap happens on set element activation.
This patch adds two new operations for sets: commit and abort, these new operations are invoked from the commit and abort steps, after the transactions have been digested, and it updates the pipapo set backend to use it.
This patch adds a new ->pending_update field to sets to maintain a list of sets that require this new commit and abort operations.
--- include/net/netfilter/nf_tables.h | 4 ++- net/netfilter/nf_tables_api.c | 56 +++++++++++++++++++++++++++++++ net/netfilter/nft_set_pipapo.c | 55 +++++++++++++++++++++--------- 3 files changed, 99 insertions(+), 16 deletions(-)
include/net/netfilter/nf_tables.h +3 -1
@@ -373,7 +373,8 @@ struct nft_set_ops {const struct nft_set *set, const struct nft_set_elem *elem, unsigned int flags); - +void (*commit)(const struct nft_set *set); +void (*abort)(const struct nft_set *set);u64 (*privsize)(const struct nlattr *const nla[],const struct nft_set_desc *desc); bool (*estimate)(const struct nft_set_desc *desc,
@@ -454,6 +455,7 @@ struct nft_set {u16 udlen;unsigned char *udata;struct nft_expr *expr; +struct list_head pending_update;/* runtime data below here */ const struct nft_set_ops *ops____cacheline_aligned ; u16 flags:14,
net/netfilter/nf_tables_api.c +56 -0
118 lines not on this page · raw message
net/netfilter/nft_set_pipapo.c +40 -15
112 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 17/226 netfilter: nf_tables: dont skip expired elements during walk
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
commit 24138933b97b055d486e8064b4a1721702442a9b upstream.
There is an asymmetry between commit/abort and preparation phase if the following conditions are met:
1. set is a verdict map ("1.2.3.4 : jump foo")
2. timeouts are enabled
In this case, following sequence is problematic:
1. element E in set S refers to chain C
2. userspace requests removal of set S
3. kernel does a set walk to decrement chain->use count for all elements from preparation phase
4. kernel does another set walk to remove elements from the commit phase (or another walk to do a chain->use increment for all elements from abort phase)
If E has already expired in 1), it will be ignored during list walk, so its use count won't have been changed.
Then, when set is culled, ->destroy callback will zap the element via nf_tables_set_elem_destroy(), but this function is only safe for elements that have been deactivated earlier from the preparation phase:
lack of earlier deactivate removes the element but leaks the chain use count, which results in a WARN splat when the chain gets removed later, plus a leak of the nft_chain structure.
Update pipapo_get() not to skip expired elements, otherwise flush command reports bogus ENOENT errors.
--- net/netfilter/nf_tables_api.c | 4 ++++ net/netfilter/nft_set_hash.c | 2 -- net/netfilter/nft_set_pipapo.c | 18 ++++++++++++------ net/netfilter/nft_set_rbtree.c | 2 -- 4 files changed, 16 insertions(+), 10 deletions(-)
net/netfilter/nf_tables_api.c +4 -0
@@ -4929,8 +4929,12 @@ static int nf_tables_dump_setelem(const struct nft_ctx *ctx,const struct nft_set_iter *iter, struct nft_set_elem *elem) { + const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);struct nft_set_dump_args *args; +if (nft_set_elem_expired (ext)) +return 0 ; + args = container_of(iter, struct nft_set_dump_args, iter);return nf_tables_fill_setelem (args->skb, set, elem); }
net/netfilter/nft_set_hash.c +0 -2
@@ -277,8 +277,6 @@ static void nft_rhash_walk(const struct nft_ctx *ctx, struct nft_set *set,if (iter->count < iter->skip) goto cont; -if (nft_set_elem_expired (&he->ext)) - goto cont;if (!nft_set_elem_active (&he->ext, iter->genmask)) goto cont;
net/netfilter/nft_set_pipapo.c +12 -6
@@ -566,8 +566,7 @@ static struct nft_pipapo_elem *pipapo_get(const struct net *net, goto out;if (last) { -if (nft_set_elem_expired (&f->mt[b].e->ext) || - (genmask && +if ((genmask && !nft_set_elem_active (&f->mt[b].e->ext, genmask))) goto next_match;
@@ -601,8 +600,17 @@ static struct nft_pipapo_elem *pipapo_get(const struct net *net,static void *nft_pipapo_get (const struct net *net,const struct nft_set *set,const struct nft_set_elem *elem,unsigned int flags) { -return pipapo_get (net, set, (const u8 *)elem->key.val.data, -nft_genmask_cur (net)); +struct nft_pipapo_elem *ret; + + ret =pipapo_get (net, set, (const u8 *)elem->key.val.data, +nft_genmask_cur (net)); +if (IS_ERR (ret)) +return ret; + +if (nft_set_elem_expired (&ret->ext)) +return ERR_PTR (-ENOENT ); + +return ret; }/**
@@ -2009,8 +2017,6 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, goto cont; e = f->mt[r].e; -if (nft_set_elem_expired (&e->ext)) - goto cont; elem.priv = e;
net/netfilter/nft_set_rbtree.c +0 -2
@@ -551,8 +551,6 @@ static void nft_rbtree_walk(const struct nft_ctx *ctx,if (iter->count < iter->skip) goto cont; -if (nft_set_elem_expired (&rbe->ext)) - goto cont;if (!nft_set_elem_active (&rbe->ext, iter->genmask)) goto cont;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 18/226 netfilter: nf_tables: GC transaction API to avoid race with control plane
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 5f68718b34a531a556f2f50300ead2862278da26 upstream.
The set types rhashtable and rbtree use a GC worker to reclaim memory.
Quoted 1 line
From system work queue, in periodic intervals, a scan of the table is
done.
The major caveat here is that the nft transaction mutex is not held. This causes a race between control plane and GC when they attempt to delete the same element.
We cannot grab the netlink mutex from the work queue, because the control plane has to wait for the GC work queue in case the set is to be removed, so we get following deadlock:
cpu 1 cpu2
GC work transaction comes in , lock nft mutex
`acquire nft mutex // BLOCKS
transaction asks to remove the set set destruction calls cancel_work_sync()
cancel_work_sync will now block forever, because it is waiting for the mutex the caller already owns.
This patch adds a new API that deals with garbage collection in two steps:
1) Lockless GC of expired elements sets on the NFT_SET_ELEM_DEAD_BIT so they are not visible via lookup. Annotate current GC sequence in the GC transaction. Enqueue GC transaction work as soon as it is full. If ruleset is updated, then GC transaction is aborted and retried later.
2) GC work grabs the mutex. If GC sequence has changed then this GC transaction lost race with control plane, abort it as it contains stale references to objects and let GC try again later. If the ruleset is intact, then this GC transaction deactivates and removes the elements and it uses call_rcu() to destroy elements.
Note that no elements are removed from GC lockless path, the _DEAD bit is set and pointers are collected. GC catchall does not remove the elements anymore too. There is a new set->dead flag that is set on to abort the GC transaction to deal with set->ops->destroy() path which removes the remaining elements in the set from commit_release, where no mutex is held.
To deal with GC when mutex is held, which allows safe deactivate and removal, add sync GC API which releases the set element object via call_rcu(). This is used by rbtree and pipapo backends which also perform garbage collection from control plane path.
Since element removal from sets can happen from control plane and element garbage collection/timeout, it is necessary to keep the set structure alive until all elements have been deactivated and destroyed.
We cannot do a cancel_work_sync or flush_work in nft_set_destroy because its called with the transaction mutex held, but the aforementioned async work queue might be blocked on the very mutex that nft_set_destroy() callchain is sitting on.
This gives us the choice of ABBA deadlock or UaF.
To avoid both, add set->refs refcount_t member. The GC API can then increment the set refcount and release it once the elements have been free'd.
Set backends are adapted to use the GC transaction API in a follow up patch entitled:
("netfilter: nf_tables: use gc transaction API in set backends")
This is joint work with Florian Westphal.
--- include/net/netfilter/nf_tables.h | 61 ++++++++- net/netfilter/nf_tables_api.c | 216 ++++++++++++++++++++++++++++-- 2 files changed, 267 insertions(+), 10 deletions(-)
include/net/netfilter/nf_tables.h +60 -1
@@ -407,6 +407,7 @@ struct nft_set_type {* * @list: table set list node * @bindings: list of set bindings +* @refs: internal refcounting for async set destruction * @table: table this set belongs to * @net: netnamespace this set belongs to * @name: name of the set
@@ -436,6 +437,7 @@ struct nft_set_type {struct nft_set {struct list_head list;struct list_head bindings; +refcount_t refs;struct nft_table *table;possible_net_t net;char *name;
@@ -458,7 +460,8 @@ struct nft_set {struct list_head pending_update;/* runtime data below here */ const struct nft_set_ops *ops____cacheline_aligned ; - u16 flags:14, + u16 flags:13, + dead:1, genmask:2;u8 klen;u8 dlen;
@@ -1450,6 +1453,32 @@ static inline void nft_set_elem_clear_busy(struct nft_set_ext *ext)clear_bit (NFT_SET_ELEM_BUSY_BIT , word); } +#define NFT_SET_ELEM_DEAD_MASK (1 << 3) + +#if defined(__LITTLE_ENDIAN_BITFIELD) +#define NFT_SET_ELEM_DEAD_BIT 3 +#elif defined(__BIG_ENDIAN_BITFIELD) +#define NFT_SET_ELEM_DEAD_BIT (BITS_PER_LONG - BITS_PER_BYTE + 3) +#else +#error +#endif + +static inline void nft_set_elem_dead (struct nft_set_ext *ext) +{ +unsigned long *word = (unsigned long *)ext; + +BUILD_BUG_ON (offsetof(struct nft_set_ext , genmask) !=0 ); +set_bit (NFT_SET_ELEM_DEAD_BIT , word); +} + +static inline int nft_set_elem_is_dead (const struct nft_set_ext *ext) +{ +unsigned long *word = (unsigned long *)ext; + +BUILD_BUG_ON (offsetof(struct nft_set_ext , genmask) !=0 ); +return test_bit (NFT_SET_ELEM_DEAD_BIT , word); +} +/** * struct nft_trans - nf_tables object update in transaction *
@@ -1575,6 +1604,35 @@ struct nft_trans_flowtable {#define nft_trans_flowtable_flags (trans) \ (((struct nft_trans_flowtable *)trans->data)->flags) +#define NFT_TRANS_GC_BATCHCOUNT 256 + +struct nft_trans_gc { +struct list_head list; +struct net *net; +struct nft_set *set; +u32 seq; +u8 count; +void *priv[NFT_TRANS_GC_BATCHCOUNT ]; +struct rcu_head rcu; +}; + +struct nft_trans_gc *nft_trans_gc_alloc (struct nft_set *set, +unsigned int gc_seq,gfp_t gfp); +void nft_trans_gc_destroy (struct nft_trans_gc *trans); + +struct nft_trans_gc *nft_trans_gc_queue_async (struct nft_trans_gc *gc, +unsigned int gc_seq,gfp_t gfp); +void nft_trans_gc_queue_async_done (struct nft_trans_gc *gc); + +struct nft_trans_gc *nft_trans_gc_queue_sync (struct nft_trans_gc *gc,gfp_t gfp); +void nft_trans_gc_queue_sync_done (struct nft_trans_gc *trans); + +void nft_trans_gc_elem_add (struct nft_trans_gc *gc,void *priv); + +void nft_setelem_data_deactivate (const struct net *net, +const struct nft_set *set, +struct nft_set_elem *elem); +int __init nft_chain_filter_init (void );void nft_chain_filter_fini (void );
@@ -1595,6 +1653,7 @@ struct nftables_pernet {struct mutex commit_mutex;unsigned int base_seq;u8 validate_state; + unsigned int gc_seq; };#endif /* _NET_NF_TABLES_H */
net/netfilter/nf_tables_api.c +207 -9
311 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 19/226 netfilter: nf_tables: adapt set backend to use GC transaction API
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit f6c383b8c31a93752a52697f8430a71dcbc46adf upstream.
Use the GC transaction API to replace the old and buggy gc API and the busy mark approach.
No set elements are removed from async garbage collection anymore, instead the _DEAD bit is set on so the set element is not visible from lookup path anymore. Async GC enqueues transaction work that might be aborted and retried later.
rbtree and pipapo set backends does not set on the _DEAD bit from the sync GC path since this runs in control plane path where mutex is held. In this case, set elements are deactivated, removed and then released via RCU callback, sync GC never fails.
--- net/netfilter/nft_set_hash.c | 77 +++++++++++------- net/netfilter/nft_set_pipapo.c | 43 +++++++--- net/netfilter/nft_set_rbtree.c | 138 +++++++++++++++++++++------------ 3 files changed, 172 insertions(+), 86 deletions(-)
net/netfilter/nft_set_hash.c +51 -26
@@ -17,6 +17,9 @@#include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> +#include <net/netns/generic.h> + +extern unsigned int nf_tables_net_id;/* We target a hash table size of 4, element hint is 75% of final size */ #define NFT_RHASH_ELEMENT_HINT 3
@@ -59,6 +62,8 @@ static inline int nft_rhash_cmp(struct rhashtable_compare_arg *arg,if (memcmp (nft_set_ext_key (&he->ext), x->key, x->set->klen))return 1 ; +if (nft_set_elem_is_dead (&he->ext)) +return 1 ;if (nft_set_elem_expired (&he->ext))return 1 ;if (!nft_set_elem_active (&he->ext, x->genmask))
@@ -187,7 +192,6 @@ static void nft_rhash_activate(const struct net *net, const struct nft_set *set,struct nft_rhash_elem *he = elem->priv;nft_set_elem_change_active (net, set, &he->ext); -nft_set_elem_clear_busy (&he->ext); } static bool nft_rhash_flush(const struct net *net,
@@ -195,12 +199,9 @@ static bool nft_rhash_flush(const struct net *net, {struct nft_rhash_elem *he = priv; -if (!nft_set_elem_mark_busy (&he->ext) || - !nft_is_active (net, &he->ext)) { -nft_set_elem_change_active (net, set, &he->ext); -return true; - } -return false; +nft_set_elem_change_active (net, set, &he->ext); + +return true; } static void *nft_rhash_deactivate(const struct net *net,
@@ -217,9 +218,8 @@ static void *nft_rhash_deactivate(const struct net *net,rcu_read_lock (); he =rhashtable_lookup (&priv->ht, &arg, nft_rhash_params); -if (he !=NULL && - !nft_rhash_flush (net, set, he)) - he =NULL ; +if (he) +nft_set_elem_change_active (net, set, &he->ext);rcu_read_unlock ();
@@ -295,49 +295,75 @@ static void nft_rhash_walk(const struct nft_ctx *ctx, struct nft_set *set,static void nft_rhash_gc (struct work_struct *work) { +struct nftables_pernet *nft_net;struct nft_set *set;struct nft_rhash_elem *he;struct nft_rhash *priv; -struct nft_set_gc_batch *gcb =NULL ;struct rhashtable_iter hti; +struct nft_trans_gc *gc; +struct net *net; +u32 gc_seq; priv = container_of(work, struct nft_rhash, gc_work.work); set =nft_set_container_of (priv); + net =read_pnet (&set->net); + nft_net =net_generic (net, nf_tables_net_id); + gc_seq =READ_ONCE (nft_net->gc_seq); + + gc =nft_trans_gc_alloc (set, gc_seq,GFP_KERNEL ); +if (!gc) + goto done;rhashtable_walk_enter (&priv->ht, &hti);rhashtable_walk_start (&hti);while ((he =rhashtable_walk_next (&hti))) {if (IS_ERR (he)) { -if (PTR_ERR (he) != -EAGAIN ) -break ; +if (PTR_ERR (he) != -EAGAIN ) { +nft_trans_gc_destroy (gc); + gc =NULL ; + goto try_later; + }continue ; } +/* Ruleset has been updated, try later. */ +if (READ_ONCE (nft_net->gc_seq) != gc_seq) { +nft_trans_gc_destroy (gc); + gc =NULL ; + goto try_later; + } + +if (nft_set_elem_is_dead (&he->ext)) + goto dead_elem; +if (nft_set_ext_exists (&he->ext,NFT_SET_EXT_EXPR )) {struct nft_expr *expr =nft_set_ext_expr (&he->ext);if (expr->ops->gc && expr->ops->gc (read_pnet (&set->net), expr)) - goto gc; + goto needs_gc_run; } +if (!nft_set_elem_expired (&he->ext))continue ; -gc: -if (nft_set_elem_mark_busy (&he->ext)) -continue ; - - gcb =nft_set_gc_batch_check (set, gcb,GFP_ATOMIC ); -if (gcb ==NULL ) -break ; -rhashtable_remove_fast (&priv->ht, &he->node, nft_rhash_params); -atomic_dec (&set->nelems); -nft_set_gc_batch_add (gcb, he); +needs_gc_run: +nft_set_elem_dead (&he->ext); +dead_elem: + gc =nft_trans_gc_queue_async (gc, gc_seq,GFP_ATOMIC ); +if (!gc) + goto try_later; + +nft_trans_gc_elem_add (gc, he); } + +try_later:rhashtable_walk_stop (&hti);rhashtable_walk_exit (&hti); -nft_set_gc_batch_complete (gcb); +if (gc) +nft_trans_gc_queue_async_done (gc); +done:queue_delayed_work (system_power_efficient_wq, &priv->gc_work,nft_set_gc_interval (set)); }
@@ -400,7 +426,6 @@ static void nft_rhash_destroy(const struct nft_ctx *ctx, };cancel_delayed_work_sync (&priv->gc_work); -rcu_barrier ();rhashtable_free_and_destroy (&priv->ht, nft_rhash_elem_destroy, (void *)&rhash_ctx); }
net/netfilter/nft_set_pipapo.c +34 -9
76 lines not on this page · raw message
net/netfilter/nft_set_rbtree.c +87 -51
232 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 20/226 netfilter: nft_set_hash: mark set element as dead when deleting from packet path
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit c92db3030492b8ad1d0faace7a93bbcf53850d0c upstream.
Set on the NFT_SET_ELEM_DEAD_BIT flag on this element, instead of performing element removal which might race with an ongoing transaction. Enable gc when dynamic flag is set on since dynset deletion requires garbage collection after this patch.
--- net/netfilter/nft_set_hash.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/netfilter/nft_set_hash.c +4 -2
@@ -251,7 +251,9 @@ static bool nft_rhash_delete(const struct nft_set *set,if (he ==NULL )return false; -return rhashtable_remove_fast (&priv->ht, &he->node, nft_rhash_params) ==0 ; +nft_set_elem_dead (&he->ext); + +return true; } static void nft_rhash_walk(const struct nft_ctx *ctx, struct nft_set *set,
@@ -398,7 +400,7 @@ static int nft_rhash_init(const struct nft_set *set,return err;INIT_DEFERRABLE_WORK (&priv->gc_work, nft_rhash_gc); -if (set->flags &NFT_SET_TIMEOUT ) +if (set->flags & (NFT_SET_TIMEOUT |NFT_SET_EVAL ))nft_rhash_gc_init (set);return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 21/226 netfilter: nf_tables: remove busy mark and gc batch API
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit a2dd0233cbc4d8a0abb5f64487487ffc9265beb5 upstream.
Ditch it, it has been replace it by the GC transaction API and it has no clients anymore.
--- include/net/netfilter/nf_tables.h | 97 +------------------------------ net/netfilter/nf_tables_api.c | 26 +-------- 2 files changed, 5 insertions(+), 118 deletions(-)
include/net/netfilter/nf_tables.h +3 -94
@@ -695,62 +695,6 @@ void nft_set_elem_destroy(const struct nft_set *set, void *elem,void nf_tables_set_elem_destroy (const struct nft_ctx *ctx,const struct nft_set *set,void *elem); -/** -* struct nft_set_gc_batch_head - nf_tables set garbage collection batch -* -* @rcu: rcu head -* @set: set the elements belong to -* @cnt: count of elements -*/ -struct nft_set_gc_batch_head { -struct rcu_head rcu; -const struct nft_set *set; -unsigned int cnt; -}; - -#define NFT_SET_GC_BATCH_SIZE ((PAGE_SIZE - \ - sizeof(struct nft_set_gc_batch_head)) / \ - sizeof(void *)) - -/** -* struct nft_set_gc_batch - nf_tables set garbage collection batch -* -* @head: GC batch head -* @elems: garbage collection elements -*/ -struct nft_set_gc_batch { -struct nft_set_gc_batch_head head; -void *elems[NFT_SET_GC_BATCH_SIZE ]; -}; - -struct nft_set_gc_batch *nft_set_gc_batch_alloc (const struct nft_set *set, -gfp_t gfp); -void nft_set_gc_batch_release (struct rcu_head *rcu); - -static inline void nft_set_gc_batch_complete (struct nft_set_gc_batch *gcb) -{ -if (gcb !=NULL ) -call_rcu (&gcb->head.rcu, nft_set_gc_batch_release); -} - -static inline struct nft_set_gc_batch * -nft_set_gc_batch_check (const struct nft_set *set,struct nft_set_gc_batch *gcb, -gfp_t gfp) -{ -if (gcb !=NULL ) { -if (gcb->head.cnt +1 <ARRAY_SIZE (gcb->elems)) -return gcb; -nft_set_gc_batch_complete (gcb); - } -return nft_set_gc_batch_alloc (set, gfp); -} - -static inline void nft_set_gc_batch_add (struct nft_set_gc_batch *gcb, -void *elem) -{ - gcb->elems[gcb->head.cnt++] = elem; -} -struct nft_expr_ops ;/** * struct nft_expr_type - nf_tables expression type
@@ -1418,47 +1362,12 @@ static inline void nft_set_elem_change_active(const struct net *net,#endif /* IS_ENABLED(CONFIG_NF_TABLES) */ -/* -* We use a free bit in the genmask field to indicate the element -* is busy, meaning it is currently being processed either by -* the netlink API or GC. -* -* Even though the genmask is only a single byte wide, this works -* because the extension structure if fully constant once initialized, -* so there are no non-atomic write accesses unless it is already -* marked busy. -*/ -#define NFT_SET_ELEM_BUSY_MASK (1 << 2) - -#if defined(__LITTLE_ENDIAN_BITFIELD) -#define NFT_SET_ELEM_BUSY_BIT 2 -#elif defined(__BIG_ENDIAN_BITFIELD) -#define NFT_SET_ELEM_BUSY_BIT (BITS_PER_LONG - BITS_PER_BYTE + 2) -#else -#error -#endif - -static inline int nft_set_elem_mark_busy (struct nft_set_ext *ext) -{ -unsigned long *word = (unsigned long *)ext; - -BUILD_BUG_ON (offsetof(struct nft_set_ext , genmask) !=0 ); -return test_and_set_bit (NFT_SET_ELEM_BUSY_BIT , word); -} - -static inline void nft_set_elem_clear_busy (struct nft_set_ext *ext) -{ -unsigned long *word = (unsigned long *)ext; - -clear_bit (NFT_SET_ELEM_BUSY_BIT , word); -} - -#define NFT_SET_ELEM_DEAD_MASK (1 << 3) +#define NFT_SET_ELEM_DEAD_MASK (1 << 2)#if defined(__LITTLE_ENDIAN_BITFIELD) -#define NFT_SET_ELEM_DEAD_BIT 3 +#define NFT_SET_ELEM_DEAD_BIT 2#elif defined(__BIG_ENDIAN_BITFIELD) -#define NFT_SET_ELEM_DEAD_BIT (BITS_PER_LONG - BITS_PER_BYTE + 3) +#define NFT_SET_ELEM_DEAD_BIT (BITS_PER_LONG - BITS_PER_BYTE + 2)#else #error #endif
net/netfilter/nf_tables_api.c +2 -24
@@ -5637,7 +5637,8 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, goto err_elem_expr; } - ext->genmask =nft_genmask_cur (ctx->net) |NFT_SET_ELEM_BUSY_MASK ; + ext->genmask =nft_genmask_cur (ctx->net); + err = set->ops->insert (ctx->net, set, &elem, &ext2);if (err) {if (err == -EEXIST ) {
@@ -5945,29 +5946,6 @@ static int nf_tables_delsetelem(struct net *net, struct sock *nlsk,return err; } -void nft_set_gc_batch_release (struct rcu_head *rcu) -{ -struct nft_set_gc_batch *gcb; -unsigned int i; - - gcb = container_of(rcu, struct nft_set_gc_batch, head.rcu); -for (i =0 ; i < gcb->head.cnt; i++) -nft_set_elem_destroy (gcb->head.set, gcb->elems[i], true); -kfree (gcb); -} - -struct nft_set_gc_batch *nft_set_gc_batch_alloc (const struct nft_set *set, -gfp_t gfp) -{ -struct nft_set_gc_batch *gcb; - - gcb =kzalloc (sizeof (*gcb), gfp); -if (gcb ==NULL ) -return gcb; - gcb->head.set = set; -return gcb; -} -/* * Stateful objects */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 22/226 netfilter: nf_tables: dont fail inserts if duplicate has expired
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
commit 7845914f45f066497ac75b30c50dbc735e84e884 upstream.
nftables selftests fail:run-tests.sh testcases/sets/0044interval_overlap_0
Expected: 0-2 . 0-3, got:
W: [FAILED] ./testcases/sets/0044interval_overlap_0: got 1
Insertion must ignore duplicate but expired entries.
Moreover, there is a strange asymmetry in nft_pipapo_activate:
It refetches the current element, whereas the other ->activate callbacks (bitmap, hash, rhash, rbtree) use elem->priv.
Same for .remove: other set implementations take elem->priv, nft_pipapo_remove fetches elem->priv, then does a relookup, remove this.
I suspect this was the reason for the change that prompted the removal of the expired check in pipapo_get() in the first place, but skipping exired elements there makes no sense to me, this helper is used for normal get requests, insertions (duplicate check) and deactivate callback.
In first two cases expired elements must be skipped.
For ->deactivate(), this gets called for DELSETELEM, so it seems to me that expired elements should be skipped as well, i.e. delete request should fail with -ENOENT error.
--- net/netfilter/nft_set_pipapo.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-)
net/netfilter/nft_set_pipapo.c +5 -20
@@ -566,6 +566,8 @@ static struct nft_pipapo_elem *pipapo_get(const struct net *net, goto out;if (last) { +if (nft_set_elem_expired (&f->mt[b].e->ext)) + goto next_match;if ((genmask && !nft_set_elem_active (&f->mt[b].e->ext, genmask))) goto next_match;
@@ -600,17 +602,8 @@ static struct nft_pipapo_elem *pipapo_get(const struct net *net,static void *nft_pipapo_get (const struct net *net,const struct nft_set *set,const struct nft_set_elem *elem,unsigned int flags) { -struct nft_pipapo_elem *ret; - - ret =pipapo_get (net, set, (const u8 *)elem->key.val.data, -nft_genmask_cur (net)); -if (IS_ERR (ret)) -return ret; - -if (nft_set_elem_expired (&ret->ext)) -return ERR_PTR (-ENOENT ); - -return ret; +return pipapo_get (net, set, (const u8 *)elem->key.val.data, +nft_genmask_cur (net)); }/**
@@ -1737,11 +1730,7 @@ static void nft_pipapo_activate(const struct net *net,const struct nft_set *set, const struct nft_set_elem *elem) { - struct nft_pipapo_elem *e; - - e =pipapo_get (net, set, (const u8 *)elem->key.val.data,0 ); -if (IS_ERR (e)) -return ; + struct nft_pipapo_elem *e = elem->priv;nft_set_elem_change_active (net, set, &e->ext); }
@@ -1955,10 +1944,6 @@ static void nft_pipapo_remove(const struct net *net, const struct nft_set *set, data = (const u8 *)nft_set_ext_key (&e->ext); - e =pipapo_get (net, set, data,0 ); -if (IS_ERR (e)) -return ; -while ((rules_f0 =pipapo_rules_same_key (m->f, first_rule))) {union nft_pipapo_map_bucket rulemap[NFT_PIPAPO_MAX_FIELDS ];const u8 *match_start, *match_end;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 23/226 netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 6a33d8b73dfac0a41f3877894b38082bd0c9a5bc upstream.
Netlink event path is missing a synchronization point with GC transactions. Add GC sequence number update to netns release path and netlink event path, any GC transaction losing race will be discarded.
--- net/netfilter/nf_tables_api.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +25 -4
@@ -8320,6 +8320,22 @@ static void nft_set_commit_update(struct list_head *set_update_list) } } +static unsigned int nft_gc_seq_begin (struct nftables_pernet *nft_net) +{ +unsigned int gc_seq; + +/* Bump gc counter, it becomes odd, this is the busy mark. */ + gc_seq =READ_ONCE (nft_net->gc_seq); +WRITE_ONCE (nft_net->gc_seq, ++gc_seq); + +return gc_seq; +} + +static void nft_gc_seq_end (struct nftables_pernet *nft_net,unsigned int gc_seq) +{ +WRITE_ONCE (nft_net->gc_seq, ++gc_seq); +} +static int nf_tables_commit (struct net *net,struct sk_buff *skb) {struct nftables_pernet *nft_net =net_generic (net, nf_tables_net_id);
@@ -8401,9 +8417,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)while (++nft_net->base_seq ==0 ) ; -/* Bump gc counter, it becomes odd, this is the busy mark. */ - gc_seq =READ_ONCE (nft_net->gc_seq); -WRITE_ONCE (nft_net->gc_seq, ++gc_seq); + gc_seq =nft_gc_seq_begin (nft_net);/* step 3. Start new generation, rules_gen_X now in use. */ net->nft.gencursor =nft_gencursor_next (net);
@@ -8583,7 +8597,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)nf_tables_gen_notify (net, skb,NFT_MSG_NEWGEN );nf_tables_commit_audit_log (&adl, nft_net->base_seq); -WRITE_ONCE (nft_net->gc_seq, ++gc_seq); +nft_gc_seq_end (nft_net, gc_seq);nf_tables_commit_release (net);return 0 ;
@@ -9538,11 +9552,18 @@ static void __net_exit nf_tables_pre_exit_net(struct net *net) static void __net_exit nf_tables_exit_net(struct net *net) {struct nftables_pernet *nft_net =net_generic (net, nf_tables_net_id); +unsigned int gc_seq;mutex_lock (&nft_net->commit_mutex); + + gc_seq =nft_gc_seq_begin (nft_net); +if (!list_empty (&nft_net->commit_list))__nf_tables_abort (net,NFNL_ABORT_NONE );__nft_release_tables (net); + +nft_gc_seq_end (nft_net, gc_seq); +mutex_unlock (&nft_net->commit_mutex);WARN_ON_ONCE (!list_empty (&nft_net->tables));WARN_ON_ONCE (!list_empty (&nft_net->module_list));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 24/226 netfilter: nf_tables: GC transaction race with netns dismantle
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 02c6c24402bf1c1e986899c14ba22a10b510916b upstream.
Use maybe_get_net() since GC workqueue might race with netns exit path.
--- net/netfilter/nf_tables_api.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +6 -1
@@ -8089,9 +8089,14 @@ struct nft_trans_gc *nft_trans_gc_alloc(struct nft_set *set,if (!trans)return NULL ; + trans->net =maybe_get_net (net); +if (!trans->net) { +kfree (trans); +return NULL ; + } +refcount_inc (&set->refs); trans->set = set; - trans->net =get_net (net); trans->seq = gc_seq;return trans;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 25/226 netfilter: nf_tables: GC transaction race with abort path
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 720344340fb9be2765bbaab7b292ece0a4570eae upstream.
Abort path is missing a synchronization point with GC transactions. Add GC sequence number hence any GC transaction losing race will be discarded.
--- net/netfilter/nf_tables_api.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +6 -1
@@ -8844,7 +8844,12 @@ static int nf_tables_abort(struct net *net, struct sk_buff *skb, enum nfnl_abort_action action) {struct nftables_pernet *nft_net =net_generic (net, nf_tables_net_id); -int ret =__nf_tables_abort (net, action); +unsigned int gc_seq; +int ret; + + gc_seq =nft_gc_seq_begin (nft_net); + ret =__nf_tables_abort (net, action); +nft_gc_seq_end (nft_net, gc_seq);mutex_unlock (&nft_net->commit_mutex);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 26/226 netfilter: nf_tables: use correct lock to protect gc_list
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 8357bc946a2abc2a10ca40e5a2105d2b4c57515e upstream.
Use nf_tables_gc_list_lock spinlock, not nf_tables_destroy_list_lock to protect the gc_list.
--- net/netfilter/nf_tables_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +2 -2
@@ -8065,9 +8065,9 @@ static void nft_trans_gc_work(struct work_struct *work)struct nft_trans_gc *trans, *next;LIST_HEAD (trans_gc_list); -spin_lock (&nf_tables_destroy_list_lock); +spin_lock (&nf_tables_gc_list_lock);list_splice_init (&nf_tables_gc_list, &trans_gc_list); -spin_unlock (&nf_tables_destroy_list_lock); +spin_unlock (&nf_tables_gc_list_lock);list_for_each_entry_safe (trans, next, &trans_gc_list, list) {list_del (&trans->list);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 27/226 netfilter: nf_tables: defer gc run if previous batch is still pending
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
commit 8e51830e29e12670b4c10df070a4ea4c9593e961 upstream.
Don't queue more gc work, else we may queue the same elements multiple times.
If an element is flagged as dead, this can mean that either the previous gc request was invalidated/discarded by a transaction or that the previous request is still pending in the system work queue.
The latter will happen if the gc interval is set to a very low value, e.g. 1ms, and system work queue is backlogged.
The sets refcount is 1 if no previous gc requeusts are queued, so add a helper for this and skip gc run if old requests are pending.
Add a helper for this and skip the gc run in this case.
--- include/net/netfilter/nf_tables.h | 5 +++++ net/netfilter/nft_set_hash.c | 3 +++ net/netfilter/nft_set_rbtree.c | 3 +++ 3 files changed, 11 insertions(+)
include/net/netfilter/nf_tables.h +5 -0
@@ -479,6 +479,11 @@ static inline void *nft_set_priv(const struct nft_set *set)return (void *)set->data; } +static inline bool nft_set_gc_is_pending (const struct nft_set *s) +{ +return refcount_read (&s->refs) !=1 ; +} +static inline struct nft_set *nft_set_container_of (const void *priv) {return (void *)priv - offsetof(struct nft_set , data);
net/netfilter/nft_set_hash.c +3 -0
@@ -312,6 +312,9 @@ static void nft_rhash_gc(struct work_struct *work) nft_net =net_generic (net, nf_tables_net_id); gc_seq =READ_ONCE (nft_net->gc_seq); +if (nft_set_gc_is_pending (set)) + goto done; + gc =nft_trans_gc_alloc (set, gc_seq,GFP_KERNEL );if (!gc) goto done;
net/netfilter/nft_set_rbtree.c +3 -0
@@ -613,6 +613,9 @@ static void nft_rbtree_gc(struct work_struct *work) nft_net =net_generic (net, nf_tables_net_id); gc_seq =READ_ONCE (nft_net->gc_seq); +if (nft_set_gc_is_pending (set)) + goto done; + gc =nft_trans_gc_alloc (set, gc_seq,GFP_KERNEL );if (!gc) goto done;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 28/226 netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 2ee52ae94baabf7ee09cf2a8d854b990dac5d0e4 upstream.
New elements in this transaction might expired before such transaction ends. Skip sync GC for such elements otherwise commit path might walk over an already released object. Once transaction is finished, async GC will collect such expired element.
--- net/netfilter/nft_set_rbtree.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/netfilter/nft_set_rbtree.c +6 -2
@@ -314,6 +314,7 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,struct nft_rbtree_elem *rbe, *rbe_le =NULL , *rbe_ge =NULL ;struct rb_node *node, *next, *parent, **p, *first =NULL ;struct nft_rbtree *priv =nft_set_priv (set); +u8 cur_genmask =nft_genmask_cur (net);u8 genmask =nft_genmask_next (net);int d, err;
@@ -359,8 +360,11 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,if (!nft_set_elem_active (&rbe->ext, genmask))continue ; -/* perform garbage collection to avoid bogus overlap reports. */ -if (nft_set_elem_expired (&rbe->ext)) { +/* perform garbage collection to avoid bogus overlap reports +* but skip new elements in this transaction. +*/ +if (nft_set_elem_expired (&rbe->ext) && +nft_set_elem_active (&rbe->ext, cur_genmask)) { err =nft_rbtree_gc_elem (set, priv, rbe, genmask);if (err <0 )return err;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 29/226 netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 96b33300fba880ec0eafcf3d82486f3463b4b6da upstream.
rbtree GC does not modify the datastructure, instead it collects expired elements and it enqueues a GC transaction. Use a read spinlock instead to avoid data contention while GC worker is running.
--- net/netfilter/nft_set_rbtree.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/netfilter/nft_set_rbtree.c +2 -4
@@ -624,8 +624,7 @@ static void nft_rbtree_gc(struct work_struct *work)if (!gc) goto done; -write_lock_bh (&priv->lock); -write_seqcount_begin (&priv->count); +read_lock_bh (&priv->lock);for (node =rb_first (&priv->root); node !=NULL ; node =rb_next (node)) {/* Ruleset has been updated, try later. */
@@ -672,8 +671,7 @@ static void nft_rbtree_gc(struct work_struct *work)nft_trans_gc_elem_add (gc, rbe); } try_later: -write_seqcount_end (&priv->count); -write_unlock_bh (&priv->lock); +read_unlock_bh (&priv->lock);if (gc)nft_trans_gc_queue_async_done (gc);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 30/226 netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 6d365eabce3c018a80f6e0379b17df2abb17405e upstream.
nft_trans_gc_queue_sync() enqueues the GC transaction and it allocates a new one. If this allocation fails, then stop this GC sync run and retry later.
--- net/netfilter/nft_set_pipapo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_set_pipapo.c +1 -1
@@ -1595,7 +1595,7 @@ static void pipapo_gc(const struct nft_set *_set, struct nft_pipapo_match *m) gc =nft_trans_gc_queue_sync (gc,GFP_ATOMIC );if (!gc) -break ; +return ;nft_pipapo_gc_deactivate (net, set, e);pipapo_drop (m, rulemap);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 31/226 netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit b079155faae94e9b3ab9337e82100a914ebb4e8d upstream.
Skip GC run if iterator rewinds to the beginning with EAGAIN, otherwise GC might collect the same element more than once.
--- net/netfilter/nft_set_hash.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
net/netfilter/nft_set_hash.c +3 -6
@@ -324,12 +324,9 @@ static void nft_rhash_gc(struct work_struct *work)while ((he =rhashtable_walk_next (&hti))) {if (IS_ERR (he)) { -if (PTR_ERR (he) != -EAGAIN ) { -nft_trans_gc_destroy (gc); - gc =NULL ; - goto try_later; - } -continue ; +nft_trans_gc_destroy (gc); + gc =NULL ; + goto try_later; }/* Ruleset has been updated, try later. */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 32/226 netfilter: nf_tables: fix memleak when more than 255 elements expired
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
commit cf5000a7787cbc10341091d37245a42c119d26c5 upstream.
When more than 255 elements expired we're supposed to switch to a new gc container structure.
This never happens: u8 type will wrap before reaching the boundary and nft_trans_gc_space() always returns true.
This means we recycle the initial gc container structure and lose track of the elements that came before.
While at it, don't deref 'gc' after we've passed it to call_rcu.
--- include/net/netfilter/nf_tables.h | 2 +- net/netfilter/nf_tables_api.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-)
include/net/netfilter/nf_tables.h +1 -1
@@ -1525,7 +1525,7 @@ struct nft_trans_gc {struct net *net;struct nft_set *set;u32 seq; -u8 count; +u16 count;void *priv[NFT_TRANS_GC_BATCHCOUNT ];struct rcu_head rcu; };
net/netfilter/nf_tables_api.c +8 -2
@@ -8124,12 +8124,15 @@ static int nft_trans_gc_space(struct nft_trans_gc *trans)struct nft_trans_gc *nft_trans_gc_queue_async (struct nft_trans_gc *gc,unsigned int gc_seq,gfp_t gfp) { +struct nft_set *set; +if (nft_trans_gc_space (gc))return gc; + set = gc->set;nft_trans_gc_queue_work (gc); -return nft_trans_gc_alloc (gc->set, gc_seq, gfp); +return nft_trans_gc_alloc (set, gc_seq, gfp); }void nft_trans_gc_queue_async_done (struct nft_trans_gc *trans)
@@ -8144,15 +8147,18 @@ void nft_trans_gc_queue_async_done(struct nft_trans_gc *trans)struct nft_trans_gc *nft_trans_gc_queue_sync (struct nft_trans_gc *gc,gfp_t gfp) { +struct nft_set *set; +if (WARN_ON_ONCE (!lockdep_commit_lock_is_held (gc->net)))return NULL ;if (nft_trans_gc_space (gc))return gc; + set = gc->set;call_rcu (&gc->rcu, nft_trans_gc_trans_free); -return nft_trans_gc_alloc (gc->set,0 , gfp); +return nft_trans_gc_alloc (set,0 , gfp); }void nft_trans_gc_queue_sync_done (struct nft_trans_gc *trans)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 33/226 ASoC: meson: spdifin: start hw on dai probe
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit aedf323b66b2b875137422ecb7d2525179759076 ]
For spdif input to report the locked rate correctly, even when no capture is running, the HW and reference clock must be started as soon as the dai is probed.
--- sound/soc/meson/axg-spdifin.c | 49 ++++++++++++----------------------- 1 file changed, 17 insertions(+), 32 deletions(-)
sound/soc/meson/axg-spdifin.c +17 -32
@@ -112,34 +112,6 @@ static int axg_spdifin_prepare(struct snd_pcm_substream *substream,return 0 ; } -static int axg_spdifin_startup (struct snd_pcm_substream *substream, -struct snd_soc_dai *dai) -{ -struct axg_spdifin *priv =snd_soc_dai_get_drvdata (dai); -int ret; - - ret =clk_prepare_enable (priv->refclk); -if (ret) { -dev_err (dai->dev, -"failed to enable spdifin reference clock\n" ); -return ret; - } - -regmap_update_bits (priv->map,SPDIFIN_CTRL0 ,SPDIFIN_CTRL0_EN , -SPDIFIN_CTRL0_EN ); - -return 0 ; -} - -static void axg_spdifin_shutdown (struct snd_pcm_substream *substream, -struct snd_soc_dai *dai) -{ -struct axg_spdifin *priv =snd_soc_dai_get_drvdata (dai); - -regmap_update_bits (priv->map,SPDIFIN_CTRL0 ,SPDIFIN_CTRL0_EN ,0 ); -clk_disable_unprepare (priv->refclk); -} - static void axg_spdifin_write_mode_param(struct regmap *map, int mode, unsigned int val, unsigned int num_per_reg,
@@ -251,25 +223,38 @@ static int axg_spdifin_dai_probe(struct snd_soc_dai *dai) ret =axg_spdifin_sample_mode_config (dai, priv);if (ret) {dev_err (dai->dev,"mode configuration failed\n" ); -clk_disable_unprepare (priv->pclk); -return ret; + goto pclk_err; } + ret =clk_prepare_enable (priv->refclk); +if (ret) { +dev_err (dai->dev, +"failed to enable spdifin reference clock\n" ); + goto pclk_err; + } + +regmap_update_bits (priv->map,SPDIFIN_CTRL0 ,SPDIFIN_CTRL0_EN , +SPDIFIN_CTRL0_EN ); +return 0 ; + +pclk_err: +clk_disable_unprepare (priv->pclk); +return ret; }static int axg_spdifin_dai_remove (struct snd_soc_dai *dai) {struct axg_spdifin *priv =snd_soc_dai_get_drvdata (dai); +regmap_update_bits (priv->map,SPDIFIN_CTRL0 ,SPDIFIN_CTRL0_EN ,0 ); +clk_disable_unprepare (priv->refclk);clk_disable_unprepare (priv->pclk);return 0 ; }static const struct snd_soc_dai_ops axg_spdifin_ops = { .prepare = axg_spdifin_prepare, - .startup = axg_spdifin_startup, - .shutdown = axg_spdifin_shutdown, }; static int axg_spdifin_iec958_info(struct snd_kcontrol *kcontrol,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 34/226 netfilter: nf_tables: disallow element removal on anonymous sets
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 23a3bfd4ba7acd36abf52b78605f61b21bdac216 ]
Anonymous sets need to be populated once at creation and then they are bound to rule since 938154b93be8 ("netfilter: nf_tables: reject unbound anonymous set before commit phase"), otherwise transaction reports EINVAL.
Userspace does not need to delete elements of anonymous sets that are not yet bound, reject this with EOPNOTSUPP.
Quoted 1 line
From flush command path, skip anonymous sets, they are expected to be
bound already. Otherwise, EINVAL is hit at the end of this transaction for unbound sets.
--- net/netfilter/nf_tables_api.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +5 -4
@@ -1267,8 +1267,7 @@ static int nft_flush_table(struct nft_ctx *ctx)if (!nft_is_active_next (ctx->net, set))continue ; -if (nft_set_is_anonymous (set) && - !list_empty (&set->bindings)) +if (nft_set_is_anonymous (set))continue ; err =nft_delset (ctx, set);
@@ -5922,8 +5921,10 @@ static int nf_tables_delsetelem(struct net *net, struct sock *nlsk,if (IS_ERR (set))return PTR_ERR (set); -if (!list_empty (&set->bindings) && - (set->flags & (NFT_SET_CONSTANT |NFT_SET_ANONYMOUS ))) +if (nft_set_is_anonymous (set)) +return -EOPNOTSUPP ; + +if (!list_empty (&set->bindings) && (set->flags &NFT_SET_CONSTANT ))return -EBUSY ;if (nla[NFTA_SET_ELEM_LIST_ELEMENTS ] ==NULL ) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 35/226 bpf: Avoid deadlock when using queue and stack maps from NMI
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit a34a9f1a19afe9c60ca0ea61dfeee63a1c2baac8 ]
Sysbot discovered that the queue and stack maps can deadlock if they are being used from a BPF program that can be called from NMI context (such as one that is attached to a perf HW counter event). To fix this, add an in_nmi() check and use raw_spin_trylock() in NMI context, erroring out if grabbing the lock fails.
--- kernel/bpf/queue_stack_maps.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
kernel/bpf/queue_stack_maps.c +18 -3
@@ -111,7 +111,12 @@ static int __queue_map_get(struct bpf_map *map, void *value, bool delete)int err =0 ;void *ptr; -raw_spin_lock_irqsave (&qs->lock, flags); +if (in_nmi ()) { +if (!raw_spin_trylock_irqsave (&qs->lock, flags)) +return -EBUSY ; + }else { +raw_spin_lock_irqsave (&qs->lock, flags); + }if (queue_stack_map_is_empty (qs)) {memset (value,0 , qs->map.value_size);
@@ -141,7 +146,12 @@ static int __stack_map_get(struct bpf_map *map, void *value, bool delete)void *ptr;u32 index; -raw_spin_lock_irqsave (&qs->lock, flags); +if (in_nmi ()) { +if (!raw_spin_trylock_irqsave (&qs->lock, flags)) +return -EBUSY ; + }else { +raw_spin_lock_irqsave (&qs->lock, flags); + }if (queue_stack_map_is_empty (qs)) {memset (value,0 , qs->map.value_size);
@@ -206,7 +216,12 @@ static int queue_stack_map_push_elem(struct bpf_map *map, void *value,if (flags &BPF_NOEXIST || flags >BPF_EXIST )return -EINVAL ; -raw_spin_lock_irqsave (&qs->lock, irq_flags); +if (in_nmi ()) { +if (!raw_spin_trylock_irqsave (&qs->lock, irq_flags)) +return -EBUSY ; + }else { +raw_spin_lock_irqsave (&qs->lock, irq_flags); + }if (queue_stack_map_is_full (qs)) {if (!replace) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 36/226 selftests/tls: Add {} to avoid static checker warning
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit f50688b47c5858d2ff315d020332bf4cb6710837 ]
This silences a static checker warning due to the unusual macro construction of EXPECT_*() by adding explicit {}s around the enclosing while loop.
Stable-dep-of: c326ca98446e ("selftests: tls: swap the TX and RX sockets in some tests")
--- tools/testing/selftests/net/tls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/net/tls.c +2 -1
@@ -387,8 +387,9 @@ TEST_F(tls, sendmsg_large)EXPECT_EQ (sendmsg (self->cfd, &msg,0 ), send_len); } -while (recvs++ < sends) +while (recvs++ < sends) {EXPECT_NE (recv (self->fd, mem, send_len,0 ),-1 ); + }free (mem); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 37/226 selftests: tls: swap the TX and RX sockets in some tests
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sabrina Dubroca <[email protected]>
[ Upstream commit c326ca98446e0ae4fee43a40acf79412b74cfedb ]
tls.sendmsg_large and tls.sendmsg_multiple are trying to send through the self->cfd socket (only configured with TLS_RX) and to receive through the self->fd socket (only configured with TLS_TX), so they're not using kTLS at all. Swap the sockets.
--- tools/testing/selftests/net/tls.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/net/tls.c +4 -4
@@ -384,11 +384,11 @@ TEST_F(tls, sendmsg_large) msg.msg_iov = &vec; msg.msg_iovlen =1 ; -EXPECT_EQ (sendmsg (self->cfd, &msg,0 ), send_len); +EXPECT_EQ (sendmsg (self->fd, &msg,0 ), send_len); }while (recvs++ < sends) { -EXPECT_NE (recv (self->fd, mem, send_len,0 ),-1 ); +EXPECT_NE (recv (self->cfd, mem, send_len,0 ),-1 ); }free (mem);
@@ -417,9 +417,9 @@ TEST_F(tls, sendmsg_multiple) msg.msg_iov = vec; msg.msg_iovlen = iov_len; -EXPECT_EQ (sendmsg (self->cfd, &msg,0 ), total_len); +EXPECT_EQ (sendmsg (self->fd, &msg,0 ), total_len); buf =malloc (total_len); -EXPECT_NE (recv (self->fd, buf, total_len,0 ),-1 ); +EXPECT_NE (recv (self->cfd, buf, total_len,0 ),-1 );for (i =0 ; i < iov_len; i++) { EXPECT_EQ(memcmp(test_strs[i], buf + len_cmp, strlen(test_strs[i])),
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 38/226 ASoC: imx-audmix: Fix return error with devm_clk_get()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shengjiu Wang <[email protected]>
[ Upstream commit b19a5733de255cabba5feecabf6e900638b582d1 ]
The devm_clk_get() can return -EPROBE_DEFER error, modify the error code to be -EINVAL is not correct, which cause the -EPROBE_DEFER error is not correctly handled.
This patch is to fix the return error code.
--- sound/soc/fsl/imx-audmix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/imx-audmix.c +1 -1
@@ -322,7 +322,7 @@ static int imx_audmix_probe(struct platform_device *pdev)if (IS_ERR (priv->cpu_mclk)) { ret =PTR_ERR (priv->cpu_mclk);dev_err (&cpu_pdev->dev,"failed to get DAI mclk1: %d\n" , ret); -return -EINVAL ; +return ret; } priv->audmix_pdev = audmix_pdev;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 39/226 i40e: Fix VF VLAN offloading when port VLAN is configured
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Vecera <[email protected]>
[ Upstream commit d0d362ffa33da4acdcf7aee2116ceef8c8fef658 ]
If port VLAN is configured on a VF then any other VLANs on top of this VF are broken.
During i40e_ndo_set_vf_port_vlan() call the i40e driver reset the VF and iavf driver asks PF (using VIRTCHNL_OP_GET_VF_RESOURCES) for VF capabilities but this reset occurs too early, prior setting of vf->info.pvid field and because this field can be zero during i40e_vc_get_vf_resources_msg() then VIRTCHNL_VF_OFFLOAD_VLAN capability is reported to iavf driver.
This is wrong because iavf driver should not report VLAN offloading capability when port VLAN is configured as i40e does not support QinQ offloading.
Fix the issue by moving VF reset after setting of vf->port_vlan_id field.
Without this patch:
$ echo 1 > /sys/class/net/enp2s0f0/device/sriov_numvfs $ ip link set enp2s0f0 vf 0 vlan 3 $ ip link set enp2s0f0v0 up $ ip link add link enp2s0f0v0 name vlan4 type vlan id 4 $ ip link set vlan4 up ... $ ethtool -k enp2s0f0v0 | grep vlan-offload rx-vlan-offload: on tx-vlan-offload: on $ dmesg -l err | grep iavf [1292500.742914] iavf 0000:02:02.0: Failed to add VLAN filter, error IAVF_ERR_INVALID_QP_ID
With this patch:
$ echo 1 > /sys/class/net/enp2s0f0/device/sriov_numvfs $ ip link set enp2s0f0 vf 0 vlan 3 $ ip link set enp2s0f0v0 up $ ip link add link enp2s0f0v0 name vlan4 type vlan id 4 $ ip link set vlan4 up ... $ ethtool -k enp2s0f0v0 | grep vlan-offload rx-vlan-offload: off [requested on] tx-vlan-offload: off [requested on] $ dmesg -l err | grep iavf
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +4 -3
@@ -4332,9 +4332,6 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,/* duplicate request, so just return success */ goto error_pvid; -i40e_vc_reset_vf (vf, true); -/* During reset the VF got a new VSI, so refresh a pointer. */ - vsi = pf->vsi[vf->lan_vsi_idx];/* Locked once because multiple functions below iterate list */ spin_lock_bh (&vsi->mac_filter_hash_lock);
@@ -4420,6 +4417,10 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,*/ vf->port_vlan_id =le16_to_cpu (vsi->info.pvid); +i40e_vc_reset_vf (vf, true); +/* During reset the VF got a new VSI, so refresh a pointer. */ + vsi = pf->vsi[vf->lan_vsi_idx]; + ret =i40e_config_vf_promiscuous_mode (vf, vsi->id, allmulti, alluni);if (ret) {dev_err (&pf->pdev->dev,"Unable to config vf promiscuous mode\n" );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 40/226 ipv4: fix null-deref in ipv4_link_failure
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kyle Zeng <[email protected]>
[ Upstream commit 0113d9c9d1ccc07f5a3710dac4aa24b6d711278c ]
Currently, we assume the skb is associated with a device before calling __ip_options_compile, which is not always the case if it is re-routed by ipvs.
When skb->dev is NULL, dev_net(skb->dev) will become null-dereference. This patch adds a check for the edge case and switch to use the net_device from the rtable when skb->dev is NULL.
--- net/ipv4/route.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv4/route.c +3 -1
@@ -1240,6 +1240,7 @@ static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie)static void ipv4_send_dest_unreach (struct sk_buff *skb) { +struct net_device *dev;struct ip_options opt;int res;
@@ -1257,7 +1258,8 @@ static void ipv4_send_dest_unreach(struct sk_buff *skb) opt.optlen =ip_hdr (skb)->ihl *4 -sizeof (struct iphdr );rcu_read_lock (); - res =__ip_options_compile (dev_net (skb->dev), &opt, skb,NULL ); + dev = skb->dev ? skb->dev :skb_rtable (skb)->dst.dev; + res =__ip_options_compile (dev_net (dev), &opt, skb,NULL );rcu_read_unlock ();if (res)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 41/226 powerpc/perf/hv-24x7: Update domain value check
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kajol Jain <[email protected]>
[ Upstream commit 4ff3ba4db5943cac1045e3e4a3c0463ea10f6930 ]
Valid domain value is in range 1 to HV_PERF_DOMAIN_MAX. Current code has check for domain value greater than or equal to HV_PERF_DOMAIN_MAX. But the check for domain value 0 is missing.
Fix this issue by adding check for domain value 0.
Before:
# ./perf stat -v -e hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/ sleep 1 Using CPUID 00800200 Control descriptor is not initialized Error: The sys_perf_event_open() syscall returned with 5 (Input/output error) for event (hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/). /bin/dmesg | grep -i perf may provide additional information.
Result from dmesg:
[ 37.819387] hv-24x7: hcall failed: [0 0x60040000 0x100 0] => ret 0xfffffffffffffffc (-4) detail=0x2000000 failing ix=0
After:
# ./perf stat -v -e hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/ sleep 1 Using CPUID 00800200 Control descriptor is not initialized Warning: hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/ event is not supported by the kernel. failed to read counter hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/
--- arch/powerpc/perf/hv-24x7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/perf/hv-24x7.c +1 -1
@@ -1410,7 +1410,7 @@ static int h_24x7_event_init(struct perf_event *event) } domain =event_get_domain (event); -if (domain >=HV_PERF_DOMAIN_MAX ) { +if (domain ==0 || domain >=HV_PERF_DOMAIN_MAX ) {pr_devel ("invalid domain %d\n" , domain);return -EINVAL ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 42/226 dccp: fix dccp_v4_err()/dccp_v6_err() again
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 6af289746a636f71f4c0535a9801774118486c7a ]
dh->dccph_x is the 9th byte (offset 8) in "struct dccp_hdr", not in the "byte 7" as Jann claimed.
We need to make sure the ICMP messages are big enough, using more standard ways (no more assumptions).
syzbot reported:
BUG: KMSAN: uninit-value in pskb_may_pull_reason include/linux/skbuff.h:2667 [inline] BUG: KMSAN: uninit-value in pskb_may_pull include/linux/skbuff.h:2681 [inline] BUG: KMSAN: uninit-value in dccp_v6_err+0x426/0x1aa0 net/dccp/ipv6.c:94 pskb_may_pull_reason include/linux/skbuff.h:2667 [inline] pskb_may_pull include/linux/skbuff.h:2681 [inline] dccp_v6_err+0x426/0x1aa0 net/dccp/ipv6.c:94 icmpv6_notify+0x4c7/0x880 net/ipv6/icmp.c:867 icmpv6_rcv+0x19d5/0x30d0 ip6_protocol_deliver_rcu+0xda6/0x2a60 net/ipv6/ip6_input.c:438 ip6_input_finish net/ipv6/ip6_input.c:483 [inline] NF_HOOK include/linux/netfilter.h:304 [inline] ip6_input+0x15d/0x430 net/ipv6/ip6_input.c:492 ip6_mc_input+0xa7e/0xc80 net/ipv6/ip6_input.c:586 dst_input include/net/dst.h:468 [inline] ip6_rcv_finish+0x5db/0x870 net/ipv6/ip6_input.c:79 NF_HOOK include/linux/netfilter.h:304 [inline] ipv6_rcv+0xda/0x390 net/ipv6/ip6_input.c:310 __netif_receive_skb_one_core net/core/dev.c:5523 [inline] __netif_receive_skb+0x1a6/0x5a0 net/core/dev.c:5637 netif_receive_skb_internal net/core/dev.c:5723 [inline] netif_receive_skb+0x58/0x660 net/core/dev.c:5782 tun_rx_batched+0x83b/0x920 tun_get_user+0x564c/0x6940 drivers/net/tun.c:2002 tun_chr_write_iter+0x3af/0x5d0 drivers/net/tun.c:2048 call_write_iter include/linux/fs.h:1985 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x8ef/0x15c0 fs/read_write.c:584 ksys_write+0x20f/0x4c0 fs/read_write.c:637 __do_sys_write fs/read_write.c:649 [inline] __se_sys_write fs/read_write.c:646 [inline] __x64_sys_write+0x93/0xd0 fs/read_write.c:646 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Uninit was created at:
slab_post_alloc_hook+0x12f/0xb70 mm/slab.h:767 slab_alloc_node mm/slub.c:3478 [inline] kmem_cache_alloc_node+0x577/0xa80 mm/slub.c:3523 kmalloc_reserve+0x13d/0x4a0 net/core/skbuff.c:559 __alloc_skb+0x318/0x740 net/core/skbuff.c:650 alloc_skb include/linux/skbuff.h:1286 [inline] alloc_skb_with_frags+0xc8/0xbd0 net/core/skbuff.c:6313 sock_alloc_send_pskb+0xa80/0xbf0 net/core/sock.c:2795 tun_alloc_skb drivers/net/tun.c:1531 [inline] tun_get_user+0x23cf/0x6940 drivers/net/tun.c:1846 tun_chr_write_iter+0x3af/0x5d0 drivers/net/tun.c:2048 call_write_iter include/linux/fs.h:1985 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x8ef/0x15c0 fs/read_write.c:584 ksys_write+0x20f/0x4c0 fs/read_write.c:637 __do_sys_write fs/read_write.c:649 [inline] __se_sys_write fs/read_write.c:646 [inline] __x64_sys_write+0x93/0xd0 fs/read_write.c:646 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd CPU: 0 PID: 4995 Comm: syz-executor153 Not tainted 6.6.0-rc1-syzkaller-00014-ga747acc0b752 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 08/04/2023
--- net/dccp/ipv4.c | 9 ++------- net/dccp/ipv6.c | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-)
net/dccp/ipv4.c +2 -7
@@ -243,13 +243,8 @@ static int dccp_v4_err(struct sk_buff *skb, u32 info)int err;struct net *net =dev_net (skb->dev); -/* For the first __dccp_basic_hdr_len() check, we only need dh->dccph_x, -* which is in byte 7 of the dccp header. -* Our caller (icmp_socket_deliver()) already pulled 8 bytes for us. -* -* Later on, we want to access the sequence number fields, which are -* beyond 8 bytes, so we have to pskb_may_pull() ourselves. -*/ +if (!pskb_may_pull (skb, offset +sizeof (*dh))) +return -EINVAL ; dh = (struct dccp_hdr *)(skb->data + offset);if (!pskb_may_pull (skb, offset +__dccp_basic_hdr_len (dh)))return -EINVAL ;
net/dccp/ipv6.c +2 -7
@@ -76,13 +76,8 @@ static int dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,__u64 seq;struct net *net =dev_net (skb->dev); -/* For the first __dccp_basic_hdr_len() check, we only need dh->dccph_x, -* which is in byte 7 of the dccp header. -* Our caller (icmpv6_notify()) already pulled 8 bytes for us. -* -* Later on, we want to access the sequence number fields, which are -* beyond 8 bytes, so we have to pskb_may_pull() ourselves. -*/ +if (!pskb_may_pull (skb, offset +sizeof (*dh))) +return -EINVAL ; dh = (struct dccp_hdr *)(skb->data + offset);if (!pskb_may_pull (skb, offset +__dccp_basic_hdr_len (dh)))return -EINVAL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 43/226 platform/x86: intel_scu_ipc: Check status after timeout in busy_loop()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Boyd <[email protected]>
[ Upstream commit e0b4ab3bb92bda8d12f55842614362989d5b2cb3 ]
It's possible for the polling loop in busy_loop() to get scheduled away for a long time.
status = ipc_read_status(scu); // status = IPC_STATUS_BUSY <long time scheduled away>
if (!(status & IPC_STATUS_BUSY))
If this happens, then the status bit could change while the task is scheduled away and this function would never read the status again after timing out. Instead, the function will return -ETIMEDOUT when it's possible that scheduling didn't work out and the status bit was cleared. Bit polling code should always check the bit being polled one more time after the timeout in case this happens.
Fix this by reading the status once more after the while loop breaks. The readl_poll_timeout() macro implements all of this, and it is shorter, so use that macro here to consolidate code and fix this.
There were some concerns with using readl_poll_timeout() because it uses timekeeping, and timekeeping isn't running early on or during the late stages of system suspend or early stages of system resume, but an audit of the code concluded that this code isn't called during those times so it is safe to use the macro.
--- drivers/platform/x86/intel_scu_ipc.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/platform/x86/intel_scu_ipc.c +8 -11
@@ -19,6 +19,7 @@#include <linux/init.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/iopoll.h> #include <linux/module.h> #include <linux/slab.h>
@@ -232,19 +233,15 @@ static inline u32 ipc_data_readl(struct intel_scu_ipc_dev *scu, u32 offset)/* Wait till scu status is busy */ static inline int busy_loop (struct intel_scu_ipc_dev *scu) { -unsigned long end = jiffies +IPC_TIMEOUT ; - -do { -u32 status; - - status =ipc_read_status (scu); -if (!(status &IPC_STATUS_BUSY )) -return (status &IPC_STATUS_ERR ) ? -EIO :0 ; +u8 status; +int err; -usleep_range (50 ,100 ); - }while (time_before (jiffies, end)); + err =readx_poll_timeout (ipc_read_status, scu, status, !(status &IPC_STATUS_BUSY ), +100 ,jiffies_to_usecs (IPC_TIMEOUT )); +if (err) +return err; -return -ETIMEDOUT ; +return (status &IPC_STATUS_ERR ) ? -EIO :0 ; }/* Wait till ipc ioc interrupt is received or timeout in 10 HZ */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 44/226 platform/x86: intel_scu_ipc: Check status upon timeout in ipc_wait_for_interrupt()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Boyd <[email protected]>
[ Upstream commit 427fada620733e6474d783ae6037a66eae42bf8c ]
It's possible for the completion in ipc_wait_for_interrupt() to timeout, simply because the interrupt was delayed in being processed. A timeout in itself is not an error. This driver should check the status register upon a timeout to ensure that scheduling or interrupt processing delays don't affect the outcome of the IPC return value.
CPU0 SCU
---- ---
ipc_wait_for_interrupt()
wait_for_completion_timeout(&scu->cmd_complete)
[TIMEOUT] status[IPC_STATUS_BUSY]=0
Fix this problem by reading the status bit in all cases, regardless of the timeout. If the completion times out, we'll assume the problem was that the IPC_STATUS_BUSY bit was still set, but if the status bit is cleared in the meantime we know that we hit some scheduling delay and we should just check the error bit.
--- drivers/platform/x86/intel_scu_ipc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/x86/intel_scu_ipc.c +4 -2
@@ -249,10 +249,12 @@ static inline int ipc_wait_for_interrupt(struct intel_scu_ipc_dev *scu) {int status; -if (!wait_for_completion_timeout (&scu->cmd_complete,IPC_TIMEOUT )) -return -ETIMEDOUT ; +wait_for_completion_timeout (&scu->cmd_complete,IPC_TIMEOUT ); status =ipc_read_status (scu); +if (status &IPC_STATUS_BUSY ) +return -ETIMEDOUT ; +if (status &IPC_STATUS_ERR )return -EIO ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 45/226 platform/x86: intel_scu_ipc: Dont override scu in intel_scu_ipc_dev_simple_command()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Boyd <[email protected]>
[ Upstream commit efce78584e583226e9a1f6cb2fb555d6ff47c3e7 ]
Andy discovered this bug during patch review. The 'scu' argument to this function shouldn't be overridden by the function itself. It doesn't make any sense. Looking at the commit history, we see that commit f57fa18583f5 ("platform/x86: intel_scu_ipc: Introduce new SCU IPC API") removed the setting of the scu to ipcdev in other functions, but not this one. That was an oversight. Remove this line so that we stop overriding the scu instance that is used by this function.
--- drivers/platform/x86/intel_scu_ipc.c | 1 - 1 file changed, 1 deletion(-)
drivers/platform/x86/intel_scu_ipc.c +0 -1
@@ -444,7 +444,6 @@ int intel_scu_ipc_dev_simple_command(struct intel_scu_ipc_dev *scu, int cmd,mutex_unlock (&ipclock);return -ENODEV ; } - scu = ipcdev; cmdval = sub <<12 | cmd;ipc_command (scu, cmdval); err =intel_scu_ipc_check_status (scu);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 46/226 platform/x86: intel_scu_ipc: Fail IPC send if still busy
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Boyd <[email protected]>
[ Upstream commit 85e654c9f722853a595fa941dca60c157b707b86 ]
It's possible for interrupts to get significantly delayed to the point that callers of intel_scu_ipc_dev_command() and friends can call the function once, hit a timeout, and call it again while the interrupt still hasn't been processed. This driver will get seriously confused if the interrupt is finally processed after the second IPC has been sent with ipc_command(). It won't know which IPC has been completed. This could be quite disastrous if calling code assumes something has happened upon return from intel_scu_ipc_dev_simple_command() when it actually hasn't.
Let's avoid this scenario by simply returning -EBUSY in this case. Hopefully higher layers will know to back off or fail gracefully when this happens. It's all highly unlikely anyway, but it's better to be correct here as we have no way to know which IPC the status register is telling us about if we send a second IPC while the previous IPC is still processing.
--- drivers/platform/x86/intel_scu_ipc.c | 40 +++++++++++++++++++--------- 1 file changed, 28 insertions(+), 12 deletions(-)
drivers/platform/x86/intel_scu_ipc.c +28 -12
@@ -266,6 +266,24 @@ static int intel_scu_ipc_check_status(struct intel_scu_ipc_dev *scu)return scu->irq >0 ?ipc_wait_for_interrupt (scu) :busy_loop (scu); } +static struct intel_scu_ipc_dev *intel_scu_ipc_get (struct intel_scu_ipc_dev *scu) +{ +u8 status; + +if (!scu) + scu = ipcdev; +if (!scu) +return ERR_PTR (-ENODEV ); + + status =ipc_read_status (scu); +if (status &IPC_STATUS_BUSY ) { +dev_dbg (&scu->dev,"device is busy\n" ); +return ERR_PTR (-EBUSY ); + } + +return scu; +} +/* Read/Write power control(PMIC in Langwell, MSIC in PenWell) registers */ static int pwr_reg_rdwr (struct intel_scu_ipc_dev *scu,u16 *addr,u8 *data,u32 count,u32 op,u32 id)
@@ -279,11 +297,10 @@ static int pwr_reg_rdwr(struct intel_scu_ipc_dev *scu, u16 *addr, u8 *data,memset (cbuf,0 ,sizeof (cbuf));mutex_lock (&ipclock); -if (!scu) - scu = ipcdev; -if (!scu) { + scu =intel_scu_ipc_get (scu); +if (IS_ERR (scu)) {mutex_unlock (&ipclock); -return -ENODEV ; +return PTR_ERR (scu); }for (nc =0 ; nc < count; nc++, offset +=2 ) {
@@ -438,12 +455,12 @@ int intel_scu_ipc_dev_simple_command(struct intel_scu_ipc_dev *scu, int cmd,int err;mutex_lock (&ipclock); -if (!scu) - scu = ipcdev; -if (!scu) { + scu =intel_scu_ipc_get (scu); +if (IS_ERR (scu)) {mutex_unlock (&ipclock); -return -ENODEV ; +return PTR_ERR (scu); } + cmdval = sub <<12 | cmd;ipc_command (scu, cmdval); err =intel_scu_ipc_check_status (scu);
@@ -483,11 +500,10 @@ int intel_scu_ipc_dev_command_with_size(struct intel_scu_ipc_dev *scu, int cmd,return -EINVAL ;mutex_lock (&ipclock); -if (!scu) - scu = ipcdev; -if (!scu) { + scu =intel_scu_ipc_get (scu); +if (IS_ERR (scu)) {mutex_unlock (&ipclock); -return -ENODEV ; +return PTR_ERR (scu); }memcpy (inbuf, in, inlen);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 47/226 x86/srso: Fix srso_show_state() side effect
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit a8cf700c17d9ca6cb8ee7dc5c9330dbac3948237 ]
Reading the 'spec_rstack_overflow' sysfs file can trigger an unnecessary MSR write, and possibly even a (handled) exception if the microcode hasn't been updated.
Avoid all that by just checking X86_FEATURE_IBPB_BRTYPE instead, which gets set by srso_select_mitigation() if the updated microcode exists.
--- arch/x86/kernel/cpu/bugs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/bugs.c +1 -1
@@ -2622,7 +2622,7 @@ static ssize_t srso_show_state(char *buf)return sysfs_emit (buf,"%s%s\n" , srso_strings[srso_mitigation], - (cpu_has_ibpb_brtype_microcode () ?"" :", no microcode" )); +boot_cpu_has (X86_FEATURE_IBPB_BRTYPE ) ?"" :", no microcode" ); } static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 48/226 x86/srso: Fix SBPB enablement for spec_rstack_overflow=off
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 01b057b2f4cc2d905a0bd92195657dbd9a7005ab ]
If the user has requested no SRSO mitigation, other mitigations can use the lighter-weight SBPB instead of IBPB.
--- arch/x86/kernel/cpu/bugs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/bugs.c +1 -1
@@ -2344,7 +2344,7 @@ static void __init srso_select_mitigation(void)switch (srso_cmd) {case SRSO_CMD_OFF : -return ; + goto pred_cmd;case SRSO_CMD_MICROCODE :if (has_microcode) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 49/226 net: hns3: only enable unicast promisc when mac table full
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jian Shen <[email protected]>
[ Upstream commit f2ed304922a55690529bcca59678dd92d7466ce8 ]
Currently, the driver will enable unicast promisc for the function once configure mac address fail. It's unreasonable when the failure is caused by using same mac address with other functions. So only enable unicast promisc when mac table full.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -1
@@ -7850,7 +7850,7 @@ static void hclge_update_overflow_flags(struct hclge_vport *vport,if (mac_type ==HCLGE_MAC_ADDR_UC ) {if (is_all_added) vport->overflow_promisc_flags &= ~HNAE3_OVERFLOW_UPE ; -else +else if (hclge_is_umv_space_full (vport, true)) vport->overflow_promisc_flags |=HNAE3_OVERFLOW_UPE ; }else {if (is_all_added)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 50/226 net: hns3: add 5ms delay before clear firmware reset irq source
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jie Wang <[email protected]>
[ Upstream commit 0770063096d5da4a8e467b6e73c1646a75589628 ]
Currently the reset process in hns3 and firmware watchdog init process is asynchronous. we think firmware watchdog initialization is completed before hns3 clear the firmware interrupt source. However, firmware initialization may not complete early.
so we add delay before hns3 clear firmware interrupt source and 5 ms delay is enough to avoid second firmware reset interrupt.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +5 -0
@@ -3125,8 +3125,13 @@ static u32 hclge_check_event_cause(struct hclge_dev *hdev, u32 *clearval)static void hclge_clear_event_cause (struct hclge_dev *hdev,u32 event_type,u32 regclr) { +#define HCLGE_IMP_RESET_DELAY 5 +switch (event_type) {case HCLGE_VECTOR0_EVENT_RST : +if (regclr ==BIT (HCLGE_VECTOR0_IMPRESET_INT_B )) +mdelay (HCLGE_IMP_RESET_DELAY ); +hclge_write_dev (&hdev->hw,HCLGE_MISC_RESET_STS_REG , regclr);break ;case HCLGE_VECTOR0_EVENT_MBX :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 51/226 net: bridge: use DEV_STATS_INC()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 44bdb313da57322c9b3c108eb66981c6ec6509f4 ]
syzbot/KCSAN reported data-races in br_handle_frame_finish() [1] This function can run from multiple cpus without mutual exclusion.
Adopt SMP safe DEV_STATS_INC() to update dev->stats fields.
Handles updates to dev->stats.tx_dropped while we are at it.
[1]
BUG: KCSAN: data-race in br_handle_frame_finish / br_handle_frame_finish
read-write to 0xffff8881374b2178 of 8 bytes by interrupt on cpu 1:
br_handle_frame_finish+0xd4f/0xef0 net/bridge/br_input.c:189 br_nf_hook_thresh+0x1ed/0x220 br_nf_pre_routing_finish_ipv6+0x50f/0x540 NF_HOOK include/linux/netfilter.h:304 [inline] br_nf_pre_routing_ipv6+0x1e3/0x2a0 net/bridge/br_netfilter_ipv6.c:178 br_nf_pre_routing+0x526/0xba0 net/bridge/br_netfilter_hooks.c:508 nf_hook_entry_hookfn include/linux/netfilter.h:144 [inline] nf_hook_bridge_pre net/bridge/br_input.c:272 [inline] br_handle_frame+0x4c9/0x940 net/bridge/br_input.c:417 __netif_receive_skb_core+0xa8a/0x21e0 net/core/dev.c:5417 __netif_receive_skb_one_core net/core/dev.c:5521 [inline] __netif_receive_skb+0x57/0x1b0 net/core/dev.c:5637 process_backlog+0x21f/0x380 net/core/dev.c:5965 __napi_poll+0x60/0x3b0 net/core/dev.c:6527 napi_poll net/core/dev.c:6594 [inline] net_rx_action+0x32b/0x750 net/core/dev.c:6727 __do_softirq+0xc1/0x265 kernel/softirq.c:553 run_ksoftirqd+0x17/0x20 kernel/softirq.c:921 smpboot_thread_fn+0x30a/0x4a0 kernel/smpboot.c:164 kthread+0x1d7/0x210 kernel/kthread.c:388 ret_from_fork+0x48/0x60 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:304
read-write to 0xffff8881374b2178 of 8 bytes by interrupt on cpu 0:
br_handle_frame_finish+0xd4f/0xef0 net/bridge/br_input.c:189 br_nf_hook_thresh+0x1ed/0x220 br_nf_pre_routing_finish_ipv6+0x50f/0x540 NF_HOOK include/linux/netfilter.h:304 [inline] br_nf_pre_routing_ipv6+0x1e3/0x2a0 net/bridge/br_netfilter_ipv6.c:178 br_nf_pre_routing+0x526/0xba0 net/bridge/br_netfilter_hooks.c:508 nf_hook_entry_hookfn include/linux/netfilter.h:144 [inline] nf_hook_bridge_pre net/bridge/br_input.c:272 [inline] br_handle_frame+0x4c9/0x940 net/bridge/br_input.c:417 __netif_receive_skb_core+0xa8a/0x21e0 net/core/dev.c:5417 __netif_receive_skb_one_core net/core/dev.c:5521 [inline] __netif_receive_skb+0x57/0x1b0 net/core/dev.c:5637 process_backlog+0x21f/0x380 net/core/dev.c:5965 __napi_poll+0x60/0x3b0 net/core/dev.c:6527 napi_poll net/core/dev.c:6594 [inline] net_rx_action+0x32b/0x750 net/core/dev.c:6727 __do_softirq+0xc1/0x265 kernel/softirq.c:553 do_softirq+0x5e/0x90 kernel/softirq.c:454 __local_bh_enable_ip+0x64/0x70 kernel/softirq.c:381 __raw_spin_unlock_bh include/linux/spinlock_api_smp.h:167 [inline] _raw_spin_unlock_bh+0x36/0x40 kernel/locking/spinlock.c:210 spin_unlock_bh include/linux/spinlock.h:396 [inline] batadv_tt_local_purge+0x1a8/0x1f0 net/batman-adv/translation-table.c:1356 batadv_tt_purge+0x2b/0x630 net/batman-adv/translation-table.c:3560 process_one_work kernel/workqueue.c:2630 [inline] process_scheduled_works+0x5b8/0xa30 kernel/workqueue.c:2703 worker_thread+0x525/0x730 kernel/workqueue.c:2784 kthread+0x1d7/0x210 kernel/kthread.c:388 ret_from_fork+0x48/0x60 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:304
value changed: 0x00000000000d7190 -> 0x00000000000d7191
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 14848 Comm: kworker/u4:11 Not tainted 6.6.0-rc1-syzkaller-00236-gad8a69f361b9 #0
--- net/bridge/br_forward.c | 4 ++-- net/bridge/br_input.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
net/bridge/br_forward.c +2 -2
@@ -118,7 +118,7 @@ static int deliver_clone(const struct net_bridge_port *prev, skb =skb_clone (skb,GFP_ATOMIC );if (!skb) { - dev->stats.tx_dropped++; +DEV_STATS_INC (dev, tx_dropped);return -ENOMEM ; }
@@ -255,7 +255,7 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, skb =skb_copy (skb,GFP_ATOMIC );if (!skb) { - dev->stats.tx_dropped++; +DEV_STATS_INC (dev, tx_dropped);return ; }
net/bridge/br_input.c +2 -2
@@ -145,12 +145,12 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skbif ((mdst && mdst->host_joined) ||br_multicast_is_router (br)) { local_rcv = true; - br->dev->stats.multicast++; +DEV_STATS_INC (br->dev, multicast); } mcast_hit = true; }else { local_rcv = true; - br->dev->stats.multicast++; +DEV_STATS_INC (br->dev, multicast); }break ;case BR_PKT_UNICAST :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 52/226 team: fix null-ptr-deref when team device type is changed
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ziyang Xuan <[email protected]>
[ Upstream commit 492032760127251e5540a5716a70996bacf2a3fd ]
Get a null-ptr-deref bug as follows with reproducer [1].
BUG: kernel NULL pointer dereference, address: 0000000000000228 ... RIP: 0010:vlan_dev_hard_header+0x35/0x140 [8021q] ... Call Trace: <TASK> ? __die+0x24/0x70 ? page_fault_oops+0x82/0x150 ? exc_page_fault+0x69/0x150 ? asm_exc_page_fault+0x26/0x30 ? vlan_dev_hard_header+0x35/0x140 [8021q] ? vlan_dev_hard_header+0x8e/0x140 [8021q] neigh_connected_output+0xb2/0x100 ip6_finish_output2+0x1cb/0x520 ? nf_hook_slow+0x43/0xc0 ? ip6_mtu+0x46/0x80 ip6_finish_output+0x2a/0xb0 mld_sendpack+0x18f/0x250 mld_ifc_work+0x39/0x160 process_one_work+0x1e6/0x3f0 worker_thread+0x4d/0x2f0 ? __pfx_worker_thread+0x10/0x10 kthread+0xe5/0x120 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x34/0x50 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1b/0x30
[1]
$ teamd -t team0 -d -c '{"runner": {"name": "loadbalance"}}'
$ ip link add name t-dummy type dummy
$ ip link add link t-dummy name t-dummy.100 type vlan id 100
$ ip link add name t-nlmon type nlmon
$ ip link set t-nlmon master team0
$ ip link set t-nlmon nomaster
$ ip link set t-dummy up
$ ip link set team0 up
$ ip link set t-dummy.100 down
$ ip link set t-dummy.100 master team0When enslave a vlan device to team device and team device type is changed from non-ether to ether, header_ops of team device is changed to vlan_header_ops. That is incorrect and will trigger null-ptr-deref for vlan->real_dev in vlan_dev_hard_header() because team device is not a vlan device.
Cache eth_header_ops in team_setup(), then assign cached header_ops to header_ops of team net device when its type is changed from non-ether to ether to fix the bug.
--- drivers/net/team/team.c | 10 +++++++++- include/linux/if_team.h | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/net/team/team.c +9 -1
@@ -2122,7 +2122,12 @@ static const struct ethtool_ops team_ethtool_ops = {static void team_setup_by_port (struct net_device *dev,struct net_device *port_dev) { - dev->header_ops = port_dev->header_ops; +struct team *team =netdev_priv (dev); + +if (port_dev->type ==ARPHRD_ETHER ) + dev->header_ops = team->header_ops_cache; +else + dev->header_ops = port_dev->header_ops; dev->type = port_dev->type; dev->hard_header_len = port_dev->hard_header_len; dev->needed_headroom = port_dev->needed_headroom;
@@ -2169,8 +2174,11 @@ static int team_dev_type_check_change(struct net_device *dev,static void team_setup (struct net_device *dev) { +struct team *team =netdev_priv (dev); +ether_setup (dev); dev->max_mtu =ETH_MAX_MTU ; + team->header_ops_cache = dev->header_ops; dev->netdev_ops = &team_netdev_ops; dev->ethtool_ops = &team_ethtool_ops;
include/linux/if_team.h +2 -0
@@ -189,6 +189,8 @@ struct team {struct net_device *dev;/* associated netdevice */ struct team_pcpu_stats __percpu *pcpu_stats; +const struct header_ops *header_ops_cache; +struct mutex lock;/* used for overall locking, e.g. port lists write */ /*
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 53/226 netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jozsef Kadlecsik <[email protected]>
[ Upstream commit 7433b6d2afd512d04398c73aa984d1e285be125b ]
Kyle Zeng reported that there is a race between IPSET_CMD_ADD and IPSET_CMD_SWAP in netfilter/ip_set, which can lead to the invocation of __ip_set_put on a wrong set, triggering the BUG_ON(set->ref == 0); check in it.
The race is caused by using the wrong reference counter, i.e. the ref counter instead of ref_netlink.
--- net/netfilter/ipset/ip_set_core.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/netfilter/ipset/ip_set_core.c +10 -2
@@ -682,6 +682,14 @@ __ip_set_put(struct ip_set *set)/* set->ref can be swapped out by ip_set_swap, netlink events (like dump) need * a separate reference counter */ +static void +__ip_set_get_netlink (struct ip_set *set) +{ +write_lock_bh (&ip_set_ref_lock); + set->ref_netlink++; +write_unlock_bh (&ip_set_ref_lock); +} +static void __ip_set_put_netlink (struct ip_set *set) {
@@ -1705,11 +1713,11 @@ call_ad(struct sock *ctnl, struct sk_buff *skb, struct ip_set *set, do { if (retried) { - __ip_set_get(set); + __ip_set_get_netlink(set); nfnl_unlock(NFNL_SUBSYS_IPSET); cond_resched(); nfnl_lock(NFNL_SUBSYS_IPSET); - __ip_set_put(set); + __ip_set_put_netlink(set); } ip_set_lock(set);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 54/226 seqlock: avoid -Wshadow warnings
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit a07c45312f06e288417049208c344ad76074627d ]
When building with W=2, there is a flood of warnings about the seqlock macros shadowing local variables:
19806 linux/seqlock.h:331:11: warning: declaration of 'seq' shadows a previous local [-Wshadow]
48 linux/seqlock.h:348:11: warning: declaration of 'seq' shadows a previous local [-Wshadow]
8 linux/seqlock.h:379:11: warning: declaration of 'seq' shadows a previous local [-Wshadow]
Prefix the local variables to make the warning useful elsewhere again.
Stable-dep-of: 41b43b6c6e30 ("locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()")
--- include/linux/seqlock.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
include/linux/seqlock.h +7 -7
@@ -328,13 +328,13 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu*/ #define __read_seqcount_begin (s) \ ({ \ - unsigned seq; \ + unsigned __seq; \ \ - while ((seq = __seqcount_sequence(s)) & 1) \ + while ((__seq = __seqcount_sequence(s)) & 1) \ cpu_relax(); \ \ kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX); \ - seq; \ + __seq; \ })/**
@@ -345,10 +345,10 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu*/ #define raw_read_seqcount_begin (s) \ ({ \ - unsigned seq = __read_seqcount_begin(s); \ + unsigned _seq = __read_seqcount_begin(s); \ \ smp_rmb(); \ - seq; \ + _seq; \ })/**
@@ -376,11 +376,11 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu*/ #define raw_read_seqcount (s) \ ({ \ - unsigned seq = __seqcount_sequence(s); \ + unsigned __seq = __seqcount_sequence(s); \ \ smp_rmb(); \ kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX); \ - seq; \ + __seq; \ })/**
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 55/226 seqlock: Rename __seqprop() users
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit ab440b2c604b60fe90885270fcfeb5c3dd5d6fae ]
More consistent naming should make it easier to untangle the _Generic token pasting maze called __seqprop().
Stable-dep-of: 41b43b6c6e30 ("locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()")
--- include/linux/seqlock.h | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-)
include/linux/seqlock.h +23 -23
@@ -307,10 +307,10 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu __seqprop_case((s), mutex, prop), \ __seqprop_case((s), ww_mutex, prop)) -#define __seqcount_ptr (s) __seqprop(s, ptr) -#define __seqcount_sequence (s) __seqprop(s, sequence) -#define __seqcount_lock_preemptible (s) __seqprop(s, preemptible) -#define __seqcount_assert_lock_held (s) __seqprop(s, assert) +#define seqprop_ptr (s) __seqprop(s, ptr) +#define seqprop_sequence (s) __seqprop(s, sequence) +#define seqprop_preemptible (s) __seqprop(s, preemptible) +#define seqprop_assert (s) __seqprop(s, assert)/** * __read_seqcount_begin() - begin a seqcount_t read section w/o barrier
@@ -330,7 +330,7 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu ({ \ unsigned __seq; \ \ - while ((__seq = __seqcount_sequence(s)) & 1) \ + while ((__seq = seqprop_sequence(s)) & 1) \ cpu_relax(); \ \ kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX); \
@@ -359,7 +359,7 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu*/ #define read_seqcount_begin (s) \ ({ \ - seqcount_lockdep_reader_access(__seqcount_ptr(s)); \ + seqcount_lockdep_reader_access(seqprop_ptr(s)); \ raw_read_seqcount_begin(s); \ })
@@ -376,7 +376,7 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu*/ #define raw_read_seqcount (s) \ ({ \ - unsigned __seq = __seqcount_sequence(s); \ + unsigned __seq = seqprop_sequence(s); \ \ smp_rmb(); \ kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX); \
@@ -425,7 +425,7 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu* Return: true if a read section retry is required, else false */ #define __read_seqcount_retry (s, start) \ - __read_seqcount_t_retry(__seqcount_ptr(s), start) + __read_seqcount_t_retry(seqprop_ptr(s), start)static inline int __read_seqcount_t_retry (const seqcount_t *s,unsigned start) {
@@ -445,7 +445,7 @@ static inline int __read_seqcount_t_retry(const seqcount_t *s, unsigned start)* Return: true if a read section retry is required, else false */ #define read_seqcount_retry (s, start) \ - read_seqcount_t_retry(__seqcount_ptr(s), start) + read_seqcount_t_retry(seqprop_ptr(s), start)static inline int read_seqcount_t_retry (const seqcount_t *s,unsigned start) {
@@ -459,10 +459,10 @@ static inline int read_seqcount_t_retry(const seqcount_t *s, unsigned start)*/ #define raw_write_seqcount_begin (s) \ do { \ - if (__seqcount_lock_preemptible(s)) \ + if (seqprop_preemptible(s)) \ preempt_disable(); \ \ - raw_write_seqcount_t_begin(__seqcount_ptr(s)); \ + raw_write_seqcount_t_begin(seqprop_ptr(s)); \ } while (0)static inline void raw_write_seqcount_t_begin (seqcount_t *s)
@@ -478,9 +478,9 @@ static inline void raw_write_seqcount_t_begin(seqcount_t *s)*/ #define raw_write_seqcount_end (s) \ do { \ - raw_write_seqcount_t_end(__seqcount_ptr(s)); \ + raw_write_seqcount_t_end(seqprop_ptr(s)); \ \ - if (__seqcount_lock_preemptible(s)) \ + if (seqprop_preemptible(s)) \ preempt_enable(); \ } while (0)
@@ -501,12 +501,12 @@ static inline void raw_write_seqcount_t_end(seqcount_t *s)*/ #define write_seqcount_begin_nested (s, subclass) \ do { \ - __seqcount_assert_lock_held(s); \ + seqprop_assert(s); \ \ - if (__seqcount_lock_preemptible(s)) \ + if (seqprop_preemptible(s)) \ preempt_disable(); \ \ - write_seqcount_t_begin_nested(__seqcount_ptr(s), subclass); \ + write_seqcount_t_begin_nested(seqprop_ptr(s), subclass); \ } while (0)static inline void write_seqcount_t_begin_nested (seqcount_t *s,int subclass)
@@ -528,12 +528,12 @@ static inline void write_seqcount_t_begin_nested(seqcount_t *s, int subclass)*/ #define write_seqcount_begin (s) \ do { \ - __seqcount_assert_lock_held(s); \ + seqprop_assert(s); \ \ - if (__seqcount_lock_preemptible(s)) \ + if (seqprop_preemptible(s)) \ preempt_disable(); \ \ - write_seqcount_t_begin(__seqcount_ptr(s)); \ + write_seqcount_t_begin(seqprop_ptr(s)); \ } while (0)static inline void write_seqcount_t_begin (seqcount_t *s)
@@ -549,9 +549,9 @@ static inline void write_seqcount_t_begin(seqcount_t *s)*/ #define write_seqcount_end (s) \ do { \ - write_seqcount_t_end(__seqcount_ptr(s)); \ + write_seqcount_t_end(seqprop_ptr(s)); \ \ - if (__seqcount_lock_preemptible(s)) \ + if (seqprop_preemptible(s)) \ preempt_enable(); \ } while (0)
@@ -603,7 +603,7 @@ static inline void write_seqcount_t_end(seqcount_t *s)* } */ #define raw_write_seqcount_barrier (s) \ - raw_write_seqcount_t_barrier(__seqcount_ptr(s)) + raw_write_seqcount_t_barrier(seqprop_ptr(s))static inline void raw_write_seqcount_t_barrier (seqcount_t *s) {
@@ -623,7 +623,7 @@ static inline void raw_write_seqcount_t_barrier(seqcount_t *s)* will complete successfully and see data older than this. */ #define write_seqcount_invalidate (s) \ - write_seqcount_t_invalidate(__seqcount_ptr(s)) + write_seqcount_t_invalidate(seqprop_ptr(s))static inline void write_seqcount_t_invalidate (seqcount_t *s) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 56/226 seqlock: Prefix internal seqcount_t-only macros with a "do_"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmed S. Darwish <[email protected]>
[ Upstream commit 66bcfcdf89d00f2409f4b5da0f8c20c08318dc72 ]
When the seqcount_LOCKNAME_t group of data types were introduced, two classes of seqlock.h sequence counter macros were added:
- An external public API which can either take a plain seqcount_t or any of the seqcount_LOCKNAME_t variants.
- An internal API which takes only a plain seqcount_t.
To distinguish between the two groups, the "*_seqcount_t_*" pattern was used for the latter. This confused a number of mm/ call-site developers, and Linus also commented that it was not a standard practice for marking seqlock.h internal APIs.
Distinguish the latter group of macros by prefixing a "do_".
Stable-dep-of: 41b43b6c6e30 ("locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()")
--- include/linux/seqlock.h | 66 ++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-)
include/linux/seqlock.h +33 -33
@@ -425,9 +425,9 @@ SEQCOUNT_LOCKNAME(ww_mutex, struct ww_mutex, true, &s->lock->base, ww_mu* Return: true if a read section retry is required, else false */ #define __read_seqcount_retry (s, start) \ - __read_seqcount_t_retry(seqprop_ptr(s), start) + do___read_seqcount_retry(seqprop_ptr(s), start) -static inline int __read_seqcount_t_retry (const seqcount_t *s,unsigned start) +static inline int do___read_seqcount_retry (const seqcount_t *s,unsigned start) {kcsan_atomic_next (0 );return unlikely (READ_ONCE (s->sequence) != start);
@@ -445,12 +445,12 @@ static inline int __read_seqcount_t_retry(const seqcount_t *s, unsigned start)* Return: true if a read section retry is required, else false */ #define read_seqcount_retry (s, start) \ - read_seqcount_t_retry(seqprop_ptr(s), start) + do_read_seqcount_retry(seqprop_ptr(s), start) -static inline int read_seqcount_t_retry (const seqcount_t *s,unsigned start) +static inline int do_read_seqcount_retry (const seqcount_t *s,unsigned start) {smp_rmb (); -return __read_seqcount_t_retry (s, start); +return do___read_seqcount_retry (s, start); }/**
@@ -462,10 +462,10 @@ do { \if (seqprop_preemptible (s)) \preempt_disable (); \ \ -raw_write_seqcount_t_begin (seqprop_ptr (s)); \ +do_raw_write_seqcount_begin (seqprop_ptr (s)); \ }while (0 ) -static inline void raw_write_seqcount_t_begin(seqcount_t *s) +static inline void do_raw_write_seqcount_begin(seqcount_t *s) {kcsan_nestable_atomic_begin (); s->sequence++;
@@ -478,13 +478,13 @@ static inline void raw_write_seqcount_t_begin(seqcount_t *s)*/ #define raw_write_seqcount_end (s) \ do { \ - raw_write_seqcount_t_end(seqprop_ptr(s)); \ + do_raw_write_seqcount_end(seqprop_ptr(s)); \ \ if (seqprop_preemptible(s)) \ preempt_enable(); \ } while (0) -static inline void raw_write_seqcount_t_end (seqcount_t *s) +static inline void do_raw_write_seqcount_end (seqcount_t *s) {smp_wmb (); s->sequence++;
@@ -506,12 +506,12 @@ do { \if (seqprop_preemptible (s)) \preempt_disable (); \ \ -write_seqcount_t_begin_nested (seqprop_ptr (s), subclass); \ +do_write_seqcount_begin_nested (seqprop_ptr (s), subclass); \ }while (0 ) -static inline void write_seqcount_t_begin_nested(seqcount_t *s, int subclass) +static inline void do_write_seqcount_begin_nested(seqcount_t *s, int subclass) { -raw_write_seqcount_t_begin (s); +do_raw_write_seqcount_begin (s);seqcount_acquire (&s->dep_map, subclass,0 , _RET_IP_); }
@@ -533,12 +533,12 @@ do { \if (seqprop_preemptible (s)) \preempt_disable (); \ \ -write_seqcount_t_begin (seqprop_ptr (s)); \ +do_write_seqcount_begin (seqprop_ptr (s)); \ }while (0 ) -static inline void write_seqcount_t_begin(seqcount_t *s) +static inline void do_write_seqcount_begin(seqcount_t *s) { -write_seqcount_t_begin_nested (s,0 ); +do_write_seqcount_begin_nested (s,0 ); }/**
@@ -549,16 +549,16 @@ static inline void write_seqcount_t_begin(seqcount_t *s)*/ #define write_seqcount_end (s) \ do { \ - write_seqcount_t_end(seqprop_ptr(s)); \ + do_write_seqcount_end(seqprop_ptr(s)); \ \ if (seqprop_preemptible(s)) \ preempt_enable(); \ } while (0) -static inline void write_seqcount_t_end (seqcount_t *s) +static inline void do_write_seqcount_end (seqcount_t *s) {seqcount_release (&s->dep_map, _RET_IP_); -raw_write_seqcount_t_end (s); +do_raw_write_seqcount_end (s); }/**
@@ -603,9 +603,9 @@ static inline void write_seqcount_t_end(seqcount_t *s)* } */ #define raw_write_seqcount_barrier (s) \ - raw_write_seqcount_t_barrier(seqprop_ptr(s)) + do_raw_write_seqcount_barrier(seqprop_ptr(s)) -static inline void raw_write_seqcount_t_barrier (seqcount_t *s) +static inline void do_raw_write_seqcount_barrier (seqcount_t *s) {kcsan_nestable_atomic_begin (); s->sequence++;
@@ -623,9 +623,9 @@ static inline void raw_write_seqcount_t_barrier(seqcount_t *s)* will complete successfully and see data older than this. */ #define write_seqcount_invalidate (s) \ - write_seqcount_t_invalidate(seqprop_ptr(s)) + do_write_seqcount_invalidate(seqprop_ptr(s)) -static inline void write_seqcount_t_invalidate (seqcount_t *s) +static inline void do_write_seqcount_invalidate (seqcount_t *s) {smp_wmb ();kcsan_nestable_atomic_begin ();
@@ -862,9 +862,9 @@ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start) }/* -* For all seqlock_t write side functions, use write_seqcount_*t*_begin() -* instead of the generic write_seqcount_begin(). This way, no redundant -* lockdep_assert_held() checks are added. +* For all seqlock_t write side functions, use the the internal +* do_write_seqcount_begin() instead of generic write_seqcount_begin(). +* This way, no redundant lockdep_assert_held() checks are added. */ /**
@@ -883,7 +883,7 @@ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)static inline void write_seqlock (seqlock_t *sl) {spin_lock (&sl->lock); -write_seqcount_t_begin (&sl->seqcount.seqcount); +do_write_seqcount_begin (&sl->seqcount.seqcount); }/**
@@ -895,7 +895,7 @@ static inline void write_seqlock(seqlock_t *sl)*/ static inline void write_sequnlock (seqlock_t *sl) { -write_seqcount_t_end (&sl->seqcount.seqcount); +do_write_seqcount_end (&sl->seqcount.seqcount);spin_unlock (&sl->lock); }
@@ -909,7 +909,7 @@ static inline void write_sequnlock(seqlock_t *sl)static inline void write_seqlock_bh (seqlock_t *sl) {spin_lock_bh (&sl->lock); -write_seqcount_t_begin (&sl->seqcount.seqcount); +do_write_seqcount_begin (&sl->seqcount.seqcount); }/**
@@ -922,7 +922,7 @@ static inline void write_seqlock_bh(seqlock_t *sl)*/ static inline void write_sequnlock_bh (seqlock_t *sl) { -write_seqcount_t_end (&sl->seqcount.seqcount); +do_write_seqcount_end (&sl->seqcount.seqcount);spin_unlock_bh (&sl->lock); }
@@ -936,7 +936,7 @@ static inline void write_sequnlock_bh(seqlock_t *sl)static inline void write_seqlock_irq (seqlock_t *sl) {spin_lock_irq (&sl->lock); -write_seqcount_t_begin (&sl->seqcount.seqcount); +do_write_seqcount_begin (&sl->seqcount.seqcount); }/**
@@ -948,7 +948,7 @@ static inline void write_seqlock_irq(seqlock_t *sl)*/ static inline void write_sequnlock_irq (seqlock_t *sl) { -write_seqcount_t_end (&sl->seqcount.seqcount); +do_write_seqcount_end (&sl->seqcount.seqcount);spin_unlock_irq (&sl->lock); }
@@ -957,7 +957,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)unsigned long flags;spin_lock_irqsave (&sl->lock, flags); -write_seqcount_t_begin (&sl->seqcount.seqcount); +do_write_seqcount_begin (&sl->seqcount.seqcount);return flags; }
@@ -986,7 +986,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)static inline void write_sequnlock_irqrestore (seqlock_t *sl,unsigned long flags) { -write_seqcount_t_end (&sl->seqcount.seqcount); +do_write_seqcount_end (&sl->seqcount.seqcount);spin_unlock_irqrestore (&sl->lock, flags); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 57/226 locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 41b43b6c6e30a832c790b010a06772e793bca193 ]
It was brought up by Tetsuo that the following sequence:
write_seqlock_irqsave()
printk_deferred_enter()
could lead to a deadlock if the lockdep annotation within write_seqlock_irqsave() triggers.
The problem is that the sequence counter is incremented before the lockdep annotation is performed. The lockdep splat would then attempt to invoke printk() but the reader side, of the same seqcount, could have a tty_port::lock acquired waiting for the sequence number to become even again.
The other lockdep annotations come before the actual locking because "we want to see the locking error before it happens". There is no reason why seqcount should be different here.
Do the lockdep annotation first then perform the locking operation (the sequence increment).
--- include/linux/seqlock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/seqlock.h +1 -1
@@ -511,8 +511,8 @@ do { \static inline void do_write_seqcount_begin_nested (seqcount_t *s,int subclass) { -do_raw_write_seqcount_begin (s);seqcount_acquire (&s->dep_map, subclass,0 , _RET_IP_); +do_raw_write_seqcount_begin (s); }/**
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 58/226 bnxt_en: Flush XDP for bnxt_poll_nitroa0()s NAPI
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit edc0140cc3b7b91874ebe70eb7d2a851e8817ccc ]
bnxt_poll_nitroa0() invokes bnxt_rx_pkt() which can run a XDP program which in turn can return XDP_REDIRECT. bnxt_rx_pkt() is also used by __bnxt_poll_work() which flushes (xdp_do_flush()) the packets after each round. bnxt_poll_nitroa0() lacks this feature. xdp_do_flush() should be invoked before leaving the NAPI callback.
Invoke xdp_do_flush() after a redirect in bnxt_poll_nitroa0() NAPI.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +5 -0
@@ -2404,6 +2404,7 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget)struct rx_cmp_ext *rxcmp1;u32 cp_cons, tmp_raw_cons;u32 raw_cons = cpr->cp_raw_cons; +bool flush_xdp = false;u32 rx_pkts =0 ;u8 event =0 ;
@@ -2438,6 +2439,8 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget) rx_pkts++; else if (rc == -EBUSY) /* partial completion */ break; +if (event &BNXT_REDIRECT_EVENT ) + flush_xdp = true; }else if (unlikely (TX_CMP_TYPE (txcmp) ==CMPL_BASE_TYPE_HWRM_DONE )) {bnxt_hwrm_handler (bp, txcmp);
@@ -2457,6 +2460,8 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget)if (event &BNXT_AGG_EVENT )bnxt_db_write (bp, &rxr->rx_agg_db, rxr->rx_agg_prod); +if (flush_xdp) +xdp_do_flush ();if (!bnxt_has_work (bp, cpr) && rx_pkts < budget) {napi_complete_done (napi, rx_pkts);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 59/226 net: rds: Fix possible NULL-pointer dereference
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Chernyshev <[email protected]>
[ Upstream commit f1d95df0f31048f1c59092648997686e3f7d9478 ]
In rds_rdma_cm_event_handler_cmn() check, if conn pointer exists before dereferencing it as rdma_set_service_type() argument
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- net/rds/rdma_transport.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/rds/rdma_transport.c +5 -3
@@ -86,10 +86,12 @@ static int rds_rdma_cm_event_handler_cmn(struct rdma_cm_id *cm_id,break ;case RDMA_CM_EVENT_ADDR_RESOLVED : -rdma_set_service_type (cm_id, conn->c_tos); -/* XXX do we need to clean up if this fails? */ - ret =rdma_resolve_route (cm_id, +if (conn) { +rdma_set_service_type (cm_id, conn->c_tos); +/* XXX do we need to clean up if this fails? */ + ret =rdma_resolve_route (cm_id,RDS_RDMA_RESOLVE_TIMEOUT_MS ); + }break ;case RDMA_CM_EVENT_ROUTE_RESOLVED :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 60/226 gpio: tb10x: Fix an error handling path in tb10x_gpio_probe()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit b547b5e52a0587e6b25ea520bf2f9e03d00cbcb6 ]
If an error occurs after a successful irq_domain_add_linear() call, it should be undone by a corresponding irq_domain_remove(), as already done in the remove function.
--- drivers/gpio/gpio-tb10x.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpio/gpio-tb10x.c +5 -1
@@ -195,7 +195,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev) handle_edge_irq,IRQ_NOREQUEST ,IRQ_NOPROBE , IRQ_GC_INIT_MASK_CACHE);if (ret) -return ret; + goto err_remove_domain; gc = tb10x_gpio->domain->gc->gc[0 ]; gc->reg_base = tb10x_gpio->base;
@@ -209,6 +209,10 @@ static int tb10x_gpio_probe(struct platform_device *pdev) }return 0 ; + +err_remove_domain: +irq_domain_remove (tb10x_gpio->domain); +return ret; }static int tb10x_gpio_remove (struct platform_device *pdev)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 61/226 i2c: mux: demux-pinctrl: check the return value of devm_kstrdup()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaoke Wang <[email protected]>
[ Upstream commit 7c0195fa9a9e263df204963f88a22b21688ffb66 ]
devm_kstrdup() returns pointer to allocated string on success, NULL on failure. So it is better to check the return value of it.
--- drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/i2c/muxes/i2c-demux-pinctrl.c +4 -0
@@ -243,6 +243,10 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) props[i].name =devm_kstrdup (&pdev->dev,"status" ,GFP_KERNEL ); props[i].value =devm_kstrdup (&pdev->dev,"ok" ,GFP_KERNEL ); +if (!props[i].name || !props[i].value) { + err = -ENOMEM ; + goto err_rollback; + } props[i].length =3 ;of_changeset_init (&priv->chan[i].chgset);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 62/226 netfilter: nf_tables: unregister flowtable hooks on netns exit
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 6069da443bf65f513bb507bb21e2f87cfb1ad0b6 upstream.
Unregister flowtable hooks before they are releases via nf_tables_flowtable_destroy() otherwise hook core reports UAF.
BUG: KASAN: use-after-free in nf_hook_entries_grow+0x5a7/0x700 net/netfilter/core.c:142 net/netfilter/core.c:142 Read of size 4 at addr ffff8880736f7438 by task syz-executor579/3666 CPU: 0 PID: 3666 Comm: syz-executor579 Not tainted 5.16.0-rc5-syzkaller #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 lib/dump_stack.c:88 [inline] lib/dump_stack.c:106 dump_stack_lvl+0x1dc/0x2d8 lib/dump_stack.c:106 lib/dump_stack.c:106 print_address_description+0x65/0x380 mm/kasan/report.c:247 mm/kasan/report.c:247 __kasan_report mm/kasan/report.c:433 [inline] __kasan_report mm/kasan/report.c:433 [inline] mm/kasan/report.c:450 kasan_report+0x19a/0x1f0 mm/kasan/report.c:450 mm/kasan/report.c:450 nf_hook_entries_grow+0x5a7/0x700 net/netfilter/core.c:142 net/netfilter/core.c:142 __nf_register_net_hook+0x27e/0x8d0 net/netfilter/core.c:429 net/netfilter/core.c:429 nf_register_net_hook+0xaa/0x180 net/netfilter/core.c:571 net/netfilter/core.c:571 nft_register_flowtable_net_hooks+0x3c5/0x730 net/netfilter/nf_tables_api.c:7232 net/netfilter/nf_tables_api.c:7232 nf_tables_newflowtable+0x2022/0x2cf0 net/netfilter/nf_tables_api.c:7430 net/netfilter/nf_tables_api.c:7430 nfnetlink_rcv_batch net/netfilter/nfnetlink.c:513 [inline] nfnetlink_rcv_skb_batch net/netfilter/nfnetlink.c:634 [inline] nfnetlink_rcv_batch net/netfilter/nfnetlink.c:513 [inline] net/netfilter/nfnetlink.c:652 nfnetlink_rcv_skb_batch net/netfilter/nfnetlink.c:634 [inline] net/netfilter/nfnetlink.c:652 nfnetlink_rcv+0x10e6/0x2550 net/netfilter/nfnetlink.c:652 net/netfilter/nfnetlink.c:652
__nft_release_hook() calls nft_unregister_flowtable_net_hooks() which only unregisters the hooks, then after RCU grace period, it is guaranteed that no packets add new entries to the flowtable (no flow offload rules and flowtable hooks are reachable from packet path), so it is safe to call nf_flow_table_free() which cleans up the remaining entries from the flowtable (both software and hardware) and it unbinds the flow_block.
--- net/netfilter/nf_tables_api.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +13 -5
@@ -9466,16 +9466,24 @@ int __nft_release_basechain(struct nft_ctx *ctx) }EXPORT_SYMBOL_GPL (__nft_release_basechain); +static void __nft_release_hook (struct net *net,struct nft_table *table) +{ +struct nft_flowtable *flowtable; +struct nft_chain *chain; + +list_for_each_entry (chain, &table->chains, list) +nf_tables_unregister_hook (net, table, chain); +list_for_each_entry (flowtable, &table->flowtables, list) +nft_unregister_flowtable_net_hooks (net, &flowtable->hook_list); +} +static void __nft_release_hooks (struct net *net) {struct nftables_pernet *nft_net =net_generic (net, nf_tables_net_id);struct nft_table *table; -struct nft_chain *chain; -list_for_each_entry (table, &nft_net->tables, list) { -list_for_each_entry (chain, &table->chains, list) -nf_tables_unregister_hook (net, table, chain); - } +list_for_each_entry (table, &nft_net->tables, list) +__nft_release_hook (net, table); }static void __nft_release_table (struct net *net,struct nft_table *table)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 63/226 netfilter: nf_tables: double hook unregistration in netns path
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit f9a43007d3f7ba76d5e7f9421094f00f2ef202f8 upstream.
[ This backport includes ab5e5c062f67 ("netfilter: nf_tables: use
kfree_rcu(ptr, rcu) to release hooks in clean_net path") ]
__nft_release_hooks() is called from pre_netns exit path which unregisters the hooks, then the NETDEV_UNREGISTER event is triggered which unregisters the hooks again.
[ 565.221461] WARNING: CPU: 18 PID: 193 at net/netfilter/core.c:495 __nf_unregister_net_hook+0x247/0x270 [...] [ 565.246890] CPU: 18 PID: 193 Comm: kworker/u64:1 Tainted: G E 5.18.0-rc7+ #27 [ 565.253682] Workqueue: netns cleanup_net [ 565.257059] RIP: 0010:__nf_unregister_net_hook+0x247/0x270 [...] [ 565.297120] Call Trace: [ 565.300900] <TASK> [ 565.304683] nf_tables_flowtable_event+0x16a/0x220 [nf_tables] [ 565.308518] raw_notifier_call_chain+0x63/0x80 [ 565.312386] unregister_netdevice_many+0x54f/0xb50
Unregister and destroy netdev hook from netns pre_exit via kfree_rcu so the NETDEV_UNREGISTER path see unregistered hooks.
--- net/netfilter/nf_tables_api.c | 54 ++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 13 deletions(-)
net/netfilter/nf_tables_api.c +41 -13
@@ -303,12 +303,18 @@ static int nft_netdev_register_hooks(struct net *net, }static void nft_netdev_unregister_hooks (struct net *net, -struct list_head *hook_list) +struct list_head *hook_list, +bool release_netdev) { -struct nft_hook *hook; +struct nft_hook *hook, *next; -list_for_each_entry (hook, hook_list, list) +list_for_each_entry_safe (hook, next, hook_list, list) {nf_unregister_net_hook (net, &hook->ops); +if (release_netdev) { +list_del (&hook->list); +kfree_rcu (hook, rcu); + } + } } static int nf_tables_register_hook(struct net *net,
@@ -334,9 +340,10 @@ static int nf_tables_register_hook(struct net *net,return nf_register_net_hook (net, &basechain->ops); } -static void nf_tables_unregister_hook (struct net *net, -const struct nft_table *table, -struct nft_chain *chain) +static void __nf_tables_unregister_hook (struct net *net, +const struct nft_table *table, +struct nft_chain *chain, +bool release_netdev) {struct nft_base_chain *basechain;const struct nf_hook_ops *ops;
@@ -351,11 +358,19 @@ static void nf_tables_unregister_hook(struct net *net,return basechain->type->ops_unregister (net, ops);if (nft_base_chain_netdev (table->family, basechain->ops.hooknum)) -nft_netdev_unregister_hooks (net, &basechain->hook_list); +nft_netdev_unregister_hooks (net, &basechain->hook_list, + release_netdev);else nf_unregister_net_hook (net, &basechain->ops); } +static void nf_tables_unregister_hook (struct net *net, +const struct nft_table *table, +struct nft_chain *chain) +{ +return __nf_tables_unregister_hook (net, table, chain, false); +} +static void nft_trans_commit_list_add_tail (struct net *net,struct nft_trans *trans) {struct nftables_pernet *nft_net;
@@ -6822,13 +6837,25 @@ static void nft_unregister_flowtable_hook(struct net *net, FLOW_BLOCK_UNBIND); } -static void nft_unregister_flowtable_net_hooks (struct net *net, -struct list_head *hook_list) +static void __nft_unregister_flowtable_net_hooks (struct net *net, +struct list_head *hook_list, +bool release_netdev) { -struct nft_hook *hook; +struct nft_hook *hook, *next; -list_for_each_entry (hook, hook_list, list) +list_for_each_entry_safe (hook, next, hook_list, list) {nf_unregister_net_hook (net, &hook->ops); +if (release_netdev) { +list_del (&hook->list); +kfree_rcu (hook, rcu); + } + } +} + +static void nft_unregister_flowtable_net_hooks (struct net *net, +struct list_head *hook_list) +{ +__nft_unregister_flowtable_net_hooks (net, hook_list, false); } static int nft_register_flowtable_net_hooks(struct net *net,
@@ -9472,9 +9499,10 @@ static void __nft_release_hook(struct net *net, struct nft_table *table)struct nft_chain *chain;list_for_each_entry (chain, &table->chains, list) -nf_tables_unregister_hook (net, table, chain); +__nf_tables_unregister_hook (net, table, chain, true);list_for_each_entry (flowtable, &table->flowtables, list) -nft_unregister_flowtable_net_hooks (net, &flowtable->hook_list); +__nft_unregister_flowtable_net_hooks (net, &flowtable->hook_list, + true); }static void __nft_release_hooks (struct net *net)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 64/226 Input: i8042 - rename i8042-x86ia64io.h to i8042-acpipnpio.h
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
[ Upstream commit 8761b9b580d53162cca7868385069c0d4354c9e0 ]
Now i8042-x86ia64io.h is shared by X86 and IA64, but it can be shared by more platforms (such as LoongArch) with ACPI firmware on which PNP typed keyboard and mouse is configured in DSDT. So rename it to i8042- acpipnpio.h.
Stable-dep-of: eb09074bdb05 ("Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN")
---
.../input/serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} | 6 +++---
drivers/input/serio/i8042.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename drivers/input/serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} (99%)drivers/input/serio/i8042-acpipnpio.h renamed from drivers/input/serio/i8042-x86ia64io.h +3 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef _I8042_X86IA64IO_H -#define _I8042_X86IA64IO_H +#ifndef _I8042_ACPIPNPIO_H +#define _I8042_ACPIPNPIO_H#ifdef CONFIG_X86
@@ -1587,4 +1587,4 @@ static inline void i8042_platform_exit(void) i8042_pnp_exit(); } -#endif /* _I8042_X86IA64IO_H */ +#endif /* _I8042_ACPIPNPIO_H */
drivers/input/serio/i8042.h +1 -1
@@ -20,7 +20,7 @@#elif defined(CONFIG_SPARC )#include "i8042-sparcio.h" #elif defined(CONFIG_X86 ) || defined(CONFIG_IA64 ) -#include "i8042-x86ia64io.h" +#include "i8042-acpipnpio.h" #else #include "i8042-io.h" #endif
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 65/226 Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Werner Sembach <[email protected]>
[ Upstream commit eb09074bdb05ffd6bfe77f8b4a41b76ef78c997b ]
The touchpad of this device is both connected via PS/2 and i2c. This causes strange behavior when both driver fight for control. The easy fix is to prevent the PS/2 driver from accessing the mouse port as the full feature set of the touchpad is only supported in the i2c interface anyway.
The strange behavior in this case is, that when an external screen is connected and the notebook is closed, the pointer on the external screen is moving to the lower right corner. When the notebook is opened again, this movement stops, but the touchpad clicks are unresponsive afterwards until reboot.
--- drivers/input/serio/i8042-acpipnpio.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/input/serio/i8042-acpipnpio.h +7 -0
@@ -1184,6 +1184,13 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, +/* See comment on TUXEDO InfinityBook S17 Gen6 / Clevo NS70MU above */ + { + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "PD5x_7xPNP_PNR_PNN_PNT"), + }, + .driver_data = (void *)(SERIO_QUIRK_NOAUX ) + }, { .matches = { DMI_MATCH(DMI_BOARD_NAME, "X170SM"),
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 66/226 mmc: renesas_sdhi: probe into TMIO after SCC parameters have been setup
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit b161d87dfd3d9f3fb064a089a9e521d0e5d3e38f ]
Setting up the SCC parameters does not need a probed TMIO device. But in the near future, probing the TMIO device needs the SCC parameters setup. So, fix the ordering.
Stable-dep-of: 74f45de394d9 ("mmc: renesas_sdhi: register irqs before registering controller")
--- drivers/mmc/host/renesas_sdhi_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mmc/host/renesas_sdhi_core.c +4 -4
@@ -1070,10 +1070,6 @@ int renesas_sdhi_probe(struct platform_device *pdev, quirks->hs400_calib_table + 1); } - ret =tmio_mmc_host_probe (host); -if (ret <0 ) - goto edisclk; -/* Enable tuning iff we have an SCC and a supported mode */ if (of_data && of_data->scc_offset && (host->mmc->caps & MMC_CAP_UHS_SDR104 ||
@@ -1105,6 +1101,10 @@ int renesas_sdhi_probe(struct platform_device *pdev, host->ops.hs400_complete = renesas_sdhi_hs400_complete; } + ret =tmio_mmc_host_probe (host); +if (ret <0 ) + goto edisclk; + num_irqs =platform_irq_count (pdev);if (num_irqs <0 ) { ret = num_irqs;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 67/226 mmc: renesas_sdhi: populate SCC pointer at the proper place
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit d14ac691bb6f6ebaa7eeec21ca04dd47300ff5b6 ]
The SCC pointer is currently filled whenever the SoC is Gen2+. This is wrong because there is a Gen2-variant without SCC (SDHI_VER_GEN2_SDR50). We have been lucky because the writes to unintended registers have not caused problems so far. But further refactoring work exposed the problem. So, move the pointer initialization to the place where we know that the SDHI instance supports tuning. And also populate the 'reset' pointer unconditionally to make sure the interrupt enable register is always properly set for Gen2+.
Stable-dep-of: 74f45de394d9 ("mmc: renesas_sdhi: register irqs before registering controller")
--- drivers/mmc/host/renesas_sdhi_core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/mmc/host/renesas_sdhi_core.c +2 -5
@@ -1010,11 +1010,7 @@ int renesas_sdhi_probe(struct platform_device *pdev, host->ops.start_signal_voltage_switch = renesas_sdhi_start_signal_voltage_switch; host->sdcard_irq_setbit_mask =TMIO_STAT_ALWAYS_SET_27 ; - -if (of_data && of_data->scc_offset) { - priv->scc_ctl = host->ctl + of_data->scc_offset; - host->reset = renesas_sdhi_reset; - } + host->reset = renesas_sdhi_reset; }/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */
@@ -1094,6 +1090,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,if (!hit)dev_warn (&host->pdev->dev,"Unknown clock rate for tuning\n" ); + priv->scc_ctl = host->ctl + of_data->scc_offset; host->check_retune = renesas_sdhi_check_scc_error; host->ops.execute_tuning = renesas_sdhi_execute_tuning; host->ops.prepare_hs400_tuning = renesas_sdhi_prepare_hs400_tuning;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 68/226 mmc: tmio: support custom irq masks
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit 0d856c4c68c639f96cb12c26aaeb906353b9a76e ]
SDHI Gen2+ has a different value for TMIO_MASK_ALL, so add a member to support that. If the member is not used, the previous default value is applied.
Stable-dep-of: 74f45de394d9 ("mmc: renesas_sdhi: register irqs before registering controller")
--- drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_core.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/mmc/host/tmio_mmc.h +1 -0
@@ -161,6 +161,7 @@ struct tmio_mmc_host {u32 sdio_irq_mask;unsigned int clk_cache;u32 sdcard_irq_setbit_mask; +u32 sdcard_irq_mask_all;spinlock_t lock;/* protect host private data */ unsigned long last_req_ts;
drivers/mmc/host/tmio_mmc_core.c +5 -3
@@ -1158,7 +1158,9 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host)tmio_mmc_reset (_host); _host->sdcard_irq_mask =sd_ctrl_read16_and_16_as_32 (_host,CTL_IRQ_MASK ); -tmio_mmc_disable_mmc_irqs (_host,TMIO_MASK_ALL ); +if (!_host->sdcard_irq_mask_all) + _host->sdcard_irq_mask_all =TMIO_MASK_ALL ; +tmio_mmc_disable_mmc_irqs (_host, _host->sdcard_irq_mask_all);if (_host->native_hotplug) tmio_mmc_enable_mmc_irqs(_host,
@@ -1212,7 +1214,7 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)cancel_work_sync (&host->done);cancel_delayed_work_sync (&host->delayed_reset_work);tmio_mmc_release_dma (host); -tmio_mmc_disable_mmc_irqs (host,TMIO_MASK_ALL ); +tmio_mmc_disable_mmc_irqs (host, host->sdcard_irq_mask_all);if (host->native_hotplug)pm_runtime_put_noidle (&pdev->dev);
@@ -1242,7 +1244,7 @@ int tmio_mmc_host_runtime_suspend(struct device *dev) {struct tmio_mmc_host *host =dev_get_drvdata (dev); -tmio_mmc_disable_mmc_irqs (host,TMIO_MASK_ALL ); +tmio_mmc_disable_mmc_irqs (host, host->sdcard_irq_mask_all);if (host->clk_cache) host->set_clock (host,0 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 69/226 mmc: renesas_sdhi: register irqs before registering controller
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit 74f45de394d979cc7770271f92fafa53e1ed3119 ]
IRQs should be ready to serve when we call mmc_add_host() via tmio_mmc_host_probe(). To achieve that, ensure that all irqs are masked before registering the handlers.
--- drivers/mmc/host/renesas_sdhi_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/mmc/host/renesas_sdhi_core.c +7 -3
@@ -1011,6 +1011,8 @@ int renesas_sdhi_probe(struct platform_device *pdev, renesas_sdhi_start_signal_voltage_switch; host->sdcard_irq_setbit_mask =TMIO_STAT_ALWAYS_SET_27 ; host->reset = renesas_sdhi_reset; + }else { + host->sdcard_irq_mask_all =TMIO_MASK_ALL ; }/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */
@@ -1098,9 +1100,7 @@ int renesas_sdhi_probe(struct platform_device *pdev, host->ops.hs400_complete = renesas_sdhi_hs400_complete; } - ret =tmio_mmc_host_probe (host); -if (ret <0 ) - goto edisclk; +sd_ctrl_write32_as_16_and_16 (host,CTL_IRQ_MASK , host->sdcard_irq_mask_all); num_irqs =platform_irq_count (pdev);if (num_irqs <0 ) {
@@ -1127,6 +1127,10 @@ int renesas_sdhi_probe(struct platform_device *pdev, goto eirq; } + ret =tmio_mmc_host_probe (host); +if (ret <0 ) + goto edisclk; +dev_info (&pdev->dev,"%s base at %pa, max clock rate %u MHz\n" ,mmc_hostname (host->mmc), &res->start, host->mmc->f_max /1000000 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 70/226 media: venus: core: Add io base variables for each block
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bryan O'Donoghue <[email protected]>
[ Upstream commit b4053a2097ec2f8ea622e817ae5a46a83b23aefe ]
New silicon means that the pre-determined offsets we have been using in this driver no longer hold. Existing blocks of registers can exist at different offsets relative to the IO base address.
This commit adds a routine to assign the IO base hooks a subsequent commit will convert from absolute to relative addressing.
Stable-dep-of: d74e48160980 ("media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts")
--- drivers/media/platform/qcom/venus/core.c | 12 ++++++++++++ drivers/media/platform/qcom/venus/core.h | 10 ++++++++++ 2 files changed, 22 insertions(+)
drivers/media/platform/qcom/venus/core.c +12 -0
@@ -21,6 +21,7 @@#include "core.h" #include "firmware.h" #include "pm_helpers.h" +#include "hfi_venus_io.h" static void venus_event_notify (struct venus_core *core,u32 event) {
@@ -210,6 +211,15 @@ static int venus_enumerate_codecs(struct venus_core *core, u32 type)return ret; } +static void venus_assign_register_offsets (struct venus_core *core) +{ + core->vbif_base = core->base +VBIF_BASE ; + core->cpu_base = core->base +CPU_BASE ; + core->cpu_cs_base = core->base +CPU_CS_BASE ; + core->cpu_ic_base = core->base +CPU_IC_BASE ; + core->wrapper_base = core->base +WRAPPER_BASE ; +} +static int venus_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -276,6 +286,8 @@ static int venus_probe(struct platform_device *pdev)if (ret) goto err_core_put; +venus_assign_register_offsets (core); + ret =v4l2_device_register (dev, &core->v4l2_dev);if (ret) goto err_core_deinit;
drivers/media/platform/qcom/venus/core.h +10 -0
@@ -119,6 +119,11 @@ struct venus_caps {* struct venus_core - holds core parameters valid for all instances * * @base: IO memory base address +* @vbif_base IO memory vbif base address +* @cpu_base IO memory cpu base address +* @cpu_cs_base IO memory cpu_cs base address +* @cpu_ic_base IO memory cpu_ic base address +* @wrapper_base IO memory wrapper base address * @irq: Venus irq * @clks: an array of struct clk pointers * @vcodec0_clks: an array of vcodec0 struct clk pointers
@@ -152,6 +157,11 @@ struct venus_caps {*/ struct venus_core {void __iomem *base; +void __iomem *vbif_base; +void __iomem *cpu_base; +void __iomem *cpu_cs_base; +void __iomem *cpu_ic_base; +void __iomem *wrapper_base;int irq;struct clk *clks[VIDC_CLKS_NUM_MAX ];struct clk *vcodec0_clks[VIDC_VCODEC_CLKS_NUM_MAX ];
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 71/226 media: venus: hfi,pm,firmware: Convert to block relative addressing
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bryan O'Donoghue <[email protected]>
[ Upstream commit ff2a7013b3e6a3d34d2b5c7786b8a73093d25319 ]
An upcoming silicon change places a number of existing blocks within the Venus at different relative offsets to the base address of IO region.
In order to handle this difference this patch changes the address offsets of the registers to function as offsets relative to the relevant sub-block of registers within the IO region not the base address of the IO region.
As a result of this change venus_readl() and venus_writel() are deleted.
Stable-dep-of: d74e48160980 ("media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts")
--- drivers/media/platform/qcom/venus/firmware.c | 28 +++---- drivers/media/platform/qcom/venus/hfi_venus.c | 82 ++++++++++--------- .../media/platform/qcom/venus/hfi_venus_io.h | 80 +++++++++--------- .../media/platform/qcom/venus/pm_helpers.c | 12 +-- 4 files changed, 105 insertions(+), 97 deletions(-)
drivers/media/platform/qcom/venus/firmware.c +14 -14
@@ -27,19 +27,19 @@static void venus_reset_cpu (struct venus_core *core) {u32 fw_size = core->fw.mapped_mem_size; -void __iomem *base = core->base; +void __iomem *wrapper_base = core->wrapper_base; -writel (0 , base +WRAPPER_FW_START_ADDR ); -writel (fw_size, base +WRAPPER_FW_END_ADDR ); -writel (0 , base +WRAPPER_CPA_START_ADDR ); -writel (fw_size, base +WRAPPER_CPA_END_ADDR ); -writel (fw_size, base +WRAPPER_NONPIX_START_ADDR ); -writel (fw_size, base +WRAPPER_NONPIX_END_ADDR ); -writel (0x0 , base +WRAPPER_CPU_CGC_DIS ); -writel (0x0 , base +WRAPPER_CPU_CLOCK_CONFIG ); +writel (0 , wrapper_base +WRAPPER_FW_START_ADDR ); +writel (fw_size, wrapper_base +WRAPPER_FW_END_ADDR ); +writel (0 , wrapper_base +WRAPPER_CPA_START_ADDR ); +writel (fw_size, wrapper_base +WRAPPER_CPA_END_ADDR ); +writel (fw_size, wrapper_base +WRAPPER_NONPIX_START_ADDR ); +writel (fw_size, wrapper_base +WRAPPER_NONPIX_END_ADDR ); +writel (0x0 , wrapper_base +WRAPPER_CPU_CGC_DIS ); +writel (0x0 , wrapper_base +WRAPPER_CPU_CLOCK_CONFIG );/* Bring ARM9 out of reset */ -writel (0 , base +WRAPPER_A9SS_SW_RESET ); +writel (0 , wrapper_base +WRAPPER_A9SS_SW_RESET ); }int venus_set_hw_state (struct venus_core *core,bool resume)
@@ -56,7 +56,7 @@ int venus_set_hw_state(struct venus_core *core, bool resume)if (resume)venus_reset_cpu (core);else -writel (1 , core->base +WRAPPER_A9SS_SW_RESET ); +writel (1 , core->wrapper_base +WRAPPER_A9SS_SW_RESET );return 0 ; }
@@ -159,12 +159,12 @@ static int venus_shutdown_no_tz(struct venus_core *core)size_t unmapped;u32 reg;struct device *dev = core->fw.dev; -void __iomem *base = core->base; +void __iomem *wrapper_base = core->wrapper_base;/* Assert the reset to ARM9 */ - reg =readl_relaxed (base +WRAPPER_A9SS_SW_RESET ); + reg =readl_relaxed (wrapper_base +WRAPPER_A9SS_SW_RESET ); reg |=WRAPPER_A9SS_SW_RESET_BIT ; -writel_relaxed (reg, base +WRAPPER_A9SS_SW_RESET ); +writel_relaxed (reg, wrapper_base +WRAPPER_A9SS_SW_RESET );/* Make sure reset is asserted before the mapping is removed */ mb ();
drivers/media/platform/qcom/venus/hfi_venus.c +44 -38
207 lines not on this page · raw message
drivers/media/platform/qcom/venus/hfi_venus_io.h +41 -39
151 lines not on this page · raw message
drivers/media/platform/qcom/venus/pm_helpers.c +6 -6
@@ -304,9 +304,9 @@ vcodec_control_v3(struct venus_core *core, u32 session_type, bool enable)void __iomem *ctrl;if (session_type ==VIDC_SESSION_TYPE_DEC ) - ctrl = core->base +WRAPPER_VDEC_VCODEC_POWER_CONTROL ; + ctrl = core->wrapper_base +WRAPPER_VDEC_VCODEC_POWER_CONTROL ;else - ctrl = core->base +WRAPPER_VENC_VCODEC_POWER_CONTROL ; + ctrl = core->wrapper_base +WRAPPER_VENC_VCODEC_POWER_CONTROL ;if (enable)writel (0 , ctrl);
@@ -381,11 +381,11 @@ static int vcodec_control_v4(struct venus_core *core, u32 coreid, bool enable)int ret;if (coreid ==VIDC_CORE_ID_1 ) { - ctrl = core->base +WRAPPER_VCODEC0_MMCC_POWER_CONTROL ; - stat = core->base +WRAPPER_VCODEC0_MMCC_POWER_STATUS ; + ctrl = core->wrapper_base +WRAPPER_VCODEC0_MMCC_POWER_CONTROL ; + stat = core->wrapper_base +WRAPPER_VCODEC0_MMCC_POWER_STATUS ; }else { - ctrl = core->base +WRAPPER_VCODEC1_MMCC_POWER_CONTROL ; - stat = core->base +WRAPPER_VCODEC1_MMCC_POWER_STATUS ; + ctrl = core->wrapper_base +WRAPPER_VCODEC1_MMCC_POWER_CONTROL ; + stat = core->wrapper_base +WRAPPER_VCODEC1_MMCC_POWER_STATUS ; }if (enable) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 72/226 media: venus: hfi: Define additional 6xx registers
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dikshita Agarwal <[email protected]>
[ Upstream commit 7f6631295f46070ee5cdbe939136ce48cc617272 ]
- Add X2 RPMh registers and definitions from the downstream example.
- Add 6xx core power definitions
- Add 6xx AON definitions
- Add 6xx wrapper tz definitions
- Add 6xx wrapper interrupt definitions
- Add 6xx soft interrupt definitions
- Define wrapper LPI register offsets
Stable-dep-of: d74e48160980 ("media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts")
--- .../media/platform/qcom/venus/hfi_venus_io.h | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/media/platform/qcom/venus/hfi_venus_io.h +30 -0
@@ -53,10 +53,22 @@#define UC_REGION_ADDR 0x64#define UC_REGION_SIZE 0x68 +#define CPU_CS_H2XSOFTINTEN_V6 0x148 + +#define CPU_CS_X2RPMH_V6 0x168 +#define CPU_CS_X2RPMH_MASK0_BMSK_V6 0x1 +#define CPU_CS_X2RPMH_MASK0_SHFT_V6 0x0 +#define CPU_CS_X2RPMH_MASK1_BMSK_V6 0x2 +#define CPU_CS_X2RPMH_MASK1_SHFT_V6 0x1 +#define CPU_CS_X2RPMH_SWOVERRIDE_BMSK_V6 0x4 +#define CPU_CS_X2RPMH_SWOVERRIDE_SHFT_V6 0x3 +/* Relative to CPU_IC_BASE */ #define CPU_IC_SOFTINT 0x18 +#define CPU_IC_SOFTINT_V6 0x150#define CPU_IC_SOFTINT_H2A_MASK 0x8000#define CPU_IC_SOFTINT_H2A_SHIFT 0xf +#define CPU_IC_SOFTINT_H2A_SHIFT_V6 0x0/* Venus wrapper */ #define WRAPPER_BASE 0x000e0000
@@ -84,6 +96,9 @@#define WRAPPER_INTR_MASK_A2HCPU_MASK 0x4#define WRAPPER_INTR_MASK_A2HCPU_SHIFT 0x2 +#define WRAPPER_INTR_STATUS_A2HWD_MASK_V6 0x8 +#define WRAPPER_INTR_MASK_A2HWD_BASK_V6 0x8 +#define WRAPPER_INTR_CLEAR 0x14#define WRAPPER_INTR_CLEAR_A2HWD_MASK 0x10#define WRAPPER_INTR_CLEAR_A2HWD_SHIFT 0x4
@@ -93,6 +108,8 @@#define WRAPPER_POWER_STATUS 0x44#define WRAPPER_VDEC_VCODEC_POWER_CONTROL 0x48#define WRAPPER_VENC_VCODEC_POWER_CONTROL 0x4c +#define WRAPPER_DEBUG_BRIDGE_LPI_CONTROL_V6 0x54 +#define WRAPPER_DEBUG_BRIDGE_LPI_STATUS_V6 0x58#define WRAPPER_VDEC_VENC_AHB_BRIDGE_SYNC_RESET 0x64#define WRAPPER_CPU_CLOCK_CONFIG 0x2000
@@ -121,4 +138,17 @@#define WRAPPER_VCODEC1_MMCC_POWER_STATUS 0x110#define WRAPPER_VCODEC1_MMCC_POWER_CONTROL 0x114 +/* Venus 6xx */ +#define WRAPPER_CORE_POWER_STATUS_V6 0x80 +#define WRAPPER_CORE_POWER_CONTROL_V6 0x84 + +/* Wrapper TZ 6xx */ +#define WRAPPER_TZ_BASE_V6 0x000c0000 +#define WRAPPER_TZ_CPU_STATUS_V6 0x10 + +/* Venus AON */ +#define AON_BASE_V6 0x000e0000 +#define AON_WRAPPER_MVP_NOC_LPI_CONTROL 0x00 +#define AON_WRAPPER_MVP_NOC_LPI_STATUS 0x04 +#endif
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 73/226 media: venus: core: Add differentiator IS_V6(core)
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bryan O'Donoghue <[email protected]>
[ Upstream commit ff027906308fcda1661e05beac6abdcbe2b93f6d ]
This commit adds the macro helper IS_V6() which will be used to differentiate iris2/v6 silicon from previous versions.
Stable-dep-of: d74e48160980 ("media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts")
--- drivers/media/platform/qcom/venus/core.h | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/qcom/venus/core.h +1 -0
@@ -426,6 +426,7 @@ struct venus_inst {#define IS_V1 (core) ((core)->res->hfi_version == HFI_VERSION_1XX)#define IS_V3 (core) ((core)->res->hfi_version == HFI_VERSION_3XX)#define IS_V4 (core) ((core)->res->hfi_version == HFI_VERSION_4XX) +#define IS_V6 (core) ((core)->res->hfi_version == HFI_VERSION_6XX)#define ctrl_to_inst (ctrl) \ container_of((ctrl)->handler, struct venus_inst, ctrl_handler)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 74/226 media: venus: hfi: Add a 6xx boot logic
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dikshita Agarwal <[email protected]>
[ Upstream commit 255385ca433ce5ff621732f26a759211a27c8f85 ]
This patch adds a 6xx specific boot logic. The goal is to share as much code as possible between 3xx, 4xx and 6xx silicon.
We need to do a different write to WRAPPER_INTR_MASK with an additional write to CPU_CS_H2XSOFTINTEN_V6 and CPU_CS_X2RPMh_V6.
The other writes are the same for 6xx and non-6xx silicon albeit at different absolute relative locations to the base of the venus address space.
Stable-dep-of: d74e48160980 ("media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts")
--- drivers/media/platform/qcom/venus/hfi_venus.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/venus/hfi_venus.c +12 -2
@@ -431,14 +431,21 @@ static int venus_boot_core(struct venus_hfi_device *hdev) {struct device *dev = hdev->core->dev;static const unsigned int max_tries =100 ; -u32 ctrl_status =0 ; +u32 ctrl_status =0 , mask_val;unsigned int count =0 ;void __iomem *cpu_cs_base = hdev->core->cpu_cs_base;void __iomem *wrapper_base = hdev->core->wrapper_base;int ret =0 ;writel (BIT (VIDC_CTRL_INIT_CTRL_SHIFT ), cpu_cs_base +VIDC_CTRL_INIT ); -writel (WRAPPER_INTR_MASK_A2HVCODEC_MASK , wrapper_base +WRAPPER_INTR_MASK ); +if (IS_V6 (hdev->core)) { + mask_val =readl (wrapper_base +WRAPPER_INTR_MASK ); + mask_val &= ~(WRAPPER_INTR_MASK_A2HWD_BASK_V6 | +WRAPPER_INTR_MASK_A2HCPU_MASK ); + }else { + mask_val =WRAPPER_INTR_MASK_A2HVCODEC_MASK ; + } +writel (mask_val, wrapper_base +WRAPPER_INTR_MASK );writel (1 , cpu_cs_base +CPU_CS_SCIACMDARG3 );while (!ctrl_status && count < max_tries) {
@@ -456,6 +463,9 @@ static int venus_boot_core(struct venus_hfi_device *hdev)if (count >= max_tries) ret = -ETIMEDOUT ; +if (IS_V6 (hdev->core)) +writel (0x0 , cpu_cs_base +CPU_CS_X2RPMH_V6 ); +return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 75/226 media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit d74e481609808330b4625b3691cf01e1f56e255e ]
The startup procedure shouldn't be started with interrupts masked, as that may entail silent failures.
Kick off initialization only after the interrupts are unmasked.
--- drivers/media/platform/qcom/venus/hfi_venus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/venus/hfi_venus.c +1 -1
@@ -437,7 +437,6 @@ static int venus_boot_core(struct venus_hfi_device *hdev)void __iomem *wrapper_base = hdev->core->wrapper_base;int ret =0 ; -writel (BIT (VIDC_CTRL_INIT_CTRL_SHIFT ), cpu_cs_base +VIDC_CTRL_INIT );if (IS_V6 (hdev->core)) { mask_val =readl (wrapper_base +WRAPPER_INTR_MASK ); mask_val &= ~(WRAPPER_INTR_MASK_A2HWD_BASK_V6 |
@@ -448,6 +447,7 @@ static int venus_boot_core(struct venus_hfi_device *hdev)writel (mask_val, wrapper_base +WRAPPER_INTR_MASK );writel (1 , cpu_cs_base +CPU_CS_SCIACMDARG3 ); +writel (BIT (VIDC_CTRL_INIT_CTRL_SHIFT ), cpu_cs_base +VIDC_CTRL_INIT );while (!ctrl_status && count < max_tries) { ctrl_status =readl (cpu_cs_base +CPU_CS_SCIACMDARG0 );if ((ctrl_status &CPU_CS_SCIACMDARG0_ERROR_STATUS_MASK ) ==4 ) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 76/226 netfilter: use actual socket sk for REJECT action
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Engelhardt <[email protected]>
[ Upstream commit 04295878beac396dae47ba93141cae0d9386e7ef ]
True to the message of commit v5.10-rc1-105-g46d6c5ae953c, _do_ actually make use of state->sk when possible, such as in the REJECT modules.
Stable-dep-of: 28427f368f0e ("netfilter: nft_exthdr: Fix non-linear header modification")
--- include/net/netfilter/ipv4/nf_reject.h | 4 ++-- include/net/netfilter/ipv6/nf_reject.h | 5 ++--- net/ipv4/netfilter/ipt_REJECT.c | 3 ++- net/ipv4/netfilter/nf_reject_ipv4.c | 6 +++--- net/ipv4/netfilter/nft_reject_ipv4.c | 3 ++- net/ipv6/netfilter/ip6t_REJECT.c | 2 +- net/ipv6/netfilter/nf_reject_ipv6.c | 5 +++-- net/ipv6/netfilter/nft_reject_ipv6.c | 3 ++- net/netfilter/nft_reject_inet.c | 6 ++++-- 9 files changed, 21 insertions(+), 16 deletions(-)
include/net/netfilter/ipv4/nf_reject.h +2 -2
@@ -8,8 +8,8 @@#include <net/netfilter/nf_reject.h> void nf_send_unreach (struct sk_buff *skb_in,int code,int hook); -void nf_send_reset (struct net *net,struct sk_buff *oldskb,int hook); - +void nf_send_reset (struct net *net,struct sock *,struct sk_buff *oldskb, +int hook);const struct tcphdr *nf_reject_ip_tcphdr_get (struct sk_buff *oldskb,struct tcphdr *_oth,int hook); struct iphdr *nf_reject_iphdr_put(struct sk_buff *nskb,
include/net/netfilter/ipv6/nf_reject.h +2 -3
@@ -7,9 +7,8 @@void nf_send_unreach6 (struct net *net,struct sk_buff *skb_in,unsigned char code,unsigned int hooknum); - -void nf_send_reset6 (struct net *net,struct sk_buff *oldskb,int hook); - +void nf_send_reset6 (struct net *net,struct sock *sk,struct sk_buff *oldskb, +int hook);const struct tcphdr *nf_reject_ip6_tcphdr_get (struct sk_buff *oldskb,struct tcphdr *otcph,unsigned int *otcplen,int hook);
net/ipv4/netfilter/ipt_REJECT.c +2 -1
@@ -56,7 +56,8 @@ reject_tg(struct sk_buff *skb, const struct xt_action_param *par)nf_send_unreach (skb,ICMP_PKT_FILTERED , hook);break ;case IPT_TCP_RESET : -nf_send_reset (xt_net (par), skb, hook); +nf_send_reset (xt_net (par), par->state->sk, skb, hook); +break ;case IPT_ICMP_ECHOREPLY :/* Doesn't happen. */ break ;
net/ipv4/netfilter/nf_reject_ipv4.c +3 -3
@@ -112,7 +112,8 @@ static int nf_reject_fill_skb_dst(struct sk_buff *skb_in) }/* Send RST reply */ -void nf_send_reset (struct net *net,struct sk_buff *oldskb,int hook) +void nf_send_reset (struct net *net,struct sock *sk,struct sk_buff *oldskb, +int hook) {struct net_device *br_indev__maybe_unused ;struct sk_buff *nskb;
@@ -144,8 +145,7 @@ void nf_send_reset(struct net *net, struct sk_buff *oldskb, int hook) niph =nf_reject_iphdr_put (nskb, oldskb,IPPROTO_TCP ,ip4_dst_hoplimit (skb_dst (nskb)));nf_reject_ip_tcphdr_put (nskb, oldskb, oth); - -if (ip_route_me_harder (net, nskb->sk, nskb,RTN_UNSPEC )) +if (ip_route_me_harder (net, sk, nskb,RTN_UNSPEC )) goto free_nskb; niph =ip_hdr (nskb);
net/ipv4/netfilter/nft_reject_ipv4.c +2 -1
@@ -27,7 +27,8 @@ static void nft_reject_ipv4_eval(const struct nft_expr *expr,nf_send_unreach (pkt->skb, priv->icmp_code,nft_hook (pkt));break ;case NFT_REJECT_TCP_RST : -nf_send_reset (nft_net (pkt), pkt->skb,nft_hook (pkt)); +nf_send_reset (nft_net (pkt), pkt->xt.state->sk, pkt->skb, +nft_hook (pkt));break ;default :break ;
net/ipv6/netfilter/ip6t_REJECT.c +1 -1
@@ -61,7 +61,7 @@ reject_tg6(struct sk_buff *skb, const struct xt_action_param *par)/* Do nothing */ break ;case IP6T_TCP_RESET : -nf_send_reset6 (net, skb,xt_hooknum (par)); +nf_send_reset6 (net, par->state->sk, skb,xt_hooknum (par));break ;case IP6T_ICMP6_POLICY_FAIL :nf_send_unreach6 (net, skb,ICMPV6_POLICY_FAIL ,xt_hooknum (par));
net/ipv6/netfilter/nf_reject_ipv6.c +3 -2
@@ -141,7 +141,8 @@ static int nf_reject6_fill_skb_dst(struct sk_buff *skb_in)return 0 ; } -void nf_send_reset6 (struct net *net,struct sk_buff *oldskb,int hook) +void nf_send_reset6 (struct net *net,struct sock *sk,struct sk_buff *oldskb, +int hook) {struct net_device *br_indev__maybe_unused ;struct sk_buff *nskb;
@@ -233,7 +234,7 @@ void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook) dev_queue_xmit(nskb); } else#endif -ip6_local_out (net, nskb->sk, nskb); +ip6_local_out (net, sk, nskb); }EXPORT_SYMBOL_GPL (nf_send_reset6);
net/ipv6/netfilter/nft_reject_ipv6.c +2 -1
@@ -28,7 +28,8 @@ static void nft_reject_ipv6_eval(const struct nft_expr *expr, nft_hook(pkt));break ;case NFT_REJECT_TCP_RST : -nf_send_reset6 (nft_net (pkt), pkt->skb,nft_hook (pkt)); +nf_send_reset6 (nft_net (pkt), pkt->xt.state->sk, pkt->skb, +nft_hook (pkt));break ;default :break ;
net/netfilter/nft_reject_inet.c +4 -2
@@ -28,7 +28,8 @@ static void nft_reject_inet_eval(const struct nft_expr *expr, nft_hook(pkt));break ;case NFT_REJECT_TCP_RST : -nf_send_reset (nft_net (pkt), pkt->skb,nft_hook (pkt)); +nf_send_reset (nft_net (pkt), pkt->xt.state->sk, + pkt->skb,nft_hook (pkt));break ;case NFT_REJECT_ICMPX_UNREACH : nf_send_unreach(pkt->skb,
@@ -44,7 +45,8 @@ static void nft_reject_inet_eval(const struct nft_expr *expr, priv->icmp_code, nft_hook(pkt));break ;case NFT_REJECT_TCP_RST : -nf_send_reset6 (nft_net (pkt), pkt->skb,nft_hook (pkt)); +nf_send_reset6 (nft_net (pkt), pkt->xt.state->sk, + pkt->skb,nft_hook (pkt));break ;case NFT_REJECT_ICMPX_UNREACH : nf_send_unreach6(nft_net(pkt), pkt->skb,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 77/226 netfilter: nft_exthdr: Support SCTP chunks
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phil Sutter <[email protected]>
[ Upstream commit 133dc203d77dff617d9c4673973ef3859be2c476 ]
Chunks are SCTP header extensions similar in implementation to IPv6 extension headers or TCP options. Reusing exthdr expression to find and extract field values from them is therefore pretty straightforward.
For now, this supports extracting data from chunks at a fixed offset (and length) only - chunks themselves are an extensible data structure; in order to make all fields available, a nested extension search is needed.
Stable-dep-of: 28427f368f0e ("netfilter: nft_exthdr: Fix non-linear header modification")
--- include/uapi/linux/netfilter/nf_tables.h | 2 + net/netfilter/nft_exthdr.c | 51 ++++++++++++++++++++++++ 2 files changed, 53 insertions(+)
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -797,11 +797,13 @@ enum nft_exthdr_flags {* @NFT_EXTHDR_OP_IPV6: match against ipv6 extension headers * @NFT_EXTHDR_OP_TCP: match against tcp options * @NFT_EXTHDR_OP_IPV4: match against ipv4 options +* @NFT_EXTHDR_OP_SCTP: match against sctp chunks */ enum nft_exthdr_op {NFT_EXTHDR_OP_IPV6 ,NFT_EXTHDR_OP_TCPOPT ,NFT_EXTHDR_OP_IPV4 , +NFT_EXTHDR_OP_SCTP , __NFT_EXTHDR_OP_MAX };#define NFT_EXTHDR_OP_MAX (__NFT_EXTHDR_OP_MAX - 1)
net/netfilter/nft_exthdr.c +51 -0
77 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 78/226 netfilter: nf_tables: add and use nft_sk helper
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 85554eb981e5a8b0b8947611193aef1737081ef2 ]
This allows to change storage placement later on without changing readers.
Stable-dep-of: 28427f368f0e ("netfilter: nft_exthdr: Fix non-linear header modification")
--- include/net/netfilter/nf_tables.h | 5 +++++ net/ipv4/netfilter/nft_reject_ipv4.c | 2 +- net/ipv6/netfilter/nft_reject_ipv6.c | 2 +- net/netfilter/nft_reject_inet.c | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-)
include/net/netfilter/nf_tables.h +5 -0
@@ -28,6 +28,11 @@ struct nft_pktinfo {struct xt_action_param xt; }; +static inline struct sock *nft_sk (const struct nft_pktinfo *pkt) +{ +return pkt->xt.state->sk; +} +static inline struct net *nft_net (const struct nft_pktinfo *pkt) {return pkt->xt.state->net;
net/ipv4/netfilter/nft_reject_ipv4.c +1 -1
@@ -27,7 +27,7 @@ static void nft_reject_ipv4_eval(const struct nft_expr *expr,nf_send_unreach (pkt->skb, priv->icmp_code,nft_hook (pkt));break ;case NFT_REJECT_TCP_RST : -nf_send_reset (nft_net (pkt), pkt->xt.state->sk, pkt->skb, +nf_send_reset (nft_net (pkt),nft_sk (pkt), pkt->skb,nft_hook (pkt));break ;default :
net/ipv6/netfilter/nft_reject_ipv6.c +1 -1
@@ -28,7 +28,7 @@ static void nft_reject_ipv6_eval(const struct nft_expr *expr, nft_hook(pkt));break ;case NFT_REJECT_TCP_RST : -nf_send_reset6 (nft_net (pkt), pkt->xt.state->sk, pkt->skb, +nf_send_reset6 (nft_net (pkt),nft_sk (pkt), pkt->skb,nft_hook (pkt));break ;default :
net/netfilter/nft_reject_inet.c +2 -2
@@ -28,7 +28,7 @@ static void nft_reject_inet_eval(const struct nft_expr *expr, nft_hook(pkt));break ;case NFT_REJECT_TCP_RST : -nf_send_reset (nft_net (pkt), pkt->xt.state->sk, +nf_send_reset (nft_net (pkt),nft_sk (pkt), pkt->skb,nft_hook (pkt));break ;case NFT_REJECT_ICMPX_UNREACH :
@@ -45,7 +45,7 @@ static void nft_reject_inet_eval(const struct nft_expr *expr, priv->icmp_code, nft_hook(pkt));break ;case NFT_REJECT_TCP_RST : -nf_send_reset6 (nft_net (pkt), pkt->xt.state->sk, +nf_send_reset6 (nft_net (pkt),nft_sk (pkt), pkt->skb,nft_hook (pkt));break ;case NFT_REJECT_ICMPX_UNREACH :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 79/226 netfilter: nf_tables: add and use nft_thoff helper
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 2d7b4ace0754ebaaf71c6824880178d46aa0ab33 ]
This allows to change storage placement later on without changing readers.
Stable-dep-of: 28427f368f0e ("netfilter: nft_exthdr: Fix non-linear header modification")
--- include/net/netfilter/nf_tables.h | 5 +++++ net/netfilter/nf_tables_core.c | 2 +- net/netfilter/nf_tables_trace.c | 6 +++--- net/netfilter/nft_exthdr.c | 8 ++++---- net/netfilter/nft_flow_offload.c | 2 +- net/netfilter/nft_payload.c | 10 +++++----- net/netfilter/nft_synproxy.c | 4 ++-- net/netfilter/nft_tproxy.c | 4 ++-- 8 files changed, 23 insertions(+), 18 deletions(-)
include/net/netfilter/nf_tables.h +5 -0
@@ -33,6 +33,11 @@ static inline struct sock *nft_sk(const struct nft_pktinfo *pkt)return pkt->xt.state->sk; } +static inline unsigned int nft_thoff (const struct nft_pktinfo *pkt) +{ +return pkt->xt.thoff; +} +static inline struct net *nft_net (const struct nft_pktinfo *pkt) {return pkt->xt.state->net;
net/netfilter/nf_tables_core.c +1 -1
@@ -125,7 +125,7 @@ static bool nft_payload_fast_eval(const struct nft_expr *expr,else {if (!pkt->tprot_set)return false; - ptr =skb_network_header (skb) + pkt->xt.thoff; + ptr =skb_network_header (skb) +nft_thoff (pkt); } ptr += priv->offset;
net/netfilter/nf_tables_trace.c +3 -3
@@ -113,17 +113,17 @@ static int nf_trace_fill_pkt_info(struct sk_buff *nlskb,int off =skb_network_offset (skb);unsigned int len, nh_end; - nh_end = pkt->tprot_set ? pkt->xt.thoff : skb->len; + nh_end = pkt->tprot_set ?nft_thoff (pkt) : skb->len; len = min_t(unsigned int, nh_end - skb_network_offset(skb),NFT_TRACETYPE_NETWORK_HSIZE );if (trace_fill_header (nlskb,NFTA_TRACE_NETWORK_HEADER , skb, off, len))return -1 ;if (pkt->tprot_set) { - len = min_t(unsigned int, skb->len - pkt->xt.thoff, + len = min_t(unsigned int, skb->len - nft_thoff(pkt),NFT_TRACETYPE_TRANSPORT_HSIZE );if (trace_fill_header (nlskb,NFTA_TRACE_TRANSPORT_HEADER , skb, - pkt->xt.thoff, len)) +nft_thoff (pkt), len))return -1 ; }
net/netfilter/nft_exthdr.c +4 -4
@@ -170,7 +170,7 @@ nft_tcp_header_pointer(const struct nft_pktinfo *pkt,if (!pkt->tprot_set || pkt->tprot !=IPPROTO_TCP )return NULL ; - tcph =skb_header_pointer (pkt->skb, pkt->xt.thoff,sizeof (*tcph), buffer); + tcph =skb_header_pointer (pkt->skb,nft_thoff (pkt),sizeof (*tcph), buffer);if (!tcph)return NULL ;
@@ -178,7 +178,7 @@ nft_tcp_header_pointer(const struct nft_pktinfo *pkt,if (*tcphdr_len <sizeof (*tcph) || *tcphdr_len > len)return NULL ; -return skb_header_pointer (pkt->skb, pkt->xt.thoff, *tcphdr_len, buffer); +return skb_header_pointer (pkt->skb,nft_thoff (pkt), *tcphdr_len, buffer); } static void nft_exthdr_tcp_eval(const struct nft_expr *expr,
@@ -254,7 +254,7 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,return ;if (skb_ensure_writable (pkt->skb, - pkt->xt.thoff + i + priv->len)) +nft_thoff (pkt) + i + priv->len))return ; tcph = nft_tcp_header_pointer(pkt, sizeof(buff), buff,
@@ -309,7 +309,7 @@ static void nft_exthdr_sctp_eval(const struct nft_expr *expr,struct nft_regs *regs, const struct nft_pktinfo *pkt) { - unsigned int offset = pkt->xt.thoff + sizeof(struct sctphdr); + unsigned int offset = nft_thoff(pkt) + sizeof(struct sctphdr);struct nft_exthdr *priv =nft_expr_priv (expr);u32 *dest = ®s->data[priv->dreg];const struct sctp_chunkhdr *sch;
net/netfilter/nft_flow_offload.c +1 -1
@@ -90,7 +90,7 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,switch (ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.dst.protonum) {case IPPROTO_TCP : - tcph =skb_header_pointer (pkt->skb, pkt->xt.thoff, + tcph =skb_header_pointer (pkt->skb,nft_thoff (pkt),sizeof (_tcph), &_tcph);if (unlikely (!tcph || tcph->fin || tcph->rst)) goto out;
net/netfilter/nft_payload.c +5 -5
@@ -110,7 +110,7 @@ void nft_payload_eval(const struct nft_expr *expr,case NFT_PAYLOAD_TRANSPORT_HEADER :if (!pkt->tprot_set) goto err; - offset = pkt->xt.thoff; + offset =nft_thoff (pkt);break ;default :BUG ();
@@ -510,7 +510,7 @@ static int nft_payload_l4csum_offset(const struct nft_pktinfo *pkt, *l4csum_offset = offsetof(struct tcphdr , check);break ;case IPPROTO_UDP : -if (!nft_payload_udp_checksum (skb, pkt->xt.thoff)) +if (!nft_payload_udp_checksum (skb,nft_thoff (pkt)))return -1 ; fallthrough;case IPPROTO_UDPLITE :
@@ -523,7 +523,7 @@ static int nft_payload_l4csum_offset(const struct nft_pktinfo *pkt,return -1 ; } - *l4csum_offset += pkt->xt.thoff; + *l4csum_offset +=nft_thoff (pkt);return 0 ; }
@@ -615,7 +615,7 @@ static void nft_payload_set_eval(const struct nft_expr *expr,case NFT_PAYLOAD_TRANSPORT_HEADER :if (!pkt->tprot_set) goto err; - offset = pkt->xt.thoff; + offset =nft_thoff (pkt);break ;default :BUG ();
@@ -646,7 +646,7 @@ static void nft_payload_set_eval(const struct nft_expr *expr,if (priv->csum_type ==NFT_PAYLOAD_CSUM_SCTP && pkt->tprot ==IPPROTO_SCTP && skb->ip_summed !=CHECKSUM_PARTIAL ) { -if (nft_payload_csum_sctp (skb, pkt->xt.thoff)) +if (nft_payload_csum_sctp (skb,nft_thoff (pkt))) goto err; }
net/netfilter/nft_synproxy.c +2 -2
@@ -109,7 +109,7 @@ static void nft_synproxy_do_eval(const struct nft_synproxy *priv, {struct synproxy_options opts = {};struct sk_buff *skb = pkt->skb; -int thoff = pkt->xt.thoff; +int thoff =nft_thoff (pkt);const struct tcphdr *tcp;struct tcphdr _tcph;
@@ -123,7 +123,7 @@ static void nft_synproxy_do_eval(const struct nft_synproxy *priv,return ; } - tcp =skb_header_pointer (skb, pkt->xt.thoff, + tcp =skb_header_pointer (skb, thoff,sizeof (struct tcphdr ), &_tcph);if (!tcp) {
net/netfilter/nft_tproxy.c +2 -2
@@ -88,9 +88,9 @@ static void nft_tproxy_eval_v6(const struct nft_expr *expr,const struct nft_tproxy *priv =nft_expr_priv (expr);struct sk_buff *skb = pkt->skb;const struct ipv6hdr *iph =ipv6_hdr (skb); -struct in6_addr taddr; -int thoff = pkt->xt.thoff; +int thoff =nft_thoff (pkt);struct udphdr _hdr, *hp; +struct in6_addr taddr;__be16 tport =0 ;struct sock *sk;int l4proto;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 80/226 netfilter: nft_exthdr: break evaluation if setting TCP option fails
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 962e5a40358787105f126ab1dc01604da3d169e9 ]
Break rule evaluation on malformed TCP options.
Stable-dep-of: 28427f368f0e ("netfilter: nft_exthdr: Fix non-linear header modification")
--- net/netfilter/nft_exthdr.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
net/netfilter/nft_exthdr.c +7 -4
@@ -236,7 +236,7 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr, tcph =nft_tcp_header_pointer (pkt,sizeof (buff), buff, &tcphdr_len);if (!tcph) -return ; + goto err; opt = (u8 *)tcph;for (i =sizeof (*tcph); i < tcphdr_len -1 ; i += optl) {
@@ -251,16 +251,16 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,continue ;if (i + optl > tcphdr_len || priv->len + priv->offset > optl) -return ; + goto err;if (skb_ensure_writable (pkt->skb,nft_thoff (pkt) + i + priv->len)) -return ; + goto err; tcph =nft_tcp_header_pointer (pkt,sizeof (buff), buff, &tcphdr_len);if (!tcph) -return ; + goto err; offset = i + priv->offset;
@@ -303,6 +303,9 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,return ; } +return ; +err: + regs->verdict.code =NFT_BREAK ; } static void nft_exthdr_sctp_eval(const struct nft_expr *expr,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 81/226 netfilter: exthdr: add support for tcp option removal
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 7890cbea66e78a3a6037b2a12827118d7243270b ]
This allows to replace a tcp option with nop padding to selectively disable a particular tcp option.
Optstrip mode is chosen when userspace passes the exthdr expression with neither a source nor a destination register attribute.
This is identical to xtables TCPOPTSTRIP extension.
The only difference is that TCPOPTSTRIP allows to pass in a bitmap of options to remove rather than a single number.
Unlike TCPOPTSTRIP this expression can be used multiple times in the same rule to get the same effect.
We could add a new nested attribute later on in case there is a use case for single-expression-multi-remove.
Stable-dep-of: 28427f368f0e ("netfilter: nft_exthdr: Fix non-linear header modification")
--- net/netfilter/nft_exthdr.c | 96 +++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-)
net/netfilter/nft_exthdr.c +95 -1
@@ -308,6 +308,63 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr, regs->verdict.code =NFT_BREAK ; } +static void nft_exthdr_tcp_strip_eval (const struct nft_expr *expr, +struct nft_regs *regs, +const struct nft_pktinfo *pkt) +{ +u8 buff[sizeof (struct tcphdr ) +MAX_TCP_OPTION_SPACE ]; +struct nft_exthdr *priv =nft_expr_priv (expr); +unsigned int i, tcphdr_len, optl; +struct tcphdr *tcph; +u8 *opt; + + tcph =nft_tcp_header_pointer (pkt,sizeof (buff), buff, &tcphdr_len); +if (!tcph) + goto err; + +if (skb_ensure_writable (pkt->skb,nft_thoff (pkt) + tcphdr_len)) + goto drop; + + opt = (u8 *)nft_tcp_header_pointer (pkt,sizeof (buff), buff, &tcphdr_len); +if (!opt) + goto err; +for (i =sizeof (*tcph); i < tcphdr_len -1 ; i += optl) { +unsigned int j; + + optl =optlen (opt, i); +if (priv->type != opt[i]) +continue ; + +if (i + optl > tcphdr_len) + goto drop; + +for (j =0 ; j < optl; ++j) { +u16 n =TCPOPT_NOP ; +u16 o = opt[i+j]; + +if ((i + j) %2 ==0 ) { + o <<=8 ; + n <<=8 ; + } +inet_proto_csum_replace2 (&tcph->check, pkt->skb,htons (o), +htons (n), false); + } +memset (opt + i,TCPOPT_NOP , optl); +return ; + } + +/* option not found, continue. This allows to do multiple +* option removals per rule. +*/ +return ; +err: + regs->verdict.code =NFT_BREAK ; +return ; +drop: +/* can't remove, no choice but to drop */ + regs->verdict.code =NF_DROP ; +} +static void nft_exthdr_sctp_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -452,6 +509,28 @@ static int nft_exthdr_tcp_set_init(const struct nft_ctx *ctx, priv->len); } +static int nft_exthdr_tcp_strip_init (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nlattr *const tb[]) +{ +struct nft_exthdr *priv =nft_expr_priv (expr); + +if (tb[NFTA_EXTHDR_SREG ] || + tb[NFTA_EXTHDR_DREG ] || + tb[NFTA_EXTHDR_FLAGS ] || + tb[NFTA_EXTHDR_OFFSET ] || + tb[NFTA_EXTHDR_LEN ]) +return -EINVAL ; + +if (!tb[NFTA_EXTHDR_TYPE ]) +return -EINVAL ; + + priv->type =nla_get_u8 (tb[NFTA_EXTHDR_TYPE ]); + priv->op =NFT_EXTHDR_OP_TCPOPT ; + +return 0 ; +} +static int nft_exthdr_ipv4_init (const struct nft_ctx *ctx,const struct nft_expr *expr,const struct nlattr *const tb[])
@@ -512,6 +591,13 @@ static int nft_exthdr_dump_set(struct sk_buff *skb, const struct nft_expr *expr)return nft_exthdr_dump_common (skb, priv); } +static int nft_exthdr_dump_strip (struct sk_buff *skb,const struct nft_expr *expr) +{ +const struct nft_exthdr *priv =nft_expr_priv (expr); + +return nft_exthdr_dump_common (skb, priv); +} +static const struct nft_expr_ops nft_exthdr_ipv6_ops = { .type = &nft_exthdr_type, .size =NFT_EXPR_SIZE (sizeof (struct nft_exthdr )),
@@ -544,6 +630,14 @@ static const struct nft_expr_ops nft_exthdr_tcp_set_ops = { .dump = nft_exthdr_dump_set, }; +static const struct nft_expr_ops nft_exthdr_tcp_strip_ops = { + .type = &nft_exthdr_type, + .size =NFT_EXPR_SIZE (sizeof (struct nft_exthdr )), + .eval = nft_exthdr_tcp_strip_eval, + .init = nft_exthdr_tcp_strip_init, + .dump = nft_exthdr_dump_strip, +}; +static const struct nft_expr_ops nft_exthdr_sctp_ops = { .type = &nft_exthdr_type, .size =NFT_EXPR_SIZE (sizeof (struct nft_exthdr )),
@@ -571,7 +665,7 @@ nft_exthdr_select_ops(const struct nft_ctx *ctx,return &nft_exthdr_tcp_set_ops;if (tb[NFTA_EXTHDR_DREG ])return &nft_exthdr_tcp_ops; -break ; +return &nft_exthdr_tcp_strip_ops;case NFT_EXTHDR_OP_IPV6 :if (tb[NFTA_EXTHDR_DREG ])return &nft_exthdr_ipv6_ops;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 82/226 netfilter: nft_exthdr: Fix non-linear header modification
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiao Liang <[email protected]>
[ Upstream commit 28427f368f0e08d504ed06e74bc7cc79d6d06511 ]
Fix skb_ensure_writable() size. Don't use nft_tcp_header_pointer() to make it explicit that pointers point to the packet (not local buffer).
--- net/netfilter/nft_exthdr.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
net/netfilter/nft_exthdr.c +8 -12
@@ -238,7 +238,12 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,if (!tcph) goto err; +if (skb_ensure_writable (pkt->skb,nft_thoff (pkt) + tcphdr_len)) + goto err; + + tcph = (struct tcphdr *)(pkt->skb->data +nft_thoff (pkt)); opt = (u8 *)tcph; +for (i =sizeof (*tcph); i < tcphdr_len -1 ; i += optl) {union {__be16 v16;
@@ -253,15 +258,6 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,if (i + optl > tcphdr_len || priv->len + priv->offset > optl) goto err; -if (skb_ensure_writable (pkt->skb, -nft_thoff (pkt) + i + priv->len)) - goto err; - - tcph =nft_tcp_header_pointer (pkt,sizeof (buff), buff, - &tcphdr_len); -if (!tcph) - goto err; - offset = i + priv->offset;switch (priv->len) {
@@ -325,9 +321,9 @@ static void nft_exthdr_tcp_strip_eval(const struct nft_expr *expr,if (skb_ensure_writable (pkt->skb,nft_thoff (pkt) + tcphdr_len)) goto drop; - opt = (u8 *)nft_tcp_header_pointer (pkt,sizeof (buff), buff, &tcphdr_len); -if (!opt) - goto err; + tcph = (struct tcphdr *)(pkt->skb->data +nft_thoff (pkt)); + opt = (u8 *)tcph; +for (i =sizeof (*tcph); i < tcphdr_len -1 ; i += optl) {unsigned int j;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 83/226 ata: libata: Rename link flag ATA_LFLAG_NO_DB_DELAY
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Menzel <[email protected]>
[ Upstream commit b9ba367c513dbc165dd6c01266a59db4be2a3564 ]
Rename the link flag ATA_LFLAG_NO_DB_DELAY to ATA_LFLAG_NO_DEBOUNCE_DELAY. The new name is longer, but clearer.
Stable-dep-of: 2a2df98ec592 ("ata: ahci: Add Elkhart Lake AHCI controller")
--- drivers/ata/ahci_brcm.c | 2 +- drivers/ata/libata-sata.c | 2 +- include/linux/libata.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/ata/ahci_brcm.c +1 -1
@@ -332,7 +332,7 @@ static struct ata_port_operations ahci_brcm_platform_ops = {static const struct ata_port_info ahci_brcm_port_info = { .flags =AHCI_FLAG_COMMON |ATA_FLAG_NO_DIPM , - .link_flags =ATA_LFLAG_NO_DB_DELAY , + .link_flags =ATA_LFLAG_NO_DEBOUNCE_DELAY , .pio_mask =ATA_PIO4 , .udma_mask =ATA_UDMA6 , .port_ops = &ahci_brcm_platform_ops,
drivers/ata/libata-sata.c +1 -1
@@ -317,7 +317,7 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params,* immediately after resuming. Delay 200ms before * debouncing. */ -if (!(link->flags &ATA_LFLAG_NO_DB_DELAY )) +if (!(link->flags &ATA_LFLAG_NO_DEBOUNCE_DELAY ))ata_msleep (link->ap,200 );/* is SControl restored correctly? */
include/linux/libata.h +1 -1
@@ -187,7 +187,7 @@ enum {ATA_LFLAG_NO_LPM = (1 <<8 ),/* disable LPM on this link */ ATA_LFLAG_RST_ONCE = (1 <<9 ),/* limit recovery to one reset */ ATA_LFLAG_CHANGED = (1 <<10 ),/* LPM state changed on this link */ -ATA_LFLAG_NO_DB_DELAY = (1 <<11 ),/* no debounce delay on link resume */ +ATA_LFLAG_NO_DEBOUNCE_DELAY = (1 <<11 ),/* no debounce delay on link resume */ /* struct ata_port flags */ ATA_FLAG_SLAVE_POSS = (1 << 0), /* host supports slave dev */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 84/226 ata: ahci: Add support for AMD A85 FCH (Hudson D4)
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Menzel <[email protected]>
[ Upstream commit a17ab7aba5df4135ef77d7f6d7105e1ea414936f ]
Add support for the AMD A85 FCH (Hudson D4) AHCI adapter.
Since this adapter does not require the default 200 ms debounce delay in sata_link_resume(), create a new board board_ahci_no_debounce_delay with the link flag ATA_LFLAG_NO_DEBOUNCE_DELAY, and, for now, configure the AMD A85 FCH (Hudson D4) to use it. On the ASUS F2A85-M PRO it reduces the Linux kernel boot time by the expected 200 ms from 787 ms to 585 ms.
Stable-dep-of: 2a2df98ec592 ("ata: ahci: Add Elkhart Lake AHCI controller")
--- drivers/ata/ahci.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/ata/ahci.c +9 -0
@@ -51,6 +51,7 @@ enum board_ids { board_ahci, board_ahci_ign_iferr, board_ahci_mobile, + board_ahci_no_debounce_delay, board_ahci_nomsi, board_ahci_noncq, board_ahci_nosntf,
@@ -142,6 +143,13 @@ static const struct ata_port_info ahci_port_info[] = { .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, + [board_ahci_no_debounce_delay] = { + .flags = AHCI_FLAG_COMMON, + .link_flags = ATA_LFLAG_NO_DEBOUNCE_DELAY, + .pio_mask = ATA_PIO4, + .udma_mask = ATA_UDMA6, + .port_ops = &ahci_ops, + }, [board_ahci_nomsi] = { AHCI_HFLAGS (AHCI_HFLAG_NO_MSI), .flags = AHCI_FLAG_COMMON,
@@ -442,6 +450,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { board_ahci_al },/* AMD */ { PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */ + { PCI_VDEVICE(AMD, 0x7801), board_ahci_no_debounce_delay }, /* AMD Hudson-2 (AHCI mode) */ { PCI_VDEVICE(AMD, 0x7900), board_ahci }, /* AMD CZ */ { PCI_VDEVICE(AMD, 0x7901), board_ahci_mobile }, /* AMD Green Sardine */ /* AMD is using RAID class only for ahci controllers */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 85/226 ata: ahci: Rename board_ahci_mobile
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 099849af27f74981c7e660dd93ff6a987307c1f2 ]
This board definition was originally created for mobile devices to designate default link power managmeent policy to influence runtime power consumption.
As this is interesting for more than just mobile designs, rename the board to board_ahci_low_power to make it clear it is about default policy.
Stable-dep-of: 2a2df98ec592 ("ata: ahci: Add Elkhart Lake AHCI controller")
--- drivers/ata/ahci.c | 96 +++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 48 deletions(-)
drivers/ata/ahci.c +48 -48
@@ -50,7 +50,7 @@ enum board_ids {/* board IDs by feature in alphabetical order */ board_ahci, board_ahci_ign_iferr, - board_ahci_mobile, + board_ahci_low_power, board_ahci_no_debounce_delay, board_ahci_nomsi, board_ahci_noncq,
@@ -136,7 +136,7 @@ static const struct ata_port_info ahci_port_info[] = { .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, - [board_ahci_mobile] = { + [board_ahci_low_power] = { AHCI_HFLAGS (AHCI_HFLAG_IS_MOBILE), .flags = AHCI_FLAG_COMMON, .pio_mask = ATA_PIO4,
@@ -276,13 +276,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x2924), board_ahci }, /* ICH9 */ { PCI_VDEVICE(INTEL, 0x2925), board_ahci }, /* ICH9 */ { PCI_VDEVICE(INTEL, 0x2927), board_ahci }, /* ICH9 */ - { PCI_VDEVICE(INTEL, 0x2929), board_ahci_mobile }, /* ICH9M */ - { PCI_VDEVICE(INTEL, 0x292a), board_ahci_mobile }, /* ICH9M */ - { PCI_VDEVICE(INTEL, 0x292b), board_ahci_mobile }, /* ICH9M */ - { PCI_VDEVICE(INTEL, 0x292c), board_ahci_mobile }, /* ICH9M */ - { PCI_VDEVICE(INTEL, 0x292f), board_ahci_mobile }, /* ICH9M */ + { PCI_VDEVICE(INTEL, 0x2929), board_ahci_low_power }, /* ICH9M */ + { PCI_VDEVICE(INTEL, 0x292a), board_ahci_low_power }, /* ICH9M */ + { PCI_VDEVICE(INTEL, 0x292b), board_ahci_low_power }, /* ICH9M */ + { PCI_VDEVICE(INTEL, 0x292c), board_ahci_low_power }, /* ICH9M */ + { PCI_VDEVICE(INTEL, 0x292f), board_ahci_low_power }, /* ICH9M */ { PCI_VDEVICE(INTEL, 0x294d), board_ahci }, /* ICH9 */ - { PCI_VDEVICE(INTEL, 0x294e), board_ahci_mobile }, /* ICH9M */ + { PCI_VDEVICE(INTEL, 0x294e), board_ahci_low_power }, /* ICH9M */ { PCI_VDEVICE(INTEL, 0x502a), board_ahci }, /* Tolapai */ { PCI_VDEVICE(INTEL, 0x502b), board_ahci }, /* Tolapai */ { PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */
@@ -292,9 +292,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x3b23), board_ahci }, /* PCH AHCI */ { PCI_VDEVICE(INTEL, 0x3b24), board_ahci }, /* PCH RAID */ { PCI_VDEVICE(INTEL, 0x3b25), board_ahci }, /* PCH RAID */ - { PCI_VDEVICE(INTEL, 0x3b29), board_ahci_mobile }, /* PCH M AHCI */ + { PCI_VDEVICE(INTEL, 0x3b29), board_ahci_low_power }, /* PCH M AHCI */ { PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */ - { PCI_VDEVICE(INTEL, 0x3b2c), board_ahci_mobile }, /* PCH M RAID */ + { PCI_VDEVICE(INTEL, 0x3b2c), board_ahci_low_power }, /* PCH M RAID */ { PCI_VDEVICE(INTEL, 0x3b2f), board_ahci }, /* PCH AHCI */ { PCI_VDEVICE(INTEL, 0x19b0), board_ahci_pcs7 }, /* DNV AHCI */ { PCI_VDEVICE(INTEL, 0x19b1), board_ahci_pcs7 }, /* DNV AHCI */
@@ -317,9 +317,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x19cE), board_ahci_pcs7 }, /* DNV AHCI */ { PCI_VDEVICE(INTEL, 0x19cF), board_ahci_pcs7 }, /* DNV AHCI */ { PCI_VDEVICE(INTEL, 0x1c02), board_ahci }, /* CPT AHCI */ - { PCI_VDEVICE(INTEL, 0x1c03), board_ahci_mobile }, /* CPT M AHCI */ + { PCI_VDEVICE(INTEL, 0x1c03), board_ahci_low_power }, /* CPT M AHCI */ { PCI_VDEVICE(INTEL, 0x1c04), board_ahci }, /* CPT RAID */ - { PCI_VDEVICE(INTEL, 0x1c05), board_ahci_mobile }, /* CPT M RAID */ + { PCI_VDEVICE(INTEL, 0x1c05), board_ahci_low_power }, /* CPT M RAID */ { PCI_VDEVICE(INTEL, 0x1c06), board_ahci }, /* CPT RAID */ { PCI_VDEVICE(INTEL, 0x1c07), board_ahci }, /* CPT RAID */ { PCI_VDEVICE(INTEL, 0x1d02), board_ahci }, /* PBG AHCI */
@@ -328,29 +328,29 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* PBG RAID */ { PCI_VDEVICE(INTEL, 0x2323), board_ahci }, /* DH89xxCC AHCI */ { PCI_VDEVICE(INTEL, 0x1e02), board_ahci }, /* Panther Point AHCI */ - { PCI_VDEVICE(INTEL, 0x1e03), board_ahci_mobile }, /* Panther M AHCI */ + { PCI_VDEVICE(INTEL, 0x1e03), board_ahci_low_power }, /* Panther M AHCI */ { PCI_VDEVICE(INTEL, 0x1e04), board_ahci }, /* Panther Point RAID */ { PCI_VDEVICE(INTEL, 0x1e05), board_ahci }, /* Panther Point RAID */ { PCI_VDEVICE(INTEL, 0x1e06), board_ahci }, /* Panther Point RAID */ - { PCI_VDEVICE(INTEL, 0x1e07), board_ahci_mobile }, /* Panther M RAID */ + { PCI_VDEVICE(INTEL, 0x1e07), board_ahci_low_power }, /* Panther M RAID */ { PCI_VDEVICE(INTEL, 0x1e0e), board_ahci }, /* Panther Point RAID */ { PCI_VDEVICE(INTEL, 0x8c02), board_ahci }, /* Lynx Point AHCI */ - { PCI_VDEVICE(INTEL, 0x8c03), board_ahci_mobile }, /* Lynx M AHCI */ + { PCI_VDEVICE(INTEL, 0x8c03), board_ahci_low_power }, /* Lynx M AHCI */ { PCI_VDEVICE(INTEL, 0x8c04), board_ahci }, /* Lynx Point RAID */ - { PCI_VDEVICE(INTEL, 0x8c05), board_ahci_mobile }, /* Lynx M RAID */ + { PCI_VDEVICE(INTEL, 0x8c05), board_ahci_low_power }, /* Lynx M RAID */ { PCI_VDEVICE(INTEL, 0x8c06), board_ahci }, /* Lynx Point RAID */ - { PCI_VDEVICE(INTEL, 0x8c07), board_ahci_mobile }, /* Lynx M RAID */ + { PCI_VDEVICE(INTEL, 0x8c07), board_ahci_low_power }, /* Lynx M RAID */ { PCI_VDEVICE(INTEL, 0x8c0e), board_ahci }, /* Lynx Point RAID */ - { PCI_VDEVICE(INTEL, 0x8c0f), board_ahci_mobile }, /* Lynx M RAID */ - { PCI_VDEVICE(INTEL, 0x9c02), board_ahci_mobile }, /* Lynx LP AHCI */ - { PCI_VDEVICE(INTEL, 0x9c03), board_ahci_mobile }, /* Lynx LP AHCI */ - { PCI_VDEVICE(INTEL, 0x9c04), board_ahci_mobile }, /* Lynx LP RAID */ - { PCI_VDEVICE(INTEL, 0x9c05), board_ahci_mobile }, /* Lynx LP RAID */ - { PCI_VDEVICE(INTEL, 0x9c06), board_ahci_mobile }, /* Lynx LP RAID */ - { PCI_VDEVICE(INTEL, 0x9c07), board_ahci_mobile }, /* Lynx LP RAID */ - { PCI_VDEVICE(INTEL, 0x9c0e), board_ahci_mobile }, /* Lynx LP RAID */ - { PCI_VDEVICE(INTEL, 0x9c0f), board_ahci_mobile }, /* Lynx LP RAID */ - { PCI_VDEVICE(INTEL, 0x9dd3), board_ahci_mobile }, /* Cannon Lake PCH-LP AHCI */ + { PCI_VDEVICE(INTEL, 0x8c0f), board_ahci_low_power }, /* Lynx M RAID */ + { PCI_VDEVICE(INTEL, 0x9c02), board_ahci_low_power }, /* Lynx LP AHCI */ + { PCI_VDEVICE(INTEL, 0x9c03), board_ahci_low_power }, /* Lynx LP AHCI */ + { PCI_VDEVICE(INTEL, 0x9c04), board_ahci_low_power }, /* Lynx LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c05), board_ahci_low_power }, /* Lynx LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c06), board_ahci_low_power }, /* Lynx LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c07), board_ahci_low_power }, /* Lynx LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c0e), board_ahci_low_power }, /* Lynx LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c0f), board_ahci_low_power }, /* Lynx LP RAID */ + { PCI_VDEVICE(INTEL, 0x9dd3), board_ahci_low_power }, /* Cannon Lake PCH-LP AHCI */ { PCI_VDEVICE(INTEL, 0x1f22), board_ahci }, /* Avoton AHCI */ { PCI_VDEVICE(INTEL, 0x1f23), board_ahci }, /* Avoton AHCI */ { PCI_VDEVICE(INTEL, 0x1f24), board_ahci }, /* Avoton RAID */
@@ -382,26 +382,26 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x8d66), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x8d6e), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x23a3), board_ahci }, /* Coleto Creek AHCI */ - { PCI_VDEVICE(INTEL, 0x9c83), board_ahci_mobile }, /* Wildcat LP AHCI */ - { PCI_VDEVICE(INTEL, 0x9c85), board_ahci_mobile }, /* Wildcat LP RAID */ - { PCI_VDEVICE(INTEL, 0x9c87), board_ahci_mobile }, /* Wildcat LP RAID */ - { PCI_VDEVICE(INTEL, 0x9c8f), board_ahci_mobile }, /* Wildcat LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c83), board_ahci_low_power }, /* Wildcat LP AHCI */ + { PCI_VDEVICE(INTEL, 0x9c85), board_ahci_low_power }, /* Wildcat LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c87), board_ahci_low_power }, /* Wildcat LP RAID */ + { PCI_VDEVICE(INTEL, 0x9c8f), board_ahci_low_power }, /* Wildcat LP RAID */ { PCI_VDEVICE(INTEL, 0x8c82), board_ahci }, /* 9 Series AHCI */ - { PCI_VDEVICE(INTEL, 0x8c83), board_ahci_mobile }, /* 9 Series M AHCI */ + { PCI_VDEVICE(INTEL, 0x8c83), board_ahci_low_power }, /* 9 Series M AHCI */ { PCI_VDEVICE(INTEL, 0x8c84), board_ahci }, /* 9 Series RAID */ - { PCI_VDEVICE(INTEL, 0x8c85), board_ahci_mobile }, /* 9 Series M RAID */ + { PCI_VDEVICE(INTEL, 0x8c85), board_ahci_low_power }, /* 9 Series M RAID */ { PCI_VDEVICE(INTEL, 0x8c86), board_ahci }, /* 9 Series RAID */ - { PCI_VDEVICE(INTEL, 0x8c87), board_ahci_mobile }, /* 9 Series M RAID */ + { PCI_VDEVICE(INTEL, 0x8c87), board_ahci_low_power }, /* 9 Series M RAID */ { PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */ - { PCI_VDEVICE(INTEL, 0x8c8f), board_ahci_mobile }, /* 9 Series M RAID */ - { PCI_VDEVICE(INTEL, 0x9d03), board_ahci_mobile }, /* Sunrise LP AHCI */ - { PCI_VDEVICE(INTEL, 0x9d05), board_ahci_mobile }, /* Sunrise LP RAID */ - { PCI_VDEVICE(INTEL, 0x9d07), board_ahci_mobile }, /* Sunrise LP RAID */ + { PCI_VDEVICE(INTEL, 0x8c8f), board_ahci_low_power }, /* 9 Series M RAID */ + { PCI_VDEVICE(INTEL, 0x9d03), board_ahci_low_power }, /* Sunrise LP AHCI */ + { PCI_VDEVICE(INTEL, 0x9d05), board_ahci_low_power }, /* Sunrise LP RAID */ + { PCI_VDEVICE(INTEL, 0x9d07), board_ahci_low_power }, /* Sunrise LP RAID */ { PCI_VDEVICE(INTEL, 0xa102), board_ahci }, /* Sunrise Point-H AHCI */ - { PCI_VDEVICE(INTEL, 0xa103), board_ahci_mobile }, /* Sunrise M AHCI */ + { PCI_VDEVICE(INTEL, 0xa103), board_ahci_low_power }, /* Sunrise M AHCI */ { PCI_VDEVICE(INTEL, 0xa105), board_ahci }, /* Sunrise Point-H RAID */ { PCI_VDEVICE(INTEL, 0xa106), board_ahci }, /* Sunrise Point-H RAID */ - { PCI_VDEVICE(INTEL, 0xa107), board_ahci_mobile }, /* Sunrise M RAID */ + { PCI_VDEVICE(INTEL, 0xa107), board_ahci_low_power }, /* Sunrise M RAID */ { PCI_VDEVICE(INTEL, 0xa10f), board_ahci }, /* Sunrise Point-H RAID */ { PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* Lewisburg RAID*/ { PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Lewisburg AHCI*/
@@ -418,13 +418,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0xa356), board_ahci }, /* Cannon Lake PCH-H RAID */ { PCI_VDEVICE(INTEL, 0x06d7), board_ahci }, /* Comet Lake-H RAID */ { PCI_VDEVICE(INTEL, 0xa386), board_ahci }, /* Comet Lake PCH-V RAID */ - { PCI_VDEVICE(INTEL, 0x0f22), board_ahci_mobile }, /* Bay Trail AHCI */ - { PCI_VDEVICE(INTEL, 0x0f23), board_ahci_mobile }, /* Bay Trail AHCI */ - { PCI_VDEVICE(INTEL, 0x22a3), board_ahci_mobile }, /* Cherry Tr. AHCI */ - { PCI_VDEVICE(INTEL, 0x5ae3), board_ahci_mobile }, /* ApolloLake AHCI */ - { PCI_VDEVICE(INTEL, 0x34d3), board_ahci_mobile }, /* Ice Lake LP AHCI */ - { PCI_VDEVICE(INTEL, 0x02d3), board_ahci_mobile }, /* Comet Lake PCH-U AHCI */ - { PCI_VDEVICE(INTEL, 0x02d7), board_ahci_mobile }, /* Comet Lake PCH RAID */ + { PCI_VDEVICE(INTEL, 0x0f22), board_ahci_low_power }, /* Bay Trail AHCI */ + { PCI_VDEVICE(INTEL, 0x0f23), board_ahci_low_power }, /* Bay Trail AHCI */ + { PCI_VDEVICE(INTEL, 0x22a3), board_ahci_low_power }, /* Cherry Tr. AHCI */ + { PCI_VDEVICE(INTEL, 0x5ae3), board_ahci_low_power }, /* ApolloLake AHCI */ + { PCI_VDEVICE(INTEL, 0x34d3), board_ahci_low_power }, /* Ice Lake LP AHCI */ + { PCI_VDEVICE(INTEL, 0x02d3), board_ahci_low_power }, /* Comet Lake PCH-U AHCI */ + { PCI_VDEVICE(INTEL, 0x02d7), board_ahci_low_power }, /* Comet Lake PCH RAID *//* JMicron 360/1/3/5/6, match class to avoid IDE function */ { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -452,7 +452,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */ { PCI_VDEVICE(AMD, 0x7801), board_ahci_no_debounce_delay }, /* AMD Hudson-2 (AHCI mode) */ { PCI_VDEVICE(AMD, 0x7900), board_ahci }, /* AMD CZ */ - { PCI_VDEVICE(AMD, 0x7901), board_ahci_mobile }, /* AMD Green Sardine */ + { PCI_VDEVICE(AMD, 0x7901), board_ahci_low_power }, /* AMD Green Sardine *//* AMD is using RAID class only for ahci controllers */ { PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci },
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 86/226 ata: ahci: Add Elkhart Lake AHCI controller
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Werner Fischer <[email protected]>
[ Upstream commit 2a2df98ec592667927b5c1351afa6493ea125c9f ]
Elkhart Lake is the successor of Apollo Lake and Gemini Lake. These CPUs and their PCHs are used in mobile and embedded environments.
With this patch I suggest that Elkhart Lake SATA controllers [1] should use the default LPM policy for mobile chipsets.
The disadvantage of missing hot-plug support with this setting should not be an issue, as those CPUs are used in embedded environments and not in servers with hot-plug backplanes.
We discovered that the Elkhart Lake SATA controllers have been missing in ahci.c after a customer reported the throttling of his SATA SSD after a short period of higher I/O. We determined the high temperature of the SSD controller in idle mode as the root cause for that.
Depending on the used SSD, we have seen up to 1.8 Watt lower system idle power usage and up to 30°C lower SSD controller temperatures in our tests, when we set med_power_with_dipm manually. I have provided a table showing seven different SATA SSDs from ATP, Intel/Solidigm and Samsung [2].
Intel lists a total of 3 SATA controller IDs (4B60, 4B62, 4B63) in [1] for those mobile PCHs.
This commit just adds 0x4b63 as I do not have test systems with 0x4b60 and 0x4b62 SATA controllers.
I have tested this patch with a system which uses 0x4b63 as SATA controller.
[1] https://sata-io.org/product/8803
[2] https://www.thomas-krenn.com/en/wiki/SATA_Link_Power_Management#Example_LES_v4
--- drivers/ata/ahci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/ata/ahci.c +2 -0
@@ -425,6 +425,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x34d3), board_ahci_low_power }, /* Ice Lake LP AHCI */ { PCI_VDEVICE(INTEL, 0x02d3), board_ahci_low_power }, /* Comet Lake PCH-U AHCI */ { PCI_VDEVICE(INTEL, 0x02d7), board_ahci_low_power }, /* Comet Lake PCH RAID */ +/* Elkhart Lake IDs 0x4b60 & 0x4b62 https://sata-io.org/product/8803 not tested yet */ + { PCI_VDEVICE(INTEL, 0x4b63), board_ahci_low_power }, /* Elkhart Lake AHCI *//* JMicron 360/1/3/5/6, match class to avoid IDE function */ { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 87/226 btrfs: reset destination buffer when read_extent_buffer() gets invalid range
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit 74ee79142c0a344d4eae2eb7012ebc4e82254109 ]
Commit f98b6215d7d1 ("btrfs: extent_io: do extra check for extent buffer read write functions") changed how we handle invalid extent buffer range for read_extent_buffer().
Previously if the range is invalid we just set the destination to zero, but after the patch we do nothing and error out.
This can lead to smatch static checker errors like:
fs/btrfs/print-tree.c:186 print_uuid_item() error: uninitialized symbol 'subvol_id'. fs/btrfs/tests/extent-io-tests.c:338 check_eb_bitmap() error: uninitialized symbol 'has'. fs/btrfs/tests/extent-io-tests.c:353 check_eb_bitmap() error: uninitialized symbol 'has'. fs/btrfs/uuid-tree.c:203 btrfs_uuid_tree_remove() error: uninitialized symbol 'read_subid'. fs/btrfs/uuid-tree.c:353 btrfs_uuid_tree_iterate() error: uninitialized symbol 'subid_le'. fs/btrfs/uuid-tree.c:72 btrfs_uuid_tree_lookup() error: uninitialized symbol 'data'. fs/btrfs/volumes.c:7415 btrfs_dev_stats_value() error: uninitialized symbol 'val'.
Fix those warnings by reverting back to the old memset() behavior. By this we keep the static checker happy and would still make a lot of noise when such invalid ranges are passed in.
--- fs/btrfs/extent_io.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/btrfs/extent_io.c +7 -1
@@ -5634,8 +5634,14 @@ void read_extent_buffer(const struct extent_buffer *eb, void *dstv,char *dst = (char *)dstv;unsigned long i = start >>PAGE_SHIFT ; -if (check_eb_range (eb, start, len)) +if (check_eb_range (eb, start, len)) { +/* +* Invalid range hit, reset the memory, so callers won't get +* some random garbage for their uninitialzed memory. +*/ +memset (dstv,0 , len);return ; + } offset =offset_in_page (start);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 88/226 MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit ef8f8f04a0b25e8f294b24350e8463a8d6a9ba0b ]
While commit d4a5c59a955b ("mmc: au1xmmc: force non-modular build and remove symbol_get usage") to be built in, it can still build a kernel without MMC support and thuse no mmc_detect_change symbol at all.
Add ifdefs to build the mmc support code in the alchemy arch code conditional on mmc support.
--- arch/mips/alchemy/devboards/db1000.c | 4 ++++ arch/mips/alchemy/devboards/db1200.c | 6 ++++++ arch/mips/alchemy/devboards/db1300.c | 4 ++++ 3 files changed, 14 insertions(+)
arch/mips/alchemy/devboards/db1000.c +4 -0
@@ -164,6 +164,7 @@ static struct platform_device db1x00_audio_dev = {/******************************************************************************/ +#ifdef CONFIG_MMC_AU1X static irqreturn_t db1100_mmc_cd (int irq,void *ptr) {mmc_detect_change (ptr,msecs_to_jiffies (500 ));
@@ -369,6 +370,7 @@ static struct platform_device db1100_mmc1_dev = { .num_resources = ARRAY_SIZE(au1100_mmc1_res), .resource = au1100_mmc1_res, }; +#endif /* CONFIG_MMC_AU1X */ /******************************************************************************/
@@ -432,8 +434,10 @@ static struct platform_device *db1x00_devs[] = {static struct platform_device *db1100_devs[] = { &au1100_lcd_device, +#ifdef CONFIG_MMC_AU1X &db1100_mmc0_dev, &db1100_mmc1_dev, +#endif };int __init db1000_dev_setup (void )
arch/mips/alchemy/devboards/db1200.c +6 -0
@@ -326,6 +326,7 @@ static struct platform_device db1200_ide_dev = {/**********************************************************************/ +#ifdef CONFIG_MMC_AU1X /* SD carddetects: they're supposed to be edge-triggered, but ack * doesn't seem to work (CPLD Rev 2). Instead, the screaming one * is disabled and its counterpart enabled. The 200ms timeout is
@@ -584,6 +585,7 @@ static struct platform_device pb1200_mmc1_dev = { .num_resources = ARRAY_SIZE(au1200_mmc1_res), .resource = au1200_mmc1_res, }; +#endif /* CONFIG_MMC_AU1X */ /**********************************************************************/
@@ -751,7 +753,9 @@ static struct platform_device db1200_audiodma_dev = {static struct platform_device *db1200_devs[]__initdata = {NULL ,/* PSC0, selected by S6.8 */ &db1200_ide_dev, +#ifdef CONFIG_MMC_AU1X &db1200_mmc0_dev, +#endif &au1200_lcd_dev, &db1200_eth_dev, &db1200_nand_dev,
@@ -762,7 +766,9 @@ static struct platform_device *db1200_devs[] __initdata = { };static struct platform_device *pb1200_devs[]__initdata = { +#ifdef CONFIG_MMC_AU1X &pb1200_mmc1_dev, +#endif };/* Some peripheral base addresses differ on the PB1200 */
arch/mips/alchemy/devboards/db1300.c +4 -0
@@ -450,6 +450,7 @@ static struct platform_device db1300_ide_dev = {/**********************************************************************/ +#ifdef CONFIG_MMC_AU1X static irqreturn_t db1300_mmc_cd (int irq,void *ptr) {disable_irq_nosync (irq);
@@ -632,6 +633,7 @@ static struct platform_device db1300_sd0_dev = { .resource = au1300_sd0_res, .num_resources = ARRAY_SIZE(au1300_sd0_res), }; +#endif /* CONFIG_MMC_AU1X */ /**********************************************************************/
@@ -776,8 +778,10 @@ static struct platform_device *db1300_dev[] __initdata = { &db1300_5waysw_dev, &db1300_nand_dev, &db1300_ide_dev, +#ifdef CONFIG_MMC_AU1X &db1300_sd0_dev, &db1300_sd1_dev, +#endif &db1300_lcd_dev, &db1300_ac97_dev, &db1300_i2s_dev,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 89/226 bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Julien Panis <[email protected]>
[ Upstream commit d929b2b7464f95ec01e47f560b1e687482ba8929 ]
The am335x-evm started producing boot errors because of subtle timing changes:
Unhandled fault: external abort on non-linefetch (0x1008) at 0xf03c1010
...sysc_reset from sysc_probe+0xf60/0x1514sysc_probe from platform_probe+0x5c/0xbc
...
The fix consists in using the appropriate sleep function in sysc reset. For flexible sleeping, fsleep is recommended. Here, sysc delay parameter can take any value in [0 - 255] us range. As a result, fsleep() should be used, calling udelay() for a sysc delay lower than 10 us.
Message-ID: <[email protected]>
--- drivers/bus/ti-sysc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/bus/ti-sysc.c +1 -2
@@ -2085,8 +2085,7 @@ static int sysc_reset(struct sysc *ddata) }if (ddata->cfg.srst_udelay) -usleep_range (ddata->cfg.srst_udelay, - ddata->cfg.srst_udelay *2 ); +fsleep (ddata->cfg.srst_udelay);if (ddata->post_reset_quirk) ddata->post_reset_quirk (ddata);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 90/226 bus: ti-sysc: Fix missing AM35xx SoC matching
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 11729caa520950e17cd81bc43ffc477c46cf791e ]
Commit feaa8baee82a ("bus: ti-sysc: Implement SoC revision handling") created a list of SoC types searching for strings based on names and wildcards which associates the SoC to different families.
The OMAP34xx and OMAP35xx are treated as SOC_3430 while OMAP36xx and OMAP37xx are treated as SOC_3630, but the AM35xx isn't listed.
The AM35xx is mostly an OMAP3430, and a later commit a12315d6d270 ("bus: ti-sysc: Make omap3 gpt12 quirk handling SoC specific") looks for the SOC type and behaves in a certain way if it's SOC_3430.
This caused a regression on the AM3517 causing it to return two errors:
ti-sysc: probe of 48318000.target-module failed with error -16
ti-sysc: probe of 49032000.target-module failed with error -16
Fix this by treating the creating SOC_AM35 and inserting it between the SOC_3430 and SOC_3630. If it is treaed the same way as the SOC_3430 when checking the status of sysc_check_active_timer, the error conditions will disappear.
Message-ID: <[email protected]>
--- drivers/bus/ti-sysc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/bus/ti-sysc.c +4 -2
@@ -38,6 +38,7 @@ enum sysc_soc {SOC_2420 ,SOC_2430 ,SOC_3430 , +SOC_AM35 ,SOC_3630 ,SOC_4430 , SOC_4460,
@@ -1818,7 +1819,7 @@ static void sysc_pre_reset_quirk_dss(struct sysc *ddata)dev_warn (ddata->dev,"%s: timed out %08x !+ %08x\n" , __func__, val, irq_mask); -if (sysc_soc->soc ==SOC_3430 ) { +if (sysc_soc->soc ==SOC_3430 || sysc_soc->soc ==SOC_AM35 ) {/* Clear DSS_SDI_CONTROL */ sysc_write (ddata,0x44 ,0 );
@@ -2959,6 +2960,7 @@ static void ti_sysc_idle(struct work_struct *work)static const struct soc_device_attribute sysc_soc_match[] = {SOC_FLAG ("OMAP242*" ,SOC_2420 ),SOC_FLAG ("OMAP243*" ,SOC_2430 ), +SOC_FLAG ("AM35*" ,SOC_AM35 ),SOC_FLAG ("OMAP3[45]*" ,SOC_3430 ),SOC_FLAG ("OMAP3[67]*" ,SOC_3630 ),SOC_FLAG ("OMAP443*" ,SOC_4430 ),
@@ -3146,7 +3148,7 @@ static int sysc_check_active_timer(struct sysc *ddata)* can be dropped if we stop supporting old beagleboard revisions * A to B4 at some point. */ -if (sysc_soc->soc ==SOC_3430 ) +if (sysc_soc->soc ==SOC_3430 || sysc_soc->soc ==SOC_AM35 ) error = -ENXIO ;else error = -EBUSY ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 91/226 clk: tegra: fix error return case for recalc_rate
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timo Alho <[email protected]>
[ Upstream commit a47b44fbb13f5e7a981b4515dcddc93a321ae89c ]
tegra-bpmp clocks driver makes implicit conversion of signed error code to unsigned value in recalc_rate operation. The behavior for recalc_rate, according to it's specification, should be that "If the driver cannot figure out a rate for this clock, it must return 0."
--- drivers/clk/tegra/clk-bpmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/tegra/clk-bpmp.c +1 -1
@@ -159,7 +159,7 @@ static unsigned long tegra_bpmp_clk_recalc_rate(struct clk_hw *hw, err =tegra_bpmp_clk_transfer (clk->bpmp, &msg);if (err <0 ) -return err; +return 0 ;return response.rate; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 92/226 ARM: dts: omap: correct indentation
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 8ae9c7a69fa14e95d032e64d8d758e3f85bee132 ]
Do not use spaces for indentation.
Stable-dep-of: 6469b2feade8 ("ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4")
--- arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 6 +-- arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 6 +-- arch/arm/boot/dts/omap3-cm-t3517.dts | 12 +++--- arch/arm/boot/dts/omap3-gta04.dtsi | 6 +-- arch/arm/boot/dts/omap3-ldp.dts | 2 - arch/arm/boot/dts/omap3-n900.dts | 38 +++++++++---------- arch/arm/boot/dts/omap3-zoom3.dts | 44 +++++++++++----------- arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 24 ++++++------ arch/arm/boot/dts/omap5-cm-t54.dts | 58 +++++++++++++++--------------- 9 files changed, 98 insertions(+), 98 deletions(-)
arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi +3 -3
@@ -8,9 +8,9 @@ / { vddvario: regulator-vddvario { - compatible = "regulator-fixed"; - regulator-name = "vddvario"; - regulator-always-on; + compatible = "regulator-fixed"; + regulator-name = "vddvario"; + regulator-always-on; }; vdd33a: regulator-vdd33a {
arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi +3 -3
@@ -12,9 +12,9 @@ / { vddvario: regulator-vddvario { - compatible = "regulator-fixed"; - regulator-name = "vddvario"; - regulator-always-on; + compatible = "regulator-fixed"; + regulator-name = "vddvario"; + regulator-always-on; }; vdd33a: regulator-vdd33a {
arch/arm/boot/dts/omap3-cm-t3517.dts +6 -6
@@ -11,12 +11,12 @@ model = "CompuLab CM-T3517"; compatible = "compulab,omap3-cm-t3517", "ti,am3517", "ti,omap3"; - vmmc: regulator-vmmc { - compatible = "regulator-fixed"; - regulator-name = "vmmc"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; + vmmc: regulator-vmmc { + compatible = "regulator-fixed"; + regulator-name = "vmmc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; wl12xx_vmmc2: wl12xx_vmmc2 { compatible = "regulator-fixed";
arch/arm/boot/dts/omap3-gta04.dtsi +3 -3
@@ -332,7 +332,7 @@ OMAP3_CORE1_IOPAD(0x2108, PIN_OUTPUT | MUX_MODE0) /* dss_data22.dss_data22 */ OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT | MUX_MODE0) /* dss_data23.dss_data23 */ >; - }; + }; gps_pins: pinmux_gps_pins { pinctrl-single,pins = <
@@ -866,8 +866,8 @@ }; &hdqw1w { - pinctrl-names = "default"; - pinctrl-0 = <&hdq_pins>; + pinctrl-names = "default"; + pinctrl-0 = <&hdq_pins>; }; /* image signal processor within OMAP3 SoC */
arch/arm/boot/dts/omap3-ldp.dts +1 -1
@@ -301,5 +301,5 @@ &vaux1 { /* Needed for ads7846 */ - regulator-name = "vcc"; + regulator-name = "vcc"; };
arch/arm/boot/dts/omap3-n900.dts +19 -19
@@ -236,27 +236,27 @@ pinctrl-single,pins = < /* address lines */ - OMAP3_CORE1_IOPAD(0x207a, PIN_OUTPUT | MUX_MODE0) /* gpmc_a1.gpmc_a1 */ - OMAP3_CORE1_IOPAD(0x207c, PIN_OUTPUT | MUX_MODE0) /* gpmc_a2.gpmc_a2 */ - OMAP3_CORE1_IOPAD(0x207e, PIN_OUTPUT | MUX_MODE0) /* gpmc_a3.gpmc_a3 */ + OMAP3_CORE1_IOPAD(0x207a, PIN_OUTPUT | MUX_MODE0) /* gpmc_a1.gpmc_a1 */ + OMAP3_CORE1_IOPAD(0x207c, PIN_OUTPUT | MUX_MODE0) /* gpmc_a2.gpmc_a2 */ + OMAP3_CORE1_IOPAD(0x207e, PIN_OUTPUT | MUX_MODE0) /* gpmc_a3.gpmc_a3 */ /* data lines, gpmc_d0..d7 not muxable according to TRM */ - OMAP3_CORE1_IOPAD(0x209e, PIN_INPUT | MUX_MODE0) /* gpmc_d8.gpmc_d8 */ - OMAP3_CORE1_IOPAD(0x20a0, PIN_INPUT | MUX_MODE0) /* gpmc_d9.gpmc_d9 */ - OMAP3_CORE1_IOPAD(0x20a2, PIN_INPUT | MUX_MODE0) /* gpmc_d10.gpmc_d10 */ - OMAP3_CORE1_IOPAD(0x20a4, PIN_INPUT | MUX_MODE0) /* gpmc_d11.gpmc_d11 */ - OMAP3_CORE1_IOPAD(0x20a6, PIN_INPUT | MUX_MODE0) /* gpmc_d12.gpmc_d12 */ - OMAP3_CORE1_IOPAD(0x20a8, PIN_INPUT | MUX_MODE0) /* gpmc_d13.gpmc_d13 */ - OMAP3_CORE1_IOPAD(0x20aa, PIN_INPUT | MUX_MODE0) /* gpmc_d14.gpmc_d14 */ - OMAP3_CORE1_IOPAD(0x20ac, PIN_INPUT | MUX_MODE0) /* gpmc_d15.gpmc_d15 */ + OMAP3_CORE1_IOPAD(0x209e, PIN_INPUT | MUX_MODE0) /* gpmc_d8.gpmc_d8 */ + OMAP3_CORE1_IOPAD(0x20a0, PIN_INPUT | MUX_MODE0) /* gpmc_d9.gpmc_d9 */ + OMAP3_CORE1_IOPAD(0x20a2, PIN_INPUT | MUX_MODE0) /* gpmc_d10.gpmc_d10 */ + OMAP3_CORE1_IOPAD(0x20a4, PIN_INPUT | MUX_MODE0) /* gpmc_d11.gpmc_d11 */ + OMAP3_CORE1_IOPAD(0x20a6, PIN_INPUT | MUX_MODE0) /* gpmc_d12.gpmc_d12 */ + OMAP3_CORE1_IOPAD(0x20a8, PIN_INPUT | MUX_MODE0) /* gpmc_d13.gpmc_d13 */ + OMAP3_CORE1_IOPAD(0x20aa, PIN_INPUT | MUX_MODE0) /* gpmc_d14.gpmc_d14 */ + OMAP3_CORE1_IOPAD(0x20ac, PIN_INPUT | MUX_MODE0) /* gpmc_d15.gpmc_d15 */ /* * gpmc_ncs0, gpmc_nadv_ale, gpmc_noe, gpmc_nwe, gpmc_wait0 not muxable * according to TRM. OneNAND seems to require PIN_INPUT on clock. */ - OMAP3_CORE1_IOPAD(0x20b0, PIN_OUTPUT | MUX_MODE0) /* gpmc_ncs1.gpmc_ncs1 */ - OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0) /* gpmc_clk.gpmc_clk */ - >; + OMAP3_CORE1_IOPAD(0x20b0, PIN_OUTPUT | MUX_MODE0) /* gpmc_ncs1.gpmc_ncs1 */ + OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0) /* gpmc_clk.gpmc_clk */ + >; }; i2c1_pins: pinmux_i2c1_pins {
@@ -738,12 +738,12 @@ si4713: si4713@63 { compatible = "silabs,si4713"; - reg = <0x63>; + reg = <0x63>; - interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_FALLING>; /* 53 */ - reset-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 */ - vio-supply = <&vio>; - vdd-supply = <&vaux1>; + interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_FALLING>; /* 53 */ + reset-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 */ + vio-supply = <&vio>; + vdd-supply = <&vaux1>; }; bq24150a: bq24150a@6b {
arch/arm/boot/dts/omap3-zoom3.dts +22 -22
81 lines not on this page · raw message
arch/arm/boot/dts/omap4-cpu-thermal.dtsi +12 -12
@@ -16,20 +16,20 @@ cpu_thermal: cpu_thermal { polling-delay = <1000>; /* milliseconds */ /* sensor ID */ - thermal-sensors = <&bandgap 0>; + thermal-sensors = <&bandgap 0>; cpu_trips: trips { - cpu_alert0: cpu_alert { - temperature = <100000>; /* millicelsius */ - hysteresis = <2000>; /* millicelsius */ - type = "passive"; - }; - cpu_crit: cpu_crit { - temperature = <125000>; /* millicelsius */ - hysteresis = <2000>; /* millicelsius */ - type = "critical"; - }; - }; + cpu_alert0: cpu_alert { + temperature = <100000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + cpu_crit: cpu_crit { + temperature = <125000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; cpu_cooling_maps: cooling-maps { map0 {
arch/arm/boot/dts/omap5-cm-t54.dts +29 -29
73 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 93/226 ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
[ Upstream commit 6469b2feade8fd82d224dd3734e146536f3e9f0e ]
Fix "thermal_sys: cpu_thermal: Failed to read thermal-sensors cells: -2" error on boot for omap3/4. This is caused by wrong addressing in the dts for bandgap sensor for single sensor instances.
Note that omap4-cpu-thermal.dtsi is shared across omap4/5 and dra7, so we can't just change the addressing in omap4-cpu-thermal.dtsi.
--- arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 3 +-- arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 5 ++++- arch/arm/boot/dts/omap443x.dtsi | 1 + arch/arm/boot/dts/omap4460.dtsi | 1 + 4 files changed, 7 insertions(+), 3 deletions(-)
arch/arm/boot/dts/omap3-cpu-thermal.dtsi +1 -2
@@ -15,8 +15,7 @@ cpu_thermal: cpu_thermal { polling-delay = <1000>; /* milliseconds */ coefficients = <0 20000>; - /* sensor ID */ - thermal-sensors = <&bandgap 0>; + thermal-sensors = <&bandgap>; cpu_trips: trips { cpu_alert0: cpu_alert {
arch/arm/boot/dts/omap4-cpu-thermal.dtsi +4 -1
@@ -15,7 +15,10 @@ cpu_thermal: cpu_thermal { polling-delay-passive = <250>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */ - /* sensor ID */ + /* + * See 44xx files for single sensor addressing, omap5 and dra7 need + * also sensor ID for addressing. + */ thermal-sensors = <&bandgap 0>; cpu_trips: trips {
arch/arm/boot/dts/omap443x.dtsi +1 -0
@@ -72,6 +72,7 @@ }; &cpu_thermal { + thermal-sensors = <&bandgap>; coefficients = <0 20000>; };
arch/arm/boot/dts/omap4460.dtsi +1 -0
@@ -89,6 +89,7 @@ }; &cpu_thermal { + thermal-sensors = <&bandgap>; coefficients = <348 (-9301)>; };
Greg Kroah-Hartman
maintainerPATCH 94/226 ARM: dts: motorola-mapphone: Configure lower temperature passive cooling
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
[ Upstream commit 5c3db2d4d4ed747e714387362afe007e6ae5e2d3 ]
The current cooling device temperature is too high at 100C as we have a battery on the device right next to the SoC as pointed out by Carl Philipp Klemm <[email protected]>. Let's configure the max temperature to 80C.
As we only have a tshut interrupt and no talert interrupt on 4430, we have a passive cooling device configured for 4430. However, we want the poll interval to be 10 seconds instead of 1 second for power management. The value of 10 seconds seems like plenty of time to notice the temperature increase above the 75C temperatures. Having the bandgap temperature change seems to take several tens of seconds because of heat dissipation above 75C range as monitored with a full CPU load.
Stable-dep-of: ac08bda1569b ("ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot")
--- arch/arm/boot/dts/motorola-mapphone-common.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/motorola-mapphone-common.dtsi +8 -0
@@ -192,6 +192,14 @@ }; }; +&cpu_thermal { + polling-delay = <10000>; /* milliseconds */ +}; + +&cpu_alert0 { + temperature = <80000>; /* millicelsius */ +}; + &dss { status = "okay"; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 95/226 ARM: dts: motorola-mapphone: Add 1.2GHz OPP
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carl Philipp Klemm <[email protected]>
[ Upstream commit 19e367147ea8864dff1fb153cfab6d8e8da10324 ]
The omap4430 HS HIGH performance devces support 1.2GHz opp, lower speed variants do not. However for mapphone devices Motorola seems to have decided that this does not really matter for the SoC variants they have tested to use, and decided to clock all devices, including the ones with STANDARD performance chips at 1.2GHz upon release of the 3.0.8 vendor kernel shiped with Android 4.0. Therefore it seems safe to do the same, but let's only do it for Motorola devices as the others have not been tested.
Note that we prevent overheating with the passive cooling device cpu_alert0 configured in the dts file that starts lowering the speed as needed.
This also removes the "failed to find current OPP for freq 1200000000" warning.
Stable-dep-of: ac08bda1569b ("ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot")
--- arch/arm/boot/dts/motorola-mapphone-common.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/arm/boot/dts/motorola-mapphone-common.dtsi +15 -0
@@ -200,6 +200,21 @@ temperature = <80000>; /* millicelsius */ }; +&cpu0 { + /* + * Note that the 1.2GiHz mode is enabled for all SoC variants for + * the Motorola Android Linux v3.0.8 based kernel. + */ + operating-points = < + /* kHz uV */ + 300000 1025000 + 600000 1200000 + 800000 1313000 + 1008000 1375000 + 1200000 1375000 + >; +}; + &dss { status = "okay"; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 96/226 ARM: dts: motorola-mapphone: Drop second ti,wlcore compatible value
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 7ebe6e99f7702dad342486e5b30d989a0a6499af ]
The TI wlcore DT bindings specify using a single compatible value for each variant, and the Linux kernel driver matches against the first compatible value since commit 078b30da3f074f2e ("wlcore: add wl1285 compatible") in v4.13.
Stable-dep-of: ac08bda1569b ("ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot")
--- arch/arm/boot/dts/motorola-mapphone-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/motorola-mapphone-common.dtsi +1 -1
@@ -407,7 +407,7 @@ #address-cells = <1>; #size-cells = <0>; wlcore: wlcore@2 { - compatible = "ti,wl1285", "ti,wl1283"; + compatible = "ti,wl1285"; reg = <2>; /* gpio_100 with gpmc_wait2 pad as wakeirq */ interrupts-extended = <&gpio4 4 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 97/226 ARM: dts: am335x: Guardian: Update beeper label
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gireesh Hiremath <[email protected]>
[ Upstream commit b5bf6b434575d32aeaa70c82ec84b3cec92e2973 ]
* Update lable pwm to guardian beeper
Message-Id: <[email protected]>
Stable-dep-of: ac08bda1569b ("ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot")
--- arch/arm/boot/dts/am335x-guardian.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/am335x-guardian.dts +4 -4
@@ -100,11 +100,11 @@ }; - pwm7: dmtimer-pwm { + guardian_beeper: dmtimer-pwm@7 { compatible = "ti,omap-dmtimer-pwm"; ti,timers = <&timer7>; pinctrl-names = "default"; - pinctrl-0 = <&dmtimer7_pins>; + pinctrl-0 = <&guardian_beeper_pins>; ti,clock-source = <0x01>; };
@@ -343,9 +343,9 @@ >; }; - dmtimer7_pins: pinmux_dmtimer7_pins { + guardian_beeper_pins: pinmux_dmtimer7_pins { pinctrl-single,pins = < - AM33XX_IOPAD(0x968, PIN_OUTPUT | MUX_MODE5) + AM33XX_IOPAD(0x968, PIN_OUTPUT | MUX_MODE5) /* (E18) timer7 */ >; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 98/226 ARM: dts: Unify pwm-omap-dmtimer node names
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
[ Upstream commit 4f15fc7c0f28ffcd6e9a56396db6edcdfa4c9925 ]
There is no reg property for pwm-omap-dmtimer.
Stable-dep-of: ac08bda1569b ("ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot")
--- arch/arm/boot/dts/am335x-guardian.dts | 3 ++- arch/arm/boot/dts/am3517-evm.dts | 2 +- arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 2 +- arch/arm/boot/dts/motorola-mapphone-common.dtsi | 4 ++-- arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- arch/arm/boot/dts/omap3-n900.dts | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-)
arch/arm/boot/dts/am335x-guardian.dts +2 -1
@@ -100,8 +100,9 @@ }; - guardian_beeper: dmtimer-pwm@7 { + guardian_beeper: pwm-7 { compatible = "ti,omap-dmtimer-pwm"; + #pwm-cells = <3>; ti,timers = <&timer7>; pinctrl-names = "default"; pinctrl-0 = <&guardian_beeper_pins>;
arch/arm/boot/dts/am3517-evm.dts +1 -1
@@ -150,7 +150,7 @@ enable-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* gpio_182 */ }; - pwm11: dmtimer-pwm@11 { + pwm11: pwm-11 { compatible = "ti,omap-dmtimer-pwm"; pinctrl-names = "default"; pinctrl-0 = <&pwm_pins>;
arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi +1 -1
@@ -59,7 +59,7 @@ }; }; - pwm10: dmtimer-pwm { + pwm10: pwm-10 { compatible = "ti,omap-dmtimer-pwm"; pinctrl-names = "default"; pinctrl-0 = <&pwm_pins>;
arch/arm/boot/dts/motorola-mapphone-common.dtsi +2 -2
@@ -156,7 +156,7 @@ dais = <&mcbsp2_port>, <&mcbsp3_port>; }; - pwm8: dmtimer-pwm-8 { + pwm8: pwm-8 { pinctrl-names = "default"; pinctrl-0 = <&vibrator_direction_pin>;
@@ -166,7 +166,7 @@ ti,clock-source = <0x01>; }; - pwm9: dmtimer-pwm-9 { + pwm9: pwm-9 { pinctrl-names = "default"; pinctrl-0 = <&vibrator_enable_pin>;
arch/arm/boot/dts/omap3-gta04.dtsi +1 -1
@@ -147,7 +147,7 @@ pinctrl-0 = <&backlight_pins>; }; - pwm11: dmtimer-pwm { + pwm11: pwm-11 { compatible = "ti,omap-dmtimer-pwm"; ti,timers = <&timer11>; #pwm-cells = <3>;
arch/arm/boot/dts/omap3-n900.dts +1 -1
@@ -156,7 +156,7 @@ io-channel-names = "temp", "bsi", "vbat"; }; - pwm9: dmtimer-pwm { + pwm9: pwm-9 { compatible = "ti,omap-dmtimer-pwm"; #pwm-cells = <3>; ti,timers = <&timer9>;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 99/226 ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
[ Upstream commit ac08bda1569b06b7a62c7b4dd00d4c3b28ceaaec ]
Commit 0840242e8875 ("ARM: dts: Configure clock parent for pwm vibra") attempted to fix the PWM settings but ended up causin an additional clock reparenting error:
clk: failed to reparent abe-clkctrl:0060:24 to sys_clkin_ck: -22
Only timer9 is in the PER domain and can use the sys_clkin_ck clock source. For timer8, the there is no sys_clkin_ck available as it's in the ABE domain, instead it should use syc_clk_div_ck. However, for power management, we want to use the always on sys_32k_ck instead.
Depends-on: 61978617e905 ("ARM: dts: Add minimal support for Droid Bionic xt875")
--- arch/arm/boot/dts/motorola-mapphone-common.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/motorola-mapphone-common.dtsi +2 -2
@@ -739,12 +739,12 @@ /* Configure pwm clock source for timers 8 & 9 */ &timer8 { assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>; - assigned-clock-parents = <&sys_clkin_ck>; + assigned-clock-parents = <&sys_32k_ck>; }; &timer9 { assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>; - assigned-clock-parents = <&sys_clkin_ck>; + assigned-clock-parents = <&sys_32k_ck>; }; /*
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 100/226 bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
[ Upstream commit e5deb8f76e64d94ccef715e75ebafffd0c312d80 ]
The uarts should be tagged with SYSC_QUIRK_SWSUP_SIDLE instead of SYSC_QUIRK_SWSUP_SIDLE_ACT. The difference is that SYSC_QUIRK_SWSUP_SIDLE is used to force idle target modules rather than block idle during usage.
The SYSC_QUIRK_SWSUP_SIDLE_ACT should disable autoidle and wake-up when a target module is active, and configure autoidle and wake-up when a target module is inactive. We are missing configuring the target module on sysc_disable_module(), and missing toggling of the wake-up bit.
Let's fix the issue to allow uart wake-up to work.
--- drivers/bus/ti-sysc.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
drivers/bus/ti-sysc.c +17 -5
@@ -1114,6 +1114,11 @@ static int sysc_enable_module(struct device *dev)if (ddata->cfg.quirks & (SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_SWSUP_SIDLE_ACT )) { best_mode =SYSC_IDLE_NO ; + +/* Clear WAKEUP */ +if (regbits->enwkup_shift >=0 && + ddata->cfg.sysc_val &BIT (regbits->enwkup_shift)) + reg &= ~BIT (regbits->enwkup_shift); }else { best_mode =fls (ddata->cfg.sidlemodes) -1 ;if (best_mode >SYSC_IDLE_MASK ) {
@@ -1234,6 +1239,13 @@ static int sysc_disable_module(struct device *dev) } } +if (ddata->cfg.quirks &SYSC_QUIRK_SWSUP_SIDLE_ACT ) { +/* Set WAKEUP */ +if (regbits->enwkup_shift >=0 && + ddata->cfg.sysc_val &BIT (regbits->enwkup_shift)) + reg |=BIT (regbits->enwkup_shift); + } + reg &= ~(SYSC_IDLE_MASK << regbits->sidle_shift); reg |= best_mode << regbits->sidle_shift; if (regbits->autoidle_shift >= 0 &&
@@ -1497,16 +1509,16 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {SYSC_QUIRK ("smartreflex" ,0 , -ENODEV ,0x38 , -ENODEV ,0x00000000 ,0xffffffff ,SYSC_QUIRK_LEGACY_IDLE ),SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x00000046 ,0xffffffff , -SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_LEGACY_IDLE ), +SYSC_QUIRK_SWSUP_SIDLE_ACT |SYSC_QUIRK_LEGACY_IDLE ),SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x00000052 ,0xffffffff , -SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_LEGACY_IDLE ), +SYSC_QUIRK_SWSUP_SIDLE_ACT |SYSC_QUIRK_LEGACY_IDLE ),/* Uarts on omap4 and later */ SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x50411e03 ,0xffff00ff , -SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_LEGACY_IDLE ), +SYSC_QUIRK_SWSUP_SIDLE_ACT |SYSC_QUIRK_LEGACY_IDLE ),SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x47422e03 ,0xffffffff , -SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_LEGACY_IDLE ), +SYSC_QUIRK_SWSUP_SIDLE_ACT |SYSC_QUIRK_LEGACY_IDLE ),SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x47424e03 ,0xffffffff , -SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_LEGACY_IDLE ), +SYSC_QUIRK_SWSUP_SIDLE_ACT |SYSC_QUIRK_LEGACY_IDLE ),/* Quirks that need to be set based on the module address */ SYSC_QUIRK("mcpdm", 0x40132000, 0, 0x10, -ENODEV, 0x50000800, 0xffffffff,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 101/226 power: supply: ucs1002: fix error code in ucs1002_get_property()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit e35059949daa83f8dadf710d0f829ab3c3a72fe2 ]
This function is supposed to return 0 for success instead of returning the val->intval. This makes it the same as the other case statements in this function.
--- drivers/power/supply/ucs1002_power.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/power/supply/ucs1002_power.c +2 -1
@@ -384,7 +384,8 @@ static int ucs1002_get_property(struct power_supply *psy,case POWER_SUPPLY_PROP_USB_TYPE :return ucs1002_get_usb_type (info, val);case POWER_SUPPLY_PROP_HEALTH : -return val->intval = info->health; + val->intval = info->health; +return 0 ;case POWER_SUPPLY_PROP_PRESENT : val->intval = info->present;return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 102/226 xtensa: add default definition for XCHAL_HAVE_DIV32
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Filippov <[email protected]>
[ Upstream commit 494e87ffa0159b3f879694a9231089707792a44d ]
When variant FSF is set, XCHAL_HAVE_DIV32 is not defined. Add default definition for that macro to prevent build warnings:
arch/xtensa/lib/divsi3.S:9:5: warning: "XCHAL_HAVE_DIV32" is not defined, evaluates to 0 [-Wundef]
9 | #if XCHAL_HAVE_DIV32
arch/xtensa/lib/modsi3.S:9:5: warning: "XCHAL_HAVE_DIV32" is not defined, evaluates to 0 [-Wundef]
9 | #if XCHAL_HAVE_DIV32--- arch/xtensa/include/asm/core.h | 4 ++++ 1 file changed, 4 insertions(+)
arch/xtensa/include/asm/core.h +4 -0
@@ -6,6 +6,10 @@#include <variant/core.h> +#ifndef XCHAL_HAVE_DIV32 +#define XCHAL_HAVE_DIV32 0 +#endif +#ifndef XCHAL_HAVE_EXCLUSIVE #define XCHAL_HAVE_EXCLUSIVE 0#endif
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 103/226 xtensa: iss/network: make functions static
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 1b59efeb59851277266318f4e0132aa61ce3455e ]
Make 2 functions static to prevent build warnings:
arch/xtensa/platforms/iss/network.c:204:16: warning: no previous prototype for 'tuntap_protocol' [-Wmissing-prototypes]
204 | unsigned short tuntap_protocol(struct sk_buff *skb)arch/xtensa/platforms/iss/network.c:444:6: warning: no previous prototype for 'iss_net_user_timer_expire' [-Wmissing-prototypes]
444 | void iss_net_user_timer_expire(struct timer_list *unused)
Message-Id: <[email protected]>
--- arch/xtensa/platforms/iss/network.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/xtensa/platforms/iss/network.c +2 -2
@@ -204,7 +204,7 @@ static int tuntap_write(struct iss_net_private *lp, struct sk_buff **skb)return simc_write (lp->tp.info.tuntap.fd, (*skb)->data, (*skb)->len); } -unsigned short tuntap_protocol (struct sk_buff *skb) +static unsigned short tuntap_protocol (struct sk_buff *skb) {return eth_type_trans (skb, skb->dev); }
@@ -477,7 +477,7 @@ static int iss_net_change_mtu(struct net_device *dev, int new_mtu)return -EINVAL ; } -void iss_net_user_timer_expire (struct timer_list *unused) +static void iss_net_user_timer_expire (struct timer_list *unused) { }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 104/226 xtensa: boot: dont add include-dirs
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 54d3d7d363823782c3444ddc41bb8cf1edc80514 ]
Drop the -I<include-dir> options to prevent build warnings since there is not boot/include directory:
cc1: warning: arch/xtensa/boot/include: No such file or directory [-Wmissing-include-dirs]
Message-Id: <[email protected]>
--- arch/xtensa/boot/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/xtensa/boot/Makefile +1 -2
@@ -9,8 +9,7 @@ # KBUILD_CFLAGS used when building rest of boot (takes effect recursively) -KBUILD_CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include -HOSTFLAGS += -Iarch/$(ARCH)/boot/include +KBUILD_CFLAGS += -fno-builtin BIG_ENDIAN := $(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#")
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 105/226 xtensa: boot/lib: fix function prototypes
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Filippov <[email protected]>
[ Upstream commit f54d02c8f2cc4b46ba2a3bd8252a6750453b6f2b ]
Add function prototype for gunzip() to the boot library code and make exit() and zalloc() static.
arch/xtensa/boot/lib/zmem.c:8:6: warning: no previous prototype for 'exit' [-Wmissing-prototypes]
8 | void exit (void)arch/xtensa/boot/lib/zmem.c:13:7: warning: no previous prototype for 'zalloc' [-Wmissing-prototypes]
13 | void *zalloc(unsigned size)arch/xtensa/boot/lib/zmem.c:35:6: warning: no previous prototype for 'gunzip' [-Wmissing-prototypes]
35 | void gunzip (void *dst, int dstlen, unsigned char *src, int *lenp)
--- arch/xtensa/boot/lib/zmem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/xtensa/boot/lib/zmem.c +3 -2
@@ -4,13 +4,14 @@/* bits taken from ppc */ extern void *avail_ram, *end_avail; +void gunzip (void *dst,int dstlen,unsigned char *src,int *lenp); -void exit (void ) +static void exit (void ) {for (;;); } -void *zalloc (unsigned size) +static void *zalloc (unsigned int size) {void *p = avail_ram;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 106/226 gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenhua Lin <[email protected]>
[ Upstream commit 26d9e5640d2130ee16df7b1fb6a908f460ab004c ]
The drivers uses a mutex and I2C bus access in its PMIC EIC chip get implementation. This means these functions can sleep and the PMIC EIC chip should set the can_sleep property to true.
This will ensure that a warning is printed when trying to get the value from a context that potentially can't sleep.
--- drivers/gpio/gpio-pmic-eic-sprd.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/gpio-pmic-eic-sprd.c +1 -0
@@ -338,6 +338,7 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev) pmic_eic->chip.set_config = sprd_pmic_eic_set_config; pmic_eic->chip.set = sprd_pmic_eic_set; pmic_eic->chip.get = sprd_pmic_eic_get; + pmic_eic->chip.can_sleep = true; pmic_eic->intc.name =dev_name (&pdev->dev); pmic_eic->intc.irq_mask = sprd_pmic_eic_irq_mask;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 107/226 i2c: npcm7xx: Fix callback completion ordering
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: William A. Kennington III <[email protected]>
[ Upstream commit 92e73d807b68b2214fcafca4e130b5300a9d4b3c ]
Sometimes, our completions race with new master transfers and override the bus->operation and bus->master_or_slave variables. This causes transactions to timeout and kernel crashes less frequently.
To remedy this, we re-order all completions to the very end of the function.
--- drivers/i2c/busses/i2c-npcm7xx.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/i2c/busses/i2c-npcm7xx.c +7 -10
@@ -675,6 +675,7 @@ static void npcm_i2c_callback(struct npcm_i2c *bus, {struct i2c_msg *msgs;int msgs_num; +bool do_complete = false; msgs = bus->msgs; msgs_num = bus->msgs_num;
@@ -701,23 +702,17 @@ static void npcm_i2c_callback(struct npcm_i2c *bus, msgs[1].flags & I2C_M_RD) msgs[1 ].len = info; } -if (completion_done (&bus->cmd_complete) == false) -complete (&bus->cmd_complete); -break ; - + do_complete = true; +break ;case I2C_NACK_IND :/* MASTER transmit got a NACK before tx all bytes */ bus->cmd_err = -ENXIO ; -if (bus->master_or_slave ==I2C_MASTER ) -complete (&bus->cmd_complete); - + do_complete = true;break ;case I2C_BUS_ERR_IND :/* Bus error */ bus->cmd_err = -EAGAIN ; -if (bus->master_or_slave ==I2C_MASTER ) -complete (&bus->cmd_complete); - + do_complete = true;break ;case I2C_WAKE_UP_IND :/* I2C wake up */
@@ -731,6 +726,8 @@ static void npcm_i2c_callback(struct npcm_i2c *bus,if (bus->slave) bus->master_or_slave =I2C_SLAVE ;#endif +if (do_complete) +complete (&bus->cmd_complete); }static u8 npcm_i2c_fifo_usage (struct npcm_i2c *bus)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 108/226 dma-debug: dont call __dma_entry_alloc_check_leak() under free_entries_lock
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Senozhatsky <[email protected]>
[ Upstream commit fb5a4315591dae307a65fc246ca80b5159d296e1 ]
__dma_entry_alloc_check_leak() calls into printk -> serial console output (qcom geni) and grabs port->lock under free_entries_lock spin lock, which is a reverse locking dependency chain as qcom_geni IRQ handler can call into dma-debug code and grab free_entries_lock under port->lock.
Move __dma_entry_alloc_check_leak() call out of free_entries_lock scope so that we don't acquire serial console's port->lock under it.
Trimmed-down lockdep splat:
The existing dependency chain (in reverse order) is:
-> #2 (free_entries_lock){-.-.}-{2:2}:
_raw_spin_lock_irqsave+0x60/0x80
dma_entry_alloc+0x38/0x110
debug_dma_map_page+0x60/0xf8
dma_map_page_attrs+0x1e0/0x230
dma_map_single_attrs.constprop.0+0x6c/0xc8
geni_se_rx_dma_prep+0x40/0xcc
qcom_geni_serial_isr+0x310/0x510
__handle_irq_event_percpu+0x110/0x244
handle_irq_event_percpu+0x20/0x54
handle_irq_event+0x50/0x88
handle_fasteoi_irq+0xa4/0xcc
handle_irq_desc+0x28/0x40
generic_handle_domain_irq+0x24/0x30
gic_handle_irq+0xc4/0x148
do_interrupt_handler+0xa4/0xb0
el1_interrupt+0x34/0x64
el1h_64_irq_handler+0x18/0x24
el1h_64_irq+0x64/0x68
arch_local_irq_enable+0x4/0x8
____do_softirq+0x18/0x24
...
-> #1 (&port_lock_key){-.-.}-{2:2}:
_raw_spin_lock_irqsave+0x60/0x80
qcom_geni_serial_console_write+0x184/0x1dc
console_flush_all+0x344/0x454
console_unlock+0x94/0xf0
vprintk_emit+0x238/0x24c
vprintk_default+0x3c/0x48
vprintk+0xb4/0xbc
_printk+0x68/0x90
register_console+0x230/0x38c
uart_add_one_port+0x338/0x494
qcom_geni_serial_probe+0x390/0x424
platform_probe+0x70/0xc0
really_probe+0x148/0x280
__driver_probe_device+0xfc/0x114
driver_probe_device+0x44/0x100
__device_attach_driver+0x64/0xdc
bus_for_each_drv+0xb0/0xd8
__device_attach+0xe4/0x140
device_initial_probe+0x1c/0x28
bus_probe_device+0x44/0xb0
device_add+0x538/0x668
of_device_add+0x44/0x50
of_platform_device_create_pdata+0x94/0xc8
of_platform_bus_create+0x270/0x304
of_platform_populate+0xac/0xc4
devm_of_platform_populate+0x60/0xac
geni_se_probe+0x154/0x160
platform_probe+0x70/0xc0
...
-> #0 (console_owner){-...}-{0:0}:
__lock_acquire+0xdf8/0x109c
lock_acquire+0x234/0x284
console_flush_all+0x330/0x454
console_unlock+0x94/0xf0
vprintk_emit+0x238/0x24c
vprintk_default+0x3c/0x48
vprintk+0xb4/0xbc
_printk+0x68/0x90
dma_entry_alloc+0xb4/0x110
debug_dma_map_sg+0xdc/0x2f8
__dma_map_sg_attrs+0xac/0xe4
dma_map_sgtable+0x30/0x4c
get_pages+0x1d4/0x1e4 [msm]
msm_gem_pin_pages_locked+0x38/0xac [msm]
msm_gem_pin_vma_locked+0x58/0x88 [msm]
msm_ioctl_gem_submit+0xde4/0x13ac [msm]
drm_ioctl_kernel+0xe0/0x15c
drm_ioctl+0x2e8/0x3f4
vfs_ioctl+0x30/0x50
...Chain exists of: console_owner --> &port_lock_key --> free_entries_lock Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(free_entries_lock);
lock(&port_lock_key);
lock(free_entries_lock); lock(console_owner);
*** DEADLOCK ***
Call trace: dump_backtrace+0xb4/0xf0 show_stack+0x20/0x30 dump_stack_lvl+0x60/0x84 dump_stack+0x18/0x24 print_circular_bug+0x1cc/0x234 check_noncircular+0x78/0xac __lock_acquire+0xdf8/0x109c lock_acquire+0x234/0x284 console_flush_all+0x330/0x454 console_unlock+0x94/0xf0 vprintk_emit+0x238/0x24c vprintk_default+0x3c/0x48 vprintk+0xb4/0xbc _printk+0x68/0x90 dma_entry_alloc+0xb4/0x110 debug_dma_map_sg+0xdc/0x2f8 __dma_map_sg_attrs+0xac/0xe4 dma_map_sgtable+0x30/0x4c get_pages+0x1d4/0x1e4 [msm] msm_gem_pin_pages_locked+0x38/0xac [msm] msm_gem_pin_vma_locked+0x58/0x88 [msm] msm_ioctl_gem_submit+0xde4/0x13ac [msm] drm_ioctl_kernel+0xe0/0x15c drm_ioctl+0x2e8/0x3f4 vfs_ioctl+0x30/0x50 ...
--- kernel/dma/debug.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
kernel/dma/debug.c +15 -5
@@ -606,15 +606,19 @@ static struct dma_debug_entry *__dma_entry_alloc(void)return entry; } -static void __dma_entry_alloc_check_leak (void ) +/* +* This should be called outside of free_entries_lock scope to avoid potential +* deadlocks with serial consoles that use DMA. +*/ +static void __dma_entry_alloc_check_leak (u32 nr_entries) { -u32 tmp = nr_total_entries % nr_prealloc_entries; +u32 tmp = nr_entries % nr_prealloc_entries;/* Shout each time we tick over some multiple of the initial pool */ if (tmp <DMA_DEBUG_DYNAMIC_ENTRIES ) {pr_info ("dma_debug_entry pool grown to %u (%u00%%)\n" , - nr_total_entries, - (nr_total_entries / nr_prealloc_entries)); + nr_entries, + (nr_entries / nr_prealloc_entries)); } }
@@ -625,8 +629,10 @@ static void __dma_entry_alloc_check_leak(void)*/ static struct dma_debug_entry *dma_entry_alloc (void ) { +bool alloc_check_leak = false;struct dma_debug_entry *entry;unsigned long flags; +u32 nr_entries;spin_lock_irqsave (&free_entries_lock, flags);if (num_free_entries ==0 ) {
@@ -636,13 +642,17 @@ static struct dma_debug_entry *dma_entry_alloc(void)pr_err ("debugging out of memory - disabling\n" );return NULL ; } -__dma_entry_alloc_check_leak (); + alloc_check_leak = true; + nr_entries = nr_total_entries; } entry =__dma_entry_alloc ();spin_unlock_irqrestore (&free_entries_lock, flags); +if (alloc_check_leak) +__dma_entry_alloc_check_leak (nr_entries); +#ifdef CONFIG_STACKTRACE entry->stack_len = stack_trace_save(entry->stack_entries, ARRAY_SIZE(entry->stack_entries),
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 109/226 parisc: sba: Fix compile warning wrt list of SBA devices
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
[ Upstream commit eb3255ee8f6f4691471a28fbf22db5e8901116cd ]
Fix this makecheck warning:drivers/parisc/sba_iommu.c:98:19: warning: symbol 'sba_list'
was not declared. Should it be static?
--- arch/parisc/include/asm/ropes.h | 3 +++ drivers/char/agp/parisc-agp.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-)
arch/parisc/include/asm/ropes.h +3 -0
@@ -86,6 +86,9 @@ struct sba_device {struct ioc ioc[MAX_IOC ]; }; +/* list of SBA's in system, see drivers/parisc/sba_iommu.c */ +extern struct sba_device *sba_list; +#define ASTRO_RUNWAY_PORT 0x582#define IKE_MERCED_PORT 0x803#define REO_MERCED_PORT 0x804
drivers/char/agp/parisc-agp.c +0 -2
@@ -394,8 +394,6 @@ find_quicksilver(struct device *dev, void *data)static int __init parisc_agp_init (void ) { -extern struct sba_device *sba_list; -int err =-1 ;struct parisc_device *sba =NULL , *lba =NULL ;struct lba_device *lbadev =NULL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 110/226 parisc: iosapic.c: Fix sparse warnings
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
[ Upstream commit 927c6c8aa27c284a799b8c18784e37d3373af908 ]
--- drivers/parisc/iosapic.c | 4 ++-- drivers/parisc/iosapic_private.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/parisc/iosapic.c +2 -2
@@ -202,9 +202,9 @@ static inline void iosapic_write(void __iomem *iosapic, unsigned int reg, u32 vastatic DEFINE_SPINLOCK (iosapic_lock); -static inline void iosapic_eoi (void __iomem *addr,unsigned int data) +static inline void iosapic_eoi (__le32 __iomem *addr,__le32 data) { -__raw_writel (data, addr); +__raw_writel ((__force u32 )data, addr); }/*
drivers/parisc/iosapic_private.h +2 -2
@@ -118,8 +118,8 @@ struct iosapic_irt {struct vector_info {struct iosapic_info *iosapic;/* I/O SAPIC this vector is on */ struct irt_entry *irte;/* IRT entry */ -u32 __iomem *eoi_addr;/* precalculate EOI reg address */ -u32 eoi_data;/* IA64: ? PA: swapped txn_data */ +__le32 __iomem *eoi_addr;/* precalculate EOI reg address */ +__le32 eoi_data;/* IA64: ? PA: swapped txn_data */ int txn_irq;/* virtual IRQ number for processor */ ulong txn_addr;/* IA64: id_eid PA: partial HPA */ u32 txn_data;/* CPU interrupt bit */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 111/226 parisc: drivers: Fix sparse warning
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
[ Upstream commit b137b9d60b8add5620a06c687a71ce18776730b0 ]
Fix "warning: directive in macro's argument list" warning.
--- arch/parisc/kernel/drivers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/parisc/kernel/drivers.c +1 -1
@@ -925,9 +925,9 @@ static __init void qemu_header(void)pr_info ("#define PARISC_MODEL \"%s\"\n\n" , boot_cpu_data.pdc.sys_model_name); +#define p ((unsigned long *)&boot_cpu_data.pdc.model)pr_info ("#define PARISC_PDC_MODEL 0x%lx, 0x%lx, 0x%lx, " "0x%lx, 0x%lx, 0x%lx, 0x%lx, 0x%lx, 0x%lx\n\n" , - #define p ((unsigned long *)&boot_cpu_data.pdc.model) p[0 ], p[1 ], p[2 ], p[3 ], p[4 ], p[5 ], p[6 ], p[7 ], p[8 ]);#undef p
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 112/226 parisc: irq: Make irq_stack_union static to avoid sparse warning
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
[ Upstream commit b1bef1388c427cdad7331a9c8eb4ebbbe5b954b0 ]
--- arch/parisc/kernel/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/parisc/kernel/irq.c +1 -1
@@ -388,7 +388,7 @@ union irq_stack_union {volatile unsigned int lock[1 ]; }; -DEFINE_PER_CPU(union irq_stack_union, irq_stack_union) = { +static DEFINE_PER_CPU(union irq_stack_union, irq_stack_union) = { .slock = {1 ,1 ,1 ,1 }, };#endif
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 113/226 scsi: qedf: Add synchronization between I/O completions and abort
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Javed Hasan <[email protected]>
[ Upstream commit 7df0b2605489bef3f4223ad66f1f9bb8d50d4cd2 ]
Avoid race condition between I/O completion and abort processing by protecting the cmd_type with the rport lock.
--- drivers/scsi/qedf/qedf_io.c | 10 ++++++++-- drivers/scsi/qedf/qedf_main.c | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-)
drivers/scsi/qedf/qedf_io.c +8 -2
@@ -1924,6 +1924,7 @@ int qedf_initiate_abts(struct qedf_ioreq *io_req, bool return_scsi_cmd_on_abts) goto drop_rdata_kref; } +spin_lock_irqsave (&fcport->rport_lock, flags);if (!test_bit (QEDF_CMD_OUTSTANDING , &io_req->flags) ||test_bit (QEDF_CMD_IN_CLEANUP , &io_req->flags) ||test_bit (QEDF_CMD_IN_ABORT , &io_req->flags)) {
@@ -1931,17 +1932,20 @@ int qedf_initiate_abts(struct qedf_ioreq *io_req, bool return_scsi_cmd_on_abts)"io_req xid=0x%x sc_cmd=%p already in cleanup or abort processing or already completed.\n" , io_req->xid, io_req->sc_cmd); rc =1 ; +spin_unlock_irqrestore (&fcport->rport_lock, flags); goto drop_rdata_kref; } +/* Set the command type to abort */ + io_req->cmd_type =QEDF_ABTS ; +spin_unlock_irqrestore (&fcport->rport_lock, flags); +kref_get (&io_req->refcount); xid = io_req->xid; qedf->control_requests++; qedf->packet_aborts++; -/* Set the command type to abort */ - io_req->cmd_type =QEDF_ABTS ; io_req->return_scsi_cmd_on_abts = return_scsi_cmd_on_abts;set_bit (QEDF_CMD_IN_ABORT , &io_req->flags);
@@ -2230,7 +2234,9 @@ int qedf_initiate_cleanup(struct qedf_ioreq *io_req, refcount, fcport, fcport->rdata->ids.port_id);/* Cleanup cmds re-use the same TID as the original I/O */ +spin_lock_irqsave (&fcport->rport_lock, flags); io_req->cmd_type =QEDF_CLEANUP ; +spin_unlock_irqrestore (&fcport->rport_lock, flags); io_req->return_scsi_cmd_on_abts = return_scsi_cmd_on_abts;init_completion (&io_req->cleanup_done);
drivers/scsi/qedf/qedf_main.c +6 -1
@@ -2803,6 +2803,8 @@ void qedf_process_cqe(struct qedf_ctx *qedf, struct fcoe_cqe *cqe)struct qedf_ioreq *io_req;struct qedf_rport *fcport;u32 comp_type; +u8 io_comp_type; +unsigned long flags; comp_type = (cqe->cqe_data >>FCOE_CQE_CQE_TYPE_SHIFT ) &FCOE_CQE_CQE_TYPE_MASK ;
@@ -2836,11 +2838,14 @@ void qedf_process_cqe(struct qedf_ctx *qedf, struct fcoe_cqe *cqe)return ; } +spin_lock_irqsave (&fcport->rport_lock, flags); + io_comp_type = io_req->cmd_type; +spin_unlock_irqrestore (&fcport->rport_lock, flags);switch (comp_type) {case FCOE_GOOD_COMPLETION_CQE_TYPE :atomic_inc (&fcport->free_sqes); -switch (io_req->cmd_type) { +switch (io_comp_type) {case QEDF_SCSI_CMD :qedf_scsi_completion (qedf, cqe, io_req);break ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 114/226 selftests/ftrace: Correctly enable event in instance-event.tc
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Yejian <[email protected]>
[ Upstream commit f4e4ada586995b17f828c6d147d1800eb1471450 ]
Function instance_set() expects to enable event 'sched_switch', so we should set 1 to its 'enable' file.
Testcase passed after this patch:
# ./ftracetest test.d/instances/instance-event.tc === Ftrace unit tests === [1] Test creation and deletion of trace instances while setting an event [PASS]
# of passed: 1 # of failed: 0 # of unresolved: 0 # of untested: 0 # of unsupported: 0 # of xfailed: 0 # of undefined(test bug): 0
--- .../testing/selftests/ftrace/test.d/instances/instance-event.tc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +1 -1
@@ -39,7 +39,7 @@ instance_read() { instance_set() { while :; do - echo 1 > foo/events/sched/sched_switch + echo 1 > foo/events/sched/sched_switch/enable done 2> /dev/null }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 115/226 ring-buffer: Avoid softlockup in ring_buffer_resize()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Yejian <[email protected]>
[ Upstream commit f6bd2c92488c30ef53b5bd80c52f0a7eee9d545a ]
When user resize all trace ring buffer through file 'buffer_size_kb', then in ring_buffer_resize(), kernel allocates buffer pages for each cpu in a loop.
If the kernel preemption model is PREEMPT_NONE and there are many cpus and there are many buffer pages to be allocated, it may not give up cpu for a long time and finally cause a softlockup.
To avoid it, call cond_resched() after each cpu buffer allocation.
--- kernel/trace/ring_buffer.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/trace/ring_buffer.c +2 -0
@@ -2080,6 +2080,8 @@ int ring_buffer_resize(struct trace_buffer *buffer, unsigned long size, err = -ENOMEM ; goto out_err; } + +cond_resched (); }get_online_cpus ();
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 116/226 selftests: fix dependency checker script
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo B. Marliere <[email protected]>
[ Upstream commit 5f9dd2e896a91bfca90f8463eb6808c03d535d8a ]
This patch fixes inconsistencies in the parsing rules of the levels 1 and 2 of the kselftest_deps.sh. It was added the levels 4 and 5 to account for a few edge cases that are present in some tests, also some
minor identation styling have been fixed (s/ /\t/g).
--- tools/testing/selftests/kselftest_deps.sh | 77 +++++++++++++++++++---- 1 file changed, 65 insertions(+), 12 deletions(-)
tools/testing/selftests/kselftest_deps.sh +65 -12
@@ -46,11 +46,11 @@ fi print_targets=0 while getopts "p" arg; do - case $arg in - p) + case $arg in + p) print_targets=1 shift;; - esac + esac done if [ $# -eq 0 ]
@@ -92,6 +92,10 @@ pass_cnt=0 # Get all TARGETS from selftests Makefile targets=$(egrep "^TARGETS +|^TARGETS =" Makefile | cut -d "=" -f2) +# Initially, in LDLIBS related lines, the dep checker needs +# to ignore lines containing the following strings: +filter="\$(VAR_LDLIBS)\|pkg-config\|PKG_CONFIG\|IOURING_EXTRA_LIBS" + # Single test case if [ $# -eq 2 ] then
@@ -100,6 +104,8 @@ then l1_test $test l2_test $test l3_test $test + l4_test $test + l5_test $test print_results $1 $2 exit $?
@@ -113,7 +119,7 @@ fi # Append space at the end of the list to append more tests. l1_tests=$(grep -r --include=Makefile "^LDLIBS" | \ - grep -v "VAR_LDLIBS" | awk -F: '{print $1}') + grep -v "$filter" | awk -F: '{print $1}' | uniq) # Level 2: LDLIBS set dynamically. #
@@ -126,7 +132,7 @@ l1_tests=$(grep -r --include=Makefile "^LDLIBS" | \ # Append space at the end of the list to append more tests. l2_tests=$(grep -r --include=Makefile ": LDLIBS" | \ - grep -v "VAR_LDLIBS" | awk -F: '{print $1}') + grep -v "$filter" | awk -F: '{print $1}' | uniq) # Level 3 # gpio, memfd and others use pkg-config to find mount and fuse libs
@@ -140,11 +146,32 @@ l2_tests=$(grep -r --include=Makefile ": LDLIBS" | \ # VAR_LDLIBS := $(shell pkg-config fuse --libs 2>/dev/null) l3_tests=$(grep -r --include=Makefile "^VAR_LDLIBS" | \ - grep -v "pkg-config" | awk -F: '{print $1}') + grep -v "pkg-config\|PKG_CONFIG" | awk -F: '{print $1}' | uniq) -#echo $l1_tests -#echo $l2_1_tests -#echo $l3_tests +# Level 4 +# some tests may fall back to default using `|| echo -l<libname>` +# if pkg-config doesn't find the libs, instead of using VAR_LDLIBS +# as per level 3 checks. +# e.g: +# netfilter/Makefile +# LDLIBS += $(shell $(HOSTPKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl) +l4_tests=$(grep -r --include=Makefile "^LDLIBS" | \ + grep "pkg-config\|PKG_CONFIG" | awk -F: '{print $1}' | uniq) + +# Level 5 +# some tests may use IOURING_EXTRA_LIBS to add extra libs to LDLIBS, +# which in turn may be defined in a sub-Makefile +# e.g.: +# mm/Makefile +# $(OUTPUT)/gup_longterm: LDLIBS += $(IOURING_EXTRA_LIBS) +l5_tests=$(grep -r --include=Makefile "LDLIBS +=.*\$(IOURING_EXTRA_LIBS)" | \ + awk -F: '{print $1}' | uniq) + +#echo l1_tests $l1_tests +#echo l2_tests $l2_tests +#echo l3_tests $l3_tests +#echo l4_tests $l4_tests +#echo l5_tests $l5_tests all_tests print_results $1 $2
@@ -166,24 +193,32 @@ all_tests() for test in $l3_tests; do l3_test $test done + + for test in $l4_tests; do + l4_test $test + done + + for test in $l5_tests; do + l5_test $test + done } # Use same parsing used for l1_tests and pick libraries this time. l1_test() { test_libs=$(grep --include=Makefile "^LDLIBS" $test | \ - grep -v "VAR_LDLIBS" | \ + grep -v "$filter" | \ sed -e 's/\:/ /' | \ sed -e 's/+/ /' | cut -d "=" -f 2) check_libs $test $test_libs } -# Use same parsing used for l2__tests and pick libraries this time. +# Use same parsing used for l2_tests and pick libraries this time. l2_test() { test_libs=$(grep --include=Makefile ": LDLIBS" $test | \ - grep -v "VAR_LDLIBS" | \ + grep -v "$filter" | \ sed -e 's/\:/ /' | sed -e 's/+/ /' | \ cut -d "=" -f 2)
@@ -199,6 +234,24 @@ l3_test() check_libs $test $test_libs } +l4_test() +{ + test_libs=$(grep --include=Makefile "^VAR_LDLIBS\|^LDLIBS" $test | \ + grep "\(pkg-config\|PKG_CONFIG\).*|| echo " | \ + sed -e 's/.*|| echo //' | sed -e 's/)$//') + + check_libs $test $test_libs +} + +l5_test() +{ + tests=$(find $(dirname "$test") -type f -name "*.mk") + test_libs=$(grep "^IOURING_EXTRA_LIBS +\?=" $tests | \ + cut -d "=" -f 2) + + check_libs $test $test_libs +} + check_libs() {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 117/226 ring-buffer: Do not attempt to read past "commit"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 95a404bd60af6c4d9d8db01ad14fe8957ece31ca ]
When iterating over the ring buffer while the ring buffer is active, the writer can corrupt the reader. There's barriers to help detect this and handle it, but that code missed the case where the last event was at the very end of the page and has only 4 bytes left.
The checks to detect the corruption by the writer to reads needs to see the length of the event. If the length in the first 4 bytes is zero then the length is stored in the second 4 bytes. But if the writer is in the process of updating that code, there's a small window where the length in the first 4 bytes could be zero even though the length is only 4 bytes. That will cause rb_event_length() to read the next 4 bytes which could happen to be off the allocated page.
To protect against this, fail immediately if the next event pointer is less than 8 bytes from the end of the commit (last byte of data), as all events must be a minimum of 8 bytes anyway.
--- kernel/trace/ring_buffer.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/trace/ring_buffer.c +5 -0
@@ -2260,6 +2260,11 @@ rb_iter_head_event(struct ring_buffer_iter *iter)*/ commit =rb_page_commit (iter_head_page);smp_rmb (); + +/* An event needs to be at least 8 bytes in size */ +if (iter->head > commit -8 ) + goto reset; + event =__rb_page_index (iter_head_page, iter->head); length =rb_event_length (event);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 118/226 platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Thompson <[email protected]>
[ Upstream commit c2dffda1d8f7511505bbbf16ba282f2079b30089 ]
The latest version of the mlxbf_bootctl driver utilizes "sysfs_format_mac", and this API is only available if NET is defined in the kernel configuration. This patch changes the mlxbf_bootctl Kconfig to depend on NET.
--- drivers/platform/mellanox/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/platform/mellanox/Kconfig +1 -0
@@ -48,6 +48,7 @@ config MLXBF_BOOTCTL tristate "Mellanox BlueField Firmware Boot Control driver" depends on ARM64 depends on ACPI + depends on NET help The Mellanox BlueField firmware implements functionality to request swapping the primary and alternate eMMC boot partition,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 119/226 scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Grzedzicki <[email protected]>
[ Upstream commit 71996bb835aed58c7ec4967be1d05190a27339ec ]
Some cards have more than one SAS address. Using an incorrect address causes communication issues with some devices like expanders.
--- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +1 -1
@@ -4344,7 +4344,7 @@ pm8001_chip_phy_start_req(struct pm8001_hba_info *pm8001_ha, u8 phy_id) payload.sas_identify.dev_type =SAS_END_DEVICE ; payload.sas_identify.initiator_bits =SAS_PROTOCOL_ALL ;memcpy (payload.sas_identify.sas_addr, - pm8001_ha->sas_addr,SAS_ADDR_SIZE ); + &pm8001_ha->phy[phy_id].dev_sas_addr,SAS_ADDR_SIZE ); payload.sas_identify.phy_id = phy_id; ret =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opcode, &payload,sizeof (payload),0 );
drivers/scsi/pm8001/pm80xx_hwi.c +1 -1
@@ -4741,7 +4741,7 @@ pm80xx_chip_phy_start_req(struct pm8001_hba_info *pm8001_ha, u8 phy_id) payload.sas_identify.dev_type =SAS_END_DEVICE ; payload.sas_identify.initiator_bits =SAS_PROTOCOL_ALL ;memcpy (payload.sas_identify.sas_addr, - &pm8001_ha->sas_addr,SAS_ADDR_SIZE ); + &pm8001_ha->phy[phy_id].dev_sas_addr,SAS_ADDR_SIZE ); payload.sas_identify.phy_id = phy_id; ret =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opcode, &payload,sizeof (payload),0 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 120/226 scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Grzedzicki <[email protected]>
[ Upstream commit c13e7331745852d0dd7c35eabbe181cbd5b01172 ]
Tags allocated for OPC_INB_SET_CONTROLLER_CONFIG command need to be freed when we receive the response.
--- drivers/scsi/pm8001/pm80xx_hwi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/pm8001/pm80xx_hwi.c +2 -0
@@ -3722,10 +3722,12 @@ static int mpi_set_controller_config_resp(struct pm8001_hba_info *pm8001_ha, (struct set_ctrl_cfg_resp *)(piomb +4 );u32 status =le32_to_cpu (pPayload->status);u32 err_qlfr_pgcd =le32_to_cpu (pPayload->err_qlfr_pgcd); +u32 tag =le32_to_cpu (pPayload->tag);pm8001_dbg (pm8001_ha,MSG ,"SET CONTROLLER RESP: status 0x%x qlfr_pgcd 0x%x\n" , status, err_qlfr_pgcd); +pm8001_tag_free (pm8001_ha, tag);return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 121/226 ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit 80cc944eca4f0baa9c381d0706f3160e491437f2 ]
ata_scsi_port_error_handler() starts off by clearing ATA_PFLAG_EH_PENDING, before calling ap->ops->error_handler() (without holding the ap->lock).
If an error IRQ is received while ap->ops->error_handler() is running, the irq handler will set ATA_PFLAG_EH_PENDING.
Once ap->ops->error_handler() returns, ata_scsi_port_error_handler() checks if ATA_PFLAG_EH_PENDING is set, and if it is, another iteration of ATA EH is performed.
The problem is that ATA_PFLAG_EH_PENDING is not only cleared by ata_scsi_port_error_handler(), it is also cleared by ata_eh_reset().
ata_eh_reset() is called by ap->ops->error_handler(). This additional clearing done by ata_eh_reset() breaks the whole retry logic in ata_scsi_port_error_handler(). Thus, if an error IRQ is received while ap->ops->error_handler() is running, the port will currently remain frozen and will never get re-enabled.
The additional clearing in ata_eh_reset() was introduced in commit 1e641060c4b5 ("libata: clear eh_info on reset completion").
Looking at the original error report:
https://marc.info/?l=linux-ide&m=124765325828495&w=2
We can see the following happening:
[ 1.074659] ata3: XXX port freeze [ 1.074700] ata3: XXX hardresetting link, stopping engine [ 1.074746] ata3: XXX flipping SControl
[ 1.411471] ata3: XXX irq_stat=400040 CONN|PHY [ 1.411475] ata3: XXX port freeze
[ 1.420049] ata3: XXX starting engine [ 1.420096] ata3: XXX rc=0, class=1 [ 1.420142] ata3: XXX clearing IRQs for thawing [ 1.420188] ata3: XXX port thawed [ 1.420234] ata3: SATA link up 3.0 Gbps (SStatus 123 SControl 300)
We are not supposed to be able to receive an error IRQ while the port is frozen (PxIE is set to 0, i.e. all IRQs for the port are disabled).
AHCI 1.3.1 section 10.7.1.1 First Tier (IS Register) states:
"Each bit location can be thought of as reporting a '1' if the virtual "interrupt line" for that port is indicating it wishes to generate an interrupt. That is, if a port has one or more interrupt status bit set, and the enables for those status bits are set, then this bit shall be set."
Additionally, AHCI state P:ComInit clearly shows that the state machine will only jump to P:ComInitSetIS (which sets IS.IPS(x) to '1'), if PxIE.PCE is set to '1'. In our case, PxIE is set to 0, so IS.IPS(x) won't get set.
So IS.IPS(x) only gets set if PxIS and PxIE is set.
AHCI 1.3.1 section 10.7.1.1 First Tier (IS Register) also states:
"The bits in this register are read/write clear. It is set by the level of the virtual interrupt line being a set, and cleared by a write of '1' from the software."
So if IS.IPS(x) is set, you need to explicitly clear it by writing a 1 to IS.IPS(x) for that port.
Since PxIE is cleared, the only way to get an interrupt while the port is frozen, is if IS.IPS(x) is set, and the only way IS.IPS(x) can be set when the port is frozen, is if it was set before the port was frozen.
However, since commit 737dd811a3db ("ata: libahci: clear pending interrupt status"), we clear both PxIS and IS.IPS(x) after freezing the port, but before the COMRESET, so the problem that commit 1e641060c4b5 ("libata:
clear eh_info on reset completion") fixed can no longer happen.
Thus, revert commit 1e641060c4b5 ("libata: clear eh_info on reset completion"), so that the retry logic in ata_scsi_port_error_handler() works once again. (The retry logic is still needed, since we can still get an error IRQ _after_ the port has been thawed, but before ata_scsi_port_error_handler() takes the ap->lock in order to check if ATA_PFLAG_EH_PENDING is set.)
--- drivers/ata/libata-eh.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/ata/libata-eh.c +3 -10
@@ -2703,18 +2703,11 @@ int ata_eh_reset(struct ata_link *link, int classify,postreset (slave, classes); } -/* -* Some controllers can't be frozen very well and may set spurious -* error conditions during reset. Clear accumulated error -* information and re-thaw the port if frozen. As reset is the -* final recovery action and we cross check link onlineness against -* device classification later, no hotplug event is lost by this. -*/ +/* clear cached SError */ spin_lock_irqsave (link->ap->lock, flags); -memset (&link->eh_info,0 ,sizeof (link->eh_info)); + link->eh_info.serror =0 ;if (slave) -memset (&slave->eh_info,0 ,sizeof (link->eh_info)); - ap->pflags &= ~ATA_PFLAG_EH_PENDING ; + slave->eh_info.serror =0 ;spin_unlock_irqrestore (link->ap->lock, flags);if (ap->pflags &ATA_PFLAG_FROZEN )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 122/226 spi: nxp-fspi: reset the FLSHxCR1 registers
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Han Xu <[email protected]>
[ Upstream commit 18495676f7886e105133f1dc06c1d5e8d5436f32 ]
Reset the FLSHxCR1 registers to default value. ROM may set the register value and it affects the SPI NAND normal functions.
--- drivers/spi/spi-nxp-fspi.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/spi/spi-nxp-fspi.c +7 -0
@@ -950,6 +950,13 @@ static int nxp_fspi_default_setup(struct nxp_fspi *f)fspi_writel (f,FSPI_AHBCR_PREF_EN |FSPI_AHBCR_RDADDROPT , base +FSPI_AHBCR ); +/* Reset the FLSHxCR1 registers. */ + reg =FSPI_FLSHXCR1_TCSH (0x3 ) |FSPI_FLSHXCR1_TCSS (0x3 ); +fspi_writel (f, reg, base +FSPI_FLSHA1CR1 ); +fspi_writel (f, reg, base +FSPI_FLSHA2CR1 ); +fspi_writel (f, reg, base +FSPI_FLSHB1CR1 ); +fspi_writel (f, reg, base +FSPI_FLSHB2CR1 ); +/* AHB Read - Set lut sequence ID for all CS. */ fspi_writel (f,SEQID_LUT , base +FSPI_FLSHA1CR2 );fspi_writel (f,SEQID_LUT , base +FSPI_FLSHA2CR2 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 123/226 bpf: Clarify error expectations from bpf_clone_redirect
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislav Fomichev <[email protected]>
[ Upstream commit 7cb779a6867fea00b4209bcf6de2f178a743247d ]
Commit 151e887d8ff9 ("veth: Fixing transmit return status for dropped packets") exposed the fact that bpf_clone_redirect is capable of returning raw NET_XMIT_XXX return codes.
This is in the conflict with its UAPI doc which says the following:
"0 on success, or a negative error in case of failure."
Update the UAPI to reflect the fact that bpf_clone_redirect can return positive error numbers, but don't explicitly define their meaning.
--- include/uapi/linux/bpf.h | 4 +++- tools/include/uapi/linux/bpf.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
include/uapi/linux/bpf.h +3 -1
@@ -976,7 +976,9 @@ union bpf_attr {* performed again, if the helper is used in combination with * direct packet access. * Return -* 0 on success, or a negative error in case of failure. +* 0 on success, or a negative error in case of failure. Positive +* error indicates a potential drop or congestion in the target +* device. The particular positive error codes are not defined. * * u64 bpf_get_current_pid_tgid(void) * Return
tools/include/uapi/linux/bpf.h +3 -1
@@ -976,7 +976,9 @@ union bpf_attr {* performed again, if the helper is used in combination with * direct packet access. * Return -* 0 on success, or a negative error in case of failure. +* 0 on success, or a negative error in case of failure. Positive +* error indicates a potential drop or congestion in the target +* device. The particular positive error codes are not defined. * * u64 bpf_get_current_pid_tgid(void) * Return
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 124/226 media: vb2: frame_vector.c: replace WARN_ONCE with a comment
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
[ Upstream commit 735de5caf79e06cc9fb96b1b4f4974674ae3e917 ]
The WARN_ONCE was issued also in cases that had nothing to do with VM_IO (e.g. if the start address was just a random value and uaccess fails with -EFAULT).
There are no reports of WARN_ONCE being issued for actual VM_IO cases, so just drop it and instead add a note to the comment before the function.
--- mm/frame_vector.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
mm/frame_vector.c +4 -2
@@ -29,6 +29,10 @@* different type underlying the specified range of virtual addresses. * When the function isn't able to map a single page, it returns error. * +* Note that get_vaddr_frames() cannot follow VM_IO mappings. It used +* to be able to do that, but that could (racily) return non-refcounted +* pfns. +* * This function takes care of grabbing mmap_lock as necessary. */ int get_vaddr_frames(unsigned long start, unsigned int nr_frames,
@@ -77,8 +81,6 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, goto out; } -/* This used to (racily) return non-refcounted pfns. Let people know */ -WARN_ONCE (1 ,"get_vaddr_frames() cannot follow VM_IO mapping" ); vec->nr_frames =0 ; out:
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 125/226 powerpc/watchpoints: Disable preemption in thread_change_pc()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Gray <[email protected]>
[ Upstream commit cc879ab3ce39bc39f9b1d238b283f43a5f6f957d ]
thread_change_pc() uses CPU local data, so must be protected from swapping CPUs while it is reading the breakpoint struct.
The error is more noticeable after 1e60f3564bad ("powerpc/watchpoints:
Track perf single step directly on the breakpoint"), which added an unconditional __this_cpu_read() call in thread_change_pc(). However the existing __this_cpu_read() that runs if a breakpoint does need to be re-inserted has the same issue.
--- arch/powerpc/kernel/hw_breakpoint.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/powerpc/kernel/hw_breakpoint.c +6 -1
@@ -479,11 +479,13 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs)struct arch_hw_breakpoint *info;int i; +preempt_disable (); +for (i =0 ; i <nr_wp_slots (); i++) {if (unlikely (tsk->thread.last_hit_ubp[i])) goto reset; } -return ; + goto out; reset: regs->msr &= ~MSR_SE ;
@@ -492,6 +494,9 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs)__set_breakpoint (i, info); tsk->thread.last_hit_ubp[i] =NULL ; } + +out: +preempt_enable (); }static bool is_larx_stcx_instr (int type)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 126/226 ncsi: Propagate carrier gain/loss events to the NCSI controller
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johnathan Mantey <[email protected]>
[ Upstream commit 3780bb29311eccb7a1c9641032a112eed237f7e3 ]
Report the carrier/no-carrier state for the network interface shared between the BMC and the passthrough channel. Without this functionality the BMC is unable to reconfigure the NIC in the event of a re-cabling to a different subnet.
--- net/ncsi/ncsi-aen.c | 5 +++++ 1 file changed, 5 insertions(+)
net/ncsi/ncsi-aen.c +5 -0
@@ -89,6 +89,11 @@ static int ncsi_aen_handler_lsc(struct ncsi_dev_priv *ndp,if ((had_link == has_link) || chained)return 0 ; +if (had_link) +netif_carrier_off (ndp->ndev.dev); +else +netif_carrier_on (ndp->ndev.dev); +if (!ndp->multi_package && !nc->package->multi_channel) {if (had_link) { ndp->flags |=NCSI_DEV_RESHUFFLE ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 127/226 fbdev/sh7760fb: Depend on FB=y
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit f75f71b2c418a27a7c05139bb27a0c83adf88d19 ]
Fix linker error if FB=m about missing fb_io_read and fb_io_write. The linker's error message suggests that this config setting has already been broken for other symbols.
All errors (new ones prefixed by >>):
sh4-linux-ld: drivers/video/fbdev/sh7760fb.o: in function `sh7760fb_probe':
sh7760fb.c:(.text+0x374): undefined reference to `framebuffer_alloc'
sh4-linux-ld: sh7760fb.c:(.text+0x394): undefined reference to `fb_videomode_to_var'
sh4-linux-ld: sh7760fb.c:(.text+0x39c): undefined reference to `fb_alloc_cmap'
sh4-linux-ld: sh7760fb.c:(.text+0x3a4): undefined reference to `register_framebuffer'
sh4-linux-ld: sh7760fb.c:(.text+0x3ac): undefined reference to `fb_dealloc_cmap'
sh4-linux-ld: sh7760fb.c:(.text+0x434): undefined reference to `framebuffer_release'
sh4-linux-ld: drivers/video/fbdev/sh7760fb.o: in function `sh7760fb_remove':
sh7760fb.c:(.text+0x800): undefined reference to `unregister_framebuffer'
sh4-linux-ld: sh7760fb.c:(.text+0x804): undefined reference to `fb_dealloc_cmap'
sh4-linux-ld: sh7760fb.c:(.text+0x814): undefined reference to `framebuffer_release'Quoted 2 lines
Quoted 2 lines
sh4-linux-ld: drivers/video/fbdev/sh7760fb.o:(.rodata+0xc): undefined reference to `fb_io_read'
sh4-linux-ld: drivers/video/fbdev/sh7760fb.o:(.rodata+0x10): undefined reference to `fb_io_write'
sh4-linux-ld: drivers/video/fbdev/sh7760fb.o:(.rodata+0x2c): undefined reference to `cfb_fillrect'
sh4-linux-ld: drivers/video/fbdev/sh7760fb.o:(.rodata+0x30): undefined reference to `cfb_copyarea'
sh4-linux-ld: drivers/video/fbdev/sh7760fb.o:(.rodata+0x34): undefined reference to `cfb_imageblit'--- drivers/video/fbdev/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/Kconfig +1 -1
@@ -2014,7 +2014,7 @@ config FB_COBALT config FB_SH7760 bool "SH7760/SH7763/SH7720/SH7721 LCDC support" - depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \ + depends on FB=y && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \ || CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721) select FB_CFB_FILLRECT select FB_CFB_COPYAREA
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 128/226 perf build: Define YYNOMEM as YYNOABORT for bison < 3.81
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 88cc47e24597971b05b6e94c28a2fc81d2a8d61a ]
YYNOMEM was introduced in bison 3.81, so define it as YYABORT for older versions, which should provide the previous perf behaviour.
--- tools/perf/util/Build | 6 ++++++ 1 file changed, 6 insertions(+)
tools/perf/util/Build +6 -0
@@ -253,6 +253,12 @@ ifeq ($(BISON_GE_35),1) else bison_flags += -w endif + +BISON_LT_381 := $(shell expr $(shell $(BISON) --version | grep bison | sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \< 381) +ifeq ($(BISON_LT_381),1) + bison_flags += -DYYNOMEM=YYABORT +endif + CFLAGS_parse-events-bison.o += $(bison_flags) CFLAGS_pmu-bison.o += -DYYLTYPE_IS_TRIVIAL=0 $(bison_flags) CFLAGS_expr-bison.o += -DYYLTYPE_IS_TRIVIAL=0 $(bison_flags)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 129/226 sched/cpuacct: Fix user/system in shown cpuacct.usage*
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Ryabinin <[email protected]>
commit dd02d4234c9a2214a81c57a16484304a1a51872a upstream.
cpuacct has 2 different ways of accounting and showing user and system times.
The first one uses cpuacct_account_field() to account times and cpuacct.stat file to expose them. And this one seems to work ok.
The second one is uses cpuacct_charge() function for accounting and set of cpuacct.usage* files to show times. Despite some attempts to fix it in the past it still doesn't work. Sometimes while running KVM guest the cpuacct_charge() accounts most of the guest time as system time. This doesn't match with user&system times shown in cpuacct.stat or proc/<pid>/stat.
Demonstration:
# git clone https://github.com/aryabinin/kvmsample # make # mkdir /sys/fs/cgroup/cpuacct/test # echo $$ > /sys/fs/cgroup/cpuacct/test/tasks # ./kvmsample & # for i in {1..5}; do cat /sys/fs/cgroup/cpuacct/test/cpuacct.usage_sys; sleep 1; done 1976535645 2979839428 3979832704 4983603153 5983604157
Use cpustats accounted in cpuacct_account_field() as the source of user/sys times for cpuacct.usage* files. Make cpuacct_charge() to account only summary execution time.
--- kernel/sched/cpuacct.c | 79 +++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 47 deletions(-)
kernel/sched/cpuacct.c +32 -47
@@ -21,15 +21,11 @@ static const char * const cpuacct_stat_desc[] = { [CPUACCT_STAT_SYSTEM] = "system", }; -struct cpuacct_usage { -u64 usages[CPUACCT_STAT_NSTATS ]; -}; -/* track CPU usage of a group of tasks and its child groups */ struct cpuacct {struct cgroup_subsys_state css;/* cpuusage holds pointer to a u64-type object on every CPU */ -struct cpuacct_usage __percpu *cpuusage; +u64 __percpu *cpuusage;struct kernel_cpustat __percpu *cpustat; };
@@ -49,7 +45,7 @@ static inline struct cpuacct *parent_ca(struct cpuacct *ca)return css_ca (ca->css.parent); } -static DEFINE_PER_CPU(struct cpuacct_usage, root_cpuacct_cpuusage); +static DEFINE_PER_CPU(u64, root_cpuacct_cpuusage);static struct cpuacct root_cpuacct = { .cpustat = &kernel_cpustat, .cpuusage = &root_cpuacct_cpuusage,
@@ -68,7 +64,7 @@ cpuacct_css_alloc(struct cgroup_subsys_state *parent_css)if (!ca) goto out; - ca->cpuusage = alloc_percpu(struct cpuacct_usage); + ca->cpuusage =alloc_percpu (u64);if (!ca->cpuusage) goto out_free_ca;
@@ -99,7 +95,8 @@ static void cpuacct_css_free(struct cgroup_subsys_state *css)static u64 cpuacct_cpuusage_read (struct cpuacct *ca,int cpu,enum cpuacct_stat_index index) { -struct cpuacct_usage *cpuusage =per_cpu_ptr (ca->cpuusage, cpu); +u64 *cpuusage =per_cpu_ptr (ca->cpuusage, cpu); +u64 *cpustat =per_cpu_ptr (ca->cpustat, cpu)->cpustat;u64 data;/*
@@ -115,14 +112,17 @@ static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu,raw_spin_lock_irq (&cpu_rq (cpu)->lock);#endif -if (index ==CPUACCT_STAT_NSTATS ) { -int i =0 ; - - data =0 ; -for (i =0 ; i <CPUACCT_STAT_NSTATS ; i++) - data += cpuusage->usages[i]; - }else { - data = cpuusage->usages[index]; +switch (index) { +case CPUACCT_STAT_USER : + data = cpustat[CPUTIME_USER ] + cpustat[CPUTIME_NICE ]; +break ; +case CPUACCT_STAT_SYSTEM : + data = cpustat[CPUTIME_SYSTEM ] + cpustat[CPUTIME_IRQ ] + + cpustat[CPUTIME_SOFTIRQ ]; +break ; +case CPUACCT_STAT_NSTATS : + data = *cpuusage; +break ; }#ifndef CONFIG_64BIT
@@ -132,10 +132,14 @@ static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu,return data; } -static void cpuacct_cpuusage_write (struct cpuacct *ca,int cpu,u64 val) +static void cpuacct_cpuusage_write (struct cpuacct *ca,int cpu) { -struct cpuacct_usage *cpuusage =per_cpu_ptr (ca->cpuusage, cpu); -int i; +u64 *cpuusage =per_cpu_ptr (ca->cpuusage, cpu); +u64 *cpustat =per_cpu_ptr (ca->cpustat, cpu)->cpustat; + +/* Don't allow to reset global kernel_cpustat */ +if (ca == &root_cpuacct) +return ;#ifndef CONFIG_64BIT /*
@@ -143,9 +147,10 @@ static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val)*/ raw_spin_lock_irq (&cpu_rq (cpu)->lock);#endif - -for (i =0 ; i <CPUACCT_STAT_NSTATS ; i++) - cpuusage->usages[i] = val; + *cpuusage =0 ; + cpustat[CPUTIME_USER ] = cpustat[CPUTIME_NICE ] =0 ; + cpustat[CPUTIME_SYSTEM ] = cpustat[CPUTIME_IRQ ] =0 ; + cpustat[CPUTIME_SOFTIRQ ] =0 ;#ifndef CONFIG_64BIT raw_spin_unlock_irq (&cpu_rq (cpu)->lock);
@@ -196,7 +201,7 @@ static int cpuusage_write(struct cgroup_subsys_state *css, struct cftype *cft,return -EINVAL ;for_each_possible_cpu (cpu) -cpuacct_cpuusage_write (ca, cpu,0 ); +cpuacct_cpuusage_write (ca, cpu);return 0 ; }
@@ -243,25 +248,10 @@ static int cpuacct_all_seq_show(struct seq_file *m, void *V)seq_puts (m,"\n" );for_each_possible_cpu (cpu) { -struct cpuacct_usage *cpuusage =per_cpu_ptr (ca->cpuusage, cpu); -seq_printf (m,"%d" , cpu); - -for (index =0 ; index <CPUACCT_STAT_NSTATS ; index++) { -#ifndef CONFIG_64BIT -/* -* Take rq->lock to make 64-bit read safe on 32-bit -* platforms. -*/ -raw_spin_lock_irq (&cpu_rq (cpu)->lock); -#endif - -seq_printf (m," %llu" , cpuusage->usages[index]); - -#ifndef CONFIG_64BIT -raw_spin_unlock_irq (&cpu_rq (cpu)->lock); -#endif - } +for (index =0 ; index <CPUACCT_STAT_NSTATS ; index++) +seq_printf (m," %llu" , +cpuacct_cpuusage_read (ca, cpu, index));seq_puts (m,"\n" ); }return 0 ;
@@ -339,16 +329,11 @@ static struct cftype files[] = {void cpuacct_charge (struct task_struct *tsk,u64 cputime) {struct cpuacct *ca; -int index =CPUACCT_STAT_SYSTEM ; -struct pt_regs *regs =get_irq_regs () ? :task_pt_regs (tsk); - -if (regs &&user_mode (regs)) - index =CPUACCT_STAT_USER ;rcu_read_lock ();for (ca =task_ca (tsk); ca; ca =parent_ca (ca)) -__this_cpu_add (ca->cpuusage->usages[index], cputime); +__this_cpu_add (*ca->cpuusage, cputime);rcu_read_unlock (); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 130/226 sched/cpuacct: Fix charge percpu cpuusage
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengming Zhou <[email protected]>
commit 248cc9993d1cc12b8e9ed716cc3fc09f6c3517dd upstream.
The cpuacct_account_field() is always called by the current task itself, so it's ok to use __this_cpu_add() to charge the tick time.
But cpuacct_charge() maybe called by update_curr() in load_balance() on a random CPU, different from the CPU on which the task is running. So __this_cpu_add() will charge that cputime to a random incorrect CPU.
--- kernel/sched/cpuacct.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sched/cpuacct.c +2 -1
@@ -328,12 +328,13 @@ static struct cftype files[] = {*/ void cpuacct_charge (struct task_struct *tsk,u64 cputime) { +unsigned int cpu =task_cpu (tsk);struct cpuacct *ca;rcu_read_lock ();for (ca =task_ca (tsk); ca; ca =parent_ca (ca)) -__this_cpu_add (*ca->cpuusage, cputime); + *per_cpu_ptr (ca->cpuusage, cpu) += cputime;rcu_read_unlock (); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 131/226 sched/cpuacct: Optimize away RCU read lock
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengming Zhou <[email protected]>
commit dc6e0818bc9a0336d9accf3ea35d146d72aa7a18 upstream.
Since cpuacct_charge() is called from the scheduler update_curr(), we must already have rq lock held, then the RCU read lock can be optimized away.
And do the same thing in it's wrapper cgroup_account_cputime(), but we can't use lockdep_assert_rq_held() there, which defined in kernel/sched/sched.h.
--- include/linux/cgroup.h | 2 -- kernel/sched/cpuacct.c | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-)
include/linux/cgroup.h +0 -2
@@ -779,11 +779,9 @@ static inline void cgroup_account_cputime(struct task_struct *task,cpuacct_charge (task, delta_exec); -rcu_read_lock (); cgrp =task_dfl_cgroup (task);if (cgroup_parent (cgrp))__cgroup_account_cputime (cgrp, delta_exec); -rcu_read_unlock (); } static inline void cgroup_account_cputime_field(struct task_struct *task,
kernel/sched/cpuacct.c +1 -3
@@ -331,12 +331,10 @@ void cpuacct_charge(struct task_struct *tsk, u64 cputime)unsigned int cpu =task_cpu (tsk);struct cpuacct *ca; -rcu_read_lock (); +lockdep_assert_held (&cpu_rq (cpu)->lock);for (ca =task_ca (tsk); ca; ca =parent_ca (ca)) *per_cpu_ptr (ca->cpuusage, cpu) += cputime; - -rcu_read_unlock (); }/*
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 132/226 cgroup: Fix suspicious rcu_dereference_check() usage warning
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengming Zhou <[email protected]>
commit f2aa197e4794bf4c2c0c9570684f86e6fa103e8b upstream.
task_css_set_check() will use rcu_dereference_check() to check for rcu_read_lock_held() on the read-side, which is not true after commit dc6e0818bc9a ("sched/cpuacct: Optimize away RCU read lock"). This commit drop explicit rcu_read_lock(), change to RCU-sched read-side critical section. So fix the RCU warning by adding check for rcu_read_lock_sched_held().
--- include/linux/cgroup.h | 1 + 1 file changed, 1 insertion(+)
include/linux/cgroup.h +1 -0
@@ -451,6 +451,7 @@ extern struct mutex cgroup_mutex;extern spinlock_t css_set_lock;#define task_css_set_check (task, __c) \ rcu_dereference_check((task)->cgroups, \ + rcu_read_lock_sched_held() || \ lockdep_is_held(&cgroup_mutex) || \ lockdep_is_held(&css_set_lock) || \ ((task)->flags & PF_EXITING) || (__c))
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 133/226 ACPI: Check StorageD3Enable _DSD property in ACPI code
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 2744d7a0733503931b71c00d156119ced002f22c ]
Although first implemented for NVME, this check may be usable by other drivers as well. Microsoft's specification explicitly mentions that is may be usable by SATA and AHCI devices. Google also indicates that they have used this with SDHCI in a downstream kernel tree that a user can plug a storage device into.
Stable-dep-of: dad651b2a44e ("nvme-pci: do not set the NUMA node of device if it has none")
--- drivers/acpi/device_pm.c | 29 +++++++++++++++++++++++++++++ drivers/nvme/host/pci.c | 28 +--------------------------- include/linux/acpi.h | 5 +++++ 3 files changed, 35 insertions(+), 27 deletions(-)
drivers/acpi/device_pm.c +29 -0
@@ -1326,4 +1326,33 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) return 1; }EXPORT_SYMBOL_GPL (acpi_dev_pm_attach); + +/** +* acpi_storage_d3 - Check if D3 should be used in the suspend path +* @dev: Device to check +* +* Return %true if the platform firmware wants @dev to be programmed +* into D3hot or D3cold (if supported) in the suspend path, or %false +* when there is no specific preference. On some platforms, if this +* hint is ignored, @dev may remain unresponsive after suspending the +* platform as a whole. +* +* Although the property has storage in the name it actually is +* applied to the PCIe slot and plugging in a non-storage device the +* same platform restrictions will likely apply. +*/ +bool acpi_storage_d3 (struct device *dev) +{ +struct acpi_device *adev =ACPI_COMPANION (dev); +u8 val; + +if (!adev) +return false; +if (fwnode_property_read_u8 (acpi_fwnode_handle (adev),"StorageD3Enable" , + &val)) +return false; +return val ==1 ; +} +EXPORT_SYMBOL_GPL (acpi_storage_d3); +#endif /* CONFIG_PM */
drivers/nvme/host/pci.c +1 -27
@@ -2840,32 +2840,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev)return 0 ; } -#ifdef CONFIG_ACPI -static bool nvme_acpi_storage_d3 (struct pci_dev *dev) -{ -struct acpi_device *adev =ACPI_COMPANION (&dev->dev); -u8 val; - -/* -* Look for _DSD property specifying that the storage device on the port -* must use D3 to support deep platform power savings during -* suspend-to-idle. -*/ - -if (!adev) -return false; -if (fwnode_property_read_u8 (acpi_fwnode_handle (adev),"StorageD3Enable" , - &val)) -return false; -return val ==1 ; -} -#else -static inline bool nvme_acpi_storage_d3 (struct pci_dev *dev) -{ -return false; -} -#endif /* CONFIG_ACPI */ -static void nvme_async_probe (void *data,async_cookie_t cookie) {struct nvme_dev *dev = data;
@@ -2915,7 +2889,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) quirks |=check_vendor_combination_bug (pdev); -if (!noacpi &&nvme_acpi_storage_d3 (pdev)) { +if (!noacpi &&acpi_storage_d3 (&pdev->dev)) {/* * Some systems use a bios work around to ask for D3 on * platforms that support kernel managed suspend.
include/linux/acpi.h +5 -0
@@ -1001,6 +1001,7 @@ int acpi_dev_resume(struct device *dev);int acpi_subsys_runtime_suspend (struct device *dev);int acpi_subsys_runtime_resume (struct device *dev);int acpi_dev_pm_attach (struct device *dev,bool power_on); +bool acpi_storage_d3 (struct device *dev);#else static inline int acpi_subsys_runtime_suspend (struct device *dev) {return 0 ; }static inline int acpi_subsys_runtime_resume (struct device *dev) {return 0 ; }
@@ -1008,6 +1009,10 @@ static inline int acpi_dev_pm_attach(struct device *dev, bool power_on) {return 0 ; } +static inline bool acpi_storage_d3 (struct device *dev) +{ +return false; +}#endif #if defined(CONFIG_ACPI ) && defined(CONFIG_PM_SLEEP )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 134/226 nvme-pci: factor the iod mempool creation into a helper
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 081a7d958ce4b65f9aab6e70e65b0b2e0b92297c ]
Add a helper to create the iod mempool.
Tested-by Gerd Bayer <[email protected]>
Stable-dep-of: dad651b2a44e ("nvme-pci: do not set the NUMA node of device if it has none")
--- drivers/nvme/host/pci.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-)
drivers/nvme/host/pci.c +18 -23
@@ -387,14 +387,6 @@ static int nvme_pci_npages_sgl(void) NVME_CTRL_PAGE_SIZE); } -static size_t nvme_pci_iod_alloc_size (void ) -{ -size_t npages =max (nvme_pci_npages_prp (),nvme_pci_npages_sgl ()); - -return sizeof (__le64 *) * npages + -sizeof (struct scatterlist ) *NVME_MAX_SEGS ; -} -static int nvme_admin_init_hctx (struct blk_mq_hw_ctx *hctx,void *data,unsigned int hctx_idx) {
@@ -2557,6 +2549,22 @@ static void nvme_release_prp_pools(struct nvme_dev *dev)dma_pool_destroy (dev->prp_small_pool); } +static int nvme_pci_alloc_iod_mempool (struct nvme_dev *dev) +{ +size_t npages =max (nvme_pci_npages_prp (),nvme_pci_npages_sgl ()); +size_t alloc_size =sizeof (__le64 *) * npages + +sizeof (struct scatterlist ) *NVME_MAX_SEGS ; + +WARN_ON_ONCE (alloc_size >PAGE_SIZE ); + dev->iod_mempool =mempool_create_node (1 , + mempool_kmalloc, mempool_kfree, + (void *)alloc_size,GFP_KERNEL , +dev_to_node (dev->dev)); +if (!dev->iod_mempool) +return -ENOMEM ; +return 0 ; +} +static void nvme_free_tagset (struct nvme_dev *dev) {if (dev->tagset.tags)
@@ -2854,7 +2862,6 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)int node, result = -ENOMEM ;struct nvme_dev *dev;unsigned long quirks = id->driver_data; -size_t alloc_size; node =dev_to_node (&pdev->dev);if (node ==NUMA_NO_NODE )
@@ -2899,21 +2906,9 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) quirks |=NVME_QUIRK_SIMPLE_SUSPEND ; } -/* -* Double check that our mempool alloc size will cover the biggest -* command we support. -*/ - alloc_size =nvme_pci_iod_alloc_size (); -WARN_ON_ONCE (alloc_size >PAGE_SIZE ); - - dev->iod_mempool =mempool_create_node (1 , mempool_kmalloc, - mempool_kfree, - (void *) alloc_size, -GFP_KERNEL , node); -if (!dev->iod_mempool) { - result = -ENOMEM ; + result =nvme_pci_alloc_iod_mempool (dev); +if (result) goto release_pools; - } result =nvme_init_ctrl (&dev->ctrl, &pdev->dev, &nvme_pci_ctrl_ops, quirks);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 135/226 nvme-pci: factor out a nvme_pci_alloc_dev helper
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 2e87570be9d2746e7c4e7ab1cc18fd3ca7de2768 ]
Add a helper that allocates the nvme_dev structure up to the point where we can call nvme_init_ctrl. This pairs with the free_ctrl method and can thus be used to cleanup the teardown path and make it more symmetric.
Note that this now calls nvme_init_ctrl a lot earlier during probing, which also means the per-controller character device shows up earlier. Due to the controller state no commnds can be send on it, but it might make sense to delay the cdev registration until nvme_init_ctrl_finish.
Tested-by Gerd Bayer <[email protected]>
Stable-dep-of: dad651b2a44e ("nvme-pci: do not set the NUMA node of device if it has none")
--- drivers/nvme/host/pci.c | 81 +++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 35 deletions(-)
drivers/nvme/host/pci.c +46 -35
@@ -2572,6 +2572,7 @@ static void nvme_free_tagset(struct nvme_dev *dev) dev->ctrl.tagset =NULL ; } +/* pairs with nvme_pci_alloc_dev */ static void nvme_pci_free_ctrl (struct nvme_ctrl *ctrl) {struct nvme_dev *dev =to_nvme_dev (ctrl);
@@ -2857,19 +2858,23 @@ static void nvme_async_probe(void *data, async_cookie_t cookie)nvme_put_ctrl (&dev->ctrl); } -static int nvme_probe (struct pci_dev *pdev,const struct pci_device_id *id) +static struct nvme_dev *nvme_pci_alloc_dev (struct pci_dev *pdev, +const struct pci_device_id *id) { -int node, result = -ENOMEM ; -struct nvme_dev *dev;unsigned long quirks = id->driver_data; +int node =dev_to_node (&pdev->dev); +struct nvme_dev *dev; +int ret = -ENOMEM ; - node =dev_to_node (&pdev->dev);if (node ==NUMA_NO_NODE )set_dev_node (&pdev->dev, first_memory_node); dev =kzalloc_node (sizeof (*dev),GFP_KERNEL , node);if (!dev) -return -ENOMEM ; +return NULL ; +INIT_WORK (&dev->ctrl.reset_work, nvme_reset_work); +INIT_WORK (&dev->remove_work, nvme_remove_dead_ctrl_work); +mutex_init (&dev->shutdown_lock); dev->nr_write_queues = write_queues; dev->nr_poll_queues = poll_queues;
@@ -2877,25 +2882,11 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) dev->queues =kcalloc_node (dev->nr_allocated_queues,sizeof (struct nvme_queue ),GFP_KERNEL , node);if (!dev->queues) - goto free; + goto out_free_dev; dev->dev =get_device (&pdev->dev); -pci_set_drvdata (pdev, dev); - - result =nvme_dev_map (dev); -if (result) - goto put_pci; - -INIT_WORK (&dev->ctrl.reset_work, nvme_reset_work); -INIT_WORK (&dev->remove_work, nvme_remove_dead_ctrl_work); -mutex_init (&dev->shutdown_lock); - - result =nvme_setup_prp_pools (dev); -if (result) - goto unmap; quirks |=check_vendor_combination_bug (pdev); -if (!noacpi &&acpi_storage_d3 (&pdev->dev)) {/* * Some systems use a bios work around to ask for D3 on
@@ -2905,34 +2896,54 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) "platform quirk: setting simple suspend\n"); quirks |=NVME_QUIRK_SIMPLE_SUSPEND ; } + ret =nvme_init_ctrl (&dev->ctrl, &pdev->dev, &nvme_pci_ctrl_ops, + quirks); +if (ret) + goto out_put_device; +return dev; - result =nvme_pci_alloc_iod_mempool (dev); +out_put_device: +put_device (dev->dev); +kfree (dev->queues); +out_free_dev: +kfree (dev); +return ERR_PTR (ret); +} + +static int nvme_probe (struct pci_dev *pdev,const struct pci_device_id *id) +{ +struct nvme_dev *dev; +int result = -ENOMEM ; + + dev =nvme_pci_alloc_dev (pdev, id); +if (!dev) +return -ENOMEM ; + + result =nvme_dev_map (dev);if (result) - goto release_pools; + goto out_uninit_ctrl; - result =nvme_init_ctrl (&dev->ctrl, &pdev->dev, &nvme_pci_ctrl_ops, - quirks); + result =nvme_setup_prp_pools (dev); +if (result) + goto out_dev_unmap; + + result =nvme_pci_alloc_iod_mempool (dev);if (result) - goto release_mempool; + goto out_release_prp_pools;dev_info (dev->ctrl.device,"pci function %s\n" ,dev_name (&pdev->dev)); +pci_set_drvdata (pdev, dev);nvme_reset_ctrl (&dev->ctrl);async_schedule (nvme_async_probe, dev); -return 0 ; - release_mempool: -mempool_destroy (dev->iod_mempool); - release_pools: +out_release_prp_pools:nvme_release_prp_pools (dev); - unmap: +out_dev_unmap:nvme_dev_unmap (dev); - put_pci: -put_device (dev->dev); - free: -kfree (dev->queues); -kfree (dev); +out_uninit_ctrl: +nvme_uninit_ctrl (&dev->ctrl);return result; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 136/226 nvme-pci: do not set the NUMA node of device if it has none
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pratyush Yadav <[email protected]>
[ Upstream commit dad651b2a44eb6b201738f810254279dca29d30d ]
If a device has no NUMA node information associated with it, the driver puts the device in node first_memory_node (say node 0). Not having a NUMA node and being associated with node 0 are completely different things and it makes little sense to mix the two.
--- drivers/nvme/host/pci.c | 3 --- 1 file changed, 3 deletions(-)
drivers/nvme/host/pci.c +0 -3
@@ -2866,9 +2866,6 @@ static struct nvme_dev *nvme_pci_alloc_dev(struct pci_dev *pdev,struct nvme_dev *dev;int ret = -ENOMEM ; -if (node ==NUMA_NO_NODE ) -set_dev_node (&pdev->dev, first_memory_node); - dev =kzalloc_node (sizeof (*dev),GFP_KERNEL , node);if (!dev)return NULL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 137/226 watchdog: iTCO_wdt: No need to stop the timer in probe
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mika Westerberg <[email protected]>
commit 1ae3e78c08209ac657c59f6f7ea21bbbd7f6a1d4 upstream.
The watchdog core can handle pinging of the watchdog before userspace opens the device. For this reason instead of stopping the timer, just mark it as running and let the watchdog core take care of it.
--- drivers/watchdog/iTCO_wdt.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/watchdog/iTCO_wdt.c +11 -2
@@ -426,6 +426,16 @@ static unsigned int iTCO_wdt_get_timeleft(struct watchdog_device *wd_dev)return time_left; } +static void iTCO_wdt_set_running (struct iTCO_wdt_private *p) +{ +u16 val; + +/* Bit 11: TCO Timer Halt -> 0 = The TCO timer is * enabled */ + val =inw (TCO1_CNT (p)); +if (!(val &BIT (11 ))) +set_bit (WDOG_HW_RUNNING , &p->wddev.status); +} +/* * Kernel Interfaces */
@@ -568,8 +578,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev)watchdog_set_drvdata (&p->wddev, p);platform_set_drvdata (pdev, p); -/* Make sure the watchdog is not running */ -iTCO_wdt_stop (&p->wddev); +iTCO_wdt_set_running (p);/* Check that the heartbeat value is within it's range; if not reset to the default */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 138/226 watchdog: iTCO_wdt: Set NO_REBOOT if the watchdog is not already running
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mika Westerberg <[email protected]>
commit ef9b7bf52c2f47f0a9bf988543c577b92c92d15e upstream.
Daniel reported that the commit 1ae3e78c0820 ("watchdog: iTCO_wdt: No need to stop the timer in probe") makes QEMU implementation of the iTCO watchdog not to trigger reboot anymore when NO_REBOOT flag is initially cleared using this option (in QEMU command line):
-global ICH9-LPC.noreboot=false
The problem with the commit is that it left the unconditional setting of NO_REBOOT that is not cleared anymore when the kernel keeps pinging the watchdog (as opposed to the previous code that called iTCO_wdt_stop() that cleared it).
Fix this so that we only set NO_REBOOT if the watchdog was not initially running.
--- drivers/watchdog/iTCO_wdt.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/watchdog/iTCO_wdt.c +14 -7
@@ -426,14 +426,18 @@ static unsigned int iTCO_wdt_get_timeleft(struct watchdog_device *wd_dev)return time_left; } -static void iTCO_wdt_set_running (struct iTCO_wdt_private *p) +/* Returns true if the watchdog was running */ +static bool iTCO_wdt_set_running (struct iTCO_wdt_private *p) {u16 val; -/* Bit 11: TCO Timer Halt -> 0 = The TCO timer is * enabled */ +/* Bit 11: TCO Timer Halt -> 0 = The TCO timer is enabled */ val =inw (TCO1_CNT (p)); -if (!(val &BIT (11 ))) +if (!(val &BIT (11 ))) {set_bit (WDOG_HW_RUNNING , &p->wddev.status); +return true; + } +return false; }/*
@@ -524,9 +528,6 @@ static int iTCO_wdt_probe(struct platform_device *pdev)return -ENODEV ;/* Cannot reset NO_REBOOT bit */ } -/* Set the NO_REBOOT bit to prevent later reboots, just for sure */ - p->update_no_reboot_bit (p->no_reboot_priv, true); -if (turn_SMI_watchdog_clear_off >= p->iTCO_version) {/* * Bit 13: TCO_EN -> 0
@@ -578,7 +579,13 @@ static int iTCO_wdt_probe(struct platform_device *pdev)watchdog_set_drvdata (&p->wddev, p);platform_set_drvdata (pdev, p); -iTCO_wdt_set_running (p); +if (!iTCO_wdt_set_running (p)) { +/* +* If the watchdog was not running set NO_REBOOT now to +* prevent later reboots. +*/ + p->update_no_reboot_bit (p->no_reboot_priv, true); + }/* Check that the heartbeat value is within it's range; if not reset to the default */
Signature · 1 line
2.40.1