5.10.188-rc1 review
Subsystems (10)
Greg Kroah-Hartman
maintainercover 5.10.188-rc1 review
This is the start of the stable review cycle for the 5.10.188 release. There are 509 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 Thu, 27 Jul 2023 10:44:26 +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.188-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.188-rc1
Zheng Yejian <[email protected]>
ftrace: Fix possible warning on checking all pages used in ftrace_process_locs()
Linus Torvalds <[email protected]>
ftrace: Store the order of pages allocated in ftrace_page
Zheng Yejian <[email protected]>
tracing: Fix memory leak of iter->temp when reading trace_pipe
Mohamed Khalfella <[email protected]>
tracing/histograms: Return an error if we fail to add histogram to hist_vars list
Vladimir Oltean <[email protected]>
net: phy: prevent stale pointer dereference in phy_init()
Eric Dumazet <[email protected]>
tcp: annotate data-races around fastopenq.max_qlen
Eric Dumazet <[email protected]>
tcp: annotate data-races around icsk->icsk_user_timeout
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->notsent_lowat
Eric Dumazet <[email protected]>
tcp: annotate data-races around rskq_defer_accept
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->linger2
Eric Dumazet <[email protected]>
tcp: annotate data-races around icsk->icsk_syn_retries
Kuniyuki Iwashima <[email protected]>
tcp: Fix data-races around sysctl_tcp_syn(ack)?_retries.
Kuniyuki Iwashima <[email protected]>
net: Introduce net.ipv4.tcp_migrate_req.
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->keepalive_probes
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->keepalive_intvl
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->keepalive_time
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->tcp_tx_delay
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: skip bound chain on rule flush
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: skip bound chain in netns release path
Florian Westphal <[email protected]>
netfilter: nft_set_pipapo: fix improper element removal
Florian Westphal <[email protected]>
netfilter: nf_tables: can't schedule in nft_chain_validate
Florian Westphal <[email protected]>
netfilter: nf_tables: fix spurious set element insertion failure
Kuniyuki Iwashima <[email protected]>
llc: Don't drop packet from non-root netns.
Zhang Shurong <[email protected]>
fbdev: au1200fb: Fix missing IRQ check in au1200fb_drv_probe
Kuniyuki Iwashima <[email protected]>
Revert "tcp: avoid the lookup process failing to get sk in ehash table"
Yuanjun Gong <[email protected]>
net:ipv6: check return value of pskb_trim()
Wang Ming <[email protected]>
net: ipv4: Use kfree_sensitive instead of kfree
Eric Dumazet <[email protected]>
tcp: annotate data-races around tcp_rsk(req)->ts_recent
Geetha sowjanya <[email protected]>
octeontx2-pf: Dont allocate BPIDs for LBK interfaces
Jiapeng Chong <[email protected]>
security: keys: Modify mismatched function name
Ding Hui <[email protected]>
iavf: Fix out-of-bounds when setting channels on remove
Ding Hui <[email protected]>
iavf: Fix use-after-free in free_netdev
Kuniyuki Iwashima <[email protected]>
bridge: Add extack warning when enabling STP in netns.
Tanmay Patil <[email protected]>
net: ethernet: ti: cpsw_ale: Fix cpsw_ale_get_field()/cpsw_ale_set_field()
Mario Limonciello <[email protected]>
pinctrl: amd: Use amd_pinconf_set() for all config options
Martin Kaiser <[email protected]>
fbdev: imxfb: warn about invalid left/right margin
Jonas Gorski <[email protected]>
spi: bcm63xx: fix max prepend length
Ying Hsu <[email protected]>
igb: Fix igb_down hung on surprise removal
Johannes Berg <[email protected]>
wifi: iwlwifi: mvm: avoid baid size integer overflow
Gustavo A. R. Silva <[email protected]>
wifi: wext-core: Fix -Wstringop-overflow warning in ioctl_standard_iw_point()
Petr Oros <[email protected]>
devlink: report devlink_port_type_warn source device
Martin KaFai Lau <[email protected]>
bpf: Address KCSAN report on bpf_lru_list
Maxime Bizon <[email protected]>
wifi: ath11k: fix registration of 6Ghz-only phy without the full channel range
Yicong Yang <[email protected]>
sched/fair: Don't balance task to its current running CPU
Mark Rutland <[email protected]>
arm64: mm: fix VA-range sanity check
Youngmin Nam <[email protected]>
arm64: set __exception_irq_entry with __irq_entry as a default
Hans de Goede <[email protected]>
ACPI: video: Add backlight=native DMI quirk for Lenovo ThinkPad X131e (3371 AMD version)
Hans de Goede <[email protected]>
ACPI: video: Add backlight=native DMI quirk for Apple iMac11,3
Hans de Goede <[email protected]>
ACPI: button: Add lid disable DMI quirk for Nextbook Ares 8A
David Sterba <[email protected]>
btrfs: add xxhash to fast checksum implementations
Thomas Gleixner <[email protected]>
posix-timers: Ensure timer ID search-loop limit is valid
Yu Kuai <[email protected]>
md/raid10: prevent soft lockup while flush writes
Yu Kuai <[email protected]>
md: fix data corruption for raid456 when reshape restart while grow up
Zhong Jinghua <[email protected]>
nbd: Add the maximum limit of allocated index in nbd_dev_add
Tetsuo Handa <[email protected]>
debugobjects: Recheck debug_objects_enabled before reporting
Eric Whitney <[email protected]>
ext4: correct inline offset when handling xattrs in inode body
Matus Gajdos <[email protected]>
ASoC: fsl_sai: Disable bit clock with transmitter
Jocelyn Falempe <[email protected]>
drm/client: Fix memory leak in drm_client_modeset_probe
Jocelyn Falempe <[email protected]>
drm/client: Fix memory leak in drm_client_target_cloned
YueHaibing <[email protected]>
can: bcm: Fix UAF in bcm_proc_show()
Mark Brown <[email protected]>
regmap: Account for register length in SMBus I/O limits
Mark Brown <[email protected]>
regmap: Drop initial version of maximum transfer length fixes
Matthieu Baerts <[email protected]>
selftests: tc: add 'ct' action kconfig dep
Matthieu Baerts <[email protected]>
selftests: tc: set timeout to 15 minutes
Miklos Szeredi <[email protected]>
fuse: revalidate: don't invalidate if interrupted
Filipe Manana <[email protected]>
btrfs: fix warning when putting transaction with qgroups enabled after abort
Georg Müller <[email protected]>
perf probe: Add test for regression introduced by switch to die_get_decl_file()
Petr Pavlu <[email protected]>
keys: Fix linking a duplicate key to a keyring's assoc_array
Luka Guzenko <[email protected]>
ALSA: hda/realtek: Enable Mute LED on HP Laptop 15s-eq2xxx
Kailang Yang <[email protected]>
ALSA: hda/realtek - remove 3k pull low procedure
Daniel Vetter <[email protected]>
drm/atomic: Fix potential use-after-free in nonblocking commits
Jason Gunthorpe <[email protected]>
RDMA/cma: Ensure rdma_addr_cancel() happens before issuing more requests
Pedro Tammela <[email protected]>
net/sched: sch_qfq: reintroduce lmax bound check for MTU
Manish Rangankar <[email protected]>
scsi: qla2xxx: Remove unused nvme_ls_waitq wait queue
Shreyas Deodhar <[email protected]>
scsi: qla2xxx: Pointer may be dereferenced
Bikash Hazarika <[email protected]>
scsi: qla2xxx: Correct the index of array
Nilesh Javali <[email protected]>
scsi: qla2xxx: Check valid rport returned by fc_bsg_to_rport()
Bikash Hazarika <[email protected]>
scsi: qla2xxx: Fix potential NULL pointer dereference
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix buffer overrun
Nilesh Javali <[email protected]>
scsi: qla2xxx: Array index may go out of bound
Quinn Tran <[email protected]>
scsi: qla2xxx: Wait for io return on terminate rport
Masami Hiramatsu (Google) <[email protected]>
tracing/probes: Fix not to count error code to total length
Mateusz Stachyra <[email protected]>
tracing: Fix null pointer dereference in tracing_err_log_open()
Max Filippov <[email protected]>
xtensa: ISS: fix call to split_if_spec
Zheng Yejian <[email protected]>
ring-buffer: Fix deadloop issue on reading trace_pipe
Krister Johansen <[email protected]>
net: ena: fix shift-out-of-bounds in exponential backoff
Florent Revest <[email protected]>
samples: ftrace: Save required argument registers in sample trampolines
Mohamed Khalfella <[email protected]>
tracing/histograms: Add histograms to hist_vars if they have referenced variables
Heiko Carstens <[email protected]>
s390/decompressor: fix misaligned symbol build error
Jiaqing Zhao <[email protected]>
Revert "8250: add support for ASIX devices with a FIFO bug"
George Stark <[email protected]>
meson saradc: fix clock divider mask length
Weitao Wang <[email protected]>
xhci: Show ZHAOXIN xHCI root hub speed correctly
Weitao Wang <[email protected]>
xhci: Fix TRB prefetch issue of ZHAOXIN hosts
Weitao Wang <[email protected]>
xhci: Fix resume issue of some ZHAOXIN hosts
Xiubo Li <[email protected]>
ceph: don't let check_caps skip sending responses for revoke msgs
Christophe JAILLET <[email protected]>
firmware: stratix10-svc: Fix a potential resource leak in svc_create_memory_pool()
Christophe JAILLET <[email protected]>
tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() when iterating clk
Christophe JAILLET <[email protected]>
tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() in case of error
Dan Carpenter <[email protected]>
serial: atmel: don't enable IRQs prematurely
Mario Limonciello <[email protected]>
drm/amd/display: Correct DMUB_FW_VERSION macro
Brian Norris <[email protected]>
drm/rockchip: vop: Leave vblank enabled in self-refresh
Brian Norris <[email protected]>
drm/atomic: Allow vblank-enabled + self-refresh "disable"
Alexander Aring <[email protected]>
fs: dlm: return positive pid value for F_GETLK
Jason Baron <[email protected]>
md/raid0: add discard support for the 'original' layout
Damien Le Moal <[email protected]>
misc: pci_endpoint_test: Re-init completion for every test
Damien Le Moal <[email protected]>
misc: pci_endpoint_test: Free IRQs before removing the device
Damien Le Moal <[email protected]>
PCI: rockchip: Set address alignment for endpoint mode
Rick Wertenbroek <[email protected]>
PCI: rockchip: Use u32 variable to access 32-bit registers
Rick Wertenbroek <[email protected]>
PCI: rockchip: Fix legacy IRQ generation for RK3399 PCIe endpoint core
Rick Wertenbroek <[email protected]>
PCI: rockchip: Add poll and timeout to wait for PHY PLLs to be locked
Rick Wertenbroek <[email protected]>
PCI: rockchip: Write PCI Device ID to correct register
Rick Wertenbroek <[email protected]>
PCI: rockchip: Assert PCI Configuration Enable bit after probe
Manivannan Sadhasivam <[email protected]>
PCI: qcom: Disable write access to read only registers for IP v2.3.3
Robin Murphy <[email protected]>
PCI: Add function 1 DMA alias quirk for Marvell 88SE9235
Ondrej Zary <[email protected]>
PCI/PM: Avoid putting EloPOS E2/S2/H2 PCIe Ports in D3cold
Martin Kaiser <[email protected]>
hwrng: imx-rngc - fix the timeout for init and self check
Siddh Raman Pant <[email protected]>
jfs: jfs_dmap: Validate db_l2nbperpage while mounting
Baokun Li <[email protected]>
ext4: only update i_reserved_data_blocks on successful block allocation
Chao Yu <[email protected]>
ext4: fix to check return value of freeze_bdev() in ext4_shutdown()
Kemeng Shi <[email protected]>
ext4: fix wrong unit use in ext4_mb_new_blocks
Kemeng Shi <[email protected]>
ext4: get block from bh in ext4_free_blocks for fast commit replay
Kemeng Shi <[email protected]>
ext4: fix wrong unit use in ext4_mb_clear_bb
Zhihao Cheng <[email protected]>
ext4: Fix reusing stale buffer heads from last failed mounting
Huacai Chen <[email protected]>
MIPS: Loongson: Fix cpu_probe_loongson() again
Gao Xiang <[email protected]>
erofs: fix compact 4B support for 16k block size
Ekansh Gupta <[email protected]>
misc: fastrpc: Create fastrpc scalar with correct buffer count
Naveen N Rao <[email protected]>
powerpc: Fail build if using recordmcount with binutils v2.37
Florian Fainelli <[email protected]>
net: bcmgenet: Ensure MDIO unregistration has clocks enabled
Arseniy Krasnov <[email protected]>
mtd: rawnand: meson: fix unaligned DMA buffers handling
Jarkko Sakkinen <[email protected]>
tpm: tpm_vtpm_proxy: fix a race condition in /dev/vtpmx creation
Mario Limonciello <[email protected]>
pinctrl: amd: Only use special debounce behavior for GPIO 0
Mario Limonciello <[email protected]>
pinctrl: amd: Detect internal GPIO0 debounce handling
Mario Limonciello <[email protected]>
pinctrl: amd: Fix mistake in handling clearing pins at startup
Chao Yu <[email protected]>
f2fs: fix to avoid NULL pointer dereference f2fs_write_end_io()
Ming Lei <[email protected]>
nvme-pci: fix DMA direction of unmapping integrity data
Pedro Tammela <[email protected]>
net/sched: sch_qfq: account for stab overhead in qfq_enqueue
Pedro Tammela <[email protected]>
net/sched: sch_qfq: refactor parsing of netlink parameters
Pedro Tammela <[email protected]>
net/sched: make psched_mtu() RTNL-less safe
Dan Carpenter <[email protected]>
netdevsim: fix uninitialized data in nsim_dev_trap_fa_cookie_write()
Ido Schimmel <[email protected]>
net/sched: flower: Ensure both minimum and maximum ports are specified
Randy Dunlap <[email protected]>
wifi: airo: avoid uninitialized warning in airo_get_rate()
Chunhai Guo <[email protected]>
erofs: avoid infinite loop in z_erofs_do_read_page() when reading beyond EOF
Björn Töpel <[email protected]>
riscv, bpf: Fix inconsistent JIT image generation
Pu Lehui <[email protected]>
bpf, riscv: Support riscv jit to provide bpf_line_info
Jisheng Zhang <[email protected]>
riscv: bpf: Avoid breaking W^X
Jisheng Zhang <[email protected]>
riscv: bpf: Move bpf_jit_alloc_exec() and bpf_jit_free_exec() to core
Florian Kauer <[email protected]>
igc: Fix inserting of empty frame for launchtime
Florian Kauer <[email protected]>
igc: Fix launchtime before start of cycle
Andy Shevchenko <[email protected]>
platform/x86: wmi: Break possible infinite loop when parsing GUID
Barnabás Pőcze <[email protected]>
platform/x86: wmi: move variables
Barnabás Pőcze <[email protected]>
platform/x86: wmi: use guid_t and guid_equal()
Barnabás Pőcze <[email protected]>
platform/x86: wmi: remove unnecessary argument
Ziyang Xuan <[email protected]>
ipv6/addrconf: fix a potential refcount underflow for idev
Jiasheng Jiang <[email protected]>
NTB: ntb_tool: Add check for devm_kcalloc
Yang Yingliang <[email protected]>
NTB: ntb_transport: fix possible memory leak while device_register() fails
Yuan Can <[email protected]>
ntb: intel: Fix error handling in intel_ntb_pci_driver_init()
Yuan Can <[email protected]>
NTB: amd: Fix error handling in amd_ntb_pci_driver_init()
Yuan Can <[email protected]>
ntb: idt: Fix error handling in idt_pci_driver_init()
Eric Dumazet <[email protected]>
udp6: fix udp6_ehashfn() typo
Kuniyuki Iwashima <[email protected]>
icmp6: Fix null-ptr-deref of ip6_null_entry->rt6i_idev in icmp6_dev().
Paolo Abeni <[email protected]>
net: prevent skb corruption on frag list segmentation
Rafał Miłecki <[email protected]>
net: bgmac: postpone turning IRQs off to avoid SoC hangs
Nitya Sunkad <[email protected]>
ionic: remove WARN_ON to prevent panic_on_warn
Junfeng Guo <[email protected]>
gve: Set default duplex configuration to full
M A Ramdhan <[email protected]>
net/sched: cls_fw: Fix improper refcount update leads to use-after-free
Klaus Kudielka <[email protected]>
net: mvneta: fix txq_map in case of txq_number==1
Dan Carpenter <[email protected]>
scsi: qla2xxx: Fix error code in qla2x00_start_sp()
Prasad Koya <[email protected]>
igc: set TP bit in 'supported' and 'advertising' fields of ethtool_link_ksettings
Vlad Buslov <[email protected]>
net/mlx5e: Check for NOT_READY flag state after locking
Zhengchao Shao <[email protected]>
net/mlx5e: fix double free in mlx5e_destroy_flow_table
Muhammad Husaini Zulkifli <[email protected]>
igc: Remove delay during TX ring configuration
Marek Vasut <[email protected]>
drm/panel: simple: Add Powertip PH800480T013 drm_display_mode flags
Fabio Estevam <[email protected]>
drm/panel: simple: Add connector_type for innolux_at043tn24
Linus Torvalds <[email protected]>
workqueue: clean up WORK_* constant types, clarify masking
Moritz Fischer <[email protected]>
net: lan743x: Don't sleep in atomic context
Jens Axboe <[email protected]>
io_uring: add reschedule point to handle_tw_list()
Andres Freund <[email protected]>
io_uring: Use io_schedule* in cqring wait
Michael Schmitz <[email protected]>
block/partition: fix signedness issue for Amiga partitions
Paul E. McKenney <[email protected]>
rcu-tasks: Simplify trc_read_check_handler() atomic operations
Paul E. McKenney <[email protected]>
rcu-tasks: Mark ->trc_reader_special.b.need_qs data races
Paul E. McKenney <[email protected]>
rcu-tasks: Mark ->trc_reader_nesting data races
Sherry Sun <[email protected]>
tty: serial: fsl_lpuart: add earlycon for imx8ulp platform
Jason A. Donenfeld <[email protected]>
wireguard: netlink: send staged packets when setting initial private key
Jason A. Donenfeld <[email protected]>
wireguard: queueing: use saner cpu selection wrapping
Thadeu Lima de Souza Cascardo <[email protected]>
netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
Thadeu Lima de Souza Cascardo <[email protected]>
netfilter: nf_tables: do not ignore genmask when looking up chain by id
Florent Revest <[email protected]>
netfilter: conntrack: Avoid nf_ct_helper_hash uses after free
Florian Westphal <[email protected]>
netfilter: nf_tables: fix scheduling-while-atomic splat
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: unbind non-anonymous set if rule construction fails
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: drop map element references from preparation phase
Pablo Neira Ayuso <[email protected]>
netfilter: nftables: rename set element data activation/deactivation functions
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject unbound chain set before commit phase
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject unbound anonymous set before commit phase
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: fix chain binding transaction logic
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
Florian Westphal <[email protected]>
netfilter: nf_tables: add rescheduling points during loop detection walks
Florian Westphal <[email protected]>
netfilter: nf_tables: use net_generic infra for transaction data
Geert Uytterhoeven <[email protected]>
sh: pgtable-3level: Fix cast to pointer from integer of different size
Michael Schmitz <[email protected]>
block: add overflow checks for Amiga partition support
Gilad Reti <[email protected]>
selftests/bpf: Add verifier test for PTR_TO_MEM spill
Lino Sanfilippo <[email protected]>
tpm, tpm_tis: Claim locality in interrupt handler
Amir Goldstein <[email protected]>
fanotify: disallow mount/sb marks on kernel internal pseudo fs
Jan Kara <[email protected]>
fs: no need to check source
Christian Marangi <[email protected]>
leds: trigger: netdev: Recheck NETDEV_LED_MODE_LINKUP on dev rename
Arnd Bergmann <[email protected]>
ARM: orion5x: fix d2net gpio initialization
Ricardo Ribalda Delgado <[email protected]>
ASoC: mediatek: mt8173: Fix snd_soc_component_initialize error path
Ricardo Ribalda Delgado <[email protected]>
ASoC: mediatek: mt8173: Fix irq error path
Filipe Manana <[email protected]>
btrfs: fix race when deleting quota root from the dirty cow roots list
Matt Corallo <[email protected]>
btrfs: add handling for RAID1C23/DUP to btrfs_reduce_alloc_profile
Jan Kara <[email protected]>
fs: Lock moved directories
Jan Kara <[email protected]>
fs: Establish locking order for unrelated directories
Jan Kara <[email protected]>
Revert "f2fs: fix potential corruption when moving a directory"
Jan Kara <[email protected]>
ext4: Remove ext4 locking of moved directory
Thomas Weißschuh <[email protected]>
fs: avoid empty option when generating legacy mount string
Fabian Frederick <[email protected]>
jffs2: reduce stack usage in jffs2_build_xattr_subsystem()
Roberto Sassu <[email protected]>
shmem: use ramfs_kill_sb() for kill_sb method of ramfs-based tmpfs
Arnd Bergmann <[email protected]>
autofs: use flexible array in ioctl structure
Tianjia Zhang <[email protected]>
integrity: Fix possible multiple allocation in integrity_inode_get()
Kees Cook <[email protected]>
um: Use HOST_DIR for mrproper
Zheng Wang <[email protected]>
bcache: Fix __bch_btree_node_alloc to make the failure behavior consistent
Zheng Wang <[email protected]>
bcache: Remove unnecessary NULL point check in node allocations
Mingzhe Zou <[email protected]>
bcache: fixup btree_cache_wait list damage
Chevron Li <[email protected]>
mmc: sdhci: fix DMA configure compatibility issue when 64bit DMA mode is used.
Ulf Hansson <[email protected]>
mmc: mmci: Set PROBE_PREFER_ASYNCHRONOUS
Robert Marko <[email protected]>
mmc: core: disable TRIM on Micron MTFC4GACAJCN-1M
Robert Marko <[email protected]>
mmc: core: disable TRIM on Kingston EMMC04G-M627
Jens Axboe <[email protected]>
io_uring: wait interruptibly for request completions on exit
Dai Ngo <[email protected]>
NFSD: add encoding of op_recall flag for write delegation
Shuai Jiang <[email protected]>
i2c: qup: Add missing unwind goto in qup_i2c_probe()
Takashi Iwai <[email protected]>
ALSA: jack: Fix mutex call in snd_jack_report()
Robert Hancock <[email protected]>
i2c: xiic: Don't try to handle more interrupt events after error
Marek Vasut <[email protected]>
i2c: xiic: Defer xiic_wakeup() and __xiic_start_xfer() in xiic_process()
Danila Chernetsov <[email protected]>
apparmor: fix missing error check for rhashtable_insert_fast
Artur Rojek <[email protected]>
sh: dma: Fix DMA channel offset calculation
Thorsten Winkler <[email protected]>
s390/qeth: Fix vipa deletion
Vladimir Oltean <[email protected]>
net: dsa: tag_sja1105: fix MAC DA patching from meta frames
Guillaume Nault <[email protected]>
pptp: Fix fib lookup calls.
Lin Ma <[email protected]>
net/sched: act_pedit: Add size check for TCA_PEDIT_PARMS_EX
Ilya Maximets <[email protected]>
xsk: Honor SO_BINDTODEVICE on bind
Eric Dumazet <[email protected]>
tcp: annotate data races in __tcp_oow_rate_limited()
Vladimir Oltean <[email protected]>
net: bridge: keep ports without IFF_UNICAST_FLT in BR_PROMISC mode
Randy Dunlap <[email protected]>
powerpc: allow PPC_EARLY_DEBUG_CPM only when SERIAL_CPM=y
Hariprasad Kelam <[email protected]>
octeontx2-af: Fix mapping for NIX block from CGX connection
Chao Yu <[email protected]>
f2fs: fix error path handling in truncate_dnode()
Nishanth Menon <[email protected]>
mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0
Jonas Gorski <[email protected]>
spi: bcm-qspi: return error if neither hif_mspi nor mspi is available
Pawel Dembicki <[email protected]>
net: dsa: vsc73xx: fix MTU configuration
Tobias Heider <[email protected]>
Add MODULE_FIRMWARE() for FIRMWARE_TG357766.
Chengfeng Ye <[email protected]>
sctp: fix potential deadlock on &net->sctp.addr_wq_lock
Randy Dunlap <[email protected]>
media: cec: i2c: ch7322: also select REGMAP
Christophe JAILLET <[email protected]>
rtc: st-lpc: Release some resources in st_rtc_probe() in case of error
Marek Vasut <[email protected]>
pwm: sysfs: Do not apply state to already disabled PWMs
Fancy Fang <[email protected]>
pwm: imx-tpm: force 'real_period' to be zero in suspend
Claudiu Beznea <[email protected]>
phy: tegra: xusb: check return value of devm_kzalloc()
Christophe JAILLET <[email protected]>
mfd: stmpe: Only disable the regulators if they are enabled
Pierre Morel <[email protected]>
KVM: s390: vsie: fix the length of APCB bitmap
Amelie Delaunay <[email protected]>
mfd: stmfx: Nullify stmfx->vdd in case of error
Amelie Delaunay <[email protected]>
mfd: stmfx: Fix error path in stmfx_chip_init
Mirsad Goran Todorovac <[email protected]>
test_firmware: return ENOMEM instead of ENOSPC on failed memory allocation
Tony Lindgren <[email protected]>
serial: 8250_omap: Use force_suspend and resume for system suspend
Greg Kroah-Hartman <[email protected]>
Revert "usb: common: usb-conn-gpio: Set last role to unknown before initial detection"
Jiasheng Jiang <[email protected]>
mfd: intel-lpss: Add missing check for platform_get_resource
Christophe JAILLET <[email protected]>
usb: dwc3-meson-g12a: Fix an error handling path in dwc3_meson_g12a_probe()
Prashanth K <[email protected]>
usb: common: usb-conn-gpio: Set last role to unknown before initial detection
Christophe JAILLET <[email protected]>
usb: dwc3: qcom: Fix an error handling path in dwc3_qcom_probe()
Christophe JAILLET <[email protected]>
usb: dwc3: qcom: Release the correct resources in dwc3_qcom_remove()
Nico Boehr <[email protected]>
KVM: s390: fix KVM_S390_GET_CMMA_BITS for GFNs in memslot holes
Dan Carpenter <[email protected]>
media: atomisp: gmin_platform: fix out_len in gmin_get_config_dsm_var()
Rikard Falkeborn <[email protected]>
media: venus: helpers: Fix ALIGN() of non power of two
Stephan Gerhold <[email protected]>
mfd: rt5033: Drop rt5033-battery sub-device
James Clark <[email protected]>
coresight: Fix loss of connection info when a module is unloaded
Muchun Song <[email protected]>
kernfs: fix missing kernfs_idr_lock to remove an ID from the IDR
John Ogness <[email protected]>
serial: 8250: lock port for UART_IER access in omap8250_irq()
John Ogness <[email protected]>
serial: 8250: lock port for stop_rx() in omap8250_irq()
Arnd Bergmann <[email protected]>
usb: hide unused usbfs_notify_suspend/resume functions
Li Yang <[email protected]>
usb: phy: phy-tahvo: fix memory leak in tahvo_usb_probe()
Andy Shevchenko <[email protected]>
extcon: Fix kernel doc of property capability fields to avoid warnings
Andy Shevchenko <[email protected]>
extcon: Fix kernel doc of property fields to avoid warnings
Prashanth K <[email protected]>
usb: gadget: u_serial: Add null pointer check in gserial_suspend
Vladislav Efanov <[email protected]>
usb: dwc3: qcom: Fix potential memory leak
Robert Marko <[email protected]>
clk: qcom: ipq6018: fix networking resets
Robert Marko <[email protected]>
clk: qcom: reset: support resetting multiple bits
Stephan Gerhold <[email protected]>
clk: qcom: reset: Allow specifying custom reset delay
Duoming Zhou <[email protected]>
media: usb: siano: Fix warning due to null work_func_t function pointer
Marek Vasut <[email protected]>
media: videodev2.h: Fix struct v4l2_input tuner index comment
Daniil Dulov <[email protected]>
media: usb: Check az6007_read() return value
Mantas Pucka <[email protected]>
clk: qcom: gcc-ipq6018: Use floor ops for sdcc clocks
Tony Lindgren <[email protected]>
serial: 8250: omap: Fix freeing of resources on failed register
John Paul Adrian Glaubitz <[email protected]>
sh: j2: Use ioremap() to translate device tree address into kernel memory
Dan Carpenter <[email protected]>
w1: fix loop in w1_fini()
Stefan Wahren <[email protected]>
w1: w1_therm: fix locking behavior in convert_t
Ding Hui <[email protected]>
SUNRPC: Fix UAF in svc_tcp_listen_data_ready()
Michael Schmitz <[email protected]>
block: change all __u32 annotations to __be32 in affs_hardblocks.h
Michael Schmitz <[email protected]>
block: fix signed int overflow in Amiga partition support
EJ Hsu <[email protected]>
phy: tegra: xusb: Clear the driver reference in usb-phy dev
Krishna Kurapati <[email protected]>
usb: dwc3: gadget: Propagate core init errors to UDC during pullup
Davide Tronchin <[email protected]>
USB: serial: option: add LARA-R6 01B PIDs
Jens Axboe <[email protected]>
io_uring: ensure IOPOLL locks around deferred work
Martin Kaiser <[email protected]>
hwrng: st - keep clock enabled while hwrng is registered
Dan Williams <[email protected]>
dax: Introduce alloc_dev_dax_id()
Dan Williams <[email protected]>
dax: Fix dax_mapping_release() use after free
Olga Kornievskaia <[email protected]>
NFSv4.1: freeze the session table upon receiving NFS4ERR_BADSESSION
Masahiro Yamada <[email protected]>
ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard
Dan Carpenter <[email protected]>
modpost: fix off by one in is_executable_section()
Arnd Bergmann <[email protected]>
crypto: marvell/cesa - Fix type mismatch warning
Masahiro Yamada <[email protected]>
modpost: fix section mismatch message for R_ARM_{PC24,CALL,JUMP24}Masahiro Yamada <[email protected]>
modpost: fix section mismatch message for R_ARM_ABS32
Randy Dunlap <[email protected]>
crypto: nx - fix build warnings when DEBUG_FS is not enabled
Herbert Xu <[email protected]>
hwrng: virtio - Fix race on data_avail and actual data
Laurent Vivier <[email protected]>
hwrng: virtio - always add a pending request
Laurent Vivier <[email protected]>
hwrng: virtio - don't waste entropy
Laurent Vivier <[email protected]>
hwrng: virtio - don't wait on cleanup
Laurent Vivier <[email protected]>
hwrng: virtio - add an internal buffer
Aneesh Kumar K.V <[email protected]>
powerpc/mm/dax: Fix the condition when checking if altmap vmemap can cross-boundary
Aneesh Kumar K.V <[email protected]>
powerpc/book3s64/mm: Fix DirectMap stats in /proc/meminfo
Aneesh Kumar K.V <[email protected]>
mm: rename p4d_page_vaddr to p4d_pgtable and make it return pud_t *
Aneesh Kumar K.V <[email protected]>
mm: rename pud_page_vaddr to pud_pgtable and make it return pmd_t *
Colin Ian King <[email protected]>
powerpc/powernv/sriov: perform null check on iov before dereferencing iov
Claudiu Beznea <[email protected]>
pinctrl: at91-pio4: check return value of devm_kasprintf()
Namhyung Kim <[email protected]>
perf dwarf-aux: Fix off-by-one in die_get_varname()
Arnaldo Carvalho de Melo <[email protected]>
perf script: Fix allocation of evsel->priv related to per-event dump files
Arnaldo Carvalho de Melo <[email protected]>
perf script: Fixup 'struct evsel_script' method prefix
Christophe Leroy <[email protected]>
kcsan: Don't expect 64 bits atomic builtins from 32 bits architectures
Andy Shevchenko <[email protected]>
pinctrl: cherryview: Return correct value if pin in push-pull mode
Arnaldo Carvalho de Melo <[email protected]>
perf bench: Add missing setlocale() call to allow usage of %'d style formatting
Sohaib Mohamed <[email protected]>
perf bench: Use unbuffered output when pipe/tee'ing to a file
Sui Jingfeng <[email protected]>
PCI: Add pci_clear_master() stub for non-CONFIG_PCI
Junyan Ye <[email protected]>
PCI: ftpci100: Release the clock resources
Rongguang Wei <[email protected]>
PCI: pciehp: Cancel bringup sequence if card is not present
Yuchen Yang <[email protected]>
scsi: 3w-xxxx: Add error handling for initialization failure in tw_probe()
Ding Hui <[email protected]>
PCI/ASPM: Disable ASPM on MFD function removal to avoid use-after-free
Christophe JAILLET <[email protected]>
pinctrl: bcm2835: Handle gpiochip_add_pin_range() errors
Jinhong Zhu <[email protected]>
scsi: qedf: Fix NULL dereference in error handling
Siddharth Vadapalli <[email protected]>
PCI: cadence: Fix Gen2 Link Retraining process
Claudiu Beznea <[email protected]>
ASoC: imx-audmix: check return value of devm_kasprintf()
Amir Goldstein <[email protected]>
ovl: update of dentry revalidate flags after copy up
Alexey Romanov <[email protected]>
drivers: meson: secure-pwrc: always enable DMA domain
Claudiu Beznea <[email protected]>
clk: ti: clkctrl: check return value of kasprintf()
Claudiu Beznea <[email protected]>
clk: keystone: sci-clk: check return value of kasprintf()
Claudiu Beznea <[email protected]>
clk: si5341: free unused memory on probe failure
Claudiu Beznea <[email protected]>
clk: si5341: check return value of {devm_}kasprintf()
Claudiu Beznea <[email protected]>
clk: si5341: return error if one synth clock registration fails
Robert Hancock <[email protected]>
clk: si5341: Add sysfs properties to allow checking/resetting device faults
Robert Hancock <[email protected]>
clk: si5341: Allow different output VDD_SEL values
Claudiu Beznea <[email protected]>
clk: cdce925: check return value of kasprintf()
Claudiu Beznea <[email protected]>
clk: vc5: check memory returned by kasprintf()
Bjorn Andersson <[email protected]>
drm/msm/dp: Free resources after unregistering them
Dmitry Baryshkov <[email protected]>
drm/msm/dpu: do not enable color-management if DSPPs are not available
Su Hui <[email protected]>
ALSA: ac97: Fix possible NULL dereference in snd_ac97_mixer
Yuan Can <[email protected]>
clk: tegra: tegra124-emc: Fix potential memory leak
Yuxing Liu <[email protected]>
clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe()
Hao Luo <[email protected]>
clk: imx: clk-imx8mn: fix memory leak in imx8mn_clocks_probe
Kashyap Desai <[email protected]>
RDMA/bnxt_re: Avoid calling wake_up threads from spin_lock context
Kashyap Desai <[email protected]>
RDMA/bnxt_re: wraparound mbox producer index
Chia-I Wu <[email protected]>
amdgpu: validate offset_in_bo of drm_amdgpu_gem_va
Nikita Zhandarovich <[email protected]>
drm/radeon: fix possible division-by-zero errors
Daniil Dulov <[email protected]>
drm/amdkfd: Fix potential deallocation of previously deallocated memory.
Christian Lamparter <[email protected]>
ARM: dts: BCM5301X: fix duplex-full => full-duplex
Guenter Roeck <[email protected]>
hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272
Potin Lai <[email protected]>
hwmon: (adm1275) Allow setting sample averaging
Chu Lin <[email protected]>
hwmon: (adm1275) enable adm1272 temperature reporting
Tim Harvey <[email protected]>
hwmon: (gsc-hwmon) fix fan pwm temperature scaling
Olivier Moysan <[email protected]>
ARM: dts: stm32: fix i2s endpoint format property for stm32mp15xx-dkx
Marek Vasut <[email protected]>
ARM: dts: stm32: Fix audio routing on STM32MP15xx DHCOM PDK2
Keerthy <[email protected]>
arm64: dts: ti: k3-j7200: Fix physical address of pin
Christophe JAILLET <[email protected]>
fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()
Wolfram Sang <[email protected]>
arm64: dts: renesas: ulcb-kf: Remove flow control for SCIF1
Geert Uytterhoeven <[email protected]>
ARM: dts: iwg20d-q7-common: Fix backlight pwm specifier
Chengchang Tang <[email protected]>
RDMA/hns: Fix hns_roce_table_get return value
Xi Wang <[email protected]>
RDMA/hns: Clean the hardware related code for HEM
Weihang Li <[email protected]>
RDMA/hns: Use refcount_t APIs for HEM
Lang Cheng <[email protected]>
RDMA/hns: Fix coding style issues
Jason Gunthorpe <[email protected]>
RDMA: Remove uverbs_ex_cmd_mask values that are linked to functions
Brendan Cunningham <[email protected]>
IB/hfi1: Fix wrong mmu_node used for user SDMA packet after invalidate
Patrick Kelsey <[email protected]>
IB/hfi1: Fix sdma.h tx->num_descs off-by-one errors
Christophe JAILLET <[email protected]>
IB/hfi1: Use bitmap_zalloc() when applicable
Randy Dunlap <[email protected]>
soc/fsl/qe: fix usb.c build errors
Martin Blumenstingl <[email protected]>
ARM: dts: meson8: correct uart_B and uart_C clock references
Cristian Ciocaltea <[email protected]>
ASoC: es8316: Do not set rate constraints for unsupported MCLKs
Cristian Ciocaltea <[email protected]>
ASoC: es8316: Increment max value for ALC Capture Target Volume control
Krzysztof Kozlowski <[email protected]>
memory: brcmstb_dpfe: fix testing array offset after use
Marek Vasut <[email protected]>
ARM: dts: stm32: Shorten the AV96 HDMI sound card name
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: apq8096: fix fixed regulator name property
Arnd Bergmann <[email protected]>
ARM: omap2: fix missing tick_broadcast() prototype
Arnd Bergmann <[email protected]>
ARM: ep93xx: fix missing-prototype warnings
Dario Binacchi <[email protected]>
drm/panel: simple: fix active size for Ampire AM-480272H3TMQW-T01H
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: msm8996: correct camss unit address
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: msm8994: correct SPMI unit address
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: msm8916: correct camss unit address
Tony Lindgren <[email protected]>
ARM: dts: gta04: Move model property out of pinctrl node
Kalesh AP <[email protected]>
RDMA/bnxt_re: Fix to remove an unnecessary log
Kalesh AP <[email protected]>
RDMA/bnxt_re: Remove a redundant check inside bnxt_re_update_gid
Kalesh AP <[email protected]>
RDMA/bnxt_re: Use unique names while registering interrupts
Kalesh AP <[email protected]>
RDMA/bnxt_re: Fix to remove unnecessary return labels
Selvin Xavier <[email protected]>
RDMA/bnxt_re: Disable/kill tasklet only if it is enabled
Robert Marko <[email protected]>
arm64: dts: microchip: sparx5: do not use PSCI on reference boards
Tony Lindgren <[email protected]>
bus: ti-sysc: Fix dispc quirk masking bool variables
Marek Vasut <[email protected]>
ARM: dts: stm32: Move ethernet MAC EEPROM from SoM to carrier boards
Dmitry Baryshkov <[email protected]>
drm/panel: sharp-ls043t1le01: adjust mode settings
XuDong Liu <[email protected]>
drm: sun4i_tcon: use devm_clk_get_enabled in sun4i_tcon_init_clocks
Marek Vasut <[email protected]>
Input: adxl34x - do not hardcode interrupt trigger type
[email protected] <[email protected]>
ARM: dts: meson8b: correct uart_B and uart_C clock references
Rafał Miłecki <[email protected]>
ARM: dts: BCM5301X: Drop "clock-names" from the SPI node
Luc Ma <[email protected]>
drm/vram-helper: fix function names in vram helper doc
Francesco Dolcini <[email protected]>
drm/bridge: tc358768: fix THS_TRAILCNT computation
Francesco Dolcini <[email protected]>
drm/bridge: tc358768: fix TXTAGOCNT computation
Francesco Dolcini <[email protected]>
drm/bridge: tc358768: fix THS_ZEROCNT computation
Francesco Dolcini <[email protected]>
drm/bridge: tc358768: fix TCLK_TRAILCNT computation
Francesco Dolcini <[email protected]>
drm/bridge: tc358768: Add atomic_get_input_bus_fmts() implementation
Francesco Dolcini <[email protected]>
drm/bridge: tc358768: fix TCLK_ZEROCNT computation
Francesco Dolcini <[email protected]>
drm/bridge: tc358768: fix PLL target frequency
Francesco Dolcini <[email protected]>
drm/bridge: tc358768: fix PLL parameters computation
Francesco Dolcini <[email protected]>
drm/bridge: tc358768: always enable HS video mode
Luca Weiss <[email protected]>
Input: drv260x - sleep between polling GO bit
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Explicitly specify update type per plane info change
Nikita Zhandarovich <[email protected]>
radeon: avoid double free in ci_dpm_init()
Kuniyuki Iwashima <[email protected]>
netlink: Add __sock_i_ino() for __netlink_diag_dump().
Cambda Zhu <[email protected]>
ipvlan: Fix return value of ipvlan_queue_xmit()
Ilia.Gavrilov <[email protected]>
netfilter: nf_conntrack_sip: fix the ct_sip_parse_numerical_param() return value.
Florian Westphal <[email protected]>
netfilter: conntrack: dccp: copy entire header to stack buffer, not just basic one
Jeremy Sowden <[email protected]>
lib/ts_bm: reset initial match offset for every block of text
Lin Ma <[email protected]>
net: nfc: Fix use-after-free caused by nfc_llcp_find_local
Krzysztof Kozlowski <[email protected]>
nfc: llcp: simplify llcp_sock_connect() error paths
Edward Cree <[email protected]>
sfc: fix crash when reading stats while NIC is resetting
Maxim Kochetkov <[email protected]>
net: axienet: Move reset before 64-bit DMA detection
Kuniyuki Iwashima <[email protected]>
gtp: Fix use-after-free in __gtp_encap_destroy().
Sabrina Dubroca <[email protected]>
selftests: rtnetlink: remove netdevsim device after ipsec offload test
Eric Dumazet <[email protected]>
netlink: do not hard code device address lenth in fdb dumps
Eric Dumazet <[email protected]>
netlink: fix potential deadlock in netlink_set_err()
Bartosz Golaszewski <[email protected]>
net: stmmac: fix double serdes powerdown
Vinicius Costa Gomes <[email protected]>
igc: Fix race condition in PTP tx code
Dmitry Antipov <[email protected]>
wifi: ath9k: convert msecs to jiffies where needed
Benjamin Berg <[email protected]>
wifi: cfg80211: rewrite merging of inherited elements
Johannes Berg <[email protected]>
wifi: iwlwifi: pull from TXQs with softirqs disabled
Edwin Peer <[email protected]>
rtnetlink: extend RTEXT_FILTER_SKIP_STATS to IFLA_VF_INFO
Remi Pommarel <[email protected]>
wifi: ath9k: Fix possible stall on ath9k_txq_list_has_key()
Arnd Bergmann <[email protected]>
memstick r592: make memstick_debug_get_tpc_name() static
Zhen Lei <[email protected]>
kexec: fix a memory leak in crash_shrink_memory()
Douglas Anderson <[email protected]>
watchdog/perf: more properly prevent false positives with turbo modes
Douglas Anderson <[email protected]>
watchdog/perf: define dummy watchdog_update_hrtimer_threshold() on correct config
Marek Vasut <[email protected]>
wifi: rsi: Do not set MMC_PM_KEEP_POWER in shutdown
Marek Vasut <[email protected]>
wifi: rsi: Do not configure WoWlan in shutdown hook if not enabled
Fedor Pchelkin <[email protected]>
wifi: ath9k: don't allow to overwrite ENDPOINT0 attributes
Christophe JAILLET <[email protected]>
wifi: ray_cs: Fix an error handling path in ray_probe()
Andy Shevchenko <[email protected]>
wifi: ray_cs: Drop useless status variable in parse_addr()
Andy Shevchenko <[email protected]>
wifi: ray_cs: Utilize strnlen() in parse_addr()
Christophe JAILLET <[email protected]>
wifi: wl3501_cs: Fix an error handling path in wl3501_probe()
Jakub Kicinski <[email protected]>
wl3501_cs: use eth_hw_addr_set()
Jakub Kicinski <[email protected]>
net: create netdev->dev_addr assignment helpers
Lee Jones <[email protected]>
wl3501_cs: Fix misspelling and provide missing documentation
Christophe JAILLET <[email protected]>
wifi: atmel: Fix an error handling path in atmel_probe()
Christophe JAILLET <[email protected]>
wifi: orinoco: Fix an error handling path in orinoco_cs_probe()
Christophe JAILLET <[email protected]>
wifi: orinoco: Fix an error handling path in spectrum_cs_probe()
Geert Uytterhoeven <[email protected]>
regulator: core: Streamline debugfs operations
Geert Uytterhoeven <[email protected]>
regulator: core: Fix more error checking for debugfs_create_dir()
Alan Maguire <[email protected]>
bpftool: JIT limited misreported as negative value on aarch64
Krzysztof Kozlowski <[email protected]>
nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect()
Krzysztof Kozlowski <[email protected]>
nfc: constify several pointers to u8, char and sk_buff
Andrii Nakryiko <[email protected]>
libbpf: fix offsetof() and container_of() to work with CO-RE
Alexander Mikhalitsyn <[email protected]>
sctp: add bpf_bypass_getsockopt proto callback
Stanislav Fomichev <[email protected]>
bpf: Remove extra lock_sock for TCP_ZEROCOPY_RECEIVE
Christophe JAILLET <[email protected]>
wifi: mwifiex: Fix the size of a memory allocation in mwifiex_ret_802_11_scan()
Amisha Patel <[email protected]>
wifi: wilc1000: fix for absent RSN capabilities WFA testcase
Vijaya Krishna Nivarthi <[email protected]>
spi: spi-geni-qcom: Correct CS_TOGGLE bit in SPI_TRANS_CFG
Pengcheng Yang <[email protected]>
samples/bpf: Fix buffer overflow in tcp_basertt
Fedor Pchelkin <[email protected]>
wifi: ath9k: avoid referencing uninit memory in ath9k_wmi_ctrl_rx
Peter Seiderer <[email protected]>
wifi: ath9k: fix AR9003 mac hardware hang check register offset calculation
Jesper Dangaard Brouer <[email protected]>
igc: Enable and fix RX hash usage by netstack
Jiasheng Jiang <[email protected]>
pstore/ram: Add check for kstrdup
Roberto Sassu <[email protected]>
ima: Fix build warnings
Roberto Sassu <[email protected]>
evm: Complete description of evm_inode_setattr()
Juergen Gross <[email protected]>
x86/mm: Fix __swp_entry_to_pte() for Xen PV guests
Ravi Bangoria <[email protected]>
perf/ibs: Fix interface via core pmu events
Qiuxu Zhuo <[email protected]>
rcu/rcuscale: Stop kfree_scale_thread thread(s) after unloading rcuscale
Qiuxu Zhuo <[email protected]>
rcu/rcuscale: Move rcu_scale_*() after kfree_scale_cleanup()
Paul E. McKenney <[email protected]>
rcuscale: Move shutdown from wait_event() to wait_event_idle()
Li Zhijian <[email protected]>
rcuscale: Always log error message
Jiangong.Han <[email protected]>
rcuscale: Console output claims too few grace periods
Christophe JAILLET <[email protected]>
thermal/drivers/sun8i: Fix some error handling paths in sun8i_ths_probe()
Tero Kristo <[email protected]>
cpufreq: intel_pstate: Fix energy_performance_preference for passive
Arnd Bergmann <[email protected]>
ARM: 9303/1: kprobes: avoid missing-declaration warnings
Zhang Rui <[email protected]>
powercap: RAPL: Fix CONFIG_IOSF_MBI dependency
Robin Murphy <[email protected]>
perf/arm-cmn: Fix DTC reset
Nikita Zhandarovich <[email protected]>
PM: domains: fix integer overflow issues in genpd_parse_state()
Feng Mingxi <[email protected]>
clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe
Sebastian Andrzej Siewior <[email protected]>
tracing/timer: Add missing hrtimer modes to decode_hrtimer_mode().
Thomas Gleixner <[email protected]>
posix-timers: Prevent RT livelock in itimer_delete()
John Paul Adrian Glaubitz <[email protected]>
irqchip/jcore-aic: Fix missing allocation of IRQ descriptors
Marc Zyngier <[email protected]>
irqchip/jcore-aic: Kill use of irq_create_strict_mappings()
Li Nan <[email protected]>
md/raid10: fix io loss while replacement replace rdev
Li Nan <[email protected]>
md/raid10: fix null-ptr-deref of mreplace in raid10_sync_request
Li Nan <[email protected]>
md/raid10: fix wrong setting of max_corr_read_errors
Li Nan <[email protected]>
md/raid10: fix overflow of md/safe_mode_delay
Li Nan <[email protected]>
md/raid10: check slab-out-of-bounds in md_bitmap_get_counter
Li Nan <[email protected]>
blk-iocost: use spin_lock_irqsave in adjust_inuse_and_calc_cost
Shawn Wang <[email protected]>
x86/resctrl: Only show tasks' pid in current pid namespace
Arnd Bergmann <[email protected]>
fs: pipe: reveal missing function protoypes
Finn Thain <[email protected]>
nubus: Partially revert proc_create_single_data() conversion
Bas Nieuwenhuizen <[email protected]>
drm/amdgpu: Validate VM ioctl flags.
Ahmed S. Darwish <[email protected]>
scripts/tags.sh: Resolve gtags empty index generation
Ricardo Cañuelo <[email protected]>
Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe"
Mike Hommey <[email protected]>
HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651.
Jason Gerecke <[email protected]>
HID: wacom: Use ktime_t rather than int when dealing with timestamps
Zheng Wang <[email protected]>
fbdev: imsttfb: Fix use after free bug in imsttfb_probe
Greg Kroah-Hartman <[email protected]>
video: imsttfb: check for ioremap() failures
Oliver Hartkopp <[email protected]>
can: isotp: isotp_sendmsg(): fix return error fix on TX path
Thomas Gleixner <[email protected]>
x86/smp: Use dedicated cache-line for mwait_play_dead()
Tsuchiya Yuto <[email protected]>
media: atomisp: fix "variable dereferenced before check 'asd'"
-------------
Diffstat:
Documentation/filesystems/autofs-mount-control.rst | 2 +- Documentation/filesystems/autofs.rst | 2 +- Documentation/filesystems/directory-locking.rst | 26 +- Documentation/networking/af_xdp.rst | 9 + Documentation/networking/ip-sysctl.rst | 25 + Makefile | 4 +- arch/alpha/include/asm/pgtable.h | 8 +- arch/arc/include/asm/linkage.h | 8 +- arch/arm/boot/dts/bcm53015-meraki-mr26.dts | 2 +- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +- arch/arm/boot/dts/bcm5301x.dtsi | 1 - arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- arch/arm/boot/dts/meson8.dtsi | 4 +- arch/arm/boot/dts/meson8b.dtsi | 4 +- arch/arm/boot/dts/omap3-gta04a5one.dts | 4 +- arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 11 +- arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 8 +- arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 6 - arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 2 +- arch/arm/include/asm/pgtable-3level.h | 2 +- arch/arm/mach-ep93xx/timer-ep93xx.c | 3 +- arch/arm/mach-omap2/board-generic.c | 1 + arch/arm/mach-orion5x/board-dt.c | 3 + arch/arm/mach-orion5x/common.h | 6 + arch/arm/probes/kprobes/checkers-common.c | 2 +- arch/arm/probes/kprobes/core.c | 2 +- arch/arm/probes/kprobes/opt-arm.c | 2 - arch/arm/probes/kprobes/test-core.c | 2 +- arch/arm/probes/kprobes/test-core.h | 4 + arch/arm64/boot/dts/microchip/sparx5.dtsi | 2 +- .../boot/dts/microchip/sparx5_pcb_common.dtsi | 12 + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 4 +- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 3 +- .../boot/dts/ti/k3-j7200-common-proc-board.dts | 28 +- arch/arm64/include/asm/exception.h | 5 - arch/arm64/include/asm/pgtable.h | 8 +- arch/arm64/mm/mmu.c | 4 +- arch/ia64/include/asm/pgtable.h | 4 +- arch/m68k/include/asm/motorola_pgtable.h | 2 +- arch/mips/include/asm/pgtable-64.h | 8 +- arch/mips/kernel/cpu-probe.c | 9 +- arch/parisc/include/asm/pgtable.h | 4 +- arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/Makefile | 8 + arch/powerpc/include/asm/book3s/64/pgtable.h | 11 +- arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 6 +- arch/powerpc/include/asm/nohash/64/pgtable.h | 6 +- arch/powerpc/mm/book3s64/radix_pgtable.c | 40 +- arch/powerpc/mm/init_64.c | 2 +- arch/powerpc/mm/pgtable_64.c | 4 +- arch/powerpc/platforms/powernv/pci-sriov.c | 6 +- arch/riscv/include/asm/pgtable-64.h | 4 +- arch/riscv/net/bpf_jit.h | 5 +- arch/riscv/net/bpf_jit_comp64.c | 13 - arch/riscv/net/bpf_jit_core.c | 29 +- arch/s390/Makefile | 1 + arch/s390/kvm/kvm-s390.c | 4 + arch/s390/kvm/vsie.c | 6 +- arch/sh/drivers/dma/dma-sh.c | 37 +- arch/sh/include/asm/pgtable-3level.h | 4 +- arch/sh/kernel/cpu/sh2/probe.c | 2 +- arch/sparc/include/asm/pgtable_32.h | 6 +- arch/sparc/include/asm/pgtable_64.h | 10 +- arch/um/Makefile | 2 +- arch/um/include/asm/pgtable-3level.h | 2 +- arch/x86/events/amd/core.c | 2 +- arch/x86/events/amd/ibs.c | 53 +- arch/x86/include/asm/perf_event.h | 2 + arch/x86/include/asm/pgtable.h | 8 +- arch/x86/include/asm/pgtable_64.h | 4 +- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 8 +- arch/x86/kernel/smpboot.c | 24 +- arch/x86/mm/init_64.c | 4 +- arch/x86/mm/pat/set_memory.c | 4 +- arch/x86/mm/pgtable.c | 2 +- arch/xtensa/platforms/iss/network.c | 2 +- block/blk-iocost.c | 7 +- block/partitions/amiga.c | 104 +++- drivers/acpi/button.c | 9 + drivers/acpi/video_detect.c | 16 + drivers/base/power/domain.c | 6 +- drivers/base/regmap/regmap-i2c.c | 8 +- drivers/base/regmap/regmap-spi-avmm.c | 2 +- drivers/base/regmap/regmap.c | 6 +- drivers/block/nbd.c | 3 +- drivers/bus/ti-sysc.c | 4 +- drivers/char/hw_random/imx-rngc.c | 6 +- drivers/char/hw_random/st-rng.c | 21 +- drivers/char/hw_random/virtio-rng.c | 86 ++- drivers/char/tpm/tpm_tis_core.c | 2 + drivers/char/tpm/tpm_vtpm_proxy.c | 30 +- drivers/clk/clk-cdce925.c | 12 + drivers/clk/clk-si5341.c | 242 +++++++- drivers/clk/clk-versaclock5.c | 29 + drivers/clk/imx/clk-imx8mn.c | 8 +- drivers/clk/imx/clk-imx8mp.c | 24 +- drivers/clk/keystone/sci-clk.c | 2 + drivers/clk/qcom/gcc-ipq6018.c | 34 +- drivers/clk/qcom/reset.c | 8 +- drivers/clk/qcom/reset.h | 2 + drivers/clk/tegra/clk-tegra124-emc.c | 2 + drivers/clk/ti/clkctrl.c | 7 + drivers/clocksource/timer-cadence-ttc.c | 19 +- drivers/cpufreq/intel_pstate.c | 2 + drivers/crypto/marvell/cesa/cipher.c | 2 +- drivers/crypto/nx/Makefile | 2 +- drivers/crypto/nx/nx.h | 4 +- drivers/dax/bus.c | 61 +- drivers/dax/dax-private.h | 4 +- drivers/extcon/extcon.c | 8 + drivers/firmware/stratix10-svc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 20 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 13 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 - drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 2 +- drivers/gpu/drm/bridge/tc358768.c | 93 ++- drivers/gpu/drm/drm_atomic.c | 11 +- drivers/gpu/drm/drm_atomic_helper.c | 11 +- drivers/gpu/drm/drm_client_modeset.c | 6 + drivers/gpu/drm/drm_gem_vram_helper.c | 6 +- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 +- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 11 +- drivers/gpu/drm/panel/panel-simple.c | 6 +- drivers/gpu/drm/radeon/ci_dpm.c | 28 +- drivers/gpu/drm/radeon/cypress_dpm.c | 8 +- drivers/gpu/drm/radeon/ni_dpm.c | 8 +- drivers/gpu/drm/radeon/rv740_dpm.c | 8 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 19 +- drivers/hid/hid-logitech-hidpp.c | 2 +- drivers/hid/wacom_wac.c | 6 +- drivers/hid/wacom_wac.h | 2 +- drivers/hwmon/gsc-hwmon.c | 6 +- drivers/hwmon/pmbus/adm1275.c | 94 ++- drivers/hwtracing/coresight/coresight-core.c | 9 +- drivers/i2c/busses/i2c-qup.c | 21 +- drivers/i2c/busses/i2c-xiic.c | 39 +- drivers/iio/adc/meson_saradc.c | 2 +- drivers/infiniband/core/cma.c | 23 + drivers/infiniband/core/cma_priv.h | 1 + drivers/infiniband/core/device.c | 11 + drivers/infiniband/core/uverbs_cmd.c | 2 +- drivers/infiniband/hw/bnxt_re/main.c | 20 +- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 40 +- drivers/infiniband/hw/bnxt_re/qplib_fp.h | 2 +- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 46 +- drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 1 + drivers/infiniband/hw/efa/efa_main.c | 3 - drivers/infiniband/hw/hfi1/ipoib_tx.c | 4 +- drivers/infiniband/hw/hfi1/mmu_rb.c | 101 +-- drivers/infiniband/hw/hfi1/mmu_rb.h | 3 + drivers/infiniband/hw/hfi1/sdma.c | 27 +- drivers/infiniband/hw/hfi1/sdma.h | 62 +- drivers/infiniband/hw/hfi1/sdma_txreq.h | 2 + drivers/infiniband/hw/hfi1/user_sdma.c | 145 ++--- drivers/infiniband/hw/hfi1/user_sdma.h | 1 - drivers/infiniband/hw/hfi1/vnic_sdma.c | 4 +- drivers/infiniband/hw/hns/hns_roce_cmd.c | 27 +- drivers/infiniband/hw/hns/hns_roce_cmd.h | 4 +- drivers/infiniband/hw/hns/hns_roce_cq.c | 2 +- drivers/infiniband/hw/hns/hns_roce_device.h | 2 - drivers/infiniband/hw/hns/hns_roce_hem.c | 131 +--- drivers/infiniband/hw/hns/hns_roce_hem.h | 15 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 93 ++- drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 7 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 9 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 6 +- drivers/infiniband/hw/hns/hns_roce_main.c | 8 +- drivers/infiniband/hw/hns/hns_roce_mr.c | 4 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- drivers/infiniband/hw/hns/hns_roce_srq.c | 1 - drivers/infiniband/hw/mlx4/main.c | 14 +- drivers/infiniband/hw/mlx5/main.c | 14 +- drivers/input/misc/adxl34x.c | 3 +- drivers/input/misc/drv260x.c | 1 + drivers/irqchip/irq-jcore-aic.c | 11 +- drivers/leds/trigger/ledtrig-netdev.c | 3 + drivers/mailbox/ti-msgmgr.c | 12 +- drivers/md/bcache/btree.c | 25 +- drivers/md/bcache/btree.h | 1 + drivers/md/bcache/super.c | 4 +- drivers/md/bcache/writeback.c | 10 + drivers/md/md-bitmap.c | 17 +- drivers/md/md.c | 23 +- drivers/md/raid0.c | 62 +- drivers/md/raid0.h | 1 + drivers/md/raid10.c | 38 +- drivers/media/cec/i2c/Kconfig | 1 + drivers/media/platform/qcom/venus/helpers.c | 4 +- drivers/media/usb/dvb-usb-v2/az6007.c | 3 +- drivers/media/usb/siano/smsusb.c | 3 +- drivers/memory/brcmstb_dpfe.c | 4 +- drivers/memstick/host/r592.c | 4 +- drivers/mfd/intel-lpss-acpi.c | 3 + drivers/mfd/rt5033.c | 3 - drivers/mfd/stmfx.c | 7 +- drivers/mfd/stmpe.c | 4 +- drivers/misc/fastrpc.c | 2 +- drivers/misc/pci_endpoint_test.c | 10 +- drivers/mmc/core/quirks.h | 14 + drivers/mmc/host/mmci.c | 1 + drivers/mmc/host/sdhci.c | 4 +- drivers/mtd/nand/raw/meson_nand.c | 4 + drivers/net/dsa/vitesse-vsc73xx-core.c | 6 +- drivers/net/ethernet/amazon/ena/ena_com.c | 3 + drivers/net/ethernet/broadcom/bgmac.c | 4 +- drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 + drivers/net/ethernet/broadcom/tg3.c | 1 + drivers/net/ethernet/google/gve/gve_ethtool.c | 3 + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 5 +- drivers/net/ethernet/intel/igb/igb_main.c | 5 + drivers/net/ethernet/intel/igc/igc.h | 33 +- drivers/net/ethernet/intel/igc/igc_ethtool.c | 2 + drivers/net/ethernet/intel/igc/igc_main.c | 45 +- drivers/net/ethernet/intel/igc/igc_ptp.c | 57 +- drivers/net/ethernet/marvell/mvneta.c | 4 +- drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 11 + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 2 +- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 5 +- .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 +- drivers/net/ethernet/microchip/lan743x_main.c | 21 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 5 - drivers/net/ethernet/sfc/ef10.c | 13 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 - drivers/net/ethernet/ti/cpsw_ale.c | 24 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 10 +- drivers/net/gtp.c | 2 + drivers/net/ipvlan/ipvlan_core.c | 9 +- drivers/net/netdevsim/dev.c | 9 +- drivers/net/phy/phy_device.c | 21 +- drivers/net/ppp/pptp.c | 31 +- drivers/net/wireguard/netlink.c | 14 +- drivers/net/wireguard/queueing.c | 1 + drivers/net/wireguard/queueing.h | 25 +- drivers/net/wireguard/receive.c | 2 +- drivers/net/wireguard/send.c | 2 +- drivers/net/wireless/ath/ath11k/mac.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 27 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 8 +- drivers/net/wireless/ath/ath9k/main.c | 11 +- drivers/net/wireless/ath/ath9k/wmi.c | 4 + drivers/net/wireless/atmel/atmel_cs.c | 13 +- drivers/net/wireless/cisco/airo.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 2 +- drivers/net/wireless/intersil/orinoco/orinoco_cs.c | 13 +- .../net/wireless/intersil/orinoco/spectrum_cs.c | 13 +- drivers/net/wireless/marvell/mwifiex/scan.c | 6 +- drivers/net/wireless/microchip/wilc1000/hif.c | 8 +- drivers/net/wireless/ray_cs.c | 36 +- drivers/net/wireless/rsi/rsi_91x_sdio.c | 9 +- drivers/net/wireless/wl3501_cs.c | 27 +- drivers/ntb/hw/amd/ntb_hw_amd.c | 7 +- drivers/ntb/hw/idt/ntb_hw_idt.c | 7 +- drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 +- drivers/ntb/ntb_transport.c | 2 +- drivers/ntb/test/ntb_tool.c | 2 + drivers/nubus/proc.c | 22 +- drivers/nvme/host/pci.c | 3 +- drivers/pci/controller/cadence/pcie-cadence-host.c | 27 + drivers/pci/controller/dwc/pcie-qcom.c | 2 + drivers/pci/controller/pci-ftpci100.c | 14 +- drivers/pci/controller/pcie-rockchip-ep.c | 65 +- drivers/pci/controller/pcie-rockchip.c | 17 + drivers/pci/controller/pcie-rockchip.h | 11 +- drivers/pci/hotplug/pciehp_ctrl.c | 8 + drivers/pci/pci.c | 10 +- drivers/pci/pcie/aspm.c | 21 +- drivers/pci/quirks.c | 2 + drivers/perf/arm-cmn.c | 7 +- drivers/phy/tegra/xusb.c | 4 + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 15 +- drivers/pinctrl/pinctrl-amd.c | 41 +- drivers/pinctrl/pinctrl-amd.h | 1 + drivers/pinctrl/pinctrl-at91-pio4.c | 2 + drivers/platform/x86/wmi.c | 64 +- drivers/powercap/Kconfig | 4 +- drivers/powercap/intel_rapl_msr.c | 1 - drivers/pwm/pwm-imx-tpm.c | 7 + drivers/pwm/sysfs.c | 17 + drivers/regulator/core.c | 30 +- drivers/rtc/rtc-st-lpc.c | 2 +- drivers/s390/net/qeth_l3_sys.c | 2 +- drivers/scsi/3w-xxxx.c | 4 +- drivers/scsi/qedf/qedf_main.c | 3 +- drivers/scsi/qla2xxx/qla_attr.c | 13 + drivers/scsi/qla2xxx/qla_bsg.c | 6 + drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla2xxx/qla_inline.h | 5 +- drivers/scsi/qla2xxx/qla_iocb.c | 5 +- drivers/scsi/qla2xxx/qla_nvme.c | 3 - drivers/scsi/qla2xxx/qla_os.c | 3 +- drivers/soc/amlogic/meson-secure-pwrc.c | 2 +- drivers/soc/fsl/qe/Kconfig | 1 + drivers/spi/spi-bcm-qspi.c | 10 +- drivers/spi/spi-bcm63xx.c | 2 +- drivers/spi/spi-geni-qcom.c | 2 +- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 3 +- .../media/atomisp/pci/atomisp_gmin_platform.c | 2 +- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 3 +- drivers/thermal/mtk_thermal.c | 14 +- drivers/thermal/sun8i_thermal.c | 55 +- drivers/tty/serial/8250/8250.h | 1 - drivers/tty/serial/8250/8250_omap.c | 25 +- drivers/tty/serial/8250/8250_pci.c | 19 - drivers/tty/serial/8250/8250_port.c | 11 +- drivers/tty/serial/atmel_serial.c | 4 +- drivers/tty/serial/fsl_lpuart.c | 1 + drivers/tty/serial/samsung_tty.c | 14 +- drivers/usb/core/devio.c | 2 + drivers/usb/dwc3/dwc3-meson-g12a.c | 5 +- drivers/usb/dwc3/dwc3-qcom.c | 17 +- drivers/usb/dwc3/gadget.c | 4 +- drivers/usb/gadget/function/u_serial.c | 13 +- drivers/usb/host/xhci-mem.c | 39 +- drivers/usb/host/xhci-pci.c | 12 + drivers/usb/host/xhci.h | 2 + drivers/usb/phy/phy-tahvo.c | 2 +- drivers/usb/serial/option.c | 4 + drivers/video/fbdev/au1200fb.c | 3 + drivers/video/fbdev/imsttfb.c | 34 +- drivers/video/fbdev/imxfb.c | 4 +- drivers/video/fbdev/omap/lcd_mipid.c | 6 +- drivers/w1/slaves/w1_therm.c | 31 +- drivers/w1/w1.c | 4 +- fs/btrfs/block-group.c | 9 +- fs/btrfs/disk-io.c | 3 + fs/btrfs/qgroup.c | 3 + fs/ceph/caps.c | 9 + fs/dlm/plock.c | 4 +- fs/erofs/zdata.c | 2 +- fs/erofs/zmap.c | 6 +- fs/ext4/indirect.c | 8 + fs/ext4/inode.c | 10 - fs/ext4/ioctl.c | 5 +- fs/ext4/mballoc.c | 17 +- fs/ext4/namei.c | 17 +- fs/ext4/super.c | 13 +- fs/ext4/xattr.c | 14 + fs/f2fs/f2fs.h | 2 +- fs/f2fs/file.c | 2 +- fs/f2fs/gc.c | 22 +- fs/f2fs/namei.c | 16 +- fs/f2fs/node.c | 4 +- fs/fs_context.c | 3 +- fs/fuse/dir.c | 2 +- fs/inode.c | 42 ++ fs/internal.h | 2 + fs/jffs2/build.c | 5 +- fs/jffs2/xattr.c | 13 +- fs/jffs2/xattr.h | 4 +- fs/jfs/jfs_dmap.c | 6 + fs/jfs/jfs_filsys.h | 2 + fs/kernfs/dir.c | 2 + fs/namei.c | 25 +- fs/nfs/nfs4proc.c | 1 + fs/nfsd/nfs4xdr.c | 2 +- fs/notify/fanotify/fanotify_user.c | 22 +- fs/overlayfs/copy_up.c | 2 + fs/overlayfs/dir.c | 3 +- fs/overlayfs/export.c | 3 +- fs/overlayfs/namei.c | 3 +- fs/overlayfs/overlayfs.h | 6 +- fs/overlayfs/super.c | 2 +- fs/overlayfs/util.c | 24 +- fs/pstore/ram_core.c | 2 + fs/ramfs/inode.c | 2 +- include/asm-generic/pgtable-nop4d.h | 2 +- include/asm-generic/pgtable-nopmd.h | 2 +- include/asm-generic/pgtable-nopud.h | 2 +- include/linux/bpf-cgroup.h | 27 +- include/linux/etherdevice.h | 12 + include/linux/indirect_call_wrapper.h | 6 + include/linux/netdevice.h | 18 + include/linux/nmi.h | 2 +- include/linux/pci.h | 1 + include/linux/pgtable.h | 4 +- include/linux/pipe_fs_i.h | 4 - include/linux/ramfs.h | 1 + include/linux/sched/signal.h | 2 +- include/linux/serial_8250.h | 1 - include/linux/tcp.h | 2 +- include/linux/workqueue.h | 15 +- include/net/netfilter/nf_tables.h | 41 +- include/net/netns/ipv4.h | 1 + include/net/netns/nftables.h | 7 - include/net/nfc/nfc.h | 4 +- include/net/pkt_sched.h | 2 +- include/net/sock.h | 3 + include/net/tcp.h | 32 +- include/trace/events/timer.h | 6 +- include/uapi/linux/affs_hardblocks.h | 68 +- include/uapi/linux/auto_dev-ioctl.h | 2 +- include/uapi/linux/videodev2.h | 2 +- io_uring/io_uring.c | 66 +- kernel/bpf/bpf_lru_list.c | 21 +- kernel/bpf/bpf_lru_list.h | 7 +- kernel/bpf/cgroup.c | 46 ++ kernel/kcsan/core.c | 2 + kernel/kexec_core.c | 5 +- kernel/rcu/rcuscale.c | 214 +++---- kernel/rcu/tasks.h | 37 +- kernel/sched/fair.c | 2 +- kernel/time/posix-timers.c | 74 ++- kernel/trace/ftrace.c | 72 ++- kernel/trace/ring_buffer.c | 24 +- kernel/trace/trace.c | 3 +- kernel/trace/trace_events_hist.c | 9 +- kernel/trace/trace_probe_tmpl.h | 2 + kernel/watchdog_hld.c | 6 +- kernel/workqueue.c | 13 +- lib/debugobjects.c | 9 + lib/test_firmware.c | 12 +- lib/ts_bm.c | 4 +- mm/shmem.c | 2 +- net/bridge/br_if.c | 5 +- net/bridge/br_stp_if.c | 3 + net/can/bcm.c | 12 +- net/can/isotp.c | 5 +- net/core/devlink.c | 5 +- net/core/rtnetlink.c | 104 ++-- net/core/skbuff.c | 5 + net/core/sock.c | 17 +- net/dsa/tag_sja1105.c | 4 +- net/ipv4/esp4.c | 2 +- net/ipv4/inet_connection_sock.c | 3 +- net/ipv4/inet_hashtables.c | 17 +- net/ipv4/inet_timewait_sock.c | 8 +- net/ipv4/sysctl_net_ipv4.c | 9 + net/ipv4/tcp.c | 68 +- net/ipv4/tcp_fastopen.c | 6 +- net/ipv4/tcp_input.c | 12 +- net/ipv4/tcp_ipv4.c | 3 +- net/ipv4/tcp_minisocks.c | 9 +- net/ipv4/tcp_output.c | 2 +- net/ipv4/tcp_timer.c | 10 +- net/ipv6/addrconf.c | 3 +- net/ipv6/icmp.c | 5 +- net/ipv6/ip6_gre.c | 3 +- net/ipv6/tcp_ipv6.c | 3 +- net/ipv6/udp.c | 2 +- net/llc/llc_input.c | 3 - net/netfilter/nf_conntrack_helper.c | 4 + net/netfilter/nf_conntrack_proto_dccp.c | 52 +- net/netfilter/nf_conntrack_sip.c | 2 +- net/netfilter/nf_tables_api.c | 681 +++++++++++++++------ net/netfilter/nf_tables_offload.c | 30 +- net/netfilter/nft_byteorder.c | 14 +- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_dynset.c | 6 +- net/netfilter/nft_immediate.c | 90 ++- net/netfilter/nft_set_bitmap.c | 5 +- net/netfilter/nft_set_hash.c | 23 +- net/netfilter/nft_set_pipapo.c | 20 +- net/netfilter/nft_set_rbtree.c | 5 +- net/netlink/af_netlink.c | 5 +- net/netlink/diag.c | 7 +- net/nfc/core.c | 4 +- net/nfc/hci/llc_shdlc.c | 10 +- net/nfc/llcp.h | 9 +- net/nfc/llcp_commands.c | 59 +- net/nfc/llcp_core.c | 95 ++- net/nfc/llcp_sock.c | 21 +- net/nfc/netlink.c | 20 +- net/nfc/nfc.h | 3 +- net/sched/act_pedit.c | 1 + net/sched/cls_flower.c | 10 + net/sched/cls_fw.c | 10 +- net/sched/sch_qfq.c | 41 +- net/sctp/socket.c | 22 +- net/socket.c | 3 + net/sunrpc/svcsock.c | 23 +- net/wireless/scan.c | 217 ++++--- net/wireless/wext-core.c | 6 + net/xdp/xsk.c | 5 + samples/bpf/tcp_basertt_kern.c | 2 +- samples/ftrace/ftrace-direct-too.c | 14 +- scripts/mod/modpost.c | 26 +- scripts/tags.sh | 9 +- security/apparmor/policy_unpack.c | 9 +- security/integrity/evm/evm_main.c | 2 + security/integrity/iint.c | 15 +- security/integrity/ima/ima_modsig.c | 3 + security/integrity/ima/ima_policy.c | 3 +- security/keys/request_key.c | 35 +- security/keys/trusted-keys/trusted_tpm2.c | 2 +- sound/core/jack.c | 15 +- sound/pci/ac97/ac97_codec.c | 4 +- sound/pci/hda/patch_realtek.c | 28 +- sound/soc/codecs/es8316.c | 23 +- sound/soc/fsl/fsl_sai.c | 2 +- sound/soc/fsl/fsl_sai.h | 1 + sound/soc/fsl/imx-audmix.c | 9 + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 13 +- tools/bpf/bpftool/feature.c | 24 +- tools/include/uapi/linux/tcp.h | 357 +++++++++++ tools/lib/bpf/bpf_helpers.h | 15 +- tools/perf/builtin-bench.c | 7 +- tools/perf/builtin-script.c | 34 +- tools/perf/tests/builtin-test.c | 3 + .../tests/shell/test_uprobe_from_different_cu.sh | 77 +++ tools/perf/util/dwarf-aux.c | 2 +- .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 1 + .../selftests/bpf/prog_tests/cls_redirect.c | 1 + .../selftests/bpf/prog_tests/sockmap_basic.c | 1 + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 28 + tools/testing/selftests/bpf/progs/sockopt_sk.c | 23 +- tools/testing/selftests/bpf/test_progs.h | 1 - tools/testing/selftests/bpf/test_verifier.c | 12 +- tools/testing/selftests/bpf/verifier/spill_fill.c | 30 + tools/testing/selftests/net/rtnetlink.sh | 1 + tools/testing/selftests/tc-testing/config | 1 + tools/testing/selftests/tc-testing/settings | 1 + tools/testing/selftests/wireguard/netns.sh | 30 +- 522 files changed, 5604 insertions(+), 2683 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/509 media: atomisp: fix "variable dereferenced before check asd"
From: Tsuchiya Yuto <[email protected]>
commit ac56760a8bbb4e654b2fd54e5de79dd5d72f937d upstream.
There are two occurrences where the variable 'asd' is dereferenced before check. Fix this issue by using the variable after the check.
--- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 3 ++- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +2 -1
@@ -5243,7 +5243,7 @@ static int atomisp_set_fmt_to_isp(structint (*configure_pp_input)(struct atomisp_sub_device *asd,unsigned int width,unsigned int height) = configure_pp_input_nop; -u16 stream_index =atomisp_source_pad_to_stream_id (asd, source_pad); +u16 stream_index;const struct atomisp_in_fmt_conv *fc;int ret, i;
@@ -5252,6 +5252,7 @@ static int atomisp_set_fmt_to_isp(struct __func__, vdev->name);return -EINVAL ; } + stream_index =atomisp_source_pad_to_stream_id (asd, source_pad);v4l2_fh_init (&fh.vfh, vdev);
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +2 -1
@@ -1123,7 +1123,7 @@ int __atomisp_reqbufs(struct file *file,struct ia_css_frame *frame;struct videobuf_vmalloc_memory *vm_mem;u16 source_pad =atomisp_subdev_source_pad (vdev); -u16 stream_id =atomisp_source_pad_to_stream_id (asd, source_pad); +u16 stream_id;int ret =0 , i =0 ;if (!asd) {
@@ -1131,6 +1131,7 @@ int __atomisp_reqbufs(struct file *file, __func__, vdev->name);return -EINVAL ; } + stream_id =atomisp_source_pad_to_stream_id (asd, source_pad);if (req->count ==0 ) {mutex_lock (&pipe->capq.vb_lock);
Greg Kroah-Hartman
maintainerPATCH 2/509 x86/smp: Use dedicated cache-line for mwait_play_dead()
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit f9c9987bf52f4e42e940ae217333ebb5a4c3b506 upstream.
Monitoring idletask::thread_info::flags in mwait_play_dead() has been an obvious choice as all what is needed is a cache line which is not written by other CPUs.
But there is a use case where a "dead" CPU needs to be brought out of
MWAIT: kexec().
This is required as kexec() can overwrite text, pagetables, stacks and the monitored cacheline of the original kernel. The latter causes MWAIT to resume execution which obviously causes havoc on the kexec kernel which results usually in triple faults.
Use a dedicated per CPU storage to prepare for that.
--- arch/x86/kernel/smpboot.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
arch/x86/kernel/smpboot.c +14 -10
@@ -100,6 +100,17 @@ DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t DEFINE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info);EXPORT_PER_CPU_SYMBOL (cpu_info); +struct mwait_cpu_dead { +unsigned int control; +unsigned int status; +}; + +/* +* Cache line aligned data for mwait_play_dead(). Separate on purpose so +* that it's unlikely to be touched by other CPUs. +*/ +static DEFINE_PER_CPU_ALIGNED(struct mwait_cpu_dead, mwait_cpu_dead); +/* Logical package management. We might want to allocate that dynamically */ unsigned int __max_logical_packages__read_mostly ;EXPORT_SYMBOL (__max_logical_packages);
@@ -1674,10 +1685,10 @@ EXPORT_SYMBOL_GPL(cond_wakeup_cpu0);*/ static inline void mwait_play_dead (void ) { +struct mwait_cpu_dead *md =this_cpu_ptr (&mwait_cpu_dead);unsigned int eax, ebx, ecx, edx;unsigned int highest_cstate =0 ;unsigned int highest_subcstate =0 ; -void *mwait_ptr;int i; if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD ||
@@ -1712,13 +1723,6 @@ static inline void mwait_play_dead(void) (highest_subcstate -1 ); } -/* -* This should be a memory location in a cache line which is -* unlikely to be touched by other processors. The actual -* content is immaterial as it is not actually modified in any way. -*/ - mwait_ptr = ¤t_thread_info ()->flags; -wbinvd ();while (1 ) {
@@ -1730,9 +1734,9 @@ static inline void mwait_play_dead(void)* case where we return around the loop. */ mb (); -clflush (mwait_ptr); +clflush (md);mb (); -__monitor (mwait_ptr,0 ,0 ); +__monitor (md,0 ,0 );mb ();__mwait (eax,0 );
Greg Kroah-Hartman
maintainerPATCH 3/509 can: isotp: isotp_sendmsg(): fix return error fix on TX path
In reply to Greg Kroah-HartmanFrom: Oliver Hartkopp <[email protected]>
commit e38910c0072b541a91954682c8b074a93e57c09b upstream.
With commit d674a8f123b4 ("can: isotp: isotp_sendmsg(): fix return error on FC timeout on TX path") the missing correct return value in the case of a protocol error was introduced.
But the way the error value has been read and sent to the user space does not follow the common scheme to clear the error after reading which is provided by the sock_error() function. This leads to an error report at the following write() attempt although everything should be working.
--- net/can/isotp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/can/isotp.c +3 -2
@@ -990,8 +990,9 @@ static int isotp_sendmsg(struct socket */* wait for complete transmission of current pdu */ wait_event_interruptible (so->wait, so->tx.state ==ISOTP_IDLE ); -if (sk->sk_err) -return -sk->sk_err; + err =sock_error (sk); +if (err) +return err; }return size;
Greg Kroah-Hartman
maintainerPATCH 4/509 video: imsttfb: check for ioremap() failures
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit 13b7c0390a5d3840e1e2cda8f44a310fdbb982de upstream.
We should check if ioremap() were to somehow fail in imsttfb_probe() and handle the unwinding of the resources allocated here properly.
Ideally if anyone cares about this driver (it's for a PowerMac era PCI display card), they wouldn't even be using fbdev anymore. Or the devm_* apis could be used, but that's just extra work for diminishing returns...
--- drivers/video/fbdev/imsttfb.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/video/fbdev/imsttfb.c +18 -3
@@ -1469,6 +1469,7 @@ static int imsttfb_probe(struct pci_devstruct imstt_par *par;struct fb_info *info;struct device_node *dp; +int ret = -ENOMEM ; dp =pci_device_to_OF_node (pdev);if (dp)
@@ -1504,23 +1505,37 @@ static int imsttfb_probe(struct pci_devdefault :printk (KERN_INFO "imsttfb: Device 0x%x unknown, " "contact maintainer.\n" , pdev->device); -release_mem_region (addr, size); -framebuffer_release (info); -return -ENODEV ; + ret = -ENODEV ; + goto error; } info->fix.smem_start = addr; info->screen_base = (__u8 *)ioremap (addr, par->ramdac ==IBM ?0x400000 :0x800000 ); +if (!info->screen_base) + goto error; info->fix.mmio_start = addr +0x800000 ; par->dc_regs =ioremap (addr +0x800000 ,0x1000 ); +if (!par->dc_regs) + goto error; par->cmap_regs_phys = addr +0x840000 ; par->cmap_regs = (__u8 *)ioremap (addr +0x840000 ,0x1000 ); +if (!par->cmap_regs) + goto error; info->pseudo_palette = par->palette;init_imstt (info);pci_set_drvdata (pdev, info);return 0 ; + +error: +if (par->dc_regs) +iounmap (par->dc_regs); +if (info->screen_base) +iounmap (info->screen_base); +release_mem_region (addr, size); +framebuffer_release (info); +return ret; }static void imsttfb_remove (struct pci_dev *pdev)
Greg Kroah-Hartman
maintainerPATCH 5/509 fbdev: imsttfb: Fix use after free bug in imsttfb_probe
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
commit c75f5a55061091030a13fef71b9995b89bc86213 upstream.
A use-after-free bug may occur if init_imstt invokes framebuffer_release and free the info ptr. The caller, imsttfb_probe didn't notice that and still keep the ptr as private data in pdev.
If we remove the driver which will call imsttfb_remove to make cleanup, UAF happens.
Fix it by return error code if bad case happens in init_imstt.
--- drivers/video/fbdev/imsttfb.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/video/fbdev/imsttfb.c +8 -7
@@ -1346,7 +1346,7 @@ static const struct fb_ops imsttfb_ops = .fb_ioctl = imsttfb_ioctl, }; -static void init_imstt (struct fb_info *info) +static int init_imstt (struct fb_info *info) {struct imstt_par *par = info->par;__u32 i, tmp, *ip, *end;
@@ -1419,7 +1419,7 @@ static void init_imstt(struct fb_info *i || !(compute_imstt_regvals(par, info->var.xres, info->var.yres))) {printk ("imsttfb: %ux%ux%u not supported\n" , info->var.xres, info->var.yres, info->var.bits_per_pixel);framebuffer_release (info); -return ; +return -ENODEV ; }sprintf (info->fix.id,"IMS TT (%s)" , par->ramdac ==IBM ?"IBM" :"TVP" );
@@ -1455,12 +1455,13 @@ static void init_imstt(struct fb_info *iif (register_framebuffer (info) <0 ) {framebuffer_release (info); -return ; +return -ENODEV ; } tmp = (read_reg_le32 (par->dc_regs,SSTATUS ) &0x0f00 ) >>8 ;fb_info (info,"%s frame buffer; %uMB vram; chip version %u\n" , info->fix.id, info->fix.smem_len >>20 , tmp); +return 0 ; }static int imsttfb_probe (struct pci_dev *pdev,const struct pci_device_id *ent)
@@ -1523,10 +1524,10 @@ static int imsttfb_probe(struct pci_devif (!par->cmap_regs) goto error; info->pseudo_palette = par->palette; -init_imstt (info); - -pci_set_drvdata (pdev, info); -return 0 ; + ret =init_imstt (info); +if (!ret) +pci_set_drvdata (pdev, info); +return ret; error:if (par->dc_regs)
Greg Kroah-Hartman
maintainerPATCH 6/509 HID: wacom: Use ktime_t rather than int when dealing with timestamps
In reply to Greg Kroah-HartmanFrom: Jason Gerecke <[email protected]>
commit 9a6c0e28e215535b2938c61ded54603b4e5814c5 upstream.
Code which interacts with timestamps needs to use the ktime_t type returned by functions like ktime_get. The int type does not offer enough space to store these values, and attempting to use it is a recipe for problems. In this particular case, overflows would occur when calculating/storing timestamps leading to incorrect values being reported to userspace. In some cases these bad timestamps cause input handling in userspace to appear hung.
--- drivers/hid/wacom_wac.c | 6 +++--- drivers/hid/wacom_wac.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/hid/wacom_wac.c +3 -3
@@ -1307,7 +1307,7 @@ static void wacom_intuos_pro2_bt_pen(strstruct input_dev *pen_input = wacom->pen_input;unsigned char *data = wacom->data;int number_of_valid_frames =0 ; -int time_interval =15000000 ; +ktime_t time_interval =15000000 ;ktime_t time_packet_received =ktime_get ();int i;
@@ -1341,7 +1341,7 @@ static void wacom_intuos_pro2_bt_pen(strif (number_of_valid_frames) {if (wacom->hid_data.time_delayed) time_interval =ktime_get () - wacom->hid_data.time_delayed; - time_interval /= number_of_valid_frames; + time_interval =div_u64 (time_interval, number_of_valid_frames); wacom->hid_data.time_delayed = time_packet_received; }
@@ -1352,7 +1352,7 @@ static void wacom_intuos_pro2_bt_pen(strbool range = frame[0 ] &0x20 ;bool invert = frame[0 ] &0x10 ;int frames_number_reversed = number_of_valid_frames - i -1 ; -int event_timestamp = time_packet_received - frames_number_reversed * time_interval; +ktime_t event_timestamp = time_packet_received - frames_number_reversed * time_interval;if (!valid)continue ;
drivers/hid/wacom_wac.h +1 -1
@@ -320,7 +320,7 @@ struct hid_data {int bat_connected;int ps_connected;bool pad_input_event_flag; -int time_delayed; +ktime_t time_delayed; };struct wacom_remote_data {
Greg Kroah-Hartman
maintainerPATCH 7/509 HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651.
In reply to Greg Kroah-HartmanFrom: Mike Hommey <[email protected]>
commit 5fe251112646d8626818ea90f7af325bab243efa upstream.
commit 498ba2069035 ("HID: logitech-hidpp: Don't restart communication if not necessary") put restarting communication behind that flag, and this was apparently necessary on the T651, but the flag was not set for it.
--- drivers/hid/hid-logitech-hidpp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-logitech-hidpp.c +1 -1
@@ -4009,7 +4009,7 @@ static const struct hid_device_id hidpp_ {/* wireless touchpad T651 */ HID_BLUETOOTH_DEVICE (USB_VENDOR_ID_LOGITECH , USB_DEVICE_ID_LOGITECH_T651), - .driver_data = HIDPP_QUIRK_CLASS_WTP }, + .driver_data = HIDPP_QUIRK_CLASS_WTP | HIDPP_QUIRK_DELAYED_INIT }, { /* Mouse Logitech Anywhere MX */ LDJ_DEVICE(0x1017), .driver_data = HIDPP_QUIRK_HI_RES_SCROLL_1P0 }, { /* Mouse Logitech Cube */
Greg Kroah-Hartman
maintainerPATCH 8/509 Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe"
In reply to Greg Kroah-HartmanFrom: Ricardo Cañuelo <[email protected]>
commit 86edac7d3888c715fe3a81bd61f3617ecfe2e1dd upstream.
This reverts commit f05c7b7d9ea9477fcc388476c6f4ade8c66d2d26.
That change was causing a regression in the generic-adc-thermal-probed bootrr test as reported in the kernelci-results list [1].
A proper rework will take longer, so revert it for now.
[1] https://groups.io/g/kernelci-results/message/42660
--- drivers/thermal/mtk_thermal.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/thermal/mtk_thermal.c +2 -12
@@ -1026,12 +1026,7 @@ static int mtk_thermal_probe(struct platreturn -ENODEV ; } - auxadc_base =devm_of_iomap (&pdev->dev, auxadc,0 ,NULL ); -if (IS_ERR (auxadc_base)) { -of_node_put (auxadc); -return PTR_ERR (auxadc_base); - } - + auxadc_base =of_iomap (auxadc,0 ); auxadc_phys_base =of_get_phys_base (auxadc);of_node_put (auxadc);
@@ -1047,12 +1042,7 @@ static int mtk_thermal_probe(struct platreturn -ENODEV ; } - apmixed_base =devm_of_iomap (&pdev->dev, apmixedsys,0 ,NULL ); -if (IS_ERR (apmixed_base)) { -of_node_put (apmixedsys); -return PTR_ERR (apmixed_base); - } - + apmixed_base =of_iomap (apmixedsys,0 ); apmixed_phys_base =of_get_phys_base (apmixedsys);of_node_put (apmixedsys);
Greg Kroah-Hartman
maintainerPATCH 9/509 scripts/tags.sh: Resolve gtags empty index generation
In reply to Greg Kroah-HartmanFrom: Ahmed S. Darwish <[email protected]>
commit e1b37563caffc410bb4b55f153ccb14dede66815 upstream.
gtags considers any file outside of its current working directory "outside the source tree" and refuses to index it. For O= kernel builds, or when "make" is invoked from a directory other then the kernel source tree, gtags ignores the entire kernel source and generates an empty index.
Force-set gtags current working directory to the kernel source tree.
Due to commit 9da0763bdd82 ("kbuild: Use relative path when building in a subdir of the source tree"), if the kernel build is done in a sub-directory of the kernel source tree, the kernel Makefile will set the kernel's $srctree to ".." for shorter compile-time and run-time warnings. Consequently, the list of files to be indexed will be in the "../*" form, rendering all such paths invalid once gtags switches to the kernel source tree as its current working directory.
If gtags indexing is requested and the build directory is not the kernel source tree, index all files in absolute-path form.
Note, indexing in absolute-path form will not affect the generated index, as paths in gtags indices are always relative to the gtags "root directory" anyway (as evidenced by "gtags --dump").
--- scripts/tags.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
scripts/tags.sh +8 -1
@@ -32,6 +32,13 @@ else ignore="$ignore ( -path ${tree}tools ) -prune -o" fi +# gtags(1) refuses to index any file outside of its current working dir. +# If gtags indexing is requested and the build output directory is not +# the kernel source tree, index all files in absolute-path form. +if [[ "$1" == "gtags" && -n "${tree}" ]]; then + tree=$(realpath "$tree")/ +fi + # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH if [ "${ALLSOURCE_ARCHS}" = "" ]; then ALLSOURCE_ARCHS=${SRCARCH}
@@ -131,7 +138,7 @@ docscope() dogtags() { - all_target_sources | gtags -i -f - + all_target_sources | gtags -i -C "${tree:-.}" -f - "$PWD" } # Basic regular expressions with an optional /kind-spec/ for ctags and
Greg Kroah-Hartman
maintainerPATCH 10/509 drm/amdgpu: Validate VM ioctl flags.
In reply to Greg Kroah-HartmanFrom: Bas Nieuwenhuizen <[email protected]>
commit a2b308044dcaca8d3e580959a4f867a1d5c37fac upstream.
None have been defined yet, so reject anybody setting any. Mesa sets it to 0 anyway.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -0
@@ -3252,6 +3252,10 @@ int amdgpu_vm_ioctl(struct drm_device *dlong timeout =msecs_to_jiffies (2000 );int r; +/* No valid flags defined yet */ +if (args->in.flags) +return -EINVAL ; +switch (args->in.op) {case AMDGPU_VM_OP_RESERVE_VMID :/* We only have requirement to reserve vmid from gfxhub */
Greg Kroah-Hartman
maintainerPATCH 11/509 nubus: Partially revert proc_create_single_data() conversion
In reply to Greg Kroah-HartmanFrom: Finn Thain <[email protected]>
commit 0e96647cff9224db564a1cee6efccb13dbe11ee2 upstream.
The conversion to proc_create_single_data() introduced a regression whereby reading a file in /proc/bus/nubus results in a seg fault:
# grep -r . /proc/bus/nubus/e/
Data read fault at 0x00000020 in Super Data (pc=0x1074c2)
BAD KERNEL BUSERR
Oops: 00000000
Modules linked in:
PC: [<001074c2>] PDE_DATA+0xc/0x16
SR: 2010 SP: 38284958 a2: 01152370
d0: 00000001 d1: 01013000 d2: 01002790 d3: 00000000
d4: 00000001 d5: 0008ce2e a0: 00000000 a1: 00222a40
Process grep (pid: 45, task=142f8727)
Frame format=B ssw=074d isc=2008 isb=4e5e daddr=00000020 dobuf=01199e70
baddr=001074c8 dibuf=ffffffff ver=f
Stack from 01199e48:
01199e70 00222a58 01002790 00000000 011a3000 01199eb0 015000c0 00000000
00000000 01199ec0 01199ec0 000d551a 011a3000 00000001 00000000 00018000
d003f000 00000003 00000001 0002800d 01052840 01199fa8 c01f8000 00000000
00000029 0b532b80 00000000 00000000 00000029 0b532b80 01199ee4 00103640
011198c0 d003f000 00018000 01199fa8 00000000 011198c0 00000000 01199f4c
000b3344 011198c0 d003f000 00018000 01199fa8 00000000 00018000 011198c0
Call Trace: [<00222a58>] nubus_proc_rsrc_show+0x18/0xa0
[<000d551a>] seq_read+0xc4/0x510
[<00018000>] fp_fcos+0x2/0x82
[<0002800d>] __sys_setreuid+0x115/0x1c6
[<00103640>] proc_reg_read+0x5c/0xb0
[<00018000>] fp_fcos+0x2/0x82
[<000b3344>] __vfs_read+0x2c/0x13c
[<00018000>] fp_fcos+0x2/0x82
[<00018000>] fp_fcos+0x2/0x82
[<000b8aa2>] sys_statx+0x60/0x7e
[<000b34b6>] vfs_read+0x62/0x12a
[<00018000>] fp_fcos+0x2/0x82
[<00018000>] fp_fcos+0x2/0x82
[<000b39c2>] ksys_read+0x48/0xbe
[<00018000>] fp_fcos+0x2/0x82
[<000b3a4e>] sys_read+0x16/0x1a
[<00018000>] fp_fcos+0x2/0x82
[<00002b84>] syscall+0x8/0xc
[<00018000>] fp_fcos+0x2/0x82
[<0000c016>] not_ext+0xa/0x18
Code: 4e5e 4e75 4e56 0000 206e 0008 2068 ffe8 <2068> 0020 2008 4e5e 4e75 4e56 0000 2f0b 206e 0008 2068 0004 2668 0020 206b ffe8
Disabling lock debugging due to kernel taintSegmentation fault
The proc_create_single_data() conversion does not work because single_open(file, nubus_proc_rsrc_show, PDE_DATA(inode)) is not equivalent to the original code.
--- drivers/nubus/proc.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
drivers/nubus/proc.c +17 -5
@@ -137,6 +137,18 @@ static int nubus_proc_rsrc_show(struct sreturn 0 ; } +static int nubus_rsrc_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, nubus_proc_rsrc_show, inode); +} + +static const struct proc_ops nubus_rsrc_proc_ops = { + .proc_open = nubus_rsrc_proc_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, +}; +void nubus_proc_add_rsrc_mem (struct proc_dir_entry *procdir,const struct nubus_dirent *ent,unsigned int size)
@@ -152,8 +164,8 @@ void nubus_proc_add_rsrc_mem(struct proc pde_data =nubus_proc_alloc_pde_data (nubus_dirptr (ent), size); else pde_data =NULL ; -proc_create_single_data (name,S_IFREG |0444 , procdir, - nubus_proc_rsrc_show, pde_data); +proc_create_data (name,S_IFREG |0444 , procdir, + &nubus_rsrc_proc_ops, pde_data); } void nubus_proc_add_rsrc(struct proc_dir_entry *procdir,
@@ -166,9 +178,9 @@ void nubus_proc_add_rsrc(struct proc_dirreturn ;snprintf (name,sizeof (name),"%x" , ent->type); -proc_create_single_data (name,S_IFREG |0444 , procdir, - nubus_proc_rsrc_show, -nubus_proc_alloc_pde_data (data,0 )); +proc_create_data (name,S_IFREG |0444 , procdir, + &nubus_rsrc_proc_ops, +nubus_proc_alloc_pde_data (data,0 )); }/*
Greg Kroah-Hartman
maintainerPATCH 12/509 fs: pipe: reveal missing function protoypes
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 247c8d2f9837a3e29e3b6b7a4aa9c36c37659dd4 ]
A couple of functions from fs/pipe.c are used both internally and for the watch queue code, but the declaration is only visible when the latter is enabled:
fs/pipe.c:1254:5: error: no previous prototype for 'pipe_resize_ring' fs/pipe.c:758:15: error: no previous prototype for 'account_pipe_buffers' fs/pipe.c:764:6: error: no previous prototype for 'too_many_pipe_buffers_soft' fs/pipe.c:771:6: error: no previous prototype for 'too_many_pipe_buffers_hard' fs/pipe.c:777:6: error: no previous prototype for 'pipe_is_unprivileged_user'
Make the visible unconditionally to avoid these warnings.
Message-Id: <[email protected]>
--- include/linux/pipe_fs_i.h | 4 ---- 1 file changed, 4 deletions(-)
include/linux/pipe_fs_i.h +0 -4
@@ -256,18 +256,14 @@ void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *);extern const struct pipe_buf_operations nosteal_pipe_buf_ops; -#ifdef CONFIG_WATCH_QUEUE unsigned long account_pipe_buffers (struct user_struct *user,unsigned long old,unsigned long new);bool too_many_pipe_buffers_soft (unsigned long user_bufs);bool too_many_pipe_buffers_hard (unsigned long user_bufs);bool pipe_is_unprivileged_user (void ); -#endif /* for F_SETPIPE_SZ and F_GETPIPE_SZ */ -#ifdef CONFIG_WATCH_QUEUE int pipe_resize_ring (struct pipe_inode_info *pipe,unsigned int nr_slots); -#endif long pipe_fcntl (struct file *,unsigned int ,unsigned long arg);struct pipe_inode_info *get_pipe_info (struct file *file,bool for_splice);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 13/509 x86/resctrl: Only show tasks pid in current pid namespace
In reply to Greg Kroah-HartmanFrom: Shawn Wang <[email protected]>
[ Upstream commit 2997d94b5dd0e8b10076f5e0b6f18410c73e28bd ]
When writing a task id to the "tasks" file in an rdtgroup, rdtgroup_tasks_write() treats the pid as a number in the current pid namespace. But when reading the "tasks" file, rdtgroup_tasks_show() shows the list of global pids from the init namespace, which is confusing and incorrect.
To be more robust, let the "tasks" file only show pids in the current pid namespace.
--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/resctrl/rdtgroup.c +6 -2
@@ -715,11 +715,15 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,static void show_rdt_tasks (struct rdtgroup *r,struct seq_file *s) {struct task_struct *p, *t; +pid_t pid;rcu_read_lock ();for_each_process_thread (p, t) { -if (is_closid_match (t, r) ||is_rmid_match (t, r)) -seq_printf (s,"%d\n" , t->pid); +if (is_closid_match (t, r) ||is_rmid_match (t, r)) { + pid =task_pid_vnr (t); +if (pid) +seq_printf (s,"%d\n" , pid); + } }rcu_read_unlock (); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 14/509 blk-iocost: use spin_lock_irqsave in adjust_inuse_and_calc_cost
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 8d211554679d0b23702bd32ba04aeac0c1c4f660 ]
adjust_inuse_and_calc_cost() use spin_lock_irq() and IRQ will be enabled when unlock. DEADLOCK might happen if we have held other locks and disabled IRQ before invoking it.
Fix it by using spin_lock_irqsave() instead, which can keep IRQ state consistent with before when unlock.
================================
WARNING: inconsistent lock state
5.10.0-02758-g8e5f91fd772f #26 Not tainted
--------------------------------
inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage. kworker/2:3/388 [HC0[0]:SC0[0]:HE0:SE1] takes:
ffff888118c00c28 (&bfqd->lock){?.-.}-{2:2}, at: spin_lock_irq ffff888118c00c28 (&bfqd->lock){?.-.}-{2:2}, at: bfq_bio_merge+0x141/0x390 {IN-HARDIRQ-W} state was registered at:
__lock_acquire+0x3d7/0x1070
lock_acquire+0x197/0x4a0
__raw_spin_lock_irqsave
_raw_spin_lock_irqsave+0x3b/0x60
bfq_idle_slice_timer_body
bfq_idle_slice_timer+0x53/0x1d0
__run_hrtimer+0x477/0xa70
__hrtimer_run_queues+0x1c6/0x2d0
hrtimer_interrupt+0x302/0x9e0
local_apic_timer_interrupt
__sysvec_apic_timer_interrupt+0xfd/0x420
run_sysvec_on_irqstack_cond
sysvec_apic_timer_interrupt+0x46/0xa0
asm_sysvec_apic_timer_interrupt+0x12/0x20
irq event stamp: 837522
hardirqs last enabled at (837521): [<ffffffff84b9419d>] __raw_spin_unlock_irqrestore
hardirqs last enabled at (837521): [<ffffffff84b9419d>] _raw_spin_unlock_irqrestore+0x3d/0x40
hardirqs last disabled at (837522): [<ffffffff84b93fa3>] __raw_spin_lock_irq
hardirqs last disabled at (837522): [<ffffffff84b93fa3>] _raw_spin_lock_irq+0x43/0x50
softirqs last enabled at (835852): [<ffffffff84e00558>] __do_softirq+0x558/0x8ec
softirqs last disabled at (835845): [<ffffffff84c010ff>] asm_call_irq_on_stack+0xf/0x20other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(&bfqd->lock);
<Interrupt>
lock(&bfqd->lock);*** DEADLOCK ***
3 locks held by kworker/2:3/388:
#0: ffff888107af0f38 ((wq_completion)kthrotld){+.+.}-{0:0}, at: process_one_work+0x742/0x13f0 #1: ffff8881176bfdd8 ((work_completion)(&td->dispatch_work)){+.+.}-{0:0}, at: process_one_work+0x777/0x13f0 #2: ffff888118c00c28 (&bfqd->lock){?.-.}-{2:2}, at: spin_lock_irq
#2: ffff888118c00c28 (&bfqd->lock){?.-.}-{2:2}, at: bfq_bio_merge+0x141/0x390
stack backtrace: CPU: 2 PID: 388 Comm: kworker/2:3 Not tainted 5.10.0-02758-g8e5f91fd772f #26 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 Workqueue: kthrotld blk_throtl_dispatch_work_fn Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x107/0x167 print_usage_bug valid_state mark_lock_irq.cold+0x32/0x3a mark_lock+0x693/0xbc0 mark_held_locks+0x9e/0xe0 __trace_hardirqs_on_caller lockdep_hardirqs_on_prepare.part.0+0x151/0x360 trace_hardirqs_on+0x5b/0x180 __raw_spin_unlock_irq _raw_spin_unlock_irq+0x24/0x40 spin_unlock_irq adjust_inuse_and_calc_cost+0x4fb/0x970 ioc_rqos_merge+0x277/0x740 __rq_qos_merge+0x62/0xb0 rq_qos_merge bio_attempt_back_merge+0x12c/0x4a0 blk_mq_sched_try_merge+0x1b6/0x4d0 bfq_bio_merge+0x24a/0x390 __blk_mq_sched_bio_merge+0xa6/0x460 blk_mq_sched_bio_merge blk_mq_submit_bio+0x2e7/0x1ee0 __submit_bio_noacct_mq+0x175/0x3b0 submit_bio_noacct+0x1fb/0x270 blk_throtl_dispatch_work_fn+0x1ef/0x2b0 process_one_work+0x83e/0x13f0 process_scheduled_works worker_thread+0x7e3/0xd80 kthread+0x353/0x470 ret_from_fork+0x1f/0x30
--- block/blk-iocost.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
block/blk-iocost.c +4 -3
@@ -2426,6 +2426,7 @@ static u64 adjust_inuse_and_calc_cost(struct ioc_gq *iocg, u64 vtime,u32 hwi, adj_step;s64 margin;u64 cost, new_inuse; +unsigned long flags;current_hweight (iocg,NULL , &hwi); old_hwi = hwi;
@@ -2444,11 +2445,11 @@ static u64 adjust_inuse_and_calc_cost(struct ioc_gq *iocg, u64 vtime, iocg->inuse == iocg->active)return cost; -spin_lock_irq (&ioc->lock); +spin_lock_irqsave (&ioc->lock, flags);/* we own inuse only when @iocg is in the normal active state */ if (iocg->abs_vdebt ||list_empty (&iocg->active_list)) { -spin_unlock_irq (&ioc->lock); +spin_unlock_irqrestore (&ioc->lock, flags);return cost; }
@@ -2469,7 +2470,7 @@ static u64 adjust_inuse_and_calc_cost(struct ioc_gq *iocg, u64 vtime, }while (time_after64 (vtime + cost, now->vnow) && iocg->inuse != iocg->active); -spin_unlock_irq (&ioc->lock); +spin_unlock_irqrestore (&ioc->lock, flags);TRACE_IOCG_PATH (inuse_adjust, iocg, now, old_inuse, iocg->inuse, old_hwi, hwi);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 15/509 md/raid10: check slab-out-of-bounds in md_bitmap_get_counter
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 301867b1c16805aebbc306aafa6ecdc68b73c7e5 ]
If we write a large number to md/bitmap_set_bits, md_bitmap_checkpage() will return -EINVAL because 'page >= bitmap->pages', but the return value was not checked immediately in md_bitmap_get_counter() in order to set *blocks value and slab-out-of-bounds occurs.
Move check of 'page >= bitmap->pages' to md_bitmap_get_counter() and return directly if true.
--- drivers/md/md-bitmap.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/md/md-bitmap.c +9 -8
@@ -54,14 +54,7 @@ __acquires(bitmap->lock) {unsigned char *mappage; -if (page >= bitmap->pages) { -/* This can happen if bitmap_start_sync goes beyond -* End-of-device while looking for a whole page. -* It is harmless. -*/ -return -EINVAL ; - } - +WARN_ON_ONCE (page >= bitmap->pages);if (bitmap->bp[page].hijacked)/* it's hijacked, don't try to alloc */ return 0 ;
@@ -1365,6 +1358,14 @@ __acquires(bitmap->lock)sector_t csize;int err; +if (page >= bitmap->pages) { +/* +* This can happen if bitmap_start_sync goes beyond +* End-of-device while looking for a whole page or +* user set a huge number to sysfs bitmap_set_bits. +*/ +return NULL ; + } err =md_bitmap_checkpage (bitmap, page, create,0 ); if (bitmap->bp[page].hijacked ||
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 16/509 md/raid10: fix overflow of md/safe_mode_delay
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 6beb489b2eed25978523f379a605073f99240c50 ]
There is no input check when echo md/safe_mode_delay in safe_delay_store(). And msec might also overflow when HZ < 1000 in safe_delay_show(), Fix it by checking overflow in safe_delay_store() and use unsigned long conversion in safe_delay_show().
--- drivers/md/md.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/md/md.c +4 -3
@@ -3890,8 +3890,9 @@ int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale)static ssize_t safe_delay_show (struct mddev *mddev,char *page) { -int msec = (mddev->safemode_delay*1000 )/HZ ; -return sprintf (page,"%d.%03d\n" , msec/1000 , msec%1000 ); +unsigned int msec = ((unsigned long )mddev->safemode_delay*1000 )/HZ ; + +return sprintf (page,"%u.%03u\n" , msec/1000 , msec%1000 ); }static ssize_t safe_delay_store (struct mddev *mddev,const char *cbuf,size_t len)
@@ -3903,7 +3904,7 @@ safe_delay_store(struct mddev *mddev, const char *cbuf, size_t len)return -EINVAL ; } -if (strict_strtoul_scaled (cbuf, &msec,3 ) <0 ) +if (strict_strtoul_scaled (cbuf, &msec,3 ) <0 || msec >UINT_MAX /HZ )return -EINVAL ;if (msec ==0 ) mddev->safemode_delay =0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 17/509 md/raid10: fix wrong setting of max_corr_read_errors
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit f8b20a405428803bd9881881d8242c9d72c6b2b2 ]
There is no input check when echo md/max_read_errors and overflow might occur. Add check of input number.
--- drivers/md/md.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/md/md.c +2 -0
@@ -4574,6 +4574,8 @@ max_corrected_read_errors_store(struct mddev *mddev, const char *buf, size_t len rv =kstrtouint (buf,10 , &n);if (rv <0 )return rv; +if (n >INT_MAX ) +return -EINVAL ;atomic_set (&mddev->max_corr_read_errors, n);return len; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 18/509 md/raid10: fix null-ptr-deref of mreplace in raid10_sync_request
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 34817a2441747b48e444cb0e05d84e14bc9443da ]
There are two check of 'mreplace' in raid10_sync_request(). In the first check, 'need_replace' will be set and 'mreplace' will be used later if no-Faulty 'mreplace' exists, In the second check, 'mreplace' will be set to NULL if it is Faulty, but 'need_replace' will not be changed accordingly. null-ptr-deref occurs if Faulty is set between two check.
Fix it by merging two checks into one. And replace 'need_replace' with 'mreplace' because their values are always the same.
--- drivers/md/raid10.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/md/raid10.c +5 -9
@@ -3037,7 +3037,6 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,int must_sync;int any_working;int need_recover =0 ; -int need_replace =0 ;struct raid10_info *mirror = &conf->mirrors[i];struct md_rdev *mrdev, *mreplace;
@@ -3049,11 +3048,10 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, !test_bit(Faulty, &mrdev->flags) && !test_bit(In_sync, &mrdev->flags)) need_recover =1 ; -if (mreplace !=NULL && - !test_bit (Faulty, &mreplace->flags)) - need_replace =1 ; +if (mreplace &&test_bit (Faulty, &mreplace->flags)) + mreplace =NULL ; -if (!need_recover && !need_replace) { +if (!need_recover && !mreplace) {rcu_read_unlock ();continue ; }
@@ -3069,8 +3067,6 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,rcu_read_unlock ();continue ; } -if (mreplace &&test_bit (Faulty, &mreplace->flags)) - mreplace =NULL ;/* Unless we are doing a full sync, or a replacement * we only need to recover the block if it is set in * the bitmap
@@ -3193,11 +3189,11 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, bio = r10_bio->devs[1 ].repl_bio;if (bio) bio->bi_end_io =NULL ; -/* Note: if need_replace, then bio +/* Note: if replace is not NULL, then bio * cannot be NULL as r10buf_pool_alloc will * have allocated it. */ -if (!need_replace) +if (!mreplace)break ; bio->bi_next = biolist; biolist = bio;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 19/509 md/raid10: fix io loss while replacement replace rdev
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 2ae6aaf76912bae53c74b191569d2ab484f24bf3 ]
When removing a disk with replacement, the replacement will be used to replace rdev. During this process, there is a brief window in which both rdev and replacement are read as NULL in raid10_write_request(). This will result in io not being submitted but it should be.
//remove //write
raid10_remove_disk raid10_write_request
mirror->rdev = NULL
read rdev -> NULL mirror->rdev = mirror->replacement mirror->replacement = NULL read replacement -> NULL
Fix it by reading replacement first and rdev later, meanwhile, use smp_mb() to prevent memory reordering.
--- drivers/md/raid10.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/md/raid10.c +18 -4
@@ -751,8 +751,16 @@ static struct md_rdev *read_balance(struct r10conf *conf, disk = r10_bio->devs[slot].devnum; rdev =rcu_dereference (conf->mirrors[disk].replacement);if (rdev ==NULL ||test_bit (Faulty, &rdev->flags) || - r10_bio->devs[slot].addr + sectors > rdev->recovery_offset) + r10_bio->devs[slot].addr + sectors > + rdev->recovery_offset) { +/* +* Read replacement first to prevent reading both rdev +* and replacement as NULL during replacement replace +* rdev. +*/ +smp_mb (); rdev =rcu_dereference (conf->mirrors[disk].rdev); + }if (rdev ==NULL ||test_bit (Faulty, &rdev->flags))continue ;
@@ -1346,9 +1354,15 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio,for (i =0 ; i < conf->copies; i++) {int d = r10_bio->devs[i].devnum; -struct md_rdev *rdev =rcu_dereference (conf->mirrors[d].rdev); -struct md_rdev *rrdev =rcu_dereference ( - conf->mirrors[d].replacement); +struct md_rdev *rdev, *rrdev; + + rrdev =rcu_dereference (conf->mirrors[d].replacement); +/* +* Read replacement first to prevent reading both rdev and +* replacement as NULL during replacement replace rdev. +*/ +smp_mb (); + rdev =rcu_dereference (conf->mirrors[d].rdev);if (rdev == rrdev) rrdev =NULL ;if (rdev &&unlikely (test_bit (Blocked, &rdev->flags))) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 20/509 irqchip/jcore-aic: Kill use of irq_create_strict_mappings()
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 5f8b938bd790cff6542c7fe3c1495c71f89fef1b ]
irq_create_strict_mappings() is a poor way to allow the use of a linear IRQ domain as a legacy one. Let's be upfront about it.
Stable-dep-of: 4848229494a3 ("irqchip/jcore-aic: Fix missing allocation of IRQ descriptors")
--- drivers/irqchip/irq-jcore-aic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-jcore-aic.c +2 -2
@@ -100,11 +100,11 @@ static int __init aic_irq_of_init(struct device_node *node, jcore_aic.irq_unmask = noop; jcore_aic.name ="AIC" ; - domain =irq_domain_add_linear (node, dom_sz, &jcore_aic_irqdomain_ops, + domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, + &jcore_aic_irqdomain_ops, &jcore_aic);if (!domain)return -ENOMEM ; -irq_create_strict_mappings (domain, min_irq, min_irq, dom_sz - min_irq);return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 21/509 irqchip/jcore-aic: Fix missing allocation of IRQ descriptors
In reply to Greg Kroah-HartmanFrom: John Paul Adrian Glaubitz <[email protected]>
[ Upstream commit 4848229494a323eeaab62eee5574ef9f7de80374 ]
The initialization function for the J-Core AIC aic_irq_of_init() is currently missing the call to irq_alloc_descs() which allocates and initializes all the IRQ descriptors. Add missing function call and return the error code from irq_alloc_descs() in case the allocation fails.
--- drivers/irqchip/irq-jcore-aic.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/irqchip/irq-jcore-aic.c +7 -0
@@ -68,6 +68,7 @@ static int __init aic_irq_of_init(struct device_node *node,unsigned min_irq =JCORE_AIC2_MIN_HWIRQ ;unsigned dom_sz =JCORE_AIC_MAX_HWIRQ +1 ;struct irq_domain *domain; +int ret;pr_info ("Initializing J-Core AIC\n" );
@@ -100,6 +101,12 @@ static int __init aic_irq_of_init(struct device_node *node, jcore_aic.irq_unmask = noop; jcore_aic.name ="AIC" ; + ret =irq_alloc_descs (-1 , min_irq, dom_sz - min_irq, +of_node_to_nid (node)); + +if (ret <0 ) +return ret; + domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, &jcore_aic_irqdomain_ops, &jcore_aic);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 22/509 posix-timers: Prevent RT livelock in itimer_delete()
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 9d9e522010eb5685d8b53e8a24320653d9d4cbbf ]
itimer_delete() has a retry loop when the timer is concurrently expired. On non-RT kernels this just spin-waits until the timer callback has completed, except for posix CPU timers which have HAVE_POSIX_CPU_TIMERS_TASK_WORK enabled.
In that case and on RT kernels the existing task could live lock when preempting the task which does the timer delivery.
Replace spin_unlock() with an invocation of timer_wait_running() to handle it the same way as the other retry loops in the posix timer code.
--- kernel/time/posix-timers.c | 43 +++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 8 deletions(-)
kernel/time/posix-timers.c +35 -8
@@ -1037,27 +1037,52 @@ SYSCALL_DEFINE1(timer_delete, timer_t, timer_id) }/* -* return timer owned by the process, used by exit_itimers +* Delete a timer if it is armed, remove it from the hash and schedule it +* for RCU freeing. */ static void itimer_delete (struct k_itimer *timer) { -retry_delete: -spin_lock_irq (&timer->it_lock); +unsigned long flags; + +/* +* irqsave is required to make timer_wait_running() work. +*/ +spin_lock_irqsave (&timer->it_lock, flags); +retry_delete: +/* +* Even if the timer is not longer accessible from other tasks +* it still might be armed and queued in the underlying timer +* mechanism. Worse, that timer mechanism might run the expiry +* function concurrently. +*/ if (timer_delete_hook (timer) ==TIMER_RETRY ) { -spin_unlock_irq (&timer->it_lock); +/* +* Timer is expired concurrently, prevent livelocks +* and pointless spinning on RT. +* +* timer_wait_running() drops timer::it_lock, which opens +* the possibility for another task to delete the timer. +* +* That's not possible here because this is invoked from +* do_exit() only for the last thread of the thread group. +* So no other task can access and delete that timer. +*/ +if (WARN_ON_ONCE (timer_wait_running (timer, &flags) != timer)) +return ; + goto retry_delete; }list_del (&timer->list); -spin_unlock_irq (&timer->it_lock); +spin_unlock_irqrestore (&timer->it_lock, flags);release_posix_timer (timer,IT_ID_SET ); }/* -* This is called by do_exit or de_thread, only when nobody else can -* modify the signal->posix_timers list. Yet we need sighand->siglock -* to prevent the race with /proc/pid/timers. +* Invoked from do_exit() when the last thread of a thread group exits. +* At that point no other task can access the timers of the dying +* task anymore. */ void exit_itimers (struct task_struct *tsk) {
@@ -1067,10 +1092,12 @@ void exit_itimers(struct task_struct *tsk)if (list_empty (&tsk->signal->posix_timers))return ; +/* Protect against concurrent read via /proc/$PID/timers */ spin_lock_irq (&tsk->sighand->siglock);list_replace_init (&tsk->signal->posix_timers, &timers);spin_unlock_irq (&tsk->sighand->siglock); +/* The timers are not longer accessible via tsk::signal */ while (!list_empty (&timers)) { tmr = list_first_entry(&timers, struct k_itimer, list);itimer_delete (tmr);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 23/509 tracing/timer: Add missing hrtimer modes to decode_hrtimer_mode().
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 2951580ba6adb082bb6b7154a5ecb24e7c1f7569 ]
The trace output for the HRTIMER_MODE_.*_HARD modes is seen as a number since these modes are not decoded. The author was not aware of the fancy decoding function which makes the life easier.
Extend decode_hrtimer_mode() with the additional HRTIMER_MODE_.*_HARD modes.
--- include/trace/events/timer.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/trace/events/timer.h +5 -1
@@ -156,7 +156,11 @@ DEFINE_EVENT(timer_class, timer_cancel, { HRTIMER_MODE_ABS_SOFT, "ABS|SOFT" }, \ { HRTIMER_MODE_REL_SOFT, "REL|SOFT" }, \ { HRTIMER_MODE_ABS_PINNED_SOFT, "ABS|PINNED|SOFT" }, \ - { HRTIMER_MODE_REL_PINNED_SOFT, "REL|PINNED|SOFT" }) + { HRTIMER_MODE_REL_PINNED_SOFT, "REL|PINNED|SOFT" }, \ + { HRTIMER_MODE_ABS_HARD, "ABS|HARD" }, \ + { HRTIMER_MODE_REL_HARD, "REL|HARD" }, \ + { HRTIMER_MODE_ABS_PINNED_HARD, "ABS|PINNED|HARD" }, \ + { HRTIMER_MODE_REL_PINNED_HARD, "REL|PINNED|HARD" })/** * hrtimer_init - called when the hrtimer is initialized
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 24/509 clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe
In reply to Greg Kroah-HartmanFrom: Feng Mingxi <[email protected]>
[ Upstream commit 8b5bf64c89c7100c921bd807ba39b2eb003061ab ]
Smatch reports:drivers/clocksource/timer-cadence-ttc.c:529 ttc_timer_probe()
warn: 'timer_baseaddr' from of_iomap() not released on lines: 498,508,516.
timer_baseaddr may have the problem of not being released after use, I replaced it with the devm_of_iomap() function and added the clk_put() function to cleanup the "clk_ce" and "clk_cs".
--- drivers/clocksource/timer-cadence-ttc.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/clocksource/timer-cadence-ttc.c +13 -6
@@ -486,10 +486,10 @@ static int __init ttc_timer_probe(struct platform_device *pdev)* and use it. Note that the event timer uses the interrupt and it's the * 2nd TTC hence the irq_of_parse_and_map(,1) */ - timer_baseaddr =of_iomap (timer,0 ); -if (!timer_baseaddr) { + timer_baseaddr =devm_of_iomap (&pdev->dev, timer,0 ,NULL ); +if (IS_ERR (timer_baseaddr)) {pr_err ("ERROR: invalid timer base address\n" ); -return -ENXIO ; +return PTR_ERR (timer_baseaddr); } irq =irq_of_parse_and_map (timer,1 );
@@ -513,20 +513,27 @@ static int __init ttc_timer_probe(struct platform_device *pdev) clk_ce =of_clk_get (timer, clksel);if (IS_ERR (clk_ce)) {pr_err ("ERROR: timer input clock not found\n" ); -return PTR_ERR (clk_ce); + ret =PTR_ERR (clk_ce); + goto put_clk_cs; } ret =ttc_setup_clocksource (clk_cs, timer_baseaddr, timer_width);if (ret) -return ret; + goto put_clk_ce; ret =ttc_setup_clockevent (clk_ce, timer_baseaddr +4 , irq);if (ret) -return ret; + goto put_clk_ce;pr_info ("%pOFn #0 at %p, irq=%d\n" , timer, timer_baseaddr, irq);return 0 ; + +put_clk_ce: +clk_put (clk_ce); +put_clk_cs: +clk_put (clk_cs); +return ret; }static const struct of_device_id ttc_timer_of_match[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 25/509 PM: domains: fix integer overflow issues in genpd_parse_state()
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit e5d1c8722083f0332dcd3c85fa1273d85fb6bed8 ]
Currently, while calculating residency and latency values, right operands may overflow if resulting values are big enough.
To prevent this, albeit unlikely case, play it safe and convert right operands to left ones' type s64.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/base/power/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/base/power/domain.c +3 -3
@@ -2763,10 +2763,10 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state, err =of_property_read_u32 (state_node,"min-residency-us" , &residency);if (!err) - genpd_state->residency_ns =1000 * residency; + genpd_state->residency_ns =1000LL * residency; - genpd_state->power_on_latency_ns =1000 * exit_latency; - genpd_state->power_off_latency_ns =1000 * entry_latency; + genpd_state->power_on_latency_ns =1000LL * exit_latency; + genpd_state->power_off_latency_ns =1000LL * entry_latency; genpd_state->fwnode = &state_node->fwnode;return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 26/509 perf/arm-cmn: Fix DTC reset
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
[ Upstream commit 71746c995cac92fcf6a65661b51211cf2009d7f0 ]
It turns out that my naive DTC reset logic fails to work as intended, since, after checking with the hardware designers, the PMU actually needs to be fully enabled in order to correctly clear any pending overflows. Therefore, invert the sequence to start with turning on both enables so that we can reliably get the DTCs into a known state, then moving to our normal counters-stopped state from there. Since all the DTM counters have already been unpaired during the initial discovery pass, we just need to additionally reset the cycle counters to ensure that no other unexpected overflows occur during this period.
--- drivers/perf/arm-cmn.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/perf/arm-cmn.c +4 -3
@@ -1254,9 +1254,10 @@ static int arm_cmn_init_dtc(struct arm_cmn *cmn, struct arm_cmn_node *dn, int idif (dtc->irq <0 )return dtc->irq; -writel_relaxed (0 , dtc->base +CMN_DT_PMCR ); +writel_relaxed (CMN_DT_DTC_CTL_DT_EN , dtc->base +CMN_DT_DTC_CTL ); +writel_relaxed (CMN_DT_PMCR_PMU_EN |CMN_DT_PMCR_OVFL_INTR_EN , dtc->base +CMN_DT_PMCR ); +writeq_relaxed (0 , dtc->base +CMN_DT_PMCCNTR );writel_relaxed (0x1ff , dtc->base +CMN_DT_PMOVSR_CLR ); -writel_relaxed (CMN_DT_PMCR_OVFL_INTR_EN , dtc->base +CMN_DT_PMCR );/* We do at least know that a DTC's XP must be in that DTC's domain */ xp =arm_cmn_node_to_xp (dn);
@@ -1303,7 +1304,7 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn) dn->type =CMN_TYPE_RNI ; } -writel_relaxed (CMN_DT_DTC_CTL_DT_EN , cmn->dtc[0 ].base +CMN_DT_DTC_CTL ); +arm_cmn_set_state (cmn,CMN_STATE_DISABLED );return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 27/509 powercap: RAPL: Fix CONFIG_IOSF_MBI dependency
In reply to Greg Kroah-HartmanFrom: Zhang Rui <[email protected]>
[ Upstream commit 4658fe81b3f8afe8adf37734ec5fe595d90415c6 ]
After commit 3382388d7148 ("intel_rapl: abstract RAPL common code"), accessing to IOSF_MBI interface is done in the RAPL common code.
Thus it is the CONFIG_INTEL_RAPL_CORE that has dependency of CONFIG_IOSF_MBI, while CONFIG_INTEL_RAPL_MSR does not.
This problem was not exposed previously because all the previous RAPL common code users, aka, the RAPL MSR and MMIO I/F drivers, have CONFIG_IOSF_MBI selected.
Fix the CONFIG_IOSF_MBI dependency in RAPL code. This also fixes a build time failure when the RAPL TPMI I/F driver is introduced without selecting CONFIG_IOSF_MBI.
x86_64-linux-ld: vmlinux.o: in function `set_floor_freq_atom':
intel_rapl_common.c:(.text+0x2dac9b8): undefined reference to `iosf_mbi_write'
x86_64-linux-ld: intel_rapl_common.c:(.text+0x2daca66): undefined reference to `iosf_mbi_read'
Reference to iosf_mbi.h is also removed from the RAPL MSR I/F driver.
--- drivers/powercap/Kconfig | 4 +++- drivers/powercap/intel_rapl_msr.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/powercap/Kconfig +3 -1
@@ -18,10 +18,12 @@ if POWERCAP # Client driver configurations go here. config INTEL_RAPL_CORE tristate + depends on PCI + select IOSF_MBI config INTEL_RAPL tristate "Intel RAPL Support via MSR Interface" - depends on X86 && IOSF_MBI + depends on X86 && PCI select INTEL_RAPL_CORE help This enables support for the Intel Running Average Power Limit (RAPL)
drivers/powercap/intel_rapl_msr.c +0 -1
@@ -22,7 +22,6 @@#include <linux/processor.h> #include <linux/platform_device.h> -#include <asm/iosf_mbi.h> #include <asm/cpu_device_id.h> #include <asm/intel-family.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 28/509 ARM: 9303/1: kprobes: avoid missing-declaration warnings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 1b9c3ddcec6a55e15d3e38e7405e2d078db02020 ]
checker_stack_use_t32strd() and kprobe_handler() can be made static since they are not used from other files, while coverage_start_registers() and __kprobes_test_case() are used from assembler code, and just need a declaration to avoid a warning with the global definition.
arch/arm/probes/kprobes/checkers-common.c:43:18: error: no previous prototype for 'checker_stack_use_t32strd' arch/arm/probes/kprobes/core.c:236:16: error: no previous prototype for 'kprobe_handler' arch/arm/probes/kprobes/test-core.c:723:10: error: no previous prototype for 'coverage_start_registers' arch/arm/probes/kprobes/test-core.c:918:14: error: no previous prototype for '__kprobes_test_case_start' arch/arm/probes/kprobes/test-core.c:952:14: error: no previous prototype for '__kprobes_test_case_end_16' arch/arm/probes/kprobes/test-core.c:967:14: error: no previous prototype for '__kprobes_test_case_end_32'
--- arch/arm/probes/kprobes/checkers-common.c | 2 +- arch/arm/probes/kprobes/core.c | 2 +- arch/arm/probes/kprobes/opt-arm.c | 2 -- arch/arm/probes/kprobes/test-core.c | 2 +- arch/arm/probes/kprobes/test-core.h | 4 ++++ 5 files changed, 7 insertions(+), 5 deletions(-)
arch/arm/probes/kprobes/checkers-common.c +1 -1
@@ -40,7 +40,7 @@ enum probes_insn checker_stack_use_imm_0xx(probes_opcode_t insn,* Different from other insn uses imm8, the real addressing offset of * STRD in T32 encoding should be imm8 * 4. See ARMARM description. */ -enum probes_insn checker_stack_use_t32strd (probes_opcode_t insn, +static enum probes_insn checker_stack_use_t32strd (probes_opcode_t insn,struct arch_probes_insn *asi,const struct decode_header *h) {
arch/arm/probes/kprobes/core.c +1 -1
@@ -231,7 +231,7 @@ singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)* kprobe, and that level is reserved for user kprobe handlers, so we can't * risk encountering a new kprobe in an interrupt handler. */ -void __kprobes kprobe_handler (struct pt_regs *regs) +static void __kprobes kprobe_handler (struct pt_regs *regs) {struct kprobe *p, *cur;struct kprobe_ctlblk *kcb;
arch/arm/probes/kprobes/opt-arm.c +0 -2
@@ -145,8 +145,6 @@ __arch_remove_optimized_kprobe(struct optimized_kprobe *op, int dirty) } } -extern void kprobe_handler (struct pt_regs *regs); -static void optimized_callback (struct optimized_kprobe *op,struct pt_regs *regs) {
arch/arm/probes/kprobes/test-core.c +1 -1
@@ -720,7 +720,7 @@ static const char coverage_register_lookup[16] = { [REG_TYPE_NOSPPCX] = COVERAGE_ANY_REG | COVERAGE_SP, }; -unsigned coverage_start_registers (const struct decode_header *h) +static unsigned coverage_start_registers (const struct decode_header *h) {unsigned regs =0 ;int i;
arch/arm/probes/kprobes/test-core.h +4 -0
@@ -453,3 +453,7 @@ void kprobe_thumb32_test_cases(void);#else void kprobe_arm_test_cases (void );#endif + +void __kprobes_test_case_start (void ); +void __kprobes_test_case_end_16 (void ); +void __kprobes_test_case_end_32 (void );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 29/509 cpufreq: intel_pstate: Fix energy_performance_preference for passive
In reply to Greg Kroah-HartmanFrom: Tero Kristo <[email protected]>
[ Upstream commit 03f44ffb3d5be2fceda375d92c70ab6de4df7081 ]
If the intel_pstate driver is set to passive mode, then writing the same value to the energy_performance_preference sysfs twice will fail. This is caused by the wrong return value used (index of the matched energy_perf_string), instead of the length of the passed in parameter. Fix by forcing the internal return value to zero when the same preference is passed in by user. This same issue is not present when active mode is used for the driver.
--- drivers/cpufreq/intel_pstate.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/cpufreq/intel_pstate.c +2 -0
@@ -777,6 +777,8 @@ static ssize_t store_energy_performance_preference( err =cpufreq_start_governor (policy);if (!ret) ret = err; + }else { + ret =0 ; } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 30/509 thermal/drivers/sun8i: Fix some error handling paths in sun8i_ths_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 89382022b370dfd34eaae9c863baa123fcd4d132 ]
Should an error occur after calling sun8i_ths_resource_init() in the probe function, some resources need to be released, as already done in the .remove() function.
Switch to the devm_clk_get_enabled() helper and add a new devm_action to turn sun8i_ths_resource_init() into a fully managed function.
Move the place where reset_control_deassert() is called so that the recommended order of reset release/clock enable steps is kept. A64 manual states that:
3.3.6.4. Gating and reset Make sure that the reset signal has been released before the release of module clock gating;
This fixes the issue and removes some LoC at the same time.
--- drivers/thermal/sun8i_thermal.c | 55 +++++++++++---------------------- 1 file changed, 18 insertions(+), 37 deletions(-)
drivers/thermal/sun8i_thermal.c +18 -37
@@ -318,6 +318,11 @@ static int sun8i_ths_calibrate(struct ths_device *tmdev)return ret; } +static void sun8i_ths_reset_control_assert (void *data) +{ +reset_control_assert (data); +} +static int sun8i_ths_resource_init (struct ths_device *tmdev) {struct device *dev = tmdev->dev;
@@ -338,47 +343,35 @@ static int sun8i_ths_resource_init(struct ths_device *tmdev)if (IS_ERR (tmdev->reset))return PTR_ERR (tmdev->reset); - tmdev->bus_clk =devm_clk_get (&pdev->dev,"bus" ); + ret =reset_control_deassert (tmdev->reset); +if (ret) +return ret; + + ret =devm_add_action_or_reset (dev, sun8i_ths_reset_control_assert, + tmdev->reset); +if (ret) +return ret; + + tmdev->bus_clk =devm_clk_get_enabled (&pdev->dev,"bus" );if (IS_ERR (tmdev->bus_clk))return PTR_ERR (tmdev->bus_clk); }if (tmdev->chip->has_mod_clk) { - tmdev->mod_clk =devm_clk_get (&pdev->dev,"mod" ); + tmdev->mod_clk =devm_clk_get_enabled (&pdev->dev,"mod" );if (IS_ERR (tmdev->mod_clk))return PTR_ERR (tmdev->mod_clk); } - ret =reset_control_deassert (tmdev->reset); -if (ret) -return ret; - - ret =clk_prepare_enable (tmdev->bus_clk); -if (ret) - goto assert_reset; - ret =clk_set_rate (tmdev->mod_clk,24000000 );if (ret) - goto bus_disable; - - ret =clk_prepare_enable (tmdev->mod_clk); -if (ret) - goto bus_disable; +return ret; ret =sun8i_ths_calibrate (tmdev);if (ret) - goto mod_disable; +return ret;return 0 ; - -mod_disable: -clk_disable_unprepare (tmdev->mod_clk); -bus_disable: -clk_disable_unprepare (tmdev->bus_clk); -assert_reset: -reset_control_assert (tmdev->reset); - -return ret; }static int sun8i_h3_thermal_init (struct ths_device *tmdev)
@@ -529,17 +522,6 @@ static int sun8i_ths_probe(struct platform_device *pdev)return 0 ; } -static int sun8i_ths_remove (struct platform_device *pdev) -{ -struct ths_device *tmdev =platform_get_drvdata (pdev); - -clk_disable_unprepare (tmdev->mod_clk); -clk_disable_unprepare (tmdev->bus_clk); -reset_control_assert (tmdev->reset); - -return 0 ; -} -static const struct ths_thermal_chip sun8i_a83t_ths = { .sensor_num =3 , .scale =705 ,
@@ -641,7 +623,6 @@ MODULE_DEVICE_TABLE(of, of_ths_match);static struct platform_driver ths_driver = { .probe = sun8i_ths_probe, - .remove = sun8i_ths_remove, .driver = { .name ="sun8i-thermal" , .of_match_table = of_ths_match,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 31/509 rcuscale: Console output claims too few grace periods
In reply to Greg Kroah-HartmanFrom: Jiangong.Han <[email protected]>
[ Upstream commit 811192c5f24bfd7246ce9ce06f668d8c408bf39b ]
The rcuscale console output claims N grace periods, numbered from zero to N, which means that there were really N+1 grace periods. The root cause of this bug is that rcu_scale_writer() stores the number of the last grace period (numbered from zero) into writer_n_durations[me] instead of the number of grace periods. This commit therefore assigns the actual number of grace periods to writer_n_durations[me], and also makes the corresponding adjustment to the loop outputting per-grace-period measurements.
Sample of old console output:
rcu-scale: writer 0 gps: 133
......
rcu-scale: 0 writer-duration: 0 44003961
rcu-scale: 0 writer-duration: 1 32003582
......
rcu-scale: 0 writer-duration: 132 28004391
rcu-scale: 0 writer-duration: 133 27996410Sample of new console output:
rcu-scale: writer 0 gps: 134
......
rcu-scale: 0 writer-duration: 0 44003961
rcu-scale: 0 writer-duration: 1 32003582
......
rcu-scale: 0 writer-duration: 132 28004391
rcu-scale: 0 writer-duration: 133 27996410Stable-dep-of: 23fc8df26dea ("rcu/rcuscale: Stop kfree_scale_thread thread(s) after unloading rcuscale")
--- kernel/rcu/rcuscale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/rcu/rcuscale.c +2 -2
@@ -457,7 +457,7 @@ rcu_scale_writer(void *arg)if (gp_async) { cur_ops->gp_barrier (); } - writer_n_durations[me] = i_max; + writer_n_durations[me] = i_max +1 ;torture_kthread_stopping ("rcu_scale_writer" );return 0 ; }
@@ -531,7 +531,7 @@ rcu_scale_cleanup(void) wdpp = writer_durations[i];if (!wdpp)continue ; -for (j =0 ; j <= writer_n_durations[i]; j++) { +for (j =0 ; j < writer_n_durations[i]; j++) { wdp = &wdpp[j]; pr_alert("%s%s %4d writer-duration: %5d %llu\n", scale_type, SCALE_FLAG,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 32/509 rcuscale: Always log error message
In reply to Greg Kroah-HartmanFrom: Li Zhijian <[email protected]>
[ Upstream commit 86e7ed1bd57d020e35d430542bf5d689c3200568 ]
Unconditionally log messages corresponding to errors.
Stable-dep-of: 23fc8df26dea ("rcu/rcuscale: Stop kfree_scale_thread thread(s) after unloading rcuscale")
--- kernel/rcu/rcuscale.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
kernel/rcu/rcuscale.c +7 -7
@@ -49,8 +49,8 @@ MODULE_AUTHOR("Paul E. McKenney <[email protected]>"); pr_alert("%s" SCALE_FLAG " %s\n", scale_type, s)#define VERBOSE_SCALEOUT_STRING (s) \ do { if (verbose) pr_alert("%s" SCALE_FLAG " %s\n", scale_type, s); } while (0) -#define VERBOSE_SCALEOUT_ERRSTRING (s) \ - do { if (verbose) pr_alert("%s" SCALE_FLAG "!!! %s\n", scale_type, s); } while (0) +#define SCALEOUT_ERRSTRING (s) \ + pr_alert("%s" SCALE_FLAG "!!! %s\n", scale_type, s)/* * The intended use cases for the nreaders and nwriters module parameters
@@ -484,11 +484,11 @@ rcu_scale_cleanup(void)* during the mid-boot phase, so have to wait till the end. */ if (rcu_gp_is_expedited () && !rcu_gp_is_normal () && !gp_exp) -VERBOSE_SCALEOUT_ERRSTRING ("All grace periods expedited, no normal ones to measure!" ); +SCALEOUT_ERRSTRING ("All grace periods expedited, no normal ones to measure!" );if (rcu_gp_is_normal () && gp_exp) -VERBOSE_SCALEOUT_ERRSTRING ("All grace periods normal, no expedited ones to measure!" ); +SCALEOUT_ERRSTRING ("All grace periods normal, no expedited ones to measure!" );if (gp_exp && gp_async) -VERBOSE_SCALEOUT_ERRSTRING ("No expedited async GPs, so went with async!" ); +SCALEOUT_ERRSTRING ("No expedited async GPs, so went with async!" );if (torture_cleanup_begin ())return ;
@@ -803,7 +803,7 @@ rcu_scale_init(void) reader_tasks =kcalloc (nrealreaders,sizeof (reader_tasks[0 ]),GFP_KERNEL );if (reader_tasks ==NULL ) { -VERBOSE_SCALEOUT_ERRSTRING ("out of memory" ); +SCALEOUT_ERRSTRING ("out of memory" ); firsterr = -ENOMEM ; goto unwind; }
@@ -823,7 +823,7 @@ rcu_scale_init(void)kcalloc (nrealwriters,sizeof (*writer_n_durations),GFP_KERNEL );if (!writer_tasks || !writer_durations || !writer_n_durations) { -VERBOSE_SCALEOUT_ERRSTRING ("out of memory" ); +SCALEOUT_ERRSTRING ("out of memory" ); firsterr = -ENOMEM ; goto unwind; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 33/509 rcuscale: Move shutdown from wait_event() to wait_event_idle()
In reply to Greg Kroah-HartmanFrom: Paul E. McKenney <[email protected]>
[ Upstream commit ef1ef3d47677dc191b88650a9f7f91413452cc1b ]
The rcu_scale_shutdown() and kfree_scale_shutdown() kthreads/functions use wait_event() to wait for the rcuscale test to complete. However, each updater thread in such a test waits for at least 100 grace periods. If each grace period takes more than 1.2 seconds, which is long, but not insanely so, this can trigger the hung-task timeout.
This commit therefore replaces those wait_event() calls with calls to wait_event_idle(), which do not trigger the hung-task timeout.
Stable-dep-of: 23fc8df26dea ("rcu/rcuscale: Stop kfree_scale_thread thread(s) after unloading rcuscale")
--- kernel/rcu/rcuscale.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/rcu/rcuscale.c +3 -4
@@ -579,8 +579,7 @@ static int compute_real(int n)static int rcu_scale_shutdown (void *arg) { -wait_event (shutdown_wq, -atomic_read (&n_rcu_scale_writer_finished) >= nrealwriters); +wait_event_idle (shutdown_wq,atomic_read (&n_rcu_scale_writer_finished) >= nrealwriters);smp_mb ();/* Wake before output. */ rcu_scale_cleanup ();kernel_power_off ();
@@ -693,8 +692,8 @@ kfree_scale_cleanup(void)static int kfree_scale_shutdown (void *arg) { -wait_event (shutdown_wq, -atomic_read (&n_kfree_scale_thread_ended) >= kfree_nrealthreads); +wait_event_idle (shutdown_wq, +atomic_read (&n_kfree_scale_thread_ended) >= kfree_nrealthreads);smp_mb ();/* Wake before output. */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 34/509 rcu/rcuscale: Move rcu_scale_*() after kfree_scale_cleanup()
In reply to Greg Kroah-HartmanFrom: Qiuxu Zhuo <[email protected]>
[ Upstream commit bf5ddd736509a7d9077c0b6793e6f0852214dbea ]
This code-movement-only commit moves the rcu_scale_cleanup() and rcu_scale_shutdown() functions to follow kfree_scale_cleanup(). This is code movement is in preparation for a bug-fix patch that invokes kfree_scale_cleanup() from rcu_scale_cleanup().
Stable-dep-of: 23fc8df26dea ("rcu/rcuscale: Stop kfree_scale_thread thread(s) after unloading rcuscale")
--- kernel/rcu/rcuscale.c | 194 +++++++++++++++++++++--------------------- 1 file changed, 97 insertions(+), 97 deletions(-)
kernel/rcu/rcuscale.c +97 -97
@@ -470,89 +470,6 @@ rcu_scale_print_module_parms(struct rcu_scale_ops *cur_ops, const char *tag) scale_type, tag, nrealreaders, nrealwriters, verbose, shutdown); } -static void -rcu_scale_cleanup (void ) -{ -int i; -int j; -int ngps =0 ; -u64 *wdp; -u64 *wdpp; - -/* -* Would like warning at start, but everything is expedited -* during the mid-boot phase, so have to wait till the end. -*/ -if (rcu_gp_is_expedited () && !rcu_gp_is_normal () && !gp_exp) -SCALEOUT_ERRSTRING ("All grace periods expedited, no normal ones to measure!" ); -if (rcu_gp_is_normal () && gp_exp) -SCALEOUT_ERRSTRING ("All grace periods normal, no expedited ones to measure!" ); -if (gp_exp && gp_async) -SCALEOUT_ERRSTRING ("No expedited async GPs, so went with async!" ); - -if (torture_cleanup_begin ()) -return ; -if (!cur_ops) { -torture_cleanup_end (); -return ; - } - -if (reader_tasks) { -for (i =0 ; i < nrealreaders; i++) -torture_stop_kthread (rcu_scale_reader, - reader_tasks[i]); -kfree (reader_tasks); - } - -if (writer_tasks) { -for (i =0 ; i < nrealwriters; i++) { -torture_stop_kthread (rcu_scale_writer, - writer_tasks[i]); -if (!writer_n_durations) -continue ; - j = writer_n_durations[i]; -pr_alert ("%s%s writer %d gps: %d\n" , - scale_type,SCALE_FLAG , i, j); - ngps += j; - } -pr_alert ("%s%s start: %llu end: %llu duration: %llu gps: %d batches: %ld\n" , - scale_type,SCALE_FLAG , - t_rcu_scale_writer_started, t_rcu_scale_writer_finished, - t_rcu_scale_writer_finished - - t_rcu_scale_writer_started, - ngps, -rcuscale_seq_diff (b_rcu_gp_test_finished, - b_rcu_gp_test_started)); -for (i =0 ; i < nrealwriters; i++) { -if (!writer_durations) -break ; -if (!writer_n_durations) -continue ; - wdpp = writer_durations[i]; -if (!wdpp) -continue ; -for (j =0 ; j < writer_n_durations[i]; j++) { - wdp = &wdpp[j]; -pr_alert ("%s%s %4d writer-duration: %5d %llu\n" , - scale_type,SCALE_FLAG , - i, j, *wdp); -if (j %100 ==0 ) -schedule_timeout_uninterruptible (1 ); - } -kfree (writer_durations[i]); - } -kfree (writer_tasks); -kfree (writer_durations); -kfree (writer_n_durations); - } - -/* Do torture-type-specific cleanup operations. */ -if (cur_ops->cleanup !=NULL ) - cur_ops->cleanup (); - -torture_cleanup_end (); -} -/* * Return the number if non-negative. If -1, the number of CPUs. * If less than -1, that much less than the number of CPUs, but
@@ -572,20 +489,6 @@ static int compute_real(int n)return nr; } -/* -* RCU scalability shutdown kthread. Just waits to be awakened, then shuts -* down system. -*/ -static int -rcu_scale_shutdown (void *arg) -{ -wait_event_idle (shutdown_wq,atomic_read (&n_rcu_scale_writer_finished) >= nrealwriters); -smp_mb ();/* Wake before output. */ -rcu_scale_cleanup (); -kernel_power_off (); -return -EINVAL ; -} -/* * kfree_rcu() scalability tests: Start a kfree_rcu() loop on all CPUs for number * of iterations and measure total time and number of GP for all iterations to complete.
@@ -747,6 +650,103 @@ kfree_scale_init(void)return firsterr; } +static void +rcu_scale_cleanup (void ) +{ +int i; +int j; +int ngps =0 ; +u64 *wdp; +u64 *wdpp; + +/* +* Would like warning at start, but everything is expedited +* during the mid-boot phase, so have to wait till the end. +*/ +if (rcu_gp_is_expedited () && !rcu_gp_is_normal () && !gp_exp) +SCALEOUT_ERRSTRING ("All grace periods expedited, no normal ones to measure!" ); +if (rcu_gp_is_normal () && gp_exp) +SCALEOUT_ERRSTRING ("All grace periods normal, no expedited ones to measure!" ); +if (gp_exp && gp_async) +SCALEOUT_ERRSTRING ("No expedited async GPs, so went with async!" ); + +if (torture_cleanup_begin ()) +return ; +if (!cur_ops) { +torture_cleanup_end (); +return ; + } + +if (reader_tasks) { +for (i =0 ; i < nrealreaders; i++) +torture_stop_kthread (rcu_scale_reader, + reader_tasks[i]); +kfree (reader_tasks); + } + +if (writer_tasks) { +for (i =0 ; i < nrealwriters; i++) { +torture_stop_kthread (rcu_scale_writer, + writer_tasks[i]); +if (!writer_n_durations) +continue ; + j = writer_n_durations[i]; +pr_alert ("%s%s writer %d gps: %d\n" , + scale_type,SCALE_FLAG , i, j); + ngps += j; + } +pr_alert ("%s%s start: %llu end: %llu duration: %llu gps: %d batches: %ld\n" , + scale_type,SCALE_FLAG , + t_rcu_scale_writer_started, t_rcu_scale_writer_finished, + t_rcu_scale_writer_finished - + t_rcu_scale_writer_started, + ngps, +rcuscale_seq_diff (b_rcu_gp_test_finished, + b_rcu_gp_test_started)); +for (i =0 ; i < nrealwriters; i++) { +if (!writer_durations) +break ; +if (!writer_n_durations) +continue ; + wdpp = writer_durations[i]; +if (!wdpp) +continue ; +for (j =0 ; j < writer_n_durations[i]; j++) { + wdp = &wdpp[j]; +pr_alert ("%s%s %4d writer-duration: %5d %llu\n" , + scale_type,SCALE_FLAG , + i, j, *wdp); +if (j %100 ==0 ) +schedule_timeout_uninterruptible (1 ); + } +kfree (writer_durations[i]); + } +kfree (writer_tasks); +kfree (writer_durations); +kfree (writer_n_durations); + } + +/* Do torture-type-specific cleanup operations. */ +if (cur_ops->cleanup !=NULL ) + cur_ops->cleanup (); + +torture_cleanup_end (); +} + +/* +* RCU scalability shutdown kthread. Just waits to be awakened, then shuts +* down system. +*/ +static int +rcu_scale_shutdown (void *arg) +{ +wait_event_idle (shutdown_wq,atomic_read (&n_rcu_scale_writer_finished) >= nrealwriters); +smp_mb ();/* Wake before output. */ +rcu_scale_cleanup (); +kernel_power_off (); +return -EINVAL ; +} +static int __init rcu_scale_init (void ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 35/509 rcu/rcuscale: Stop kfree_scale_thread thread(s) after unloading rcuscale
In reply to Greg Kroah-HartmanFrom: Qiuxu Zhuo <[email protected]>
[ Upstream commit 23fc8df26dead16687ae6eb47b0561a4a832e2f6 ]
Running the 'kfree_rcu_test' test case [1] results in a splat [2]. The root cause is the kfree_scale_thread thread(s) continue running after unloading the rcuscale module. This commit fixes that isue by invoking kfree_scale_cleanup() from rcu_scale_cleanup() when removing the rcuscale module.
[1] modprobe rcuscale kfree_rcu_test=1
// After some time
rmmod rcuscale
rmmod torture[2] BUG: unable to handle page fault for address: ffffffffc0601a87
#PF: supervisor instruction fetch in kernel mode
#PF: error_code(0x0010) - not-present page
PGD 11de4f067 P4D 11de4f067 PUD 11de51067 PMD 112f4d067 PTE 0
Oops: 0010 [#1] PREEMPT SMP NOPTI
CPU: 1 PID: 1798 Comm: kfree_scale_thr Not tainted 6.3.0-rc1-rcu+ #1
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 0.0.0 02/06/2015
RIP: 0010:0xffffffffc0601a87
Code: Unable to access opcode bytes at 0xffffffffc0601a5d.
RSP: 0018:ffffb25bc2e57e18 EFLAGS: 00010297
RAX: 0000000000000000 RBX: ffffffffc061f0b6 RCX: 0000000000000000
RDX: 0000000000000000 RSI: ffffffff962fd0de RDI: ffffffff962fd0de
RBP: ffffb25bc2e57ea8 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000001 R11: 0000000000000001 R12: 0000000000000000
R13: 0000000000000000 R14: 000000000000000a R15: 00000000001c1dbe
FS: 0000000000000000(0000) GS:ffff921fa2200000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: ffffffffc0601a5d CR3: 000000011de4c006 CR4: 0000000000370ee0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
? kvfree_call_rcu+0xf0/0x3a0
? kthread+0xf3/0x120
? kthread_complete_and_exit+0x20/0x20
? ret_from_fork+0x1f/0x30
</TASK>
Modules linked in: rfkill sunrpc ... [last unloaded: torture]
CR2: ffffffffc0601a87
---[ end trace 0000000000000000 ]------ kernel/rcu/rcuscale.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/rcu/rcuscale.c +5 -0
@@ -670,6 +670,11 @@ rcu_scale_cleanup(void)if (gp_exp && gp_async)SCALEOUT_ERRSTRING ("No expedited async GPs, so went with async!" ); +if (kfree_rcu_test) { +kfree_scale_cleanup (); +return ; + } +if (torture_cleanup_begin ())return ;if (!cur_ops) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 36/509 perf/ibs: Fix interface via core pmu events
In reply to Greg Kroah-HartmanFrom: Ravi Bangoria <[email protected]>
[ Upstream commit 2fad201fe38ff9a692acedb1990ece2c52a29f95 ]
Although, IBS pmus can be invoked via their own interface, indirect IBS invocation via core pmu events is also supported with fixed set of events: cpu-cycles:p, r076:p (same as cpu-cycles:p) and r0C1:p (micro-ops) for user convenience.
This indirect IBS invocation is broken since commit 66d258c5b048 ("perf/core: Optimize perf_init_event()"), which added RAW pmu under 'pmu_idr' list and thus if event_init() fails with RAW pmu, it started returning error instead of trying other pmus.
Forward precise events from core pmu to IBS by overwriting 'type' and 'config' in the kernel copy of perf_event_attr. Overwriting will cause perf_init_event() to retry with updated 'type' and 'config', which will automatically forward event to IBS pmu.
Without patch:
$ sudo ./perf record -C 0 -e r076:p -- sleep 1 Error: The r076:p event is not supported.
With patch:
$ sudo ./perf record -C 0 -e r076:p -- sleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.341 MB perf.data (37 samples) ]
--- arch/x86/events/amd/core.c | 2 +- arch/x86/events/amd/ibs.c | 53 +++++++++++++++---------------- arch/x86/include/asm/perf_event.h | 2 ++ 3 files changed, 29 insertions(+), 28 deletions(-)
arch/x86/events/amd/core.c +1 -1
@@ -364,7 +364,7 @@ static int amd_pmu_hw_config(struct perf_event *event)/* pass precise event sampling to ibs: */ if (event->attr.precise_ip &&get_ibs_caps ()) -return -ENOENT ; +return forward_event_to_ibs (event);if (has_branch_stack (event))return -EOPNOTSUPP ;
arch/x86/events/amd/ibs.c +26 -27
80 lines not on this page · raw message
arch/x86/include/asm/perf_event.h +2 -0
@@ -412,8 +412,10 @@ struct pebs_xmm {#ifdef CONFIG_X86_LOCAL_APIC extern u32 get_ibs_caps (void ); +extern int forward_event_to_ibs (struct perf_event *event);#else static inline u32 get_ibs_caps (void ) {return 0 ; } +static inline int forward_event_to_ibs (struct perf_event *event) {return -ENOENT ; }#endif #ifdef CONFIG_PERF_EVENTS
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 37/509 x86/mm: Fix __swp_entry_to_pte() for Xen PV guests
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
[ Upstream commit 0f88130e8a6fd185b0aeb5d8e286083735f2585a ]
Normally __swp_entry_to_pte() is never called with a value translating to a valid PTE. The only known exception is pte_swap_tests(), resulting in a WARN splat in Xen PV guests, as __pte_to_swp_entry() did translate the PFN of the valid PTE to a guest local PFN, while __swp_entry_to_pte() doesn't do the opposite translation.
Fix that by using __pte() in __swp_entry_to_pte() instead of open coding the native variant of it.
For correctness do the similar conversion for __swp_entry_to_pmd().
--- arch/x86/include/asm/pgtable_64.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/pgtable_64.h +2 -2
@@ -235,8 +235,8 @@ static inline void native_pgd_clear(pgd_t *pgd)#define __pte_to_swp_entry (pte) ((swp_entry_t) { pte_val((pte)) })#define __pmd_to_swp_entry (pmd) ((swp_entry_t) { pmd_val((pmd)) }) -#define __swp_entry_to_pte (x) ((pte_t) { .pte = (x).val }) -#define __swp_entry_to_pmd (x) ((pmd_t) { .pmd = (x).val }) +#define __swp_entry_to_pte (x) (__pte((x).val)) +#define __swp_entry_to_pmd (x) (__pmd((x).val))extern int kern_addr_valid (unsigned long addr);extern void cleanup_highmap (void );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 38/509 evm: Complete description of evm_inode_setattr()
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
[ Upstream commit b1de86d4248b273cb12c4cd7d20c08d459519f7d ]
Add the description for missing parameters of evm_inode_setattr() to avoid the warning arising with W=n compile option.
--- security/integrity/evm/evm_main.c | 2 ++ 1 file changed, 2 insertions(+)
security/integrity/evm/evm_main.c +2 -0
@@ -472,7 +472,9 @@ void evm_inode_post_removexattr(struct dentry *dentry, const char *xattr_name)/** * evm_inode_setattr - prevent updating an invalid EVM extended attribute +* @idmap: idmap of the mount * @dentry: pointer to the affected dentry +* @attr: iattr structure containing the new file attributes * * Permit update of file attributes when files have a valid EVM signature, * except in the case of them having an immutable portable signature.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 39/509 ima: Fix build warnings
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
[ Upstream commit 95526d13038c2bbddd567a4d8e39fac42484e182 ]
Fix build warnings (function parameters description) for ima_collect_modsig(), ima_match_policy() and ima_parse_add_rule().
--- security/integrity/ima/ima_modsig.c | 3 +++ security/integrity/ima/ima_policy.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)
security/integrity/ima/ima_modsig.c +3 -0
@@ -89,6 +89,9 @@ int ima_read_modsig(enum ima_hooks func, const void *buf, loff_t buf_len,/** * ima_collect_modsig - Calculate the file hash without the appended signature. +* @modsig: parsed module signature +* @buf: data to verify the signature on +* @size: data size * * Since the modsig is part of the file contents, the hash used in its signature * isn't the same one ordinarily calculated by IMA. Therefore PKCS7 code
security/integrity/ima/ima_policy.c +2 -1
@@ -628,6 +628,7 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func)* @secid: LSM secid of the task to be validated * @func: IMA hook identifier * @mask: requested action (MAY_READ | MAY_WRITE | MAY_APPEND | MAY_EXEC) +* @flags: IMA actions to consider (e.g. IMA_MEASURE | IMA_APPRAISE) * @pcr: set the pcr to extend * @template_desc: the template that should be used for this rule * @keyring: the keyring name, if given, to be used to check in the policy.
@@ -1515,7 +1516,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)/** * ima_parse_add_rule - add a rule to ima_policy_rules -* @rule - ima measurement policy rule +* @rule: ima measurement policy rule * * Avoid locking by allowing just one writer at a time in ima_write_policy() * Returns the length of the rule parsed, an error code on failure
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 40/509 pstore/ram: Add check for kstrdup
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit d97038d5ec2062733c1e016caf9baaf68cf64ea1 ]
Add check for the return value of kstrdup() and return the error if it fails in order to avoid NULL pointer dereference.
--- fs/pstore/ram_core.c | 2 ++ 1 file changed, 2 insertions(+)
fs/pstore/ram_core.c +2 -0
@@ -577,6 +577,8 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,raw_spin_lock_init (&prz->buffer_lock); prz->flags = flags; prz->label =kstrdup (label,GFP_KERNEL ); +if (!prz->label) + goto err; ret =persistent_ram_buffer_map (start, size, prz, memtype);if (ret)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 41/509 igc: Enable and fix RX hash usage by netstack
In reply to Greg Kroah-HartmanFrom: Jesper Dangaard Brouer <[email protected]>
[ Upstream commit 84214ab4689f962b4bfc47fc9a5838d25ac4274d ]
When function igc_rx_hash() was introduced in v4.20 via commit 0507ef8a0372 ("igc: Add transmit and receive fastpath and interrupt handlers"), the hardware wasn't configured to provide RSS hash, thus it made sense to not enable net_device NETIF_F_RXHASH feature bit.
The NIC hardware was configured to enable RSS hash info in v5.2 via commit 2121c2712f82 ("igc: Add multiple receive queues control supporting"), but forgot to set the NETIF_F_RXHASH feature bit.
The original implementation of igc_rx_hash() didn't extract the associated pkt_hash_type, but statically set PKT_HASH_TYPE_L3. The largest portions of this patch are about extracting the RSS Type from the hardware and mapping this to enum pkt_hash_types. This was based on Foxville i225 software user manual rev-1.3.1 and tested on Intel Ethernet Controller I225-LM (rev 03).
For UDP it's worth noting that RSS (type) hashing have been disabled both for IPv4 and IPv6 (see IGC_MRQC_RSS_FIELD_IPV4_UDP + IGC_MRQC_RSS_FIELD_IPV6_UDP) because hardware RSS doesn't handle fragmented pkts well when enabled (can cause out-of-order). This results in PKT_HASH_TYPE_L3 for UDP packets, and hash value doesn't include UDP port numbers. Not being PKT_HASH_TYPE_L4, have the effect that netstack will do a software based hash calc calling into flow_dissect, but only when code calls skb_get_hash(), which doesn't necessary happen for local delivery.
For QA verification testing I wrote a small bpftrace prog:
[0] https://github.com/xdp-project/xdp-project/blob/master/areas/hints/monitor_skb_hash_on_dev.bt
--- drivers/net/ethernet/intel/igc/igc.h | 28 ++++++++++++++++++++ drivers/net/ethernet/intel/igc/igc_main.c | 31 ++++++++++++++++++++--- 2 files changed, 55 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/igc/igc.h +28 -0
@@ -13,6 +13,7 @@#include <linux/ptp_clock_kernel.h> #include <linux/timecounter.h> #include <linux/net_tstamp.h> +#include <linux/bitfield.h> #include "igc_hw.h"
@@ -272,6 +273,33 @@ extern char igc_driver_name[];#define IGC_MRQC_RSS_FIELD_IPV4_UDP 0x00400000#define IGC_MRQC_RSS_FIELD_IPV6_UDP 0x00800000 +/* RX-desc Write-Back format RSS Type's */ +enum igc_rss_type_num { +IGC_RSS_TYPE_NO_HASH =0 , +IGC_RSS_TYPE_HASH_TCP_IPV4 =1 , +IGC_RSS_TYPE_HASH_IPV4 =2 , +IGC_RSS_TYPE_HASH_TCP_IPV6 =3 , +IGC_RSS_TYPE_HASH_IPV6_EX =4 , +IGC_RSS_TYPE_HASH_IPV6 =5 , +IGC_RSS_TYPE_HASH_TCP_IPV6_EX =6 , +IGC_RSS_TYPE_HASH_UDP_IPV4 =7 , +IGC_RSS_TYPE_HASH_UDP_IPV6 =8 , +IGC_RSS_TYPE_HASH_UDP_IPV6_EX =9 , +IGC_RSS_TYPE_MAX =10 , +}; +#define IGC_RSS_TYPE_MAX_TABLE 16 +#define IGC_RSS_TYPE_MASK GENMASK(3,0)/* 4-bits (3:0) = mask 0x0F */ + +/* igc_rss_type - Rx descriptor RSS type field */ +static inline u32 igc_rss_type (const union igc_adv_rx_desc *rx_desc) +{ +/* RSS Type 4-bits (3:0) number: 0-9 (above 9 is reserved) +* Accessing the same bits via u16 (wb.lower.lo_dword.hs_rss.pkt_info) +* is slightly slower than via u32 (wb.lower.lo_dword.data) +*/ +return le32_get_bits (rx_desc->wb.lower.lo_dword.data,IGC_RSS_TYPE_MASK ); +} +/* Interrupt defines */ #define IGC_START_ITR 648/* ~6000 ints/sec */ #define IGC_4K_ITR 980
drivers/net/ethernet/intel/igc/igc_main.c +27 -4
@@ -1569,14 +1569,36 @@ static void igc_rx_checksum(struct igc_ring *ring, le32_to_cpu(rx_desc->wb.upper.status_error)); } +/* Mapping HW RSS Type to enum pkt_hash_types */ +static const enum pkt_hash_types igc_rss_type_table[IGC_RSS_TYPE_MAX_TABLE ] = { + [IGC_RSS_TYPE_NO_HASH ] =PKT_HASH_TYPE_L2 , + [IGC_RSS_TYPE_HASH_TCP_IPV4 ] =PKT_HASH_TYPE_L4 , + [IGC_RSS_TYPE_HASH_IPV4 ] =PKT_HASH_TYPE_L3 , + [IGC_RSS_TYPE_HASH_TCP_IPV6 ] =PKT_HASH_TYPE_L4 , + [IGC_RSS_TYPE_HASH_IPV6_EX ] =PKT_HASH_TYPE_L3 , + [IGC_RSS_TYPE_HASH_IPV6 ] =PKT_HASH_TYPE_L3 , + [IGC_RSS_TYPE_HASH_TCP_IPV6_EX ] =PKT_HASH_TYPE_L4 , + [IGC_RSS_TYPE_HASH_UDP_IPV4 ] =PKT_HASH_TYPE_L4 , + [IGC_RSS_TYPE_HASH_UDP_IPV6 ] =PKT_HASH_TYPE_L4 , + [IGC_RSS_TYPE_HASH_UDP_IPV6_EX ] =PKT_HASH_TYPE_L4 , + [10 ] =PKT_HASH_TYPE_NONE ,/* RSS Type above 9 "Reserved" by HW */ + [11 ] =PKT_HASH_TYPE_NONE ,/* keep array sized for SW bit-mask */ + [12 ] =PKT_HASH_TYPE_NONE ,/* to handle future HW revisons */ + [13 ] =PKT_HASH_TYPE_NONE , + [14 ] =PKT_HASH_TYPE_NONE , + [15 ] =PKT_HASH_TYPE_NONE , +}; +static inline void igc_rx_hash (struct igc_ring *ring,union igc_adv_rx_desc *rx_desc,struct sk_buff *skb) { -if (ring->netdev->features &NETIF_F_RXHASH ) -skb_set_hash (skb, -le32_to_cpu (rx_desc->wb.lower.hi_dword.rss), -PKT_HASH_TYPE_L3 ); +if (ring->netdev->features &NETIF_F_RXHASH ) { +u32 rss_hash =le32_to_cpu (rx_desc->wb.lower.hi_dword.rss); +u32 rss_type =igc_rss_type (rx_desc); + +skb_set_hash (skb, rss_hash, igc_rss_type_table[rss_type]); + } }/**
@@ -5257,6 +5279,7 @@ static int igc_probe(struct pci_dev *pdev, netdev->features |=NETIF_F_TSO ; netdev->features |=NETIF_F_TSO6 ; netdev->features |=NETIF_F_TSO_ECN ; + netdev->features |=NETIF_F_RXHASH ; netdev->features |=NETIF_F_RXCSUM ; netdev->features |=NETIF_F_HW_CSUM ; netdev->features |=NETIF_F_SCTP_CRC ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 42/509 wifi: ath9k: fix AR9003 mac hardware hang check register offset calculation
In reply to Greg Kroah-HartmanFrom: Peter Seiderer <[email protected]>
[ Upstream commit 3e56c80931c7615250fe4bf83f93b57881969266 ]
Fix ath9k_hw_verify_hang()/ar9003_hw_detect_mac_hang() register offset calculation (do not overflow the shift for the second register/queues above five, use the register layout described in the comments above ath9k_hw_verify_hang() instead).
--- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_hw.c +18 -9
@@ -1099,17 +1099,22 @@ static bool ath9k_hw_verify_hang(struct ath_hw *ah, unsigned int queue) {u32 dma_dbg_chain, dma_dbg_complete;u8 dcu_chain_state, dcu_complete_state; +unsigned int dbg_reg, reg_offset;int i; -for (i =0 ; i <NUM_STATUS_READS ; i++) { -if (queue <6 ) - dma_dbg_chain =REG_READ (ah,AR_DMADBG_4 ); -else - dma_dbg_chain =REG_READ (ah,AR_DMADBG_5 ); +if (queue <6 ) { + dbg_reg =AR_DMADBG_4 ; + reg_offset = queue *5 ; + }else { + dbg_reg =AR_DMADBG_5 ; + reg_offset = (queue -6 ) *5 ; + } +for (i =0 ; i <NUM_STATUS_READS ; i++) { + dma_dbg_chain =REG_READ (ah, dbg_reg); dma_dbg_complete =REG_READ (ah,AR_DMADBG_6 ); - dcu_chain_state = (dma_dbg_chain >> (5 * queue)) &0x1f ; + dcu_chain_state = (dma_dbg_chain >> reg_offset) &0x1f ; dcu_complete_state = dma_dbg_complete &0x3 ;if ((dcu_chain_state !=0x6 ) || (dcu_complete_state !=0x1 ))
@@ -1128,6 +1133,7 @@ static bool ar9003_hw_detect_mac_hang(struct ath_hw *ah)u8 dcu_chain_state, dcu_complete_state;bool dcu_wait_frdone = false;unsigned long chk_dcu =0 ; +unsigned int reg_offset;unsigned int i =0 ; dma_dbg_4 =REG_READ (ah,AR_DMADBG_4 );
@@ -1139,12 +1145,15 @@ static bool ar9003_hw_detect_mac_hang(struct ath_hw *ah) goto exit;for (i =0 ; i <ATH9K_NUM_TX_QUEUES ; i++) { -if (i <6 ) +if (i <6 ) { chk_dbg = dma_dbg_4; -else + reg_offset = i *5 ; + }else { chk_dbg = dma_dbg_5; + reg_offset = (i -6 ) *5 ; + } - dcu_chain_state = (chk_dbg >> (5 * i)) &0x1f ; + dcu_chain_state = (chk_dbg >> reg_offset) &0x1f ;if (dcu_chain_state ==0x6 ) { dcu_wait_frdone = true; chk_dcu |=BIT (i);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 43/509 wifi: ath9k: avoid referencing uninit memory in ath9k_wmi_ctrl_rx
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
[ Upstream commit f24292e827088bba8de7158501ac25a59b064953 ]
For the reasons also described in commit b383e8abed41 ("wifi: ath9k: avoid uninit memory read in ath9k_htc_rx_msg()"), ath9k_htc_rx_msg() should validate pkt_len before accessing the SKB.
For example, the obtained SKB may have been badly constructed with pkt_len = 8. In this case, the SKB can only contain a valid htc_frame_hdr but after being processed in ath9k_htc_rx_msg() and passed to ath9k_wmi_ctrl_rx() endpoint RX handler, it is expected to have a WMI command header which should be located inside its data payload.
Implement sanity checking inside ath9k_wmi_ctrl_rx(). Otherwise, uninit memory can be referenced.
Tested on Qualcomm Atheros Communications AR9271 802.11n .
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/net/wireless/ath/ath9k/wmi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath9k/wmi.c +4 -0
@@ -221,6 +221,10 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,if (unlikely (wmi->stopped)) goto free_skb; +/* Validate the obtained SKB. */ +if (unlikely (skb->len <sizeof (struct wmi_cmd_hdr ))) + goto free_skb; + hdr = (struct wmi_cmd_hdr *) skb->data; cmd_id =be16_to_cpu (hdr->command_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 44/509 samples/bpf: Fix buffer overflow in tcp_basertt
In reply to Greg Kroah-HartmanFrom: Pengcheng Yang <[email protected]>
[ Upstream commit f4dea9689c5fea3d07170c2cb0703e216f1a0922 ]
Using sizeof(nv) or strlen(nv)+1 is correct.
--- samples/bpf/tcp_basertt_kern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/bpf/tcp_basertt_kern.c +1 -1
@@ -47,7 +47,7 @@ int bpf_basertt(struct bpf_sock_ops *skops)case BPF_SOCK_OPS_BASE_RTT : n =bpf_getsockopt (skops,SOL_TCP ,TCP_CONGESTION , cong,sizeof (cong)); -if (!n && !__builtin_memcmp (cong, nv,sizeof (nv)+1 )) { +if (!n && !__builtin_memcmp (cong, nv,sizeof (nv))) {/* Set base_rtt to 80us */ rv =80 ; }else if (n) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 45/509 spi: spi-geni-qcom: Correct CS_TOGGLE bit in SPI_TRANS_CFG
In reply to Greg Kroah-HartmanFrom: Vijaya Krishna Nivarthi <[email protected]>
[ Upstream commit 5fd7c99ecf45c8ee8a9b1268f0ffc91cc6271da2 ]
The CS_TOGGLE bit when set is supposed to instruct FW to toggle CS line between words. The driver with intent of disabling this behaviour has been unsetting BIT(0). This has not caused any trouble so far because the original BIT(1) is untouched and BIT(0) likely wasn't being used.
Correct this to prevent a potential future bug.
--- drivers/spi/spi-geni-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-geni-qcom.c +1 -1
@@ -32,7 +32,7 @@#define CS_DEMUX_OUTPUT_SEL GENMASK(3, 0)#define SE_SPI_TRANS_CFG 0x25c -#define CS_TOGGLE BIT(0) +#define CS_TOGGLE BIT(1)#define SE_SPI_WORD_LEN 0x268#define WORD_LEN_MSK GENMASK(9, 0)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 46/509 wifi: wilc1000: fix for absent RSN capabilities WFA testcase
In reply to Greg Kroah-HartmanFrom: Amisha Patel <[email protected]>
[ Upstream commit 9ce4bb09123e9754996e358bd808d39f5d112899 ]
Mandatory WFA testcase CT_Security_WPA2Personal_STA_RSNEBoundsVerification-AbsentRSNCap, performs bounds verfication on Beacon and/or Probe response frames. It failed and observed the reason to be absence of cipher suite and AKM suite in RSN information. To fix this, enable the RSN flag before extracting RSN capabilities.
--- drivers/net/wireless/microchip/wilc1000/hif.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/microchip/wilc1000/hif.c +4 -4
@@ -470,6 +470,9 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,int rsn_ie_len =sizeof (struct element ) + rsn_ie[1 ];int offset =8 ; + param->mode_802_11i =2 ; + param->rsn_found = true; +/* extract RSN capabilities */ if (offset < rsn_ie_len) {/* skip over pairwise suites */
@@ -479,11 +482,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,/* skip over authentication suites */ offset += (rsn_ie[offset] *4 ) +2 ; -if (offset +1 < rsn_ie_len) { - param->mode_802_11i =2 ; - param->rsn_found = true; +if (offset +1 < rsn_ie_len)memcpy (param->rsn_cap, &rsn_ie[offset],2 ); - } } } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 47/509 wifi: mwifiex: Fix the size of a memory allocation in mwifiex_ret_802_11_scan()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit d9aef04fcfa81ee4fb2804a21a3712b7bbd936af ]
The type of "mwifiex_adapter->nd_info" is "struct cfg80211_wowlan_nd_info", not "struct cfg80211_wowlan_nd_match".
Use struct_size() to ease the computation of the needed size.
The current code over-allocates some memory, so is safe. But it wastes 32 bytes.
--- drivers/net/wireless/marvell/mwifiex/scan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/marvell/mwifiex/scan.c +3 -3
@@ -2200,9 +2200,9 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,if (nd_config) { adapter->nd_info = -kzalloc (sizeof (struct cfg80211_wowlan_nd_match ) + -sizeof (struct cfg80211_wowlan_nd_match *) * - scan_rsp->number_of_sets,GFP_ATOMIC ); +kzalloc (struct_size (adapter->nd_info, matches, + scan_rsp->number_of_sets), +GFP_ATOMIC );if (adapter->nd_info) adapter->nd_info->n_matches = scan_rsp->number_of_sets;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 48/509 bpf: Remove extra lock_sock for TCP_ZEROCOPY_RECEIVE
In reply to Greg Kroah-HartmanFrom: Stanislav Fomichev <[email protected]>
[ Upstream commit 9cacf81f8161111db25f98e78a7a0e32ae142b3f ]
Add custom implementation of getsockopt hook for TCP_ZEROCOPY_RECEIVE. We skip generic hooks for TCP_ZEROCOPY_RECEIVE and have a custom call in do_tcp_getsockopt using the on-stack data. This removes 3% overhead for locking/unlocking the socket.
Without this patch:
3.38% 0.07% tcp_mmap [kernel.kallsyms] [k] __cgroup_bpf_run_filter_getsockopt
|
--3.30%--__cgroup_bpf_run_filter_getsockopt
|
--0.81%--__kmallocWith the patch applied:
0.52% 0.12% tcp_mmap [kernel.kallsyms] [k] __cgroup_bpf_run_filter_getsockopt_kern
Note, exporting uapi/tcp.h requires removing netinet/tcp.h from test_progs.h because those headers have confliciting definitions.
Stable-dep-of: 2598619e012c ("sctp: add bpf_bypass_getsockopt proto callback")
--- include/linux/bpf-cgroup.h | 27 +- include/linux/indirect_call_wrapper.h | 6 + include/net/sock.h | 2 + include/net/tcp.h | 1 + kernel/bpf/cgroup.c | 46 +++ net/ipv4/tcp.c | 14 + net/ipv4/tcp_ipv4.c | 1 + net/ipv6/tcp_ipv6.c | 1 + net/socket.c | 3 + tools/include/uapi/linux/tcp.h | 357 ++++++++++++++++++ .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 1 + .../selftests/bpf/prog_tests/cls_redirect.c | 1 + .../selftests/bpf/prog_tests/sockmap_basic.c | 1 + .../selftests/bpf/prog_tests/sockopt_sk.c | 28 ++ .../testing/selftests/bpf/progs/sockopt_sk.c | 23 +- tools/testing/selftests/bpf/test_progs.h | 1 - 16 files changed, 506 insertions(+), 7 deletions(-) create mode 100644 tools/include/uapi/linux/tcp.h
include/linux/bpf-cgroup.h +23 -4
@@ -158,6 +158,10 @@ int __cgroup_bpf_run_filter_getsockopt(struct sock *sk, int level, int __user *optlen, int max_optlen, int retval); +int __cgroup_bpf_run_filter_getsockopt_kern (struct sock *sk,int level, +int optname,void *optval, +int *optlen,int retval); +static inline enum bpf_cgroup_storage_type cgroup_storage_type (struct bpf_map *map) {
@@ -404,10 +408,23 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key, ({ \int __ret = retval; \if (cgroup_bpf_enabled) \ - __ret =__cgroup_bpf_run_filter_getsockopt (sock, level, \ - optname, optval, \ - optlen, max_optlen, \ - retval); \ +if (!(sock)->sk_prot->bpf_bypass_getsockopt || \ + !INDIRECT_CALL_INET_1 ((sock)->sk_prot->bpf_bypass_getsockopt, \ + tcp_bpf_bypass_getsockopt, \ + level, optname)) \ + __ret =__cgroup_bpf_run_filter_getsockopt ( \ + sock, level, optname, optval, optlen, \ + max_optlen, retval); \ + __ret; \ +}) + +#define BPF_CGROUP_RUN_PROG_GETSOCKOPT_KERN (sock, level, optname, optval, \ + optlen, retval) \ +({ \ + int __ret = retval; \ + if (cgroup_bpf_enabled) \ + __ret = __cgroup_bpf_run_filter_getsockopt_kern( \ + sock, level, optname, optval, optlen, retval); \ __ret; \ })
@@ -493,6 +510,8 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map,#define BPF_CGROUP_GETSOCKOPT_MAX_OPTLEN (optlen) ({ 0; })#define BPF_CGROUP_RUN_PROG_GETSOCKOPT (sock, level, optname, optval, \ optlen, max_optlen, retval) ({ retval; }) +#define BPF_CGROUP_RUN_PROG_GETSOCKOPT_KERN (sock, level, optname, optval, \ + optlen, retval) ({ retval; })#define BPF_CGROUP_RUN_PROG_SETSOCKOPT (sock, level, optname, optval, optlen, \ kernel_optval) ({ 0; })
include/linux/indirect_call_wrapper.h +6 -0
@@ -60,4 +60,10 @@#define INDIRECT_CALL_INET (f, f2, f1, ...) f(__VA_ARGS__)#endif +#if IS_ENABLED (CONFIG_INET ) +#define INDIRECT_CALL_INET_1 (f, f1, ...) INDIRECT_CALL_1(f, f1, __VA_ARGS__) +#else +#define INDIRECT_CALL_INET_1 (f, f1, ...) f(__VA_ARGS__) +#endif +#endif
include/net/sock.h +2 -0
@@ -1207,6 +1207,8 @@ struct proto {int (*backlog_rcv) (struct sock *sk,struct sk_buff *skb); +bool (*bpf_bypass_getsockopt)(int level, +int optname);void (*release_cb)(struct sock *sk);
include/net/tcp.h +1 -0
@@ -389,6 +389,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, struct poll_table_struct *wait);int tcp_getsockopt (struct sock *sk,int level,int optname,char __user *optval,int __user *optlen); +bool tcp_bpf_bypass_getsockopt (int level,int optname);int tcp_setsockopt (struct sock *sk,int level,int optname,sockptr_t optval,unsigned int optlen);void tcp_set_keepalive (struct sock *sk,int val);
kernel/bpf/cgroup.c +46 -0
52 lines not on this page · raw message
net/ipv4/tcp.c +14 -0
@@ -3970,6 +3970,8 @@ static int do_tcp_getsockopt(struct sock *sk, int level,return -EFAULT ;lock_sock (sk); err =tcp_zerocopy_receive (sk, &zc); + err =BPF_CGROUP_RUN_PROG_GETSOCKOPT_KERN (sk, level, optname, + &zc, &len, err);release_sock (sk); if (len >= offsetofend(struct tcp_zerocopy_receive, err)) goto zerocopy_rcv_sk_err;
@@ -4004,6 +4006,18 @@ static int do_tcp_getsockopt(struct sock *sk, int level,return 0 ; } +bool tcp_bpf_bypass_getsockopt (int level,int optname) +{ +/* TCP do_tcp_getsockopt has optimized getsockopt implementation +* to avoid extra socket lock for TCP_ZEROCOPY_RECEIVE. +*/ +if (level ==SOL_TCP && optname ==TCP_ZEROCOPY_RECEIVE ) +return true; + +return false; +} +EXPORT_SYMBOL (tcp_bpf_bypass_getsockopt); +int tcp_getsockopt (struct sock *sk,int level,int optname,char __user *optval,int __user *optlen) {
net/ipv4/tcp_ipv4.c +1 -0
@@ -2805,6 +2805,7 @@ struct proto tcp_prot = { .shutdown = tcp_shutdown, .setsockopt = tcp_setsockopt, .getsockopt = tcp_getsockopt, + .bpf_bypass_getsockopt = tcp_bpf_bypass_getsockopt, .keepalive = tcp_set_keepalive, .recvmsg = tcp_recvmsg, .sendmsg = tcp_sendmsg,
net/ipv6/tcp_ipv6.c +1 -0
@@ -2135,6 +2135,7 @@ struct proto tcpv6_prot = { .shutdown = tcp_shutdown, .setsockopt = tcp_setsockopt, .getsockopt = tcp_getsockopt, + .bpf_bypass_getsockopt = tcp_bpf_bypass_getsockopt, .keepalive = tcp_set_keepalive, .recvmsg = tcp_recvmsg, .sendmsg = tcp_sendmsg,
net/socket.c +3 -0
@@ -2137,6 +2137,9 @@ SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname,return __sys_setsockopt (fd, level, optname, optval, optlen); } +INDIRECT_CALLABLE_DECLARE(bool tcp_bpf_bypass_getsockopt(int level, +int optname)); +/* * Get a socket option. Because we don't know the option lengths we have * to pass a user mode parameter for the protocols to sort out.
tools/include/uapi/linux/tcp.h new file +357 -0
357 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +1 -0
@@ -2,6 +2,7 @@/* Copyright (c) 2019 Facebook */ #include <linux/err.h> +#include <netinet/tcp.h> #include <test_progs.h> #include "bpf_dctcp.skel.h" #include "bpf_cubic.skel.h"
tools/testing/selftests/bpf/prog_tests/cls_redirect.c +1 -0
@@ -7,6 +7,7 @@#include <string.h> #include <linux/pkt_cls.h> +#include <netinet/tcp.h> #include <test_progs.h>
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2020 Cloudflare #include <error.h> +#include <netinet/tcp.h> #include "test_progs.h" #include "test_skmsg_load_helpers.skel.h"
tools/testing/selftests/bpf/prog_tests/sockopt_sk.c +28 -0
@@ -2,6 +2,12 @@#include <test_progs.h> #include "cgroup_helpers.h" +#include <linux/tcp.h> + +#ifndef SOL_TCP +#define SOL_TCP IPPROTO_TCP +#endif +#define SOL_CUSTOM 0xdeadbeefstatic int getsetsockopt (void )
@@ -11,6 +17,7 @@ static int getsetsockopt(void)char u8[4 ];__u32 u32;char cc[16 ];/* TCP_CA_NAME_MAX */ +struct tcp_zerocopy_receive zc; } buf = {};socklen_t optlen;char *big_buf =NULL ;
@@ -154,6 +161,27 @@ static int getsetsockopt(void) goto err; } +/* TCP_ZEROCOPY_RECEIVE triggers */ +memset (&buf,0 ,sizeof (buf)); + optlen =sizeof (buf.zc); + err =getsockopt (fd,SOL_TCP ,TCP_ZEROCOPY_RECEIVE , &buf, &optlen); +if (err) { +log_err ("Unexpected getsockopt(TCP_ZEROCOPY_RECEIVE) err=%d errno=%d" , + err, errno); + goto err; + } + +memset (&buf,0 ,sizeof (buf)); + buf.zc.address =12345 ;/* rejected by BPF */ + optlen =sizeof (buf.zc); + errno =0 ; + err =getsockopt (fd,SOL_TCP ,TCP_ZEROCOPY_RECEIVE , &buf, &optlen); +if (errno !=EPERM ) { +log_err ("Unexpected getsockopt(TCP_ZEROCOPY_RECEIVE) err=%d errno=%d" , + err, errno); + goto err; + } +free (big_buf);close (fd);return 0 ;
tools/testing/selftests/bpf/progs/sockopt_sk.c +21 -2
@@ -1,8 +1,8 @@// SPDX-License-Identifier: GPL-2.0 #include <string.h> -#include <netinet/in.h> -#include <netinet/tcp.h> +#include <linux/tcp.h> #include <linux/bpf.h> +#include <netinet/in.h> #include <bpf/bpf_helpers.h> char _license[] SEC("license") = "GPL";
@@ -12,6 +12,10 @@ __u32 _version SEC("version") = 1;#define PAGE_SIZE 4096#endif +#ifndef SOL_TCP +#define SOL_TCP IPPROTO_TCP +#endif +#define SOL_CUSTOM 0xdeadbeefstruct sockopt_sk {
@@ -57,6 +61,21 @@ int _getsockopt(struct bpf_sockopt *ctx)return 1 ; } +if (ctx->level ==SOL_TCP && ctx->optname ==TCP_ZEROCOPY_RECEIVE ) { +/* Verify that TCP_ZEROCOPY_RECEIVE triggers. +* It has a custom implementation for performance +* reasons. +*/ + +if (optval +sizeof (struct tcp_zerocopy_receive ) > optval_end) +return 0 ;/* EPERM, bounds check */ + +if (((struct tcp_zerocopy_receive *)optval)->address !=0 ) +return 0 ;/* EPERM, unexpected data */ + +return 1 ; + } +if (ctx->level ==SOL_IP && ctx->optname ==IP_FREEBIND ) {if (optval +1 > optval_end)return 0 ;/* EPERM, bounds check */
tools/testing/selftests/bpf/test_progs.h +0 -1
@@ -16,7 +16,6 @@ typedef __u16 __sum16;#include <linux/if_packet.h> #include <linux/ip.h> #include <linux/ipv6.h> -#include <netinet/tcp.h> #include <linux/filter.h> #include <linux/perf_event.h> #include <linux/socket.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 49/509 sctp: add bpf_bypass_getsockopt proto callback
In reply to Greg Kroah-HartmanFrom: Alexander Mikhalitsyn <[email protected]>
[ Upstream commit 2598619e012cee5273a2821441b9a051ad931249 ]
Implement ->bpf_bypass_getsockopt proto callback and filter out SCTP_SOCKOPT_PEELOFF, SCTP_SOCKOPT_PEELOFF_FLAGS and SCTP_SOCKOPT_CONNECTX3 socket options from running eBPF hook on them.
SCTP_SOCKOPT_PEELOFF and SCTP_SOCKOPT_PEELOFF_FLAGS options do fd_install(), and if BPF_CGROUP_RUN_PROG_GETSOCKOPT hook returns an error after success of the original handler sctp_getsockopt(...), userspace will receive an error from getsockopt syscall and will be not aware that fd was successfully installed into a fdtable.
As pointed by Marcelo Ricardo Leitner it seems reasonable to skip bpf getsockopt hook for SCTP_SOCKOPT_CONNECTX3 sockopt too. Because internaly, it triggers connect() and if error is masked then userspace will be confused.
This patch was born as a result of discussion around a new SCM_PIDFD interface:
https://lore.kernel.org/all/[email protected]/
--- net/sctp/socket.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
net/sctp/socket.c +18 -0
@@ -8039,6 +8039,22 @@ static int sctp_getsockopt(struct sock *sk, int level, int optname,return retval; } +static bool sctp_bpf_bypass_getsockopt (int level,int optname) +{ +if (level ==SOL_SCTP ) { +switch (optname) { +case SCTP_SOCKOPT_PEELOFF : +case SCTP_SOCKOPT_PEELOFF_FLAGS : +case SCTP_SOCKOPT_CONNECTX3 : +return true; +default : +return false; + } + } + +return false; +} +static int sctp_hash (struct sock *sk) {/* STUB */
@@ -9407,6 +9423,7 @@ struct proto sctp_prot = { .shutdown = sctp_shutdown, .setsockopt = sctp_setsockopt, .getsockopt = sctp_getsockopt, + .bpf_bypass_getsockopt = sctp_bpf_bypass_getsockopt, .sendmsg = sctp_sendmsg, .recvmsg = sctp_recvmsg, .bind = sctp_bind,
@@ -9459,6 +9476,7 @@ struct proto sctpv6_prot = { .shutdown = sctp_shutdown, .setsockopt = sctp_setsockopt, .getsockopt = sctp_getsockopt, + .bpf_bypass_getsockopt = sctp_bpf_bypass_getsockopt, .sendmsg = sctp_sendmsg, .recvmsg = sctp_recvmsg, .bind = sctp_bind,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 50/509 libbpf: fix offsetof() and container_of() to work with CO-RE
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit bdeeed3498c7871c17465bb4f11d1bc67f9098af ]
It seems like __builtin_offset() doesn't preserve CO-RE field relocations properly. So if offsetof() macro is defined through __builtin_offset(), CO-RE-enabled BPF code using container_of() will be subtly and silently broken.
To avoid this problem, redefine offsetof() and container_of() in the form that works with CO-RE relocations more reliably.
--- tools/lib/bpf/bpf_helpers.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
tools/lib/bpf/bpf_helpers.h +10 -5
@@ -42,16 +42,21 @@/* * Helper macro to manipulate data structures */ -#ifndef offsetof -#define offsetof (TYPE ,MEMBER ) ((unsigned long)&((TYPE *)0)->MEMBER) -#endif -#ifndef container_of + +/* offsetof() definition that uses __builtin_offset() might not preserve field +* offset CO-RE relocation properly, so force-redefine offsetof() using +* old-school approach which works with CO-RE correctly +*/ +#undef offsetof +#define offsetof (type, member) ((unsigned long)&((type *)0)->member) + +/* redefined container_of() to ensure we use the above offsetof() macro */ +#undef container_of#define container_of (ptr, type, member) \ ({ \ void *__mptr = (void *)(ptr); \ ((type *)(__mptr - offsetof(type, member))); \ }) -#endif /* * Helper macro to throw a compilation error if __bpf_unreachable() gets
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 51/509 nfc: constify several pointers to u8, char and sk_buff
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 3df40eb3a2ea58bf404a38f15a7a2768e4762cb0 ]
Several functions receive pointers to u8, char or sk_buff but do not modify the contents so make them const. This allows doing the same for local variables and in total makes the code a little bit safer.
Stable-dep-of: 0d9b41daa590 ("nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect()")
--- include/net/nfc/nfc.h | 4 ++-- net/nfc/core.c | 4 ++-- net/nfc/hci/llc_shdlc.c | 10 ++++----- net/nfc/llcp.h | 8 +++---- net/nfc/llcp_commands.c | 46 ++++++++++++++++++++++------------------- net/nfc/llcp_core.c | 44 +++++++++++++++++++++------------------ net/nfc/nfc.h | 2 +- 7 files changed, 63 insertions(+), 55 deletions(-)
include/net/nfc/nfc.h +2 -2
@@ -266,7 +266,7 @@ struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk,struct sk_buff *nfc_alloc_recv_skb (unsigned int size,gfp_t gfp);int nfc_set_remote_general_bytes (struct nfc_dev *dev, -u8 *gt,u8 gt_len); +const u8 *gt,u8 gt_len);u8 *nfc_get_local_general_bytes (struct nfc_dev *dev,size_t *gb_len); int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name,
@@ -280,7 +280,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, u8 comm_mode, u8 rf_mode);int nfc_tm_activated (struct nfc_dev *dev,u32 protocol,u8 comm_mode, -u8 *gb,size_t gb_len); +const u8 *gb,size_t gb_len);int nfc_tm_deactivated (struct nfc_dev *dev);int nfc_tm_data_received (struct nfc_dev *dev,struct sk_buff *skb);
net/nfc/core.c +2 -2
@@ -634,7 +634,7 @@ int nfc_disable_se(struct nfc_dev *dev, u32 se_idx)return rc; } -int nfc_set_remote_general_bytes (struct nfc_dev *dev,u8 *gb,u8 gb_len) +int nfc_set_remote_general_bytes (struct nfc_dev *dev,const u8 *gb,u8 gb_len) {pr_debug ("dev_name=%s gb_len=%d\n" ,dev_name (&dev->dev), gb_len);
@@ -663,7 +663,7 @@ int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb)EXPORT_SYMBOL (nfc_tm_data_received);int nfc_tm_activated (struct nfc_dev *dev,u32 protocol,u8 comm_mode, -u8 *gb,size_t gb_len) +const u8 *gb,size_t gb_len) {int rc;
net/nfc/hci/llc_shdlc.c +5 -5
@@ -123,7 +123,7 @@ static bool llc_shdlc_x_lteq_y_lt_z(int x, int y, int z)return ((y >= x) || (y < z)) ? true : false; } -static struct sk_buff *llc_shdlc_alloc_skb (struct llc_shdlc *shdlc, +static struct sk_buff *llc_shdlc_alloc_skb (const struct llc_shdlc *shdlc,int payload_len) {struct sk_buff *skb;
@@ -137,7 +137,7 @@ static struct sk_buff *llc_shdlc_alloc_skb(struct llc_shdlc *shdlc, }/* immediately sends an S frame. */ -static int llc_shdlc_send_s_frame (struct llc_shdlc *shdlc, +static int llc_shdlc_send_s_frame (const struct llc_shdlc *shdlc,enum sframe_type sframe_type,int nr) {int r;
@@ -159,7 +159,7 @@ static int llc_shdlc_send_s_frame(struct llc_shdlc *shdlc, }/* immediately sends an U frame. skb may contain optional payload */ -static int llc_shdlc_send_u_frame (struct llc_shdlc *shdlc, +static int llc_shdlc_send_u_frame (const struct llc_shdlc *shdlc,struct sk_buff *skb,enum uframe_modifier uframe_modifier) {
@@ -361,7 +361,7 @@ static void llc_shdlc_connect_complete(struct llc_shdlc *shdlc, int r)wake_up (shdlc->connect_wq); } -static int llc_shdlc_connect_initiate (struct llc_shdlc *shdlc) +static int llc_shdlc_connect_initiate (const struct llc_shdlc *shdlc) {struct sk_buff *skb;
@@ -377,7 +377,7 @@ static int llc_shdlc_connect_initiate(struct llc_shdlc *shdlc)return llc_shdlc_send_u_frame (shdlc, skb,U_FRAME_RSET ); } -static int llc_shdlc_connect_send_ua (struct llc_shdlc *shdlc) +static int llc_shdlc_connect_send_ua (const struct llc_shdlc *shdlc) {struct sk_buff *skb;
net/nfc/llcp.h +4 -4
@@ -221,15 +221,15 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *sk, struct socket *newsock);/* TLV API */ int nfc_llcp_parse_gb_tlv (struct nfc_llcp_local *local, -u8 *tlv_array,u16 tlv_array_len); +const u8 *tlv_array,u16 tlv_array_len);int nfc_llcp_parse_connection_tlv (struct nfc_llcp_sock *sock, -u8 *tlv_array,u16 tlv_array_len); +const u8 *tlv_array,u16 tlv_array_len);/* Commands API */ void nfc_llcp_recv (void *data,struct sk_buff *skb,int err); -u8 *nfc_llcp_build_tlv (u8 type,u8 *value,u8 value_length,u8 *tlv_length); +u8 *nfc_llcp_build_tlv (u8 type,const u8 *value,u8 value_length,u8 *tlv_length);struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv (u8 tid,u8 sap); -struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv (u8 tid,char *uri, +struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv (u8 tid,const char *uri,size_t uri_len);void nfc_llcp_free_sdp_tlv (struct nfc_llcp_sdp_tlv *sdp);void nfc_llcp_free_sdp_tlv_list (struct hlist_head *sdp_head);
net/nfc/llcp_commands.c +25 -21
132 lines not on this page · raw message
net/nfc/llcp_core.c +24 -20
142 lines not on this page · raw message
net/nfc/nfc.h +1 -1
@@ -48,7 +48,7 @@ void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx, u8 comm_mode, u8 rf_mode);int nfc_llcp_register_device (struct nfc_dev *dev);void nfc_llcp_unregister_device (struct nfc_dev *dev); -int nfc_llcp_set_remote_gb (struct nfc_dev *dev,u8 *gb,u8 gb_len); +int nfc_llcp_set_remote_gb (struct nfc_dev *dev,const u8 *gb,u8 gb_len);u8 *nfc_llcp_general_bytes (struct nfc_dev *dev,size_t *general_bytes_len);int nfc_llcp_data_received (struct nfc_dev *dev,struct sk_buff *skb);struct nfc_llcp_local *nfc_llcp_find_local (struct nfc_dev *dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 52/509 nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect()
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 0d9b41daa5907756a31772d8af8ac5ff25cf17c1 ]
If sock->service_name is NULL, the local variable service_name_tlv_length will not be assigned by nfc_llcp_build_tlv(), later leading to using value frmo the stack. Smatch warning:
net/nfc/llcp_commands.c:442 nfc_llcp_send_connect() error: uninitialized symbol 'service_name_tlv_length'.
--- net/nfc/llcp_commands.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/nfc/llcp_commands.c +2 -1
@@ -394,7 +394,8 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)const u8 *service_name_tlv =NULL ;const u8 *miux_tlv =NULL ;const u8 *rw_tlv =NULL ; -u8 service_name_tlv_length, miux_tlv_length, rw_tlv_length, rw; +u8 service_name_tlv_length =0 ; +u8 miux_tlv_length, rw_tlv_length, rw;int err;u16 size =0 ;__be16 miux;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 53/509 bpftool: JIT limited misreported as negative value on aarch64
In reply to Greg Kroah-HartmanFrom: Alan Maguire <[email protected]>
[ Upstream commit 04cb8453a91c7c22f60ddadb6cef0d19abb33bb5 ]
On aarch64, "bpftool feature" reports an incorrect BPF JIT limit:
$ sudo /sbin/bpftool feature Scanning system configuration... bpf() syscall restricted to privileged users JIT compiler is enabled JIT compiler hardening is disabled JIT compiler kallsyms exports are enabled for root skipping kernel config, can't open file: No such file or directory Global memory limit for JIT compiler for unprivileged users is -201326592 bytes
This is because /proc/sys/net/core/bpf_jit_limit reports
$ sudo cat /proc/sys/net/core/bpf_jit_limit 68169519595520
...and an int is assumed in read_procfs(). Change read_procfs() to return a long to avoid negative value reporting.
--- tools/bpf/bpftool/feature.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
tools/bpf/bpftool/feature.c +12 -12
@@ -135,12 +135,12 @@ static void print_end_section(void)/* Probing functions */ -static int read_procfs (const char *path) +static long read_procfs (const char *path) {char *endptr, *line =NULL ;size_t len =0 ;FILE *fd; -int res; +long res; fd =fopen (path,"r" );if (!fd)
@@ -162,7 +162,7 @@ static int read_procfs(const char *path)static void probe_unprivileged_disabled (void ) { -int res; +long res;/* No support for C-style ouptut */
@@ -181,14 +181,14 @@ static void probe_unprivileged_disabled(void)printf ("Unable to retrieve required privileges for bpf() syscall\n" );break ;default : -printf ("bpf() syscall restriction has unknown value %d\n" , res); +printf ("bpf() syscall restriction has unknown value %ld\n" , res); } } }static void probe_jit_enable (void ) { -int res; +long res;/* No support for C-style ouptut */
@@ -210,7 +210,7 @@ static void probe_jit_enable(void)printf ("Unable to retrieve JIT-compiler status\n" );break ;default : -printf ("JIT-compiler status has unknown value %d\n" , +printf ("JIT-compiler status has unknown value %ld\n" , res); } }
@@ -218,7 +218,7 @@ static void probe_jit_enable(void)static void probe_jit_harden (void ) { -int res; +long res;/* No support for C-style ouptut */
@@ -240,7 +240,7 @@ static void probe_jit_harden(void)printf ("Unable to retrieve JIT hardening status\n" );break ;default : -printf ("JIT hardening status has unknown value %d\n" , +printf ("JIT hardening status has unknown value %ld\n" , res); } }
@@ -248,7 +248,7 @@ static void probe_jit_harden(void)static void probe_jit_kallsyms (void ) { -int res; +long res;/* No support for C-style ouptut */
@@ -267,14 +267,14 @@ static void probe_jit_kallsyms(void)printf ("Unable to retrieve JIT kallsyms export status\n" );break ;default : -printf ("JIT kallsyms exports status has unknown value %d\n" , res); +printf ("JIT kallsyms exports status has unknown value %ld\n" , res); } } }static void probe_jit_limit (void ) { -int res; +long res;/* No support for C-style ouptut */
@@ -287,7 +287,7 @@ static void probe_jit_limit(void)printf ("Unable to retrieve global memory limit for JIT compiler for unprivileged users\n" );break ;default : -printf ("Global memory limit for JIT compiler for unprivileged users is %d bytes\n" , res); +printf ("Global memory limit for JIT compiler for unprivileged users is %ld bytes\n" , res); } } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 54/509 regulator: core: Fix more error checking for debugfs_create_dir()
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 2715bb11cfff964aa33946847f9527cfbd4874f5 ]
In case of failure, debugfs_create_dir() does not return NULL, but an error pointer. Most incorrect error checks were fixed, but the one in create_regulator() was forgotten.
Fix the remaining error check.
--- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/core.c +1 -1
@@ -1751,7 +1751,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,if (err != -EEXIST ) regulator->debugfs =debugfs_create_dir (supply_name, rdev->debugfs); -if (!regulator->debugfs) { +if (IS_ERR (regulator->debugfs)) {rdev_dbg (rdev,"Failed to create debugfs directory\n" ); }else { debugfs_create_u32("uA_load", 0444, regulator->debugfs,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 55/509 regulator: core: Streamline debugfs operations
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 08880713ceec023dd94d634f1e8902728c385939 ]
If CONFIG_DEBUG_FS is not set:
regulator: Failed to create debugfs directory
...
regulator-dummy: Failed to create debugfs directory
As per the comments for debugfs_create_dir(), errors returned by this function should be expected, and ignored:
* If debugfs is not enabled in the kernel, the value -%ENODEV will be
* returned.
*
* NOTE: it's expected that most callers should _ignore_ the errors returned
* by this function. Other debugfs functions handle the fact that the "dentry"
* passed to them could be an error and they don't crash in that case.
* Drivers should generally work fine even if debugfs fails to init anyway.
Adhere to the debugfs spirit, and streamline all operations by:
1. Demoting the importance of the printed error messages to debug level, like is already done in create_regulator(),
2. Further ignoring any returned errors, as by design, all debugfs functions are no-ops when passed an error pointer.
--- drivers/regulator/core.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
drivers/regulator/core.c +13 -17
@@ -1751,19 +1751,17 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,if (err != -EEXIST ) regulator->debugfs =debugfs_create_dir (supply_name, rdev->debugfs); -if (IS_ERR (regulator->debugfs)) { +if (IS_ERR (regulator->debugfs))rdev_dbg (rdev,"Failed to create debugfs directory\n" ); - }else { -debugfs_create_u32 ("uA_load" ,0444 , regulator->debugfs, - ®ulator->uA_load); -debugfs_create_u32 ("min_uV" ,0444 , regulator->debugfs, - ®ulator->voltage[PM_SUSPEND_ON ].min_uV); -debugfs_create_u32 ("max_uV" ,0444 , regulator->debugfs, - ®ulator->voltage[PM_SUSPEND_ON ].max_uV); -debugfs_create_file ("constraint_flags" ,0444 , - regulator->debugfs, regulator, - &constraint_flags_fops); - } + +debugfs_create_u32 ("uA_load" ,0444 , regulator->debugfs, + ®ulator->uA_load); +debugfs_create_u32 ("min_uV" ,0444 , regulator->debugfs, + ®ulator->voltage[PM_SUSPEND_ON ].min_uV); +debugfs_create_u32 ("max_uV" ,0444 , regulator->debugfs, + ®ulator->voltage[PM_SUSPEND_ON ].max_uV); +debugfs_create_file ("constraint_flags" ,0444 , regulator->debugfs, + regulator, &constraint_flags_fops);/* * Check now if the regulator is an always on regulator - if
@@ -5032,10 +5030,8 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) } rdev->debugfs =debugfs_create_dir (rname, debugfs_root); -if (IS_ERR (rdev->debugfs)) { -rdev_warn (rdev,"Failed to create debugfs directory\n" ); -return ; - } +if (IS_ERR (rdev->debugfs)) +rdev_dbg (rdev,"Failed to create debugfs directory\n" );debugfs_create_u32 ("use_count" ,0444 , rdev->debugfs, &rdev->use_count);
@@ -5938,7 +5934,7 @@ static int __init regulator_init(void) debugfs_root =debugfs_create_dir ("regulator" ,NULL );if (IS_ERR (debugfs_root)) -pr_warn ("regulator: Failed to create debugfs directory\n" ); +pr_debug ("regulator: Failed to create debugfs directory\n" );#ifdef CONFIG_DEBUG_FS debugfs_create_file("supply_map", 0444, debugfs_root, NULL,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 56/509 wifi: orinoco: Fix an error handling path in spectrum_cs_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 925244325159824385209e3e0e3f91fa6bf0646c ]
Should spectrum_cs_config() fail, some resources need to be released as already done in the remove function.
While at it, remove a useless and erroneous comment. The probe is spectrum_cs_probe(), not spectrum_cs_attach().
--- drivers/net/wireless/intersil/orinoco/spectrum_cs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/intersil/orinoco/spectrum_cs.c +11 -2
@@ -157,6 +157,7 @@ spectrum_cs_probe(struct pcmcia_device *link) {struct orinoco_private *priv;struct orinoco_pccard *card; +int ret; priv = alloc_orinocodev(sizeof(*card), &link->dev, spectrum_cs_hard_reset,
@@ -169,8 +170,16 @@ spectrum_cs_probe(struct pcmcia_device *link) card->p_dev = link; link->priv = priv; -return spectrum_cs_config (link); -}/* spectrum_cs_attach */ + ret =spectrum_cs_config (link); +if (ret) + goto err_free_orinocodev; + +return 0 ; + +err_free_orinocodev: +free_orinocodev (priv); +return ret; +}static void spectrum_cs_detach (struct pcmcia_device *link) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 57/509 wifi: orinoco: Fix an error handling path in orinoco_cs_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 67a81d911c01225f426cc6bee2373df044c1a9b7 ]
Should orinoco_cs_config() fail, some resources need to be released as already done in the remove function.
While at it, remove a useless and erroneous comment. The probe is orinoco_cs_probe(), not orinoco_cs_attach().
--- drivers/net/wireless/intersil/orinoco/orinoco_cs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/intersil/orinoco/orinoco_cs.c +11 -2
@@ -96,6 +96,7 @@ orinoco_cs_probe(struct pcmcia_device *link) {struct orinoco_private *priv;struct orinoco_pccard *card; +int ret; priv =alloc_orinocodev (sizeof (*card), &link->dev, orinoco_cs_hard_reset,NULL );
@@ -107,8 +108,16 @@ orinoco_cs_probe(struct pcmcia_device *link) card->p_dev = link; link->priv = priv; -return orinoco_cs_config (link); -}/* orinoco_cs_attach */ + ret =orinoco_cs_config (link); +if (ret) + goto err_free_orinocodev; + +return 0 ; + +err_free_orinocodev: +free_orinocodev (priv); +return ret; +}static void orinoco_cs_detach (struct pcmcia_device *link) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 58/509 wifi: atmel: Fix an error handling path in atmel_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 6b92e4351a29af52c285fe235e6e4d1a75de04b2 ]
Should atmel_config() fail, some resources need to be released as already done in the remove function.
While at it, remove a useless and erroneous comment. The probe is atmel_probe(), not atmel_attach().
--- drivers/net/wireless/atmel/atmel_cs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/atmel/atmel_cs.c +11 -2
@@ -73,6 +73,7 @@ struct local_info {static int atmel_probe (struct pcmcia_device *p_dev) {struct local_info *local; +int ret;dev_dbg (&p_dev->dev,"atmel_attach()\n" );
@@ -83,8 +84,16 @@ static int atmel_probe(struct pcmcia_device *p_dev) p_dev->priv = local; -return atmel_config (p_dev); -}/* atmel_attach */ + ret =atmel_config (p_dev); +if (ret) + goto err_free_priv; + +return 0 ; + +err_free_priv: +kfree (p_dev->priv); +return ret; +}static void atmel_detach (struct pcmcia_device *link) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 59/509 wl3501_cs: Fix misspelling and provide missing documentation
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
[ Upstream commit 8b8a6f8c3b50193d161c598a6784e721128d6dc3 ]
Fixes the following W=1 kernel build warning(s):
In file included from drivers/net/wireless/wl3501_cs.c:57:
drivers/net/wireless/wl3501_cs.c:143: warning: Function parameter or member 'reg_domain' not described in 'iw_valid_channel' drivers/net/wireless/wl3501_cs.c:143: warning: Excess function parameter 'reg_comain' description in 'iw_valid_channel' drivers/net/wireless/wl3501_cs.c:469: warning: Function parameter or member 'data' not described in 'wl3501_send_pkt' drivers/net/wireless/wl3501_cs.c:469: warning: Function parameter or member 'len' not described in 'wl3501_send_pkt'
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- drivers/net/wireless/wl3501_cs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/wireless/wl3501_cs.c +3 -5
@@ -134,7 +134,7 @@ static const struct {/** * iw_valid_channel - validate channel in regulatory domain -* @reg_comain: regulatory domain +* @reg_domain: regulatory domain * @channel: channel to validate * * Returns 0 if invalid in the specified regulatory domain, non-zero if valid.
@@ -458,11 +458,9 @@ static int wl3501_pwr_mgmt(struct wl3501_card *this, int suspend)/** * wl3501_send_pkt - Send a packet. * @this: Card -* -* Send a packet. -* -* data = Ethernet raw frame. (e.g. data[0] - data[5] is Dest MAC Addr, +* @data: Ethernet raw frame. (e.g. data[0] - data[5] is Dest MAC Addr, * data[6] - data[11] is Src MAC Addr) +* @len: Packet length * Ref: IEEE 802.11 */ static int wl3501_send_pkt (struct wl3501_card *this,u8 *data,u16 len)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 60/509 net: create netdev->dev_addr assignment helpers
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 48eab831ae8b9f7002a533fa4235eed63ea1f1a3 ]
Recent work on converting address list to a tree made it obvious we need an abstraction around writing netdev->dev_addr. Without such abstraction updating the main device address is invisible to the core.
Introduce a number of helpers which for now just wrap memcpy() but in the future can make necessary changes to the address tree.
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- include/linux/etherdevice.h | 12 ++++++++++++ include/linux/netdevice.h | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+)
include/linux/etherdevice.h +12 -0
@@ -299,6 +299,18 @@ static inline void ether_addr_copy(u8 *dst, const u8 *src)#endif } +/** +* eth_hw_addr_set - Assign Ethernet address to a net_device +* @dev: pointer to net_device structure +* @addr: address to assign +* +* Assign given address to the net_device, addr_assign_type is not changed. +*/ +static inline void eth_hw_addr_set (struct net_device *dev,const u8 *addr) +{ +ether_addr_copy (dev->dev_addr, addr); +} +/** * eth_hw_addr_inherit - Copy dev_addr from another net_device * @dst: pointer to net_device to copy dev_addr to
include/linux/netdevice.h +18 -0
@@ -4474,6 +4474,24 @@ void __hw_addr_unsync_dev(struct netdev_hw_addr_list *list,void __hw_addr_init (struct netdev_hw_addr_list *list);/* Functions used for device addresses handling */ +static inline void +__dev_addr_set (struct net_device *dev,const u8 *addr,size_t len) +{ +memcpy (dev->dev_addr, addr, len); +} + +static inline void dev_addr_set (struct net_device *dev,const u8 *addr) +{ +__dev_addr_set (dev, addr, dev->addr_len); +} + +static inline void +dev_addr_mod (struct net_device *dev,unsigned int offset, +const u8 *addr,size_t len) +{ +memcpy (&dev->dev_addr[offset], addr, len); +} +int dev_addr_add (struct net_device *dev,const unsigned char *addr,unsigned char addr_type); int dev_addr_del(struct net_device *dev, const unsigned char *addr,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 61/509 wl3501_cs: use eth_hw_addr_set()
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 18774612246d036c04ce9fee7f67192f96f48725 ]
Commit 406f42fa0d3c ("net-next: When a bond have a massive amount of VLANs...") introduced a rbtree for faster Ethernet address look up. To maintain netdev->dev_addr in this tree we need to make all the writes to it got through appropriate helpers.
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- drivers/net/wireless/wl3501_cs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/wl3501_cs.c +1 -2
@@ -1945,8 +1945,7 @@ static int wl3501_config(struct pcmcia_device *link) goto failed; } -for (i =0 ; i <6 ; i++) - dev->dev_addr[i] = ((char *)&this->mac_addr)[i]; +eth_hw_addr_set (dev, this->mac_addr);/* print probe information */ printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, "
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 62/509 wifi: wl3501_cs: Fix an error handling path in wl3501_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 391af06a02e7642039ac5f6c4b2c034ab0992b5d ]
Should wl3501_config() fail, some resources need to be released as already done in the remove function.
--- drivers/net/wireless/wl3501_cs.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/wireless/wl3501_cs.c +11 -5
@@ -1862,6 +1862,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev) {struct net_device *dev;struct wl3501_card *this; +int ret;/* The io structure describes IO port mapping */ p_dev->resource[0 ]->end =16 ;
@@ -1873,8 +1874,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev) dev =alloc_etherdev (sizeof (struct wl3501_card ));if (!dev) - goto out_link; - +return -ENOMEM ; dev->netdev_ops = &wl3501_netdev_ops; dev->watchdog_timeo =5 *HZ ;
@@ -1887,9 +1887,15 @@ static int wl3501_probe(struct pcmcia_device *p_dev)netif_stop_queue (dev); p_dev->priv = dev; -return wl3501_config (p_dev); -out_link: -return -ENOMEM ; + ret =wl3501_config (p_dev); +if (ret) + goto out_free_etherdev; + +return 0 ; + +out_free_etherdev: +free_netdev (dev); +return ret; }static int wl3501_config (struct pcmcia_device *link)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 63/509 wifi: ray_cs: Utilize strnlen() in parse_addr()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 9e8e9187673cb24324f9165dd47b2b28f60b0b10 ]
Instead of doing simple operations and using an additional variable on stack, utilize strnlen() and reuse len variable.
Stable-dep-of: 4f8d66a9fb2e ("wifi: ray_cs: Fix an error handling path in ray_probe()")
--- drivers/net/wireless/ray_cs.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/net/wireless/ray_cs.c +7 -9
@@ -1641,31 +1641,29 @@ static void authenticate_timeout(struct timer_list *t)/*===========================================================================*/ static int parse_addr (char *in_str,UCHAR *out) { +int i, k;int len; -int i, j, k;int status;if (in_str ==NULL )return 0 ; -if ((len =strlen (in_str)) <2 ) + len =strnlen (in_str,ADDRLEN *2 +1 ) -1 ; +if (len <1 )return 0 ;memset (out,0 ,ADDRLEN ); status =1 ; - j = len -1 ; -if (j >12 ) - j =12 ; i =5 ; -while (j >0 ) { -if ((k =hex_to_bin (in_str[j--])) !=-1 ) +while (len >0 ) { +if ((k =hex_to_bin (in_str[len--])) !=-1 ) out[i] = k;else return 0 ; -if (j ==0 ) +if (len ==0 )break ; -if ((k =hex_to_bin (in_str[j--])) !=-1 ) +if ((k =hex_to_bin (in_str[len--])) !=-1 ) out[i] += k <<4 ;else return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 64/509 wifi: ray_cs: Drop useless status variable in parse_addr()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 4dfc63c002a555a2c3c34d89009532ad803be876 ]
The status variable assigned only once and used also only once. Replace it's usage by actual value.
Stable-dep-of: 4f8d66a9fb2e ("wifi: ray_cs: Fix an error handling path in ray_probe()")
--- drivers/net/wireless/ray_cs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/ray_cs.c +1 -3
@@ -1643,7 +1643,6 @@ static int parse_addr(char *in_str, UCHAR *out) {int i, k;int len; -int status;if (in_str ==NULL )return 0 ;
@@ -1652,7 +1651,6 @@ static int parse_addr(char *in_str, UCHAR *out)return 0 ;memset (out,0 ,ADDRLEN ); - status =1 ; i =5 ;while (len >0 ) {
@@ -1670,7 +1668,7 @@ static int parse_addr(char *in_str, UCHAR *out)if (!i--)break ; } -return status; +return 1 ; }/*===========================================================================*/
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 65/509 wifi: ray_cs: Fix an error handling path in ray_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 4f8d66a9fb2edcd05c1e563456a55a08910bfb37 ]
Should ray_config() fail, some resources need to be released as already done in the remove function.
While at it, remove a useless and erroneous comment. The probe is ray_probe(), not ray_attach().
--- drivers/net/wireless/ray_cs.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/wireless/ray_cs.c +11 -5
@@ -270,13 +270,14 @@ static int ray_probe(struct pcmcia_device *p_dev) {ray_dev_t *local;struct net_device *dev; +int ret;dev_dbg (&p_dev->dev,"ray_attach()\n" );/* Allocate space for private device-specific data */ dev =alloc_etherdev (sizeof (ray_dev_t));if (!dev) - goto fail_alloc_dev; +return -ENOMEM ; local =netdev_priv (dev); local->finder = p_dev;
@@ -313,11 +314,16 @@ static int ray_probe(struct pcmcia_device *p_dev)timer_setup (&local->timer,NULL ,0 ); this_device = p_dev; -return ray_config (p_dev); + ret =ray_config (p_dev); +if (ret) + goto err_free_dev; + +return 0 ; -fail_alloc_dev: -return -ENOMEM ; -}/* ray_attach */ +err_free_dev: +free_netdev (dev); +return ret; +}static void ray_detach (struct pcmcia_device *link) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 66/509 wifi: ath9k: dont allow to overwrite ENDPOINT0 attributes
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
[ Upstream commit 061b0cb9327b80d7a0f63a33e7c3e2a91a71f142 ]
A bad USB device is able to construct a service connection response message with target endpoint being ENDPOINT0 which is reserved for HTC_CTRL_RSVD_SVC and should not be modified to be used for any other services.
Reject such service connection responses.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/net/wireless/ath/ath9k/htc_hst.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/htc_hst.c +7 -1
@@ -114,7 +114,13 @@ static void htc_process_conn_rsp(struct htc_target *target,if (svc_rspmsg->status ==HTC_SERVICE_SUCCESS ) { epid = svc_rspmsg->endpoint_id; -if (epid <0 || epid >=ENDPOINT_MAX ) + +/* Check that the received epid for the endpoint to attach +* a new service is valid. ENDPOINT0 can't be used here as it +* is already reserved for HTC_CTRL_RSVD_SVC service and thus +* should not be modified. +*/ +if (epid <=ENDPOINT0 || epid >=ENDPOINT_MAX )return ; service_id =be16_to_cpu (svc_rspmsg->service_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 67/509 wifi: rsi: Do not configure WoWlan in shutdown hook if not enabled
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit b241e260820b68c09586e8a0ae0fc23c0e3215bd ]
In case WoWlan was never configured during the operation of the system, the hw->wiphy->wowlan_config will be NULL. rsi_config_wowlan() checks whether wowlan_config is non-NULL and if it is not, then WARNs about it. The warning is valid, as during normal operation the rsi_config_wowlan() should only ever be called with non-NULL wowlan_config. In shutdown this rsi_config_wowlan() should only ever be called if WoWlan was configured before by the user.
Add checks for non-NULL wowlan_config into the shutdown hook. While at it, check whether the wiphy is also non-NULL before accessing wowlan_config . Drop the single-use wowlan_config variable, just inline it into function call.
--- drivers/net/wireless/rsi/rsi_91x_sdio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/wireless/rsi/rsi_91x_sdio.c +2 -4
@@ -1463,10 +1463,8 @@ static void rsi_shutdown(struct device *dev)rsi_dbg (ERR_ZONE ,"SDIO Bus shutdown =====>\n" ); -if (hw) { -struct cfg80211_wowlan *wowlan = hw->wiphy->wowlan_config; - -if (rsi_config_wowlan (adapter, wowlan)) +if (hw && hw->wiphy && hw->wiphy->wowlan_config) { +if (rsi_config_wowlan (adapter, hw->wiphy->wowlan_config))rsi_dbg (ERR_ZONE ,"Failed to configure WoWLAN\n" ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 68/509 wifi: rsi: Do not set MMC_PM_KEEP_POWER in shutdown
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e74f562328b03fbe9cf438f958464dff3a644dfc ]
It makes no sense to set MMC_PM_KEEP_POWER in shutdown. The flag indicates to the MMC subsystem to keep the slot powered on during suspend, but in shutdown the slot should actually be powered off. Drop this call.
--- drivers/net/wireless/rsi/rsi_91x_sdio.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/wireless/rsi/rsi_91x_sdio.c +0 -3
@@ -1479,9 +1479,6 @@ static void rsi_shutdown(struct device *dev)if (sdev->write_fail)rsi_dbg (INFO_ZONE ,"###### Device is not ready #######\n" ); -if (rsi_set_sdio_pm_caps (adapter)) -rsi_dbg (INFO_ZONE ,"Setting power management caps failed\n" ); -rsi_dbg (INFO_ZONE ,"***** RSI module shut down *****\n" ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 69/509 watchdog/perf: define dummy watchdog_update_hrtimer_threshold() on correct config
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 5e008df11c55228a86a1bae692cc2002503572c9 ]
Patch series "watchdog/hardlockup: Add the buddy hardlockup detector", v5.
This patch series adds the "buddy" hardlockup detector. In brief, the buddy hardlockup detector can detect hardlockups without arch-level support by having CPUs checkup on a "buddy" CPU periodically.
Given the new design of this patch series, testing all combinations is fairly difficult. I've attempted to make sure that all combinations of CONFIG_ options are good, but it wouldn't surprise me if I missed something. I apologize in advance and I'll do my best to fix any problems that are found.
This patch (of 18):
The real watchdog_update_hrtimer_threshold() is defined in kernel/watchdog_hld.c. That file is included if CONFIG_HARDLOCKUP_DETECTOR_PERF and the function is defined in that file if CONFIG_HARDLOCKUP_CHECK_TIMESTAMP.
The dummy version of the function in "nmi.h" didn't get that quite right. While this doesn't appear to be a huge deal, it's nice to make it consistent.
It doesn't break builds because CHECK_TIMESTAMP is only defined by x86 so others don't get a double definition, and x86 uses perf lockup detector, so it gets the out of line version.
--- include/linux/nmi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/nmi.h +1 -1
@@ -197,7 +197,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh);#endif #if defined(CONFIG_HARDLOCKUP_CHECK_TIMESTAMP ) && \ - defined(CONFIG_HARDLOCKUP_DETECTOR ) + defined(CONFIG_HARDLOCKUP_DETECTOR_PERF )void watchdog_update_hrtimer_threshold (u64 period);#else static inline void watchdog_update_hrtimer_threshold (u64 period) { }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 70/509 watchdog/perf: more properly prevent false positives with turbo modes
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 4379e59fe5665cfda737e45b8bf2f05321ef049c ]
Currently, in the watchdog_overflow_callback() we first check to see if the watchdog had been touched and _then_ we handle the workaround for turbo mode. This order should be reversed.
Specifically, "touching" the hardlockup detector's watchdog should avoid lockups being detected for one period that should be roughly the same regardless of whether we're running turbo or not. That means that we should do the extra accounting for turbo _before_ we look at (and clear) the global indicating that we've been touched.
NOTE: this fix is made based on code inspection. I am not aware of any reports where the old code would have generated false positives. That being said, this order seems more correct and also makes it easier down the line to share code with the "buddy" hardlockup detector.
--- kernel/watchdog_hld.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/watchdog_hld.c +3 -3
@@ -114,14 +114,14 @@ static void watchdog_overflow_callback(struct perf_event *event,/* Ensure the watchdog never gets throttled */ event->hw.interrupts =0 ; +if (!watchdog_check_timestamp ()) +return ; +if (__this_cpu_read (watchdog_nmi_touch) == true) {__this_cpu_write (watchdog_nmi_touch, false);return ; } -if (!watchdog_check_timestamp ()) -return ; -/* check for a hardlockup * This is done by making sure our timer interrupt * is incrementing. The timer interrupt should have
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 71/509 kexec: fix a memory leak in crash_shrink_memory()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit 1cba6c4309f03de570202c46f03df3f73a0d4c82 ]
Patch series "kexec: enable kexec_crash_size to support two crash kernel regions".
When crashkernel=X fails to reserve region under 4G, it will fall back to reserve region above 4G and a region of the default size will also be reserved under 4G. Unfortunately, /sys/kernel/kexec_crash_size only supports one crash kernel region now, the user cannot sense the low memory reserved by reading /sys/kernel/kexec_crash_size. Also, low memory cannot be freed by writing this file.
For example:resource_size(crashk_res) = 512Mresource_size(crashk_low_res) = 256M
The result of 'cat /sys/kernel/kexec_crash_size' is 512M, but it should be 768M. When we execute 'echo 0 > /sys/kernel/kexec_crash_size', the size of crashk_res becomes 0 and resource_size(crashk_low_res) is still 256 MB, which is incorrect.
Since crashk_res manages the memory with high address and crashk_low_res manages the memory with low address, crashk_low_res is shrunken only when all crashk_res is shrunken. And because when there is only one crash kernel region, crashk_res is always used. Therefore, if all crashk_res is shrunken and crashk_low_res still exists, swap them.
This patch (of 6):
If the value of parameter 'new_size' is in the semi-open and semi-closed interval (crashk_res.end - KEXEC_CRASH_MEM_ALIGN + 1, crashk_res.end], the calculation result of ram_res is:
ram_res->start = crashk_res.end + 1 ram_res->end = crashk_res.end
The operation of insert_resource() fails, and ram_res is not added to iomem_resource. As a result, the memory of the control block ram_res is leaked.
In fact, on all architectures, the start address and size of crashk_res are already aligned by KEXEC_CRASH_MEM_ALIGN. Therefore, we do not need to round up crashk_res.start again. Instead, we should round up 'new_size' in advance.
--- kernel/kexec_core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/kexec_core.c +2 -3
@@ -1029,6 +1029,7 @@ int crash_shrink_memory(unsigned long new_size) start = crashk_res.start; end = crashk_res.end; old_size = (end ==0 ) ?0 : end - start +1 ; + new_size =roundup (new_size,KEXEC_CRASH_MEM_ALIGN );if (new_size >= old_size) { ret = (new_size == old_size) ?0 : -EINVAL ; goto unlock;
@@ -1040,9 +1041,7 @@ int crash_shrink_memory(unsigned long new_size) goto unlock; } - start =roundup (start,KEXEC_CRASH_MEM_ALIGN ); - end =roundup (start + new_size,KEXEC_CRASH_MEM_ALIGN ); - + end = start + new_size;crash_free_reserved_phys_range (end, crashk_res.end);if ((start == end) && (crashk_res.parent !=NULL ))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 72/509 memstick r592: make memstick_debug_get_tpc_name() static
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 434587df9f7fd68575f99a889cc5f2efc2eaee5e ]
There are no other files referencing this function, apparently it was left global to avoid an 'unused function' warning when the only caller is left out. With a 'W=1' build, it causes a 'missing prototype' warning though:
drivers/memstick/host/r592.c:47:13: error: no previous prototype for 'memstick_debug_get_tpc_name' [-Werror=missing-prototypes]
Annotate the function as 'static __maybe_unused' to avoid both problems.
--- drivers/memstick/host/r592.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/memstick/host/r592.c +1 -3
@@ -44,12 +44,10 @@ static const char *tpc_names[] = {* memstick_debug_get_tpc_name - debug helper that returns string for * a TPC number */ -const char *memstick_debug_get_tpc_name (int tpc) +static __maybe_unused const char *memstick_debug_get_tpc_name (int tpc) {return tpc_names[tpc-1 ]; } -EXPORT_SYMBOL (memstick_debug_get_tpc_name); -/* Read a register*/ static inline u32 r592_read_reg (struct r592_device *dev,int address)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 73/509 wifi: ath9k: Fix possible stall on ath9k_txq_list_has_key()
In reply to Greg Kroah-HartmanFrom: Remi Pommarel <[email protected]>
[ Upstream commit 75086cc6dee046e3fbb3dba148b376d8802f83bc ]
On EDMA capable hardware, ath9k_txq_list_has_key() can enter infinite loop if it is called while all txq_fifos have packets that use different key that the one we are looking for. Fix it by exiting the loop if all txq_fifos have been checked already.
Because this loop is called under spin_lock_bh() (see ath_txq_lock) it causes the following rcu stall:
rcu: INFO: rcu_sched self-detected stall on CPU
ath10k_pci 0000:01:00.0: failed to read temperature -11
rcu: 1-....: (5254 ticks this GP) idle=189/1/0x4000000000000002 softirq=8442983/8442984 fqs=2579
(t=5257 jiffies g=17983297 q=334)
Task dump for CPU 1:
task:hostapd state:R running task stack: 0 pid: 297 ppid: 289 flags:0x0000000a
Call trace:
dump_backtrace+0x0/0x170
show_stack+0x1c/0x24
sched_show_task+0x140/0x170
dump_cpu_task+0x48/0x54
rcu_dump_cpu_stacks+0xf0/0x134
rcu_sched_clock_irq+0x8d8/0x9fc
update_process_times+0xa0/0xec
tick_sched_timer+0x5c/0xd0
__hrtimer_run_queues+0x154/0x320
hrtimer_interrupt+0x120/0x2f0
arch_timer_handler_virt+0x38/0x44
handle_percpu_devid_irq+0x9c/0x1e0
handle_domain_irq+0x64/0x90
gic_handle_irq+0x78/0xb0
call_on_irq_stack+0x28/0x38
do_interrupt_handler+0x54/0x5c
el1_interrupt+0x2c/0x4c
el1h_64_irq_handler+0x14/0x1c
el1h_64_irq+0x74/0x78
ath9k_txq_has_key+0x1bc/0x250 [ath9k]
ath9k_set_key+0x1cc/0x3dc [ath9k]
drv_set_key+0x78/0x170
ieee80211_key_replace+0x564/0x6cc
ieee80211_key_link+0x174/0x220
ieee80211_add_key+0x11c/0x300
nl80211_new_key+0x12c/0x330
genl_family_rcv_msg_doit+0xbc/0x11c
genl_rcv_msg+0xd8/0x1c4
netlink_rcv_skb+0x40/0x100
genl_rcv+0x3c/0x50
netlink_unicast+0x1ec/0x2c0
netlink_sendmsg+0x198/0x3c0
____sys_sendmsg+0x210/0x250
___sys_sendmsg+0x78/0xc4
__sys_sendmsg+0x4c/0x90
__arm64_sys_sendmsg+0x28/0x30
invoke_syscall.constprop.0+0x60/0x100
do_el0_svc+0x48/0xd0
el0_svc+0x14/0x50
el0t_64_sync_handler+0xa8/0xb0
el0t_64_sync+0x158/0x15cThis rcu stall is hard to reproduce as is, but changing ATH_TXFIFO_DEPTH from 8 to 2 makes it reasonably easy to reproduce.
--- drivers/net/wireless/ath/ath9k/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +4 -3
@@ -850,7 +850,7 @@ static bool ath9k_txq_list_has_key(struct list_head *txq_list, u32 keyix)static bool ath9k_txq_has_key (struct ath_softc *sc,u32 keyix) {struct ath_hw *ah = sc->sc_ah; -int i; +int i, j;struct ath_txq *txq;bool key_in_use = false;
@@ -868,8 +868,9 @@ static bool ath9k_txq_has_key(struct ath_softc *sc, u32 keyix)if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_EDMA ) {int idx = txq->txq_tailidx; -while (!key_in_use && - !list_empty (&txq->txq_fifo[idx])) { +for (j =0 ; !key_in_use && + !list_empty (&txq->txq_fifo[idx]) && + j <ATH_TXFIFO_DEPTH ; j++) { key_in_use =ath9k_txq_list_has_key ( &txq->txq_fifo[idx], keyix);INCR (idx,ATH_TXFIFO_DEPTH );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 74/509 rtnetlink: extend RTEXT_FILTER_SKIP_STATS to IFLA_VF_INFO
In reply to Greg Kroah-HartmanFrom: Edwin Peer <[email protected]>
[ Upstream commit fa0e21fa44438a0e856d42224bfa24641d37b979 ]
This filter already exists for excluding IPv6 SNMP stats. Extend its definition to also exclude IFLA_VF_INFO stats in RTM_GETLINK.
This patch constitutes a partial fix for a netlink attribute nesting overflow bug in IFLA_VFINFO_LIST. By excluding the stats when the requester doesn't need them, the truncation of the VF list is avoided.
While it was technically only the stats added in commit c5a9f6f0ab40 ("net/core: Add drop counters to VF statistics") breaking the camel's back, the appreciable size of the stats data should never have been included without due consideration for the maximum number of VFs supported by PCI.
--- net/core/rtnetlink.c | 96 +++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 45 deletions(-)
net/core/rtnetlink.c +51 -45
@@ -929,24 +929,27 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev,nla_total_size (sizeof (struct ifla_vf_rate )) +nla_total_size (sizeof (struct ifla_vf_link_state )) +nla_total_size (sizeof (struct ifla_vf_rss_query_en )) + -nla_total_size (0 ) +/* nest IFLA_VF_STATS */ -/* IFLA_VF_STATS_RX_PACKETS */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_TX_PACKETS */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_RX_BYTES */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_TX_BYTES */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_BROADCAST */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_MULTICAST */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_RX_DROPPED */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_TX_DROPPED */ -nla_total_size_64bit (sizeof (__u64)) + nla_total_size(sizeof(struct ifla_vf_trust))); +if (~ext_filter_mask &RTEXT_FILTER_SKIP_STATS ) { + size += num_vfs * + (nla_total_size (0 ) +/* nest IFLA_VF_STATS */ +/* IFLA_VF_STATS_RX_PACKETS */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_TX_PACKETS */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_RX_BYTES */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_TX_BYTES */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_BROADCAST */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_MULTICAST */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_RX_DROPPED */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_TX_DROPPED */ +nla_total_size_64bit (sizeof (__u64))); + }return size; }else return 0 ;
@@ -1221,7 +1224,8 @@ static noinline_for_stack int rtnl_fill_stats(struct sk_buff *skb, static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,struct net_device *dev,int vfs_num, -struct nlattr *vfinfo) +struct nlattr *vfinfo, +u32 ext_filter_mask) {struct ifla_vf_rss_query_en vf_rss_query_en;struct nlattr *vf, *vfstats, *vfvlanlist;
@@ -1327,33 +1331,35 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb, goto nla_put_vf_failure; }nla_nest_end (skb, vfvlanlist); -memset (&vf_stats,0 ,sizeof (vf_stats)); -if (dev->netdev_ops->ndo_get_vf_stats) - dev->netdev_ops->ndo_get_vf_stats (dev, vfs_num, - &vf_stats); - vfstats =nla_nest_start_noflag (skb,IFLA_VF_STATS ); -if (!vfstats) - goto nla_put_vf_failure; -if (nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_PACKETS , - vf_stats.rx_packets,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_PACKETS , - vf_stats.tx_packets,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_BYTES , - vf_stats.rx_bytes,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_BYTES , - vf_stats.tx_bytes,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_BROADCAST , - vf_stats.broadcast,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_MULTICAST , - vf_stats.multicast,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_DROPPED , - vf_stats.rx_dropped,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_DROPPED , - vf_stats.tx_dropped,IFLA_VF_STATS_PAD )) { -nla_nest_cancel (skb, vfstats); - goto nla_put_vf_failure; +if (~ext_filter_mask &RTEXT_FILTER_SKIP_STATS ) { +memset (&vf_stats,0 ,sizeof (vf_stats)); +if (dev->netdev_ops->ndo_get_vf_stats) + dev->netdev_ops->ndo_get_vf_stats (dev, vfs_num, + &vf_stats); + vfstats =nla_nest_start_noflag (skb,IFLA_VF_STATS ); +if (!vfstats) + goto nla_put_vf_failure; +if (nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_PACKETS , + vf_stats.rx_packets,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_PACKETS , + vf_stats.tx_packets,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_BYTES , + vf_stats.rx_bytes,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_BYTES , + vf_stats.tx_bytes,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_BROADCAST , + vf_stats.broadcast,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_MULTICAST , + vf_stats.multicast,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_DROPPED , + vf_stats.rx_dropped,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_DROPPED , + vf_stats.tx_dropped,IFLA_VF_STATS_PAD )) { +nla_nest_cancel (skb, vfstats); + goto nla_put_vf_failure; + } +nla_nest_end (skb, vfstats); } -nla_nest_end (skb, vfstats);nla_nest_end (skb, vf);return 0 ;
@@ -1386,7 +1392,7 @@ static noinline_for_stack int rtnl_fill_vf(struct sk_buff *skb,return -EMSGSIZE ;for (i =0 ; i < num_vfs; i++) { -if (rtnl_fill_vfinfo (skb, dev, i, vfinfo)) +if (rtnl_fill_vfinfo (skb, dev, i, vfinfo, ext_filter_mask))return -EMSGSIZE ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 75/509 wifi: iwlwifi: pull from TXQs with softirqs disabled
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 96fb6f47db24a712d650b0a9b9074873f273fb0e ]
In mac80211, it's required that we pull from TXQs by calling ieee80211_tx_dequeue() only with softirqs disabled. However, in iwl_mvm_queue_state_change() we're often called with them enabled, e.g. from flush if anything was flushed, triggering a mac80211 warning.
Fix that by disabling the softirqs across the TX call.
--- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/ops.c +4 -1
@@ -1174,8 +1174,11 @@ static void iwl_mvm_queue_state_change(struct iwl_op_mode *op_mode, mvmtxq =iwl_mvm_txq_from_mac80211 (txq); mvmtxq->stopped = !start; -if (start && mvmsta->sta_state !=IEEE80211_STA_NOTEXIST ) +if (start && mvmsta->sta_state !=IEEE80211_STA_NOTEXIST ) { +local_bh_disable ();iwl_mvm_mac_itxq_xmit (mvm->hw, txq); +local_bh_enable (); + } } out:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 76/509 wifi: cfg80211: rewrite merging of inherited elements
In reply to Greg Kroah-HartmanFrom: Benjamin Berg <[email protected]>
[ Upstream commit dfd9aa3e7a456d57b18021d66472ab7ff8373ab7 ]
The cfg80211_gen_new_ie function merges the IEs using inheritance rules. Rewrite this function to fix issues around inheritance rules. In particular, vendor elements do not require any special handling, as they are either all inherited or overridden by the subprofile. Also, add fragmentation handling as this may be needed in some cases.
This also changes the function to not require making a copy. The new version could be optimized a bit by explicitly tracking which IEs have been handled already rather than looking that up again every time.
Note that a small behavioural change is the removal of the SSID special handling. This should be fine for the MBSSID element, as the SSID must be included in the subelement.
--- net/wireless/scan.c | 213 ++++++++++++++++++++++++++------------------ 1 file changed, 124 insertions(+), 89 deletions(-)
net/wireless/scan.c +124 -89
@@ -262,117 +262,152 @@ bool cfg80211_is_element_inherited(const struct element *elem, }EXPORT_SYMBOL (cfg80211_is_element_inherited); -static size_t cfg80211_gen_new_ie (const u8 *ie,size_t ielen, -const u8 *subelement,size_t subie_len, -u8 *new_ie,gfp_t gfp) +static size_t cfg80211_copy_elem_with_frags (const struct element *elem, +const u8 *ie,size_t ie_len, +u8 **pos,u8 *buf,size_t buf_len) { -u8 *pos, *tmp; -const u8 *tmp_old, *tmp_new; -const struct element *non_inherit_elem; -u8 *sub_copy; +if (WARN_ON ((u8 *)elem < ie || elem->data > ie + ie_len || + elem->data + elem->datalen > ie + ie_len)) +return 0 ; -/* copy subelement as we need to change its content to -* mark an ie after it is processed. -*/ - sub_copy =kmemdup (subelement, subie_len, gfp); -if (!sub_copy) +if (elem->datalen +2 > buf + buf_len - *pos)return 0 ; - pos = &new_ie[0 ]; +memcpy (*pos, elem, elem->datalen +2 ); + *pos += elem->datalen +2 ; -/* set new ssid */ - tmp_new =cfg80211_find_ie (WLAN_EID_SSID , sub_copy, subie_len); -if (tmp_new) { -memcpy (pos, tmp_new, tmp_new[1 ] +2 ); - pos += (tmp_new[1 ] +2 ); +/* Finish if it is not fragmented */ +if (elem->datalen !=255 ) +return *pos - buf; + + ie_len = ie + ie_len - elem->data - elem->datalen; + ie = (const u8 *)elem->data + elem->datalen; + +for_each_element (elem, ie, ie_len) { +if (elem->id !=WLAN_EID_FRAGMENT ) +break ; + +if (elem->datalen +2 > buf + buf_len - *pos) +return 0 ; + +memcpy (*pos, elem, elem->datalen +2 ); + *pos += elem->datalen +2 ; + +if (elem->datalen !=255 ) +break ; } -/* get non inheritance list if exists */ - non_inherit_elem = -cfg80211_find_ext_elem (WLAN_EID_EXT_NON_INHERITANCE , - sub_copy, subie_len); +return *pos - buf; +} -/* go through IEs in ie (skip SSID) and subelement, -* merge them into new_ie +static size_t cfg80211_gen_new_ie (const u8 *ie,size_t ielen, +const u8 *subie,size_t subie_len, +u8 *new_ie,size_t new_ie_len) +{ +const struct element *non_inherit_elem, *parent, *sub; +u8 *pos = new_ie; +u8 id, ext_id; +unsigned int match_len; + + non_inherit_elem =cfg80211_find_ext_elem (WLAN_EID_EXT_NON_INHERITANCE , + subie, subie_len); + +/* We copy the elements one by one from the parent to the generated +* elements. +* If they are not inherited (included in subie or in the non +* inheritance element), then we copy all occurrences the first time +* we see this element type. */ - tmp_old =cfg80211_find_ie (WLAN_EID_SSID , ie, ielen); - tmp_old = (tmp_old) ? tmp_old + tmp_old[1 ] +2 : ie; - -while (tmp_old +2 - ie <= ielen && - tmp_old + tmp_old[1 ] +2 - ie <= ielen) { -if (tmp_old[0 ] ==0 ) { - tmp_old++; +for_each_element (parent, ie, ielen) { +if (parent->id ==WLAN_EID_FRAGMENT )continue ; + +if (parent->id ==WLAN_EID_EXTENSION ) { +if (parent->datalen <1 ) +continue ; + + id =WLAN_EID_EXTENSION ; + ext_id = parent->data[0 ]; + match_len =1 ; + }else { + id = parent->id; + match_len =0 ; } -if (tmp_old[0 ] ==WLAN_EID_EXTENSION ) - tmp = (u8 *)cfg80211_find_ext_ie (tmp_old[2 ], sub_copy, - subie_len); -else - tmp = (u8 *)cfg80211_find_ie (tmp_old[0 ], sub_copy, - subie_len); +/* Find first occurrence in subie */ + sub =cfg80211_find_elem_match (id, subie, subie_len, + &ext_id, match_len,0 ); -if (!tmp) { -const struct element *old_elem = (void *)tmp_old; +/* Copy from parent if not in subie and inherited */ +if (!sub && +cfg80211_is_element_inherited (parent, non_inherit_elem)) { +if (!cfg80211_copy_elem_with_frags (parent, + ie, ielen, + &pos, new_ie, + new_ie_len)) +return 0 ; -/* ie in old ie but not in subelement */ -if (cfg80211_is_element_inherited (old_elem, - non_inherit_elem)) { -memcpy (pos, tmp_old, tmp_old[1 ] +2 ); - pos += tmp_old[1 ] +2 ; - } - }else { -/* ie in transmitting ie also in subelement, -* copy from subelement and flag the ie in subelement -* as copied (by setting eid field to WLAN_EID_SSID, -* which is skipped anyway). -* For vendor ie, compare OUI + type + subType to -* determine if they are the same ie. -*/ -if (tmp_old[0 ] ==WLAN_EID_VENDOR_SPECIFIC ) { -if (tmp_old[1 ] >=5 && tmp[1 ] >=5 && - !memcmp (tmp_old +2 , tmp +2 ,5 )) { -/* same vendor ie, copy from -* subelement -*/ -memcpy (pos, tmp, tmp[1 ] +2 ); - pos += tmp[1 ] +2 ; - tmp[0 ] =WLAN_EID_SSID ; - }else { -memcpy (pos, tmp_old, tmp_old[1 ] +2 ); - pos += tmp_old[1 ] +2 ; - } - }else { -/* copy ie from subelement into new ie */ -memcpy (pos, tmp, tmp[1 ] +2 ); - pos += tmp[1 ] +2 ; - tmp[0 ] =WLAN_EID_SSID ; - } +continue ; } -if (tmp_old + tmp_old[1 ] +2 - ie == ielen) -break ; +/* Already copied if an earlier element had the same type */ +if (cfg80211_find_elem_match (id, ie, (u8 *)parent - ie, + &ext_id, match_len,0 )) +continue ; - tmp_old += tmp_old[1 ] +2 ; +/* Not inheriting, copy all similar elements from subie */ +while (sub) { +if (!cfg80211_copy_elem_with_frags (sub, + subie, subie_len, + &pos, new_ie, + new_ie_len)) +return 0 ; + + sub =cfg80211_find_elem_match (id, + sub->data + sub->datalen, + subie_len + subie - + (sub->data + + sub->datalen), + &ext_id, match_len,0 ); + } } -/* go through subelement again to check if there is any ie not -* copied to new ie, skip ssid, capability, bssid-index ie +/* The above misses elements that are included in subie but not in the +* parent, so do a pass over subie and append those. +* Skip the non-tx BSSID caps and non-inheritance element. */ - tmp_new = sub_copy; -while (tmp_new +2 - sub_copy <= subie_len && - tmp_new + tmp_new[1 ] +2 - sub_copy <= subie_len) { -if (!(tmp_new[0 ] ==WLAN_EID_NON_TX_BSSID_CAP || - tmp_new[0 ] ==WLAN_EID_SSID )) { -memcpy (pos, tmp_new, tmp_new[1 ] +2 ); - pos += tmp_new[1 ] +2 ; +for_each_element (sub, subie, subie_len) { +if (sub->id ==WLAN_EID_NON_TX_BSSID_CAP ) +continue ; + +if (sub->id ==WLAN_EID_FRAGMENT ) +continue ; + +if (sub->id ==WLAN_EID_EXTENSION ) { +if (sub->datalen <1 ) +continue ; + + id =WLAN_EID_EXTENSION ; + ext_id = sub->data[0 ]; + match_len =1 ; + +if (ext_id ==WLAN_EID_EXT_NON_INHERITANCE ) +continue ; + }else { + id = sub->id; + match_len =0 ; } -if (tmp_new + tmp_new[1 ] +2 - sub_copy == subie_len) -break ; - tmp_new += tmp_new[1 ] +2 ; + +/* Processed if one was included in the parent */ +if (cfg80211_find_elem_match (id, ie, ielen, + &ext_id, match_len,0 )) +continue ; + +if (!cfg80211_copy_elem_with_frags (sub, subie, subie_len, + &pos, new_ie, new_ie_len)) +return 0 ; } -kfree (sub_copy);return pos - new_ie; }
@@ -2170,7 +2205,7 @@ static void cfg80211_parse_mbssid_data(struct wiphy *wiphy, new_ie_len =cfg80211_gen_new_ie (ie, ielen, profile, profile_len, new_ie, - gfp); +IEEE80211_MAX_DATA_LEN );if (!new_ie_len)continue ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 77/509 wifi: ath9k: convert msecs to jiffies where needed
In reply to Greg Kroah-HartmanFrom: Dmitry Antipov <[email protected]>
[ Upstream commit 2aa083acea9f61be3280184384551178f510ff51 ]
Since 'ieee80211_queue_delayed_work()' expects timeout in jiffies and not milliseconds, 'msecs_to_jiffies()' should be used in 'ath_restart_work()' and '__ath9k_flush()'.
--- drivers/net/wireless/ath/ath9k/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +2 -2
@@ -203,7 +203,7 @@ void ath_cancel_work(struct ath_softc *sc)void ath_restart_work (struct ath_softc *sc) {ieee80211_queue_delayed_work (sc->hw, &sc->hw_check_work, -ATH_HW_CHECK_POLL_INT ); +msecs_to_jiffies (ATH_HW_CHECK_POLL_INT ));if (AR_SREV_9340 (sc->sc_ah) ||AR_SREV_9330 (sc->sc_ah)) ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
@@ -2244,7 +2244,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop, }ieee80211_queue_delayed_work (hw, &sc->hw_check_work, -ATH_HW_CHECK_POLL_INT ); +msecs_to_jiffies (ATH_HW_CHECK_POLL_INT )); }static bool ath9k_tx_frames_pending (struct ieee80211_hw *hw)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 78/509 igc: Fix race condition in PTP tx code
In reply to Greg Kroah-HartmanFrom: Vinicius Costa Gomes <[email protected]>
[ Upstream commit 9c50e2b150c8ee0eee5f8154e2ad168cdd748877 ]
Currently, the igc driver supports timestamping only one tx packet at a time. During the transmission flow, the skb that requires hardware timestamping is saved in adapter->ptp_tx_skb. Once hardware has the timestamp, an interrupt is delivered, and adapter->ptp_tx_work is scheduled. In igc_ptp_tx_work(), we read the timestamp register, update adapter->ptp_tx_skb, and notify the network stack.
While the thread executing the transmission flow (the user process running in kernel mode) and the thread executing ptp_tx_work don't access adapter->ptp_tx_skb concurrently, there are two other places where adapter->ptp_tx_skb is accessed: igc_ptp_tx_hang() and igc_ptp_suspend().
igc_ptp_tx_hang() is executed by the adapter->watchdog_task worker thread which runs periodically so it is possible we have two threads accessing ptp_tx_skb at the same time. Consider the following scenario:
right after __IGC_PTP_TX_IN_PROGRESS is set in igc_xmit_frame_ring(), igc_ptp_tx_hang() is executed. Since adapter->ptp_tx_start hasn't been written yet, this is considered a timeout and adapter->ptp_tx_skb is cleaned up.
This patch fixes the issue described above by adding the ptp_tx_lock to protect access to ptp_tx_skb and ptp_tx_start fields from igc_adapter. Since igc_xmit_frame_ring() called in atomic context by the networking stack, ptp_tx_lock is defined as a spinlock, and the irq safe variants of lock/unlock are used.
With the introduction of the ptp_tx_lock, the __IGC_PTP_TX_IN_PROGRESS flag doesn't provide much of a use anymore so this patch gets rid of it.
--- drivers/net/ethernet/intel/igc/igc.h | 5 +- drivers/net/ethernet/intel/igc/igc_main.c | 9 ++-- drivers/net/ethernet/intel/igc/igc_ptp.c | 57 ++++++++++++----------- 3 files changed, 41 insertions(+), 30 deletions(-)
drivers/net/ethernet/intel/igc/igc.h +4 -1
@@ -210,6 +210,10 @@ struct igc_adapter {struct ptp_clock *ptp_clock;struct ptp_clock_info ptp_caps;struct work_struct ptp_tx_work; +/* Access to ptp_tx_skb and ptp_tx_start are protected by the +* ptp_tx_lock. +*/ +spinlock_t ptp_tx_lock;struct sk_buff *ptp_tx_skb;struct hwtstamp_config tstamp_config;unsigned long ptp_tx_start;
@@ -389,7 +393,6 @@ enum igc_state_t { __IGC_TESTING, __IGC_RESETTING, __IGC_DOWN, - __IGC_PTP_TX_IN_PROGRESS, }; enum igc_tx_flags {
drivers/net/ethernet/intel/igc/igc_main.c +6 -3
@@ -1467,9 +1467,10 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,* the other timer registers before skipping the * timestamping request. */ -if (adapter->tstamp_config.tx_type ==HWTSTAMP_TX_ON && - !test_and_set_bit_lock (__IGC_PTP_TX_IN_PROGRESS, - &adapter->state)) { +unsigned long flags; + +spin_lock_irqsave (&adapter->ptp_tx_lock, flags); +if (adapter->tstamp_config.tx_type ==HWTSTAMP_TX_ON && !adapter->ptp_tx_skb) {skb_shinfo (skb)->tx_flags |=SKBTX_IN_PROGRESS ; tx_flags |=IGC_TX_FLAGS_TSTAMP ;
@@ -1478,6 +1479,8 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb, }else { adapter->tx_hwtstamp_skipped++; } + +spin_unlock_irqrestore (&adapter->ptp_tx_lock, flags); }/* record initial flags and protocol */
drivers/net/ethernet/intel/igc/igc_ptp.c +31 -26
120 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 79/509 net: stmmac: fix double serdes powerdown
In reply to Greg Kroah-HartmanFrom: Bartosz Golaszewski <[email protected]>
[ Upstream commit c4fc88ad2a765224a648db8ab35f125e120fe41b ]
Commit 49725ffc15fc ("net: stmmac: power up/down serdes in stmmac_open/release") correctly added a call to the serdes_powerdown() callback to stmmac_release() but did not remove the one from stmmac_remove() which leads to a doubled call to serdes_powerdown().
This can lead to all kinds of problems: in the case of the qcom ethqos driver, it caused an unbalanced regulator disable splat.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0 -6
@@ -5254,12 +5254,6 @@ int stmmac_dvr_remove(struct device *dev)netif_carrier_off (ndev);unregister_netdev (ndev); -/* Serdes power down needs to happen after VLAN filter -* is deleted that is triggered by unregister_netdev(). -*/ -if (priv->plat->serdes_powerdown) - priv->plat->serdes_powerdown (ndev, priv->plat->bsp_priv); -#ifdef CONFIG_DEBUG_FS stmmac_exit_fs (ndev);#endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 80/509 netlink: fix potential deadlock in netlink_set_err()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 8d61f926d42045961e6b65191c09e3678d86a9cf ]
syzbot reported a possible deadlock in netlink_set_err() [1]
A similar issue was fixed in commit 1d482e666b8e ("netlink: disable IRQs for netlink_lock_table()") in netlink_lock_table()
This patch adds IRQ safety to netlink_set_err() and __netlink_diag_dump() which were not covered by cited commit.
[1]
WARNING: possible irq lock inversion dependency detected 6.4.0-rc6-syzkaller-00240-g4e9f0ec38852 #0 Not tainted
syz-executor.2/23011 just changed the state of lock:ffffffff8e1a7a58 (nl_table_lock){.+.?}-{2:2}, at: netlink_set_err+0x2e/0x3a0 net/netlink/af_netlink.c:1612 but this lock was taken by another, SOFTIRQ-safe lock in the past:
(&local->queue_stop_reason_lock){..-.}-{2:2}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(nl_table_lock);
local_irq_disable();
lock(&local->queue_stop_reason_lock);
lock(nl_table_lock);
<Interrupt>
lock(&local->queue_stop_reason_lock);*** DEADLOCK ***
--- net/netlink/af_netlink.c | 5 +++-- net/netlink/diag.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
net/netlink/af_netlink.c +3 -2
@@ -1602,6 +1602,7 @@ static int do_one_set_err(struct sock *sk, struct netlink_set_err_data *p)int netlink_set_err (struct sock *ssk,u32 portid,u32 group,int code) {struct netlink_set_err_data info; +unsigned long flags;struct sock *sk;int ret =0 ;
@@ -1611,12 +1612,12 @@ int netlink_set_err(struct sock *ssk, u32 portid, u32 group, int code)/* sk->sk_err wants a positive error value */ info.code = -code; -read_lock (&nl_table_lock); +read_lock_irqsave (&nl_table_lock, flags);sk_for_each_bound (sk, &nl_table[ssk->sk_protocol].mc_list) ret +=do_one_set_err (sk, &info); -read_unlock (&nl_table_lock); +read_unlock_irqrestore (&nl_table_lock, flags);return ret; }EXPORT_SYMBOL (netlink_set_err);
net/netlink/diag.c +3 -2
@@ -94,6 +94,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,struct net *net =sock_net (skb->sk);struct netlink_diag_req *req;struct netlink_sock *nlsk; +unsigned long flags;struct sock *sk;int num =2 ;int ret =0 ;
@@ -152,7 +153,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, num++; mc_list: -read_lock (&nl_table_lock); +read_lock_irqsave (&nl_table_lock, flags);sk_for_each_bound (sk, &tbl->mc_list) {if (sk_hashed (sk))continue ;
@@ -173,7 +174,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, } num++; } -read_unlock (&nl_table_lock); +read_unlock_irqrestore (&nl_table_lock, flags); done: cb->args[0 ] = num;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 81/509 netlink: do not hard code device address lenth in fdb dumps
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit aa5406950726e336c5c9585b09799a734b6e77bf ]
syzbot reports that some netdev devices do not have a six bytes address [1]
Replace ETH_ALEN by dev->addr_len.
[1] (Case of a device where dev->addr_len = 4)
BUG: KMSAN: kernel-infoleak in instrument_copy_to_user include/linux/instrumented.h:114 [inline] BUG: KMSAN: kernel-infoleak in copyout+0xb8/0x100 lib/iov_iter.c:169 instrument_copy_to_user include/linux/instrumented.h:114 [inline] copyout+0xb8/0x100 lib/iov_iter.c:169 _copy_to_iter+0x6d8/0x1d00 lib/iov_iter.c:536 copy_to_iter include/linux/uio.h:206 [inline] simple_copy_to_iter+0x68/0xa0 net/core/datagram.c:513 __skb_datagram_iter+0x123/0xdc0 net/core/datagram.c:419 skb_copy_datagram_iter+0x5c/0x200 net/core/datagram.c:527 skb_copy_datagram_msg include/linux/skbuff.h:3960 [inline] netlink_recvmsg+0x4ae/0x15a0 net/netlink/af_netlink.c:1970 sock_recvmsg_nosec net/socket.c:1019 [inline] sock_recvmsg net/socket.c:1040 [inline] ____sys_recvmsg+0x283/0x7f0 net/socket.c:2722 ___sys_recvmsg+0x223/0x840 net/socket.c:2764 do_recvmmsg+0x4f9/0xfd0 net/socket.c:2858 __sys_recvmmsg net/socket.c:2937 [inline] __do_sys_recvmmsg net/socket.c:2960 [inline] __se_sys_recvmmsg net/socket.c:2953 [inline] __x64_sys_recvmmsg+0x397/0x490 net/socket.c:2953 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 stored to memory at:
__nla_put lib/nlattr.c:1009 [inline] nla_put+0x1c6/0x230 lib/nlattr.c:1067 nlmsg_populate_fdb_fill+0x2b8/0x600 net/core/rtnetlink.c:4071 nlmsg_populate_fdb net/core/rtnetlink.c:4418 [inline] ndo_dflt_fdb_dump+0x616/0x840 net/core/rtnetlink.c:4456 rtnl_fdb_dump+0x14ff/0x1fc0 net/core/rtnetlink.c:4629 netlink_dump+0x9d1/0x1310 net/netlink/af_netlink.c:2268 netlink_recvmsg+0xc5c/0x15a0 net/netlink/af_netlink.c:1995 sock_recvmsg_nosec+0x7a/0x120 net/socket.c:1019 ____sys_recvmsg+0x664/0x7f0 net/socket.c:2720 ___sys_recvmsg+0x223/0x840 net/socket.c:2764 do_recvmmsg+0x4f9/0xfd0 net/socket.c:2858 __sys_recvmmsg net/socket.c:2937 [inline] __do_sys_recvmmsg net/socket.c:2960 [inline] __se_sys_recvmmsg net/socket.c:2953 [inline] __x64_sys_recvmmsg+0x397/0x490 net/socket.c:2953 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+0x12d/0xb60 mm/slab.h:716 slab_alloc_node mm/slub.c:3451 [inline] __kmem_cache_alloc_node+0x4ff/0x8b0 mm/slub.c:3490 kmalloc_trace+0x51/0x200 mm/slab_common.c:1057 kmalloc include/linux/slab.h:559 [inline] __hw_addr_create net/core/dev_addr_lists.c:60 [inline] __hw_addr_add_ex+0x2e5/0x9e0 net/core/dev_addr_lists.c:118 __dev_mc_add net/core/dev_addr_lists.c:867 [inline] dev_mc_add+0x9a/0x130 net/core/dev_addr_lists.c:885 igmp6_group_added+0x267/0xbc0 net/ipv6/mcast.c:680 ipv6_mc_up+0x296/0x3b0 net/ipv6/mcast.c:2754 ipv6_mc_remap+0x1e/0x30 net/ipv6/mcast.c:2708 addrconf_type_change net/ipv6/addrconf.c:3731 [inline] addrconf_notify+0x4d3/0x1d90 net/ipv6/addrconf.c:3699 notifier_call_chain kernel/notifier.c:93 [inline] raw_notifier_call_chain+0xe4/0x430 kernel/notifier.c:461 call_netdevice_notifiers_info net/core/dev.c:1935 [inline] call_netdevice_notifiers_extack net/core/dev.c:1973 [inline] call_netdevice_notifiers+0x1ee/0x2d0 net/core/dev.c:1987 bond_enslave+0xccd/0x53f0 drivers/net/bonding/bond_main.c:1906 do_set_master net/core/rtnetlink.c:2626 [inline] rtnl_newlink_create net/core/rtnetlink.c:3460 [inline] __rtnl_newlink net/core/rtnetlink.c:3660 [inline] rtnl_newlink+0x378c/0x40e0 net/core/rtnetlink.c:3673 rtnetlink_rcv_msg+0x16a6/0x1840 net/core/rtnetlink.c:6395 netlink_rcv_skb+0x371/0x650 net/netlink/af_netlink.c:2546 rtnetlink_rcv+0x34/0x40 net/core/rtnetlink.c:6413 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0xf28/0x1230 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x122f/0x13d0 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg net/socket.c:747 [inline] ____sys_sendmsg+0x999/0xd50 net/socket.c:2503 ___sys_sendmsg+0x28d/0x3c0 net/socket.c:2557 __sys_sendmsg net/socket.c:2586 [inline] __do_sys_sendmsg net/socket.c:2595 [inline] __se_sys_sendmsg net/socket.c:2593 [inline] __x64_sys_sendmsg+0x304/0x490 net/socket.c:2593 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
Bytes 2856-2857 of 3500 are uninitialized Memory access of size 3500 starts at ffff888018d99104 Data copied to user address 0000000020000480
--- net/core/rtnetlink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/core/rtnetlink.c +4 -4
@@ -3889,7 +3889,7 @@ static int nlmsg_populate_fdb_fill(struct sk_buff *skb, ndm->ndm_ifindex = dev->ifindex; ndm->ndm_state = ndm_state; -if (nla_put (skb,NDA_LLADDR ,ETH_ALEN , addr)) +if (nla_put (skb,NDA_LLADDR , dev->addr_len, addr)) goto nla_put_failure;if (vid)if (nla_put (skb,NDA_VLAN ,sizeof (u16), &vid))
@@ -3903,10 +3903,10 @@ static int nlmsg_populate_fdb_fill(struct sk_buff *skb,return -EMSGSIZE ; } -static inline size_t rtnl_fdb_nlmsg_size (void ) +static inline size_t rtnl_fdb_nlmsg_size (const struct net_device *dev) {return NLMSG_ALIGN (sizeof (struct ndmsg )) + -nla_total_size (ETH_ALEN ) +/* NDA_LLADDR */ +nla_total_size (dev->addr_len) +/* NDA_LLADDR */ nla_total_size (sizeof (u16)) +/* NDA_VLAN */ 0 ; }
@@ -3918,7 +3918,7 @@ static void rtnl_fdb_notify(struct net_device *dev, u8 *addr, u16 vid, int type,struct sk_buff *skb;int err = -ENOBUFS ; - skb =nlmsg_new (rtnl_fdb_nlmsg_size (),GFP_ATOMIC ); + skb =nlmsg_new (rtnl_fdb_nlmsg_size (dev),GFP_ATOMIC );if (!skb) goto errout;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 82/509 selftests: rtnetlink: remove netdevsim device after ipsec offload test
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 5f789f103671fec3733ebe756e56adf15c90c21d ]
On systems where netdevsim is built-in or loaded before the test starts, kci_test_ipsec_offload doesn't remove the netdevsim device it created during the test.
--- tools/testing/selftests/net/rtnetlink.sh | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/net/rtnetlink.sh +1 -0
@@ -835,6 +835,7 @@ EOF fi # clean up any leftovers + echo 0 > /sys/bus/netdevsim/del_device $probed && rmmod netdevsim if [ $ret -ne 0 ]; then
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 83/509 gtp: Fix use-after-free in __gtp_encap_destroy().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit ce3aee7114c575fab32a5e9e939d4bbb3dcca79f ]
syzkaller reported use-after-free in __gtp_encap_destroy(). [0]
It shows the same process freed sk and touched it illegally.
Commit e198987e7dd7 ("gtp: fix suspicious RCU usage") added lock_sock() and release_sock() in __gtp_encap_destroy() to protect sk->sk_user_data, but release_sock() is called after sock_put() releases the last refcnt.
[0]:
BUG: KASAN: slab-use-after-free in instrument_atomic_read_write include/linux/instrumented.h:96 [inline] BUG: KASAN: slab-use-after-free in atomic_try_cmpxchg_acquire include/linux/atomic/atomic-instrumented.h:541 [inline] BUG: KASAN: slab-use-after-free in queued_spin_lock include/asm-generic/qspinlock.h:111 [inline] BUG: KASAN: slab-use-after-free in do_raw_spin_lock include/linux/spinlock.h:186 [inline] BUG: KASAN: slab-use-after-free in __raw_spin_lock_bh include/linux/spinlock_api_smp.h:127 [inline] BUG: KASAN: slab-use-after-free in _raw_spin_lock_bh+0x75/0xe0 kernel/locking/spinlock.c:178 Write of size 4 at addr ffff88800dbef398 by task syz-executor.2/2401 CPU: 1 PID: 2401 Comm: syz-executor.2 Not tainted 6.4.0-rc5-01219-gfa0e21fa4443 #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x72/0xa0 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:351 [inline] print_report+0xcc/0x620 mm/kasan/report.c:462 kasan_report+0xb2/0xe0 mm/kasan/report.c:572 check_region_inline mm/kasan/generic.c:181 [inline] kasan_check_range+0x39/0x1c0 mm/kasan/generic.c:187 instrument_atomic_read_write include/linux/instrumented.h:96 [inline] atomic_try_cmpxchg_acquire include/linux/atomic/atomic-instrumented.h:541 [inline] queued_spin_lock include/asm-generic/qspinlock.h:111 [inline] do_raw_spin_lock include/linux/spinlock.h:186 [inline] __raw_spin_lock_bh include/linux/spinlock_api_smp.h:127 [inline] _raw_spin_lock_bh+0x75/0xe0 kernel/locking/spinlock.c:178 spin_lock_bh include/linux/spinlock.h:355 [inline] release_sock+0x1f/0x1a0 net/core/sock.c:3526 gtp_encap_disable_sock drivers/net/gtp.c:651 [inline] gtp_encap_disable+0xb9/0x220 drivers/net/gtp.c:664 gtp_dev_uninit+0x19/0x50 drivers/net/gtp.c:728 unregister_netdevice_many_notify+0x97e/0x1520 net/core/dev.c:10841 rtnl_delete_link net/core/rtnetlink.c:3216 [inline] rtnl_dellink+0x3c0/0xb30 net/core/rtnetlink.c:3268 rtnetlink_rcv_msg+0x450/0xb10 net/core/rtnetlink.c:6423 netlink_rcv_skb+0x15d/0x450 net/netlink/af_netlink.c:2548 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x700/0x930 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x91c/0xe30 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b7/0x200 net/socket.c:747 ____sys_sendmsg+0x75a/0x990 net/socket.c:2493 ___sys_sendmsg+0x11d/0x1c0 net/socket.c:2547 __sys_sendmsg+0xfe/0x1d0 net/socket.c:2576 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7f1168b1fe5d Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 73 9f 1b 00 f7 d8 64 89 01 48 RSP: 002b:00007f1167edccc8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00000000004bbf80 RCX: 00007f1168b1fe5d RDX: 0000000000000000 RSI: 00000000200002c0 RDI: 0000000000000003 RBP: 00000000004bbf80 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007f1168b80530 R15: 0000000000000000 </TASK> Allocated by task 1483: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 __kasan_slab_alloc+0x59/0x70 mm/kasan/common.c:328 kasan_slab_alloc include/linux/kasan.h:186 [inline] slab_post_alloc_hook mm/slab.h:711 [inline] slab_alloc_node mm/slub.c:3451 [inline] slab_alloc mm/slub.c:3459 [inline] __kmem_cache_alloc_lru mm/slub.c:3466 [inline] kmem_cache_alloc+0x16d/0x340 mm/slub.c:3475 sk_prot_alloc+0x5f/0x280 net/core/sock.c:2073 sk_alloc+0x34/0x6c0 net/core/sock.c:2132 inet6_create net/ipv6/af_inet6.c:192 [inline] inet6_create+0x2c7/0xf20 net/ipv6/af_inet6.c:119 __sock_create+0x2a1/0x530 net/socket.c:1535 sock_create net/socket.c:1586 [inline] __sys_socket_create net/socket.c:1623 [inline] __sys_socket_create net/socket.c:1608 [inline] __sys_socket+0x137/0x250 net/socket.c:1651 __do_sys_socket net/socket.c:1664 [inline] __se_sys_socket net/socket.c:1662 [inline] __x64_sys_socket+0x72/0xb0 net/socket.c:1662 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 2401: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 kasan_save_free_info+0x2e/0x50 mm/kasan/generic.c:521 ____kasan_slab_free mm/kasan/common.c:236 [inline] ____kasan_slab_free mm/kasan/common.c:200 [inline] __kasan_slab_free+0x10c/0x1b0 mm/kasan/common.c:244 kasan_slab_free include/linux/kasan.h:162 [inline] slab_free_hook mm/slub.c:1781 [inline] slab_free_freelist_hook mm/slub.c:1807 [inline] slab_free mm/slub.c:3786 [inline] kmem_cache_free+0xb4/0x490 mm/slub.c:3808 sk_prot_free net/core/sock.c:2113 [inline] __sk_destruct+0x500/0x720 net/core/sock.c:2207 sk_destruct+0xc1/0xe0 net/core/sock.c:2222 __sk_free+0xed/0x3d0 net/core/sock.c:2233 sk_free+0x7c/0xa0 net/core/sock.c:2244 sock_put include/net/sock.h:1981 [inline] __gtp_encap_destroy+0x165/0x1b0 drivers/net/gtp.c:634 gtp_encap_disable_sock drivers/net/gtp.c:651 [inline] gtp_encap_disable+0xb9/0x220 drivers/net/gtp.c:664 gtp_dev_uninit+0x19/0x50 drivers/net/gtp.c:728 unregister_netdevice_many_notify+0x97e/0x1520 net/core/dev.c:10841 rtnl_delete_link net/core/rtnetlink.c:3216 [inline] rtnl_dellink+0x3c0/0xb30 net/core/rtnetlink.c:3268 rtnetlink_rcv_msg+0x450/0xb10 net/core/rtnetlink.c:6423 netlink_rcv_skb+0x15d/0x450 net/netlink/af_netlink.c:2548 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x700/0x930 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x91c/0xe30 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b7/0x200 net/socket.c:747 ____sys_sendmsg+0x75a/0x990 net/socket.c:2493 ___sys_sendmsg+0x11d/0x1c0 net/socket.c:2547 __sys_sendmsg+0xfe/0x1d0 net/socket.c:2576 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc The buggy address belongs to the object at ffff88800dbef300 which belongs to the cache UDPv6 of size 1344
The buggy address is located 152 bytes inside of
freed 1344-byte region [ffff88800dbef300, ffff88800dbef840)
The buggy address belongs to the physical page:
page:00000000d31bfed5 refcount:1 mapcount:0 mapping:0000000000000000 index:0xffff88800dbeed40 pfn:0xdbe8 head:00000000d31bfed5 order:3 entire_mapcount:0 nr_pages_mapped:0 pincount:0 memcg:ffff888008ee0801
flags: 0x100000000010200(slab|head|node=0|zone=1)page_type: 0xffffffff()
raw: 0100000000010200 ffff88800c7a3000 dead000000000122 0000000000000000
raw: ffff88800dbeed40 0000000080160015 00000001ffffffff ffff888008ee0801
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff88800dbef280: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88800dbef300: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff88800dbef380: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff88800dbef400: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88800dbef480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb--- drivers/net/gtp.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/gtp.c +2 -0
@@ -291,7 +291,9 @@ static void __gtp_encap_destroy(struct sock *sk) gtp->sk1u =NULL ;udp_sk (sk)->encap_type =0 ;rcu_assign_sk_user_data (sk,NULL ); +release_sock (sk);sock_put (sk); +return ; }release_sock (sk); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 84/509 net: axienet: Move reset before 64-bit DMA detection
In reply to Greg Kroah-HartmanFrom: Maxim Kochetkov <[email protected]>
[ Upstream commit f1bc9fc4a06de0108e0dca2a9a7e99ba1fc632f9 ]
64-bit DMA detection will fail if axienet was started before (by boot loader, boot ROM, etc). In this state axienet will not start properly. XAXIDMA_TX_CDESC_OFFSET + 4 register (MM2S_CURDESC_MSB) is used to detect 64-bit DMA capability here. But datasheet says: When DMACR.RS is 1 (axienet is in enabled state), CURDESC_PTR becomes Read Only (RO) and is used to fetch the first descriptor. So iowrite32()/ioread32() trick to this register to detect 64-bit DMA will not work.
So move axienet reset before 64-bit DMA detection.
--- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +5 -5
@@ -2009,6 +2009,11 @@ static int axienet_probe(struct platform_device *pdev) goto cleanup_clk; } +/* Reset core now that clocks are enabled, prior to accessing MDIO */ + ret =__axienet_device_reset (lp); +if (ret) + goto cleanup_clk; +/* Autodetect the need for 64-bit DMA pointers. * When the IP is configured for a bus width bigger than 32 bits, * writing the MSB registers is mandatory, even if they are all 0.
@@ -2055,11 +2060,6 @@ static int axienet_probe(struct platform_device *pdev) lp->coalesce_count_rx =XAXIDMA_DFT_RX_THRESHOLD ; lp->coalesce_count_tx =XAXIDMA_DFT_TX_THRESHOLD ; -/* Reset core now that clocks are enabled, prior to accessing MDIO */ - ret =__axienet_device_reset (lp); -if (ret) - goto cleanup_clk; - ret =axienet_mdio_setup (lp);if (ret) dev_warn(&pdev->dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 85/509 sfc: fix crash when reading stats while NIC is resetting
In reply to Greg Kroah-HartmanFrom: Edward Cree <[email protected]>
[ Upstream commit d1b355438b8325a486f087e506d412c4e852f37b ]
efx_net_stats() (.ndo_get_stats64) can be called during an ethtool
selftest, during which time nic_data->mc_stats is NULL as the NIC has been fini'd. In this case do not attempt to fetch the latest stats from the hardware, else we will crash on a NULL dereference:
BUG: kernel NULL pointer dereference, address: 0000000000000038
RIP efx_nic_update_stats
abridged calltrace:
efx_ef10_update_stats_pf
efx_net_stats
dev_get_stats
dev_seq_printf_statsSkipping the read is safe, we will simply give out stale stats. To ensure that the free in efx_ef10_fini_nic() does not race against
efx_ef10_update_stats_pf(), which could cause a TOCTTOU bug, take the efx->stats_lock in fini_nic (it is already held across update_stats).
--- drivers/net/ethernet/sfc/ef10.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/net/ethernet/sfc/ef10.c +10 -3
@@ -1297,8 +1297,10 @@ static void efx_ef10_fini_nic(struct efx_nic *efx) {struct efx_ef10_nic_data *nic_data = efx->nic_data; +spin_lock_bh (&efx->stats_lock);kfree (nic_data->mc_stats); nic_data->mc_stats =NULL ; +spin_unlock_bh (&efx->stats_lock); }static int efx_ef10_init_nic (struct efx_nic *efx)
@@ -1836,9 +1838,14 @@ static size_t efx_ef10_update_stats_pf(struct efx_nic *efx, u64 *full_stats,efx_ef10_get_stat_mask (efx, mask); -efx_nic_copy_stats (efx, nic_data->mc_stats); -efx_nic_update_stats (efx_ef10_stat_desc,EF10_STAT_COUNT , - mask, stats, nic_data->mc_stats, false); +/* If NIC was fini'd (probably resetting), then we can't read +* updated stats right now. +*/ +if (nic_data->mc_stats) { +efx_nic_copy_stats (efx, nic_data->mc_stats); +efx_nic_update_stats (efx_ef10_stat_desc,EF10_STAT_COUNT , + mask, stats, nic_data->mc_stats, false); + }/* Update derived statistics */ efx_nic_fix_nodesc_drop_stat(efx,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 86/509 nfc: llcp: simplify llcp_sock_connect() error paths
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit ec10fd154d934cc4195da3cbd017a12817b41d51 ]
The llcp_sock_connect() error paths were using a mixed way of central exit (goto) and cleanup
Stable-dep-of: 6709d4b7bc2e ("net: nfc: Fix use-after-free caused by nfc_llcp_find_local")
--- net/nfc/llcp_sock.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/nfc/llcp_sock.c +4 -3
@@ -712,10 +712,8 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, llcp_sock->local =nfc_llcp_local_get (local); llcp_sock->ssap =nfc_llcp_get_local_ssap (local);if (llcp_sock->ssap ==LLCP_SAP_MAX ) { -nfc_llcp_local_put (llcp_sock->local); - llcp_sock->local =NULL ; ret = -ENOMEM ; - goto put_dev; + goto sock_llcp_put_local; } llcp_sock->reserved_ssap = llcp_sock->ssap;
@@ -760,8 +758,11 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, sock_llcp_release:nfc_llcp_put_ssap (local, llcp_sock->ssap); + +sock_llcp_put_local:nfc_llcp_local_put (llcp_sock->local); llcp_sock->local =NULL ; + llcp_sock->dev =NULL ; put_dev:nfc_put_device (dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 87/509 net: nfc: Fix use-after-free caused by nfc_llcp_find_local
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
[ Upstream commit 6709d4b7bc2e079241fdef15d1160581c5261c10 ]
This commit fixes several use-after-free that caused by function nfc_llcp_find_local(). For example, one UAF can happen when below buggy time window occurs.
// nfc_genl_llc_get_params | // nfc_unregister_device
|
dev = nfc_get_device(idx); | device_lock(...)
if (!dev) | dev->shutting_down = true;
return -ENODEV; | device_unlock(...);
|
device_lock(...); | // nfc_llcp_unregister_device
| nfc_llcp_find_local()
nfc_llcp_find_local(...); |
| local_cleanup()
if (!local) { |
rc = -ENODEV; | // nfc_llcp_local_put
goto exit; | kref_put(.., local_release)
} |
| // local_release
| list_del(&local->list)
// nfc_genl_send_params | kfree()
local->dev->idx !!!UAF!!! |
|and the crash trace for the one of the discussed UAF like:
BUG: KASAN: slab-use-after-free in nfc_genl_llc_get_params+0x72f/0x780 net/nfc/netlink.c:1045 Read of size 8 at addr ffff888105b0e410 by task 20114 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x72/0xa0 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:319 [inline] print_report+0xcc/0x620 mm/kasan/report.c:430 kasan_report+0xb2/0xe0 mm/kasan/report.c:536 nfc_genl_send_params net/nfc/netlink.c:999 [inline] nfc_genl_llc_get_params+0x72f/0x780 net/nfc/netlink.c:1045 genl_family_rcv_msg_doit.isra.0+0x1ee/0x2e0 net/netlink/genetlink.c:968 genl_family_rcv_msg net/netlink/genetlink.c:1048 [inline] genl_rcv_msg+0x503/0x7d0 net/netlink/genetlink.c:1065 netlink_rcv_skb+0x161/0x430 net/netlink/af_netlink.c:2548 genl_rcv+0x28/0x40 net/netlink/genetlink.c:1076 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x644/0x900 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x934/0xe70 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b6/0x200 net/socket.c:747 ____sys_sendmsg+0x6e9/0x890 net/socket.c:2501 ___sys_sendmsg+0x110/0x1b0 net/socket.c:2555 __sys_sendmsg+0xf7/0x1d0 net/socket.c:2584 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7f34640a2389 RSP: 002b:00007f3463415168 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f34641c1f80 RCX: 00007f34640a2389 RDX: 0000000000000000 RSI: 0000000020000240 RDI: 0000000000000006 RBP: 00007f34640ed493 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffe38449ecf R14: 00007f3463415300 R15: 0000000000022000 </TASK> Allocated by task 20116: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 ____kasan_kmalloc mm/kasan/common.c:374 [inline] __kasan_kmalloc+0x7f/0x90 mm/kasan/common.c:383 kmalloc include/linux/slab.h:580 [inline] kzalloc include/linux/slab.h:720 [inline] nfc_llcp_register_device+0x49/0xa40 net/nfc/llcp_core.c:1567 nfc_register_device+0x61/0x260 net/nfc/core.c:1124 nci_register_device+0x776/0xb20 net/nfc/nci/core.c:1257 virtual_ncidev_open+0x147/0x230 drivers/nfc/virtual_ncidev.c:148 misc_open+0x379/0x4a0 drivers/char/misc.c:165 chrdev_open+0x26c/0x780 fs/char_dev.c:414 do_dentry_open+0x6c4/0x12a0 fs/open.c:920 do_open fs/namei.c:3560 [inline] path_openat+0x24fe/0x37e0 fs/namei.c:3715 do_filp_open+0x1ba/0x410 fs/namei.c:3742 do_sys_openat2+0x171/0x4c0 fs/open.c:1356 do_sys_open fs/open.c:1372 [inline] __do_sys_openat fs/open.c:1388 [inline] __se_sys_openat fs/open.c:1383 [inline] __x64_sys_openat+0x143/0x200 fs/open.c:1383 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 20115: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 kasan_save_free_info+0x2e/0x50 mm/kasan/generic.c:521 ____kasan_slab_free mm/kasan/common.c:236 [inline] ____kasan_slab_free mm/kasan/common.c:200 [inline] __kasan_slab_free+0x10a/0x190 mm/kasan/common.c:244 kasan_slab_free include/linux/kasan.h:162 [inline] slab_free_hook mm/slub.c:1781 [inline] slab_free_freelist_hook mm/slub.c:1807 [inline] slab_free mm/slub.c:3787 [inline] __kmem_cache_free+0x7a/0x190 mm/slub.c:3800 local_release net/nfc/llcp_core.c:174 [inline] kref_put include/linux/kref.h:65 [inline] nfc_llcp_local_put net/nfc/llcp_core.c:182 [inline] nfc_llcp_local_put net/nfc/llcp_core.c:177 [inline] nfc_llcp_unregister_device+0x206/0x290 net/nfc/llcp_core.c:1620 nfc_unregister_device+0x160/0x1d0 net/nfc/core.c:1179 virtual_ncidev_close+0x52/0xa0 drivers/nfc/virtual_ncidev.c:163 __fput+0x252/0xa20 fs/file_table.c:321 task_work_run+0x174/0x270 kernel/task_work.c:179 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop kernel/entry/common.c:171 [inline] exit_to_user_mode_prepare+0x108/0x110 kernel/entry/common.c:204 __syscall_exit_to_user_mode_work kernel/entry/common.c:286 [inline] syscall_exit_to_user_mode+0x21/0x50 kernel/entry/common.c:297 do_syscall_64+0x4c/0x90 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x72/0xdc Last potentially related work creation: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 __kasan_record_aux_stack+0x95/0xb0 mm/kasan/generic.c:491 kvfree_call_rcu+0x29/0xa80 kernel/rcu/tree.c:3328 drop_sysctl_table+0x3be/0x4e0 fs/proc/proc_sysctl.c:1735 unregister_sysctl_table.part.0+0x9c/0x190 fs/proc/proc_sysctl.c:1773 unregister_sysctl_table+0x24/0x30 fs/proc/proc_sysctl.c:1753 neigh_sysctl_unregister+0x5f/0x80 net/core/neighbour.c:3895 addrconf_notify+0x140/0x17b0 net/ipv6/addrconf.c:3684 notifier_call_chain+0xbe/0x210 kernel/notifier.c:87 call_netdevice_notifiers_info+0xb5/0x150 net/core/dev.c:1937 call_netdevice_notifiers_extack net/core/dev.c:1975 [inline] call_netdevice_notifiers net/core/dev.c:1989 [inline] dev_change_name+0x3c3/0x870 net/core/dev.c:1211 dev_ifsioc+0x800/0xf70 net/core/dev_ioctl.c:376 dev_ioctl+0x3d9/0xf80 net/core/dev_ioctl.c:542 sock_do_ioctl+0x160/0x260 net/socket.c:1213 sock_ioctl+0x3f9/0x670 net/socket.c:1316 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:870 [inline] __se_sys_ioctl fs/ioctl.c:856 [inline] __x64_sys_ioctl+0x19e/0x210 fs/ioctl.c:856 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc The buggy address belongs to the object at ffff888105b0e400 which belongs to the cache kmalloc-1k of size 1024
The buggy address is located 16 bytes inside of
freed 1024-byte region [ffff888105b0e400, ffff888105b0e800)
The buggy address belongs to the physical page:
head:ffffea000416c200 order:3 entire_mapcount:0 nr_pages_mapped:0 pincount:0
flags: 0x200000000010200(slab|head|node=0|zone=2)
raw: 0200000000010200 ffff8881000430c0 ffffea00044c7010 ffffea0004510e10
raw: 0000000000000000 00000000000a000a 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff888105b0e300: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff888105b0e380: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
>ffff888105b0e400: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff888105b0e480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888105b0e500: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fbIn summary, this patch solves those use-after-free by
1. Re-implement the nfc_llcp_find_local(). The current version does not grab the reference when getting the local from the linked list. For example, the llcp_sock_bind() gets the reference like below:
// llcp_sock_bind()
local = nfc_llcp_find_local(dev); // A
..... \
| raceable
..... /
llcp_sock->local = nfc_llcp_local_get(local); // BThere is an apparent race window that one can drop the reference and free the local object fetched in (A) before (B) gets the reference.
2. Some callers of the nfc_llcp_find_local() do not grab the reference at all. For example, the nfc_genl_llc_{{get/set}_params/sdreq} functions. We add the nfc_llcp_local_put() for them. Moreover, we add the necessary error handling function to put the reference.
3. Add the nfc_llcp_remove_local() helper. The local object is removed from the linked list in local_release() when all reference is gone. This patch removes it when nfc_llcp_unregister_device() is called.
Therefore, every caller of nfc_llcp_find_local() will get a reference even when the nfc_llcp_unregister_device() is called. This promises no use-after-free for the local object is ever possible.
--- net/nfc/llcp.h | 1 - net/nfc/llcp_commands.c | 12 +++++++--- net/nfc/llcp_core.c | 49 +++++++++++++++++++++++++++++++++++------ net/nfc/llcp_sock.c | 18 ++++++++------- net/nfc/netlink.c | 20 ++++++++++++----- net/nfc/nfc.h | 1 + 6 files changed, 77 insertions(+), 24 deletions(-)
net/nfc/llcp.h +0 -1
@@ -202,7 +202,6 @@ void nfc_llcp_sock_link(struct llcp_sock_list *l, struct sock *s);void nfc_llcp_sock_unlink (struct llcp_sock_list *l,struct sock *s);void nfc_llcp_socket_remote_param_init (struct nfc_llcp_sock *sock);struct nfc_llcp_local *nfc_llcp_find_local (struct nfc_dev *dev); -struct nfc_llcp_local *nfc_llcp_local_get (struct nfc_llcp_local *local);int nfc_llcp_local_put (struct nfc_llcp_local *local);u8 nfc_llcp_get_sdp_ssap (struct nfc_llcp_local *local,struct nfc_llcp_sock *sock);
net/nfc/llcp_commands.c +9 -3
@@ -361,6 +361,7 @@ int nfc_llcp_send_symm(struct nfc_dev *dev)struct sk_buff *skb;struct nfc_llcp_local *local;u16 size =0 ; +int err;pr_debug ("Sending SYMM\n" );
@@ -372,8 +373,10 @@ int nfc_llcp_send_symm(struct nfc_dev *dev) size += dev->tx_headroom + dev->tx_tailroom +NFC_HEADER_SIZE ; skb =alloc_skb (size,GFP_KERNEL ); -if (skb ==NULL ) -return -ENOMEM ; +if (skb ==NULL ) { + err = -ENOMEM ; + goto out; + }skb_reserve (skb, dev->tx_headroom +NFC_HEADER_SIZE );
@@ -383,8 +386,11 @@ int nfc_llcp_send_symm(struct nfc_dev *dev)nfc_llcp_send_to_raw_sock (local, skb,NFC_DIRECTION_TX ); -return nfc_data_exchange (dev, local->target_idx, skb, + err =nfc_data_exchange (dev, local->target_idx, skb, nfc_llcp_recv, local); +out: +nfc_llcp_local_put (local); +return err; }int nfc_llcp_send_connect (struct nfc_llcp_sock *sock)
net/nfc/llcp_core.c +42 -7
123 lines not on this page · raw message
net/nfc/llcp_sock.c +10 -8
@@ -99,7 +99,7 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) } llcp_sock->dev = dev; - llcp_sock->local =nfc_llcp_local_get (local); + llcp_sock->local = local; llcp_sock->nfc_protocol = llcp_addr.nfc_protocol; llcp_sock->service_name_len = min_t(unsigned int, llcp_addr.service_name_len,
@@ -181,7 +181,7 @@ static int llcp_raw_sock_bind(struct socket *sock, struct sockaddr *addr, } llcp_sock->dev = dev; - llcp_sock->local =nfc_llcp_local_get (local); + llcp_sock->local = local; llcp_sock->nfc_protocol = llcp_addr.nfc_protocol;nfc_llcp_sock_link (&local->raw_sockets, sk);
@@ -698,22 +698,22 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,if (dev->dep_link_up == false) { ret = -ENOLINK ;device_unlock (&dev->dev); - goto put_dev; + goto sock_llcp_put_local; }device_unlock (&dev->dev);if (local->rf_mode ==NFC_RF_INITIATOR && addr->target_idx != local->target_idx) { ret = -ENOLINK ; - goto put_dev; + goto sock_llcp_put_local; } llcp_sock->dev = dev; - llcp_sock->local =nfc_llcp_local_get (local); + llcp_sock->local = local; llcp_sock->ssap =nfc_llcp_get_local_ssap (local);if (llcp_sock->ssap ==LLCP_SAP_MAX ) { ret = -ENOMEM ; - goto sock_llcp_put_local; + goto sock_llcp_nullify; } llcp_sock->reserved_ssap = llcp_sock->ssap;
@@ -759,11 +759,13 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, sock_llcp_release:nfc_llcp_put_ssap (local, llcp_sock->ssap); -sock_llcp_put_local: -nfc_llcp_local_put (llcp_sock->local); +sock_llcp_nullify: llcp_sock->local =NULL ; llcp_sock->dev =NULL ; +sock_llcp_put_local: +nfc_llcp_local_put (local); + put_dev:nfc_put_device (dev);
net/nfc/netlink.c +15 -5
@@ -1039,11 +1039,14 @@ static int nfc_genl_llc_get_params(struct sk_buff *skb, struct genl_info *info) msg =nlmsg_new (NLMSG_DEFAULT_SIZE ,GFP_KERNEL );if (!msg) { rc = -ENOMEM ; - goto exit; + goto put_local; } rc =nfc_genl_send_params (msg, local, info->snd_portid, info->snd_seq); +put_local: +nfc_llcp_local_put (local); + exit:device_unlock (&dev->dev);
@@ -1105,7 +1108,7 @@ static int nfc_genl_llc_set_params(struct sk_buff *skb, struct genl_info *info)if (info->attrs[NFC_ATTR_LLC_PARAM_LTO ]) {if (dev->dep_link_up) { rc = -EINPROGRESS ; - goto exit; + goto put_local; } local->lto =nla_get_u8 (info->attrs[NFC_ATTR_LLC_PARAM_LTO ]);
@@ -1117,6 +1120,9 @@ static int nfc_genl_llc_set_params(struct sk_buff *skb, struct genl_info *info)if (info->attrs[NFC_ATTR_LLC_PARAM_MIUX ]) local->miux =cpu_to_be16 (miux); +put_local: +nfc_llcp_local_put (local); + exit:device_unlock (&dev->dev);
@@ -1172,7 +1178,7 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)if (rc !=0 ) { rc = -EINVAL ; - goto exit; + goto put_local; }if (!sdp_attrs[NFC_SDP_ATTR_URI ])
@@ -1191,7 +1197,7 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info) sdreq =nfc_llcp_build_sdreq_tlv (tid, uri, uri_len);if (sdreq ==NULL ) { rc = -ENOMEM ; - goto exit; + goto put_local; } tlvs_len += sdreq->tlv_len;
@@ -1201,10 +1207,14 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)if (hlist_empty (&sdreq_list)) { rc = -EINVAL ; - goto exit; + goto put_local; } rc =nfc_llcp_send_snl_sdreq (local, &sdreq_list, tlvs_len); + +put_local: +nfc_llcp_local_put (local); + exit:device_unlock (&dev->dev);
net/nfc/nfc.h +1 -0
@@ -52,6 +52,7 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, const u8 *gb, u8 gb_len);u8 *nfc_llcp_general_bytes (struct nfc_dev *dev,size_t *general_bytes_len);int nfc_llcp_data_received (struct nfc_dev *dev,struct sk_buff *skb);struct nfc_llcp_local *nfc_llcp_find_local (struct nfc_dev *dev); +int nfc_llcp_local_put (struct nfc_llcp_local *local);int __init nfc_llcp_init (void );void nfc_llcp_exit (void );void nfc_llcp_free_sdp_tlv (struct nfc_llcp_sdp_tlv *sdp);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 88/509 lib/ts_bm: reset initial match offset for every block of text
In reply to Greg Kroah-HartmanFrom: Jeremy Sowden <[email protected]>
[ Upstream commit 6f67fbf8192da80c4db01a1800c7fceaca9cf1f9 ]
The shift variable which indicates the offset in the string at which to start matching the pattern is initialized to bm->patlen - 1, but it is not reset when a new block is retrieved. This means the implemen- tation may start looking at later and later positions in each successive block and miss occurrences of the pattern at the beginning. E.g., consider a HTTP packet held in a non-linear skb, where the HTTP request line occurs in the second block:
[... 52 bytes of packet headers ...]
GET /bmtest HTTP/1.1\r\nHost: www.example.com\r\n\r\n
and the pattern is "GET /bmtest".
Once the first block comprising the packet headers has been examined, shift will be pointing to somewhere near the end of the block, and so when the second block is examined the request line at the beginning will be missed.
Reinitialize the variable for each new block.
--- lib/ts_bm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/ts_bm.c +3 -1
@@ -60,10 +60,12 @@ static unsigned int bm_find(struct ts_config *conf, struct ts_state *state)struct ts_bm *bm =ts_config_priv (conf);unsigned int i, text_len, consumed = state->offset;const u8 *text; -int shift = bm->patlen -1 , bs; +int bs;const u8 icase = conf->flags &TS_IGNORECASE ;for (;;) { +int shift = bm->patlen -1 ; + text_len = conf->get_next_block (consumed, &text, conf, state);if (unlikely (text_len ==0 ))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 89/509 netfilter: conntrack: dccp: copy entire header to stack buffer, not just basic one
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit ff0a3a7d52ff7282dbd183e7fc29a1fe386b0c30 ]
Eric Dumazet says:
nf_conntrack_dccp_packet() has an unique:
dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
And nothing more is 'pulled' from the packet, depending on the content. dh->dccph_doff, and/or dh->dccph_x ...)
So dccp_ack_seq() is happily reading stuff past the _dh buffer.
BUG: KASAN: stack-out-of-bounds in nf_conntrack_dccp_packet+0x1134/0x11c0 Read of size 4 at addr ffff000128f66e0c by task syz-executor.2/29371
[..]
Fix this by increasing the stack buffer to also include room for the extra sequence numbers and all the known dccp packet type headers, then pull again after the initial validation of the basic header.
While at it, mark packets invalid that lack 48bit sequence bit but where RFC says the type MUST use them.
Compile tested only.
v2: first skb_header_pointer() now needs to adjust the size to
only pull the generic header. (Eric)
Heads-up: I intend to remove dccp conntrack support later this year.
--- net/netfilter/nf_conntrack_proto_dccp.c | 52 +++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-)
net/netfilter/nf_conntrack_proto_dccp.c +49 -3
@@ -431,9 +431,19 @@ static bool dccp_error(const struct dccp_hdr *dh, struct sk_buff *skb, unsigned int dataoff, const struct nf_hook_state *state) { +static const unsigned long require_seq48 =1 <<DCCP_PKT_REQUEST | +1 <<DCCP_PKT_RESPONSE | +1 <<DCCP_PKT_CLOSEREQ | +1 <<DCCP_PKT_CLOSE | +1 <<DCCP_PKT_RESET | +1 <<DCCP_PKT_SYNC | +1 <<DCCP_PKT_SYNCACK ;unsigned int dccp_len = skb->len - dataoff;unsigned int cscov;const char *msg; +u8 type; + +BUILD_BUG_ON (DCCP_PKT_INVALID >=BITS_PER_LONG );if (dh->dccph_doff *4 <sizeof (struct dccp_hdr ) || dh->dccph_doff *4 > dccp_len) {
@@ -458,10 +468,17 @@ static bool dccp_error(const struct dccp_hdr *dh, goto out_invalid; } -if (dh->dccph_type >=DCCP_PKT_INVALID ) { + type = dh->dccph_type; +if (type >=DCCP_PKT_INVALID ) { msg ="nf_ct_dccp: reserved packet type " ; goto out_invalid; } + +if (test_bit (type, &require_seq48) && !dh->dccph_x) { + msg ="nf_ct_dccp: type lacks 48bit sequence numbers" ; + goto out_invalid; + } +return false; out_invalid: nf_l4proto_log_invalid(skb, state->net, state->pf,
@@ -469,24 +486,53 @@ static bool dccp_error(const struct dccp_hdr *dh,return true; } +struct nf_conntrack_dccp_buf { +struct dccp_hdr dh;/* generic header part */ +struct dccp_hdr_ext ext;/* optional depending dh->dccph_x */ +union {/* depends on header type */ +struct dccp_hdr_ack_bits ack; +struct dccp_hdr_request req; +struct dccp_hdr_response response; +struct dccp_hdr_reset rst; + } u; +}; + +static struct dccp_hdr * +dccp_header_pointer (const struct sk_buff *skb,int offset,const struct dccp_hdr *dh, +struct nf_conntrack_dccp_buf *buf) +{ +unsigned int hdrlen =__dccp_hdr_len (dh); + +if (hdrlen >sizeof (*buf)) +return NULL ; + +return skb_header_pointer (skb, offset, hdrlen, buf); +} +int nf_conntrack_dccp_packet (struct nf_conn *ct,struct sk_buff *skb,unsigned int dataoff,enum ip_conntrack_info ctinfo,const struct nf_hook_state *state) {enum ip_conntrack_dir dir =CTINFO2DIR (ctinfo); -struct dccp_hdr _dh, *dh; +struct nf_conntrack_dccp_buf _dh;u_int8_t type, old_state, new_state;enum ct_dccp_roles role;unsigned int *timeouts; +struct dccp_hdr *dh; - dh =skb_header_pointer (skb, dataoff,sizeof (_dh), &_dh); + dh =skb_header_pointer (skb, dataoff,sizeof (*dh), &_dh.dh);if (!dh)return NF_DROP ;if (dccp_error (dh, skb, dataoff, state))return -NF_ACCEPT ; +/* pull again, including possible 48 bit sequences and subtype header */ + dh =dccp_header_pointer (skb, dataoff, dh, &_dh); +if (!dh) +return NF_DROP ; + type = dh->dccph_type;if (!nf_ct_is_confirmed (ct) && !dccp_new (ct, skb, dh))return -NF_ACCEPT ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 90/509 netfilter: nf_conntrack_sip: fix the ct_sip_parse_numerical_param() return value.
In reply to Greg Kroah-HartmanFrom: Ilia.Gavrilov <[email protected]>
[ Upstream commit f188d30087480eab421cd8ca552fb15f55d57f4d ]
ct_sip_parse_numerical_param() returns only 0 or 1 now.
But process_register_request() and process_register_response() imply checking for a negative value if parsing of a numerical header parameter failed.
The invocation in nf_nat_sip() looks correct:
if (ct_sip_parse_numerical_param(...) > 0 &&
...) { ... }
Make the return value of the function ct_sip_parse_numerical_param() a tristate to fix all the cases
a) return 1 if value is found; *val is set
b) return 0 if value is not found; *val is unchanged
c) return -1 on error; *val is undefined
Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with SVACE.
--- net/netfilter/nf_conntrack_sip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_sip.c +1 -1
@@ -611,7 +611,7 @@ int ct_sip_parse_numerical_param(const struct nf_conn *ct, const char *dptr, start +=strlen (name); *val =simple_strtoul (start, &end,0 );if (start == end) -return 0 ; +return -1 ;if (matchoff && matchlen) { *matchoff = start - dptr; *matchlen = end - start;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 91/509 ipvlan: Fix return value of ipvlan_queue_xmit()
In reply to Greg Kroah-HartmanFrom: Cambda Zhu <[email protected]>
[ Upstream commit 8a9922e7be6d042fa00f894c376473b17a162b66 ]
ipvlan_queue_xmit() should return NET_XMIT_XXX, but ipvlan_xmit_mode_l2/l3() returns rx_handler_result_t or NET_RX_XXX in some cases. ipvlan_rcv_frame() will only return RX_HANDLER_CONSUMED in ipvlan_xmit_mode_l2/l3() because 'local' is true. It's equal to NET_XMIT_SUCCESS. But dev_forward_skb() can return NET_RX_SUCCESS or NET_RX_DROP, and returning NET_RX_DROP(NET_XMIT_DROP) will increase both ipvlan and ipvlan->phy_dev drops counter.
The skb to forward can be treated as xmitted successfully. This patch makes ipvlan_queue_xmit() return NET_XMIT_SUCCESS for forward skb.
--- drivers/net/ipvlan/ipvlan_core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ipvlan/ipvlan_core.c +6 -3
@@ -586,7 +586,8 @@ static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev)consume_skb (skb);return NET_XMIT_DROP ; } -return ipvlan_rcv_frame (addr, &skb, true); +ipvlan_rcv_frame (addr, &skb, true); +return NET_XMIT_SUCCESS ; } } out:
@@ -612,7 +613,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)consume_skb (skb);return NET_XMIT_DROP ; } -return ipvlan_rcv_frame (addr, &skb, true); +ipvlan_rcv_frame (addr, &skb, true); +return NET_XMIT_SUCCESS ; } } skb =skb_share_check (skb,GFP_ATOMIC );
@@ -624,7 +626,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)* the skb for the main-dev. At the RX side we just return * RX_PASS for it to be processed further on the stack. */ -return dev_forward_skb (ipvlan->phy_dev, skb); +dev_forward_skb (ipvlan->phy_dev, skb); +return NET_XMIT_SUCCESS ; }else if (is_multicast_ether_addr (eth->h_dest)) {skb_reset_mac_header (skb);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 92/509 netlink: Add __sock_i_ino() for __netlink_diag_dump().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 25a9c8a4431c364f97f75558cb346d2ad3f53fbb ]
syzbot reported a warning in __local_bh_enable_ip(). [0]
Commit 8d61f926d420 ("netlink: fix potential deadlock in netlink_set_err()") converted read_lock(&nl_table_lock) to read_lock_irqsave() in __netlink_diag_dump() to prevent a deadlock.
However, __netlink_diag_dump() calls sock_i_ino() that uses read_lock_bh() and read_unlock_bh(). If CONFIG_TRACE_IRQFLAGS=y, read_unlock_bh() finally enables IRQ even though it should stay disabled until the following read_unlock_irqrestore().
Using read_lock() in sock_i_ino() would trigger a lockdep splat in another place that was fixed in commit f064af1e500a ("net: fix a lockdep splat"), so let's add __sock_i_ino() that would be safe to use under BH disabled.
[0]:
WARNING: CPU: 0 PID: 5012 at kernel/softirq.c:376 __local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376 Modules linked in: CPU: 0 PID: 5012 Comm: syz-executor487 Not tainted 6.4.0-rc7-syzkaller-00202-g6f68fc395f49 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/27/2023 RIP: 0010:__local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376 Code: 45 bf 01 00 00 00 e8 91 5b 0a 00 e8 3c 15 3d 00 fb 65 8b 05 ec e9 b5 7e 85 c0 74 58 5b 5d c3 65 8b 05 b2 b6 b4 7e 85 c0 75 a2 <0f> 0b eb 9e e8 89 15 3d 00 eb 9f 48 89 ef e8 6f 49 18 00 eb a8 0f RSP: 0018:ffffc90003a1f3d0 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000201 RCX: 1ffffffff1cf5996 RDX: 0000000000000000 RSI: 0000000000000201 RDI: ffffffff8805c6f3 RBP: ffffffff8805c6f3 R08: 0000000000000001 R09: ffff8880152b03a3 R10: ffffed1002a56074 R11: 0000000000000005 R12: 00000000000073e4 R13: dffffc0000000000 R14: 0000000000000002 R15: 0000000000000000 FS: 0000555556726300(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000045ad50 CR3: 000000007c646000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> sock_i_ino+0x83/0xa0 net/core/sock.c:2559 __netlink_diag_dump+0x45c/0x790 net/netlink/diag.c:171 netlink_diag_dump+0xd6/0x230 net/netlink/diag.c:207 netlink_dump+0x570/0xc50 net/netlink/af_netlink.c:2269 __netlink_dump_start+0x64b/0x910 net/netlink/af_netlink.c:2374 netlink_dump_start include/linux/netlink.h:329 [inline] netlink_diag_handler_dump+0x1ae/0x250 net/netlink/diag.c:238 __sock_diag_cmd net/core/sock_diag.c:238 [inline] sock_diag_rcv_msg+0x31e/0x440 net/core/sock_diag.c:269 netlink_rcv_skb+0x165/0x440 net/netlink/af_netlink.c:2547 sock_diag_rcv+0x2a/0x40 net/core/sock_diag.c:280 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x547/0x7f0 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x925/0xe30 net/netlink/af_netlink.c:1914 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0xde/0x190 net/socket.c:747 ____sys_sendmsg+0x71c/0x900 net/socket.c:2503 ___sys_sendmsg+0x110/0x1b0 net/socket.c:2557 __sys_sendmsg+0xf7/0x1c0 net/socket.c:2586 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f5303aaabb9 Code: 28 c3 e8 2a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffc7506e548 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f5303aaabb9 RDX: 0000000000000000 RSI: 0000000020000180 RDI: 0000000000000003 RBP: 00007f5303a6ed60 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f5303a6edf0 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 </TASK>
--- include/net/sock.h | 1 + net/core/sock.c | 17 ++++++++++++++--- net/netlink/diag.c | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-)
include/net/sock.h +1 -0
@@ -1934,6 +1934,7 @@ static inline void sock_graft(struct sock *sk, struct socket *parent) }kuid_t sock_i_uid (struct sock *sk); +unsigned long __sock_i_ino (struct sock *sk);unsigned long sock_i_ino (struct sock *sk);static inline kuid_t sock_net_uid (const struct net *net,const struct sock *sk)
net/core/sock.c +14 -3
@@ -2175,13 +2175,24 @@ kuid_t sock_i_uid(struct sock *sk) }EXPORT_SYMBOL (sock_i_uid); -unsigned long sock_i_ino (struct sock *sk) +unsigned long __sock_i_ino (struct sock *sk) {unsigned long ino; -read_lock_bh (&sk->sk_callback_lock); +read_lock (&sk->sk_callback_lock); ino = sk->sk_socket ?SOCK_INODE (sk->sk_socket)->i_ino :0 ; -read_unlock_bh (&sk->sk_callback_lock); +read_unlock (&sk->sk_callback_lock); +return ino; +} +EXPORT_SYMBOL (__sock_i_ino); + +unsigned long sock_i_ino (struct sock *sk) +{ +unsigned long ino; + +local_bh_disable (); + ino =__sock_i_ino (sk); +local_bh_enable ();return ino; }EXPORT_SYMBOL (sock_i_ino);
net/netlink/diag.c +1 -1
@@ -168,7 +168,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI, - sock_i_ino(sk)) < 0) { + __sock_i_ino(sk)) < 0) { ret =1 ;break ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 93/509 radeon: avoid double free in ci_dpm_init()
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit 20c3dffdccbd494e0dd631d1660aeecbff6775f2 ]
Several calls to ci_dpm_fini() will attempt to free resources that either have been freed before or haven't been allocated yet. This may lead to undefined or dangerous behaviour.
For instance, if r600_parse_extended_power_table() fails, it might call r600_free_extended_power_table() as will ci_dpm_fini() later during error handling.
Fix this by only freeing pointers to objects previously allocated.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/gpu/drm/radeon/ci_dpm.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/ci_dpm.c +20 -8
@@ -5541,6 +5541,7 @@ static int ci_parse_power_table(struct radeon_device *rdev)u8 frev, crev;u8 *power_state_offset;struct ci_ps *ps; +int ret;if (!atom_parse_data_header (mode_info->atom_context, index,NULL , &frev, &crev, &data_offset))
@@ -5570,11 +5571,15 @@ static int ci_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; -if (!rdev->pm.power_state[i].clock_info) -return -EINVAL ; +if (!rdev->pm.power_state[i].clock_info) { + ret = -EINVAL ; + goto err_free_ps; + } ps =kzalloc (sizeof (struct ci_ps ),GFP_KERNEL ); -if (ps ==NULL ) -return -ENOMEM ; +if (ps ==NULL ) { + ret = -ENOMEM ; + goto err_free_ps; + } rdev->pm.dpm.ps[i].ps_priv = ps; ci_parse_pplib_non_clock_info(rdev, &rdev->pm.dpm.ps[i], non_clock_info,
@@ -5614,6 +5619,12 @@ static int ci_parse_power_table(struct radeon_device *rdev) }return 0 ; + +err_free_ps: +for (i =0 ; i < rdev->pm.dpm.num_ps; i++) +kfree (rdev->pm.dpm.ps[i].ps_priv); +kfree (rdev->pm.dpm.ps); +return ret; } static int ci_get_vbios_boot_values(struct radeon_device *rdev,
@@ -5702,25 +5713,26 @@ int ci_dpm_init(struct radeon_device *rdev) ret =ci_get_vbios_boot_values (rdev, &pi->vbios_boot_state);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =r600_get_platform_caps (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =r600_parse_extended_power_table (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =ci_parse_power_table (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv); +r600_free_extended_power_table (rdev);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 94/509 drm/amd/display: Explicitly specify update type per plane info change
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit 710cc1e7cd461446a9325c9bd1e9a54daa462952 ]
[Why]
The bit for flip addr is being set causing the determination for FAST vs MEDIUM to always return MEDIUM when plane info is provided as a surface update. This causes extreme stuttering for the typical atomic update path on Linux.
[How]
Don't use update_flags->raw for determining FAST vs MEDIUM. It's too fragile to changes like this.
Explicitly specify the update type per update flag instead. It's not as clever as checking the bits itself but at least it's correct.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +0 -3
@@ -1855,9 +1855,6 @@ static enum surface_update_type det_surface_update(const struct dc *dc,enum surface_update_type overall_type =UPDATE_TYPE_FAST ;union surface_update_flags *update_flags = &u->surface->update_flags; -if (u->flip_addr) - update_flags->bits.addr_update =1 ; -if (!is_surface_in_context (context, u->surface) || u->surface->force_full_update) { update_flags->raw =0xFFFFFFFF ;return UPDATE_TYPE_FULL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 95/509 Input: drv260x - sleep between polling GO bit
In reply to Greg Kroah-HartmanFrom: Luca Weiss <[email protected]>
[ Upstream commit efef661dfa6bf8cbafe4cd6a97433fcef0118967 ]
When doing the initial startup there's no need to poll without any delay and spam the I2C bus.
Let's sleep 15ms between each attempt, which is the same time as used in the vendor driver.
--- drivers/input/misc/drv260x.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/misc/drv260x.c +1 -0
@@ -435,6 +435,7 @@ static int drv260x_init(struct drv260x_data *haptics) } do { + usleep_range(15000, 15500); error = regmap_read(haptics->regmap, DRV260X_GO, &cal_buf); if (error) { dev_err(&haptics->client->dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 96/509 drm/bridge: tc358768: always enable HS video mode
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 75a8aeac2573ab258c53676eba9b3796ea691988 ]
Always enable HS video mode setting the TXMD bit, without this change no video output is present with DSI sinks that are setting MIPI_DSI_MODE_LPM flag (tested with LT8912B DSI-HDMI bridge).
Previously the driver was enabling HS mode only when the DSI sink was not explicitly setting the MIPI_DSI_MODE_LPM, however this is not correct.
The MIPI_DSI_MODE_LPM is supposed to indicate that the sink is willing to receive data in low power mode, however clearing the TC358768_DSI_CONTROL_TXMD bit will make the TC358768 send video in LP mode that is not the intended behavior.
--- drivers/gpu/drm/bridge/tc358768.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +1 -2
@@ -819,8 +819,7 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge) val =TC358768_DSI_CONFW_MODE_SET |TC358768_DSI_CONFW_ADDR_DSI_CONTROL ; val |= (dsi_dev->lanes -1 ) <<1 ; -if (!(dsi_dev->mode_flags &MIPI_DSI_MODE_LPM )) - val |=TC358768_DSI_CONTROL_TXMD ; + val |=TC358768_DSI_CONTROL_TXMD ;if (!(dsi_dev->mode_flags &MIPI_DSI_CLOCK_NON_CONTINUOUS )) val |=TC358768_DSI_CONTROL_HSCKMD ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 97/509 drm/bridge: tc358768: fix PLL parameters computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 6a4020b4c63911977aaf8047f904a300d15de739 ]
According to Toshiba documentation the PLL input clock after the divider should be not less than 4MHz, fix the PLL parameters computation accordingly.
--- drivers/gpu/drm/bridge/tc358768.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358768.c +5 -1
@@ -329,13 +329,17 @@ static int tc358768_calc_pll(struct tc358768_priv *priv,u32 fbd;for (fbd =0 ; fbd <512 ; ++fbd) { -u32 pll, diff; +u32 pll, diff, pll_in; pll = (u32 )div_u64 ((u64 )refclk * (fbd +1 ), divisor);if (pll >= max_pll || pll < min_pll)continue ; + pll_in = (u32 )div_u64 ((u64 )refclk, prd +1 ); +if (pll_in <4000000 ) +continue ; + diff =max (pll, target_pll) -min (pll, target_pll);if (diff < best_diff) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 98/509 drm/bridge: tc358768: fix PLL target frequency
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit ffd2e4bbea626d565b9817312b0fcfb382fecb88 ]
Correctly compute the PLL target frequency, the current formula works correctly only when the input bus width is 24bit, actually to properly compute the PLL target frequency what is relevant is the bits-per-pixel on the DSI link.
No regression expected since the DSI format is currently hard-coded as MIPI_DSI_FMT_RGB888.
--- drivers/gpu/drm/bridge/tc358768.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +5 -3
@@ -147,6 +147,7 @@ struct tc358768_priv {u32 pd_lines;/* number of Parallel Port Input Data Lines */ u32 dsi_lanes;/* number of DSI Lanes */ +u32 dsi_bpp;/* number of Bits Per Pixel over DSI */ /* Parameters for PLL programming */ u32 fbd;/* PLL feedback divider */
@@ -279,12 +280,12 @@ static void tc358768_hw_disable(struct tc358768_priv *priv)static u32 tc358768_pll_to_pclk (struct tc358768_priv *priv,u32 pll_clk) { -return (u32 )div_u64 ((u64 )pll_clk * priv->dsi_lanes, priv->pd_lines); +return (u32 )div_u64 ((u64 )pll_clk * priv->dsi_lanes, priv->dsi_bpp); }static u32 tc358768_pclk_to_pll (struct tc358768_priv *priv,u32 pclk) { -return (u32 )div_u64 ((u64 )pclk * priv->pd_lines, priv->dsi_lanes); +return (u32 )div_u64 ((u64 )pclk * priv->dsi_bpp, priv->dsi_lanes); } static int tc358768_calc_pll(struct tc358768_priv *priv,
@@ -421,6 +422,7 @@ static int tc358768_dsi_host_attach(struct mipi_dsi_host *host, priv->output.panel = panel; priv->dsi_lanes = dev->lanes; + priv->dsi_bpp =mipi_dsi_pixel_format_to_bpp (dev->format);/* get input ep (port0/endpoint0) */ ret = -EINVAL ;
@@ -432,7 +434,7 @@ static int tc358768_dsi_host_attach(struct mipi_dsi_host *host, }if (ret) - priv->pd_lines =mipi_dsi_pixel_format_to_bpp (dev->format); + priv->pd_lines = priv->dsi_bpp;drm_bridge_add (&priv->bridge);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 99/509 drm/bridge: tc358768: fix TCLK_ZEROCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit f9cf811374f42fca31ac34aaf59ee2ae72b89879 ]
Correct computation of TCLK_ZEROCNT register.
This register must be set to a value that ensure that (TCLK-PREPARECNT + TCLK-ZERO) > 300ns
with the actual value of (TCLK-PREPARECNT + TCLK-ZERO) being
(1 to 2) + (TCLK_ZEROCNT + 1)) x HSByteClkCycle + (PHY output delay)
with PHY output delay being about
(2 to 3) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +4 -4
@@ -725,10 +725,10 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)/* 38ns < TCLK_PREPARE < 95ns */ val =tc358768_ns_to_cnt (65 , dsibclk_nsk) -1 ; -/* TCLK_PREPARE > 300ns */ - val2 =tc358768_ns_to_cnt (300 +tc358768_to_ns (3 * ui_nsk), - dsibclk_nsk); - val |= (val2 -tc358768_to_ns (phy_delay_nsk - dsibclk_nsk)) <<8 ; +/* TCLK_PREPARE + TCLK_ZERO > 300ns */ + val2 =tc358768_ns_to_cnt (300 -tc358768_to_ns (2 * ui_nsk), + dsibclk_nsk) -2 ; + val |= val2 <<8 ;dev_dbg (priv->dev,"TCLK_HEADERCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_HEADERCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 100/509 drm/bridge: tc358768: Add atomic_get_input_bus_fmts() implementation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit cec5ccef85bd0128cf895612de54a9d21d2015d0 ]
Add atomic_get_input_bus_fmts() implementation, tc358768 has a parallel RGB input interface with the actual bus format depending on the amount of parallel input data lines.
Without this change when the tc358768 is used with less than 24bit the color mapping is completely wrong.
Stable-dep-of: ee18698e212b ("drm/bridge: tc358768: fix TCLK_TRAILCNT computation")
--- drivers/gpu/drm/bridge/tc358768.c | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
drivers/gpu/drm/bridge/tc358768.c +44 -0
@@ -9,6 +9,7 @@#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/kernel.h> +#include <linux/media-bus-format.h> #include <linux/module.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
@@ -871,6 +872,44 @@ static void tc358768_bridge_enable(struct drm_bridge *bridge) } } +#define MAX_INPUT_SEL_FORMATS 1 + +static u32 * +tc358768_atomic_get_input_bus_fmts (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state, +u32 output_fmt, +unsigned int *num_input_fmts) +{ +struct tc358768_priv *priv =bridge_to_tc358768 (bridge); +u32 *input_fmts; + + *num_input_fmts =0 ; + + input_fmts =kcalloc (MAX_INPUT_SEL_FORMATS ,sizeof (*input_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + +switch (priv->pd_lines) { +case 16 : + input_fmts[0 ] =MEDIA_BUS_FMT_RGB565_1X16 ; +break ; +case 18 : + input_fmts[0 ] =MEDIA_BUS_FMT_RGB666_1X18 ; +break ; +default : +case 24 : + input_fmts[0 ] =MEDIA_BUS_FMT_RGB888_1X24 ; +break ; + }; + + *num_input_fmts =MAX_INPUT_SEL_FORMATS ; + +return input_fmts; +} +static const struct drm_bridge_funcs tc358768_bridge_funcs = { .attach = tc358768_bridge_attach, .mode_valid = tc358768_bridge_mode_valid,
@@ -878,6 +917,11 @@ static const struct drm_bridge_funcs tc358768_bridge_funcs = { .enable = tc358768_bridge_enable, .disable = tc358768_bridge_disable, .post_disable = tc358768_bridge_post_disable, + + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_get_input_bus_fmts = tc358768_atomic_get_input_bus_fmts, };static const struct drm_bridge_timings default_tc358768_timings = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 101/509 drm/bridge: tc358768: fix TCLK_TRAILCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit ee18698e212b1659dd0850d7e2ae0f22e16ed3d3 ]
Correct computation of TCLK_TRAILCNT register.
The driver does not implement non-continuous clock mode, so the actual value doesn't make a practical difference yet. However this change also ensures that the value does not write to reserved registers bits in case of under/overflow.
This register must be set to a value that ensures that
TCLK-TRAIL > 60ns
and
TEOT <= (105 ns + 12 x UI)
with the actual value of TCLK-TRAIL being
(TCLK_TRAILCNT + (1 to 2)) xHSByteClkCycle +
(2 + (1 to 2)) * HSBYTECLKCycle - (PHY output delay)
with PHY output delay being about
(2 to 3) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +5 -3
@@ -10,6 +10,7 @@#include <linux/i2c.h> #include <linux/kernel.h> #include <linux/media-bus-format.h> +#include <linux/minmax.h> #include <linux/module.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
@@ -633,6 +634,7 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)struct tc358768_priv *priv =bridge_to_tc358768 (bridge);struct mipi_dsi_device *dsi_dev = priv->output.dev;u32 val, val2, lptxcnt, hact, data_type; +s32 raw_val;const struct drm_display_mode *mode;u32 dsibclk_nsk, dsiclk_nsk, ui_nsk, phy_delay_nsk;u32 dsiclk, dsibclk;
@@ -733,9 +735,9 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)dev_dbg (priv->dev,"TCLK_HEADERCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_HEADERCNT , val); -/* TCLK_TRAIL > 60ns + 3*UI */ - val =60 +tc358768_to_ns (3 * ui_nsk); - val =tc358768_ns_to_cnt (val, dsibclk_nsk) -5 ; +/* TCLK_TRAIL > 60ns AND TEOT <= 105 ns + 12*UI */ + raw_val =tc358768_ns_to_cnt (60 +tc358768_to_ns (2 * ui_nsk), dsibclk_nsk) -5 ; + val =clamp (raw_val,0 ,127 );dev_dbg (priv->dev,"TCLK_TRAILCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_TRAILCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 102/509 drm/bridge: tc358768: fix THS_ZEROCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 77a089328da791118af9692543a5eedc79eb5fd4 ]
Correct computation of THS_ZEROCNT register.
This register must be set to a value that ensure that THS_PREPARE + THS_ZERO > 145ns + 10*UI
with the actual value of (THS_PREPARE + THS_ZERO) being
((1 to 2) + 1 + (TCLK_ZEROCNT + 1) + (3 to 4)) x ByteClk cycle +
+ HSByteClk x (2 + (1 to 2)) + (PHY delay)
with PHY delay being about
(8 + (5 to 6)) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +4 -3
@@ -744,9 +744,10 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)/* 40ns + 4*UI < THS_PREPARE < 85ns + 6*UI */ val =50 +tc358768_to_ns (4 * ui_nsk); val =tc358768_ns_to_cnt (val, dsibclk_nsk) -1 ; -/* THS_ZERO > 145ns + 10*UI */ - val2 =tc358768_ns_to_cnt (145 -tc358768_to_ns (ui_nsk), dsibclk_nsk); - val |= (val2 -tc358768_to_ns (phy_delay_nsk)) <<8 ; +/* THS_PREPARE + THS_ZERO > 145ns + 10*UI */ + raw_val =tc358768_ns_to_cnt (145 -tc358768_to_ns (3 * ui_nsk), dsibclk_nsk) -10 ; + val2 =clamp (raw_val,0 ,127 ); + val |= val2 <<8 ;dev_dbg (priv->dev,"THS_HEADERCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_THS_HEADERCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 103/509 drm/bridge: tc358768: fix TXTAGOCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 3666aad8185af8d0ce164fd3c4974235417d6d0b ]
Correct computation of TXTAGOCNT register.
This register must be set to a value that ensure that the TTA-GO period = (4 x TLPX)
with the actual value of TTA-GO being
4 x (TXTAGOCNT + 1) x (HSByteClk cycle)
--- drivers/gpu/drm/bridge/tc358768.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358768.c +1 -1
@@ -779,7 +779,7 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)/* TXTAGOCNT[26:16] RXTASURECNT[10:0] */ val =tc358768_to_ns ((lptxcnt +1 ) * dsibclk_nsk *4 ); - val =tc358768_ns_to_cnt (val, dsibclk_nsk) -1 ; + val =tc358768_ns_to_cnt (val, dsibclk_nsk) /4 -1 ; val2 =tc358768_ns_to_cnt (tc358768_to_ns ((lptxcnt +1 ) * dsibclk_nsk), dsibclk_nsk) -2 ; val |= val2 <<16 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 104/509 drm/bridge: tc358768: fix THS_TRAILCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit bac7842cd179572e8e0fc2d7b5254e40c6e9e057 ]
Correct computation of THS_TRAILCNT register.
This register must be set to a value that ensure that THS_TRAIL > 60 ns + 4 x UI
andTHS_TRAIL > 8 x UI
andTHS_TRAIL < TEOT
with
TEOT = 105 ns + (12 x UI)
with the actual value of THS_TRAIL being
(1 + THS_TRAILCNT) x ByteClk cycle + ((1 to 2) + 2) xHSBYTECLK cycle +
- (PHY output delay)
with PHY output delay being about
(8 + (5 to 6)) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +4 -3
@@ -763,9 +763,10 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)dev_dbg (priv->dev,"TCLK_POSTCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_POSTCNT , val); -/* 60ns + 4*UI < THS_PREPARE < 105ns + 12*UI */ - val =tc358768_ns_to_cnt (60 +tc358768_to_ns (15 * ui_nsk), - dsibclk_nsk) -5 ; +/* max(60ns + 4*UI, 8*UI) < THS_TRAILCNT < 105ns + 12*UI */ + raw_val =tc358768_ns_to_cnt (60 +tc358768_to_ns (18 * ui_nsk), + dsibclk_nsk) -4 ; + val =clamp (raw_val,0 ,15 );dev_dbg (priv->dev,"THS_TRAILCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_THS_TRAILCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 105/509 drm/vram-helper: fix function names in vram helper doc
In reply to Greg Kroah-HartmanFrom: Luc Ma <[email protected]>
[ Upstream commit b8e392245105b50706f18418054821e71e637288 ]
Refer to drmm_vram_helper_init() instead of the non-existent drmm_vram_helper_alloc_mm().
--- drivers/gpu/drm/drm_gem_vram_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +3 -3
@@ -41,7 +41,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs;* the frame's scanout buffer or the cursor image. If there's no more space * left in VRAM, inactive GEM objects can be moved to system memory. * -* To initialize the VRAM helper library call drmm_vram_helper_alloc_mm(). +* To initialize the VRAM helper library call drmm_vram_helper_init(). * The function allocates and initializes an instance of &struct drm_vram_mm * in &struct drm_device.vram_mm . Use &DRM_GEM_VRAM_DRIVER to initialize * &struct drm_driver and &DRM_VRAM_MM_FILE_OPERATIONS to initialize
@@ -69,7 +69,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs;* // setup device, vram base and size * // ... * -* ret = drmm_vram_helper_alloc_mm(dev, vram_base, vram_size); +* ret = drmm_vram_helper_init(dev, vram_base, vram_size); * if (ret) * return ret; * return 0;
@@ -82,7 +82,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs;* to userspace. * * You don't have to clean up the instance of VRAM MM. -* drmm_vram_helper_alloc_mm() is a managed interface that installs a +* drmm_vram_helper_init() is a managed interface that installs a * clean-up handler to run during the DRM device's release. * * For drawing or scanout operations, rsp. buffer objects have to be pinned
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 106/509 ARM: dts: BCM5301X: Drop "clock-names" from the SPI node
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit d3c8e2c5757153bbfad70019ec1decbca86f3def ]
There is no such property in the SPI controller binding documentation. Also Linux driver doesn't look for it.
This fixes:arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dtb: spi@18029200: Unevaluated properties are not allowed ('clock-names' was unexpected)
From schema: Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
--- arch/arm/boot/dts/bcm5301x.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/bcm5301x.dtsi +0 -1
@@ -532,7 +532,6 @@ spi@18029200 { "spi_lr_session_done", "spi_lr_overread"; clocks = <&iprocmed>; - clock-names = "iprocmed"; num-cs = <2>; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 107/509 ARM: dts: meson8b: correct uart_B and uart_C clock references
In reply to Greg Kroah-HartmanFrom: [email protected] <[email protected]>
[ Upstream commit d542ce8d4769cdef6a7bc3437e59cfed9c68f0e4 ]
With the current device tree for meson8b, uarts B (e.g. available on pins 8/10 on Odroid-C1) and C (pins 3/5 on Odroid-C1) do not work, because they are relying on incorrect clocks. Change the references of pclk to the correct CLKID, to allow use of the two uarts.
--- arch/arm/boot/dts/meson8b.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/meson8b.dtsi +2 -2
@@ -599,13 +599,13 @@ &uart_A { &uart_B { compatible = "amlogic,meson8b-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; }; &uart_C { compatible = "amlogic,meson8b-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 108/509 Input: adxl34x - do not hardcode interrupt trigger type
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e96220bce5176ed2309f77f061dcc0430b82b25e ]
Instead of hardcoding IRQ trigger type to IRQF_TRIGGER_HIGH, let's respect the settings specified in the firmware description.
--- drivers/input/misc/adxl34x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/input/misc/adxl34x.c +1 -2
@@ -811,8 +811,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,AC_WRITE (ac,POWER_CTL ,0 ); err =request_threaded_irq (ac->irq,NULL , adxl34x_irq, -IRQF_TRIGGER_HIGH |IRQF_ONESHOT , -dev_name (dev), ac); +IRQF_ONESHOT ,dev_name (dev), ac);if (err) {dev_err (dev,"irq %d busy?\n" , ac->irq); goto err_free_mem;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 109/509 drm: sun4i_tcon: use devm_clk_get_enabled in `sun4i_tcon_init_clocks`
In reply to Greg Kroah-HartmanFrom: XuDong Liu <[email protected]>
[ Upstream commit 123ee07ba5b7123e0ce0e0f9d64938026c16a2ce ]
Smatch reports:drivers/gpu/drm/sun4i/sun4i_tcon.c:805 sun4i_tcon_init_clocks() warn:
'tcon->clk' from clk_prepare_enable() not released on lines: 792,801.
In the function sun4i_tcon_init_clocks(), tcon->clk and tcon->sclk0 are not disabled in the error handling, which affects the release of these variable. Although sun4i_tcon_bind(), which calls sun4i_tcon_init_clocks(), use sun4i_tcon_free_clocks to disable the variables mentioned, but the error handling branch of sun4i_tcon_init_clocks() ignores the required disable process.
To fix this issue, use the devm_clk_get_enabled to automatically balance enable and disabled calls. As original implementation use sun4i_tcon_free_clocks() to disable clk explicitly, we delete the related calls and error handling that are no longer needed.
--- drivers/gpu/drm/sun4i/sun4i_tcon.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
drivers/gpu/drm/sun4i/sun4i_tcon.c +4 -15
@@ -777,21 +777,19 @@ static irqreturn_t sun4i_tcon_handler(int irq, void *private)static int sun4i_tcon_init_clocks (struct device *dev,struct sun4i_tcon *tcon) { - tcon->clk =devm_clk_get (dev,"ahb" ); + tcon->clk =devm_clk_get_enabled (dev,"ahb" );if (IS_ERR (tcon->clk)) {dev_err (dev,"Couldn't get the TCON bus clock\n" );return PTR_ERR (tcon->clk); } -clk_prepare_enable (tcon->clk);if (tcon->quirks->has_channel_0) { - tcon->sclk0 =devm_clk_get (dev,"tcon-ch0" ); + tcon->sclk0 =devm_clk_get_enabled (dev,"tcon-ch0" );if (IS_ERR (tcon->sclk0)) {dev_err (dev,"Couldn't get the TCON channel 0 clock\n" );return PTR_ERR (tcon->sclk0); } } -clk_prepare_enable (tcon->sclk0);if (tcon->quirks->has_channel_1) { tcon->sclk1 =devm_clk_get (dev,"tcon-ch1" );
@@ -804,12 +802,6 @@ static int sun4i_tcon_init_clocks(struct device *dev,return 0 ; } -static void sun4i_tcon_free_clocks (struct sun4i_tcon *tcon) -{ -clk_disable_unprepare (tcon->sclk0); -clk_disable_unprepare (tcon->clk); -} -static int sun4i_tcon_init_irq (struct device *dev,struct sun4i_tcon *tcon) {
@@ -1224,14 +1216,14 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, ret =sun4i_tcon_init_regmap (dev, tcon);if (ret) {dev_err (dev,"Couldn't init our TCON regmap\n" ); - goto err_free_clocks; + goto err_assert_reset; }if (tcon->quirks->has_channel_0) { ret =sun4i_dclk_create (dev, tcon);if (ret) {dev_err (dev,"Couldn't create our TCON dot clock\n" ); - goto err_free_clocks; + goto err_assert_reset; } }
@@ -1294,8 +1286,6 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, err_free_dotclock:if (tcon->quirks->has_channel_0)sun4i_dclk_free (tcon); -err_free_clocks: -sun4i_tcon_free_clocks (tcon); err_assert_reset:reset_control_assert (tcon->lcd_rst);return ret;
@@ -1309,7 +1299,6 @@ static void sun4i_tcon_unbind(struct device *dev, struct device *master,list_del (&tcon->list);if (tcon->quirks->has_channel_0)sun4i_dclk_free (tcon); -sun4i_tcon_free_clocks (tcon); }static const struct component_ops sun4i_tcon_ops = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 110/509 drm/panel: sharp-ls043t1le01: adjust mode settings
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit dee23b2c9e3ff46d59c5d45e1436eceb878e7c9a ]
Using current settings causes panel flickering on APQ8074 dragonboard. Adjust panel settings to follow the vendor-provided mode. This also enables MIPI_DSI_MODE_VIDEO_SYNC_PULSE, which is also specified by the vendor dtsi for the mentioned dragonboard.
--- drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +6 -5
@@ -192,15 +192,15 @@ static int sharp_nt_panel_enable(struct drm_panel *panel) }static const struct drm_display_mode default_mode = { - .clock =41118 , + .clock = (540 +48 +32 +80 ) * (960 +3 +10 +15 ) *60 /1000 , .hdisplay =540 , .hsync_start =540 +48 , - .hsync_end =540 +48 +80 , - .htotal =540 +48 +80 +32 , + .hsync_end =540 +48 +32 , + .htotal =540 +48 +32 +80 , .vdisplay =960 , .vsync_start =960 +3 , - .vsync_end =960 +3 +15 , - .vtotal =960 +3 +15 +1 , + .vsync_end =960 +3 +10 , + .vtotal =960 +3 +10 +15 , }; static int sharp_nt_panel_get_modes(struct drm_panel *panel,
@@ -280,6 +280,7 @@ static int sharp_nt_panel_probe(struct mipi_dsi_device *dsi) dsi->lanes =2 ; dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO | +MIPI_DSI_MODE_VIDEO_SYNC_PULSE |MIPI_DSI_MODE_VIDEO_HSE |MIPI_DSI_CLOCK_NON_CONTINUOUS |MIPI_DSI_MODE_EOT_PACKET ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 111/509 ARM: dts: stm32: Move ethernet MAC EEPROM from SoM to carrier boards
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 9660efc2af37f3c12dc6e6a5511ad99e0addc297 ]
The ethernet MAC EEPROM is not populated on the SoM itself, it has to be populated on each carrier board. Move the EEPROM into the correct place in DTs, i.e. the carrier board DTs. Add label to the EEPROM too.
--- arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 6 ++++++ arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi +6 -0
@@ -232,6 +232,12 @@ adv7513_i2s0: endpoint { }; }; }; + + dh_mac_eeprom: eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; }; <dc {
arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi +0 -6
@@ -167,12 +167,6 @@ watchdog { status = "disabled"; }; }; - - eeprom@53 { - compatible = "atmel,24c02"; - reg = <0x53>; - pagesize = <16>; - }; }; &iwdg2 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 112/509 bus: ti-sysc: Fix dispc quirk masking bool variables
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit f620596fa347170852da499e778a5736d79a4b79 ]
Fix warning drivers/bus/ti-sysc.c:1806 sysc_quirk_dispc()
warn: masking a bool.
While at it let's add a comment for what were doing to make the code a bit easier to follow.
--- drivers/bus/ti-sysc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bus/ti-sysc.c +2 -2
@@ -1748,7 +1748,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,if (!ddata->module_va)return -EIO ; -/* DISP_CONTROL */ +/* DISP_CONTROL, shut down lcd and digit on disable if enabled */ val =sysc_read (ddata, dispc_offset +0x40 ); lcd_en = val & lcd_en_mask; digit_en = val & digit_en_mask;
@@ -1760,7 +1760,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,else irq_mask |=BIT (2 ) |BIT (3 );/* EVSYNC bits */ } -if (disable & (lcd_en | digit_en)) +if (disable && (lcd_en || digit_en))sysc_write (ddata, dispc_offset +0x40 , val & ~(lcd_en_mask | digit_en_mask));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 113/509 arm64: dts: microchip: sparx5: do not use PSCI on reference boards
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
[ Upstream commit 70be83708c925b3f72c508e4756e48ad2330c830 ]
PSCI is not implemented on SparX-5 at all, there is no ATF and U-boot that is shipped does not implement it as well.
I have tried flashing the latest BSP 2022.12 U-boot which did not work. After contacting Microchip, they confirmed that there is no ATF for the SoC nor PSCI implementation which is unfortunate in 2023.
So, disable PSCI as otherwise kernel crashes as soon as it tries probing PSCI with, and the crash is only visible if earlycon is used.
Since PSCI is not implemented, switch core bringup to use spin-tables which are implemented in the vendor U-boot and actually work.
Tested on PCB134 with eMMC (VSC5640EV).
--- arch/arm64/boot/dts/microchip/sparx5.dtsi | 2 +- arch/arm64/boot/dts/microchip/sparx5_pcb_common.dtsi | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/microchip/sparx5.dtsi +1 -1
@@ -61,7 +61,7 @@ arm-pmu { interrupt-affinity = <&cpu0>, <&cpu1>; }; - psci { + psci: psci { compatible = "arm,psci-0.2"; method = "smc"; };
arch/arm64/boot/dts/microchip/sparx5_pcb_common.dtsi +12 -0
@@ -6,6 +6,18 @@ /dts-v1/; #include "sparx5.dtsi" +&psci { + status = "disabled"; +}; + +&cpu0 { + enable-method = "spin-table"; +}; + +&cpu1 { + enable-method = "spin-table"; +}; + &uart0 { status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 114/509 RDMA/bnxt_re: Disable/kill tasklet only if it is enabled
In reply to Greg Kroah-HartmanFrom: Selvin Xavier <[email protected]>
[ Upstream commit ab112ee7899d6171da5acd77a7ed7ae103f488de ]
When the ulp hook to start the IRQ fails because the rings are not available, tasklets are not enabled. In this case when the driver is unloaded, driver calls CREQ tasklet_kill. This causes an indefinite hang as the tasklet is not enabled.
Driver shouldn't call tasklet_kill if it is not enabled. So using the creq->requested and nq->requested flags to identify if both tasklets/irqs are registered. Checking this flag while scheduling the tasklet from ISR. Also, added a cleanup for disabling tasklet, in case request_irq fails during start_irq.
Check for return value for bnxt_qplib_rcfw_start_irq and in case the bnxt_qplib_rcfw_start_irq fails, return bnxt_re_start_irq without attempting to start NQ IRQs.
--- drivers/infiniband/hw/bnxt_re/main.c | 12 +++++++++--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 16 ++++++++++------ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 14 +++++++++----- 3 files changed, 28 insertions(+), 14 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +9 -3
@@ -294,15 +294,21 @@ static void bnxt_re_start_irq(void *handle, struct bnxt_msix_entry *ent)for (indx =0 ; indx < rdev->num_msix; indx++) rdev->msix_entries[indx].vector = ent[indx].vector; -bnxt_qplib_rcfw_start_irq (rcfw, msix_ent[BNXT_RE_AEQ_IDX ].vector, - false); + rc =bnxt_qplib_rcfw_start_irq (rcfw, msix_ent[BNXT_RE_AEQ_IDX ].vector, + false); +if (rc) { +ibdev_warn (&rdev->ibdev,"Failed to reinit CREQ\n" ); +return ; + }for (indx =BNXT_RE_NQ_IDX ; indx < rdev->num_msix; indx++) { nq = &rdev->nq[indx -1 ]; rc =bnxt_qplib_nq_start_irq (nq, indx -1 , msix_ent[indx].vector, false); -if (rc) +if (rc) {ibdev_warn (&rdev->ibdev,"Failed to reinit NQ index %d\n" , indx -1 ); +return ; + } } }
drivers/infiniband/hw/bnxt_re/qplib_fp.c +10 -6
@@ -404,6 +404,9 @@ static irqreturn_t bnxt_qplib_nq_irq(int irq, void *dev_instance)void bnxt_qplib_nq_stop_irq (struct bnxt_qplib_nq *nq,bool kill) { +if (!nq->requested) +return ; +tasklet_disable (&nq->nq_tasklet);/* Mask h/w interrupt */ bnxt_qplib_ring_nq_db (&nq->nq_db.dbinfo, nq->res->cctx, false);
@@ -411,11 +414,10 @@ void bnxt_qplib_nq_stop_irq(struct bnxt_qplib_nq *nq, bool kill)synchronize_irq (nq->msix_vec);if (kill)tasklet_kill (&nq->nq_tasklet); -if (nq->requested) { -irq_set_affinity_hint (nq->msix_vec,NULL ); -free_irq (nq->msix_vec, nq); - nq->requested = false; - } + +irq_set_affinity_hint (nq->msix_vec,NULL ); +free_irq (nq->msix_vec, nq); + nq->requested = false; }void bnxt_qplib_disable_nq (struct bnxt_qplib_nq *nq)
@@ -454,8 +456,10 @@ int bnxt_qplib_nq_start_irq(struct bnxt_qplib_nq *nq, int nq_indx,snprintf (nq->name,sizeof (nq->name),"bnxt_qplib_nq-%d" , nq_indx); rc =request_irq (nq->msix_vec, bnxt_qplib_nq_irq,0 , nq->name, nq); -if (rc) +if (rc) { +tasklet_disable (&nq->nq_tasklet);return rc; + }cpumask_clear (&nq->mask);cpumask_set_cpu (nq_indx, &nq->mask);
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +9 -5
@@ -633,6 +633,10 @@ void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill)struct bnxt_qplib_creq_ctx *creq; creq = &rcfw->creq; + +if (!creq->requested) +return ; +tasklet_disable (&creq->creq_tasklet);/* Mask h/w interrupts */ bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, rcfw->res->cctx, false);
@@ -641,10 +645,8 @@ void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill)if (kill)tasklet_kill (&creq->creq_tasklet); -if (creq->requested) { -free_irq (creq->msix_vec, rcfw); - creq->requested = false; - } +free_irq (creq->msix_vec, rcfw); + creq->requested = false; }void bnxt_qplib_disable_rcfw_channel (struct bnxt_qplib_rcfw *rcfw)
@@ -690,8 +692,10 @@ int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector,tasklet_enable (&creq->creq_tasklet); rc =request_irq (creq->msix_vec, bnxt_qplib_creq_irq,0 ,"bnxt_qplib_creq" , rcfw); -if (rc) +if (rc) { +tasklet_disable (&creq->creq_tasklet);return rc; + } creq->requested = true;bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, rcfw->res->cctx, true);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 115/509 RDMA/bnxt_re: Fix to remove unnecessary return labels
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit 9b3ee47796f529e5bc31a355d6cb756d68a7079a ]
If there is no cleanup needed then just return directly. This cleans up the code and improve readability.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +2 -5
@@ -1603,7 +1603,7 @@ static int bnxt_qplib_put_inline(struct bnxt_qplib_qp *qp, il_src = (void *)wqe->sg_list[indx].addr; t_len += len;if (t_len > qp->max_inline_data) - goto bad; +return -ENOMEM ;while (len) {if (pull_dst) { pull_dst = false;
@@ -1627,8 +1627,6 @@ static int bnxt_qplib_put_inline(struct bnxt_qplib_qp *qp, }return t_len; -bad: -return -ENOMEM ; } static u32 bnxt_qplib_put_sges(struct bnxt_qplib_hwq *hwq,
@@ -2058,7 +2056,7 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq) hwq_attr.sginfo = &cq->sg_info; rc =bnxt_qplib_alloc_init_hwq (&cq->hwq, &hwq_attr);if (rc) - goto exit; +return rc;RCFW_CMD_PREP (req,CREATE_CQ , cmd_flags);
@@ -2099,7 +2097,6 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq) fail:bnxt_qplib_free_hwq (res, &cq->hwq); -exit:return rc; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 116/509 RDMA/bnxt_re: Use unique names while registering interrupts
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit ff2e4bfd162cf66a112a81509e419805add44d64 ]
bnxt_re currently uses the names "bnxt_qplib_creq" and "bnxt_qplib_nq-0" while registering IRQs. There is no way to distinguish the IRQs of different device ports when there are multiple IB devices registered. This could make the scenarios worse where one want to pin IRQs of a device port to certain CPUs.
Fixed the code to use unique names which has PCI BDF information while registering interrupts like: "bnxt_re-nq-0@pci:0000:65:00.0" and "bnxt_re-creq@pci:0000:65:00.1".
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 12 ++++++++++-- drivers/infiniband/hw/bnxt_re/qplib_fp.h | 2 +- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 15 +++++++++++++-- drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 1 + 4 files changed, 25 insertions(+), 5 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +10 -2
@@ -417,6 +417,8 @@ void bnxt_qplib_nq_stop_irq(struct bnxt_qplib_nq *nq, bool kill)irq_set_affinity_hint (nq->msix_vec,NULL );free_irq (nq->msix_vec, nq); +kfree (nq->name); + nq->name =NULL ; nq->requested = false; }
@@ -443,6 +445,7 @@ void bnxt_qplib_disable_nq(struct bnxt_qplib_nq *nq)int bnxt_qplib_nq_start_irq (struct bnxt_qplib_nq *nq,int nq_indx,int msix_vector,bool need_init) { +struct bnxt_qplib_res *res = nq->res;int rc;if (nq->requested)
@@ -454,9 +457,14 @@ int bnxt_qplib_nq_start_irq(struct bnxt_qplib_nq *nq, int nq_indx,else tasklet_enable (&nq->nq_tasklet); -snprintf (nq->name,sizeof (nq->name),"bnxt_qplib_nq-%d" , nq_indx); + nq->name =kasprintf (GFP_KERNEL ,"bnxt_re-nq-%d@pci:%s" , + nq_indx,pci_name (res->pdev)); +if (!nq->name) +return -ENOMEM ; rc =request_irq (nq->msix_vec, bnxt_qplib_nq_irq,0 , nq->name, nq);if (rc) { +kfree (nq->name); + nq->name =NULL ;tasklet_disable (&nq->nq_tasklet);return rc; }
@@ -470,7 +478,7 @@ int bnxt_qplib_nq_start_irq(struct bnxt_qplib_nq *nq, int nq_indx, nq->msix_vec, nq_indx); } nq->requested = true; -bnxt_qplib_ring_nq_db (&nq->nq_db.dbinfo, nq->res->cctx, true); +bnxt_qplib_ring_nq_db (&nq->nq_db.dbinfo, res->cctx, true);return rc; }
drivers/infiniband/hw/bnxt_re/qplib_fp.h +1 -1
@@ -469,7 +469,7 @@ typedef int (*srqn_handler_t)(struct bnxt_qplib_nq *nq,struct bnxt_qplib_nq {struct pci_dev *pdev;struct bnxt_qplib_res *res; -char name[32 ]; +char *name;struct bnxt_qplib_hwq hwq;struct bnxt_qplib_nq_db nq_db;u16 ring_id;
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +13 -2
@@ -646,6 +646,8 @@ void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill)tasklet_kill (&creq->creq_tasklet);free_irq (creq->msix_vec, rcfw); +kfree (creq->irq_name); + creq->irq_name =NULL ; creq->requested = false; }
@@ -678,9 +680,11 @@ int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector, bool need_init) {struct bnxt_qplib_creq_ctx *creq; +struct bnxt_qplib_res *res;int rc; creq = &rcfw->creq; + res = rcfw->res;if (creq->requested)return -EFAULT ;
@@ -690,15 +694,22 @@ int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector,tasklet_setup (&creq->creq_tasklet, bnxt_qplib_service_creq); else tasklet_enable(&creq->creq_tasklet); + + creq->irq_name =kasprintf (GFP_KERNEL ,"bnxt_re-creq@pci:%s" , +pci_name (res->pdev)); +if (!creq->irq_name) +return -ENOMEM ; rc =request_irq (creq->msix_vec, bnxt_qplib_creq_irq,0 , -"bnxt_qplib_creq" , rcfw); + creq->irq_name, rcfw);if (rc) { +kfree (creq->irq_name); + creq->irq_name =NULL ;tasklet_disable (&creq->creq_tasklet);return rc; } creq->requested = true; -bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, rcfw->res->cctx, true); +bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, res->cctx, true);return 0 ; }
drivers/infiniband/hw/bnxt_re/qplib_rcfw.h +1 -0
@@ -172,6 +172,7 @@ struct bnxt_qplib_creq_ctx {u16 ring_id;int msix_vec;bool requested;/*irq handler installed */ +char *irq_name; };/* RCFW Communication Channels */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 117/509 RDMA/bnxt_re: Remove a redundant check inside bnxt_re_update_gid
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit b989f90cef0af48aa5679b6a75476371705ec53c ]
The NULL check inside bnxt_re_update_gid() always return false. If sgid_tbl->tbl is not allocated, then dev_init would have failed.
--- drivers/infiniband/hw/bnxt_re/main.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +1 -7
@@ -1191,12 +1191,6 @@ static int bnxt_re_update_gid(struct bnxt_re_dev *rdev)if (!ib_device_try_get (&rdev->ibdev))return 0 ; -if (!sgid_tbl) { -ibdev_err (&rdev->ibdev,"QPLIB: SGID table not allocated" ); - rc = -EINVAL ; - goto out; - } -for (index =0 ; index < sgid_tbl->active; index++) { gid_idx = sgid_tbl->hw_id[index];
@@ -1214,7 +1208,7 @@ static int bnxt_re_update_gid(struct bnxt_re_dev *rdev) rc =bnxt_qplib_update_sgid (sgid_tbl, &gid, gid_idx, rdev->qplib_res.netdev->dev_addr); } -out: +ib_device_put (&rdev->ibdev);return rc; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 118/509 RDMA/bnxt_re: Fix to remove an unnecessary log
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit 43774bc156614346fe5dacabc8e8c229167f2536 ]
During destroy_qp, driver sets the qp handle in the existing CQEs belonging to the QP being destroyed to NULL. As a result, a poll_cq after destroy_qp can report unnecessary messages. Remove this noise from system logs.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +1 -4
@@ -2732,11 +2732,8 @@ static int bnxt_qplib_cq_process_terminal(struct bnxt_qplib_cq *cq, qp = (struct bnxt_qplib_qp *)((unsigned long )le64_to_cpu (hwcqe->qp_handle)); -if (!qp) { -dev_err (&cq->hwq.pdev->dev, -"FP: CQ Process terminal qp is NULL\n" ); +if (!qp)return -EINVAL ; - }/* Must block new posting of SQ and RQ */ qp->state =CMDQ_MODIFY_QP_NEW_STATE_ERR ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 119/509 ARM: dts: gta04: Move model property out of pinctrl node
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 4ffec92e70ac5097b9f67ec154065305b16a3b46 ]
The model property should be at the top level, let's move it out of the pinctrl node.
--- arch/arm/boot/dts/omap3-gta04a5one.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04a5one.dts +3 -1
@@ -5,9 +5,11 @@ #include "omap3-gta04a5.dts" -&omap3_pmx_core { +/ { model = "Goldelico GTA04A5/Letux 2804 with OneNAND"; +}; +&omap3_pmx_core { gpmc_pins: pinmux_gpmc_pins { pinctrl-single,pins = <
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 120/509 arm64: dts: qcom: msm8916: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 48798d992ce276cf0d57bf75318daf8eabd02aa4 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/camss@1b00000: simple-bus unit address format error, expected "1b0ac00"
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +1 -1
@@ -1006,7 +1006,7 @@ dsi_phy0: dsi-phy@1a98300 { }; }; - camss: camss@1b00000 { + camss: camss@1b0ac00 { compatible = "qcom,msm8916-camss"; reg = <0x01b0ac00 0x200>, <0x01b00030 0x4>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 121/509 arm64: dts: qcom: msm8994: correct SPMI unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 24f0f6a8059c7108d4ee3476c95db1e7ff4feb79 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc/spmi@fc4c0000: simple-bus unit address format error, expected "fc4cf000"
--- arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8994.dtsi +1 -1
@@ -489,7 +489,7 @@ restart@fc4ab000 { reg = <0xfc4ab000 0x4>; }; - spmi_bus: spmi@fc4c0000 { + spmi_bus: spmi@fc4cf000 { compatible = "qcom,spmi-pmic-arb"; reg = <0xfc4cf000 0x1000>, <0xfc4cb000 0x1000>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 122/509 arm64: dts: qcom: msm8996: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit e959ced1d0e5ef0b1f66a0c2d0e1ae80790e5ca5 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc/camss@a00000: simple-bus unit address format error, expected "a34000"
--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +1 -1
@@ -956,7 +956,7 @@ ufsphy_lane: lanes@627400 { }; }; - camss: camss@a00000 { + camss: camss@a34000 { compatible = "qcom,msm8996-camss"; reg = <0x00a34000 0x1000>, <0x00a00030 0x4>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 123/509 drm/panel: simple: fix active size for Ampire AM-480272H3TMQW-T01H
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit f24b49550814fdee4a98b9552e35e243ccafd4a8 ]
The previous setting was related to the overall dimension and not to the active display area.
In the "PHYSICAL SPECIFICATIONS" section, the datasheet shows the following parameters:
----------------------------------------------------------
| Item | Specifications | unit |
----------------------------------------------------------
| Display area | 98.7 (W) x 57.5 (H) | mm |
----------------------------------------------------------
| Overall dimension | 105.5(W) x 67.2(H) x 4.96(D) | mm |
----------------------------------------------------------
--- drivers/gpu/drm/panel/panel-simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-simple.c +2 -2
@@ -704,8 +704,8 @@ static const struct panel_desc ampire_am_480272h3tmqw_t01h = { .num_modes = 1, .bpc = 8, .size = { - .width = 105, - .height = 67, + .width = 99, + .height = 58, }, .bus_format = MEDIA_BUS_FMT_RGB888_1X24, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 124/509 ARM: ep93xx: fix missing-prototype warnings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 419013740ea1e4343d8ade535d999f59fa28e460 ]
ep93xx_clocksource_read() is only called from the file it is declared in, while ep93xx_timer_init() is declared in a header that is not included here.
arch/arm/mach-ep93xx/timer-ep93xx.c:120:13: error: no previous prototype for 'ep93xx_timer_init' arch/arm/mach-ep93xx/timer-ep93xx.c:63:5: error: no previous prototype for 'ep93xx_clocksource_read'
--- arch/arm/mach-ep93xx/timer-ep93xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-ep93xx/timer-ep93xx.c +2 -1
@@ -9,6 +9,7 @@#include <linux/io.h> #include <asm/mach/time.h> #include "soc.h" +#include "platform.h" /************************************************************************* * Timer handling for EP93xx
@@ -60,7 +61,7 @@ static u64 notrace ep93xx_read_sched_clock(void)return ret; } -u64 ep93xx_clocksource_read (struct clocksource *c) +static u64 ep93xx_clocksource_read (struct clocksource *c) {u64 ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 125/509 ARM: omap2: fix missing tick_broadcast() prototype
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 861bc1d2886d47bd57a2cbf2cda87fdbe3eb9d08 ]
omap2 contains a hack to define tick_broadcast() on non-SMP configurations in place of the normal SMP definition. This one causes a warning because of a missing prototype:
arch/arm/mach-omap2/board-generic.c:44:6: error: no previous prototype for 'tick_broadcast'
Make sure to always include the header with the declaration.
--- arch/arm/mach-omap2/board-generic.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-omap2/board-generic.c +1 -0
@@ -13,6 +13,7 @@#include <linux/of_platform.h> #include <linux/irqdomain.h> #include <linux/clocksource.h> +#include <linux/clockchips.h> #include <asm/setup.h> #include <asm/mach/arch.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 126/509 arm64: dts: qcom: apq8096: fix fixed regulator name property
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit c77612a07d18d4425fd8ddd532a8a9b8e1970c53 ]
Correct the typo in 'regulator-name' property.
apq8096-ifc6640.dtb: v1p05-regulator: 'regulator-name' is a required property apq8096-ifc6640.dtb: v1p05-regulator: Unevaluated properties are not allowed ('reglator-name' was unexpected)
--- arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts +2 -2
@@ -26,7 +26,7 @@ chosen { v1p05: v1p05-regulator { compatible = "regulator-fixed"; - reglator-name = "v1p05"; + regulator-name = "v1p05"; regulator-always-on; regulator-boot-on;
@@ -38,7 +38,7 @@ v1p05: v1p05-regulator { v12_poe: v12-poe-regulator { compatible = "regulator-fixed"; - reglator-name = "v12_poe"; + regulator-name = "v12_poe"; regulator-always-on; regulator-boot-on;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 127/509 ARM: dts: stm32: Shorten the AV96 HDMI sound card name
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 0cf765e598712addec34d0208cc1418c151fefb2 ]
Fix the following error in kernel log due to too long sound card name:
"
asoc-audio-graph-card sound: ASoC: driver name too long 'STM32MP1-AV96-HDMI' -> 'STM32MP1-AV96-H' "
--- arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi +1 -1
@@ -88,7 +88,7 @@ sd_switch: regulator-sd_switch { sound { compatible = "audio-graph-card"; - label = "STM32MP1-AV96-HDMI"; + label = "STM32-AV96-HDMI"; dais = <&sai2a_port>; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 128/509 memory: brcmstb_dpfe: fix testing array offset after use
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 1d9e93fad549bc38f593147479ee063f2872c170 ]
Code should first check for valid value of array offset, then use it as the index. Fixes smatch warning:
drivers/memory/brcmstb_dpfe.c:443 __send_command() error: testing array offset 'cmd' after use.
--- drivers/memory/brcmstb_dpfe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/memory/brcmstb_dpfe.c +3 -1
@@ -434,15 +434,17 @@ static void __finalize_command(struct brcmstb_dpfe_priv *priv)static int __send_command (struct brcmstb_dpfe_priv *priv,unsigned int cmd,u32 result[]) { -const u32 *msg = priv->dpfe_api->command[cmd];void __iomem *regs = priv->regs;unsigned int i, chksum, chksum_idx; +const u32 *msg;int ret =0 ;u32 resp;if (cmd >=DPFE_CMD_MAX )return -1 ; + msg = priv->dpfe_api->command[cmd]; +mutex_lock (&priv->lock);/* Wait for DCPU to become ready */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 129/509 ASoC: es8316: Increment max value for ALC Capture Target Volume control
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 6f073429037cd79d7311cd8236311c53f5ea8f01 ]
The following error occurs when trying to restore a previously saved ALSA mixer state (tested on a Rock 5B board):
$ alsactl --no-ucm -f /tmp/asound.state store hw:Analog $ alsactl --no-ucm -I -f /tmp/asound.state restore hw:Analog alsactl: set_control:1475: Cannot write control '2:0:0:ALC Capture Target Volume:0' : Invalid argument
According to ES8316 datasheet, the register at address 0x2B, which is related to the above mixer control, contains by default the value 0xB0. Considering the corresponding ALC target bits (ALCLVL) are 7:4, the control is initialized with 11, which is one step above the maximum value allowed by the driver:
ALCLVL | dB gain
-------+--------
0000 | -16.5 0001 | -15.0 0010 | -13.5 .... | ..... 0111 | -6.0 1000 | -4.5 1001 | -3.0 1010 | -1.5 .... | ..... 1111 | -1.5
The tests performed using the VU meter feature (--vumeter=TYPE) of arecord/aplay confirm the specs are correct and there is no measured gain if the 1011-1111 range would have been mapped to 0 dB:
dB gain | VU meter %
--------+-----------
-6.0 | 30-31
-4.5 | 35-36
-3.0 | 42-43
-1.5 | 50-51
0.0 | 50-51Increment the max value allowed for ALC Capture Target Volume control, so that it matches the hardware default. Additionally, update the related TLV to prevent an artificial extension of the dB gain range.
--- sound/soc/codecs/es8316.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/soc/codecs/es8316.c +7 -2
@@ -52,7 +52,12 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(dac_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(adc_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_max_gain_tlv, -650, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_min_gain_tlv, -1200, 150, 0); -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_target_tlv, -1650, 150, 0); + +static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(alc_target_tlv, +0 ,10 ,TLV_DB_SCALE_ITEM (-1650 ,150 ,0 ), + 11, 11, TLV_DB_SCALE_ITEM(-150, 0, 0), +); + static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv,0 ,4 ,TLV_DB_SCALE_ITEM (-1200 ,150 ,0 ), 8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0),
@@ -115,7 +120,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = { alc_max_gain_tlv),SOC_SINGLE_TLV ("ALC Capture Min Volume" ,ES8316_ADC_ALC2 ,0 ,28 ,0 , alc_min_gain_tlv), -SOC_SINGLE_TLV ("ALC Capture Target Volume" ,ES8316_ADC_ALC3 ,4 ,10 ,0 , +SOC_SINGLE_TLV ("ALC Capture Target Volume" ,ES8316_ADC_ALC3 ,4 ,11 ,0 , alc_target_tlv),SOC_SINGLE ("ALC Capture Hold Time" ,ES8316_ADC_ALC3 ,0 ,10 ,0 ), SOC_SINGLE("ALC Capture Decay Time", ES8316_ADC_ALC4, 4, 10, 0),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 130/509 ASoC: es8316: Do not set rate constraints for unsupported MCLKs
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 60413129ee2b38a80347489270af7f6e1c1de4d0 ]
When using the codec through the generic audio graph card, there are at least two calls of es8316_set_dai_sysclk(), with the effect of limiting the allowed sample rates according to the MCLK/LRCK ratios supported by the codec:
1. During audio card setup, to set the initial MCLK - see asoc_simple_init_dai().
2. Before opening a stream, to update MCLK, according to the stream sample rate and the multiplication factor - see asoc_simple_hw_params().
In some cases the initial MCLK might be set to a frequency that doesn't match any of the supported ratios, e.g. 12287999 instead of 12288000, which is only 1 Hz below the supported clock, as that is what the hardware reports. This creates an empty list of rate constraints, which is further passed to snd_pcm_hw_constraint_list() via es8316_pcm_startup(), and causes the following error on the very first access of the sound card:
$ speaker-test -D hw:Analog,0 -F S16_LE -c 2 -t wav Broken configuration for playback: no configurations available: Invalid argument Setting of hwparams failed: Invalid argument
Note that all subsequent retries succeed thanks to the updated MCLK set at point 2 above, which uses a computed frequency value instead of a reading from the hardware registers. Normally this would have mitigated the issue, but es8316_pcm_startup() executes before the 2nd call to es8316_set_dai_sysclk(), hence it cannot make use of the updated constraints.
Since es8316_pcm_hw_params() performs anyway a final validation of MCLK against the stream sample rate and the supported MCLK/LRCK ratios, fix the issue by ensuring that sysclk_constraints list is only set when at least one supported sample rate is autodetected by the codec.
--- sound/soc/codecs/es8316.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
sound/soc/codecs/es8316.c +7 -7
@@ -369,13 +369,11 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai,int count =0 ; es8316->sysclk = freq; + es8316->sysclk_constraints.list =NULL ; + es8316->sysclk_constraints.count =0 ; -if (freq ==0 ) { - es8316->sysclk_constraints.list =NULL ; - es8316->sysclk_constraints.count =0 ; - +if (freq ==0 )return 0 ; - } ret =clk_set_rate (es8316->mclk, freq);if (ret)
@@ -391,8 +389,10 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai, es8316->allowed_rates[count++] = freq / ratio; } - es8316->sysclk_constraints.list = es8316->allowed_rates; - es8316->sysclk_constraints.count = count; +if (count) { + es8316->sysclk_constraints.list = es8316->allowed_rates; + es8316->sysclk_constraints.count = count; + }return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 131/509 ARM: dts: meson8: correct uart_B and uart_C clock references
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 98b503c7fb13a17a47d8ebf15fa8f7c10118e75c ]
On Meson8 uart_B and uart_C do not work, because they are relying on incorrect clocks. Change the references of pclk to the correct CLKID (UART1 for uart_B and UART2 for uart_C), to allow use of the two uarts.
This was originally reported by Hans-Frieder Vogt for Meson8b [0], but the same bug is also present in meson8.dtsi
--- arch/arm/boot/dts/meson8.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/meson8.dtsi +2 -2
@@ -611,13 +611,13 @@ &uart_A { &uart_B { compatible = "amlogic,meson8-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; }; &uart_C { compatible = "amlogic,meson8-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 132/509 soc/fsl/qe: fix usb.c build errors
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7b1a78babd0d2cd27aa07255dee0c2d7ac0f31e3 ]
Fix build errors in soc/fsl/qe/usb.c when QUICC_ENGINE is not set. This happens when PPC_EP88XC is set, which selects CPM1 & CPM. When CPM is set, USB_FSL_QE can be set without QUICC_ENGINE being set. When USB_FSL_QE is set, QE_USB deafults to y, which causes build errors when QUICC_ENGINE is not set. Making QE_USB depend on QUICC_ENGINE prevents QE_USB from defaulting to y.
Fixes these build errors:
drivers/soc/fsl/qe/usb.o: in function `qe_usb_clock_set':
usb.c:(.text+0x1e): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0x2a): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0xbc): undefined reference to `qe_setbrg'
powerpc-linux-ld: usb.c:(.text+0xca): undefined reference to `cmxgcr_lock'
powerpc-linux-ld: usb.c:(.text+0xce): undefined reference to `cmxgcr_lock'
--- drivers/soc/fsl/qe/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/soc/fsl/qe/Kconfig +1 -0
@@ -39,6 +39,7 @@ config QE_TDM config QE_USB bool + depends on QUICC_ENGINE default y if USB_FSL_QE help QE USB Controller support
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 133/509 IB/hfi1: Use bitmap_zalloc() when applicable
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit f86dbc9fc5d83384eae7eda0de17f823e8c81ca0 ]
Use 'bitmap_zalloc()' to simplify code, improve the semantic and avoid some open-coded arithmetic in allocator arguments.
Also change the corresponding 'kfree()' into 'bitmap_free()' to keep consistency.
Stable-dep-of: c9358de193ec ("IB/hfi1: Fix wrong mmu_node used for user SDMA packet after invalidate")
--- drivers/infiniband/hw/hfi1/user_sdma.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/infiniband/hw/hfi1/user_sdma.c +3 -5
@@ -202,9 +202,7 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt,if (!pq->reqs) goto pq_reqs_nomem; - pq->req_in_use =kcalloc (BITS_TO_LONGS (hfi1_sdma_comp_ring_size), -sizeof (*pq->req_in_use), -GFP_KERNEL ); + pq->req_in_use =bitmap_zalloc (hfi1_sdma_comp_ring_size,GFP_KERNEL );if (!pq->req_in_use) goto pq_reqs_no_in_use;
@@ -251,7 +249,7 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, cq_nomem:kmem_cache_destroy (pq->txreq_cache); pq_txreq_nomem: -kfree (pq->req_in_use); +bitmap_free (pq->req_in_use); pq_reqs_no_in_use:kfree (pq->reqs); pq_reqs_nomem:
@@ -298,7 +296,7 @@ int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd, pq->wait, !atomic_read(&pq->n_reqs));kfree (pq->reqs); -kfree (pq->req_in_use); +bitmap_free (pq->req_in_use);kmem_cache_destroy (pq->txreq_cache);flush_pq_iowait (pq);kfree (pq);
Signature · 1 line
2.39.2