6.1.9-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 1/313 memory: tegra: Remove clients SID override programming
In reply to Greg Kroah-HartmanFrom: Ashish Mhetre <[email protected]>
[ Upstream commit ef86b2c2807f41c045e5534d8513a8b83f63bc39 ]
On newer Tegra releases, early boot SID override programming and SID override programming during resume is handled by bootloader. In the function tegra186_mc_program_sid() which is getting removed, SID override register of all clients is written without checking if secure firmware has allowed write on it or not. If write is disabled by secure firmware then it can lead to errors coming from secure firmware and hang in kernel boot.
Also, SID override is programmed on-demand during probe_finalize() call of IOMMU which is done in tegra186_mc_client_sid_override() in this same file. This function does it correctly by checking if write is permitted on SID override register. It also checks if SID override register is already written with correct value and skips re-writing it in that case.
--- drivers/memory/tegra/tegra186.c | 36 --------------------------------- 1 file changed, 36 deletions(-)
drivers/memory/tegra/tegra186.c +0 -36
@@ -22,32 +22,6 @@#define MC_SID_STREAMID_SECURITY_WRITE_ACCESS_DISABLED BIT(16)#define MC_SID_STREAMID_SECURITY_OVERRIDE BIT(8) -static void tegra186_mc_program_sid (struct tegra_mc *mc) -{ -unsigned int i; - -for (i =0 ; i < mc->soc->num_clients; i++) { -const struct tegra_mc_client *client = &mc->soc->clients[i]; -u32 override, security; - - override =readl (mc->regs + client->regs.sid.override); - security =readl (mc->regs + client->regs.sid.security); - -dev_dbg (mc->dev,"client %s: override: %x security: %x\n" , - client->name, override, security); - -dev_dbg (mc->dev,"setting SID %u for %s\n" , client->sid, - client->name); -writel (client->sid, mc->regs + client->regs.sid.override); - - override =readl (mc->regs + client->regs.sid.override); - security =readl (mc->regs + client->regs.sid.security); - -dev_dbg (mc->dev,"client %s: override: %x security: %x\n" , - client->name, override, security); - } -} -static int tegra186_mc_probe (struct tegra_mc *mc) {struct platform_device *pdev =to_platform_device (mc->dev);
@@ -85,8 +59,6 @@ static int tegra186_mc_probe(struct tegra_mc *mc)if (err <0 )return err; -tegra186_mc_program_sid (mc); -return 0 ; }
@@ -95,13 +67,6 @@ static void tegra186_mc_remove(struct tegra_mc *mc)of_platform_depopulate (mc->dev); } -static int tegra186_mc_resume (struct tegra_mc *mc) -{ -tegra186_mc_program_sid (mc); - -return 0 ; -} -#if IS_ENABLED (CONFIG_IOMMU_API ) static void tegra186_mc_client_sid_override(struct tegra_mc *mc, const struct tegra_mc_client *client,
@@ -173,7 +138,6 @@ static int tegra186_mc_probe_device(struct tegra_mc *mc, struct device *dev)const struct tegra_mc_ops tegra186_mc_ops = { .probe = tegra186_mc_probe, .remove = tegra186_mc_remove, - .resume = tegra186_mc_resume, .probe_device = tegra186_mc_probe_device, .handle_irq = tegra30_mc_handle_irq, };
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 2/313 memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit 340cb392a038cf70540a4cdf2e98a247c66b6df4 ]
The clk_disable_unprepare() should be called in the error handling of caps->has_mpddr_clk, fix it by replacing devm_clk_get and clk_prepare_enable by devm_clk_get_enabled.
--- drivers/memory/atmel-sdramc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/memory/atmel-sdramc.c +2 -4
@@ -47,19 +47,17 @@ static int atmel_ramc_probe(struct platform_device *pdev) caps =of_device_get_match_data (&pdev->dev);if (caps->has_ddrck) { - clk =devm_clk_get (&pdev->dev,"ddrck" ); + clk =devm_clk_get_enabled (&pdev->dev,"ddrck" );if (IS_ERR (clk))return PTR_ERR (clk); -clk_prepare_enable (clk); }if (caps->has_mpddr_clk) { - clk =devm_clk_get (&pdev->dev,"mpddr" ); + clk =devm_clk_get_enabled (&pdev->dev,"mpddr" );if (IS_ERR (clk)) {pr_err ("AT91 RAMC: couldn't get mpddr clock\n" );return PTR_ERR (clk); } -clk_prepare_enable (clk); }return 0 ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 3/313 memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe()
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit cb8fd6f75775165390ededea8799b60d93d9fe3e ]
The clk_disable_unprepare() should be called in the error handling of devbus_get_timing_params() and of_platform_populate(), fix it by replacing devm_clk_get and clk_prepare_enable by devm_clk_get_enabled.
--- drivers/memory/mvebu-devbus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/memory/mvebu-devbus.c +1 -2
@@ -280,10 +280,9 @@ static int mvebu_devbus_probe(struct platform_device *pdev)if (IS_ERR (devbus->base))return PTR_ERR (devbus->base); - clk =devm_clk_get (&pdev->dev,NULL ); + clk =devm_clk_get_enabled (&pdev->dev,NULL );if (IS_ERR (clk))return PTR_ERR (clk); -clk_prepare_enable (clk);/* * Obtain clock period in picoseconds,
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainercover 6.1.9-rc1 review
This is the start of the stable review cycle for the 6.1.9 release. There are 313 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 01 Feb 2023 13:42:39 +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/v6.x/stable-review/patch-6.1.9-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-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.1.9-rc1
Colin Ian King <[email protected]>
perf/x86/amd: fix potential integer overflow on shift of a int
Sriram Yagnaraman <[email protected]>
netfilter: conntrack: unify established states for SCTP paths
Fabrizio Castro <[email protected]>
dt-bindings: i2c: renesas,rzv2m: Fix SoC specific string
Thomas Gleixner <[email protected]>
x86/i8259: Mark legacy PIC interrupts with IRQ_LEVEL
Conor Dooley <[email protected]>
dt-bindings: riscv: fix single letter canonical order
Conor Dooley <[email protected]>
dt-bindings: riscv: fix underscore requirement for multi-letter extensions
Juergen Gross <[email protected]>
acpi: Fix suspend with Xen PV
Nikunj A Dadhania <[email protected]>
x86/sev: Add SEV-SNP guest feature negotiation support
Werner Sembach <[email protected]>
Input: i8042 - add Clevo PCX0DX to i8042 quirk table
Dmitry Torokhov <[email protected]>
Revert "Input: synaptics - switch touchpad on HP Laptop 15-da3001TU to RMI mode"
Vlastimil Babka <[email protected]>
Revert "mm/compaction: fix set skip in fast_find_migrateblock"
Linus Torvalds <[email protected]>
Fix up more non-executable files marked executable
Ivo Borisov Shopov <[email protected]>
tools: gpio: fix -c option of gpio-event-mon
Linus Torvalds <[email protected]>
treewide: fix up files incorrectly marked executable
Ming Lei <[email protected]>
block: ublk: move ublk_chr_class destroying after devices are removed
Robin Murphy <[email protected]>
Partially revert "perf/arm-cmn: Optimise DTC counter accesses"
Jerome Brunet <[email protected]>
net: mdio-mux-meson-g12a: force internal PHY off on mux switch
Gerhard Engleder <[email protected]>
tsnep: Fix TX queue stop/wake for multiple queues
David Christensen <[email protected]>
net/tg3: resolve deadlock in tg3_reset_task() during EEH
Ley Foon Tan <[email protected]>
riscv: Move call to init_cpu_topology() to later initialization stage
Rafael J. Wysocki <[email protected]>
thermal: intel: int340x: Add locking to int340x_thermal_get_trip_type()
Jeremy Kerr <[email protected]>
net: mctp: mark socks as dead on unhash, prevent re-add
Paolo Abeni <[email protected]>
net: mctp: hold key reference when looking up a general key
Jeremy Kerr <[email protected]>
net: mctp: move expiry timer delete to unhash
Jeremy Kerr <[email protected]>
net: mctp: add an explicit reference from a mctp_sk_key to sock
Yoshihiro Shimoda <[email protected]>
net: ravb: Fix possible hang if RIS2_QFF1 happen
Yoshihiro Shimoda <[email protected]>
net: ravb: Fix lack of register setting after system resumed for Gen3
Nikita Shubin <[email protected]>
gpio: ep93xx: Fix port F hwirq numbers in handler
Dan Carpenter <[email protected]>
gpio: mxc: Unlock on error path in mxc_flip_edge()
Keith Busch <[email protected]>
nvme: fix passthrough csi check
Liao Chang <[email protected]>
riscv/kprobe: Fix instruction simulation of JALR
Marcelo Ricardo Leitner <[email protected]>
sctp: fail if no bound addresses can be used for a given scope
Eric Dumazet <[email protected]>
net/sched: sch_taprio: do not schedule in taprio_reset()
Chuang Wang <[email protected]>
tracing/osnoise: Use built-in RCU list checking
Hans de Goede <[email protected]>
ACPI: video: Fix apple gmux detection
Hans de Goede <[email protected]>
platform/x86: apple-gmux: Add apple_gmux_detect() helper
Hans de Goede <[email protected]>
platform/x86: apple-gmux: Move port defines to apple-gmux.h
Hans de Goede <[email protected]>
platform/x86: asus-wmi: Fix kbd_dock_devid tablet-switch reporting
Kuniyuki Iwashima <[email protected]>
netrom: Fix use-after-free of a listening socket.
Sriram Yagnaraman <[email protected]>
netfilter: conntrack: fix bug in for_each_sctp_chunk
Sriram Yagnaraman <[email protected]>
netfilter: conntrack: fix vtag checks for ABORT/SHUTDOWN_COMPLETE
Alexandru Tachici <[email protected]>
net: ethernet: adi: adin1110: Fix multicast offloading
Ahmad Fatoum <[email protected]>
net: dsa: microchip: fix probe of I2C-connected KSZ8563
Eric Dumazet <[email protected]>
ipv4: prevent potential spectre v1 gadget in fib_metrics_match()
Eric Dumazet <[email protected]>
ipv4: prevent potential spectre v1 gadget in ip_metrics_convert()
Eric Dumazet <[email protected]>
netlink: annotate data races around sk_state
Eric Dumazet <[email protected]>
netlink: annotate data races around dst_portid and dst_group
Eric Dumazet <[email protected]>
netlink: annotate data races around nlk->portid
Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_rbtree: skip elements in transaction from garbage collection
Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_rbtree: Switch to node list walk for overlap detection
Hans de Goede <[email protected]>
ACPI: video: Add backlight=native DMI quirk for Asus U46E
Hans de Goede <[email protected]>
ACPI: video: Add backlight=native DMI quirk for HP EliteBook 8460p
Hans de Goede <[email protected]>
ACPI: video: Add backlight=native DMI quirk for HP Pavilion g6-1d80nr
Arnd Bergmann <[email protected]>
drm/i915/selftest: fix intel_selftest_modify_policy argument types
Ross Lagerwall <[email protected]>
nvme-fc: fix initialization order
Christoph Hellwig <[email protected]>
nvme: consolidate setting the tagset flags
Christoph Hellwig <[email protected]>
nvme: simplify transport specific device attribute handling
Wei Fang <[email protected]>
net: fec: Use page_pool_put_full_page when freeing rx buffers
Paolo Abeni <[email protected]>
net: fix UaF in netns ops registration error path
Eric Dumazet <[email protected]>
netlink: prevent potential spectre v1 gadgets
Stefan Assmann <[email protected]>
iavf: schedule watchdog immediately when changing primary MAC
Michal Schmidt <[email protected]>
iavf: fix temporary deadlock and failure to set MAC address
Nirmoy Das <[email protected]>
drm/i915: Fix a memory leak with reused mmap_offset
Nirmoy Das <[email protected]>
drm/drm_vma_manager: Add drm_vma_node_allow_once()
Richard Fitzgerald <[email protected]>
i2c: designware: Fix unbalanced suspended flag
Lareine Khawaly <[email protected]>
i2c: designware: use casting of u64 in clock multiplication to avoid overflow
Dylan Yudaken <[email protected]>
io_uring: always prep_async for drain requests
Haiyang Zhang <[email protected]>
net: mana: Fix IRQ name - add PCI and queue number
Pavel Begunkov <[email protected]>
io_uring: inline __io_req_complete_put()
Pavel Begunkov <[email protected]>
io_uring: remove io_req_tw_post_queue
Pavel Begunkov <[email protected]>
io_uring: use io_req_task_complete() in timeout
Pavel Begunkov <[email protected]>
io_uring: hold locks for io_req_complete_failed
Pavel Begunkov <[email protected]>
io_uring: inline __io_req_complete_post()
Pavel Begunkov <[email protected]>
io_uring: inline io_req_task_work_add()
Wayne Lin <[email protected]>
drm/amdgpu/display/mst: update mst_mgr relevant variable when long HPD
Wayne Lin <[email protected]>
drm/amdgpu/display/mst: limit payload to be updated one by one
Lyude Paul <[email protected]>
drm/amdgpu/display/mst: Fix mst_state->pbn_div and slot count assignments
Jonathan Kim <[email protected]>
drm/amdgpu: remove unconditional trap enable on add gfx11 queues
Evan Quan <[email protected]>
drm/amd/pm: add missing AllowIHInterrupt message mapping for SMU13.0.0
Wayne Lin <[email protected]>
drm/display/dp_mst: Correct the kref of port.
Mark Pearson <[email protected]>
platform/x86: thinkpad_acpi: Fix profile modes on Intel platforms
Manivannan Sadhasivam <[email protected]>
EDAC/qcom: Do not pass llcc_driv_data as edac_device_ctl_info's pvt_info
Manivannan Sadhasivam <[email protected]>
EDAC/device: Respect any driver-supplied workqueue polling value
Giulio Benetti <[email protected]>
ARM: 9280/1: mm: fix warning on phys_addr_t to void pointer assignment
Gergely Risko <[email protected]>
ipv6: fix reachability confirmation with proxy_ndp
Krzysztof Kozlowski <[email protected]>
regulator: dt-bindings: samsung,s2mps14: add lost samsung,ext-control-gpios
Srinivas Pandruvada <[email protected]>
thermal: intel: int340x: Protect trip temperature from concurrent updates
Masahiro Yamada <[email protected]>
riscv: fix -Wundef warning for CONFIG_RISCV_BOOT_SPINWAIT
Johan Hovold <[email protected]>
scsi: ufs: core: Fix devfreq deadlocks
Marc Zyngier <[email protected]>
KVM: arm64: GICv4.1: Fix race with doorbell on VPE activation/deactivation
Hendrik Borghorst <[email protected]>
KVM: x86/vmx: Do not skip segment attributes if unusable bit is set
Jens Axboe <[email protected]>
io_uring/net: cache provided buffer group value for multishot receives
Miklos Szeredi <[email protected]>
ovl: fail on invalid uid/gid mapping at copy up
Miklos Szeredi <[email protected]>
ovl: fix tmpfile leak
Namjae Jeon <[email protected]>
ksmbd: limit pdu length size according to connection status
Namjae Jeon <[email protected]>
ksmbd: downgrade ndr version error message to debug
Marios Makassikis <[email protected]>
ksmbd: do not sign response to session request for guest login
Namjae Jeon <[email protected]>
ksmbd: add max connections parameter
David Howells <[email protected]>
cifs: Fix oops due to uncleared server->smbd_conn in reconnect
Steven Rostedt (Google) <[email protected]>
ftrace/scripts: Update the instructions for ftrace-bisect.sh
Natalia Petrova <[email protected]>
trace_events_hist: add check for return value of 'create_hist_field'
Steven Rostedt (Google) <[email protected]>
tracing: Make sure trace_printk() can output as soon as it can be used
Mark Rutland <[email protected]>
ftrace: Export ftrace_free_filter() to modules
Petr Pavlu <[email protected]>
module: Don't wait for GOING modules
Jeff Layton <[email protected]>
nfsd: don't free files unconditionally in __nfsd_file_cache_purge
Yi Liu <[email protected]>
kvm/vfio: Fix potential deadlock on vfio group_lock
Alexey V. Vissarionov <[email protected]>
scsi: hpsa: Fix allocation size for scsi_host_alloc()
Niklas Schnelle <[email protected]>
vfio/type1: Respect IOMMU reserved regions in vfio_test_domain_fgsp()
Qais Yousef <[email protected]>
sched/uclamp: Fix a uninitialized variable warnings
Pierre Gondois <[email protected]>
sched/fair: Check if prev_cpu has highest spare cap in feec()
Alexander Wetzel <[email protected]>
wifi: mac80211: Fix iTXQ AMPDU fragmentation handling
Alexander Wetzel <[email protected]>
wifi: mac80211: Proper mark iTXQs for resumption
Pavel Begunkov <[email protected]>
io_uring/msg_ring: fix remote queue to disabled ring
Harsh Jain <[email protected]>
drm/amdgpu: complete gfxoff allow signal during suspend without delay
Ville Syrjälä <[email protected]>
drm/i915: Allow alternate fixed modes always for eDP
Ville Syrjälä <[email protected]>
drm/i915: Allow panel fixed modes to have differing sync polarities
Archie Pusaka <[email protected]>
Bluetooth: hci_sync: cancel cmd_timer if hci_open failed
Ard Biesheuvel <[email protected]>
arm64: efi: Account for the EFI runtime stack in stack unwinder
Ard Biesheuvel <[email protected]>
arm64: efi: Avoid workqueue to check whether EFI runtime is live
Ard Biesheuvel <[email protected]>
arm64: efi: Recover from synchronous exceptions occurring in firmware
Sasha Levin <[email protected]>
Revert "selftests/bpf: check null propagation only neither reg is PTR_TO_BTF_ID"
Naohiro Aota <[email protected]>
btrfs: zoned: enable metadata over-commit for non-ZNS setup
Kees Cook <[email protected]>
firmware: coreboot: Check size of table entry and use flex-array
Peter Foley <[email protected]>
ata: pata_cs5535: Don't build on UML
Mateusz Guzik <[email protected]>
lockref: stop doing cpu_relax in the cmpxchg loop
Henning Schild <[email protected]>
platform/x86: simatic-ipc: add another model
Henning Schild <[email protected]>
platform/x86: simatic-ipc: correct name of a model
Thomas Weißschuh <[email protected]>
platform/x86: asus-wmi: Ignore fan on E410MA
Thomas Weißschuh <[email protected]>
platform/x86: asus-wmi: Add quirk wmi_ignore_fan
Hans de Goede <[email protected]>
platform/x86: asus-nb-wmi: Add alternate mapping for KEY_SCREENLOCK
Thomas Weißschuh <[email protected]>
platform/x86: asus-nb-wmi: Add alternate mapping for KEY_CAMERA
Michael Klein <[email protected]>
platform/x86: touchscreen_dmi: Add info for the CSL Panther Tab HD
Andre Przywara <[email protected]>
r8152: add vendor/device ID pair for Microsoft Devkit
Yihang Li <[email protected]>
scsi: hisi_sas: Set a port invalid only if there are no devices attached when refreshing port id
Xingui Yang <[email protected]>
scsi: hisi_sas: Use abort task set to reset SAS disks when discovered
Heiko Carstens <[email protected]>
KVM: s390: interrupt: use READ_ONCE() before cmpxchg()
Bartosz Golaszewski <[email protected]>
spi: spidev: remove debug messages that access spidev->spi without locking
Paulo Alcantara <[email protected]>
cifs: fix potential memory leaks in session setup
Eric Huang <[email protected]>
drm/amdkfd: Fix NULL pointer error for GC 11.0.1 on mGPU
Eric Huang <[email protected]>
drm/amdkfd: Add sync after creating vram bo
Tamim Khan <[email protected]>
ACPI: resource: Skip IRQ override on Asus Expertbook B2402CBA
Mark Brown <[email protected]>
ASoC: fsl-asoc-card: Fix naming of AC'97 CODEC widgets
Mark Brown <[email protected]>
ASoC: fsl_ssi: Rename AC'97 streams to avoid collisions with AC'97 CODEC
Miles Chen <[email protected]>
cpufreq: armada-37xx: stop using 0 as NULL pointer
Willy Tarreau <[email protected]>
tools/nolibc: prevent gcc from making memset() loop over itself
Willy Tarreau <[email protected]>
tools/nolibc: fix missing includes causing build issues at -O0
Warner Losh <[email protected]>
tools/nolibc: Fix S_ISxxx macros
Sven Schnelle <[email protected]>
nolibc: fix fd_set type
Kan Liang <[email protected]>
perf/x86/intel/uncore: Add Emerald Rapids
Kan Liang <[email protected]>
perf/x86/msr: Add Emerald Rapids
Kan Liang <[email protected]>
perf/x86/msr: Add Meteor Lake support
Kan Liang <[email protected]>
perf/x86/cstate: Add Meteor Lake support
Oleksii Moisieiev <[email protected]>
xen/pvcalls: free active map buffer on pvcalls_front_free_map
Alexander Gordeev <[email protected]>
s390: expicitly align _edata and _end symbols on page boundary
Niklas Schnelle <[email protected]>
s390/debug: add _ASM_S390_ prefix to header guard
Patrick Thompson <[email protected]>
drm: Add orientation quirk for Lenovo ideapad D330-10IGL
Hui Wang <[email protected]>
net: usb: cdc_ether: add support for Thales Cinterion PLS62-W modem
Akhil P Oommen <[email protected]>
drm/msm/a6xx: Avoid gx gbit halt during rpm suspend
Chancel Liu <[email protected]>
ASoC: fsl_micfil: Correct the number of steps on SX controls
Konrad Dybcio <[email protected]>
cpufreq: Add SM6375 to cpufreq-dt-platdev blocklist
Max Filippov <[email protected]>
kcsan: test: don't put the expect array on the stack
Mars Chen <[email protected]>
ASoC: support machine driver with max98360
Aniol Martí <[email protected]>
ASoC: amd: yc: Add ASUS M5402RA into DMI table
Allen-KH Cheng <[email protected]>
ASoC: mediatek: mt8186: Add machine support for max98357a
tongjian <[email protected]>
ASoC: mediatek: mt8186: support rt5682s_max98360
Sumit Gupta <[email protected]>
cpufreq: Add Tegra234 to cpufreq-dt-platdev blocklist
Pierre Gondois <[email protected]>
cpufreq: CPPC: Add u64 casts to avoid overflowing
Witold Sadowski <[email protected]>
spi: cadence: Fix busy cycles calculation
Wim Van Boven <[email protected]>
ASoC: amd: yc: Add Razer Blade 14 2022 into DMI table
Curtis Malainey <[email protected]>
ASoC: SOF: Add FW state to debugfs
Ranjani Sridharan <[email protected]>
ASoC: SOF: pm: Always tear down pipelines before DSP suspend
Ranjani Sridharan <[email protected]>
ASoC: SOF: pm: Set target state earlier
Wenchao Hao <[email protected]>
scsi: iscsi: Fix multiple iSCSI session unbind events sent to userspace
David Morley <[email protected]>
tcp: fix rate_app_limited to default to 1
Kees Cook <[email protected]>
bnxt: Do not read past the end of test names
Andrew Halaney <[email protected]>
net: stmmac: enable all safety features by default
Viresh Kumar <[email protected]>
thermal: core: call put_device() only after device_register() fails
Dan Carpenter <[email protected]>
thermal/core: fix error code in __thermal_cooling_device_register()
Viresh Kumar <[email protected]>
thermal: Validate new state in cur_state_store()
Rakesh Sankaranarayanan <[email protected]>
net: dsa: microchip: ksz9477: port map correction in ALU table entry register
Willem de Bruijn <[email protected]>
selftests/net: toeplitz: fix race on tpacket_v3 block close
Chen Zhongjin <[email protected]>
driver core: Fix test_async_probe_init saves device in wrong array
Yang Yingliang <[email protected]>
w1: fix WARNING after calling w1_process()
Yang Yingliang <[email protected]>
w1: fix deadloop in __w1_remove_master_device()
Yang Yingliang <[email protected]>
device property: fix of node refcount leak in fwnode_graph_get_next_endpoint()
Eric Pilmore <[email protected]>
ptdma: pt_core_execute_cmd() should use spinlock
Arnd Bergmann <[email protected]>
usb: dwc3: fix extcon dependency
Jason Xing <[email protected]>
tcp: avoid the lookup process failing to get sk in ehash table
Keith Busch <[email protected]>
nvme-pci: fix timeout request state check
Jakub Kicinski <[email protected]>
net: sched: gred: prevent races when adding offloads to stats
Hamza Mahfooz <[email protected]>
drm/amd/display: fix issues with driver unload
Geert Uytterhoeven <[email protected]>
phy: phy-can-transceiver: Skip warning if no "max-bitrate"
Akhil R <[email protected]>
dmaengine: tegra: Fix memory leak in terminate_all()
Liu Shixin <[email protected]>
dmaengine: xilinx_dma: call of_node_put() when breaking out of for_each_child_of_node()
Paulo Alcantara <[email protected]>
cifs: fix potential deadlock in cache_refresh_path()
Chris Wilson <[email protected]>
drm/i915/selftests: Unwind hugepages to drop wakeref on error
Pietro Borrello <[email protected]>
HID: betop: check shape of output reports
Eric Dumazet <[email protected]>
l2tp: prevent lockdep issue in l2tp_tunnel_register()
Jason Wang <[email protected]>
virtio-net: correctly enable callback during start_xmit
Robert Hancock <[email protected]>
net: macb: fix PTP TX timestamp failure due to packet padding
Koba Ko <[email protected]>
dmaengine: Fix double increment of client_count in dma_chan_get()
Arnd Bergmann <[email protected]>
drm/panfrost: fix GENERIC_ATOMIC64 dependency
Randy Dunlap <[email protected]>
net: mlx5: eliminate anonymous module_init & module_exit
Chris Mi <[email protected]>
net/mlx5: E-switch, Fix switchdev mode after devlink reload
Chris Mi <[email protected]>
net/mlx5e: Set decap action based on attr for sample
Maor Dickman <[email protected]>
net/mlx5e: QoS, Fix wrongfully setting parent_element_id on MODIFY_SCHEDULING_ELEMENT
Maor Dickman <[email protected]>
net/mlx5: E-switch, Fix setting of reserved fields on MODIFY_SCHEDULING_ELEMENT
Vlad Buslov <[email protected]>
net/mlx5e: Avoid false lock dependency warning on tc_ht even more
Caleb Connolly <[email protected]>
net: ipa: disable ipa interrupt during suspend
Ying Hsu <[email protected]>
Bluetooth: Fix possible deadlock in rfcomm_sk_state_change
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_event: Fix Invalid wait context
Luiz Augusto von Dentz <[email protected]>
Bluetooth: ISO: Fix possible circular locking dependency
Luiz Augusto von Dentz <[email protected]>
Bluetooth: ISO: Avoid circular locking dependency
Zhengchao Shao <[email protected]>
Bluetooth: hci_sync: fix memory leak in hci_update_adv_data()
Zhengchao Shao <[email protected]>
Bluetooth: hci_conn: Fix memory leaks
Harshit Mogalapalli <[email protected]>
Bluetooth: Fix a buffer overflow in mgmt_mesh_add()
Florian Westphal <[email protected]>
netfilter: conntrack: handle tcp challenge acks during connection reuse
Udipto Goswami <[email protected]>
usb: gadget: f_fs: Ensure ep0req is dequeued before free_request
Udipto Goswami <[email protected]>
usb: gadget: f_fs: Prevent race during ffs_ep0_queue_wait
Jack Pham <[email protected]>
usb: ucsi: Ensure connector delayed work items are flushed
Guoqing Jiang <[email protected]>
block/rnbd-clt: fix wrong max ID in ida_alloc_max
Jiri Kosina <[email protected]>
HID: revert CHERRY_MOUSE_000C quirk
Patrice Chotard <[email protected]>
ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp151a-prtt1l
Patrice Chotard <[email protected]>
ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp157c-emstamp-argon
Patrice Chotard <[email protected]>
ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcom-som
Patrice Chotard <[email protected]>
ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcor-som
Jonas Karlman <[email protected]>
pinctrl: rockchip: fix mux route data for rk3568
Heiner Kallweit <[email protected]>
net: stmmac: fix invalid call to mdiobus_get_phy()
Pietro Borrello <[email protected]>
HID: check empty report_list in bigben_probe()
Pietro Borrello <[email protected]>
HID: check empty report_list in hid_validate_values()
Heiner Kallweit <[email protected]>
net: mdio: validate parameter addr in mdiobus_get_phy()
Szymon Heidrich <[email protected]>
net: usb: sr9700: Handle negative len
Cong Wang <[email protected]>
l2tp: close all race conditions in l2tp_tunnel_register()
Cong Wang <[email protected]>
l2tp: convert l2tp_tunnel_list to idr
Eric Dumazet <[email protected]>
net/sched: sch_taprio: fix possible use-after-free
Kurt Kanzenbach <[email protected]>
net: stmmac: Fix queue statistics reading
Jonas Karlman <[email protected]>
pinctrl: rockchip: fix reading pull type on rk3568
Szymon Heidrich <[email protected]>
wifi: rndis_wlan: Prevent buffer overflow in rndis_query_oid
Marek Vasut <[email protected]>
gpio: mxc: Always set GPIOs used as interrupt source to INPUT mode
Marek Vasut <[email protected]>
gpio: mxc: Protect GPIO irqchip RMW with bgpio spinlock
Rahul Rameshbabu <[email protected]>
sch_htb: Avoid grafting on htb_destroy_class_offload when destroying htb
Clément Léger <[email protected]>
net: lan966x: add missing fwnode_handle_put() for ports node
Vladimir Oltean <[email protected]>
net: enetc: avoid deadlock in enetc_tx_onestep_tstamp()
Esina Ekaterina <[email protected]>
net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs
Jisoo Jang <[email protected]>
net: nfc: Fix use-after-free in local_cleanup()
Shang XiaoJing <[email protected]>
phy: rockchip-inno-usb2: Fix missing clk_disable_unprepare() in rockchip_usb2phy_power_on()
Maxime Ripard <[email protected]>
drm/vc4: bo: Fix unused variable warning
Luis Gerhorst <[email protected]>
bpf: Fix pointer-leak due to insufficient speculative store bypass mitigation
Raju Rangoju <[email protected]>
amd-xgbe: Delay AN timeout during KR training
Raju Rangoju <[email protected]>
amd-xgbe: TX Flow Ctrl Registers are h/w ver dependent
Tonghao Zhang <[email protected]>
bpf: hash map, avoid deadlock with suitable hash mask
Shang XiaoJing <[email protected]>
phy: usb: sunplus: Fix potential null-ptr-deref in sp_usb_phy_probe()
Maxime Ripard <[email protected]>
drm/vc4: bo: Fix drmm_mutex_init memory hog
Claudiu Beznea <[email protected]>
ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60
Xingyuan Mo <[email protected]>
NFSD: fix use-after-free in nfsd4_ssc_setup_dul()
Rob Clark <[email protected]>
drm/msm/gpu: Fix potential double-free
Randy Dunlap <[email protected]>
phy: ti: fix Kconfig warning and operator precedence
Masahiro Yamada <[email protected]>
kbuild: fix 'make modules' error when CONFIG_DEBUG_INFO_BTF_MODULES=y
Masahiro Yamada <[email protected]>
kbuild: export top-level LDFLAGS_vmlinux only to scripts/Makefile.vmlinux
Konrad Dybcio <[email protected]>
arm64: dts: qcom: msm8992-libra: Fix the memory map
Konrad Dybcio <[email protected]>
arm64: dts: qcom: msm8992: Don't use sfpb mutex
Christophe JAILLET <[email protected]>
PM: AVS: qcom-cpr: Fix an error handling path in cpr_probe()
Alexander Potapenko <[email protected]>
affs: initialize fsdata in affs_truncate()
Dean Luick <[email protected]>
IB/hfi1: Remove user expected buffer invalidate race
Dean Luick <[email protected]>
IB/hfi1: Immediately remove invalid memory from hardware
Dean Luick <[email protected]>
IB/hfi1: Fix expected receive setup error exit issues
Dean Luick <[email protected]>
IB/hfi1: Reserve user expected TIDs
Dean Luick <[email protected]>
IB/hfi1: Reject a zero-length user expected buffer
Yonatan Nachum <[email protected]>
RDMA/core: Fix ib block iterator counter overflow
Chris Packham <[email protected]>
arm64: dts: marvell: AC5/AC5X: Fix address for UART1
Gao Xiang <[email protected]>
erofs: fix kvcalloc() misuse with __GFP_NOFAIL
Daisuke Matsuda <[email protected]>
RDMA/rxe: Prevent faulty rkey generation
Daisuke Matsuda <[email protected]>
RDMA/rxe: Fix inaccurate constants in rxe_type_info
Tejun Heo <[email protected]>
block: Drop spurious might_sleep() from blk_put_queue()
Christoph Hellwig <[email protected]>
block: mark blk_put_queue as potentially blocking
Christoph Hellwig <[email protected]>
block: untangle request_queue refcounting from sysfs
Christoph Hellwig <[email protected]>
block: fix error unwinding in blk_register_queue
Christoph Hellwig <[email protected]>
block: factor out a blk_debugfs_remove helper
Christoph Hellwig <[email protected]>
blk-crypto: pass a gendisk to blk_crypto_sysfs_{,un}register
Christoph Hellwig <[email protected]>
blk-mq: move the srcu_struct used for quiescing to the tagset
Masahiro Yamada <[email protected]>
tomoyo: fix broken dependency on *.conf.default
Basavaraj Natikar <[email protected]>
HID: amd_sfh: Fix warning unwind goto
Konrad Dybcio <[email protected]>
interconnect: qcom: msm8996: Fix regmap max_register values
Konrad Dybcio <[email protected]>
interconnect: qcom: msm8996: Provide UFS clocks to A2NoC
Cristian Marussi <[email protected]>
firmware: arm_scmi: Fix virtio channels cleanup on shutdown
Cristian Marussi <[email protected]>
firmware: arm_scmi: Harden shared memory access in fetch_notification
Cristian Marussi <[email protected]>
firmware: arm_scmi: Harden shared memory access in fetch_response
Miaoqian Lin <[email protected]>
EDAC/highbank: Fix memory leak in highbank_mc_probe()
Hui Tang <[email protected]>
reset: uniphier-glue: Fix possible null-ptr-deref
Randy Dunlap <[email protected]>
reset: ti-sci: honor TI_SCI_PROTOCOL setting when not COMPILE_TEST
Miaoqian Lin <[email protected]>
soc: imx8m: Fix incorrect check for of_clk_get_by_name()
Tim Harvey <[email protected]>
arm64: dts: imx8mm-venice-gw7901: fix USB2 controller OC polarity
Jiasheng Jiang <[email protected]>
HID: intel_ish-hid: Add check for ishtp_dma_tx_map
Marco Felsch <[email protected]>
arm64: dts: imx8mp-evk: pcie0-refclk cosmetic cleanup
Adam Ford <[email protected]>
arm64: dts: imx8mp: Fix power-domain typo
Adam Ford <[email protected]>
arm64: dts: imx8mp: Fix missing GPC Interrupt
Lucas Stach <[email protected]>
soc: imx: imx8mp-blk-ctrl: don't set power device name
Dario Binacchi <[email protected]>
ARM: imx: add missing of_node_put()
Haibo Chen <[email protected]>
arm64: dts: imx93-11x11-evk: correct clock and strobe pad setting
Emanuele Ghidoli <[email protected]>
arm64: dts: verdin-imx8mm: fix dev board audio playback
Adam Ford <[email protected]>
arm64: dts: imx8mm-beacon: Fix ecspi2 pinmux
Emanuele Ghidoli <[email protected]>
arm64: dts: verdin-imx8mm: fix dahlia audio playback
Fabio Estevam <[email protected]>
ARM: dts: imx6qdl-gw560x: Remove incorrect 'uart-has-rtscts'
Fabio Estevam <[email protected]>
ARM: dts: imx7d-pico: Use 'clock-frequency'
Fabio Estevam <[email protected]>
ARM: dts: imx6ul-pico-dwarf: Use 'clock-frequency'
Fabio Estevam <[email protected]>
arm64: dts: imx8mp-phycore-som: Remove invalid PMIC property
Lucas Stach <[email protected]>
soc: imx: imx8mp-blk-ctrl: enable global pixclk with HDMI_TX_PHY PD
Jayesh Choudhary <[email protected]>
dmaengine: ti: k3-udma: Do conditional decrement of UDMA_CHAN_RT_PEER_BCNT_REG
Vijaya Krishna Nivarthi <[email protected]>
dmaengine: qcom: gpi: Set link_rx bit on GO TRE for rx operation
Johan Hovold <[email protected]>
arm64: dts: qcom: sc8280xp: fix primary USB-DP PHY reset
Gaosheng Cui <[email protected]>
memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe()
Gaosheng Cui <[email protected]>
memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe()
Ashish Mhetre <[email protected]>
memory: tegra: Remove clients SID override programming
-------------
Diffstat:
.../devicetree/bindings/i2c/renesas,rzv2m.yaml | 4 +- .../bindings/regulator/samsung,s2mps14.yaml | 21 +- Documentation/devicetree/bindings/riscv/cpus.yaml | 2 +- .../devicetree/bindings/sound/everest,es8326.yaml | 0 Documentation/x86/amd-memory-encryption.rst | 36 +++ Makefile | 19 +- arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 1 - arch/arm/boot/dts/imx6ul-pico-dwarf.dts | 2 +- arch/arm/boot/dts/imx7d-pico-dwarf.dts | 4 +- arch/arm/boot/dts/imx7d-pico-nymph.dts | 4 +- arch/arm/boot/dts/sam9x60.dtsi | 2 +- arch/arm/boot/dts/stm32mp151a-prtt1l.dtsi | 8 +- arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 8 +- arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 8 +- arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 8 +- arch/arm/mach-imx/cpu-imx25.c | 1 + arch/arm/mach-imx/cpu-imx27.c | 1 + arch/arm/mach-imx/cpu-imx31.c | 1 + arch/arm/mach-imx/cpu-imx35.c | 1 + arch/arm/mach-imx/cpu-imx5.c | 1 + arch/arm/mm/nommu.c | 2 +- .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 4 +- .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 1 + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 1 + .../boot/dts/freescale/imx8mm-verdin-dev.dtsi | 1 + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 4 +- .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 10 - arch/arm64/boot/dts/freescale/imx8mp.dtsi | 3 +- arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 6 +- arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 77 +++-- arch/arm64/boot/dts/qcom/msm8992.dtsi | 4 - arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +- arch/arm64/include/asm/efi.h | 17 ++ arch/arm64/include/asm/stacktrace.h | 15 + arch/arm64/kernel/efi-rt-wrapper.S | 38 ++- arch/arm64/kernel/efi.c | 23 ++ arch/arm64/kernel/stacktrace.c | 12 + arch/arm64/kvm/vgic/vgic-v3.c | 25 +- arch/arm64/kvm/vgic/vgic-v4.c | 8 +- arch/arm64/kvm/vgic/vgic.h | 1 + arch/arm64/mm/fault.c | 4 + arch/riscv/kernel/head.S | 2 +- arch/riscv/kernel/probes/simulate-insn.c | 4 +- arch/riscv/kernel/smpboot.c | 3 +- arch/s390/include/asm/debug.h | 6 +- arch/s390/kernel/vmlinux.lds.S | 2 + arch/s390/kvm/interrupt.c | 12 +- arch/x86/boot/compressed/ident_map_64.c | 6 + arch/x86/boot/compressed/misc.h | 2 + arch/x86/boot/compressed/sev.c | 70 +++++ arch/x86/events/amd/core.c | 2 +- arch/x86/events/intel/cstate.c | 21 +- arch/x86/events/intel/uncore.c | 1 + arch/x86/events/msr.c | 3 + arch/x86/include/asm/acpi.h | 8 + arch/x86/include/asm/msr-index.h | 20 ++ arch/x86/include/uapi/asm/svm.h | 6 + arch/x86/kernel/i8259.c | 1 + arch/x86/kernel/irqinit.c | 4 +- arch/x86/kvm/vmx/vmx.c | 21 +- block/blk-core.c | 70 +++-- block/blk-crypto-internal.h | 10 +- block/blk-crypto-sysfs.c | 11 +- block/blk-ia-ranges.c | 3 +- block/blk-mq.c | 33 +- block/blk-mq.h | 14 +- block/blk-sysfs.c | 134 ++++----- block/blk.h | 13 +- block/bsg.c | 11 +- block/elevator.c | 2 +- block/genhd.c | 2 +- drivers/acpi/resource.c | 7 + drivers/acpi/sleep.c | 6 +- drivers/acpi/video_detect.c | 49 +-- drivers/ata/Kconfig | 1 + drivers/base/property.c | 18 +- drivers/base/test/test_async_driver_probe.c | 2 +- drivers/block/rnbd/rnbd-clt.c | 2 +- drivers/block/ublk_drv.c | 7 +- drivers/cpufreq/armada-37xx-cpufreq.c | 2 +- drivers/cpufreq/cppc_cpufreq.c | 11 +- drivers/cpufreq/cpufreq-dt-platdev.c | 2 + drivers/dma/dmaengine.c | 7 +- drivers/dma/ptdma/ptdma-dev.c | 7 +- drivers/dma/ptdma/ptdma.h | 2 +- drivers/dma/qcom/gpi.c | 1 + drivers/dma/tegra186-gpc-dma.c | 1 + drivers/dma/ti/k3-udma.c | 5 +- drivers/dma/xilinx/xilinx_dma.c | 4 +- drivers/edac/edac_device.c | 15 +- drivers/edac/highbank_mc_edac.c | 7 +- drivers/edac/qcom_edac.c | 5 +- drivers/firmware/arm_scmi/shmem.c | 9 +- drivers/firmware/arm_scmi/virtio.c | 7 +- drivers/firmware/efi/runtime-wrappers.c | 1 + drivers/firmware/google/coreboot_table.c | 9 +- drivers/firmware/google/coreboot_table.h | 1 + drivers/gpio/gpio-ep93xx.c | 2 +- drivers/gpio/gpio-mxc.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 10 +- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 1 - .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 9 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 51 +++- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 - drivers/gpu/drm/amd/display/dc/core/dc_link.c | 14 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 + drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 +- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + drivers/gpu/drm/drm_vma_manager.c | 76 +++-- drivers/gpu/drm/i915/display/intel_dp.c | 4 +- drivers/gpu/drm/i915/display/intel_panel.c | 7 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 +- .../drm/i915/selftests/intel_scheduler_helpers.c | 3 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 15 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 7 + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 + drivers/gpu/drm/msm/msm_gpu.c | 2 + drivers/gpu/drm/msm/msm_gpu.h | 12 +- drivers/gpu/drm/panfrost/Kconfig | 3 +- drivers/gpu/drm/vc4/vc4_bo.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_msg_arm64.h | 0 drivers/hid/amd-sfh-hid/amd_sfh_client.c | 2 +- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 2 +- drivers/hid/hid-betopff.c | 17 +- drivers/hid/hid-bigbenff.c | 5 + drivers/hid/hid-core.c | 4 +- drivers/hid/hid-ids.h | 1 - drivers/hid/hid-quirks.c | 1 - drivers/hid/intel-ish-hid/ishtp/dma-if.c | 10 + drivers/i2c/busses/i2c-designware-common.c | 9 +- drivers/i2c/busses/i2c-designware-platdrv.c | 20 +- drivers/infiniband/core/verbs.c | 7 +- drivers/infiniband/hw/hfi1/user_exp_rcv.c | 200 +++++++++---- drivers/infiniband/hw/hfi1/user_exp_rcv.h | 3 + drivers/infiniband/sw/rxe/rxe_param.h | 10 +- drivers/infiniband/sw/rxe/rxe_pool.c | 22 +- drivers/input/mouse/synaptics.c | 1 - drivers/input/serio/i8042-acpipnpio.h | 7 + drivers/interconnect/qcom/msm8996.c | 19 +- drivers/memory/atmel-sdramc.c | 6 +- drivers/memory/mvebu-devbus.c | 3 +- drivers/memory/tegra/tegra186.c | 36 --- drivers/net/dsa/microchip/ksz9477.c | 4 +- drivers/net/dsa/microchip/ksz9477_i2c.c | 2 +- drivers/net/ethernet/adi/adin1110.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 23 +- drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 ++ drivers/net/ethernet/amd/xgbe/xgbe.h | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 13 +- drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 9 +- drivers/net/ethernet/broadcom/tg3.c | 8 +- drivers/net/ethernet/cadence/macb_main.c | 9 +- drivers/net/ethernet/engleder/tsnep_main.c | 15 +- drivers/net/ethernet/freescale/enetc/enetc.c | 4 +- drivers/net/ethernet/freescale/fec_main.c | 2 +- drivers/net/ethernet/intel/iavf/iavf.h | 2 +- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 10 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 86 +++--- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en/htb.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 3 + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 18 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +- drivers/net/ethernet/mellanox/mlx5/core/qos.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/qos.h | 2 +- .../net/ethernet/microchip/lan966x/lan966x_main.c | 13 +- drivers/net/ethernet/microsoft/mana/gdma.h | 3 + drivers/net/ethernet/microsoft/mana/gdma_main.c | 9 +- drivers/net/ethernet/renesas/ravb_main.c | 10 +- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 14 + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 + drivers/net/ipa/ipa_interrupt.c | 10 + drivers/net/ipa/ipa_interrupt.h | 16 + drivers/net/ipa/ipa_power.c | 17 ++ drivers/net/mdio/mdio-mux-meson-g12a.c | 23 +- drivers/net/phy/mdio_bus.c | 7 +- drivers/net/usb/cdc_ether.c | 6 + drivers/net/usb/r8152.c | 1 + drivers/net/usb/sr9700.c | 2 +- drivers/net/virtio_net.c | 6 +- drivers/net/wan/fsl_ucc_hdlc.c | 6 +- drivers/net/wireless/rndis_wlan.c | 19 +- drivers/nvme/host/core.c | 25 +- drivers/nvme/host/fc.c | 20 +- drivers/nvme/host/nvme.h | 11 +- drivers/nvme/host/pci.c | 25 +- drivers/nvme/host/rdma.c | 3 +- drivers/nvme/host/tcp.c | 5 +- drivers/nvme/target/loop.c | 4 +- drivers/perf/arm-cmn.c | 7 +- drivers/phy/phy-can-transceiver.c | 5 +- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 4 +- drivers/phy/sunplus/phy-sunplus-usb2.c | 3 + drivers/phy/ti/Kconfig | 4 +- drivers/pinctrl/pinctrl-rockchip.c | 31 +- drivers/platform/x86/apple-gmux.c | 93 ++---- drivers/platform/x86/asus-nb-wmi.c | 15 + drivers/platform/x86/asus-wmi.c | 21 +- drivers/platform/x86/asus-wmi.h | 1 + drivers/platform/x86/simatic-ipc.c | 3 +- drivers/platform/x86/thinkpad_acpi.c | 11 +- drivers/platform/x86/touchscreen_dmi.c | 25 ++ drivers/reset/Kconfig | 2 +- drivers/reset/reset-uniphier-glue.c | 4 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 4 +- drivers/scsi/hpsa.c | 2 +- drivers/scsi/scsi_transport_iscsi.c | 50 +++- drivers/soc/imx/imx8mp-blk-ctrl.c | 7 +- drivers/soc/imx/soc-imx8m.c | 4 +- drivers/soc/qcom/cpr.c | 6 +- drivers/spi/spi-cadence-xspi.c | 5 +- drivers/spi/spidev.c | 2 - drivers/thermal/gov_fair_share.c | 6 +- .../intel/int340x_thermal/int340x_thermal_zone.c | 28 +- .../intel/int340x_thermal/int340x_thermal_zone.h | 1 + drivers/thermal/thermal_core.c | 25 +- drivers/thermal/thermal_sysfs.c | 11 +- drivers/ufs/core/ufshcd.c | 29 +- drivers/usb/dwc3/Kconfig | 2 +- drivers/usb/gadget/function/f_fs.c | 7 + drivers/usb/typec/ucsi/ucsi.c | 24 +- drivers/usb/typec/ucsi/ucsi.h | 1 + drivers/vfio/vfio_iommu_type1.c | 31 +- drivers/w1/w1.c | 6 +- drivers/w1/w1_int.c | 5 +- drivers/xen/pvcalls-front.c | 4 +- fs/affs/file.c | 2 +- fs/btrfs/ctree.h | 6 + fs/btrfs/space-info.c | 3 +- fs/btrfs/zoned.c | 2 + fs/cifs/cifsencrypt.c | 1 + fs/cifs/dfs_cache.c | 42 +-- fs/cifs/sess.c | 2 + fs/cifs/smb2pdu.c | 1 + fs/cifs/smbdirect.c | 1 + fs/erofs/zdata.c | 12 +- fs/ksmbd/connection.c | 17 +- fs/ksmbd/ksmbd_netlink.h | 3 +- fs/ksmbd/ndr.c | 8 +- fs/ksmbd/server.h | 1 + fs/ksmbd/smb2pdu.c | 2 + fs/ksmbd/smb2pdu.h | 5 +- fs/ksmbd/transport_ipc.c | 3 + fs/ksmbd/transport_tcp.c | 17 +- fs/nfsd/filecache.c | 61 ++-- fs/nfsd/nfs4proc.c | 1 + fs/overlayfs/copy_up.c | 6 +- include/drm/drm_vma_manager.h | 1 + include/linux/apple-gmux.h | 109 ++++++- include/linux/blk-mq.h | 4 + include/linux/blkdev.h | 15 +- include/linux/platform_data/x86/simatic-ipc.h | 3 +- include/linux/thermal.h | 1 + include/net/mac80211.h | 4 - include/net/sch_generic.h | 7 + include/scsi/scsi_transport_iscsi.h | 9 + include/uapi/linux/netfilter/nf_conntrack_sctp.h | 2 +- include/uapi/linux/netfilter/nfnetlink_cttimeout.h | 2 +- include/ufs/ufshcd.h | 2 + io_uring/io_uring.c | 68 ++--- io_uring/io_uring.h | 16 +- io_uring/msg_ring.c | 4 + io_uring/net.c | 11 + io_uring/timeout.c | 10 +- kernel/bpf/hashtab.c | 4 +- kernel/bpf/verifier.c | 4 +- kernel/kcsan/kcsan_test.c | 7 +- kernel/module/main.c | 26 +- kernel/sched/fair.c | 48 ++- kernel/trace/ftrace.c | 23 +- kernel/trace/trace.c | 2 + kernel/trace/trace.h | 1 + kernel/trace/trace_events_hist.c | 2 + kernel/trace/trace_osnoise.c | 5 +- kernel/trace/trace_output.c | 3 +- lib/lockref.c | 1 - lib/nlattr.c | 3 + mm/compaction.c | 1 + net/bluetooth/hci_conn.c | 18 +- net/bluetooth/hci_event.c | 5 +- net/bluetooth/hci_sync.c | 14 +- net/bluetooth/iso.c | 110 +++---- net/bluetooth/mgmt_util.h | 2 +- net/bluetooth/rfcomm/sock.c | 7 +- net/core/net_namespace.c | 2 +- net/ipv4/fib_semantics.c | 2 + net/ipv4/inet_hashtables.c | 17 +- net/ipv4/inet_timewait_sock.c | 8 +- net/ipv4/metrics.c | 2 + net/ipv4/tcp.c | 2 + net/ipv6/ip6_output.c | 15 +- net/l2tp/l2tp_core.c | 102 ++++--- net/mac80211/agg-tx.c | 2 - net/mac80211/debugfs_sta.c | 5 +- net/mac80211/driver-ops.h | 2 +- net/mac80211/ht.c | 37 +++ net/mac80211/ieee80211_i.h | 2 +- net/mac80211/tx.c | 30 +- net/mac80211/util.c | 20 +- net/mctp/af_mctp.c | 10 +- net/mctp/route.c | 34 ++- net/netfilter/nf_conntrack_proto_sctp.c | 122 ++++---- net/netfilter/nf_conntrack_proto_tcp.c | 15 + net/netfilter/nf_conntrack_standalone.c | 8 - net/netfilter/nft_set_rbtree.c | 332 +++++++++++++-------- net/netlink/af_netlink.c | 38 ++- net/netrom/nr_timer.c | 1 + net/nfc/llcp_core.c | 1 + net/sched/sch_gred.c | 2 + net/sched/sch_htb.c | 27 +- net/sched/sch_taprio.c | 2 + net/sctp/bind_addr.c | 6 + samples/ftrace/ftrace-direct-multi-modify.c | 1 + samples/ftrace/ftrace-direct-multi.c | 1 + scripts/atomic/atomics.tbl | 0 scripts/tracing/ftrace-bisect.sh | 34 ++- security/tomoyo/Makefile | 2 +- sound/soc/amd/yc/acp6x-mach.c | 14 + sound/soc/codecs/es8326.c | 0 sound/soc/codecs/es8326.h | 0 sound/soc/fsl/fsl-asoc-card.c | 8 +- sound/soc/fsl/fsl_micfil.c | 16 +- sound/soc/fsl/fsl_ssi.c | 4 +- sound/soc/mediatek/Kconfig | 4 +- .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 22 +- sound/soc/sof/debug.c | 4 +- sound/soc/sof/pm.c | 9 +- tools/gpio/gpio-event-mon.c | 1 + tools/include/nolibc/ctype.h | 3 + tools/include/nolibc/errno.h | 3 + tools/include/nolibc/signal.h | 3 + tools/include/nolibc/stdio.h | 3 + tools/include/nolibc/stdlib.h | 3 + tools/include/nolibc/string.h | 8 +- tools/include/nolibc/sys.h | 2 + tools/include/nolibc/time.h | 3 + tools/include/nolibc/types.h | 70 +++-- tools/include/nolibc/unistd.h | 3 + .../selftests/bpf/prog_tests/jeq_infer_not_null.c | 9 - .../selftests/bpf/progs/jeq_infer_not_null_fail.c | 42 --- tools/testing/selftests/net/toeplitz.c | 12 +- virt/kvm/vfio.c | 6 +- 351 files changed, 2974 insertions(+), 1694 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 5/313 dmaengine: qcom: gpi: Set link_rx bit on GO TRE for rx operation
From: Vijaya Krishna Nivarthi <[email protected]>
[ Upstream commit 25e8ac233d24051e2c4ff64c34f60609b0988568 ]
Rx operation on SPI GSI DMA is currently not working. As per GSI spec, link_rx bit is to be set on GO TRE on tx channel whenever there is going to be a DMA TRE on rx channel. This is currently set for duplex operation only.
Set the bit for rx operation as well.
This is part of changes required to bring up Rx.
--- drivers/dma/qcom/gpi.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/qcom/gpi.c +1 -0
@@ -1756,6 +1756,7 @@ static int gpi_create_spi_tre(struct gchan *chan, struct gpi_desc *desc, tre->dword[3 ] =u32_encode_bits (TRE_TYPE_GO ,TRE_FLAGS_TYPE );if (spi->cmd ==SPI_RX ) { tre->dword[3 ] |=u32_encode_bits (1 ,TRE_FLAGS_IEOB ); + tre->dword[3 ] |=u32_encode_bits (1 ,TRE_FLAGS_LINK ); }else if (spi->cmd ==SPI_TX ) { tre->dword[3 ] |=u32_encode_bits (1 ,TRE_FLAGS_CHAIN ); }else {/* SPI_DUPLEX */
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 14/313 arm64: dts: verdin-imx8mm: fix dev board audio playback
In reply to Greg Kroah-HartmanFrom: Emanuele Ghidoli <[email protected]>
[ Upstream commit 6c620a30515c494b5eeb3dc0e40d3220ea04c53b ]
Set optional simple-audio-card,mclk-fs parameter to ensure a proper clock to the nau8822 audio codec. Without this change with an audio stream rate of 44.1 kHz the playback is faster.
Set the MCLK at the right frequency, codec can properly use it to generate 44.1 kHz I2S-FS.
--- arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi +1 -0
@@ -11,6 +11,7 @@ sound_card: sound-card { simple-audio-card,bitclock-master = <&dailink_master>; simple-audio-card,format = "i2s"; simple-audio-card,frame-master = <&dailink_master>; + simple-audio-card,mclk-fs = <256>; simple-audio-card,name = "imx8mm-nau8822"; simple-audio-card,routing = "Headphones", "LHP",
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 15/313 arm64: dts: imx93-11x11-evk: correct clock and strobe pad setting
In reply to Greg Kroah-HartmanFrom: Haibo Chen <[email protected]>
[ Upstream commit 62f0147fd4d86620853bee027800f988d3013656 ]
For clock and strobe pad of usdhc, need to config as pull down. Current pad config set these pad as both pull up and pull down, this is wrong, so fix it here.
Find this issue when enable HS400ES mode on one Micron eMMC chip, CMD8 always meet CRC error in HS400ES/HS400 mode.
--- arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts +3 -3
@@ -74,7 +74,7 @@ MX93_PAD_UART1_TXD__LPUART1_TX 0x31e pinctrl_usdhc1: usdhc1grp { fsl,pins = < - MX93_PAD_SD1_CLK__USDHC1_CLK 0x17fe + MX93_PAD_SD1_CLK__USDHC1_CLK 0x15fe MX93_PAD_SD1_CMD__USDHC1_CMD 0x13fe MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x13fe MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x13fe
@@ -84,7 +84,7 @@ MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x13fe MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x13fe MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x13fe MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x13fe - MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x17fe + MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x15fe >; };
@@ -102,7 +102,7 @@ MX93_PAD_SD2_CD_B__GPIO3_IO00 0x31e pinctrl_usdhc2: usdhc2grp { fsl,pins = < - MX93_PAD_SD2_CLK__USDHC2_CLK 0x17fe + MX93_PAD_SD2_CLK__USDHC2_CLK 0x15fe MX93_PAD_SD2_CMD__USDHC2_CMD 0x13fe MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x13fe MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x13fe
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 16/313 ARM: imx: add missing of_node_put()
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit 87b30c4b0efb6a194a7b8eac2568a3da520d905f ]
Calling of_find_compatible_node() returns a node pointer with refcount incremented. Use of_node_put() on it when done.
The patch fixes the same problem on different i.MX platforms.
--- arch/arm/mach-imx/cpu-imx25.c | 1 + arch/arm/mach-imx/cpu-imx27.c | 1 + arch/arm/mach-imx/cpu-imx31.c | 1 + arch/arm/mach-imx/cpu-imx35.c | 1 + arch/arm/mach-imx/cpu-imx5.c | 1 + 5 files changed, 5 insertions(+)
arch/arm/mach-imx/cpu-imx25.c +1 -0
@@ -23,6 +23,7 @@ static int mx25_read_cpu_rev(void) np =of_find_compatible_node (NULL ,NULL ,"fsl,imx25-iim" ); iim_base =of_iomap (np,0 ); +of_node_put (np);BUG_ON (!iim_base); rev =readl (iim_base +MXC_IIMSREV );iounmap (iim_base);
arch/arm/mach-imx/cpu-imx27.c +1 -0
@@ -28,6 +28,7 @@ static int mx27_read_cpu_rev(void) np =of_find_compatible_node (NULL ,NULL ,"fsl,imx27-ccm" ); ccm_base =of_iomap (np,0 ); +of_node_put (np);BUG_ON (!ccm_base);/* * now we have access to the IO registers. As we need
arch/arm/mach-imx/cpu-imx31.c +1 -0
@@ -39,6 +39,7 @@ static int mx31_read_cpu_rev(void) np =of_find_compatible_node (NULL ,NULL ,"fsl,imx31-iim" ); iim_base =of_iomap (np,0 ); +of_node_put (np);BUG_ON (!iim_base);/* read SREV register from IIM module */
arch/arm/mach-imx/cpu-imx35.c +1 -0
@@ -21,6 +21,7 @@ static int mx35_read_cpu_rev(void) np =of_find_compatible_node (NULL ,NULL ,"fsl,imx35-iim" ); iim_base =of_iomap (np,0 ); +of_node_put (np);BUG_ON (!iim_base); rev =imx_readl (iim_base +MXC_IIMSREV );
arch/arm/mach-imx/cpu-imx5.c +1 -0
@@ -28,6 +28,7 @@ static u32 imx5_read_srev_reg(const char *compat) np =of_find_compatible_node (NULL ,NULL , compat); iim_base =of_iomap (np,0 ); +of_node_put (np);WARN_ON (!iim_base); srev =readl (iim_base +IIM_SREV ) &0xff ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 17/313 soc: imx: imx8mp-blk-ctrl: dont set power device name
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
[ Upstream commit 21b84ebeee79d91e405f87f051e9489ef30ecad6 ]
Setting the device name after it has been registered confuses the sysfs cleanup paths. This has already been fixed for the imx8m-blk-ctrl driver in b64b46fbaa1d ("Revert "soc: imx: imx8m-blk-ctrl: set power device name""), but the same problem exists in imx8mp-blk-ctrl.
--- drivers/soc/imx/imx8mp-blk-ctrl.c | 1 - 1 file changed, 1 deletion(-)
drivers/soc/imx/imx8mp-blk-ctrl.c +0 -1
@@ -592,7 +592,6 @@ static int imx8mp_blk_ctrl_probe(struct platform_device *pdev) ret =PTR_ERR (domain->power_dev); goto cleanup_pds; } -dev_set_name (domain->power_dev,"%s" , data->name); domain->genpd.name = data->name; domain->genpd.power_on = imx8mp_blk_ctrl_power_on;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 18/313 arm64: dts: imx8mp: Fix missing GPC Interrupt
In reply to Greg Kroah-HartmanFrom: Adam Ford <[email protected]>
[ Upstream commit b3b75ace2085aca623c57e04ea7218ae690090fb ]
The GPC node references an interrupt parent, but it doesn't state the interrupt itself. According to the TRM, this IRQ is 87. This also eliminate an error detected from dt_binding_check
--- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -0
@@ -523,6 +523,7 @@ gpc: gpc@303a0000 { compatible = "fsl,imx8mp-gpc"; reg = <0x303a0000 0x1000>; interrupt-parent = <&gic>; + interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>; interrupt-controller; #interrupt-cells = <3>;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 19/313 arm64: dts: imx8mp: Fix power-domain typo
In reply to Greg Kroah-HartmanFrom: Adam Ford <[email protected]>
[ Upstream commit 10e2f328bd900787fd2db24e474f87e1d525ccc4 ]
dt_binding_check detects an issue with the pgc_hsiomix power domain:
pgc: 'power-domains@17' does not match any of the regexes
This is because 'power-domains' should be 'power-domain'
--- arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
@@ -590,7 +590,7 @@ pgc_mipi_phy2: power-domain@16 { reg = <IMX8MP_POWER_DOMAIN_MIPI_PHY2>; }; - pgc_hsiomix: power-domains@17 { + pgc_hsiomix: power-domain@17 { #power-domain-cells = <0>; reg = <IMX8MP_POWER_DOMAIN_HSIOMIX>; clocks = <&clk IMX8MP_CLK_HSIO_AXI>,
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 20/313 arm64: dts: imx8mp-evk: pcie0-refclk cosmetic cleanup
In reply to Greg Kroah-HartmanFrom: Marco Felsch <[email protected]>
[ Upstream commit 9a65c759e4666476a6642ad87b4db8a67cb957d0 ]
Use the correct indention.
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +2 -2
@@ -36,8 +36,8 @@ memory@40000000 { pcie0_refclk: pcie0-refclk { compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <100000000>; + #clock-cells = <0>; + clock-frequency = <100000000>; }; reg_can1_stby: regulator-can1-stby {
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 21/313 HID: intel_ish-hid: Add check for ishtp_dma_tx_map
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit b3d40c3ec3dc4ad78017de6c3a38979f57aaaab8 ]
As the kcalloc may return NULL pointer,
it should be better to check the ishtp_dma_tx_map before use in order to avoid NULL pointer dereference.
--- drivers/hid/intel-ish-hid/ishtp/dma-if.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/hid/intel-ish-hid/ishtp/dma-if.c +10 -0
@@ -104,6 +104,11 @@ void *ishtp_cl_get_dma_send_buf(struct ishtp_device *dev,int required_slots = (size /DMA_SLOT_SIZE ) +1 * (size %DMA_SLOT_SIZE !=0 ); +if (!dev->ishtp_dma_tx_map) { +dev_err (dev->devc,"Fail to allocate Tx map\n" ); +return NULL ; + } +spin_lock_irqsave (&dev->ishtp_dma_tx_lock, flags);for (i =0 ; i <= (dev->ishtp_dma_num_slots - required_slots); i++) { free =1 ;
@@ -150,6 +155,11 @@ void ishtp_cl_release_dma_acked_mem(struct ishtp_device *dev,return ; } +if (!dev->ishtp_dma_tx_map) { +dev_err (dev->devc,"Fail to allocate Tx map\n" ); +return ; + } + i = (msg_addr - dev->ishtp_host_dma_tx_buf) /DMA_SLOT_SIZE ;spin_lock_irqsave (&dev->ishtp_dma_tx_lock, flags);for (j =0 ; j < acked_slots; j++) {
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 22/313 arm64: dts: imx8mm-venice-gw7901: fix USB2 controller OC polarity
In reply to Greg Kroah-HartmanFrom: Tim Harvey <[email protected]>
[ Upstream commit ae066f374687d7dd06bb8c732f66d6ab3c3fd480 ]
The GW7901 has USB2 routed to a USB VBUS supply with over-current protection via an active-low pin. Define the OC pin polarity properly.
--- arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts +1 -0
@@ -759,6 +759,7 @@ &usbotg1 { &usbotg2 { dr_mode = "host"; vbus-supply = <®_usb2_vbus>; + over-current-active-low; status = "okay"; };
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 23/313 soc: imx8m: Fix incorrect check for of_clk_get_by_name()
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 490748874ebf1875420fc29b335bba2075dd1b5e ]
of_clk_get_by_name() returns error pointers instead of NULL. Use IS_ERR() checks the return value to catch errors.
--- drivers/soc/imx/soc-imx8m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/imx/soc-imx8m.c +2 -2
@@ -66,8 +66,8 @@ static u32 __init imx8mq_soc_revision(void) ocotp_base =of_iomap (np,0 );WARN_ON (!ocotp_base); clk =of_clk_get_by_name (np,NULL ); -if (!clk) { -WARN_ON (!clk); +if (IS_ERR (clk)) { +WARN_ON (IS_ERR (clk));return 0 ; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 6/313 dmaengine: ti: k3-udma: Do conditional decrement of UDMA_CHAN_RT_PEER_BCNT_REG
In reply to Greg Kroah-HartmanFrom: Jayesh Choudhary <[email protected]>
[ Upstream commit efab25894a41a920d9581183741e7fadba00719c ]
PSIL_EP_NATIVE endpoints may not have PEER registers for BCNT and thus udma_decrement_byte_counters() should not try to decrement these counters. This fixes the issue of crypto IPERF testing where the client side (EVM) hangs without transfer of packets to the server side, seen since this function was added.
--- drivers/dma/ti/k3-udma.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/dma/ti/k3-udma.c +3 -2
@@ -761,11 +761,12 @@ static void udma_decrement_byte_counters(struct udma_chan *uc, u32 val)if (uc->desc->dir ==DMA_DEV_TO_MEM ) {udma_rchanrt_write (uc,UDMA_CHAN_RT_BCNT_REG , val);udma_rchanrt_write (uc,UDMA_CHAN_RT_SBCNT_REG , val); -udma_rchanrt_write (uc,UDMA_CHAN_RT_PEER_BCNT_REG , val); +if (uc->config.ep_type !=PSIL_EP_NATIVE ) +udma_rchanrt_write (uc,UDMA_CHAN_RT_PEER_BCNT_REG , val); }else {udma_tchanrt_write (uc,UDMA_CHAN_RT_BCNT_REG , val);udma_tchanrt_write (uc,UDMA_CHAN_RT_SBCNT_REG , val); -if (!uc->bchan) +if (!uc->bchan && uc->config.ep_type !=PSIL_EP_NATIVE )udma_tchanrt_write (uc,UDMA_CHAN_RT_PEER_BCNT_REG , val); } }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 24/313 reset: ti-sci: honor TI_SCI_PROTOCOL setting when not COMPILE_TEST
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 13678f3feb3009b23aab424864fd0dac0765c83e ]
There is a build error when COMPILE_TEST=y, TI_SCI_PROTOCOL=m, and RESET_TI_SCI=y:
drivers/reset/reset-ti-sci.o: in function `ti_sci_reset_probe':
reset-ti-sci.c:(.text+0x22c): undefined reference to `devm_ti_sci_get_handle'
Fix this by making RESET_TI_SCI honor the Kconfig setting of TI_SCI_PROTOCOL when COMPILE_TEST is not set. When COMPILE_TEST is set, TI_SCI_PROTOCOL must be disabled (=n).
--- drivers/reset/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/reset/Kconfig +1 -1
@@ -257,7 +257,7 @@ config RESET_SUNXI config RESET_TI_SCI tristate "TI System Control Interface (TI-SCI) reset driver" - depends on TI_SCI_PROTOCOL || COMPILE_TEST + depends on TI_SCI_PROTOCOL || (COMPILE_TEST && TI_SCI_PROTOCOL=n) help This enables the reset driver support over TI System Control Interface available on some new TI's SoCs. If you wish to use reset resources
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 25/313 reset: uniphier-glue: Fix possible null-ptr-deref
In reply to Greg Kroah-HartmanFrom: Hui Tang <[email protected]>
[ Upstream commit 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 ]
It will cause null-ptr-deref when resource_size(res) invoked, if platform_get_resource() returns NULL.
--- drivers/reset/reset-uniphier-glue.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/reset/reset-uniphier-glue.c +1 -3
@@ -47,7 +47,6 @@ static int uniphier_glue_reset_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct uniphier_glue_reset_priv *priv;struct resource *res; -resource_size_t size;int i, ret; priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL );
@@ -60,7 +59,6 @@ static int uniphier_glue_reset_probe(struct platform_device *pdev)return -EINVAL ; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - size =resource_size (res); priv->rdata.membase =devm_ioremap_resource (dev, res);if (IS_ERR (priv->rdata.membase))return PTR_ERR (priv->rdata.membase);
@@ -96,7 +94,7 @@ static int uniphier_glue_reset_probe(struct platform_device *pdev)spin_lock_init (&priv->rdata.lock); priv->rdata.rcdev.owner =THIS_MODULE ; - priv->rdata.rcdev.nr_resets = size *BITS_PER_BYTE ; + priv->rdata.rcdev.nr_resets =resource_size (res) *BITS_PER_BYTE ; priv->rdata.rcdev.ops = &reset_simple_ops; priv->rdata.rcdev.of_node = dev->of_node; priv->rdata.active_low = true;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 26/313 EDAC/highbank: Fix memory leak in highbank_mc_probe()
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit e7a293658c20a7945014570e1921bf7d25d68a36 ]
When devres_open_group() fails, it returns -ENOMEM without freeing memory allocated by edac_mc_alloc().
Call edac_mc_free() on the error handling path to avoid a memory leak.
[ bp: Massage commit message. ]
--- drivers/edac/highbank_mc_edac.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/edac/highbank_mc_edac.c +5 -2
@@ -174,8 +174,10 @@ static int highbank_mc_probe(struct platform_device *pdev) drvdata = mci->pvt_info;platform_set_drvdata (pdev, mci); -if (!devres_open_group (&pdev->dev,NULL ,GFP_KERNEL )) -return -ENOMEM ; +if (!devres_open_group (&pdev->dev,NULL ,GFP_KERNEL )) { + res = -ENOMEM ; + goto free; + } r =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!r) {
@@ -243,6 +245,7 @@ static int highbank_mc_probe(struct platform_device *pdev)edac_mc_del_mc (&pdev->dev); err:devres_release_group (&pdev->dev,NULL ); +free:edac_mc_free (mci);return res; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 27/313 firmware: arm_scmi: Harden shared memory access in fetch_response
In reply to Greg Kroah-HartmanFrom: Cristian Marussi <[email protected]>
[ Upstream commit ad78b81a1077f7d956952cd8bdfe1e61504e3eb8 ]
A misbheaving SCMI platform firmware could reply with out-of-spec messages, shorter than the mimimum size comprising a header and a status field.
Harden shmem_fetch_response to properly truncate such a bad messages.
--- drivers/firmware/arm_scmi/shmem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/firmware/arm_scmi/shmem.c +3 -2
@@ -81,10 +81,11 @@ u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem)void shmem_fetch_response (struct scmi_shared_mem __iomem *shmem,struct scmi_xfer *xfer) { +size_t len =ioread32 (&shmem->length); + xfer->hdr.status =ioread32 (shmem->msg_payload);/* Skip the length of header and status in shmem area i.e 8 bytes */ - xfer->rx.len =min_t (size_t, xfer->rx.len, -ioread32 (&shmem->length) -8 ); + xfer->rx.len =min_t (size_t, xfer->rx.len, len >8 ? len -8 :0 );/* Take a copy to the rx buffer.. */ memcpy_fromio (xfer->rx.buf, shmem->msg_payload +4 , xfer->rx.len);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 28/313 firmware: arm_scmi: Harden shared memory access in fetch_notification
In reply to Greg Kroah-HartmanFrom: Cristian Marussi <[email protected]>
[ Upstream commit 9bae076cd4e3e3c3dc185cae829d80b2dddec86e ]
A misbheaving SCMI platform firmware could reply with out-of-spec notifications, shorter than the mimimum size comprising a header.
--- drivers/firmware/arm_scmi/shmem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/firmware/arm_scmi/shmem.c +3 -1
@@ -94,8 +94,10 @@ void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem,void shmem_fetch_notification (struct scmi_shared_mem __iomem *shmem,size_t max_len,struct scmi_xfer *xfer) { +size_t len =ioread32 (&shmem->length); +/* Skip only the length of header in shmem area i.e 4 bytes */ - xfer->rx.len =min_t (size_t, max_len,ioread32 (&shmem->length) -4 ); + xfer->rx.len =min_t (size_t, max_len, len >4 ? len -4 :0 );/* Take a copy to the rx buffer.. */ memcpy_fromio (xfer->rx.buf, shmem->msg_payload, xfer->rx.len);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 29/313 firmware: arm_scmi: Fix virtio channels cleanup on shutdown
In reply to Greg Kroah-HartmanFrom: Cristian Marussi <[email protected]>
[ Upstream commit e325285de2cd82fbdcc4df8898e4c6a597674816 ]
When unloading the SCMI core stack module, configured to use the virtio SCMI transport, LOCKDEP reports the splat down below about unsafe locks dependencies.
In order to avoid this possible unsafe locking scenario call upfront virtio_break_device() before getting hold of vioch->lock.
=====================================================
WARNING: HARDIRQ-safe -> HARDIRQ-unsafe lock order detected 6.1.0-00067-g6b934395ba07-dirty #4 Not tainted
-----------------------------------------------------
rmmod/307 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire:
ffff000080c510e0 (&dev->vqs_list_lock){+.+.}-{3:3}, at: virtio_break_device+0x28/0x68
and this task is already holding:
ffff00008288ada0 (&channels[i].lock){-.-.}-{3:3}, at: virtio_chan_free+0x60/0x168 [scmi_module]
which would create a new lock dependency:
(&channels[i].lock){-.-.}-{3:3} -> (&dev->vqs_list_lock){+.+.}-{3:3}
but this new dependency connects a HARDIRQ-irq-safe lock:
(&channels[i].lock){-.-.}-{3:3}
... which became HARDIRQ-irq-safe at:
lock_acquire+0x128/0x398 _raw_spin_lock_irqsave+0x78/0x140 scmi_vio_complete_cb+0xb4/0x3b8 [scmi_module] vring_interrupt+0x84/0x120 vm_interrupt+0x94/0xe8 __handle_irq_event_percpu+0xb4/0x3d8 handle_irq_event_percpu+0x20/0x68 handle_irq_event+0x50/0xb0 handle_fasteoi_irq+0xac/0x138 generic_handle_domain_irq+0x34/0x50 gic_handle_irq+0xa0/0xd8 call_on_irq_stack+0x2c/0x54 do_interrupt_handler+0x8c/0x90 el1_interrupt+0x40/0x78 el1h_64_irq_handler+0x18/0x28 el1h_64_irq+0x64/0x68 _raw_write_unlock_irq+0x48/0x80 ep_start_scan+0xf0/0x128 do_epoll_wait+0x390/0x858 do_compat_epoll_pwait.part.34+0x1c/0xb8 __arm64_sys_epoll_pwait+0x80/0xd0 invoke_syscall+0x4c/0x110 el0_svc_common.constprop.3+0x98/0x120 do_el0_svc+0x34/0xd0 el0_svc+0x40/0x98 el0t_64_sync_handler+0x98/0xc0 el0t_64_sync+0x170/0x174
to a HARDIRQ-irq-unsafe lock:
(&dev->vqs_list_lock){+.+.}-{3:3}
... which became HARDIRQ-irq-unsafe at:
...
lock_acquire+0x128/0x398 _raw_spin_lock+0x58/0x70 __vring_new_virtqueue+0x130/0x1c0 vring_create_virtqueue+0xc4/0x2b8 vm_find_vqs+0x20c/0x430 init_vq+0x308/0x390 virtblk_probe+0x114/0x9b0 virtio_dev_probe+0x1a4/0x248 really_probe+0xc8/0x3a8 __driver_probe_device+0x84/0x190 driver_probe_device+0x44/0x110 __driver_attach+0x104/0x1e8 bus_for_each_dev+0x7c/0xd0 driver_attach+0x2c/0x38 bus_add_driver+0x1e4/0x258 driver_register+0x6c/0x128 register_virtio_driver+0x2c/0x48 virtio_blk_init+0x70/0xac do_one_initcall+0x84/0x420 kernel_init_freeable+0x2d0/0x340 kernel_init+0x2c/0x138 ret_from_fork+0x10/0x20
other info that might help us debug this:
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&dev->vqs_list_lock);
local_irq_disable();
lock(&channels[i].lock);
lock(&dev->vqs_list_lock);
<Interrupt>
lock(&channels[i].lock); *** DEADLOCK ***
================
--- drivers/firmware/arm_scmi/virtio.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/firmware/arm_scmi/virtio.c +6 -1
@@ -160,7 +160,6 @@ static void scmi_vio_channel_cleanup_sync(struct scmi_vio_channel *vioch) } vioch->shutdown_done = &vioch_shutdown_done; -virtio_break_device (vioch->vqueue->vdev);if (!vioch->is_rx && vioch->deferred_tx_wq)/* Cannot be kicked anymore after this...*/ vioch->deferred_tx_wq =NULL ;
@@ -482,6 +481,12 @@ static int virtio_chan_free(int id, void *p, void *data)struct scmi_chan_info *cinfo = p;struct scmi_vio_channel *vioch = cinfo->transport_info; +/* +* Break device to inhibit further traffic flowing while shutting down +* the channels: doing it later holding vioch->lock creates unsafe +* locking dependency chains as reported by LOCKDEP. +*/ +virtio_break_device (vioch->vqueue->vdev);scmi_vio_channel_cleanup_sync (vioch);scmi_free_channel (cinfo, data, id);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 30/313 interconnect: qcom: msm8996: Provide UFS clocks to A2NoC
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 60426ff08af6a21275d9c879c0dfb09406469868 ]
On eMMC devices the bootloader has no business enabling UFS clocks. That results in a platform hang and hard reboot when trying to vote on paths including MASTER_UFS and since sync_state guarantees that it's done at boot time, this effectively prevents such devices from booting. Fix that.
--- drivers/interconnect/qcom/msm8996.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/interconnect/qcom/msm8996.c +9 -0
@@ -33,6 +33,13 @@ static const char * const bus_a0noc_clocks[] = { "aggre0_noc_mpu_cfg" }; +static const char *const bus_a2noc_clocks[] = { +"bus" , +"bus_a" , +"aggre2_ufs_axi" , +"ufs_axi" +}; +static const u16 mas_a0noc_common_links[] = {MSM8996_SLAVE_A0NOC_SNOC };
@@ -1859,6 +1866,8 @@ static const struct qcom_icc_desc msm8996_a2noc = { .type = QCOM_ICC_NOC, .nodes = a2noc_nodes, .num_nodes = ARRAY_SIZE(a2noc_nodes), + .clocks = bus_a2noc_clocks, + .num_clocks = ARRAY_SIZE(bus_a2noc_clocks), .regmap_cfg = &msm8996_a2noc_regmap_config };
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 31/313 interconnect: qcom: msm8996: Fix regmap max_register values
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 4be39d5d86c690c60e2afe55787fc5ec4409d0f0 ]
The device tree reg starts at BUS_BASE + QoS_OFFSET, but the regmap configs in the ICC driver had values suggesting the reg started at BUS_BASE. Shrink them down (where they haven't been already, so for providers where QoS_OFFSET = 0) to make sure they stay within their window.
--- drivers/interconnect/qcom/msm8996.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/interconnect/qcom/msm8996.c +5 -5
@@ -1813,7 +1813,7 @@ static const struct regmap_config msm8996_a0noc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x9000, + .max_register = 0x6000, .fast_io = true };
@@ -1837,7 +1837,7 @@ static const struct regmap_config msm8996_a1noc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x7000, + .max_register = 0x5000, .fast_io = true };
@@ -1858,7 +1858,7 @@ static const struct regmap_config msm8996_a2noc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0xa000, + .max_register = 0x7000, .fast_io = true };
@@ -1886,7 +1886,7 @@ static const struct regmap_config msm8996_bimc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x62000, + .max_register = 0x5a000, .fast_io = true };
@@ -1997,7 +1997,7 @@ static const struct regmap_config msm8996_mnoc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x20000, + .max_register = 0x1c000, .fast_io = true };
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 32/313 HID: amd_sfh: Fix warning unwind goto
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit 2a33ad4a0ba5a527b92aeef9a313aefec197fe28 ]
Return directly instead of using existing goto will not cleanup previously allocated resources. Hence replace return with goto to fix warning unwind goto which cleanups previously allocated resources.
--- drivers/hid/amd-sfh-hid/amd_sfh_client.c | 2 +- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/hid/amd-sfh-hid/amd_sfh_client.c +1 -1
@@ -282,7 +282,7 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) } rc = mp2_ops->get_rep_desc (cl_idx, cl_data->report_descr[i]);if (rc) -return rc; + goto cleanup; mp2_ops->start (privdata, info); status =amd_sfh_wait_for_response (privdata, cl_data->sensor_idx[i],SENSOR_ENABLED );
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c +1 -1
@@ -160,7 +160,7 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) } rc = mp2_ops->get_rep_desc (cl_idx, cl_data->report_descr[i]);if (rc) -return rc; + goto cleanup;writel (0 , privdata->mmio +AMD_P2C_MSG (0 )); mp2_ops->start (privdata, info);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 33/313 tomoyo: fix broken dependency on *.conf.default
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit eaf2213ba563b2d74a1f2c13a6b258273f689802 ]
If *.conf.default is updated, builtin-policy.h should be rebuilt, but this does not work when compiled with O= option.
[Without this commit]
$ touch security/tomoyo/policy/exception_policy.conf.default
$ make O=/tmp security/tomoyo/
make[1]: Entering directory '/tmp'
GEN Makefile
CALL /home/masahiro/ref/linux/scripts/checksyscalls.sh
DESCEND objtool
make[1]: Leaving directory '/tmp'[With this commit]
$ touch security/tomoyo/policy/exception_policy.conf.default
$ make O=/tmp security/tomoyo/
make[1]: Entering directory '/tmp'
GEN Makefile
CALL /home/masahiro/ref/linux/scripts/checksyscalls.sh
DESCEND objtool
POLICY security/tomoyo/builtin-policy.h
CC security/tomoyo/common.o
AR security/tomoyo/built-in.a
make[1]: Leaving directory '/tmp'$(srctree)/ is essential because $(wildcard ) does not follow VPATH.
--- security/tomoyo/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/tomoyo/Makefile +1 -1
@@ -10,7 +10,7 @@ endef quiet_cmd_policy = POLICY $@ cmd_policy = ($(call do_policy,profile); $(call do_policy,exception_policy); $(call do_policy,domain_policy); $(call do_policy,manager); $(call do_policy,stat)) >$@ -$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(src)/policy/*.conf.default) FORCE +$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(srctree)/$(src)/policy/*.conf.default) FORCE $(call if_changed,policy) $(obj)/common.o: $(obj)/builtin-policy.h
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 7/313 soc: imx: imx8mp-blk-ctrl: enable global pixclk with HDMI_TX_PHY PD
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
[ Upstream commit b814eda949c324791580003303aa608761cfde3f ]
NXP internal information shows that the PHY refclk is gated by the GLOBAL_TX_PIX_CLK_EN bit, so to allow the PHY PLL to lock without the LCDIF being already active, tie this bit to the HDMI_TX_PHY power domain.
--- drivers/soc/imx/imx8mp-blk-ctrl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/soc/imx/imx8mp-blk-ctrl.c +4 -2
@@ -212,7 +212,7 @@ static void imx8mp_hdmi_blk_ctrl_power_on(struct imx8mp_blk_ctrl *bc,break ;case IMX8MP_HDMIBLK_PD_LCDIF :regmap_set_bits (bc->regmap,HDMI_RTX_CLK_CTL0 , -BIT (7 ) |BIT (16 ) |BIT (17 ) |BIT (18 ) | +BIT (16 ) |BIT (17 ) |BIT (18 ) |BIT (19 ) |BIT (20 ));regmap_set_bits (bc->regmap,HDMI_RTX_CLK_CTL1 ,BIT (11 )); regmap_set_bits(bc->regmap, HDMI_RTX_RESET_CTL0,
@@ -241,6 +241,7 @@ static void imx8mp_hdmi_blk_ctrl_power_on(struct imx8mp_blk_ctrl *bc,regmap_set_bits (bc->regmap,HDMI_TX_CONTROL0 ,BIT (1 ));break ;case IMX8MP_HDMIBLK_PD_HDMI_TX_PHY : +regmap_set_bits (bc->regmap,HDMI_RTX_CLK_CTL0 ,BIT (7 ));regmap_set_bits (bc->regmap,HDMI_RTX_CLK_CTL1 ,BIT (22 ) |BIT (24 ));regmap_set_bits (bc->regmap,HDMI_RTX_RESET_CTL0 ,BIT (12 ));regmap_clear_bits (bc->regmap,HDMI_TX_CONTROL0 ,BIT (3 ));
@@ -270,7 +271,7 @@ static void imx8mp_hdmi_blk_ctrl_power_off(struct imx8mp_blk_ctrl *bc, BIT(4) | BIT(5) | BIT(6));regmap_clear_bits (bc->regmap,HDMI_RTX_CLK_CTL1 ,BIT (11 ));regmap_clear_bits (bc->regmap,HDMI_RTX_CLK_CTL0 , -BIT (7 ) |BIT (16 ) |BIT (17 ) |BIT (18 ) | +BIT (16 ) |BIT (17 ) |BIT (18 ) |BIT (19 ) |BIT (20 ));break ;case IMX8MP_HDMIBLK_PD_PAI :
@@ -298,6 +299,7 @@ static void imx8mp_hdmi_blk_ctrl_power_off(struct imx8mp_blk_ctrl *bc,case IMX8MP_HDMIBLK_PD_HDMI_TX_PHY :regmap_set_bits (bc->regmap,HDMI_TX_CONTROL0 ,BIT (3 ));regmap_clear_bits (bc->regmap,HDMI_RTX_RESET_CTL0 ,BIT (12 )); +regmap_clear_bits (bc->regmap,HDMI_RTX_CLK_CTL0 ,BIT (7 ));regmap_clear_bits (bc->regmap,HDMI_RTX_CLK_CTL1 ,BIT (22 ) |BIT (24 ));break ;case IMX8MP_HDMIBLK_PD_HDCP :
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 34/313 blk-mq: move the srcu_struct used for quiescing to the tagset
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 80bd4a7aab4c9ce59bf5e35fdf52aa23d8a3c9f5 ]
All I/O submissions have fairly similar latencies, and a tagset-wide quiesce is a fairly common operation.
Stable-dep-of: 49e4d04f0486 ("block: Drop spurious might_sleep() from blk_put_queue()")
--- block/blk-core.c | 27 +++++---------------------- block/blk-mq.c | 33 +++++++++++++++++++++++++-------- block/blk-mq.h | 14 +++++++------- block/blk-sysfs.c | 9 ++------- block/blk.h | 9 +-------- block/genhd.c | 2 +- include/linux/blk-mq.h | 4 ++++ include/linux/blkdev.h | 9 --------- 8 files changed, 45 insertions(+), 62 deletions(-)
block/blk-core.c +5 -22
@@ -65,7 +65,6 @@ DEFINE_IDA(blk_queue_ida);* For queue allocation */ struct kmem_cache *blk_requestq_cachep; -struct kmem_cache *blk_requestq_srcu_cachep;/* * Controlling structure to kblockd
@@ -373,26 +372,20 @@ static void blk_timeout_work(struct work_struct *work) { } -struct request_queue *blk_alloc_queue (int node_id,bool alloc_srcu) +struct request_queue *blk_alloc_queue (int node_id) {struct request_queue *q; - q =kmem_cache_alloc_node (blk_get_queue_kmem_cache (alloc_srcu), -GFP_KERNEL | __GFP_ZERO, node_id); + q =kmem_cache_alloc_node (blk_requestq_cachep,GFP_KERNEL | __GFP_ZERO, + node_id);if (!q)return NULL ; -if (alloc_srcu) { -blk_queue_flag_set (QUEUE_FLAG_HAS_SRCU , q); -if (init_srcu_struct (q->srcu) !=0 ) - goto fail_q; - } - q->last_merge =NULL ; q->id =ida_alloc (&blk_queue_ida,GFP_KERNEL );if (q->id <0 ) - goto fail_srcu; + goto fail_q; q->stats =blk_alloc_queue_stats ();if (!q->stats)
@@ -434,11 +427,8 @@ struct request_queue *blk_alloc_queue(int node_id, bool alloc_srcu)blk_free_queue_stats (q->stats); fail_id:ida_free (&blk_queue_ida, q->id); -fail_srcu: -if (alloc_srcu) -cleanup_srcu_struct (q->srcu); fail_q: -kmem_cache_free (blk_get_queue_kmem_cache (alloc_srcu), q); +kmem_cache_free (blk_requestq_cachep, q);return NULL ; }
@@ -1183,9 +1173,6 @@ int __init blk_dev_init(void) sizeof_field(struct request, cmd_flags));BUILD_BUG_ON (REQ_OP_BITS +REQ_FLAG_BITS >8 * sizeof_field(struct bio, bi_opf)); -BUILD_BUG_ON (ALIGN (offsetof(struct request_queue , srcu), - __alignof__(struct request_queue )) != -sizeof (struct request_queue ));/* used for unplugging and affects IO latency/throughput - HIGHPRI */ kblockd_workqueue = alloc_workqueue("kblockd",
@@ -1196,10 +1183,6 @@ int __init blk_dev_init(void) blk_requestq_cachep =kmem_cache_create ("request_queue" ,sizeof (struct request_queue ),0 ,SLAB_PANIC ,NULL ); - blk_requestq_srcu_cachep =kmem_cache_create ("request_queue_srcu" , -sizeof (struct request_queue ) + -sizeof (struct srcu_struct ),0 ,SLAB_PANIC ,NULL ); - blk_debugfs_root =debugfs_create_dir ("block" ,NULL );return 0 ;
block/blk-mq.c +25 -8
@@ -261,8 +261,8 @@ EXPORT_SYMBOL_GPL(blk_mq_quiesce_queue_nowait);*/ void blk_mq_wait_quiesce_done (struct request_queue *q) { -if (blk_queue_has_srcu (q)) -synchronize_srcu (q->srcu); +if (q->tag_set->flags &BLK_MQ_F_BLOCKING ) +synchronize_srcu (q->tag_set->srcu);else synchronize_rcu (); }
@@ -4010,7 +4010,7 @@ static struct request_queue *blk_mq_init_queue_data(struct blk_mq_tag_set *set,struct request_queue *q;int ret; - q =blk_alloc_queue (set->numa_node, set->flags &BLK_MQ_F_BLOCKING ); + q =blk_alloc_queue (set->numa_node);if (!q)return ERR_PTR (-ENOMEM ); q->queuedata = queuedata;
@@ -4182,9 +4182,6 @@ static void blk_mq_update_poll_flag(struct request_queue *q)int blk_mq_init_allocated_queue (struct blk_mq_tag_set *set,struct request_queue *q) { -WARN_ON_ONCE (blk_queue_has_srcu (q) != - !!(set->flags &BLK_MQ_F_BLOCKING )); -/* mark the queue as mq asap */ q->mq_ops = set->ops;
@@ -4441,8 +4438,18 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)if (set->nr_maps ==1 && set->nr_hw_queues > nr_cpu_ids) set->nr_hw_queues = nr_cpu_ids; -if (blk_mq_alloc_tag_set_tags (set, set->nr_hw_queues) <0 ) -return -ENOMEM ; +if (set->flags &BLK_MQ_F_BLOCKING ) { + set->srcu =kmalloc (sizeof (*set->srcu),GFP_KERNEL ); +if (!set->srcu) +return -ENOMEM ; + ret =init_srcu_struct (set->srcu); +if (ret) + goto out_free_srcu; + } + + ret =blk_mq_alloc_tag_set_tags (set, set->nr_hw_queues); +if (ret) + goto out_cleanup_srcu; ret = -ENOMEM ;for (i =0 ; i < set->nr_maps; i++) {
@@ -4472,6 +4479,12 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) }kfree (set->tags); set->tags =NULL ; +out_cleanup_srcu: +if (set->flags &BLK_MQ_F_BLOCKING ) +cleanup_srcu_struct (set->srcu); +out_free_srcu: +if (set->flags &BLK_MQ_F_BLOCKING ) +kfree (set->srcu);return ret; }EXPORT_SYMBOL (blk_mq_alloc_tag_set);
@@ -4511,6 +4524,10 @@ void blk_mq_free_tag_set(struct blk_mq_tag_set *set)kfree (set->tags); set->tags =NULL ; +if (set->flags &BLK_MQ_F_BLOCKING ) { +cleanup_srcu_struct (set->srcu); +kfree (set->srcu); + } }EXPORT_SYMBOL (blk_mq_free_tag_set);
block/blk-mq.h +7 -7
@@ -377,17 +377,17 @@ static inline bool hctx_may_queue(struct blk_mq_hw_ctx *hctx,/* run the code block in @dispatch_ops with rcu/srcu read lock held */ #define __blk_mq_run_dispatch_ops (q, check_sleep, dispatch_ops) \ do { \ - if (!blk_queue_has_srcu(q)) { \ - rcu_read_lock(); \ - (dispatch_ops); \ - rcu_read_unlock(); \ - } else { \ + if ((q)->tag_set->flags & BLK_MQ_F_BLOCKING) { \ int srcu_idx; \ \ might_sleep_if(check_sleep); \ - srcu_idx = srcu_read_lock((q)->srcu); \ + srcu_idx = srcu_read_lock((q)->tag_set->srcu); \ (dispatch_ops); \ - srcu_read_unlock((q)->srcu, srcu_idx); \ + srcu_read_unlock((q)->tag_set->srcu, srcu_idx); \ + } else { \ + rcu_read_lock(); \ + (dispatch_ops); \ + rcu_read_unlock(); \ } \ } while (0)
block/blk-sysfs.c +2 -7
@@ -739,10 +739,8 @@ queue_attr_store(struct kobject *kobj, struct attribute *attr,static void blk_free_queue_rcu (struct rcu_head *rcu_head) { - struct request_queue *q = container_of(rcu_head, struct request_queue, - rcu_head); - -kmem_cache_free (blk_get_queue_kmem_cache (blk_queue_has_srcu (q)), q); +kmem_cache_free (blk_requestq_cachep, + container_of(rcu_head, struct request_queue, rcu_head)); }/**
@@ -779,9 +777,6 @@ static void blk_release_queue(struct kobject *kobj)if (queue_is_mq (q))blk_mq_release (q); -if (blk_queue_has_srcu (q)) -cleanup_srcu_struct (q->srcu); -ida_free (&blk_queue_ida, q->id);call_rcu (&q->rcu_head, blk_free_queue_rcu); }
block/blk.h +1 -8
@@ -27,7 +27,6 @@ struct blk_flush_queue { };extern struct kmem_cache *blk_requestq_cachep; -extern struct kmem_cache *blk_requestq_srcu_cachep;extern struct kobj_type blk_queue_ktype;extern struct ida blk_queue_ida;
@@ -428,13 +427,7 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio, struct page *page, unsigned int len, unsigned int offset, unsigned int max_sectors, bool *same_page); -static inline struct kmem_cache *blk_get_queue_kmem_cache (bool srcu) -{ -if (srcu) -return blk_requestq_srcu_cachep; -return blk_requestq_cachep; -} -struct request_queue *blk_alloc_queue (int node_id,bool alloc_srcu); +struct request_queue *blk_alloc_queue (int node_id);int disk_scan_partitions (struct gendisk *disk,fmode_t mode,void *owner);
block/genhd.c +1 -1
@@ -1417,7 +1417,7 @@ struct gendisk *__blk_alloc_disk(int node, struct lock_class_key *lkclass)struct request_queue *q;struct gendisk *disk; - q =blk_alloc_queue (node, false); + q =blk_alloc_queue (node);if (!q)return NULL ;
include/linux/blk-mq.h +4 -0
@@ -7,6 +7,7 @@#include <linux/lockdep.h> #include <linux/scatterlist.h> #include <linux/prefetch.h> +#include <linux/srcu.h> struct blk_mq_tags ;struct blk_flush_queue ;
@@ -501,6 +502,8 @@ enum hctx_type {* @tag_list_lock: Serializes tag_list accesses. * @tag_list: List of the request queues that use this tag set. See also * request_queue.tag_set_list. +* @srcu: Use as lock when type of the request queue is blocking +* (BLK_MQ_F_BLOCKING). */ struct blk_mq_tag_set {struct blk_mq_queue_map map[HCTX_MAX_TYPES ];
@@ -521,6 +524,7 @@ struct blk_mq_tag_set {struct mutex tag_list_lock;struct list_head tag_list; +struct srcu_struct *srcu; };/**
include/linux/blkdev.h +0 -9
@@ -22,7 +22,6 @@#include <linux/blkzoned.h> #include <linux/sched.h> #include <linux/sbitmap.h> -#include <linux/srcu.h> #include <linux/uuid.h> #include <linux/xarray.h>
@@ -544,18 +543,11 @@ struct request_queue {struct mutex debugfs_mutex;bool mq_sysfs_init_done; - -/** -* @srcu: Sleepable RCU. Use as lock when type of the request queue -* is blocking (BLK_MQ_F_BLOCKING). Must be the last member -*/ -struct srcu_struct srcu[]; };/* Keep blk_queue_flag_name[] in sync with the definitions below */ #define QUEUE_FLAG_STOPPED 0/* queue is stopped */ #define QUEUE_FLAG_DYING 1/* queue being torn down */ -#define QUEUE_FLAG_HAS_SRCU 2/* SRCU is allocated */ #define QUEUE_FLAG_NOMERGES 3/* disable merge attempts */ #define QUEUE_FLAG_SAME_COMP 4/* complete on same CPU-group */ #define QUEUE_FLAG_FAIL_IO 5/* fake timeout */
@@ -591,7 +583,6 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q);#define blk_queue_stopped (q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags)#define blk_queue_dying (q) test_bit(QUEUE_FLAG_DYING, &(q)->queue_flags) -#define blk_queue_has_srcu (q) test_bit(QUEUE_FLAG_HAS_SRCU, &(q)->queue_flags)#define blk_queue_init_done (q) test_bit(QUEUE_FLAG_INIT_DONE, &(q)->queue_flags)#define blk_queue_nomerges (q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags)#define blk_queue_noxmerges (q) \
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 35/313 blk-crypto: pass a gendisk to blk_crypto_sysfs_{,un}register
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 450deb93df7d457cdd93594a1987f9650c749b96 ]
Prepare for changes to the block layer sysfs handling by passing the readily available gendisk to blk_crypto_sysfs_{,un}register.
Stable-dep-of: 49e4d04f0486 ("block: Drop spurious might_sleep() from blk_put_queue()")
--- block/blk-crypto-internal.h | 10 ++++++---- block/blk-crypto-sysfs.c | 7 ++++--- block/blk-sysfs.c | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-)
block/blk-crypto-internal.h +6 -4
@@ -21,9 +21,9 @@ extern const struct blk_crypto_mode blk_crypto_modes[];#ifdef CONFIG_BLK_INLINE_ENCRYPTION -int blk_crypto_sysfs_register (struct request_queue *q); +int blk_crypto_sysfs_register (struct gendisk *disk); -void blk_crypto_sysfs_unregister (struct request_queue *q); +void blk_crypto_sysfs_unregister (struct gendisk *disk);void bio_crypt_dun_increment (u64 dun[BLK_CRYPTO_DUN_ARRAY_SIZE ],unsigned int inc);
@@ -67,12 +67,14 @@ static inline bool blk_crypto_rq_is_encrypted(struct request *rq)#else /* CONFIG_BLK_INLINE_ENCRYPTION */ -static inline int blk_crypto_sysfs_register (struct request_queue *q) +static inline int blk_crypto_sysfs_register (struct gendisk *disk) {return 0 ; } -static inline void blk_crypto_sysfs_unregister (struct request_queue *q) { } +static inline void blk_crypto_sysfs_unregister (struct gendisk *disk) +{ +}static inline bool bio_crypt_rq_ctx_compatible (struct request *rq,struct bio *bio)
block/blk-crypto-sysfs.c +4 -3
@@ -126,8 +126,9 @@ static struct kobj_type blk_crypto_ktype = {* If the request_queue has a blk_crypto_profile, create the "crypto" * subdirectory in sysfs (/sys/block/$disk/queue/crypto/). */ -int blk_crypto_sysfs_register (struct request_queue *q) +int blk_crypto_sysfs_register (struct gendisk *disk) { +struct request_queue *q = disk->queue;struct blk_crypto_kobj *obj;int err;
@@ -149,9 +150,9 @@ int blk_crypto_sysfs_register(struct request_queue *q)return 0 ; } -void blk_crypto_sysfs_unregister (struct request_queue *q) +void blk_crypto_sysfs_unregister (struct gendisk *disk) { -kobject_put (q->crypto_kobject); +kobject_put (disk->queue->crypto_kobject); }static int __init blk_crypto_sysfs_init (void )
block/blk-sysfs.c +2 -2
@@ -833,7 +833,7 @@ int blk_register_queue(struct gendisk *disk) goto put_dev; } - ret =blk_crypto_sysfs_register (q); + ret =blk_crypto_sysfs_register (disk);if (ret) goto put_dev;
@@ -910,7 +910,7 @@ void blk_unregister_queue(struct gendisk *disk)*/ if (queue_is_mq (q))blk_mq_sysfs_unregister (disk); -blk_crypto_sysfs_unregister (q); +blk_crypto_sysfs_unregister (disk);mutex_lock (&q->sysfs_lock);elv_unregister_queue (q);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 8/313 arm64: dts: imx8mp-phycore-som: Remove invalid PMIC property
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit cfd04dd1c4b6c33afc2a934b957d71cf8ddd1539 ]
'regulator-compatible' is not a valid property according to nxp,pca9450-regulator.yaml and causes the following warning:
DTC_CHK arch/arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dtb
...
pmic@25: regulators:LDO1: Unevaluated properties are not allowed ('regulator-compatible' was unexpected)
Remove the invalid 'regulator-compatible' property.
--- arch/arm64/boot/dts/freescale/imx8mp-phycore-som.dtsi | 10 ---------- 1 file changed, 10 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-phycore-som.dtsi +0 -10
@@ -99,7 +99,6 @@ pmic: pmic@25 { regulators { buck1: BUCK1 { - regulator-compatible = "BUCK1"; regulator-min-microvolt = <600000>; regulator-max-microvolt = <2187500>; regulator-boot-on;
@@ -108,7 +107,6 @@ buck1: BUCK1 { }; buck2: BUCK2 { - regulator-compatible = "BUCK2"; regulator-min-microvolt = <600000>; regulator-max-microvolt = <2187500>; regulator-boot-on;
@@ -119,7 +117,6 @@ buck2: BUCK2 { }; buck4: BUCK4 { - regulator-compatible = "BUCK4"; regulator-min-microvolt = <600000>; regulator-max-microvolt = <3400000>; regulator-boot-on;
@@ -127,7 +124,6 @@ buck4: BUCK4 { }; buck5: BUCK5 { - regulator-compatible = "BUCK5"; regulator-min-microvolt = <600000>; regulator-max-microvolt = <3400000>; regulator-boot-on;
@@ -135,7 +131,6 @@ buck5: BUCK5 { }; buck6: BUCK6 { - regulator-compatible = "BUCK6"; regulator-min-microvolt = <600000>; regulator-max-microvolt = <3400000>; regulator-boot-on;
@@ -143,7 +138,6 @@ buck6: BUCK6 { }; ldo1: LDO1 { - regulator-compatible = "LDO1"; regulator-min-microvolt = <1600000>; regulator-max-microvolt = <3300000>; regulator-boot-on;
@@ -151,7 +145,6 @@ ldo1: LDO1 { }; ldo2: LDO2 { - regulator-compatible = "LDO2"; regulator-min-microvolt = <800000>; regulator-max-microvolt = <1150000>; regulator-boot-on;
@@ -159,7 +152,6 @@ ldo2: LDO2 { }; ldo3: LDO3 { - regulator-compatible = "LDO3"; regulator-min-microvolt = <800000>; regulator-max-microvolt = <3300000>; regulator-boot-on;
@@ -167,13 +159,11 @@ ldo3: LDO3 { }; ldo4: LDO4 { - regulator-compatible = "LDO4"; regulator-min-microvolt = <800000>; regulator-max-microvolt = <3300000>; }; ldo5: LDO5 { - regulator-compatible = "LDO5"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; regulator-boot-on;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 9/313 ARM: dts: imx6ul-pico-dwarf: Use clock-frequency
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 94e2cf1e0db5b06c7a6ae0878c5cbec925819a8a ]
'clock_frequency' is not a valid property.
Use the correct 'clock-frequency' instead.
--- arch/arm/boot/dts/imx6ul-pico-dwarf.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx6ul-pico-dwarf.dts +1 -1
@@ -32,7 +32,7 @@ sys_mclk: clock-sys-mclk { }; &i2c2 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay";
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 10/313 ARM: dts: imx7d-pico: Use clock-frequency
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit f4dd0845c4f1f5371f1e06fef0e4a1734a2db964 ]
'clock_frequency' is not a valid property.
Use the correct 'clock-frequency' instead.
--- arch/arm/boot/dts/imx7d-pico-dwarf.dts | 4 ++-- arch/arm/boot/dts/imx7d-pico-nymph.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx7d-pico-dwarf.dts +2 -2
@@ -32,7 +32,7 @@ sys_mclk: clock-sys-mclk { }; &i2c1 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c1>; status = "okay";
@@ -52,7 +52,7 @@ pressure-sensor@60 { }; &i2c4 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c1>; status = "okay";
arch/arm/boot/dts/imx7d-pico-nymph.dts +2 -2
@@ -43,7 +43,7 @@ sys_mclk: clock-sys-mclk { }; &i2c1 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c1>; status = "okay";
@@ -64,7 +64,7 @@ adc@52 { }; &i2c2 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay";
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 11/313 ARM: dts: imx6qdl-gw560x: Remove incorrect uart-has-rtscts
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 9dfbc72256b5de608ad10989bcbafdbbd1ac8d4e ]
The following build warning is seen when running:
make dtbs_check DT_SCHEMA_FILES=fsl-imx-uart.yaml
arch/arm/boot/dts/imx6dl-gw560x.dtb: serial@2020000: rts-gpios: False schema does not allow [[20, 1, 0]]
From schema: Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
The imx6qdl-gw560x board does not expose the UART RTS and CTS as native UART pins, so 'uart-has-rtscts' should not be used.
Using 'uart-has-rtscts' with 'rts-gpios' is an invalid combination detected by serial.yaml.
Fix the problem by removing the incorrect 'uart-has-rtscts' property.
--- arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/imx6qdl-gw560x.dtsi +0 -1
@@ -632,7 +632,6 @@ &ssi1 { &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; - uart-has-rtscts; rts-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>; status = "okay"; };
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 12/313 arm64: dts: verdin-imx8mm: fix dahlia audio playback
In reply to Greg Kroah-HartmanFrom: Emanuele Ghidoli <[email protected]>
[ Upstream commit 0d1d030f00f3f3eea04017cbd50ffe44a2842ebc ]
Set optional simple-audio-card,mclk-fs parameter to ensure a proper clock to the wm8904 audio codec. Without this change with an audio stream rate of 44.1 kHz the playback is completely distorted.
--- arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi +1 -0
@@ -9,6 +9,7 @@ sound_card: sound-card { simple-audio-card,bitclock-master = <&dailink_master>; simple-audio-card,format = "i2s"; simple-audio-card,frame-master = <&dailink_master>; + simple-audio-card,mclk-fs = <256>; simple-audio-card,name = "imx8mm-wm8904"; simple-audio-card,routing = "Headphone Jack", "HPOUTL",
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 13/313 arm64: dts: imx8mm-beacon: Fix ecspi2 pinmux
In reply to Greg Kroah-HartmanFrom: Adam Ford <[email protected]>
[ Upstream commit 5225ba9db112ec4ed67da5e4d8b72e618573955e ]
Early hardware did not support hardware handshaking on the UART, but final production hardware did. When the hardware was updated the chip select was changed to facilitate hardware handshaking on UART3. Fix the ecspi2 pin mux to eliminate a pin conflict with UART3 and allow the EEPROM to operate again.
--- arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi +2 -2
@@ -120,7 +120,7 @@ &csi { &ecspi2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_espi2>; - cs-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; + cs-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>; status = "okay"; eeprom@0 {
@@ -316,7 +316,7 @@ pinctrl_espi2: espi2grp { MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0x82 MX8MM_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0x82 MX8MM_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0x82 - MX8MM_IOMUXC_ECSPI1_SS0_GPIO5_IO9 0x41 + MX8MM_IOMUXC_ECSPI2_SS0_GPIO5_IO13 0x41 >; };
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 4/313 arm64: dts: qcom: sc8280xp: fix primary USB-DP PHY reset
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit ee4e530bdde29a69c58656a919545251a782674e ]
The vendor kernel is using the GCC_USB4_DP_PHY_PRIM_BCR and GCC_USB4_1_DP_PHY_PRIM_BCR resets for the USB4-USB3-DP QMP PHYs.
Update the primary USB-DP PHY node to match.
--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +1 -1
@@ -1173,7 +1173,7 @@ usb_0_qmpphy: phy-wrapper@88ec000 { clock-names = "aux", "ref_clk_src", "ref", "com_aux"; resets = <&gcc GCC_USB3_PHY_PRIM_BCR>, - <&gcc GCC_USB3_DP_PHY_PRIM_BCR>; + <&gcc GCC_USB4_DP_PHY_PRIM_BCR>; reset-names = "phy", "common"; power-domains = <&gcc USB30_PRIM_GDSC>;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 37/313 block: fix error unwinding in blk_register_queue
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 40602997be26887bdfa3d58659c3acb4579099e9 ]
blk_register_queue fails to handle errors from blk_mq_sysfs_register, leaks various resources on errors and accidentally sets queue refs percpu refcount to percpu mode on kobject_add failure. Fix all that by properly unwinding on errors.
Stable-dep-of: 49e4d04f0486 ("block: Drop spurious might_sleep() from blk_put_queue()")
--- block/blk-sysfs.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
block/blk-sysfs.c +16 -12
@@ -820,13 +820,15 @@ int blk_register_queue(struct gendisk *disk)int ret;mutex_lock (&q->sysfs_dir_lock); - ret =kobject_add (&q->kobj, &disk_to_dev (disk)->kobj,"queue" );if (ret <0 ) - goto unlock; + goto out_unlock_dir; -if (queue_is_mq (q)) -blk_mq_sysfs_register (disk); +if (queue_is_mq (q)) { + ret =blk_mq_sysfs_register (disk); +if (ret) + goto out_del_queue_kobj; + }mutex_lock (&q->sysfs_lock);mutex_lock (&q->debugfs_mutex);
@@ -838,17 +840,17 @@ int blk_register_queue(struct gendisk *disk) ret =disk_register_independent_access_ranges (disk);if (ret) - goto put_dev; + goto out_debugfs_remove;if (q->elevator) { ret =elv_register_queue (q, false);if (ret) - goto put_dev; + goto out_unregister_ia_ranges; } ret =blk_crypto_sysfs_register (disk);if (ret) - goto put_dev; + goto out_elv_unregister;blk_queue_flag_set (QUEUE_FLAG_REGISTERED , q);wbt_enable_default (q);
@@ -859,8 +861,6 @@ int blk_register_queue(struct gendisk *disk)if (q->elevator)kobject_uevent (&q->elevator->kobj,KOBJ_ADD );mutex_unlock (&q->sysfs_lock); - -unlock:mutex_unlock (&q->sysfs_dir_lock);/*
@@ -879,13 +879,17 @@ int blk_register_queue(struct gendisk *disk)return ret; -put_dev: +out_elv_unregister:elv_unregister_queue (q); +out_unregister_ia_ranges:disk_unregister_independent_access_ranges (disk); +out_debugfs_remove: +blk_debugfs_remove (disk);mutex_unlock (&q->sysfs_lock); -mutex_unlock (&q->sysfs_dir_lock); +out_del_queue_kobj:kobject_del (&q->kobj); - +out_unlock_dir: +mutex_unlock (&q->sysfs_dir_lock);return ret; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 46/313 IB/hfi1: Reject a zero-length user expected buffer
In reply to Greg Kroah-HartmanFrom: Dean Luick <[email protected]>
[ Upstream commit 0a0a6e80472c98947d73c3d13bcd7d101895f55d ]
A zero length user buffer makes no sense and the code does not handle it correctly. Instead, reject a zero length as invalid.
--- drivers/infiniband/hw/hfi1/user_exp_rcv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/hfi1/user_exp_rcv.c +2 -0
@@ -256,6 +256,8 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,if (!PAGE_ALIGNED (tinfo->vaddr))return -EINVAL ; +if (tinfo->length ==0 ) +return -EINVAL ; tidbuf =kzalloc (sizeof (*tidbuf),GFP_KERNEL );if (!tidbuf)
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 47/313 IB/hfi1: Reserve user expected TIDs
In reply to Greg Kroah-HartmanFrom: Dean Luick <[email protected]>
[ Upstream commit ecf91551cdd2925ed6d9a9d99074fa5f67b90596 ]
To avoid a race, reserve the number of user expected TIDs before setup.
--- drivers/infiniband/hw/hfi1/user_exp_rcv.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/infiniband/hw/hfi1/user_exp_rcv.c +6 -8
@@ -282,16 +282,13 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,/* Find sets of physically contiguous pages */ tidbuf->n_psets =find_phys_blocks (tidbuf, pinned); -/* -* We don't need to access this under a lock since tid_used is per -* process and the same process cannot be in hfi1_user_exp_rcv_clear() -* and hfi1_user_exp_rcv_setup() at the same time. -*/ +/* Reserve the number of expected tids to be used. */ spin_lock (&fd->tid_lock);if (fd->tid_used + tidbuf->n_psets > fd->tid_limit) pageset_count = fd->tid_limit - fd->tid_used;else pageset_count = tidbuf->n_psets; + fd->tid_used += pageset_count;spin_unlock (&fd->tid_lock);if (!pageset_count)
@@ -400,10 +397,11 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, nomem:hfi1_cdbg (TID ,"total mapped: tidpairs:%u pages:%u (%d)" , tididx, mapped_pages, ret); +/* adjust reserved tid_used to actual count */ +spin_lock (&fd->tid_lock); + fd->tid_used -= pageset_count - tididx; +spin_unlock (&fd->tid_lock);if (tididx) { -spin_lock (&fd->tid_lock); - fd->tid_used += tididx; -spin_unlock (&fd->tid_lock); tinfo->tidcnt = tididx; tinfo->length = mapped_pages *PAGE_SIZE ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 48/313 IB/hfi1: Fix expected receive setup error exit issues
In reply to Greg Kroah-HartmanFrom: Dean Luick <[email protected]>
[ Upstream commit e0c4a422f5246abefbf7c178ef99a1f2dc3c5f62 ]
Fix three error exit issues in expected receive setup. Re-arrange error exits to increase readability.
Issues and fixes:
1. Possible missed page unpin if tidlist copyout fails and not all pinned pages where made part of a TID.
Fix: Unpin the unused pages.
2. Return success with unset return values tidcnt and length when no pages were pinned.
Fix: Return -ENOSPC if no pages were pinned.
3. Return success with unset return values tidcnt and length when no rcvarray entries available.
Fix: Return -ENOSPC if no rcvarray entries are available.
--- drivers/infiniband/hw/hfi1/user_exp_rcv.c | 83 ++++++++++++++--------- 1 file changed, 50 insertions(+), 33 deletions(-)
drivers/infiniband/hw/hfi1/user_exp_rcv.c +50 -33
@@ -268,15 +268,14 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, tidbuf->psets =kcalloc (uctxt->expected_count,sizeof (*tidbuf->psets),GFP_KERNEL );if (!tidbuf->psets) { -kfree (tidbuf); -return -ENOMEM ; + ret = -ENOMEM ; + goto fail_release_mem; } pinned =pin_rcv_pages (fd, tidbuf);if (pinned <=0 ) { -kfree (tidbuf->psets); -kfree (tidbuf); -return pinned; + ret = (pinned <0 ) ? pinned : -ENOSPC ; + goto fail_unpin; }/* Find sets of physically contiguous pages */
@@ -291,14 +290,16 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, fd->tid_used += pageset_count;spin_unlock (&fd->tid_lock); -if (!pageset_count) - goto bail; +if (!pageset_count) { + ret = -ENOSPC ; + goto fail_unreserve; + } ngroups = pageset_count / dd->rcv_entries.group_size; tidlist =kcalloc (pageset_count,sizeof (*tidlist),GFP_KERNEL );if (!tidlist) { ret = -ENOMEM ; - goto nomem; + goto fail_unreserve; } tididx =0 ;
@@ -394,44 +395,60 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, } unlock:mutex_unlock (&uctxt->exp_mutex); -nomem:hfi1_cdbg (TID ,"total mapped: tidpairs:%u pages:%u (%d)" , tididx, mapped_pages, ret); + +/* fail if nothing was programmed, set error if none provided */ +if (tididx ==0 ) { +if (ret >=0 ) + ret = -ENOSPC ; + goto fail_unreserve; + } +/* adjust reserved tid_used to actual count */ spin_lock (&fd->tid_lock); fd->tid_used -= pageset_count - tididx;spin_unlock (&fd->tid_lock); -if (tididx) { - tinfo->tidcnt = tididx; - tinfo->length = mapped_pages *PAGE_SIZE ; -if (copy_to_user (u64_to_user_ptr (tinfo->tidlist), - tidlist,sizeof (tidlist[0 ]) * tididx)) { -/* -* On failure to copy to the user level, we need to undo -* everything done so far so we don't leak resources. -*/ - tinfo->tidlist = (unsigned long )&tidlist; -hfi1_user_exp_rcv_clear (fd, tinfo); - tinfo->tidlist =0 ; - ret = -EFAULT ; - goto bail; - } +/* unpin all pages not covered by a TID */ +unpin_rcv_pages (fd, tidbuf,NULL , mapped_pages, pinned - mapped_pages, + false); + + tinfo->tidcnt = tididx; + tinfo->length = mapped_pages *PAGE_SIZE ; + +if (copy_to_user (u64_to_user_ptr (tinfo->tidlist), + tidlist,sizeof (tidlist[0 ]) * tididx)) { + ret = -EFAULT ; + goto fail_unprogram; } -/* -* If not everything was mapped (due to insufficient RcvArray entries, -* for example), unpin all unmapped pages so we can pin them nex time. -*/ -if (mapped_pages != pinned) -unpin_rcv_pages (fd, tidbuf,NULL , mapped_pages, - (pinned - mapped_pages), false); -bail: +kfree (tidbuf->pages);kfree (tidbuf->psets); +kfree (tidbuf);kfree (tidlist); +return 0 ; + +fail_unprogram: +/* unprogram, unmap, and unpin all allocated TIDs */ + tinfo->tidlist = (unsigned long )tidlist; +hfi1_user_exp_rcv_clear (fd, tinfo); + tinfo->tidlist =0 ; + pinned =0 ;/* nothing left to unpin */ + pageset_count =0 ;/* nothing left reserved */ +fail_unreserve: +spin_lock (&fd->tid_lock); + fd->tid_used -= pageset_count; +spin_unlock (&fd->tid_lock); +fail_unpin: +if (pinned >0 ) +unpin_rcv_pages (fd, tidbuf,NULL ,0 , pinned, false); +fail_release_mem:kfree (tidbuf->pages); +kfree (tidbuf->psets);kfree (tidbuf); -return ret >0 ?0 : ret; +kfree (tidlist); +return ret; } int hfi1_user_exp_rcv_clear(struct hfi1_filedata *fd,
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 49/313 IB/hfi1: Immediately remove invalid memory from hardware
In reply to Greg Kroah-HartmanFrom: Dean Luick <[email protected]>
[ Upstream commit 1c7edde1b5720ddb0aff5ca8c7f605a0f92526eb ]
When a user expected receive page is unmapped, it should be immediately removed from hardware rather than depend on a reaction from user space.
--- drivers/infiniband/hw/hfi1/user_exp_rcv.c | 43 +++++++++++++++-------- drivers/infiniband/hw/hfi1/user_exp_rcv.h | 1 + 2 files changed, 30 insertions(+), 14 deletions(-)
drivers/infiniband/hw/hfi1/user_exp_rcv.c +29 -14
@@ -28,8 +28,9 @@ static int program_rcvarray(struct hfi1_filedata *fd, struct tid_user_buf *, unsigned int start, u16 count, u32 *tidlist, unsigned int *tididx, unsigned int *pmapped); -static int unprogram_rcvarray (struct hfi1_filedata *fd,u32 tidinfo, -struct tid_group **grp); +static int unprogram_rcvarray (struct hfi1_filedata *fd,u32 tidinfo); +static void __clear_tid_node (struct hfi1_filedata *fd, +struct tid_rb_node *node);static void clear_tid_node (struct hfi1_filedata *fd,struct tid_rb_node *node);static const struct mmu_interval_notifier_ops tid_mn_ops = {
@@ -469,7 +470,7 @@ int hfi1_user_exp_rcv_clear(struct hfi1_filedata *fd,mutex_lock (&uctxt->exp_mutex);for (tididx =0 ; tididx < tinfo->tidcnt; tididx++) { - ret =unprogram_rcvarray (fd, tidinfo[tididx],NULL ); + ret =unprogram_rcvarray (fd, tidinfo[tididx]);if (ret) {hfi1_cdbg (TID ,"Failed to unprogram rcv array %d" , ret);
@@ -723,6 +724,7 @@ static int set_rcvarray_entry(struct hfi1_filedata *fd, } node->fdata = fd; +mutex_init (&node->invalidate_mutex); node->phys =page_to_phys (pages[0 ]); node->npages = npages; node->rcventry = rcventry;
@@ -762,8 +764,7 @@ static int set_rcvarray_entry(struct hfi1_filedata *fd,return -EFAULT ; } -static int unprogram_rcvarray (struct hfi1_filedata *fd,u32 tidinfo, -struct tid_group **grp) +static int unprogram_rcvarray (struct hfi1_filedata *fd,u32 tidinfo) {struct hfi1_ctxtdata *uctxt = fd->uctxt;struct hfi1_devdata *dd = uctxt->dd;
@@ -786,9 +787,6 @@ static int unprogram_rcvarray(struct hfi1_filedata *fd, u32 tidinfo,if (!node || node->rcventry != (uctxt->expected_base + rcventry))return -EBADF ; -if (grp) - *grp = node->grp; -if (fd->use_mn)mmu_interval_notifier_remove (&node->notifier);cacheless_tid_rb_remove (fd, node);
@@ -796,23 +794,34 @@ static int unprogram_rcvarray(struct hfi1_filedata *fd, u32 tidinfo,return 0 ; } -static void clear_tid_node (struct hfi1_filedata *fd,struct tid_rb_node *node) +static void __clear_tid_node (struct hfi1_filedata *fd,struct tid_rb_node *node) {struct hfi1_ctxtdata *uctxt = fd->uctxt;struct hfi1_devdata *dd = uctxt->dd; +mutex_lock (&node->invalidate_mutex); +if (node->freed) + goto done; + node->freed = true; +trace_hfi1_exp_tid_unreg (uctxt->ctxt, fd->subctxt, node->rcventry, node->npages, node->notifier.interval_tree.start, node->phys, node->dma_addr); -/* -* Make sure device has seen the write before we unpin the -* pages. -*/ +/* Make sure device has seen the write before pages are unpinned */ hfi1_put_tid (dd, node->rcventry,PT_INVALID_FLUSH ,0 ,0 );unpin_rcv_pages (fd,NULL , node,0 , node->npages, true); +done: +mutex_unlock (&node->invalidate_mutex); +} + +static void clear_tid_node (struct hfi1_filedata *fd,struct tid_rb_node *node) +{ +struct hfi1_ctxtdata *uctxt = fd->uctxt; + +__clear_tid_node (fd, node); node->grp->used--; node->grp->map &= ~(1 << (node->rcventry - node->grp->base));
@@ -871,10 +880,16 @@ static bool tid_rb_invalidate(struct mmu_interval_notifier *mni,if (node->freed)return true; +/* take action only if unmapping */ +if (range->event !=MMU_NOTIFY_UNMAP ) +return true; +trace_hfi1_exp_tid_inval (uctxt->ctxt, fdata->subctxt, node->notifier.interval_tree.start, node->rcventry, node->npages, node->dma_addr); - node->freed = true; + +/* clear the hardware rcvarray entry */ +__clear_tid_node (fdata, node);spin_lock (&fdata->invalid_lock);if (fdata->invalid_tid_idx < uctxt->expected_count) {
drivers/infiniband/hw/hfi1/user_exp_rcv.h +1 -0
@@ -27,6 +27,7 @@ struct tid_user_buf {struct tid_rb_node {struct mmu_interval_notifier notifier;struct hfi1_filedata *fdata; +struct mutex invalidate_mutex;/* covers hw removal */ unsigned long phys;struct tid_group *grp;u32 rcventry;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 50/313 IB/hfi1: Remove user expected buffer invalidate race
In reply to Greg Kroah-HartmanFrom: Dean Luick <[email protected]>
[ Upstream commit b3deec25847bda34e34d5d7be02f633caf000bd8 ]
During setup, there is a possible race between a page invalidate and hardware programming. Add a covering invalidate over the user target range during setup. If anything within that range is invalidated during setup, fail the setup. Once set up, each TID will have its own invalidate callback and invalidate.
--- drivers/infiniband/hw/hfi1/user_exp_rcv.c | 58 +++++++++++++++++++++-- drivers/infiniband/hw/hfi1/user_exp_rcv.h | 2 + 2 files changed, 55 insertions(+), 5 deletions(-)
drivers/infiniband/hw/hfi1/user_exp_rcv.c +53 -5
@@ -23,6 +23,9 @@ static void cacheless_tid_rb_remove(struct hfi1_filedata *fdata,static bool tid_rb_invalidate (struct mmu_interval_notifier *mni,const struct mmu_notifier_range *range,unsigned long cur_seq); +static bool tid_cover_invalidate (struct mmu_interval_notifier *mni, +const struct mmu_notifier_range *range, +unsigned long cur_seq); static int program_rcvarray(struct hfi1_filedata *fd, struct tid_user_buf *, struct tid_group *grp, unsigned int start, u16 count,
@@ -36,6 +39,9 @@ static void clear_tid_node(struct hfi1_filedata *fd, struct tid_rb_node *node);static const struct mmu_interval_notifier_ops tid_mn_ops = { .invalidate = tid_rb_invalidate, }; +static const struct mmu_interval_notifier_ops tid_cover_ops = { + .invalidate = tid_cover_invalidate, +};/* * Initialize context and file private data needed for Expected
@@ -254,6 +260,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, tididx =0 , mapped, mapped_pages =0 ;u32 *tidlist =NULL ;struct tid_user_buf *tidbuf; +unsigned long mmu_seq =0 ;if (!PAGE_ALIGNED (tinfo->vaddr))return -EINVAL ;
@@ -264,6 +271,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,if (!tidbuf)return -ENOMEM ; +mutex_init (&tidbuf->cover_mutex); tidbuf->vaddr = tinfo->vaddr; tidbuf->length = tinfo->length; tidbuf->psets = kcalloc(uctxt->expected_count, sizeof(*tidbuf->psets),
@@ -273,6 +281,16 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, goto fail_release_mem; } +if (fd->use_mn) { + ret =mmu_interval_notifier_insert ( + &tidbuf->notifier, current->mm, + tidbuf->vaddr, tidbuf->npages *PAGE_SIZE , + &tid_cover_ops); +if (ret) + goto fail_release_mem; + mmu_seq =mmu_interval_read_begin (&tidbuf->notifier); + } + pinned =pin_rcv_pages (fd, tidbuf);if (pinned <=0 ) { ret = (pinned <0 ) ? pinned : -ENOSPC ;
@@ -415,6 +433,20 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,unpin_rcv_pages (fd, tidbuf,NULL , mapped_pages, pinned - mapped_pages, false); +if (fd->use_mn) { +/* check for an invalidate during setup */ +bool fail = false; + +mutex_lock (&tidbuf->cover_mutex); + fail =mmu_interval_read_retry (&tidbuf->notifier, mmu_seq); +mutex_unlock (&tidbuf->cover_mutex); + +if (fail) { + ret = -EBUSY ; + goto fail_unprogram; + } + } + tinfo->tidcnt = tididx; tinfo->length = mapped_pages *PAGE_SIZE ;
@@ -424,6 +456,8 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, goto fail_unprogram; } +if (fd->use_mn) +mmu_interval_notifier_remove (&tidbuf->notifier);kfree (tidbuf->pages);kfree (tidbuf->psets);kfree (tidbuf);
@@ -442,6 +476,8 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, fd->tid_used -= pageset_count;spin_unlock (&fd->tid_lock); fail_unpin: +if (fd->use_mn) +mmu_interval_notifier_remove (&tidbuf->notifier);if (pinned >0 )unpin_rcv_pages (fd, tidbuf,NULL ,0 , pinned, false); fail_release_mem:
@@ -740,11 +776,6 @@ static int set_rcvarray_entry(struct hfi1_filedata *fd, &tid_mn_ops);if (ret) goto out_unmap; -/* -* FIXME: This is in the wrong order, the notifier should be -* established before the pages are pinned by pin_rcv_pages. -*/ -mmu_interval_read_begin (&node->notifier); } fd->entry_to_rb[node->rcventry - uctxt->expected_base] = node;
@@ -919,6 +950,23 @@ static bool tid_rb_invalidate(struct mmu_interval_notifier *mni,return true; } +static bool tid_cover_invalidate (struct mmu_interval_notifier *mni, +const struct mmu_notifier_range *range, +unsigned long cur_seq) +{ +struct tid_user_buf *tidbuf = + container_of(mni, struct tid_user_buf, notifier); + +/* take action only if unmapping */ +if (range->event ==MMU_NOTIFY_UNMAP ) { +mutex_lock (&tidbuf->cover_mutex); +mmu_interval_set_seq (mni, cur_seq); +mutex_unlock (&tidbuf->cover_mutex); + } + +return true; +} +static void cacheless_tid_rb_remove (struct hfi1_filedata *fdata,struct tid_rb_node *tnode) {
drivers/infiniband/hw/hfi1/user_exp_rcv.h +2 -0
@@ -16,6 +16,8 @@ struct tid_pageset { };struct tid_user_buf { +struct mmu_interval_notifier notifier; +struct mutex cover_mutex;unsigned long vaddr;unsigned long length;unsigned int npages;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 51/313 affs: initialize fsdata in affs_truncate()
In reply to Greg Kroah-HartmanFrom: Alexander Potapenko <[email protected]>
[ Upstream commit eef034ac6690118c88f357b00e2b3239c9d8575d ]
When aops->write_begin() does not initialize fsdata, KMSAN may report an error passing the latter to aops->write_end().
Fix this by unconditionally initializing fsdata.
--- fs/affs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/affs/file.c +1 -1
@@ -880,7 +880,7 @@ affs_truncate(struct inode *inode)if (inode->i_size >AFFS_I (inode)->mmu_private) {struct address_space *mapping = inode->i_mapping;struct page *page; -void *fsdata; +void *fsdata =NULL ;loff_t isize = inode->i_size;int res;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 52/313 PM: AVS: qcom-cpr: Fix an error handling path in cpr_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 6049aae52392539e505bfb8ccbcff3c26f1d2f0b ]
If an error occurs after a successful pm_genpd_init() call, it should be undone by a corresponding pm_genpd_remove().
Add the missing call in the error handling path, as already done in the remove function.
--- drivers/soc/qcom/cpr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/soc/qcom/cpr.c +5 -1
@@ -1708,12 +1708,16 @@ static int cpr_probe(struct platform_device *pdev) ret =of_genpd_add_provider_simple (dev->of_node, &drv->pd);if (ret) -return ret; + goto err_remove_genpd;platform_set_drvdata (pdev, drv);cpr_debugfs_init (drv);return 0 ; + +err_remove_genpd: +pm_genpd_remove (&drv->pd); +return ret; }static int cpr_remove (struct platform_device *pdev)
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 53/313 arm64: dts: qcom: msm8992: Dont use sfpb mutex
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 2bd5ab93335bf2c4d22c8db427822ae637ed8dc3 ]
MSM8992 uses the same mutex hardware as MSM8994. This was wrong from the start, but never presented as an issue until the sfpb compatible was given different driver data.
--- arch/arm64/boot/dts/qcom/msm8992.dtsi | 4 ---- 1 file changed, 4 deletions(-)
arch/arm64/boot/dts/qcom/msm8992.dtsi +0 -4
@@ -36,10 +36,6 @@ &rpmcc { compatible = "qcom,rpmcc-msm8992", "qcom,rpmcc"; }; -&tcsr_mutex { - compatible = "qcom,sfpb-mutex"; -}; - &timer { interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 54/313 arm64: dts: qcom: msm8992-libra: Fix the memory map
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 69876bc6fd4de3ad2dc7826fe269e91fa2c1807f ]
The memory map was wrong. Fix it to prevent the device from randomly rebooting.
--- .../boot/dts/qcom/msm8992-xiaomi-libra.dts | 77 +++++++++++++++---- 1 file changed, 60 insertions(+), 17 deletions(-)
arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts +60 -17
@@ -11,6 +11,12 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/gpio-keys.h> +/delete-node/ &adsp_mem; +/delete-node/ &audio_mem; +/delete-node/ &mpss_mem; +/delete-node/ &peripheral_region; +/delete-node/ &rmtfs_mem; + / { model = "Xiaomi Mi 4C"; compatible = "xiaomi,libra", "qcom,msm8992";
@@ -70,25 +76,67 @@ reserved-memory { #size-cells = <2>; ranges; - /* This is for getting crash logs using Android downstream kernels */ - ramoops@dfc00000 { - compatible = "ramoops"; - reg = <0x0 0xdfc00000 0x0 0x40000>; - console-size = <0x10000>; - record-size = <0x10000>; - ftrace-size = <0x10000>; - pmsg-size = <0x20000>; + memory_hole: hole@6400000 { + reg = <0 0x06400000 0 0x600000>; + no-map; + }; + + memory_hole2: hole2@6c00000 { + reg = <0 0x06c00000 0 0x2400000>; + no-map; + }; + + mpss_mem: mpss@9000000 { + reg = <0 0x09000000 0 0x5a00000>; + no-map; + }; + + tzapp: tzapp@ea00000 { + reg = <0 0x0ea00000 0 0x1900000>; + no-map; + }; + + mdm_rfsa_mem: mdm-rfsa@ca0b0000 { + reg = <0 0xca0b0000 0 0x10000>; + no-map; + }; + + rmtfs_mem: rmtfs@ca100000 { + compatible = "qcom,rmtfs-mem"; + reg = <0 0xca100000 0 0x180000>; + no-map; + + qcom,client-id = <1>; }; - modem_region: modem_region@9000000 { - reg = <0x0 0x9000000 0x0 0x5a00000>; + audio_mem: audio@cb400000 { + reg = <0 0xcb000000 0 0x400000>; + no-mem; + }; + + qseecom_mem: qseecom@cb400000 { + reg = <0 0xcb400000 0 0x1c00000>; + no-mem; + }; + + adsp_rfsa_mem: adsp-rfsa@cd000000 { + reg = <0 0xcd000000 0 0x10000>; no-map; }; - tzapp: modem_region@ea00000 { - reg = <0x0 0xea00000 0x0 0x1900000>; + sensor_rfsa_mem: sensor-rfsa@cd010000 { + reg = <0 0xcd010000 0 0x10000>; no-map; }; + + ramoops@dfc00000 { + compatible = "ramoops"; + reg = <0 0xdfc00000 0 0x40000>; + console-size = <0x10000>; + record-size = <0x10000>; + ftrace-size = <0x10000>; + pmsg-size = <0x20000>; + }; }; };
@@ -130,11 +178,6 @@ &blsp2_uart2 { status = "okay"; }; -&peripheral_region { - reg = <0x0 0x7400000 0x0 0x1c00000>; - no-map; -}; - &pm8994_spmi_regulators { VDD_APC0: s8 { regulator-min-microvolt = <680000>;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 55/313 kbuild: export top-level LDFLAGS_vmlinux only to scripts/Makefile.vmlinux
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 8debed3efe3a731451ad9a91a7a74eeb18a7f7eb ]
Nathan Chancellor reports that $(NM) emits an error message when GNU Make 4.4 is used to build the ARM zImage.
$ make-4.4 ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- O=build defconfig zImage
[snip]
LD vmlinux
NM System.map
SORTTAB vmlinux
OBJCOPY arch/arm/boot/Image
Kernel: arch/arm/boot/Image is ready
arm-linux-gnueabi-nm: 'arch/arm/boot/compressed/../../../../vmlinux': No such file
/bin/sh: 1: arithmetic expression: expecting primary: " "
LDS arch/arm/boot/compressed/vmlinux.lds
AS arch/arm/boot/compressed/head.o
GZIP arch/arm/boot/compressed/piggy_data
AS arch/arm/boot/compressed/piggy.o
CC arch/arm/boot/compressed/misc.oThis occurs since GNU Make commit 98da874c4303 ("[SV 10593] Export variables to $(shell ...) commands"), and the O= option is needed to reproduce it. The generated zImage is correct despite the error message.
As the commit description of 98da874c4303 [1] says, exported variables are passed down to $(shell ) functions, which means exported recursive variables might be expanded earlier than before, in the parse stage.
The following test code demonstrates the change for GNU Make 4.4.
[Test Makefile]
$(shell echo hello > foo)
export foo = $(shell cat bar/../foo)
$(shell mkdir bar)
all:
@echo $(foo)[GNU Make 4.3]
$ rm -rf bar; make-4.3 hello
[GNU Make 4.4]
$ rm -rf bar; make-4.4 cat: bar/../foo: No such file or directory hello
The 'foo' is a resursively expanded (i.e. lazily expanded) variable.
GNU Make 4.3 expands 'foo' just before running the recipe '@echo $(foo)', at this point, the directory 'bar' exists.
GNU Make 4.4 expands 'foo' to evaluate $(shell mkdir bar) because it is exported. At this point, the directory 'bar' does not exit yet. The cat command cannot resolve the bar/../foo path, hence the error message.
Let's get back to the kernel Makefile.
In arch/arm/boot/compressed/Makefile, KBSS_SZ is referenced by LDFLAGS_vmlinux, which is recursive and also exported by the top Makefile.
GNU Make 4.3 expands KBSS_SZ just before running the recipes, so no error message.
GNU Make 4.4 expands KBSS_SZ in the parse stage, where the directory arm/arm/boot/compressed does not exit yet. When compiled with O=, the output directory is created by $(shell mkdir -p $(obj-dirs)) in scripts/Makefile.build.
There are two ways to fix this particular issue:
- change "$(obj)/../../../../vmlinux" in KBSS_SZ to "vmlinux"
- unexport LDFLAGS_vmlinux
This commit takes the latter course because it is what I originally intended.
Commit 3ec8a5b33dea ("kbuild: do not export LDFLAGS_vmlinux") unexported LDFLAGS_vmlinux.
Commit 5d4aeffbf709 ("kbuild: rebuild .vmlinux.export.o when its prerequisite is updated") accidentally exported it again.
We can clean up arch/arm/boot/compressed/Makefile later.
[1]: https://git.savannah.gnu.org/cgit/make.git/commit/?id=98da874c43035a490cdca81331724f233a3d0c9a
--- Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
Makefile +13 -1
@@ -538,7 +538,7 @@ LDFLAGS_MODULE = CFLAGS_KERNEL = RUSTFLAGS_KERNEL = AFLAGS_KERNEL = -export LDFLAGS_vmlinux = +LDFLAGS_vmlinux = # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE := \
@@ -1232,6 +1232,18 @@ vmlinux.o modules.builtin.modinfo modules.builtin: vmlinux_o @: PHONY += vmlinux +# LDFLAGS_vmlinux in the top Makefile defines linker flags for the top vmlinux, +# not for decompressors. LDFLAGS_vmlinux in arch/*/boot/compressed/Makefile is +# unrelated; the decompressors just happen to have the same base name, +# arch/*/boot/compressed/vmlinux. +# Export LDFLAGS_vmlinux only to scripts/Makefile.vmlinux. +# +# _LDFLAGS_vmlinux is a workaround for the 'private export' bug: +# https://savannah.gnu.org/bugs/?61463 +# For Make > 4.4, the following simple code will work: +# vmlinux: private export LDFLAGS_vmlinux := $(LDFLAGS_vmlinux) +vmlinux: private _LDFLAGS_vmlinux := $(LDFLAGS_vmlinux) +vmlinux: export LDFLAGS_vmlinux = $(_LDFLAGS_vmlinux) vmlinux: vmlinux.o $(KBUILD_LDS) modpost $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 38/313 block: untangle request_queue refcounting from sysfs
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 2bd85221a625b316114bafaab527770b607095d3 ]
The kobject embedded into the request_queue is used for the queue directory in sysfs, but that is a child of the gendisks directory and is intimately tied to it. Move this kobject to the gendisk and use a refcount_t in the request_queue for the actual request_queue refcounting that is completely unrelated to the device model.
Stable-dep-of: 49e4d04f0486 ("block: Drop spurious might_sleep() from blk_put_queue()")
--- block/blk-core.c | 42 ++++++++++++++++---- block/blk-crypto-sysfs.c | 4 +- block/blk-ia-ranges.c | 3 +- block/blk-sysfs.c | 86 +++++++++++----------------------------- block/blk.h | 4 -- block/bsg.c | 11 +++-- block/elevator.c | 2 +- include/linux/blkdev.h | 6 +-- 8 files changed, 71 insertions(+), 87 deletions(-)
block/blk-core.c +34 -8
@@ -59,12 +59,12 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_split);EXPORT_TRACEPOINT_SYMBOL_GPL (block_unplug);EXPORT_TRACEPOINT_SYMBOL_GPL (block_rq_insert); -DEFINE_IDA (blk_queue_ida); +static DEFINE_IDA (blk_queue_ida);/* * For queue allocation */ -struct kmem_cache *blk_requestq_cachep; +static struct kmem_cache *blk_requestq_cachep;/* * Controlling structure to kblockd
@@ -252,19 +252,46 @@ void blk_clear_pm_only(struct request_queue *q) }EXPORT_SYMBOL_GPL (blk_clear_pm_only); +static void blk_free_queue_rcu (struct rcu_head *rcu_head) +{ +kmem_cache_free (blk_requestq_cachep, + container_of(rcu_head, struct request_queue, rcu_head)); +} + +static void blk_free_queue (struct request_queue *q) +{ +might_sleep (); + +percpu_ref_exit (&q->q_usage_counter); + +if (q->poll_stat) +blk_stat_remove_callback (q, q->poll_cb); +blk_stat_free_callback (q->poll_cb); + +blk_free_queue_stats (q->stats); +kfree (q->poll_stat); + +if (queue_is_mq (q)) +blk_mq_release (q); + +ida_free (&blk_queue_ida, q->id); +call_rcu (&q->rcu_head, blk_free_queue_rcu); +} +/** * blk_put_queue - decrement the request_queue refcount * @q: the request_queue structure to decrement the refcount for * -* Decrements the refcount of the request_queue kobject. When this reaches 0 -* we'll have blk_release_queue() called. +* Decrements the refcount of the request_queue and free it when the refcount +* reaches 0. * * Context: Any context, but the last reference must not be dropped from * atomic context. */ void blk_put_queue (struct request_queue *q) { -kobject_put (&q->kobj); +if (refcount_dec_and_test (&q->refs)) +blk_free_queue (q); }EXPORT_SYMBOL (blk_put_queue);
@@ -399,8 +426,7 @@ struct request_queue *blk_alloc_queue(int node_id)INIT_WORK (&q->timeout_work, blk_timeout_work);INIT_LIST_HEAD (&q->icq_list); -kobject_init (&q->kobj, &blk_queue_ktype); - +refcount_set (&q->refs,1 );mutex_init (&q->debugfs_mutex);mutex_init (&q->sysfs_lock);mutex_init (&q->sysfs_dir_lock);
@@ -444,7 +470,7 @@ bool blk_get_queue(struct request_queue *q) {if (unlikely (blk_queue_dying (q)))return false; -kobject_get (&q->kobj); +refcount_inc (&q->refs);return true; }EXPORT_SYMBOL (blk_get_queue);
block/blk-crypto-sysfs.c +2 -2
@@ -140,8 +140,8 @@ int blk_crypto_sysfs_register(struct gendisk *disk)return -ENOMEM ; obj->profile = q->crypto_profile; - err =kobject_init_and_add (&obj->kobj, &blk_crypto_ktype, &q->kobj, -"crypto" ); + err =kobject_init_and_add (&obj->kobj, &blk_crypto_ktype, + &disk->queue_kobj,"crypto" );if (err) {kobject_put (&obj->kobj);return err;
block/blk-ia-ranges.c +2 -1
@@ -123,7 +123,8 @@ int disk_register_independent_access_ranges(struct gendisk *disk)*/ WARN_ON (iars->sysfs_registered); ret =kobject_init_and_add (&iars->kobj, &blk_ia_ranges_ktype, - &q->kobj,"%s" ,"independent_access_ranges" ); + &disk->queue_kobj,"%s" , +"independent_access_ranges" );if (ret) { disk->ia_ranges =NULL ;kobject_put (&iars->kobj);
block/blk-sysfs.c +23 -63
156 lines not on this page · raw message
block/blk.h +0 -4
@@ -26,10 +26,6 @@ struct blk_flush_queue {spinlock_t mq_flush_lock; }; -extern struct kmem_cache *blk_requestq_cachep; -extern struct kobj_type blk_queue_ktype; -extern struct ida blk_queue_ida; -bool is_flush_rq (struct request *req); struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size,
block/bsg.c +7 -4
@@ -175,8 +175,10 @@ static void bsg_device_release(struct device *dev)void bsg_unregister_queue (struct bsg_device *bd) { -if (bd->queue->kobj.sd) -sysfs_remove_link (&bd->queue->kobj,"bsg" ); +struct gendisk *disk = bd->queue->disk; + +if (disk && disk->queue_kobj.sd) +sysfs_remove_link (&disk->queue_kobj,"bsg" );cdev_device_del (&bd->cdev, &bd->device);put_device (&bd->device); }
@@ -216,8 +218,9 @@ struct bsg_device *bsg_register_queue(struct request_queue *q,if (ret) goto out_put_device; -if (q->kobj.sd) { - ret =sysfs_create_link (&q->kobj, &bd->device.kobj,"bsg" ); +if (q->disk && q->disk->queue_kobj.sd) { + ret =sysfs_create_link (&q->disk->queue_kobj, &bd->device.kobj, +"bsg" );if (ret) goto out_device_del; }
block/elevator.c +1 -1
@@ -499,7 +499,7 @@ int elv_register_queue(struct request_queue *q, bool uevent)lockdep_assert_held (&q->sysfs_lock); - error =kobject_add (&e->kobj, &q->kobj,"%s" ,"iosched" ); + error =kobject_add (&e->kobj, &q->disk->queue_kobj,"iosched" );if (!error) {struct elv_fs_entry *attr = e->type->elevator_attrs;if (attr) {
include/linux/blkdev.h +2 -4
@@ -155,6 +155,7 @@ struct gendisk {unsigned open_partitions;/* number of open partitions */ struct backing_dev_info *bdi; +struct kobject queue_kobj;/* the queue/ directory */ struct kobject *slave_dir;#ifdef CONFIG_BLOCK_HOLDER_DEPRECATED struct list_head slave_bdevs;
@@ -437,10 +438,7 @@ struct request_queue {struct gendisk *disk; -/* -* queue kobject -*/ -struct kobject kobj; +refcount_t refs;/* * mq queue kobject
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 56/313 kbuild: fix make modules error when CONFIG_DEBUG_INFO_BTF_MODULES=y
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 74d3320f6f7cf72de88a7e8df573821f6db90239 ]
When CONFIG_DEBUG_INFO_BTF_MODULES=y, running 'make modules' in the clean kernel tree will get the following error.
$ grep CONFIG_DEBUG_INFO_BTF_MODULES .config
CONFIG_DEBUG_INFO_BTF_MODULES=y
$ make -s clean
$ make modules
[snip]
AR vmlinux.a
ar: ./built-in.a: No such file or directory
make: *** [Makefile:1241: vmlinux.a] Error 1'modules' depends on 'vmlinux', but builtin objects are not built.
Define KBUILD_BUILTIN.
--- Makefile | 1 + 1 file changed, 1 insertion(+)
Makefile +1 -0
@@ -1529,6 +1529,7 @@ endif # *.ko are usually independent of vmlinux, but CONFIG_DEBUG_INFOBTF_MODULES # is an exception. ifdef CONFIG_DEBUG_INFO_BTF_MODULES +KBUILD_BUILTIN := 1 modules: vmlinux endif
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 57/313 phy: ti: fix Kconfig warning and operator precedence
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7124c93887cc4e6c5b48920f83115e4a5892e870 ]
Fix Kconfig depends operator precedence to prevent a Kconfig warning:
WARNING: unmet direct dependencies detected for MUX_MMIO
Depends on [n]: MULTIPLEXER [=m] && OF [=n]
Selected by [m]:
- PHY_AM654_SERDES [=m] && (OF [=n] && ARCH_K3 || COMPILE_TEST [=y]) && COMMON_CLK [=y]
--- drivers/phy/ti/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/ti/Kconfig +2 -2
@@ -23,7 +23,7 @@ config PHY_DM816X_USB config PHY_AM654_SERDES tristate "TI AM654 SERDES support" - depends on OF && ARCH_K3 || COMPILE_TEST + depends on OF && (ARCH_K3 || COMPILE_TEST) depends on COMMON_CLK select GENERIC_PHY select MULTIPLEXER
@@ -35,7 +35,7 @@ config PHY_AM654_SERDES config PHY_J721E_WIZ tristate "TI J721E WIZ (SERDES Wrapper) support" - depends on OF && ARCH_K3 || COMPILE_TEST + depends on OF && (ARCH_K3 || COMPILE_TEST) depends on HAS_IOMEM && OF_ADDRESS depends on COMMON_CLK select GENERIC_PHY
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 58/313 drm/msm/gpu: Fix potential double-free
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit a66f1efcf748febea7758c4c3c8b5bc5294949ef ]
If userspace was calling the MSM_SET_PARAM ioctl on multiple threads to set the COMM or CMDLINE param, it could trigger a race causing the previous value to be kfree'd multiple times. Fix this by serializing on the gpu lock.
Patchwork: https://patchwork.freedesktop.org/patch/517778/
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 ++++ drivers/gpu/drm/msm/msm_gpu.c | 2 ++ drivers/gpu/drm/msm/msm_gpu.h | 12 ++++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +4 -0
@@ -351,6 +351,8 @@ int adreno_set_param(struct msm_gpu *gpu, struct msm_file_private *ctx,/* Ensure string is null terminated: */ str[len] ='\0' ; +mutex_lock (&gpu->lock); +if (param ==MSM_PARAM_COMM ) { paramp = &ctx->comm; }else {
@@ -360,6 +362,8 @@ int adreno_set_param(struct msm_gpu *gpu, struct msm_file_private *ctx,kfree (*paramp); *paramp = str; +mutex_unlock (&gpu->lock); +return 0 ; }case MSM_PARAM_SYSPROF :
drivers/gpu/drm/msm/msm_gpu.c +2 -0
@@ -335,6 +335,8 @@ static void get_comm_cmdline(struct msm_gem_submit *submit, char **comm, char **struct msm_file_private *ctx = submit->queue->ctx;struct task_struct *task; +WARN_ON (!mutex_is_locked (&submit->gpu->lock)); +/* Note that kstrdup will return NULL if argument is NULL: */ *comm =kstrdup (ctx->comm,GFP_KERNEL ); *cmd =kstrdup (ctx->cmdline,GFP_KERNEL );
drivers/gpu/drm/msm/msm_gpu.h +10 -2
@@ -366,10 +366,18 @@ struct msm_file_private {*/ int sysprof; -/** comm: Overridden task comm, see MSM_PARAM_COMM */ +/** +* comm: Overridden task comm, see MSM_PARAM_COMM +* +* Accessed under msm_gpu::lock +*/ char *comm; -/** cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE */ +/** +* cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE +* +* Accessed under msm_gpu::lock +*/ char *cmdline;/**
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 59/313 NFSD: fix use-after-free in nfsd4_ssc_setup_dul()
In reply to Greg Kroah-HartmanFrom: Xingyuan Mo <[email protected]>
[ Upstream commit e6cf91b7b47ff82b624bdfe2fdcde32bb52e71dd ]
If signal_pending() returns true, schedule_timeout() will not be executed, causing the waiting task to remain in the wait queue.
Fixed by adding a call to finish_wait(), which ensures that the waiting task will always be removed from the wait queue.
--- fs/nfsd/nfs4proc.c | 1 + 1 file changed, 1 insertion(+)
fs/nfsd/nfs4proc.c +1 -0
@@ -1331,6 +1331,7 @@ static __be32 nfsd4_ssc_setup_dul(struct nfsd_net *nn, char *ipaddr,/* allow 20secs for mount/unmount for now - revisit */ if (signal_pending (current) || (schedule_timeout (20 *HZ ) ==0 )) { +finish_wait (&nn->nfsd_ssc_waitq, &wait);kfree (work);return nfserr_eagain; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 60/313 ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 9bfa2544dbd1133f0b0af4e967de3bb9c1e3a497 ]
The 2nd DDR clock for sam9x60 DDR controller is peripheral clock with id 49.
--- arch/arm/boot/dts/sam9x60.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sam9x60.dtsi +1 -1
@@ -564,7 +564,7 @@ pmecc: ecc-engine@ffffe000 { mpddrc: mpddrc@ffffe800 { compatible = "microchip,sam9x60-ddramc", "atmel,sama5d3-ddramc"; reg = <0xffffe800 0x200>; - clocks = <&pmc PMC_TYPE_SYSTEM 2>, <&pmc PMC_TYPE_CORE PMC_MCK>; + clocks = <&pmc PMC_TYPE_SYSTEM 2>, <&pmc PMC_TYPE_PERIPHERAL 49>; clock-names = "ddrck", "mpddr"; };
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 61/313 drm/vc4: bo: Fix drmm_mutex_init memory hog
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 07a2975c65f2be2e22591d795a9c39b00f95fd11 ]
Commit 374146cad469 ("drm/vc4: Switch to drmm_mutex_init") converted, among other functions, vc4_create_object() to use drmm_mutex_init().
However, that function is used to allocate a BO, and therefore the mutex needs to be freed much sooner than when the DRM device is removed from the system.
For each buffer allocation we thus end up allocating a small structure as part of the DRM-managed mechanism that is never freed, eventually leading us to no longer having any free memory anymore.
Let's switch back to mutex_init/mutex_destroy to deal with it properly.
--- drivers/gpu/drm/vc4/vc4_bo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/vc4/vc4_bo.c +2 -3
@@ -179,6 +179,7 @@ static void vc4_bo_destroy(struct vc4_bo *bo) bo->validated_shader =NULL ; } +mutex_destroy (&bo->madv_lock);drm_gem_dma_free (&bo->base); }
@@ -406,9 +407,7 @@ struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size) bo->madv =VC4_MADV_WILLNEED ;refcount_set (&bo->usecnt,0 ); - ret =drmm_mutex_init (dev, &bo->madv_lock); -if (ret) -return ERR_PTR (ret); +mutex_init (&bo->madv_lock);mutex_lock (&vc4->bo_lock); bo->label =VC4_BO_TYPE_KERNEL ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 62/313 phy: usb: sunplus: Fix potential null-ptr-deref in sp_usb_phy_probe()
In reply to Greg Kroah-HartmanFrom: Shang XiaoJing <[email protected]>
[ Upstream commit 17eee264ef386ef30a69dd70e36f29893b85c170 ]
sp_usb_phy_probe() will call platform_get_resource_byname() that may fail and return NULL. devm_ioremap() will use usbphy->moon4_res_mem->start as input, which may causes null-ptr-deref. Check the ret value of platform_get_resource_byname() to avoid the null-ptr-deref.
--- drivers/phy/sunplus/phy-sunplus-usb2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/phy/sunplus/phy-sunplus-usb2.c +3 -0
@@ -254,6 +254,9 @@ static int sp_usb_phy_probe(struct platform_device *pdev)return PTR_ERR (usbphy->phy_regs); usbphy->moon4_res_mem =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"moon4" ); +if (!usbphy->moon4_res_mem) +return -EINVAL ; + usbphy->moon4_regs =devm_ioremap (&pdev->dev, usbphy->moon4_res_mem->start,resource_size (usbphy->moon4_res_mem));if (!usbphy->moon4_regs)
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 63/313 bpf: hash map, avoid deadlock with suitable hash mask
In reply to Greg Kroah-HartmanFrom: Tonghao Zhang <[email protected]>
[ Upstream commit 9f907439dc80e4a2fcfb949927b36c036468dbb3 ]
The deadlock still may occur while accessed in NMI and non-NMI context. Because in NMI, we still may access the same bucket but with different map_locked index.
For example, on the same CPU, .max_entries = 2, we update the hash map, with key = 4, while running bpf prog in NMI nmi_handle(), to update hash map with key = 20, so it will have the same bucket index but have different map_locked index.
To fix this issue, using min mask to hash again.
--- kernel/bpf/hashtab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/bpf/hashtab.c +2 -2
@@ -152,7 +152,7 @@ static inline int htab_lock_bucket(const struct bpf_htab *htab, {unsigned long flags; - hash = hash &HASHTAB_MAP_LOCK_MASK ; + hash = hash &min_t (u32,HASHTAB_MAP_LOCK_MASK , htab->n_buckets -1 );preempt_disable ();if (unlikely (__this_cpu_inc_return (*(htab->map_locked[hash])) !=1 )) {
@@ -171,7 +171,7 @@ static inline void htab_unlock_bucket(const struct bpf_htab *htab, struct bucket *b, u32 hash, unsigned long flags) { - hash = hash &HASHTAB_MAP_LOCK_MASK ; + hash = hash &min_t (u32,HASHTAB_MAP_LOCK_MASK , htab->n_buckets -1 );raw_spin_unlock_irqrestore (&b->raw_lock, flags);__this_cpu_dec (*(htab->map_locked[hash]));preempt_enable ();
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 64/313 amd-xgbe: TX Flow Ctrl Registers are h/w ver dependent
In reply to Greg Kroah-HartmanFrom: Raju Rangoju <[email protected]>
[ Upstream commit 579923d84b04abb6cd4cd1fd9974096a2dd1832b ]
There is difference in the TX Flow Control registers (TFCR) between the revisions of the hardware. The older revisions of hardware used to have single register per queue. Whereas, the newer revision of hardware (from ver 30H onwards) have one register per priority.
Update the driver to use the TFCR based on the reported version of the hardware.
--- drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-dev.c +15 -8
@@ -524,19 +524,28 @@ static void xgbe_disable_vxlan(struct xgbe_prv_data *pdata)netif_dbg (pdata, drv, pdata->netdev,"VXLAN acceleration disabled\n" ); } +static unsigned int xgbe_get_fc_queue_count (struct xgbe_prv_data *pdata) +{ +unsigned int max_q_count =XGMAC_MAX_FLOW_CONTROL_QUEUES ; + +/* From MAC ver 30H the TFCR is per priority, instead of per queue */ +if (XGMAC_GET_BITS (pdata->hw_feat.version,MAC_VR ,SNPSVER ) >=0x30 ) +return max_q_count; +else + return min_t(unsigned int, pdata->tx_q_count, max_q_count); +} +static int xgbe_disable_tx_flow_control (struct xgbe_prv_data *pdata) { -unsigned int max_q_count, q_count;unsigned int reg, reg_val; -unsigned int i; +unsigned int i, q_count;/* Clear MTL flow control */ for (i =0 ; i < pdata->rx_q_count; i++)XGMAC_MTL_IOWRITE_BITS (pdata, i,MTL_Q_RQOMR ,EHFC ,0 );/* Clear MAC flow control */ - max_q_count =XGMAC_MAX_FLOW_CONTROL_QUEUES ; - q_count = min_t(unsigned int, pdata->tx_q_count, max_q_count); + q_count =xgbe_get_fc_queue_count (pdata); reg =MAC_Q0TFCR ;for (i =0 ; i < q_count; i++) { reg_val =XGMAC_IOREAD (pdata, reg);
@@ -553,9 +562,8 @@ static int xgbe_enable_tx_flow_control(struct xgbe_prv_data *pdata) {struct ieee_pfc *pfc = pdata->pfc;struct ieee_ets *ets = pdata->ets; -unsigned int max_q_count, q_count;unsigned int reg, reg_val; -unsigned int i; +unsigned int i, q_count;/* Set MTL flow control */ for (i =0 ; i < pdata->rx_q_count; i++) {
@@ -579,8 +587,7 @@ static int xgbe_enable_tx_flow_control(struct xgbe_prv_data *pdata) }/* Set MAC flow control */ - max_q_count =XGMAC_MAX_FLOW_CONTROL_QUEUES ; - q_count = min_t(unsigned int, pdata->tx_q_count, max_q_count); + q_count =xgbe_get_fc_queue_count (pdata); reg =MAC_Q0TFCR ;for (i =0 ; i < q_count; i++) { reg_val =XGMAC_IOREAD (pdata, reg);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 65/313 amd-xgbe: Delay AN timeout during KR training
In reply to Greg Kroah-HartmanFrom: Raju Rangoju <[email protected]>
[ Upstream commit 926446ae24c03311a480fb96eb78f0ce7ea6d091 ]
AN restart triggered during KR training not only aborts the KR training process but also move the HW to unstable state. Driver has to wait upto 500ms or until the KR training is completed before restarting AN cycle.
--- drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 +++++++++++++++++++++++ drivers/net/ethernet/amd/xgbe/xgbe.h | 2 ++ 2 files changed, 26 insertions(+)
drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +24 -0
@@ -496,6 +496,7 @@ static enum xgbe_an xgbe_an73_tx_training(struct xgbe_prv_data *pdata, reg |=XGBE_KR_TRAINING_ENABLE ; reg |=XGBE_KR_TRAINING_START ;XMDIO_WRITE (pdata,MDIO_MMD_PMAPMD ,MDIO_PMA_10GBR_PMD_CTRL , reg); + pdata->kr_start_time = jiffies;netif_dbg (pdata, link, pdata->netdev,"KR training initiated\n" );
@@ -632,6 +633,8 @@ static enum xgbe_an xgbe_an73_incompat_link(struct xgbe_prv_data *pdata)xgbe_switch_mode (pdata); + pdata->an_result =XGBE_AN_READY ; +xgbe_an_restart (pdata);return XGBE_AN_INCOMPAT_LINK ;
@@ -1275,9 +1278,30 @@ static bool xgbe_phy_aneg_done(struct xgbe_prv_data *pdata)static void xgbe_check_link_timeout (struct xgbe_prv_data *pdata) {unsigned long link_timeout; +unsigned long kr_time; +int wait; link_timeout = pdata->link_check + (XGBE_LINK_TIMEOUT *HZ );if (time_after (jiffies, link_timeout)) { +if ((xgbe_cur_mode (pdata) ==XGBE_MODE_KR ) && + pdata->phy.autoneg ==AUTONEG_ENABLE ) { +/* AN restart should not happen while KR training is in progress. +* The while loop ensures no AN restart during KR training, +* waits up to 500ms and AN restart is triggered only if KR +* training is failed. +*/ + wait =XGBE_KR_TRAINING_WAIT_ITER ; +while (wait--) { + kr_time = pdata->kr_start_time + +msecs_to_jiffies (XGBE_AN_MS_TIMEOUT ); +if (time_after (jiffies, kr_time)) +break ; +/* AN restart is not required, if AN result is COMPLETE */ +if (pdata->an_result ==XGBE_AN_COMPLETE ) +return ; +usleep_range (10000 ,11000 ); + } + }netif_dbg (pdata, link, pdata->netdev,"AN link timeout\n" );xgbe_phy_config_aneg (pdata); }
drivers/net/ethernet/amd/xgbe/xgbe.h +2 -0
@@ -290,6 +290,7 @@/* Auto-negotiation */ #define XGBE_AN_MS_TIMEOUT 500#define XGBE_LINK_TIMEOUT 5 +#define XGBE_KR_TRAINING_WAIT_ITER 50#define XGBE_SGMII_AN_LINK_STATUS BIT(1)#define XGBE_SGMII_AN_LINK_SPEED (BIT(2) | BIT(3))
@@ -1280,6 +1281,7 @@ struct xgbe_prv_data {unsigned int parallel_detect;unsigned int fec_ability;unsigned long an_start; +unsigned long kr_start_time;enum xgbe_an_mode an_mode;/* I2C support */
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 39/313 block: mark blk_put_queue as potentially blocking
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 63f93fd6fa5717769a78d6d7bea6f7f9a1ccca8e ]
We can't just say that the last reference release may block, as any reference dropped could be the last one. So move the might_sleep() from blk_free_queue to blk_put_queue and update the documentation.
Stable-dep-of: 49e4d04f0486 ("block: Drop spurious might_sleep() from blk_put_queue()")
--- block/blk-core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
block/blk-core.c +2 -4
@@ -260,8 +260,6 @@ static void blk_free_queue_rcu(struct rcu_head *rcu_head)static void blk_free_queue (struct request_queue *q) { -might_sleep (); -percpu_ref_exit (&q->q_usage_counter);if (q->poll_stat)
@@ -285,11 +283,11 @@ static void blk_free_queue(struct request_queue *q)* Decrements the refcount of the request_queue and free it when the refcount * reaches 0. * -* Context: Any context, but the last reference must not be dropped from -* atomic context. +* Context: Can sleep. */ void blk_put_queue (struct request_queue *q) { +might_sleep ();if (refcount_dec_and_test (&q->refs))blk_free_queue (q); }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 66/313 bpf: Fix pointer-leak due to insufficient speculative store bypass mitigation
In reply to Greg Kroah-HartmanFrom: Luis Gerhorst <[email protected]>
[ Upstream commit e4f4db47794c9f474b184ee1418f42e6a07412b6 ]
To mitigate Spectre v4, 2039f26f3aca ("bpf: Fix leakage due to insufficient speculative store bypass mitigation") inserts lfence instructions after 1) initializing a stack slot and 2) spilling a pointer to the stack.
However, this does not cover cases where a stack slot is first initialized with a pointer (subject to sanitization) but then overwritten with a scalar (not subject to sanitization because the slot was already initialized). In this case, the second write may be subject to speculative store bypass (SSB) creating a speculative pointer-as-scalar type confusion. This allows the program to subsequently leak the numerical pointer value using, for example, a branch-based cache side channel.
To fix this, also sanitize scalars if they write a stack slot that previously contained a pointer. Assuming that pointer-spills are only generated by LLVM on register-pressure, the performance impact on most real-world BPF programs should be small.
The following unprivileged BPF bytecode drafts a minimal exploit and the mitigation:
[...]
// r6 = 0 or 1 (skalar, unknown user input)
// r7 = accessible ptr for side channel
// r10 = frame pointer (fp), to be leaked
//
r9 = r10 # fp alias to encourage ssb
*(u64 *)(r9 - 8) = r10 // fp[-8] = ptr, to be leaked
// lfence added here because of pointer spill to stack.
//
// Ommitted: Dummy bpf_ringbuf_output() here to train alias predictor // for no r9-r10 dependency.
//
*(u64 *)(r10 - 8) = r6 // fp[-8] = scalar, overwrites ptr
// 2039f26f3aca: no lfence added because stack slot was not STACK_INVALID, // store may be subject to SSB
//
// fix: also add an lfence when the slot contained a ptr
//
r8 = *(u64 *)(r9 - 8)
// r8 = architecturally a scalar, speculatively a ptr
//
// leak ptr using branch-based cache side channel:
r8 &= 1 // choose bit to leak
if r8 == 0 goto SLOW // no mispredict
// architecturally dead code if input r6 is 0,
// only executes speculatively iff ptr bit is 1
r8 = *(u64 *)(r7 + 0) # encode bit in cache (0: slow, 1: fast)
SLOW:
[...]
After running this, the program can time the access to *(r7 + 0) to determine whether the chosen pointer bit was 0 or 1. Repeat this 64 times to recover the whole address on amd64.
In summary, sanitization can only be skipped if one scalar is overwritten with another scalar. Scalar-confusion due to speculative store bypass can not lead to invalid accesses because the pointer bounds deducted during verification are enforced using branchless logic. See 979d63d50c0c ("bpf: prevent out of bounds speculation on pointer arithmetic") for details.
Do not make the mitigation depend on !env->allow_{uninit_stack,ptr_leaks} because speculative leaks are likely unexpected if these were enabled. For example, leaking the address to a protected log file may be acceptable while disabling the mitigation might unintentionally leak the address into the cached-state of a map that is accessible to unprivileged processes.
--- kernel/bpf/verifier.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +3 -1
@@ -3063,7 +3063,9 @@ static int check_stack_write_fixed_off(struct bpf_verifier_env *env,bool sanitize = reg &&is_spillable_regtype (reg->type);for (i =0 ; i < size; i++) { -if (state->stack[spi].slot_type[i] ==STACK_INVALID ) { +u8 type = state->stack[spi].slot_type[i]; + +if (type !=STACK_MISC && type !=STACK_ZERO ) { sanitize = true;break ; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 67/313 drm/vc4: bo: Fix unused variable warning
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 83a7f8e4899fb4cd77c787a3373f3e82b49a080f ]
Commit 07a2975c65f2 ("drm/vc4: bo: Fix drmm_mutex_init memory hog") removed the only use of the ret variable, but didn't remove the variable itself leading to a unused variable warning.
Remove that variable.
--- drivers/gpu/drm/vc4/vc4_bo.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/vc4/vc4_bo.c +0 -1
@@ -395,7 +395,6 @@ struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size) {struct vc4_dev *vc4 =to_vc4_dev (dev);struct vc4_bo *bo; -int ret;if (WARN_ON_ONCE (vc4->is_vc5))return ERR_PTR (-ENODEV );
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 40/313 block: Drop spurious might_sleep() from blk_put_queue()
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
[ Upstream commit 49e4d04f0486117ac57a97890eb1db6d52bf82b3 ]
Dan reports the following smatch detected the following:
block/blk-cgroup.c:1863 blkcg_schedule_throttle() warn: sleeping in atomic context
caused by blkcg_schedule_throttle() calling blk_put_queue() in an non-sleepable context.
blk_put_queue() acquired might_sleep() in 63f93fd6fa57 ("block: mark blk_put_queue as potentially blocking") which transferred the might_sleep() from blk_free_queue().
blk_free_queue() acquired might_sleep() in e8c7d14ac6c3 ("block: revert back to synchronous request_queue removal") while turning request_queue removal synchronous. However, this isn't necessary as nothing in the free path actually requires sleeping.
It's pretty unusual to require a sleeping context in a put operation and it's not needed in the first place. Let's drop it.
--- block/blk-core.c | 3 --- 1 file changed, 3 deletions(-)
block/blk-core.c +0 -3
@@ -282,12 +282,9 @@ static void blk_free_queue(struct request_queue *q)* * Decrements the refcount of the request_queue and free it when the refcount * reaches 0. -* -* Context: Can sleep. */ void blk_put_queue (struct request_queue *q) { -might_sleep ();if (refcount_dec_and_test (&q->refs))blk_free_queue (q); }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 41/313 RDMA/rxe: Fix inaccurate constants in rxe_type_info
In reply to Greg Kroah-HartmanFrom: Daisuke Matsuda <[email protected]>
[ Upstream commit 3a73746b267e5c6a87c9ad26f8c6a48e44da609c ]
ibv_query_device() has reported incorrect device attributes, which are actually not used by the device. Make the constants correspond with the attributes shown to users.
--- drivers/infiniband/sw/rxe/rxe_pool.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/infiniband/sw/rxe/rxe_pool.c +11 -11
@@ -23,16 +23,16 @@ static const struct rxe_type_info { .size = sizeof(struct rxe_ucontext), .elem_offset = offsetof(struct rxe_ucontext, elem), .min_index = 1, - .max_index = UINT_MAX, - .max_elem = UINT_MAX, + .max_index = RXE_MAX_UCONTEXT, + .max_elem = RXE_MAX_UCONTEXT, }, [RXE_TYPE_PD] = { .name = "pd", .size = sizeof(struct rxe_pd), .elem_offset = offsetof(struct rxe_pd, elem), .min_index = 1, - .max_index = UINT_MAX, - .max_elem = UINT_MAX, + .max_index = RXE_MAX_PD, + .max_elem = RXE_MAX_PD, }, [RXE_TYPE_AH] = { .name = "ah",
@@ -40,7 +40,7 @@ static const struct rxe_type_info { .elem_offset = offsetof(struct rxe_ah, elem), .min_index = RXE_MIN_AH_INDEX, .max_index = RXE_MAX_AH_INDEX, - .max_elem = RXE_MAX_AH_INDEX - RXE_MIN_AH_INDEX + 1, + .max_elem = RXE_MAX_AH, }, [RXE_TYPE_SRQ] = { .name = "srq",
@@ -49,7 +49,7 @@ static const struct rxe_type_info { .cleanup = rxe_srq_cleanup, .min_index = RXE_MIN_SRQ_INDEX, .max_index = RXE_MAX_SRQ_INDEX, - .max_elem = RXE_MAX_SRQ_INDEX - RXE_MIN_SRQ_INDEX + 1, + .max_elem = RXE_MAX_SRQ, }, [RXE_TYPE_QP] = { .name = "qp",
@@ -58,7 +58,7 @@ static const struct rxe_type_info { .cleanup = rxe_qp_cleanup, .min_index = RXE_MIN_QP_INDEX, .max_index = RXE_MAX_QP_INDEX, - .max_elem = RXE_MAX_QP_INDEX - RXE_MIN_QP_INDEX + 1, + .max_elem = RXE_MAX_QP, }, [RXE_TYPE_CQ] = { .name = "cq",
@@ -66,8 +66,8 @@ static const struct rxe_type_info { .elem_offset = offsetof(struct rxe_cq, elem), .cleanup = rxe_cq_cleanup, .min_index = 1, - .max_index = UINT_MAX, - .max_elem = UINT_MAX, + .max_index = RXE_MAX_CQ, + .max_elem = RXE_MAX_CQ, }, [RXE_TYPE_MR] = { .name = "mr",
@@ -76,7 +76,7 @@ static const struct rxe_type_info { .cleanup = rxe_mr_cleanup, .min_index = RXE_MIN_MR_INDEX, .max_index = RXE_MAX_MR_INDEX, - .max_elem = RXE_MAX_MR_INDEX - RXE_MIN_MR_INDEX + 1, + .max_elem = RXE_MAX_MR, }, [RXE_TYPE_MW] = { .name = "mw",
@@ -85,7 +85,7 @@ static const struct rxe_type_info { .cleanup = rxe_mw_cleanup, .min_index = RXE_MIN_MW_INDEX, .max_index = RXE_MAX_MW_INDEX, - .max_elem = RXE_MAX_MW_INDEX - RXE_MIN_MW_INDEX + 1, + .max_elem = RXE_MAX_MW, }, };
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 42/313 RDMA/rxe: Prevent faulty rkey generation
In reply to Greg Kroah-HartmanFrom: Daisuke Matsuda <[email protected]>
[ Upstream commit 1aefe5c177c1922119afb4ee443ddd6ac3140b37 ]
If you create MRs more than 0x10000 times after loading the module, responder starts to reply NAKs for RDMA/Atomic operations because of rkey violation detected in check_rkey(). The root cause is that rkeys are incremented each time a new MR is created and the value overflows into the range reserved for MWs.
This commit also increases the value of RXE_MAX_MW that has been limited unlike other parameters.
--- drivers/infiniband/sw/rxe/rxe_param.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/infiniband/sw/rxe/rxe_param.h +5 -5
@@ -91,11 +91,11 @@ enum rxe_device_param {RXE_MAX_SRQ =DEFAULT_MAX_VALUE -RXE_MIN_SRQ_INDEX ,RXE_MIN_MR_INDEX =0x00000001 , -RXE_MAX_MR_INDEX =DEFAULT_MAX_VALUE , -RXE_MAX_MR =DEFAULT_MAX_VALUE -RXE_MIN_MR_INDEX , -RXE_MIN_MW_INDEX =0x00010001 , -RXE_MAX_MW_INDEX =0x00020000 , -RXE_MAX_MW =0x00001000 , +RXE_MAX_MR_INDEX =DEFAULT_MAX_VALUE >>1 , +RXE_MAX_MR =RXE_MAX_MR_INDEX -RXE_MIN_MR_INDEX , +RXE_MIN_MW_INDEX =RXE_MAX_MR_INDEX +1 , +RXE_MAX_MW_INDEX =DEFAULT_MAX_VALUE , +RXE_MAX_MW =RXE_MAX_MW_INDEX -RXE_MIN_MW_INDEX , RXE_MAX_PKT_PER_ACK = 64,
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 43/313 erofs: fix kvcalloc() misuse with __GFP_NOFAIL
In reply to Greg Kroah-HartmanFrom: Gao Xiang <[email protected]>
[ Upstream commit 12724ba38992bd045e92a9a88a868a530f89d13e ]
As reported by syzbot [1], kvcalloc() cannot work with __GFP_NOFAIL. Let's use kcalloc() instead.
[1] https://lore.kernel.org/r/[email protected]
--- fs/erofs/zdata.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/erofs/zdata.c +6 -6
@@ -1047,12 +1047,12 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,if (!be->decompressed_pages) be->decompressed_pages = -kvcalloc (be->nr_pages,sizeof (struct page *), -GFP_KERNEL | __GFP_NOFAIL); +kcalloc (be->nr_pages,sizeof (struct page *), +GFP_KERNEL | __GFP_NOFAIL);if (!be->compressed_pages) be->compressed_pages = -kvcalloc (pclusterpages,sizeof (struct page *), -GFP_KERNEL | __GFP_NOFAIL); +kcalloc (pclusterpages,sizeof (struct page *), +GFP_KERNEL | __GFP_NOFAIL);z_erofs_parse_out_bvecs (be); err2 =z_erofs_parse_in_bvecs (be, &overlapped);
@@ -1100,7 +1100,7 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, }if (be->compressed_pages < be->onstack_pages || be->compressed_pages >= be->onstack_pages +Z_EROFS_ONSTACK_PAGES ) -kvfree (be->compressed_pages); +kfree (be->compressed_pages);z_erofs_fill_other_copies (be, err);for (i =0 ; i < be->nr_pages; ++i) {
@@ -1119,7 +1119,7 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, }if (be->decompressed_pages != be->onstack_pages) -kvfree (be->decompressed_pages); +kfree (be->decompressed_pages); pcl->length =0 ; pcl->partial = true;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 44/313 arm64: dts: marvell: AC5/AC5X: Fix address for UART1
In reply to Greg Kroah-HartmanFrom: Chris Packham <[email protected]>
[ Upstream commit 80502ffab2fa92ba9777e381efea2efddc348d13 ]
The correct address offset is 0x12100.
--- arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi +1 -1
@@ -97,7 +97,7 @@ uart0: serial@12000 { uart1: serial@12100 { compatible = "snps,dw-apb-uart"; - reg = <0x11000 0x100>; + reg = <0x12100 0x100>; reg-shift = <2>; interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; reg-io-width = <1>;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 45/313 RDMA/core: Fix ib block iterator counter overflow
In reply to Greg Kroah-HartmanFrom: Yonatan Nachum <[email protected]>
[ Upstream commit 0afec5e9cea732cb47014655685a2a47fb180c31 ]
When registering a new DMA MR after selecting the best aligned page size for it, we iterate over the given sglist to split each entry to smaller, aligned to the selected page size, DMA blocks.
In given circumstances where the sg entry and page size fit certain sizes and the sg entry is not aligned to the selected page size, the total size of the aligned pages we need to cover the sg entry is >= 4GB. Under this circumstances, while iterating page aligned blocks, the counter responsible for counting how much we advanced from the start of the sg entry is overflowed because its type is u32 and we pass 4GB in size. This can lead to an infinite loop inside the iterator function because the overflow prevents the counter to be larger
than the size of the sg entry.
Fix the presented problem by changing the advancement condition to eliminate overflow.
Backtrace: [ 192.374329] efa_reg_user_mr_dmabuf [ 192.376783] efa_register_mr [ 192.382579] pgsz_bitmap 0xfffff000 rounddown 0x80000000 [ 192.386423] pg_sz [0x80000000] umem_length[0xc0000000] [ 192.392657] start 0x0 length 0xc0000000 params.page_shift 31 params.page_num 3 [ 192.399559] hp_cnt[3], pages_in_hp[524288] [ 192.403690] umem->sgt_append.sgt.nents[1] [ 192.407905] number entries: [1], pg_bit: [31] [ 192.411397] biter->__sg_nents [1] biter->__sg [0000000008b0c5d8] [ 192.415601] biter->__sg_advance [665837568] sg_dma_len[3221225472] [ 192.419823] biter->__sg_nents [1] biter->__sg [0000000008b0c5d8] [ 192.423976] biter->__sg_advance [2813321216] sg_dma_len[3221225472] [ 192.428243] biter->__sg_nents [1] biter->__sg [0000000008b0c5d8] [ 192.432397] biter->__sg_advance [665837568] sg_dma_len[3221225472]
--- drivers/infiniband/core/verbs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/infiniband/core/verbs.c +5 -2
@@ -2957,15 +2957,18 @@ EXPORT_SYMBOL(__rdma_block_iter_start);bool __rdma_block_iter_next (struct ib_block_iter *biter) {unsigned int block_offset; +unsigned int sg_delta;if (!biter->__sg_nents || !biter->__sg)return false; biter->__dma_addr =sg_dma_address (biter->__sg) + biter->__sg_advance; block_offset = biter->__dma_addr & (BIT_ULL (biter->__pg_bit) -1 ); - biter->__sg_advance +=BIT_ULL (biter->__pg_bit) - block_offset; + sg_delta =BIT_ULL (biter->__pg_bit) - block_offset; -if (biter->__sg_advance >=sg_dma_len (biter->__sg)) { +if (sg_dma_len (biter->__sg) - biter->__sg_advance > sg_delta) { + biter->__sg_advance += sg_delta; + }else { biter->__sg_advance =0 ; biter->__sg =sg_next (biter->__sg); biter->__sg_nents--;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 36/313 block: factor out a blk_debugfs_remove helper
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 6fc75f309d291d328b4ea2f91bef0ff56e4bc7c2 ]
Split the debugfs removal from blk_unregister_queue into a helper so that the it can be reused for blk_register_queue error handling.
Stable-dep-of: 49e4d04f0486 ("block: Drop spurious might_sleep() from blk_put_queue()")
--- block/blk-sysfs.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
block/blk-sysfs.c +14 -7
@@ -797,6 +797,19 @@ struct kobj_type blk_queue_ktype = { .release = blk_release_queue, }; +static void blk_debugfs_remove (struct gendisk *disk) +{ +struct request_queue *q = disk->queue; + +mutex_lock (&q->debugfs_mutex); +blk_trace_shutdown (q); +debugfs_remove_recursive (q->debugfs_dir); + q->debugfs_dir =NULL ; + q->sched_debugfs_dir =NULL ; + q->rqos_debugfs_dir =NULL ; +mutex_unlock (&q->debugfs_mutex); +} +/** * blk_register_queue - register a block layer queue with sysfs * @disk: Disk of which the request queue should be registered with sysfs.
@@ -922,11 +935,5 @@ void blk_unregister_queue(struct gendisk *disk)kobject_del (&q->kobj);mutex_unlock (&q->sysfs_dir_lock); -mutex_lock (&q->debugfs_mutex); -blk_trace_shutdown (q); -debugfs_remove_recursive (q->debugfs_dir); - q->debugfs_dir =NULL ; - q->sched_debugfs_dir =NULL ; - q->rqos_debugfs_dir =NULL ; -mutex_unlock (&q->debugfs_mutex); +blk_debugfs_remove (disk); }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 69/313 net: nfc: Fix use-after-free in local_cleanup()
In reply to Greg Kroah-HartmanFrom: Jisoo Jang <[email protected]>
[ Upstream commit 4bb4db7f3187c6e3de6b229ffc87cdb30a2d22b6 ]
Fix a use-after-free that occurs in kfree_skb() called from local_cleanup(). This could happen when killing nfc daemon (e.g. neard) after detaching an nfc device.
When detaching an nfc device, local_cleanup() called from nfc_llcp_unregister_device() frees local->rx_pending and decreases local->ref by kref_put() in nfc_llcp_local_put().
In the terminating process, nfc daemon releases all sockets and it leads to decreasing local->ref. After the last release of local->ref, local_cleanup() called from local_release() frees local->rx_pending again, which leads to the bug.
Setting local->rx_pending to NULL in local_cleanup() could prevent use-after-free when local_cleanup() is called twice.
Found by a modified version of syzkaller.
BUG: KASAN: use-after-free in kfree_skb() Call Trace:
dump_stack_lvl (lib/dump_stack.c:106) print_address_description.constprop.0.cold (mm/kasan/report.c:306) kasan_check_range (mm/kasan/generic.c:189)kfree_skb (net/core/skbuff.c:955)local_cleanup (net/nfc/llcp_core.c:159) nfc_llcp_local_put.part.0 (net/nfc/llcp_core.c:172) nfc_llcp_local_put (net/nfc/llcp_core.c:181) llcp_sock_destruct (net/nfc/llcp_sock.c:959) __sk_destruct (net/core/sock.c:2133)sk_destruct (net/core/sock.c:2181)__sk_free (net/core/sock.c:2192)sk_free (net/core/sock.c:2203)llcp_sock_release (net/nfc/llcp_sock.c:646) __sock_release (net/socket.c:650)sock_close (net/socket.c:1365)__fput (fs/file_table.c:306)task_work_run (kernel/task_work.c:179)ptrace_notify (kernel/signal.c:2354) syscall_exit_to_user_mode_prepare (kernel/entry/common.c:278) syscall_exit_to_user_mode (kernel/entry/common.c:296) do_syscall_64 (arch/x86/entry/common.c:86) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:106)
Allocated by task 4719:
kasan_save_stack (mm/kasan/common.c:45) __kasan_slab_alloc (mm/kasan/common.c:325) slab_post_alloc_hook (mm/slab.h:766) kmem_cache_alloc_node (mm/slub.c:3497) __alloc_skb (net/core/skbuff.c:552) pn533_recv_response (drivers/nfc/pn533/usb.c:65) __usb_hcd_giveback_urb (drivers/usb/core/hcd.c:1671) usb_giveback_urb_bh (drivers/usb/core/hcd.c:1704) tasklet_action_common.isra.0 (kernel/softirq.c:797) __do_softirq (kernel/softirq.c:571)
Freed by task 1901:
kasan_save_stack (mm/kasan/common.c:45) kasan_set_track (mm/kasan/common.c:52) kasan_save_free_info (mm/kasan/genericdd.c:518) __kasan_slab_free (mm/kasan/common.c:236) kmem_cache_free (mm/slub.c:3809)kfree_skbmem (net/core/skbuff.c:874)kfree_skb (net/core/skbuff.c:931) local_cleanup (net/nfc/llcp_core.c:159) nfc_llcp_unregister_device (net/nfc/llcp_core.c:1617) nfc_unregister_device (net/nfc/core.c:1179) pn53x_unregister_nfc (drivers/nfc/pn533/pn533.c:2846) pn533_usb_disconnect (drivers/nfc/pn533/usb.c:579) usb_unbind_interface (drivers/usb/core/driver.c:458) device_release_driver_internal (drivers/base/dd.c:1279) bus_remove_device (drivers/base/bus.c:529) device_del (drivers/base/core.c:3665) usb_disable_device (drivers/usb/core/message.c:1420) usb_disconnect (drivers/usb/core.c:2261) hub_event (drivers/usb/core/hub.c:5833)
process_one_work (arch/x86/include/asm/jump_label.h:27 include/linux/jump_label.h:212 include/trace/events/workqueue.h:108 kernel/workqueue.c:2281) worker_thread (include/linux/list.h:282 kernel/workqueue.c:2423)
kthread (kernel/kthread.c:319)ret_from_fork (arch/x86/entry/entry_64.S:301)
--- net/nfc/llcp_core.c | 1 + 1 file changed, 1 insertion(+)
net/nfc/llcp_core.c +1 -0
@@ -157,6 +157,7 @@ static void local_cleanup(struct nfc_llcp_local *local)cancel_work_sync (&local->rx_work);cancel_work_sync (&local->timeout_work);kfree_skb (local->rx_pending); + local->rx_pending =NULL ;del_timer_sync (&local->sdreq_timer);cancel_work_sync (&local->sdreq_timeout_work);nfc_llcp_free_sdp_tlv_list (&local->pending_sdreqs);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 78/313 net: stmmac: Fix queue statistics reading
In reply to Greg Kroah-HartmanFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit c296c77efb66994d94d9f706446a115581226550 ]
Correct queue statistics reading. All queue statistics are stored as unsigned long values. The retrieval for ethtool fetches these values as u64. However, on some systems the size of the counters are 32 bit. That yields wrong queue statistic counters e.g., on arm32 systems such as the stm32mp157. Fix it by using the correct data type.
Tested on Olimex STMP157-OLinuXino-LIME2 by simple running linuxptp for a short period of time:
Non-patched kernel:
|root@st1:~# ethtool -S eth0 | grep q0 | q0_tx_pkt_n: 3775276254951 # ??? | q0_tx_irq_n: 879 | q0_rx_pkt_n: 1194000908909 # ??? | q0_rx_irq_n: 278
Patched kernel:
|root@st1:~# ethtool -S eth0 | grep q0 | q0_tx_pkt_n: 2434 | q0_tx_irq_n: 1274 | q0_rx_pkt_n: 1604 | q0_rx_irq_n: 846
--- drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +4 -4
@@ -551,16 +551,16 @@ static void stmmac_get_per_qstats(struct stmmac_priv *priv, u64 *data) p = (char *)priv + offsetof(struct stmmac_priv , xstats.txq_stats[q].tx_pkt_n);for (stat =0 ; stat <STMMAC_TXQ_STATS ; stat++) { - *data++ = (*(u64 *)p); - p +=sizeof (u64 *); + *data++ = (*(unsigned long *)p); + p +=sizeof (unsigned long ); } }for (q =0 ; q < rx_cnt; q++) { p = (char *)priv + offsetof(struct stmmac_priv , xstats.rxq_stats[q].rx_pkt_n);for (stat =0 ; stat <STMMAC_RXQ_STATS ; stat++) { - *data++ = (*(u64 *)p); - p +=sizeof (u64 *); + *data++ = (*(unsigned long *)p); + p +=sizeof (unsigned long ); } } }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 79/313 net/sched: sch_taprio: fix possible use-after-free
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 3a415d59c1dbec9d772dbfab2d2520d98360caae ]
syzbot reported a nasty crash [1] in net_tx_action() which made little sense until we got a repro.
This repro installs a taprio qdisc, but providing an invalid TCA_RATE attribute.
qdisc_create() has to destroy the just initialized taprio qdisc, and taprio_destroy() is called.
However, the hrtimer used by taprio had already fired, therefore advance_sched() called __netif_schedule().
Then net_tx_action was trying to use a destroyed qdisc.
We can not undo the __netif_schedule(), so we must wait until one cpu serviced the qdisc before we can proceed.
Many thanks to Alexander Potapenko for his help.
[1]
BUG: KMSAN: uninit-value in queued_spin_trylock include/asm-generic/qspinlock.h:94 [inline] BUG: KMSAN: uninit-value in do_raw_spin_trylock include/linux/spinlock.h:191 [inline] BUG: KMSAN: uninit-value in __raw_spin_trylock include/linux/spinlock_api_smp.h:89 [inline] BUG: KMSAN: uninit-value in _raw_spin_trylock+0x92/0xa0 kernel/locking/spinlock.c:138 queued_spin_trylock include/asm-generic/qspinlock.h:94 [inline] do_raw_spin_trylock include/linux/spinlock.h:191 [inline] __raw_spin_trylock include/linux/spinlock_api_smp.h:89 [inline] _raw_spin_trylock+0x92/0xa0 kernel/locking/spinlock.c:138 spin_trylock include/linux/spinlock.h:359 [inline] qdisc_run_begin include/net/sch_generic.h:187 [inline] qdisc_run+0xee/0x540 include/net/pkt_sched.h:125 net_tx_action+0x77c/0x9a0 net/core/dev.c:5086 __do_softirq+0x1cc/0x7fb kernel/softirq.c:571 run_ksoftirqd+0x2c/0x50 kernel/softirq.c:934 smpboot_thread_fn+0x554/0x9f0 kernel/smpboot.c:164 kthread+0x31b/0x430 kernel/kthread.c:376 ret_from_fork+0x1f/0x30
Uninit was created at:
slab_post_alloc_hook mm/slab.h:732 [inline] slab_alloc_node mm/slub.c:3258 [inline] __kmalloc_node_track_caller+0x814/0x1250 mm/slub.c:4970 kmalloc_reserve net/core/skbuff.c:358 [inline] __alloc_skb+0x346/0xcf0 net/core/skbuff.c:430 alloc_skb include/linux/skbuff.h:1257 [inline] nlmsg_new include/net/netlink.h:953 [inline] netlink_ack+0x5f3/0x12b0 net/netlink/af_netlink.c:2436 netlink_rcv_skb+0x55d/0x6c0 net/netlink/af_netlink.c:2507 rtnetlink_rcv+0x30/0x40 net/core/rtnetlink.c:6108 netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline] netlink_unicast+0xf3b/0x1270 net/netlink/af_netlink.c:1345 netlink_sendmsg+0x1288/0x1440 net/netlink/af_netlink.c:1921 sock_sendmsg_nosec net/socket.c:714 [inline] sock_sendmsg net/socket.c:734 [inline] ____sys_sendmsg+0xabc/0xe90 net/socket.c:2482 ___sys_sendmsg+0x2a1/0x3f0 net/socket.c:2536 __sys_sendmsg net/socket.c:2565 [inline] __do_sys_sendmsg net/socket.c:2574 [inline] __se_sys_sendmsg net/socket.c:2572 [inline] __x64_sys_sendmsg+0x367/0x540 net/socket.c:2572 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd CPU: 0 PID: 13 Comm: ksoftirqd/0 Not tainted 6.0.0-rc2-syzkaller-47461-gac3859c02d7f #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/22/2022
--- include/net/sch_generic.h | 7 +++++++ net/sched/sch_taprio.c | 3 +++ 2 files changed, 10 insertions(+)
include/net/sch_generic.h +7 -0
@@ -1288,4 +1288,11 @@ void mq_change_real_num_tx(struct Qdisc *sch, unsigned int new_real_tx);int sch_frag_xmit_hook (struct sk_buff *skb,int (*xmit)(struct sk_buff *skb)); +/* Make sure qdisc is no longer in SCHED state. */ +static inline void qdisc_synchronize (const struct Qdisc *q) +{ +while (test_bit (__QDISC_STATE_SCHED, &q->state)) +msleep (1 ); +} +#endif
net/sched/sch_taprio.c +3 -0
@@ -1700,6 +1700,8 @@ static void taprio_reset(struct Qdisc *sch)int i;hrtimer_cancel (&q->advance_timer); +qdisc_synchronize (sch); +if (q->qdiscs) {for (i =0 ; i < dev->num_tx_queues; i++)if (q->qdiscs[i])
@@ -1720,6 +1722,7 @@ static void taprio_destroy(struct Qdisc *sch)* happens in qdisc_create(), after taprio_init() has been called. */ hrtimer_cancel (&q->advance_timer); +qdisc_synchronize (sch);taprio_disable_offload (dev, q,NULL );
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 80/313 l2tp: convert l2tp_tunnel_list to idr
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit c4d48a58f32c5972174a1d01c33b296fe378cce0 ]
l2tp uses l2tp_tunnel_list to track all registered tunnels and to allocate tunnel ID's. IDR can do the same job.
More importantly, with IDR we can hold the ID before a successful registration so that we don't need to worry about late error handling, it is not easy to rollback socket changes.
This is a preparation for the following fix.
Stable-dep-of: 0b2c59720e65 ("l2tp: close all race conditions in l2tp_tunnel_register()")
--- net/l2tp/l2tp_core.c | 85 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 43 deletions(-)
net/l2tp/l2tp_core.c +42 -43
@@ -104,9 +104,9 @@ static struct workqueue_struct *l2tp_wq;/* per-net private data for this module */ static unsigned int l2tp_net_id;struct l2tp_net { -struct list_head l2tp_tunnel_list; -/* Lock for write access to l2tp_tunnel_list */ -spinlock_t l2tp_tunnel_list_lock; +/* Lock for write access to l2tp_tunnel_idr */ +spinlock_t l2tp_tunnel_idr_lock; +struct idr l2tp_tunnel_idr;struct hlist_head l2tp_session_hlist[L2TP_HASH_SIZE_2 ];/* Lock for write access to l2tp_session_hlist */ spinlock_t l2tp_session_hlist_lock;
@@ -208,13 +208,10 @@ struct l2tp_tunnel *l2tp_tunnel_get(const struct net *net, u32 tunnel_id)struct l2tp_tunnel *tunnel;rcu_read_lock_bh (); -list_for_each_entry_rcu (tunnel, &pn->l2tp_tunnel_list, list) { -if (tunnel->tunnel_id == tunnel_id && -refcount_inc_not_zero (&tunnel->ref_count)) { -rcu_read_unlock_bh (); - -return tunnel; - } + tunnel =idr_find (&pn->l2tp_tunnel_idr, tunnel_id); +if (tunnel &&refcount_inc_not_zero (&tunnel->ref_count)) { +rcu_read_unlock_bh (); +return tunnel; }rcu_read_unlock_bh ();
@@ -224,13 +221,14 @@ EXPORT_SYMBOL_GPL(l2tp_tunnel_get);struct l2tp_tunnel *l2tp_tunnel_get_nth (const struct net *net,int nth) { -const struct l2tp_net *pn =l2tp_pernet (net); +struct l2tp_net *pn =l2tp_pernet (net); +unsigned long tunnel_id, tmp;struct l2tp_tunnel *tunnel;int count =0 ;rcu_read_lock_bh (); -list_for_each_entry_rcu (tunnel, &pn->l2tp_tunnel_list, list) { -if (++count > nth && +idr_for_each_entry_ul (&pn->l2tp_tunnel_idr, tunnel, tmp, tunnel_id) { +if (tunnel && ++count > nth &&refcount_inc_not_zero (&tunnel->ref_count)) {rcu_read_unlock_bh ();return tunnel;
@@ -1227,6 +1225,15 @@ static void l2tp_udp_encap_destroy(struct sock *sk)l2tp_tunnel_delete (tunnel); } +static void l2tp_tunnel_remove (struct net *net,struct l2tp_tunnel *tunnel) +{ +struct l2tp_net *pn =l2tp_pernet (net); + +spin_lock_bh (&pn->l2tp_tunnel_idr_lock); +idr_remove (&pn->l2tp_tunnel_idr, tunnel->tunnel_id); +spin_unlock_bh (&pn->l2tp_tunnel_idr_lock); +} +/* Workqueue tunnel deletion function */ static void l2tp_tunnel_del_work (struct work_struct *work) {
@@ -1234,7 +1241,6 @@ static void l2tp_tunnel_del_work(struct work_struct *work) del_work);struct sock *sk = tunnel->sock;struct socket *sock = sk->sk_socket; -struct l2tp_net *pn;l2tp_tunnel_closeall (tunnel);
@@ -1248,12 +1254,7 @@ static void l2tp_tunnel_del_work(struct work_struct *work) } } -/* Remove the tunnel struct from the tunnel list */ - pn =l2tp_pernet (tunnel->l2tp_net); -spin_lock_bh (&pn->l2tp_tunnel_list_lock); -list_del_rcu (&tunnel->list); -spin_unlock_bh (&pn->l2tp_tunnel_list_lock); - +l2tp_tunnel_remove (tunnel->l2tp_net, tunnel);/* drop initial ref */ l2tp_tunnel_dec_refcount (tunnel);
@@ -1455,12 +1456,19 @@ static int l2tp_validate_socket(const struct sock *sk, const struct net *net,int l2tp_tunnel_register (struct l2tp_tunnel *tunnel,struct net *net,struct l2tp_tunnel_cfg *cfg) { -struct l2tp_tunnel *tunnel_walk; -struct l2tp_net *pn; +struct l2tp_net *pn =l2tp_pernet (net); +u32 tunnel_id = tunnel->tunnel_id;struct socket *sock;struct sock *sk;int ret; +spin_lock_bh (&pn->l2tp_tunnel_idr_lock); + ret =idr_alloc_u32 (&pn->l2tp_tunnel_idr,NULL , &tunnel_id, tunnel_id, +GFP_ATOMIC ); +spin_unlock_bh (&pn->l2tp_tunnel_idr_lock); +if (ret) +return ret == -ENOSPC ? -EEXIST : ret; +if (tunnel->fd <0 ) { ret = l2tp_tunnel_sock_create(net, tunnel->tunnel_id, tunnel->peer_tunnel_id, cfg,
@@ -1481,23 +1489,13 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,rcu_assign_sk_user_data (sk, tunnel);write_unlock_bh (&sk->sk_callback_lock); - tunnel->l2tp_net = net; - pn =l2tp_pernet (net); -sock_hold (sk); tunnel->sock = sk; + tunnel->l2tp_net = net; -spin_lock_bh (&pn->l2tp_tunnel_list_lock); -list_for_each_entry (tunnel_walk, &pn->l2tp_tunnel_list, list) { -if (tunnel_walk->tunnel_id == tunnel->tunnel_id) { -spin_unlock_bh (&pn->l2tp_tunnel_list_lock); -sock_put (sk); - ret = -EEXIST ; - goto err_sock; - } - } -list_add_rcu (&tunnel->list, &pn->l2tp_tunnel_list); -spin_unlock_bh (&pn->l2tp_tunnel_list_lock); +spin_lock_bh (&pn->l2tp_tunnel_idr_lock); +idr_replace (&pn->l2tp_tunnel_idr, tunnel, tunnel->tunnel_id); +spin_unlock_bh (&pn->l2tp_tunnel_idr_lock);if (tunnel->encap ==L2TP_ENCAPTYPE_UDP ) {struct udp_tunnel_sock_cfg udp_cfg = {
@@ -1523,9 +1521,6 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,return 0 ; -err_sock: -write_lock_bh (&sk->sk_callback_lock); -rcu_assign_sk_user_data (sk,NULL ); err_inval_sock:write_unlock_bh (&sk->sk_callback_lock);
@@ -1534,6 +1529,7 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,else sockfd_put (sock); err: +l2tp_tunnel_remove (net, tunnel);return ret; }EXPORT_SYMBOL_GPL (l2tp_tunnel_register);
@@ -1647,8 +1643,8 @@ static __net_init int l2tp_init_net(struct net *net)struct l2tp_net *pn =net_generic (net, l2tp_net_id);int hash; -INIT_LIST_HEAD (&pn->l2tp_tunnel_list); -spin_lock_init (&pn->l2tp_tunnel_list_lock); +idr_init (&pn->l2tp_tunnel_idr); +spin_lock_init (&pn->l2tp_tunnel_idr_lock);for (hash =0 ; hash <L2TP_HASH_SIZE_2 ; hash++)INIT_HLIST_HEAD (&pn->l2tp_session_hlist[hash]);
@@ -1662,11 +1658,13 @@ static __net_exit void l2tp_exit_net(struct net *net) {struct l2tp_net *pn =l2tp_pernet (net);struct l2tp_tunnel *tunnel =NULL ; +unsigned long tunnel_id, tmp;int hash;rcu_read_lock_bh (); -list_for_each_entry_rcu (tunnel, &pn->l2tp_tunnel_list, list) { -l2tp_tunnel_delete (tunnel); +idr_for_each_entry_ul (&pn->l2tp_tunnel_idr, tunnel, tmp, tunnel_id) { +if (tunnel) +l2tp_tunnel_delete (tunnel); }rcu_read_unlock_bh ();
@@ -1676,6 +1674,7 @@ static __net_exit void l2tp_exit_net(struct net *net)for (hash =0 ; hash <L2TP_HASH_SIZE_2 ; hash++)WARN_ON_ONCE (!hlist_empty (&pn->l2tp_session_hlist[hash])); +idr_destroy (&pn->l2tp_tunnel_idr); }static struct pernet_operations l2tp_net_ops = {
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 81/313 l2tp: close all race conditions in l2tp_tunnel_register()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 0b2c59720e65885a394a017d0cf9cab118914682 ]
The code in l2tp_tunnel_register() is racy in several ways:
1. It modifies the tunnel socket _after_ publishing it.
2. It calls setup_udp_tunnel_sock() on an existing socket without locking.
3. It changes sock lock class on fly, which triggers many syzbot reports.
This patch amends all of them by moving socket initialization code before publishing and under sock lock. As suggested by Jakub, the l2tp lockdep class is not necessary as we can just switch to bh_lock_sock_nested().
--- net/l2tp/l2tp_core.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
net/l2tp/l2tp_core.c +14 -14
@@ -1041,7 +1041,7 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb, unsIPCB (skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE |IPSKB_XFRM_TRANSFORMED |IPSKB_REROUTED );nf_reset_ct (skb); -bh_lock_sock (sk); +bh_lock_sock_nested (sk);if (sock_owned_by_user (sk)) {kfree_skb (skb); ret =NET_XMIT_DROP ;
@@ -1385,8 +1385,6 @@ static int l2tp_tunnel_sock_create(struct net *net,return err; } -static struct lock_class_key l2tp_socket_class; -int l2tp_tunnel_create (int fd,int version,u32 tunnel_id,u32 peer_tunnel_id,struct l2tp_tunnel_cfg *cfg,struct l2tp_tunnel **tunnelp) {
@@ -1482,21 +1480,16 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net, } sk = sock->sk; +lock_sock (sk);write_lock_bh (&sk->sk_callback_lock); ret =l2tp_validate_socket (sk, net, tunnel->encap); -if (ret <0 ) +if (ret <0 ) { +release_sock (sk); goto err_inval_sock; + }rcu_assign_sk_user_data (sk, tunnel);write_unlock_bh (&sk->sk_callback_lock); -sock_hold (sk); - tunnel->sock = sk; - tunnel->l2tp_net = net; - -spin_lock_bh (&pn->l2tp_tunnel_idr_lock); -idr_replace (&pn->l2tp_tunnel_idr, tunnel, tunnel->tunnel_id); -spin_unlock_bh (&pn->l2tp_tunnel_idr_lock); -if (tunnel->encap ==L2TP_ENCAPTYPE_UDP ) {struct udp_tunnel_sock_cfg udp_cfg = { .sk_user_data = tunnel,
@@ -1510,9 +1503,16 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net, tunnel->old_sk_destruct = sk->sk_destruct; sk->sk_destruct = &l2tp_tunnel_destruct; -lockdep_set_class_and_name (&sk->sk_lock.slock, &l2tp_socket_class, -"l2tp_sock" ); sk->sk_allocation =GFP_ATOMIC ; +release_sock (sk); + +sock_hold (sk); + tunnel->sock = sk; + tunnel->l2tp_net = net; + +spin_lock_bh (&pn->l2tp_tunnel_idr_lock); +idr_replace (&pn->l2tp_tunnel_idr, tunnel, tunnel->tunnel_id); +spin_unlock_bh (&pn->l2tp_tunnel_idr_lock);trace_register_tunnel (tunnel);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 82/313 net: usb: sr9700: Handle negative len
In reply to Greg Kroah-HartmanFrom: Szymon Heidrich <[email protected]>
[ Upstream commit ecf7cf8efb59789e2b21d2f9ab926142579092b2 ]
Packet len computed as difference of length word extracted from skb data and four may result in a negative value. In such case processing of the buffer should be interrupted rather than setting sr_skb->len to an unexpectedly large value (due to cast from signed to unsigned integer) and passing sr_skb to usbnet_skb_return.
--- drivers/net/usb/sr9700.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/sr9700.c +1 -1
@@ -413,7 +413,7 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb)/* ignore the CRC length */ len = (skb->data[1 ] | (skb->data[2 ] <<8 )) -4 ; -if (len >ETH_FRAME_LEN || len > skb->len) +if (len >ETH_FRAME_LEN || len > skb->len || len <0 )return 0 ;/* the last packet of current skb */
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 83/313 net: mdio: validate parameter addr in mdiobus_get_phy()
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit 867dbe784c5010a466f00a7d1467c1c5ea569c75 ]
The caller may pass any value as addr, what may result in an out-of-bounds access to array mdio_map. One existing case is stmmac_init_phy() that may pass -1 as addr. Therefore validate addr before using it.
--- drivers/net/phy/mdio_bus.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/phy/mdio_bus.c +6 -1
@@ -108,7 +108,12 @@ EXPORT_SYMBOL(mdiobus_unregister_device);struct phy_device *mdiobus_get_phy (struct mii_bus *bus,int addr) { -struct mdio_device *mdiodev = bus->mdio_map[addr]; +struct mdio_device *mdiodev; + +if (addr <0 || addr >=ARRAY_SIZE (bus->mdio_map)) +return NULL ; + + mdiodev = bus->mdio_map[addr];if (!mdiodev)return NULL ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 84/313 HID: check empty report_list in hid_validate_values()
In reply to Greg Kroah-HartmanFrom: Pietro Borrello <[email protected]>
[ Upstream commit b12fece4c64857e5fab4290bf01b2e0317a88456 ]
Add a check for empty report_list in hid_validate_values(). The missing check causes a type confusion when issuing a list_entry() on an empty report_list.
The problem is caused by the assumption that the device must have valid report_list. While this will be true for all normal HID devices, a suitably malicious device can violate the assumption.
--- drivers/hid/hid-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hid/hid-core.c +2 -2
@@ -993,8 +993,8 @@ struct hid_report *hid_validate_values(struct hid_device *hid,* Validating on id 0 means we should examine the first * report in the list. */ - report =list_entry ( - hid->report_enum[type].report_list.next, + report =list_first_entry_or_null ( + &hid->report_enum[type].report_list, struct hid_report, list); }else { report = hid->report_enum[type].report_id_hash[id];
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 85/313 HID: check empty report_list in bigben_probe()
In reply to Greg Kroah-HartmanFrom: Pietro Borrello <[email protected]>
[ Upstream commit c7bf714f875531f227f2ef1fdcc8f4d44e7c7d9d ]
Add a check for empty report_list in bigben_probe().
The missing check causes a type confusion when issuing a list_entry() on an empty report_list.
The problem is caused by the assumption that the device must have valid report_list. While this will be true for all normal HID devices, a suitably malicious device can violate the assumption.
--- drivers/hid/hid-bigbenff.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hid/hid-bigbenff.c +5 -0
@@ -344,6 +344,11 @@ static int bigben_probe(struct hid_device *hid, } report_list = &hid->report_enum[HID_OUTPUT_REPORT ].report_list; +if (list_empty (report_list)) { +hid_err (hid,"no output report found\n" ); + error = -ENODEV ; + goto error_hw_stop; + } bigben->report =list_entry (report_list->next, struct hid_report, list);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 86/313 net: stmmac: fix invalid call to mdiobus_get_phy()
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit 1f3bd64ad921f051254591fbed04fd30b306cde6 ]
In a number of cases the driver assigns a default value of -1 to priv->plat->phy_addr. This may result in calling mdiobus_get_phy() with addr parameter being -1. Therefore check for this scenario and bail out before calling mdiobus_get_phy().
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +5 -0
@@ -1148,6 +1148,11 @@ static int stmmac_init_phy(struct net_device *dev)int addr = priv->plat->phy_addr;struct phy_device *phydev; +if (addr <0 ) { +netdev_err (priv->dev,"no phy found\n" ); +return -ENODEV ; + } + phydev =mdiobus_get_phy (priv->mii, addr);if (!phydev) {netdev_err (priv->dev,"no phy at addr %d\n" , addr);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 87/313 pinctrl: rockchip: fix mux route data for rk3568
In reply to Greg Kroah-HartmanFrom: Jonas Karlman <[email protected]>
[ Upstream commit 431d1531466033909d2e8c754a7dc3704b70843f ]
IO mux selection is configured in PMU_GRF_SOC_CON4 and GRF_IOFUNC_SEL0-5 regs on RK3568. pwm0-2 is configured in PMU_GRF reg and the rest is configured in GRF_IOFUNC regs according to TRM [1].
Update mux route data to reflect this and use proper detection pin for UART1 IO mux M1.
This fixes HDMITX IO mux M1 selection and makes it possible to enable HDMI CEC on my Radxa ROCK 3 Model A v1.31 board.
[1] http://opensource.rock-chips.com/images/2/26/Rockchip_RK3568_TRM_Part1_V1.3-20220930P.PDF
--- drivers/pinctrl/pinctrl-rockchip.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/pinctrl/pinctrl-rockchip.c +10 -10
@@ -926,19 +926,19 @@ static struct rockchip_mux_route_data rk3568_mux_route_data[] = {RK_MUXROUTE_PMU (0 ,RK_PB5 ,4 ,0x0110 ,WRITE_MASK_VAL (3 ,2 ,1 )),/* PWM1 IO mux M1 */ RK_MUXROUTE_PMU (0 ,RK_PC1 ,1 ,0x0110 ,WRITE_MASK_VAL (5 ,4 ,0 )),/* PWM2 IO mux M0 */ RK_MUXROUTE_PMU (0 ,RK_PB6 ,4 ,0x0110 ,WRITE_MASK_VAL (5 ,4 ,1 )),/* PWM2 IO mux M1 */ -RK_MUXROUTE_PMU (0 ,RK_PB3 ,2 ,0x0300 ,WRITE_MASK_VAL (0 ,0 ,0 )),/* CAN0 IO mux M0 */ +RK_MUXROUTE_GRF (0 ,RK_PB3 ,2 ,0x0300 ,WRITE_MASK_VAL (0 ,0 ,0 )),/* CAN0 IO mux M0 */ RK_MUXROUTE_GRF (2 ,RK_PA1 ,4 ,0x0300 ,WRITE_MASK_VAL (0 ,0 ,1 )),/* CAN0 IO mux M1 */ RK_MUXROUTE_GRF (1 ,RK_PA1 ,3 ,0x0300 ,WRITE_MASK_VAL (2 ,2 ,0 )),/* CAN1 IO mux M0 */ RK_MUXROUTE_GRF (4 ,RK_PC3 ,3 ,0x0300 ,WRITE_MASK_VAL (2 ,2 ,1 )),/* CAN1 IO mux M1 */ RK_MUXROUTE_GRF (4 ,RK_PB5 ,3 ,0x0300 ,WRITE_MASK_VAL (4 ,4 ,0 )),/* CAN2 IO mux M0 */ RK_MUXROUTE_GRF (2 ,RK_PB2 ,4 ,0x0300 ,WRITE_MASK_VAL (4 ,4 ,1 )),/* CAN2 IO mux M1 */ RK_MUXROUTE_GRF (4 ,RK_PC4 ,1 ,0x0300 ,WRITE_MASK_VAL (6 ,6 ,0 )),/* HPDIN IO mux M0 */ -RK_MUXROUTE_PMU (0 ,RK_PC2 ,2 ,0x0300 ,WRITE_MASK_VAL (6 ,6 ,1 )),/* HPDIN IO mux M1 */ +RK_MUXROUTE_GRF (0 ,RK_PC2 ,2 ,0x0300 ,WRITE_MASK_VAL (6 ,6 ,1 )),/* HPDIN IO mux M1 */ RK_MUXROUTE_GRF (3 ,RK_PB1 ,3 ,0x0300 ,WRITE_MASK_VAL (8 ,8 ,0 )),/* GMAC1 IO mux M0 */ RK_MUXROUTE_GRF (4 ,RK_PA7 ,3 ,0x0300 ,WRITE_MASK_VAL (8 ,8 ,1 )),/* GMAC1 IO mux M1 */ RK_MUXROUTE_GRF (4 ,RK_PD1 ,1 ,0x0300 ,WRITE_MASK_VAL (10 ,10 ,0 )),/* HDMITX IO mux M0 */ -RK_MUXROUTE_PMU (0 ,RK_PC7 ,1 ,0x0300 ,WRITE_MASK_VAL (10 ,10 ,1 )),/* HDMITX IO mux M1 */ -RK_MUXROUTE_PMU (0 ,RK_PB6 ,1 ,0x0300 ,WRITE_MASK_VAL (14 ,14 ,0 )),/* I2C2 IO mux M0 */ +RK_MUXROUTE_GRF (0 ,RK_PC7 ,1 ,0x0300 ,WRITE_MASK_VAL (10 ,10 ,1 )),/* HDMITX IO mux M1 */ +RK_MUXROUTE_GRF (0 ,RK_PB6 ,1 ,0x0300 ,WRITE_MASK_VAL (14 ,14 ,0 )),/* I2C2 IO mux M0 */ RK_MUXROUTE_GRF (4 ,RK_PB4 ,1 ,0x0300 ,WRITE_MASK_VAL (14 ,14 ,1 )),/* I2C2 IO mux M1 */ RK_MUXROUTE_GRF (1 ,RK_PA0 ,1 ,0x0304 ,WRITE_MASK_VAL (0 ,0 ,0 )),/* I2C3 IO mux M0 */ RK_MUXROUTE_GRF(3, RK_PB6, 4, 0x0304, WRITE_MASK_VAL(0, 0, 1)), /* I2C3 IO mux M1 */
@@ -964,7 +964,7 @@ static struct rockchip_mux_route_data rk3568_mux_route_data[] = {RK_MUXROUTE_GRF (4 ,RK_PC3 ,1 ,0x0308 ,WRITE_MASK_VAL (12 ,12 ,1 )),/* PWM15 IO mux M1 */ RK_MUXROUTE_GRF (3 ,RK_PD2 ,3 ,0x0308 ,WRITE_MASK_VAL (14 ,14 ,0 )),/* SDMMC2 IO mux M0 */ RK_MUXROUTE_GRF (3 ,RK_PA5 ,5 ,0x0308 ,WRITE_MASK_VAL (14 ,14 ,1 )),/* SDMMC2 IO mux M1 */ -RK_MUXROUTE_PMU (0 ,RK_PB5 ,2 ,0x030c ,WRITE_MASK_VAL (0 ,0 ,0 )),/* SPI0 IO mux M0 */ +RK_MUXROUTE_GRF (0 ,RK_PB5 ,2 ,0x030c ,WRITE_MASK_VAL (0 ,0 ,0 )),/* SPI0 IO mux M0 */ RK_MUXROUTE_GRF (2 ,RK_PD3 ,3 ,0x030c ,WRITE_MASK_VAL (0 ,0 ,1 )),/* SPI0 IO mux M1 */ RK_MUXROUTE_GRF (2 ,RK_PB5 ,3 ,0x030c ,WRITE_MASK_VAL (2 ,2 ,0 )),/* SPI1 IO mux M0 */ RK_MUXROUTE_GRF(3, RK_PC3, 3, 0x030c, WRITE_MASK_VAL(2, 2, 1)), /* SPI1 IO mux M1 */
@@ -973,8 +973,8 @@ static struct rockchip_mux_route_data rk3568_mux_route_data[] = {RK_MUXROUTE_GRF (4 ,RK_PB3 ,4 ,0x030c ,WRITE_MASK_VAL (6 ,6 ,0 )),/* SPI3 IO mux M0 */ RK_MUXROUTE_GRF (4 ,RK_PC2 ,2 ,0x030c ,WRITE_MASK_VAL (6 ,6 ,1 )),/* SPI3 IO mux M1 */ RK_MUXROUTE_GRF (2 ,RK_PB4 ,2 ,0x030c ,WRITE_MASK_VAL (8 ,8 ,0 )),/* UART1 IO mux M0 */ -RK_MUXROUTE_PMU (0 ,RK_PD1 ,1 ,0x030c ,WRITE_MASK_VAL (8 ,8 ,1 )),/* UART1 IO mux M1 */ -RK_MUXROUTE_PMU (0 ,RK_PD1 ,1 ,0x030c ,WRITE_MASK_VAL (10 ,10 ,0 )),/* UART2 IO mux M0 */ +RK_MUXROUTE_GRF (3 ,RK_PD6 ,4 ,0x030c ,WRITE_MASK_VAL (8 ,8 ,1 )),/* UART1 IO mux M1 */ +RK_MUXROUTE_GRF (0 ,RK_PD1 ,1 ,0x030c ,WRITE_MASK_VAL (10 ,10 ,0 )),/* UART2 IO mux M0 */ RK_MUXROUTE_GRF (1 ,RK_PD5 ,2 ,0x030c ,WRITE_MASK_VAL (10 ,10 ,1 )),/* UART2 IO mux M1 */ RK_MUXROUTE_GRF (1 ,RK_PA1 ,2 ,0x030c ,WRITE_MASK_VAL (12 ,12 ,0 )),/* UART3 IO mux M0 */ RK_MUXROUTE_GRF(3, RK_PB7, 4, 0x030c, WRITE_MASK_VAL(12, 12, 1)), /* UART3 IO mux M1 */
@@ -1004,13 +1004,13 @@ static struct rockchip_mux_route_data rk3568_mux_route_data[] = {RK_MUXROUTE_GRF (3 ,RK_PD6 ,5 ,0x0314 ,WRITE_MASK_VAL (1 ,0 ,1 )),/* PDM IO mux M1 */ RK_MUXROUTE_GRF (4 ,RK_PA0 ,4 ,0x0314 ,WRITE_MASK_VAL (1 ,0 ,1 )),/* PDM IO mux M1 */ RK_MUXROUTE_GRF (3 ,RK_PC4 ,5 ,0x0314 ,WRITE_MASK_VAL (1 ,0 ,2 )),/* PDM IO mux M2 */ -RK_MUXROUTE_PMU (0 ,RK_PA5 ,3 ,0x0314 ,WRITE_MASK_VAL (3 ,2 ,0 )),/* PCIE20 IO mux M0 */ +RK_MUXROUTE_GRF (0 ,RK_PA5 ,3 ,0x0314 ,WRITE_MASK_VAL (3 ,2 ,0 )),/* PCIE20 IO mux M0 */ RK_MUXROUTE_GRF (2 ,RK_PD0 ,4 ,0x0314 ,WRITE_MASK_VAL (3 ,2 ,1 )),/* PCIE20 IO mux M1 */ RK_MUXROUTE_GRF (1 ,RK_PB0 ,4 ,0x0314 ,WRITE_MASK_VAL (3 ,2 ,2 )),/* PCIE20 IO mux M2 */ -RK_MUXROUTE_PMU (0 ,RK_PA4 ,3 ,0x0314 ,WRITE_MASK_VAL (5 ,4 ,0 )),/* PCIE30X1 IO mux M0 */ +RK_MUXROUTE_GRF (0 ,RK_PA4 ,3 ,0x0314 ,WRITE_MASK_VAL (5 ,4 ,0 )),/* PCIE30X1 IO mux M0 */ RK_MUXROUTE_GRF (2 ,RK_PD2 ,4 ,0x0314 ,WRITE_MASK_VAL (5 ,4 ,1 )),/* PCIE30X1 IO mux M1 */ RK_MUXROUTE_GRF (1 ,RK_PA5 ,4 ,0x0314 ,WRITE_MASK_VAL (5 ,4 ,2 )),/* PCIE30X1 IO mux M2 */ -RK_MUXROUTE_PMU (0 ,RK_PA6 ,2 ,0x0314 ,WRITE_MASK_VAL (7 ,6 ,0 )),/* PCIE30X2 IO mux M0 */ +RK_MUXROUTE_GRF (0 ,RK_PA6 ,2 ,0x0314 ,WRITE_MASK_VAL (7 ,6 ,0 )),/* PCIE30X2 IO mux M0 */ RK_MUXROUTE_GRF (2 ,RK_PD4 ,4 ,0x0314 ,WRITE_MASK_VAL (7 ,6 ,1 )),/* PCIE30X2 IO mux M1 */ RK_MUXROUTE_GRF(4, RK_PC2, 4, 0x0314, WRITE_MASK_VAL(7, 6, 2)), /* PCIE30X2 IO mux M2 */ };
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 70/313 net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs
In reply to Greg Kroah-HartmanFrom: Esina Ekaterina <[email protected]>
[ Upstream commit 488e0bf7f34af3d42d1d5e56f7a5a7beaff188a3 ]
If uhdlc_priv_tsa != 1 then utdm is not initialized. And if ret != NULL then goto undo_uhdlc_init, where utdm is dereferenced. Same if dev == NULL.
Found by Astra Linux on behalf of Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wan/fsl_ucc_hdlc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wan/fsl_ucc_hdlc.c +4 -2
@@ -1243,9 +1243,11 @@ static int ucc_hdlc_probe(struct platform_device *pdev) free_dev:free_netdev (dev); undo_uhdlc_init: -iounmap (utdm->siram); +if (utdm) +iounmap (utdm->siram); unmap_si_regs: -iounmap (utdm->si_regs); +if (utdm) +iounmap (utdm->si_regs); free_utdm:if (uhdlc_priv->tsa)kfree (utdm);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 88/313 ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcor-som
In reply to Greg Kroah-HartmanFrom: Patrice Chotard <[email protected]>
[ Upstream commit 7ffd2266bd32d9f31a4e918443c733906cff0d19 ]
Chip select pinctrl phandle was missing in several stm32mp15x based boards.
--- arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi +6 -2
@@ -247,8 +247,12 @@ &pwr_regulators { &qspi { pinctrl-names = "default", "sleep"; - pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>; - pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>; + pinctrl-0 = <&qspi_clk_pins_a + &qspi_bk1_pins_a + &qspi_cs1_pins_a>; + pinctrl-1 = <&qspi_clk_sleep_pins_a + &qspi_bk1_sleep_pins_a + &qspi_cs1_sleep_pins_a>; reg = <0x58003000 0x1000>, <0x70000000 0x200000>; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 89/313 ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcom-som
In reply to Greg Kroah-HartmanFrom: Patrice Chotard <[email protected]>
[ Upstream commit 21d83512bf2bd25ebed467151fd2bcd0cca7dc9a ]
Chip select pinctrl phandle was missing in several stm32mp15x based boards.
--- arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi +6 -2
@@ -428,8 +428,12 @@ &pwr_regulators { &qspi { pinctrl-names = "default", "sleep"; - pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>; - pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>; + pinctrl-0 = <&qspi_clk_pins_a + &qspi_bk1_pins_a + &qspi_cs1_pins_a>; + pinctrl-1 = <&qspi_clk_sleep_pins_a + &qspi_bk1_sleep_pins_a + &qspi_cs1_sleep_pins_a>; reg = <0x58003000 0x1000>, <0x70000000 0x4000000>; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 90/313 ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp157c-emstamp-argon
In reply to Greg Kroah-HartmanFrom: Patrice Chotard <[email protected]>
[ Upstream commit 732dbcf52f74b254a7ddd4226e0b9638e1e7aeff ]
Chip select pinctrl phandle was missing in several stm32mp15x based boards.
--- arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi +6 -2
@@ -391,8 +391,12 @@ &pwr_regulators { &qspi { pinctrl-names = "default", "sleep"; - pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>; - pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>; + pinctrl-0 = <&qspi_clk_pins_a + &qspi_bk1_pins_a + &qspi_cs1_pins_a>; + pinctrl-1 = <&qspi_clk_sleep_pins_a + &qspi_bk1_sleep_pins_a + &qspi_cs1_sleep_pins_a>; reg = <0x58003000 0x1000>, <0x70000000 0x4000000>; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 91/313 ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp151a-prtt1l
In reply to Greg Kroah-HartmanFrom: Patrice Chotard <[email protected]>
[ Upstream commit 175281f80695569c7f9cf062e5d0ddc4addc109f ]
Chip select pinctrl phandle was missing in several stm32mp15x based boards.
--- arch/arm/boot/dts/stm32mp151a-prtt1l.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stm32mp151a-prtt1l.dtsi +6 -2
@@ -101,8 +101,12 @@ &iwdg2 { &qspi { pinctrl-names = "default", "sleep"; - pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>; - pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>; + pinctrl-0 = <&qspi_clk_pins_a + &qspi_bk1_pins_a + &qspi_cs1_pins_a>; + pinctrl-1 = <&qspi_clk_sleep_pins_a + &qspi_bk1_sleep_pins_a + &qspi_cs1_sleep_pins_a>; reg = <0x58003000 0x1000>, <0x70000000 0x4000000>; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 92/313 HID: revert CHERRY_MOUSE_000C quirk
In reply to Greg Kroah-HartmanFrom: Jiri Kosina <[email protected]>
[ Upstream commit cbf44580ce6b310272a73e3e794233fd064330bd ]
This partially reverts commit f6d910a89a2391 ("HID: usbhid: Add ALWAYS_POLL quirk for some mice"), as it turns out to break reboot on some platforms for reason yet to be understood.
--- drivers/hid/hid-ids.h | 1 - drivers/hid/hid-quirks.c | 1 - 2 files changed, 2 deletions(-)
drivers/hid/hid-ids.h +0 -1
@@ -274,7 +274,6 @@#define USB_DEVICE_ID_CH_AXIS_295 0x001c#define USB_VENDOR_ID_CHERRY 0x046a -#define USB_DEVICE_ID_CHERRY_MOUSE_000C 0x000c#define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023#define USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR 0x0027
drivers/hid/hid-quirks.c +0 -1
@@ -54,7 +54,6 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_THROTTLE), HID_QUIRK_NOGET }, - { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_MOUSE_000C), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K65RGB), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K65RGB_RAPIDFIRE), HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K70RGB), HID_QUIRK_NO_INIT_REPORTS },
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 93/313 block/rnbd-clt: fix wrong max ID in ida_alloc_max
In reply to Greg Kroah-HartmanFrom: Guoqing Jiang <[email protected]>
[ Upstream commit 9d6033e350694a67885605674244d43c9559dc36 ]
We need to pass 'end - 1' to ida_alloc_max after switch from ida_simple_get to ida_alloc_max.
Otherwise smatch warns.
drivers/block/rnbd/rnbd-clt.c:1460 init_dev() error: Calling ida_alloc_max() with a 'max' argument which is a power of 2. -1 missing?
--- drivers/block/rnbd/rnbd-clt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/rnbd/rnbd-clt.c +1 -1
@@ -1440,7 +1440,7 @@ static struct rnbd_clt_dev *init_dev(struct rnbd_clt_session *sess, goto out_alloc; } - ret =ida_alloc_max (&index_ida,1 << (MINORBITS -RNBD_PART_BITS ), + ret =ida_alloc_max (&index_ida, (1 << (MINORBITS -RNBD_PART_BITS )) -1 ,GFP_KERNEL );if (ret <0 ) { pr_err("Failed to initialize device '%s' from session %s, allocating idr failed, err: %d\n",
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 94/313 usb: ucsi: Ensure connector delayed work items are flushed
In reply to Greg Kroah-HartmanFrom: Jack Pham <[email protected]>
[ Upstream commit fac4b8633fd682ecc8e9cff61cb3e33374a1c7e5 ]
During ucsi_unregister() when destroying a connector's workqueue, there may still be pending delayed work items that haven't been scheduled yet. Because queue_delayed_work() uses a separate timer to schedule a work item, the destroy_workqueue() call is not aware of any pending items. Hence when a pending item's timer expires it would then try to queue on a dangling workqueue pointer.
Fix this by keeping track of all work items in a list, so that prior to destroying the workqueue any pending items can be flushed. Do this by calling mod_delayed_work() as that will cause pending items to get queued immediately, which then allows the ensuing destroy_workqueue() to implicitly drain all currently queued items to completion and free themselves.
--- drivers/usb/typec/ucsi/ucsi.c | 24 +++++++++++++++++++++--- drivers/usb/typec/ucsi/ucsi.h | 1 + 2 files changed, 22 insertions(+), 3 deletions(-)
drivers/usb/typec/ucsi/ucsi.c +21 -3
@@ -187,6 +187,7 @@ EXPORT_SYMBOL_GPL(ucsi_send_command);struct ucsi_work {struct delayed_work work; +struct list_head node;unsigned long delay;unsigned int count;struct ucsi_connector *con;
@@ -202,6 +203,7 @@ static void ucsi_poll_worker(struct work_struct *work)mutex_lock (&con->lock);if (!con->partner) { +list_del (&uwork->node);mutex_unlock (&con->lock);kfree (uwork);return ;
@@ -209,10 +211,12 @@ static void ucsi_poll_worker(struct work_struct *work) ret = uwork->cb (con); -if (uwork->count-- && (ret == -EBUSY || ret == -ETIMEDOUT )) +if (uwork->count-- && (ret == -EBUSY || ret == -ETIMEDOUT )) {queue_delayed_work (con->wq, &uwork->work, uwork->delay); -else + }else { +list_del (&uwork->node);kfree (uwork); + }mutex_unlock (&con->lock); }
@@ -236,6 +240,7 @@ static int ucsi_partner_task(struct ucsi_connector *con, uwork->con = con; uwork->cb = cb; +list_add_tail (&uwork->node, &con->partner_tasks);queue_delayed_work (con->wq, &uwork->work, delay);return 0 ;
@@ -1056,6 +1061,7 @@ static int ucsi_register_port(struct ucsi *ucsi, int index)INIT_WORK (&con->work, ucsi_handle_connector_change);init_completion (&con->complete);mutex_init (&con->lock); +INIT_LIST_HEAD (&con->partner_tasks); con->num = index +1 ; con->ucsi = ucsi;
@@ -1420,8 +1426,20 @@ void ucsi_unregister(struct ucsi *ucsi)ucsi_unregister_altmodes (&ucsi->connector[i],UCSI_RECIPIENT_CON );ucsi_unregister_port_psy (&ucsi->connector[i]); -if (ucsi->connector[i].wq) + +if (ucsi->connector[i].wq) { +struct ucsi_work *uwork; + +mutex_lock (&ucsi->connector[i].lock); +/* +* queue delayed items immediately so they can execute +* and free themselves before the wq is destroyed +*/ +list_for_each_entry (uwork, &ucsi->connector[i].partner_tasks, node) +mod_delayed_work (ucsi->connector[i].wq, &uwork->work,0 ); +mutex_unlock (&ucsi->connector[i].lock);destroy_workqueue (ucsi->connector[i].wq); + }typec_unregister_port (ucsi->connector[i].port); }
drivers/usb/typec/ucsi/ucsi.h +1 -0
@@ -322,6 +322,7 @@ struct ucsi_connector {struct work_struct work;struct completion complete;struct workqueue_struct *wq; +struct list_head partner_tasks;struct typec_port *port;struct typec_partner *partner;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 95/313 usb: gadget: f_fs: Prevent race during ffs_ep0_queue_wait
In reply to Greg Kroah-HartmanFrom: Udipto Goswami <[email protected]>
[ Upstream commit 6a19da111057f69214b97c62fb0ac59023970850 ]
While performing fast composition switch, there is a possibility that the process of ffs_ep0_write/ffs_ep0_read get into a race condition due to ep0req being freed up from functionfs_unbind.
Consider the scenario that the ffs_ep0_write calls the ffs_ep0_queue_wait by taking a lock &ffs->ev.waitq.lock. However, the functionfs_unbind isn't bounded so it can go ahead and mark the ep0req to NULL, and since there is no NULL check in ffs_ep0_queue_wait we will end up in use-after-free.
Fix this by making a serialized execution between the two functions using a mutex_lock(ffs->mutex).
--- drivers/usb/gadget/function/f_fs.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/gadget/function/f_fs.c +5 -0
@@ -279,6 +279,9 @@ static int __ffs_ep0_queue_wait(struct ffs_data *ffs, char *data, size_t len)struct usb_request *req = ffs->ep0req;int ret; +if (!req) +return -EINVAL ; + req->zero = len <le16_to_cpu (ffs->ev.setup.wLength);spin_unlock_irq (&ffs->ev.waitq.lock);
@@ -1892,10 +1895,12 @@ static void functionfs_unbind(struct ffs_data *ffs)ENTER ();if (!WARN_ON (!ffs->gadget)) { +mutex_lock (&ffs->mutex);usb_ep_free_request (ffs->gadget->ep0, ffs->ep0req); ffs->ep0req =NULL ; ffs->gadget =NULL ;clear_bit (FFS_FL_BOUND , &ffs->flags); +mutex_unlock (&ffs->mutex);ffs_data_put (ffs); } }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 96/313 usb: gadget: f_fs: Ensure ep0req is dequeued before free_request
In reply to Greg Kroah-HartmanFrom: Udipto Goswami <[email protected]>
[ Upstream commit ce405d561b020e5a46340eb5146805a625dcacee ]
As per the documentation, function usb_ep_free_request guarantees the request will not be queued or no longer be re-queued (or otherwise used). However, with the current implementation it doesn't make sure that the request in ep0 isn't reused.
Fix this by dequeuing the ep0req on functionfs_unbind before freeing the request to align with the definition.
--- drivers/usb/gadget/function/f_fs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/gadget/function/f_fs.c +2 -0
@@ -1895,6 +1895,8 @@ static void functionfs_unbind(struct ffs_data *ffs)ENTER ();if (!WARN_ON (!ffs->gadget)) { +/* dequeue before freeing ep0req */ +usb_ep_dequeue (ffs->gadget->ep0, ffs->ep0req);mutex_lock (&ffs->mutex);usb_ep_free_request (ffs->gadget->ep0, ffs->ep0req); ffs->ep0req =NULL ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 97/313 netfilter: conntrack: handle tcp challenge acks during connection reuse
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit c410cb974f2ba562920ecb8492ee66945dcf88af ]
When a connection is re-used, following can happen:
[ connection starts to close, fin sent in either direction ]
Quoted 1 line
syn # initator quickly reuses connection
< ack # peer sends a challenge ack > rst # rst, sequence number == ack_seq of previous challenge ack > syn # this syn is expected to pass
Problem is that the rst will fail window validation, so it gets tagged as invalid.
If ruleset drops such packets, we get repeated syn-retransmits until initator gives up or peer starts responding with syn/ack.
Before the commit indicated in the "Fixes" tag below this used to work:
The challenge-ack made conntrack re-init state based on the challenge ack itself, so the following rst would pass window validation.
Add challenge-ack support: If we get ack for syn, record the ack_seq, and then check if the rst sequence number matches the last ack number seen in reverse direction.
--- net/netfilter/nf_conntrack_proto_tcp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
net/netfilter/nf_conntrack_proto_tcp.c +15 -0
@@ -1068,6 +1068,13 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct, ct->proto.tcp.last_flags |=IP_CT_EXP_CHALLENGE_ACK ; } + +/* possible challenge ack reply to syn */ +if (old_state ==TCP_CONNTRACK_SYN_SENT && + index ==TCP_ACK_SET && + dir ==IP_CT_DIR_REPLY ) + ct->proto.tcp.last_ack =ntohl (th->ack_seq); +spin_unlock_bh (&ct->lock); nf_ct_l4proto_log_invalid(skb, ct, state, "packet (index %d) in dir %d ignored, state %s",
@@ -1193,6 +1200,14 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct,* segments we ignored. */ goto in_window; } + +/* Reset in response to a challenge-ack we let through earlier */ +if (old_state ==TCP_CONNTRACK_SYN_SENT && + ct->proto.tcp.last_index ==TCP_ACK_SET && + ct->proto.tcp.last_dir ==IP_CT_DIR_REPLY && +ntohl (th->seq) == ct->proto.tcp.last_ack) + goto in_window; +break ;default :/* Keep compilers happy. */
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 71/313 net: enetc: avoid deadlock in enetc_tx_onestep_tstamp()
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 3c463721a73bdb57a913e0d3124677a3758886fc ]
This lockdep splat says it better than I could:
================================
WARNING: inconsistent lock state 6.2.0-rc2-07010-ga9b9500ffaac-dirty #967 Not tainted
--------------------------------
inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. kworker/1:3/179 [HC0[0]:SC0[0]:HE1:SE1] takes:ffff3ec4036ce098 (_xmit_ETHER#2){+.?.}-{3:3}, at: netif_freeze_queues+0x5c/0xc0 {IN-SOFTIRQ-W} state was registered at:
_raw_spin_lock+0x5c/0xc0 sch_direct_xmit+0x148/0x37c __dev_queue_xmit+0x528/0x111c ip6_finish_output2+0x5ec/0xb7c ip6_finish_output+0x240/0x3f0 ip6_output+0x78/0x360 ndisc_send_skb+0x33c/0x85c ndisc_send_rs+0x54/0x12c addrconf_rs_timer+0x154/0x260 call_timer_fn+0xb8/0x3a0 __run_timers.part.0+0x214/0x26c run_timer_softirq+0x3c/0x74 __do_softirq+0x14c/0x5d8 ____do_softirq+0x10/0x20 call_on_irq_stack+0x2c/0x5c do_softirq_own_stack+0x1c/0x30 __irq_exit_rcu+0x168/0x1a0 irq_exit_rcu+0x10/0x40 el1_interrupt+0x38/0x64 irq event stamp: 7825 hardirqs last enabled at (7825): [<ffffdf1f7200cae4>] exit_to_kernel_mode+0x34/0x130 hardirqs last disabled at (7823): [<ffffdf1f708105f0>] __do_softirq+0x550/0x5d8 softirqs last enabled at (7824): [<ffffdf1f7081050c>] __do_softirq+0x46c/0x5d8 softirqs last disabled at (7811): [<ffffdf1f708166e0>] ____do_softirq+0x10/0x20
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(_xmit_ETHER#2);
<Interrupt>
lock(_xmit_ETHER#2);*** DEADLOCK ***
3 locks held by kworker/1:3/179:
#0: ffff3ec400004748 ((wq_completion)events){+.+.}-{0:0}, at: process_one_work+0x1f4/0x6c0
#1: ffff80000a0bbdc8 ((work_completion)(&priv->tx_onestep_tstamp)){+.+.}-{0:0}, at: process_one_work+0x1f4/0x6c0 #2: ffff3ec4036cd438 (&dev->tx_global_lock){+.+.}-{3:3}, at: netif_tx_lock+0x1c/0x34
Workqueue: events enetc_tx_onestep_tstamp Call trace: print_usage_bug.part.0+0x208/0x22c mark_lock+0x7f0/0x8b0 __lock_acquire+0x7c4/0x1ce0 lock_acquire.part.0+0xe0/0x220 lock_acquire+0x68/0x84 _raw_spin_lock+0x5c/0xc0 netif_freeze_queues+0x5c/0xc0 netif_tx_lock+0x24/0x34 enetc_tx_onestep_tstamp+0x20/0x100 process_one_work+0x28c/0x6c0 worker_thread+0x74/0x450 kthread+0x118/0x11c
but I'll say it anyway: the enetc_tx_onestep_tstamp() work item runs in process context, therefore with softirqs enabled (i.o.w., it can be interrupted by a softirq). If we hold the netif_tx_lock() when there is an interrupt, and the NET_TX softirq then gets scheduled, this will take the netif_tx_lock() a second time and deadlock the kernel.
To solve this, use netif_tx_lock_bh(), which blocks softirqs from running.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +2 -2
@@ -2290,14 +2290,14 @@ static void enetc_tx_onestep_tstamp(struct work_struct *work) priv = container_of(work, struct enetc_ndev_priv, tx_onestep_tstamp); -netif_tx_lock (priv->ndev); +netif_tx_lock_bh (priv->ndev);clear_bit_unlock (ENETC_TX_ONESTEP_TSTAMP_IN_PROGRESS , &priv->flags); skb =skb_dequeue (&priv->tx_skbs);if (skb)enetc_start_xmit (skb, priv->ndev); -netif_tx_unlock (priv->ndev); +netif_tx_unlock_bh (priv->ndev); }static void enetc_tx_onestep_tstamp_init (struct enetc_ndev_priv *priv)
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 98/313 Bluetooth: Fix a buffer overflow in mgmt_mesh_add()
In reply to Greg Kroah-HartmanFrom: Harshit Mogalapalli <[email protected]>
[ Upstream commit 2185e0fdbb2137f22a9dd9fcbf6481400d56299b ]
Smatch Warning:net/bluetooth/mgmt_util.c:375 mgmt_mesh_add() error: __memcpy() 'mesh_tx->param' too small (48 vs 50)
Analysis:
'mesh_tx->param' is array of size 48. This is the destination. u8 param[sizeof(struct mgmt_cp_mesh_send) + 29]; // 19 + 29 = 48.
But in the caller 'mesh_send' we reject only when len > 50. len > (MGMT_MESH_SEND_SIZE + 31) // 19 + 31 = 50.
--- net/bluetooth/mgmt_util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/mgmt_util.h +1 -1
@@ -27,7 +27,7 @@ struct mgmt_mesh_tx {struct sock *sk;u8 handle;u8 instance; -u8 param[sizeof (struct mgmt_cp_mesh_send ) +29 ]; +u8 param[sizeof (struct mgmt_cp_mesh_send ) +31 ]; };struct mgmt_pending_cmd {
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 99/313 Bluetooth: hci_conn: Fix memory leaks
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 3aa21311f36d8a2730c7ccef37235e951f23927b ]
When hci_cmd_sync_queue() failed in hci_le_terminate_big() or hci_le_big_terminate(), the memory pointed by variable d is not freed, which will cause memory leak. Add release process to error path.
--- net/bluetooth/hci_conn.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
net/bluetooth/hci_conn.c +14 -4
@@ -821,6 +821,7 @@ static void terminate_big_destroy(struct hci_dev *hdev, void *data, int err)static int hci_le_terminate_big (struct hci_dev *hdev,u8 big,u8 bis) {struct iso_list_data *d; +int ret;bt_dev_dbg (hdev,"big 0x%2.2x bis 0x%2.2x" , big, bis);
@@ -832,8 +833,12 @@ static int hci_le_terminate_big(struct hci_dev *hdev, u8 big, u8 bis) d->big = big; d->bis = bis; -return hci_cmd_sync_queue (hdev, terminate_big_sync, d, - terminate_big_destroy); + ret =hci_cmd_sync_queue (hdev, terminate_big_sync, d, + terminate_big_destroy); +if (ret) +kfree (d); + +return ret; }static int big_terminate_sync (struct hci_dev *hdev,void *data)
@@ -858,6 +863,7 @@ static int big_terminate_sync(struct hci_dev *hdev, void *data)static int hci_le_big_terminate (struct hci_dev *hdev,u8 big,u16 sync_handle) {struct iso_list_data *d; +int ret;bt_dev_dbg (hdev,"big 0x%2.2x sync_handle 0x%4.4x" , big, sync_handle);
@@ -869,8 +875,12 @@ static int hci_le_big_terminate(struct hci_dev *hdev, u8 big, u16 sync_handle) d->big = big; d->sync_handle = sync_handle; -return hci_cmd_sync_queue (hdev, big_terminate_sync, d, - terminate_big_destroy); + ret =hci_cmd_sync_queue (hdev, big_terminate_sync, d, + terminate_big_destroy); +if (ret) +kfree (d); + +return ret; }/* Cleanup BIS connection
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 100/313 Bluetooth: hci_sync: fix memory leak in hci_update_adv_data()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 1ed8b37cbaf14574c779064ef1372af62e8ba6aa ]
When hci_cmd_sync_queue() failed in hci_update_adv_data(), inst_ptr is not freed, which will cause memory leak, convert to use ERR_PTR/PTR_ERR to pass the instance to callback so no memory needs to be allocated.
--- net/bluetooth/hci_sync.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
net/bluetooth/hci_sync.c +3 -10
@@ -6168,20 +6168,13 @@ int hci_get_random_address(struct hci_dev *hdev, bool require_privacy,static int _update_adv_data_sync (struct hci_dev *hdev,void *data) { -u8 instance = *(u8 *)data; - -kfree (data); +u8 instance =PTR_ERR (data);return hci_update_adv_data_sync (hdev, instance); }int hci_update_adv_data (struct hci_dev *hdev,u8 instance) { -u8 *inst_ptr =kmalloc (1 ,GFP_KERNEL ); - -if (!inst_ptr) -return -ENOMEM ; - - *inst_ptr = instance; -return hci_cmd_sync_queue (hdev, _update_adv_data_sync, inst_ptr,NULL ); +return hci_cmd_sync_queue (hdev, _update_adv_data_sync, +ERR_PTR (instance),NULL ); }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 72/313 net: lan966x: add missing fwnode_handle_put() for ports node
In reply to Greg Kroah-HartmanFrom: Clément Léger <[email protected]>
[ Upstream commit 925f3deb45df73173a33e1e81db77575f4ffde39 ]
Since the "ethernet-ports" node is retrieved using device_get_named_child_node(), it should be release after using it. Add missing fwnode_handle_put() and move the code that retrieved the node from device-tree to avoid complicated handling in case of error.
--- .../net/ethernet/microchip/lan966x/lan966x_main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_main.c +8 -5
@@ -1022,11 +1022,6 @@ static int lan966x_probe(struct platform_device *pdev) lan966x->base_mac[5 ] &=0xf0 ; } - ports =device_get_named_child_node (&pdev->dev,"ethernet-ports" ); -if (!ports) -return dev_err_probe (&pdev->dev, -ENODEV , -"no ethernet-ports child found\n" ); - err =lan966x_create_targets (pdev, lan966x);if (err) return dev_err_probe(&pdev->dev, err,
@@ -1104,6 +1099,11 @@ static int lan966x_probe(struct platform_device *pdev) } } + ports =device_get_named_child_node (&pdev->dev,"ethernet-ports" ); +if (!ports) +return dev_err_probe (&pdev->dev, -ENODEV , +"no ethernet-ports child found\n" ); +/* init switch */ lan966x_init (lan966x);lan966x_stats_init (lan966x);
@@ -1138,6 +1138,8 @@ static int lan966x_probe(struct platform_device *pdev)lan966x_port_init (lan966x->ports[p]); } +fwnode_handle_put (ports); +lan966x_mdb_init (lan966x); err =lan966x_fdb_init (lan966x);if (err)
@@ -1160,6 +1162,7 @@ static int lan966x_probe(struct platform_device *pdev)lan966x_fdb_deinit (lan966x); cleanup_ports: +fwnode_handle_put (ports);fwnode_handle_put (portnp);lan966x_cleanup_ports (lan966x);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 73/313 sch_htb: Avoid grafting on htb_destroy_class_offload when destroying htb
In reply to Greg Kroah-HartmanFrom: Rahul Rameshbabu <[email protected]>
[ Upstream commit a22b7388d658ecfcd226600c8c34ce4481e88655 ]
Peek at old qdisc and graft only when deleting a leaf class in the htb, rather than when deleting the htb itself. Do not peek at the qdisc of the netdev queue when destroying the htb. The caller may already have grafted a new qdisc that is not part of the htb structure being destroyed.
This fix resolves two use cases.
1. Using tc to destroy the htb.
- Netdev was being prematurely activated before the htb was fully destroyed.
2. Using tc to replace the htb with another qdisc (which also leads to the htb being destroyed).
- Premature netdev activation like previous case. Newly grafted qdisc was also getting accidentally overwritten when destroying the htb.
--- net/sched/sch_htb.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
net/sched/sch_htb.c +16 -11
@@ -1545,7 +1545,7 @@ static int htb_destroy_class_offload(struct Qdisc *sch, struct htb_class *cl,struct tc_htb_qopt_offload offload_opt;struct netdev_queue *dev_queue;struct Qdisc *q = cl->leaf.q; -struct Qdisc *old =NULL ; +struct Qdisc *old;int err;if (cl->level)
@@ -1553,14 +1553,17 @@ static int htb_destroy_class_offload(struct Qdisc *sch, struct htb_class *cl,WARN_ON (!q); dev_queue =htb_offload_get_queue (cl); - old =htb_graft_helper (dev_queue,NULL ); -if (destroying) -/* Before HTB is destroyed, the kernel grafts noop_qdisc to -* all queues. +/* When destroying, caller qdisc_graft grafts the new qdisc and invokes +* qdisc_put for the qdisc being destroyed. htb_destroy_class_offload +* does not need to graft or qdisc_put the qdisc being destroyed. +*/ +if (!destroying) { + old =htb_graft_helper (dev_queue,NULL ); +/* Last qdisc grafted should be the same as cl->leaf.q when +* calling htb_delete. */ -WARN_ON (!(old->flags &TCQ_F_BUILTIN )); -else WARN_ON (old != q); + }if (cl->parent) { _bstats_update(&cl->parent->bstats_bias,
@@ -1577,10 +1580,12 @@ static int htb_destroy_class_offload(struct Qdisc *sch, struct htb_class *cl, }; err =htb_offload (qdisc_dev (sch), &offload_opt); -if (!err || destroying) -qdisc_put (old); -else -htb_graft_helper (dev_queue, old); +if (!destroying) { +if (!err) +qdisc_put (old); +else +htb_graft_helper (dev_queue, old); + }if (last_child)return err;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 74/313 gpio: mxc: Protect GPIO irqchip RMW with bgpio spinlock
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e5464277625c1aca5c002e0f470377cdd6816dcf ]
The driver currently performs register read-modify-write without locking in its irqchip part, this could lead to a race condition when configuring interrupt mode setting. Add the missing bgpio spinlock lock/unlock around the register read-modify-write.
--- drivers/gpio/gpio-mxc.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpio/gpio-mxc.c +11 -0
@@ -18,6 +18,7 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/spinlock.h> #include <linux/syscore_ops.h> #include <linux/gpio/driver.h> #include <linux/of.h>
@@ -147,6 +148,7 @@ static int gpio_set_irq_type(struct irq_data *d, u32 type) {struct irq_chip_generic *gc =irq_data_get_irq_chip_data (d);struct mxc_gpio_port *port = gc->private; +unsigned long flags;u32 bit, val;u32 gpio_idx = d->hwirq;int edge;
@@ -185,6 +187,8 @@ static int gpio_set_irq_type(struct irq_data *d, u32 type)return -EINVAL ; } +raw_spin_lock_irqsave (&port->gc.bgpio_lock, flags); +if (GPIO_EDGE_SEL >=0 ) { val =readl (port->base +GPIO_EDGE_SEL );if (edge ==GPIO_INT_BOTH_EDGES )
@@ -204,15 +208,20 @@ static int gpio_set_irq_type(struct irq_data *d, u32 type)writel (1 << gpio_idx, port->base +GPIO_ISR ); +raw_spin_unlock_irqrestore (&port->gc.bgpio_lock, flags); +return 0 ; }static void mxc_flip_edge (struct mxc_gpio_port *port,u32 gpio) {void __iomem *reg = port->base; +unsigned long flags;u32 bit, val;int edge; +raw_spin_lock_irqsave (&port->gc.bgpio_lock, flags); + reg +=GPIO_ICR1 + ((gpio &0x10 ) >>2 );/* lower or upper register */ bit = gpio &0xf ; val =readl (reg);
@@ -230,6 +239,8 @@ static void mxc_flip_edge(struct mxc_gpio_port *port, u32 gpio)return ; }writel (val | (edge << (bit <<1 )), reg); + +raw_spin_unlock_irqrestore (&port->gc.bgpio_lock, flags); }/* handle 32 interrupts in one status register */
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 75/313 gpio: mxc: Always set GPIOs used as interrupt source to INPUT mode
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 8e88a0feebb241cab0253698b2f7358b6ebec802 ]
Always configure GPIO pins which are used as interrupt source as INPUTs. In case the default pin configuration is OUTPUT, or the prior stage does configure the pins as OUTPUT, then Linux will not reconfigure the pin as INPUT and no interrupts are received.
Always configure the interrupt source GPIO pin as input to fix the above case.
--- drivers/gpio/gpio-mxc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-mxc.c +1 -1
@@ -210,7 +210,7 @@ static int gpio_set_irq_type(struct irq_data *d, u32 type)raw_spin_unlock_irqrestore (&port->gc.bgpio_lock, flags); -return 0 ; +return port->gc.direction_input (&port->gc, gpio_idx); }static void mxc_flip_edge (struct mxc_gpio_port *port,u32 gpio)
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 76/313 wifi: rndis_wlan: Prevent buffer overflow in rndis_query_oid
In reply to Greg Kroah-HartmanFrom: Szymon Heidrich <[email protected]>
[ Upstream commit b870e73a56c4cccbec33224233eaf295839f228c ]
Since resplen and respoffs are signed integers sufficiently large values of unsigned int len and offset members of RNDIS response will result in negative values of prior variables. This may be utilized to bypass implemented security checks to either extract memory contents by manipulating offset or overflow the data buffer via memcpy by manipulating both offset and len.
Additionally assure that sum of resplen and respoffs does not overflow so buffer boundaries are kept.
--- drivers/net/wireless/rndis_wlan.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
drivers/net/wireless/rndis_wlan.c +6 -13
@@ -696,8 +696,8 @@ static int rndis_query_oid(struct usbnet *dev, u32 oid, void *data, int *len)struct rndis_query *get;struct rndis_query_c *get_c; } u; -int ret, buflen; -int resplen, respoffs, copylen; +int ret; +size_t buflen, resplen, respoffs, copylen; buflen = *len +sizeof (*u.get);if (buflen <CONTROL_BUFFER_SIZE )
@@ -732,22 +732,15 @@ static int rndis_query_oid(struct usbnet *dev, u32 oid, void *data, int *len)if (respoffs > buflen) {/* Device returned data offset outside buffer, error. */ -netdev_dbg (dev->net,"%s(%s): received invalid " -"data offset: %d > %d\n" , __func__, -oid_to_string (oid), respoffs, buflen); +netdev_dbg (dev->net, +"%s(%s): received invalid data offset: %zu > %zu\n" , + __func__,oid_to_string (oid), respoffs, buflen); ret = -EINVAL ; goto exit_unlock; } -if ((resplen + respoffs) > buflen) { -/* Device would have returned more data if buffer would -* have been big enough. Copy just the bits that we got. -*/ - copylen = buflen - respoffs; - }else { - copylen = resplen; - } + copylen =min (resplen, buflen - respoffs);if (copylen > *len) copylen = *len;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 77/313 pinctrl: rockchip: fix reading pull type on rk3568
In reply to Greg Kroah-HartmanFrom: Jonas Karlman <[email protected]>
[ Upstream commit 31b62a98de42cf65d76e4dcfb571af067d27d83a ]
When reading pinconf-pins from debugfs it fails to get the configured pull type on RK3568, "unsupported pinctrl type" error messages is also reported.
Fix this by adding support for RK3568 in rockchip_get_pull, including a reverse of the pull-up value swap applied in rockchip_set_pull so that pull-up is correctly reported in pinconf-pins.
Also update the workaround comment to reflect affected pins, GPIO0_D3-D6.
--- drivers/pinctrl/pinctrl-rockchip.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/pinctrl/pinctrl-rockchip.c +10 -1
@@ -2436,10 +2436,19 @@ static int rockchip_get_pull(struct rockchip_pin_bank *bank, int pin_num)case RK3308 :case RK3368 :case RK3399 : +case RK3568 :case RK3588 : pull_type = bank->pull_type[pin_num /8 ]; data >>= bit; data &= (1 <<RK3188_PULL_BITS_PER_PIN ) -1 ; +/* +* In the TRM, pull-up being 1 for everything except the GPIO0_D3-D6, +* where that pull up value becomes 3. +*/ +if (ctrl->type ==RK3568 && bank->bank_num ==0 && pin_num >=27 && pin_num <=30 ) { +if (data ==3 ) + data =1 ; + }return rockchip_pull_list[pull_type][data];default :
@@ -2497,7 +2506,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, } }/* -* In the TRM, pull-up being 1 for everything except the GPIO0_D0-D6, +* In the TRM, pull-up being 1 for everything except the GPIO0_D3-D6, * where that pull up value becomes 3. */ if (ctrl->type ==RK3568 && bank->bank_num ==0 && pin_num >=27 && pin_num <=30 ) {
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 68/313 phy: rockchip-inno-usb2: Fix missing clk_disable_unprepare() in rockchip_usb2phy_power_on()
In reply to Greg Kroah-HartmanFrom: Shang XiaoJing <[email protected]>
[ Upstream commit 5daba914da0e48950e9407ea4d75fa57029c9adc ]
The clk_disable_unprepare() should be called in the error handling of rockchip_usb2phy_power_on().
--- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/phy/rockchip/phy-rockchip-inno-usb2.c +3 -1
@@ -485,8 +485,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy)return ret; ret =property_enable (base, &rport->port_cfg->phy_sus, false); -if (ret) +if (ret) { +clk_disable_unprepare (rphy->clk480m);return ret; + }/* waiting for the utmi_clk to become stable */ usleep_range (1500 ,2000 );
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 102/313 Bluetooth: ISO: Fix possible circular locking dependency
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 6a5ad251b7cdb990a3705428aef408433f05614a ]
This attempts to fix the following trace:
kworker/u3:1/184 is trying to acquire lock:ffff888001888130 (sk_lock-AF_BLUETOOTH-BTPROTO_ISO){+.+.}-{0:0}, at:iso_connect_cfm+0x2de/0x690
but task is already holding lock:ffff8880028d1c20 (&conn->lock){+.+.}-{2:2}, at:iso_connect_cfm+0x265/0x690
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&conn->lock){+.+.}-{2:2}:
lock_acquire+0x176/0x3d0
_raw_spin_lock+0x2a/0x40
__iso_sock_close+0x1dd/0x4f0
iso_sock_release+0xa0/0x1b0
sock_close+0x5e/0x120
__fput+0x102/0x410
task_work_run+0xf1/0x160
exit_to_user_mode_prepare+0x170/0x180
syscall_exit_to_user_mode+0x19/0x50
do_syscall_64+0x4e/0x90
entry_SYSCALL_64_after_hwframe+0x62/0xcc-> #0 (sk_lock-AF_BLUETOOTH-BTPROTO_ISO){+.+.}-{0:0}:
check_prev_add+0xfc/0x1190
__lock_acquire+0x1e27/0x2750
lock_acquire+0x176/0x3d0
lock_sock_nested+0x32/0x80
iso_connect_cfm+0x2de/0x690
hci_cc_le_setup_iso_path+0x195/0x340
hci_cmd_complete_evt+0x1ae/0x500
hci_event_packet+0x38e/0x7c0
hci_rx_work+0x34c/0x980
process_one_work+0x5a5/0x9a0
worker_thread+0x89/0x6f0
kthread+0x14e/0x180
ret_from_fork+0x22/0x30other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&conn->lock);
lock(sk_lock-AF_BLUETOOTH-BTPROTO_ISO);
lock(&conn->lock); lock(sk_lock-AF_BLUETOOTH-BTPROTO_ISO);
*** DEADLOCK ***
--- net/bluetooth/iso.c | 61 +++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 35 deletions(-)
net/bluetooth/iso.c +26 -35
@@ -288,15 +288,15 @@ static int iso_connect_bis(struct sock *sk)hci_dev_unlock (hdev);hci_dev_put (hdev); + err =iso_chan_add (conn, sk,NULL ); +if (err) +return err; +lock_sock (sk);/* Update source addr of the socket */ bacpy (&iso_pi (sk)->src, &hcon->src); - err =iso_chan_add (conn, sk,NULL ); -if (err) - goto release; -if (hcon->state ==BT_CONNECTED ) {iso_sock_clear_timer (sk); sk->sk_state =BT_CONNECTED ;
@@ -305,7 +305,6 @@ static int iso_connect_bis(struct sock *sk)iso_sock_set_timer (sk, sk->sk_sndtimeo); } -release:release_sock (sk);return err;
@@ -371,15 +370,15 @@ static int iso_connect_cis(struct sock *sk)hci_dev_unlock (hdev);hci_dev_put (hdev); + err =iso_chan_add (conn, sk,NULL ); +if (err) +return err; +lock_sock (sk);/* Update source addr of the socket */ bacpy (&iso_pi (sk)->src, &hcon->src); - err =iso_chan_add (conn, sk,NULL ); -if (err) - goto release; -if (hcon->state ==BT_CONNECTED ) {iso_sock_clear_timer (sk); sk->sk_state =BT_CONNECTED ;
@@ -391,7 +390,6 @@ static int iso_connect_cis(struct sock *sk)iso_sock_set_timer (sk, sk->sk_sndtimeo); } -release:release_sock (sk);return err;
@@ -1430,33 +1428,29 @@ static void iso_conn_ready(struct iso_conn *conn)struct sock *parent;struct sock *sk = conn->sk;struct hci_ev_le_big_sync_estabilished *ev; +struct hci_conn *hcon;BT_DBG ("conn %p" , conn);if (sk) {iso_sock_ready (conn->sk); }else { -iso_conn_lock (conn); - -if (!conn->hcon) { -iso_conn_unlock (conn); + hcon = conn->hcon; +if (!hcon)return ; - } - ev =hci_recv_event_data (conn->hcon->hdev, + ev =hci_recv_event_data (hcon->hdev,HCI_EVT_LE_BIG_SYNC_ESTABILISHED );if (ev) - parent =iso_get_sock_listen (&conn->hcon->src, - &conn->hcon->dst, + parent =iso_get_sock_listen (&hcon->src, + &hcon->dst, iso_match_big, ev);else - parent =iso_get_sock_listen (&conn->hcon->src, + parent =iso_get_sock_listen (&hcon->src,BDADDR_ANY ,NULL ,NULL ); -if (!parent) { -iso_conn_unlock (conn); +if (!parent)return ; - }lock_sock (parent);
@@ -1464,30 +1458,29 @@ static void iso_conn_ready(struct iso_conn *conn) BTPROTO_ISO, GFP_ATOMIC, 0);if (!sk) {release_sock (parent); -iso_conn_unlock (conn);return ; }iso_sock_init (sk, parent); -bacpy (&iso_pi (sk)->src, &conn->hcon->src); -iso_pi (sk)->src_type = conn->hcon->src_type; +bacpy (&iso_pi (sk)->src, &hcon->src); +iso_pi (sk)->src_type = hcon->src_type;/* If hcon has no destination address (BDADDR_ANY) it means it * was created by HCI_EV_LE_BIG_SYNC_ESTABILISHED so we need to * initialize using the parent socket destination address. */ -if (!bacmp (&conn->hcon->dst,BDADDR_ANY )) { -bacpy (&conn->hcon->dst, &iso_pi (parent)->dst); - conn->hcon->dst_type =iso_pi (parent)->dst_type; - conn->hcon->sync_handle =iso_pi (parent)->sync_handle; +if (!bacmp (&hcon->dst,BDADDR_ANY )) { +bacpy (&hcon->dst, &iso_pi (parent)->dst); + hcon->dst_type =iso_pi (parent)->dst_type; + hcon->sync_handle =iso_pi (parent)->sync_handle; } -bacpy (&iso_pi (sk)->dst, &conn->hcon->dst); -iso_pi (sk)->dst_type = conn->hcon->dst_type; +bacpy (&iso_pi (sk)->dst, &hcon->dst); +iso_pi (sk)->dst_type = hcon->dst_type; -hci_conn_hold (conn->hcon); -__iso_chan_add (conn, sk, parent); +hci_conn_hold (hcon); +iso_chan_add (conn, sk, parent);if (test_bit (BT_SK_DEFER_SETUP , &bt_sk (parent)->flags)) sk->sk_state =BT_CONNECT2 ;
@@ -1498,8 +1491,6 @@ static void iso_conn_ready(struct iso_conn *conn) parent->sk_data_ready (parent);release_sock (parent); - -iso_conn_unlock (conn); } }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 111/313 net: mlx5: eliminate anonymous module_init & module_exit
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 2c1e1b949024989e20907b84e11a731a50778416 ]
Eliminate anonymous module_init() and module_exit(), which can lead to confusion or ambiguity when reading System.map, crashes/oops/bugs, or an initcall_debug log.
Give each of these init and exit functions unique driver-specific names to eliminate the anonymous names.
Example 1: (System.map)
ffffffff832fc78c t init
ffffffff832fc79e t init
ffffffff832fc8f8 t init
Example 2: (initcall_debug log)
calling init+0x0/0x12 @ 1
initcall init+0x0/0x12 returned 0 after 15 usecs
calling init+0x0/0x60 @ 1
initcall init+0x0/0x60 returned 0 after 2 usecs
calling init+0x0/0x9a @ 1
initcall init+0x0/0x9a returned 0 after 74 usecs
--- drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +4 -4
@@ -2082,7 +2082,7 @@ static void mlx5_core_verify_params(void) } } -static int __init init (void ) +static int __init mlx5_init (void ) {int err;
@@ -2117,7 +2117,7 @@ static int __init init(void)return err; } -static void __exit cleanup(void) +static void __exit mlx5_cleanup(void) {mlx5e_cleanup ();mlx5_sf_driver_unregister ();
@@ -2125,5 +2125,5 @@ static void __exit cleanup(void)mlx5_unregister_debugfs (); } -module_init (init); -module_exit (cleanup); +module_init (mlx5_init); +module_exit (mlx5_cleanup);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 112/313 drm/panfrost: fix GENERIC_ATOMIC64 dependency
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 6437a549ae178a3f5a5c03e983f291ebcdc2bbc7 ]
On ARMv5 and earlier, a randconfig build can still run into
WARNING: unmet direct dependencies detected for IOMMU_IO_PGTABLE_LPAE
Depends on [n]: IOMMU_SUPPORT [=y] && (ARM [=y] || ARM64 || COMPILE_TEST [=y]) && !GENERIC_ATOMIC64 [=y] Selected by [y]:
- DRM_PANFROST [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARM [=y] || ARM64 || COMPILE_TEST [=y] && !GENERIC_ATOMIC64 [=y]) && MMU [=y]
Rework the dependencies to always require a working cmpxchg64.
--- drivers/gpu/drm/panfrost/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/panfrost/Kconfig +2 -1
@@ -3,7 +3,8 @@ config DRM_PANFROST tristate "Panfrost (DRM support for ARM Mali Midgard/Bifrost GPUs)" depends on DRM - depends on ARM || ARM64 || (COMPILE_TEST && !GENERIC_ATOMIC64) + depends on ARM || ARM64 || COMPILE_TEST + depends on !GENERIC_ATOMIC64 # for IOMMU_IO_PGTABLE_LPAE depends on MMU select DRM_SCHED select IOMMU_SUPPORT
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 113/313 dmaengine: Fix double increment of client_count in dma_chan_get()
In reply to Greg Kroah-HartmanFrom: Koba Ko <[email protected]>
[ Upstream commit f3dc1b3b4750851a94212dba249703dd0e50bb20 ]
The first time dma_chan_get() is called for a channel the channel client_count is incorrectly incremented twice for public channels, first in balance_ref_count(), and again prior to returning. This results in an incorrect client count which will lead to the channel resources not being freed when they should be. A simple
test of repeated module load and unload of async_tx on a Dell Power Edge R7425 also shows this resulting in a kref underflow warning.
[ 124.329662] async_tx: api initialized (async) [ 129.000627] async_tx: api initialized (async) [ 130.047839] ------------[ cut here ]------------ [ 130.052472] refcount_t: underflow; use-after-free. [ 130.057279] WARNING: CPU: 3 PID: 19364 at lib/refcount.c:28 refcount_warn_saturate+0xba/0x110 [ 130.065811] Modules linked in: async_tx(-) rfkill intel_rapl_msr
intel_rapl_common amd64_edac edac_mce_amd ipmi_ssif kvm_amd dcdbas kvm mgag200 drm_shmem_helper acpi_ipmi irqbypass drm_kms_helper ipmi_si syscopyarea sysfillrect rapl pcspkr ipmi_devintf sysimgblt fb_sys_fops k10temp i2c_piix4 ipmi_msghandler acpi_power_meter acpi_cpufreq vfat fat drm fuse xfs libcrc32c sd_mod t10_pi sg ahci crct10dif_pclmul libahci crc32_pclmul crc32c_intel ghash_clmulni_intel igb megaraid_sas i40e libata i2c_algo_bit ccp sp5100_tco dca dm_mirror dm_region_hash dm_log dm_mod [last unloaded: async_tx]
[ 130.117361] CPU: 3 PID: 19364 Comm: modprobe Kdump: loaded Not tainted 5.14.0-185.el9.x86_64 #1 [ 130.126091] Hardware name: Dell Inc. PowerEdge R7425/02MJ3T, BIOS 1.18.0 01/17/2022 [ 130.133806] RIP: 0010:refcount_warn_saturate+0xba/0x110 [ 130.139041] Code: 01 01 e8 6d bd 55 00 0f 0b e9 72 9d 8a 00 80 3d 26 18 9c 01 00 75 85 48 c7 c7 f8 a3 03 9d c6 05 16 18 9c 01 01 e8 4a bd 55 00 <0f> 0b e9 4f 9d 8a 00 80 3d 01 18 9c 01 00 0f 85 5e ff ff ff 48 c7 [ 130.157807] RSP: 0018:ffffbf98898afe68 EFLAGS: 00010286 [ 130.163036] RAX: 0000000000000000 RBX: ffff9da06028e598 RCX: 0000000000000000 [ 130.170172] RDX: ffff9daf9de26480 RSI: ffff9daf9de198a0 RDI: ffff9daf9de198a0 [ 130.177316] RBP: ffff9da7cddf3970 R08: 0000000000000000 R09: 00000000ffff7fff [ 130.184459] R10: ffffbf98898afd00 R11: ffffffff9d9e8c28 R12: ffff9da7cddf1970 [ 130.191596] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 [ 130.198739] FS: 00007f646435c740(0000) GS:ffff9daf9de00000(0000) knlGS:0000000000000000 [ 130.206832] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 130.212586] CR2: 00007f6463b214f0 CR3: 00000008ab98c000 CR4: 00000000003506e0 [ 130.219729] Call Trace: [ 130.222192] <TASK> [ 130.224305] dma_chan_put+0x10d/0x110 [ 130.227988] dmaengine_put+0x7a/0xa0 [ 130.231575] __do_sys_delete_module.constprop.0+0x178/0x280 [ 130.237157] ? syscall_trace_enter.constprop.0+0x145/0x1d0 [ 130.242652] do_syscall_64+0x5c/0x90 [ 130.246240] ? exc_page_fault+0x62/0x150 [ 130.250178] entry_SYSCALL_64_after_hwframe+0x63/0xcd [ 130.255243] RIP: 0033:0x7f6463a3f5ab [ 130.258830] Code: 73 01 c3 48 8b 0d 75 a8 1b 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 45 a8 1b 00 f7 d8 64 89 01 48 [ 130.277591] RSP: 002b:00007fff22f972c8 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0 [ 130.285164] RAX: ffffffffffffffda RBX: 000055b6786edd40 RCX: 00007f6463a3f5ab [ 130.292303] RDX: 0000000000000000 RSI: 0000000000000800 RDI: 000055b6786edda8 [ 130.299443] RBP: 000055b6786edd40 R08: 0000000000000000 R09: 0000000000000000 [ 130.306584] R10: 00007f6463b9eac0 R11: 0000000000000206 R12: 000055b6786edda8 [ 130.313731] R13: 0000000000000000 R14: 000055b6786edda8 R15: 00007fff22f995f8 [ 130.320875] </TASK> [ 130.323081] ---[ end trace eff7156d56b5cf25 ]---
cat /sys/class/dma/dma0chan*/in_use would get the wrong result. 2
2
2
--- drivers/dma/dmaengine.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/dma/dmaengine.c +4 -3
@@ -451,7 +451,8 @@ static int dma_chan_get(struct dma_chan *chan)/* The channel is already in use, update client count */ if (chan->client_count) {__module_get (owner); - goto out; + chan->client_count++; +return 0 ; }if (!try_module_get (owner))
@@ -470,11 +471,11 @@ static int dma_chan_get(struct dma_chan *chan) goto err_out; } + chan->client_count++; +if (!dma_has_cap (DMA_PRIVATE , chan->device->cap_mask))balance_ref_count (chan); -out: - chan->client_count++;return 0 ; err_out:
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 114/313 net: macb: fix PTP TX timestamp failure due to packet padding
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit 7b90f5a665acd46efbbfa677a3a3a18d01ad6487 ]
PTP TX timestamp handling was observed to be broken with this driver when using the raw Layer 2 PTP encapsulation. ptp4l was not receiving the expected TX timestamp after transmitting a packet, causing it to enter a failure state.
The problem appears to be due to the way that the driver pads packets which are smaller than the Ethernet minimum of 60 bytes. If headroom space was available in the SKB, this caused the driver to move the data back to utilize it. However, this appears to cause other data references in the SKB to become inconsistent. In particular, this caused the ptp_one_step_sync function to later (in the TX completion path) falsely detect the packet as a one-step SYNC packet, even when it was not, which caused the TX timestamp to not be processed when it should be.
Using the headroom for this purpose seems like an unnecessary complexity as this is not a hot path in the driver, and in most cases it appears that there is sufficient tailroom to not require using the headroom anyway. Remove this usage of headroom to prevent this inconsistency from occurring and causing other problems.
--- drivers/net/ethernet/cadence/macb_main.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/net/ethernet/cadence/macb_main.c +1 -8
@@ -2188,7 +2188,6 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev)bool cloned =skb_cloned (*skb) ||skb_header_cloned (*skb) ||skb_is_nonlinear (*skb);int padlen =ETH_ZLEN - (*skb)->len; -int headroom =skb_headroom (*skb);int tailroom =skb_tailroom (*skb);struct sk_buff *nskb;u32 fcs;
@@ -2202,9 +2201,6 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev)/* FCS could be appeded to tailroom. */ if (tailroom >=ETH_FCS_LEN ) goto add_fcs; -/* FCS could be appeded by moving data to headroom. */ -else if (!cloned && headroom + tailroom >=ETH_FCS_LEN ) - padlen =0 ;/* No room for FCS, need to reallocate skb. */ else padlen =ETH_FCS_LEN ;
@@ -2213,10 +2209,7 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev) padlen +=ETH_FCS_LEN ; } -if (!cloned && headroom + tailroom >= padlen) { - (*skb)->data =memmove ((*skb)->head, (*skb)->data, (*skb)->len); -skb_set_tail_pointer (*skb, (*skb)->len); - }else { +if (cloned || tailroom < padlen) { nskb =skb_copy_expand (*skb,0 , padlen,GFP_ATOMIC );if (!nskb)return -ENOMEM ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 115/313 virtio-net: correctly enable callback during start_xmit
In reply to Greg Kroah-HartmanFrom: Jason Wang <[email protected]>
[ Upstream commit d71ebe8114b4bf622804b810f5e274069060a174 ]
Commit a7766ef18b33("virtio_net: disable cb aggressively") enables virtqueue callback via the following statement:
do {
if (use_napi)
virtqueue_disable_cb(sq->vq);
free_old_xmit_skbs(sq, false);
} while (use_napi && kick &&
unlikely(!virtqueue_enable_cb_delayed(sq->vq)));When NAPI is used and kick is false, the callback won't be enabled here. And when the virtqueue is about to be full, the tx will be disabled, but we still don't enable tx interrupt which will cause a TX hang. This could be observed when using pktgen with burst enabled.
TO be consistent with the logic that tries to disable cb only for NAPI, fixing this by trying to enable delayed callback only when NAPI is enabled when the queue is about to be full.
--- drivers/net/virtio_net.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/virtio_net.c +4 -2
@@ -1873,8 +1873,10 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)*/ if (sq->vq->num_free <2 +MAX_SKB_FRAGS ) {netif_stop_subqueue (dev, qnum); -if (!use_napi && -unlikely (!virtqueue_enable_cb_delayed (sq->vq))) { +if (use_napi) { +if (unlikely (!virtqueue_enable_cb_delayed (sq->vq))) +virtqueue_napi_schedule (&sq->napi, sq->vq); + }else if (unlikely (!virtqueue_enable_cb_delayed (sq->vq))) {/* More just got used, free them then recheck. */ free_old_xmit_skbs (sq, false);if (sq->vq->num_free >=2 +MAX_SKB_FRAGS ) {
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 116/313 l2tp: prevent lockdep issue in l2tp_tunnel_register()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit b9fb10d131b8c84af9bb14e2078d5c63600c7dea ]
lockdep complains with the following lock/unlock sequence:
lock_sock(sk);
write_lock_bh(&sk->sk_callback_lock);[1] release_sock(sk);
[2] write_unlock_bh(&sk->sk_callback_lock);
We need to swap [1] and [2] to fix this issue.
--- net/l2tp/l2tp_core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/l2tp/l2tp_core.c +2 -3
@@ -1483,10 +1483,8 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,lock_sock (sk);write_lock_bh (&sk->sk_callback_lock); ret =l2tp_validate_socket (sk, net, tunnel->encap); -if (ret <0 ) { -release_sock (sk); +if (ret <0 ) goto err_inval_sock; - }rcu_assign_sk_user_data (sk, tunnel);write_unlock_bh (&sk->sk_callback_lock);
@@ -1523,6 +1521,7 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net, err_inval_sock:write_unlock_bh (&sk->sk_callback_lock); +release_sock (sk);if (tunnel->fd <0 )sock_release (sock);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 117/313 HID: betop: check shape of output reports
In reply to Greg Kroah-HartmanFrom: Pietro Borrello <[email protected]>
[ Upstream commit 3782c0d6edf658b71354a64d60aa7a296188fc90 ]
betopff_init() only checks the total sum of the report counts for each report field to be at least 4, but hid_betopff_play() expects 4 report fields.
A device advertising an output report with one field and 4 report counts would pass the check but crash the kernel with a NULL pointer dereference in hid_betopff_play().
--- drivers/hid/hid-betopff.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/hid/hid-betopff.c +9 -8
@@ -60,7 +60,6 @@ static int betopff_init(struct hid_device *hid)struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT ].report_list;struct input_dev *dev; -int field_count =0 ;int error;int i, j;
@@ -86,19 +85,21 @@ static int betopff_init(struct hid_device *hid)* ----------------------------------------- * Do init them with default value. */ +if (report->maxfield <4 ) { +hid_err (hid,"not enough fields in the report: %d\n" , + report->maxfield); +return -ENODEV ; + }for (i =0 ; i < report->maxfield; i++) { +if (report->field[i]->report_count <1 ) { +hid_err (hid,"no values in the field\n" ); +return -ENODEV ; + }for (j =0 ; j < report->field[i]->report_count; j++) { report->field[i]->value[j] =0x00 ; - field_count++; } } -if (field_count <4 ) { -hid_err (hid,"not enough fields in the report: %d\n" , - field_count); -return -ENODEV ; - } - betopff =kzalloc (sizeof (*betopff),GFP_KERNEL );if (!betopff)return -ENOMEM ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 118/313 drm/i915/selftests: Unwind hugepages to drop wakeref on error
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit 93eea624526fc7d070cdae463408665824075f54 ]
Make sure that upon error after we have acquired the wakeref we do release it again.
v2: add another missing "goto out_wf"(Andi).
--- drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +4 -4
@@ -1697,7 +1697,7 @@ static int igt_shrink_thp(void *arg) I915_SHRINK_ACTIVE);i915_vma_unpin (vma);if (err) - goto out_put; + goto out_wf;/* * Now that the pages are *unpinned* shrinking should invoke
@@ -1713,19 +1713,19 @@ static int igt_shrink_thp(void *arg)pr_err ("unexpected pages mismatch, should_swap=%s\n" ,str_yes_no (should_swap)); err = -EINVAL ; - goto out_put; + goto out_wf; }if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {pr_err ("unexpected residual page-size bits, should_swap=%s\n" ,str_yes_no (should_swap)); err = -EINVAL ; - goto out_put; + goto out_wf; } err =i915_vma_pin (vma,0 ,0 , flags);if (err) - goto out_put; + goto out_wf;while (n--) { err =cpu_check (obj, n,0xdeadbeaf );
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 119/313 cifs: fix potential deadlock in cache_refresh_path()
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
[ Upstream commit 9fb0db40513e27537fde63287aea920b60557a69 ]
Avoid getting DFS referral from an exclusive lock in cache_refresh_path() because the tcon IPC used for getting the referral could be disconnected and thus causing a deadlock as shown below:
task A task B ====== ====== cifs_demultiplex_thread() dfs_cache_find()
cifs_handle_standard() cache_refresh_path()
reconnect_dfs_server() down_write()
dfs_cache_noreq_find() get_dfs_referral()
down_read() <- deadlock smb2_get_dfs_refer()
SMB2_ioctl()
cifs_send_recv()
compound_send_recv()
wait_for_response()
where task A cannot wake up task B because it is blocked on down_read() due to the exclusive lock held in cache_refresh_path() and therefore not being able to make progress.
--- fs/cifs/dfs_cache.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-)
fs/cifs/dfs_cache.c +23 -19
@@ -792,26 +792,27 @@ static int get_dfs_referral(const unsigned int xid, struct cifs_ses *ses, const*/ static int cache_refresh_path (const unsigned int xid,struct cifs_ses *ses,const char *path) { -int rc; -struct cache_entry *ce;struct dfs_info3_param *refs =NULL ; +struct cache_entry *ce;int numrefs =0 ; -bool newent = false; +int rc;cifs_dbg (FYI ,"%s: search path: %s\n" , __func__, path); -down_write (&htable_rw_lock); +down_read (&htable_rw_lock); ce =lookup_cache_entry (path); -if (!IS_ERR (ce)) { -if (!cache_entry_expired (ce)) { -dump_ce (ce); -up_write (&htable_rw_lock); -return 0 ; - } - }else { - newent = true; +if (!IS_ERR (ce) && !cache_entry_expired (ce)) { +up_read (&htable_rw_lock); +return 0 ; } +/* +* Unlock shared access as we don't want to hold any locks while getting +* a new referral. The @ses used for performing the I/O could be +* reconnecting and it acquires @htable_rw_lock to look up the dfs cache +* in order to failover -- if necessary. +*/ +up_read (&htable_rw_lock);/* * Either the entry was not found, or it is expired.
@@ -819,19 +820,22 @@ static int cache_refresh_path(const unsigned int xid, struct cifs_ses *ses, cons*/ rc =get_dfs_referral (xid, ses, path, &refs, &numrefs);if (rc) - goto out_unlock; + goto out;dump_refs (refs, numrefs); -if (!newent) { - rc =update_cache_entry_locked (ce, refs, numrefs); - goto out_unlock; +down_write (&htable_rw_lock); +/* Re-check as another task might have it added or refreshed already */ + ce =lookup_cache_entry (path); +if (!IS_ERR (ce)) { +if (cache_entry_expired (ce)) + rc =update_cache_entry_locked (ce, refs, numrefs); + }else { + rc =add_cache_entry_locked (refs, numrefs); } - rc =add_cache_entry_locked (refs, numrefs); - -out_unlock:up_write (&htable_rw_lock); +out:free_dfs_info_array (refs, numrefs);return rc; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 120/313 dmaengine: xilinx_dma: call of_node_put() when breaking out of for_each_child_of_node()
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
[ Upstream commit 596b53ccc36a546ab28e8897315c5b4d1d5a0200 ]
Since for_each_child_of_node() will increase the refcount of node, we need to call of_node_put() manually when breaking out of the iteration.
--- drivers/dma/xilinx/xilinx_dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/xilinx/xilinx_dma.c +3 -1
@@ -3141,8 +3141,10 @@ static int xilinx_dma_probe(struct platform_device *pdev)/* Initialize the channels */ for_each_child_of_node (node, child) { err =xilinx_dma_child_probe (xdev, child); -if (err <0 ) +if (err <0 ) { +of_node_put (child); goto error; + } }if (xdev->dma_config->dmatype ==XDMA_TYPE_VDMA ) {
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 103/313 Bluetooth: hci_event: Fix Invalid wait context
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit e9d50f76fe1f7f6f251114919247445fb5cb3734 ]
This fixes the following trace caused by attempting to lock cmd_sync_work_lock while holding the rcu_read_lock:
kworker/u3:2/212 is trying to lock:ffff888002600910 (&hdev->cmd_sync_work_lock){+.+.}-{3:3}, at:hci_cmd_sync_queue+0xad/0x140
other info that might help us debug this:
context-{4:4}
4 locks held by kworker/u3:2/212:
#0: ffff8880028c6530 ((wq_completion)hci0#2){+.+.}-{0:0}, at:
process_one_work+0x4dc/0x9a0
#1: ffff888001aafde0 ((work_completion)(&hdev->rx_work)){+.+.}-{0:0},
at: process_one_work+0x4dc/0x9a0
#2: ffff888002600070 (&hdev->lock){+.+.}-{3:3}, at:
hci_cc_le_set_cig_params+0x64/0x4f0
#3: ffffffffa5994b00 (rcu_read_lock){....}-{1:2}, at:
hci_cc_le_set_cig_params+0x2f9/0x4f0--- net/bluetooth/hci_event.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/bluetooth/hci_event.c +4 -1
@@ -3838,8 +3838,11 @@ static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data, conn->handle, conn->link);/* Create CIS if LE is already connected */ -if (conn->link && conn->link->state ==BT_CONNECTED ) +if (conn->link && conn->link->state ==BT_CONNECTED ) { +rcu_read_unlock ();hci_le_create_cis (conn->link); +rcu_read_lock (); + }if (i == rp->num_handles)break ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 121/313 dmaengine: tegra: Fix memory leak in terminate_all()
In reply to Greg Kroah-HartmanFrom: Akhil R <[email protected]>
[ Upstream commit a7a7ee6f5a019ad72852c001abbce50d35e992f2 ]
Terminate vdesc when terminating an ongoing transfer.
This will ensure that the vdesc is present in the desc_terminated list The descriptor will be freed later in desc_free_list().
This fixes the memory leaks which can happen when terminating an ongoing transfer.
--- drivers/dma/tegra186-gpc-dma.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/tegra186-gpc-dma.c +1 -0
@@ -707,6 +707,7 @@ static int tegra_dma_terminate_all(struct dma_chan *dc)return err; } +vchan_terminate_vdesc (&tdc->dma_desc->vd);tegra_dma_disable (tdc); tdc->dma_desc =NULL ; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 122/313 phy: phy-can-transceiver: Skip warning if no "max-bitrate"
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit bc30c15f275484f9b9fe27c2fa0895f3022d9943 ]
According to the DT bindings, the "max-bitrate" property is optional. However, when it is not present, a warning is printed.
Fix this by adding a missing check for -EINVAL.
--- drivers/phy/phy-can-transceiver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/phy/phy-can-transceiver.c +3 -2
@@ -99,6 +99,7 @@ static int can_transceiver_phy_probe(struct platform_device *pdev)struct gpio_desc *standby_gpio;struct gpio_desc *enable_gpio;u32 max_bitrate =0 ; +int err; can_transceiver_phy =devm_kzalloc (dev,sizeof (struct can_transceiver_phy ),GFP_KERNEL );if (!can_transceiver_phy)
@@ -124,8 +125,8 @@ static int can_transceiver_phy_probe(struct platform_device *pdev)return PTR_ERR (phy); } -device_property_read_u32 (dev,"max-bitrate" , &max_bitrate); -if (!max_bitrate) + err =device_property_read_u32 (dev,"max-bitrate" , &max_bitrate); +if ((err != -EINVAL ) && !max_bitrate)dev_warn (dev,"Invalid value for transceiver max bitrate. Ignoring bitrate limit\n" ); phy->attrs.max_link_rate = max_bitrate;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 123/313 drm/amd/display: fix issues with driver unload
In reply to Greg Kroah-HartmanFrom: Hamza Mahfooz <[email protected]>
[ Upstream commit e433adc60f7f847e734c56246b09291532f29b6d ]
Currently, we run into a number of WARN()s when attempting to unload the amdgpu driver (e.g. using "modprobe -r amdgpu"). These all stem from calling drm_encoder_cleanup() too early. So, to fix this we can stop calling drm_encoder_cleanup() from amdgpu_dm_fini() and instead have it be called from amdgpu_dm_encoder_destroy(). Also, we don't need to free in amdgpu_dm_encoder_destroy() since mst_encoders[] isn't explicitly allocated by the slab allocator.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ---- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 - 2 files changed, 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -4
@@ -1737,10 +1737,6 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev) adev->dm.vblank_control_workqueue =NULL ; } -for (i =0 ; i < adev->dm.display_indexes_num; i++) { -drm_encoder_cleanup (&adev->dm.mst_encoders[i].base); - } -amdgpu_dm_destroy_drm_device (&adev->dm);#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY )
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +0 -1
@@ -468,7 +468,6 @@ static const struct drm_connector_helper_funcs dm_dp_mst_connector_helper_funcsstatic void amdgpu_dm_encoder_destroy (struct drm_encoder *encoder) {drm_encoder_cleanup (encoder); -kfree (encoder); }static const struct drm_encoder_funcs amdgpu_dm_encoder_funcs = {
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 124/313 net: sched: gred: prevent races when adding offloads to stats
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 339346d49ae0859fe19b860998867861d37f1a76 ]
Naresh reports seeing a warning that gred is calling u64_stats_update_begin() with preemption enabled. Arnd points out it's coming from _bstats_update().
We should be holding the qdisc lock when writing to stats, they are also updated from the datapath.
--- net/sched/sch_gred.c | 2 ++ 1 file changed, 2 insertions(+)
net/sched/sch_gred.c +2 -0
@@ -377,6 +377,7 @@ static int gred_offload_dump_stats(struct Qdisc *sch)/* Even if driver returns failure adjust the stats - in case offload * ended but driver still wants to adjust the values. */ +sch_tree_lock (sch);for (i =0 ; i < MAX_DPs; i++) {if (!table->tab[i])continue ;
@@ -393,6 +394,7 @@ static int gred_offload_dump_stats(struct Qdisc *sch) sch->qstats.overlimits += hw_stats->stats.qstats[i].overlimits; }_bstats_update (&sch->bstats, bytes, packets); +sch_tree_unlock (sch);kfree (hw_stats);return ret;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 125/313 nvme-pci: fix timeout request state check
In reply to Greg Kroah-HartmanFrom: Keith Busch <[email protected]>
[ Upstream commit 1c5842085851f786eba24a39ecd02650ad892064 ]
Polling the completion can progress the request state to IDLE, either inline with the completion, or through softirq. Either way, the state may not be COMPLETED, so don't check for that. We only care if the state isn't IN_FLIGHT.
This is fixing an issue where the driver aborts an IO that we just completed. Seeing the "aborting" message instead of "polled" is very misleading as to where the timeout problem resides.
--- drivers/nvme/host/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/pci.c +1 -1
@@ -1367,7 +1367,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req)else nvme_poll_irqdisable (nvmeq); -if (blk_mq_request_completed (req)) { +if (blk_mq_rq_state (req) !=MQ_RQ_IN_FLIGHT ) {dev_warn (dev->ctrl.device,"I/O %d QID %d timeout, completion polled\n" , req->tag, nvmeq->qid);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 126/313 tcp: avoid the lookup process failing to get sk in ehash table
In reply to Greg Kroah-HartmanFrom: Jason Xing <[email protected]>
[ Upstream commit 3f4ca5fafc08881d7a57daa20449d171f2887043 ]
While one cpu is working on looking up the right socket from ehash table, another cpu is done deleting the request socket and is about to add (or is adding) the big socket from the table. It means that we could miss both of them, even though it has little chance.
Let me draw a call trace map of the server side.
CPU 0 CPU 1
----- -----tcp_v4_rcv() syn_recv_sock()
inet_ehash_insert()
-> sk_nulls_del_node_init_rcu(osk)
__inet_lookup_established()
-> __sk_nulls_add_node_rcu(sk, list)Notice that the CPU 0 is receiving the data after the final ack during 3-way shakehands and CPU 1 is still handling the final ack.
Why could this be a real problem?
This case is happening only when the final ack and the first data receiving by different CPUs. Then the server receiving data with ACK flag tries to search one proper established socket from ehash table, but apparently it fails as my map shows above. After that, the server fetches a listener socket and then sends a RST because it finds a ACK flag in the skb (data), which obeys RST definition in RFC 793.
Besides, Eric pointed out there's one more race condition where it handles tw socket hashdance. Only by adding to the tail of the list before deleting the old one can we avoid the race if the reader has already begun the bucket traversal and it would possibly miss the head.
Many thanks to Eric for great help from beginning to end.
--- net/ipv4/inet_hashtables.c | 17 +++++++++++++++-- net/ipv4/inet_timewait_sock.c | 8 ++++---- 2 files changed, 19 insertions(+), 6 deletions(-)
net/ipv4/inet_hashtables.c +15 -2
@@ -650,8 +650,20 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)spin_lock (lock);if (osk) {WARN_ON_ONCE (sk->sk_hash != osk->sk_hash); - ret =sk_nulls_del_node_init_rcu (osk); - }else if (found_dup_sk) { + ret =sk_hashed (osk); +if (ret) { +/* Before deleting the node, we insert a new one to make +* sure that the look-up-sk process would not miss either +* of them and that at least one node would exist in ehash +* table all the time. Otherwise there's a tiny chance +* that lookup process could find nothing in ehash table. +*/ +__sk_nulls_add_node_tail_rcu (sk, list); +sk_nulls_del_node_init_rcu (osk); + } + goto unlock; + } +if (found_dup_sk) { *found_dup_sk =inet_ehash_lookup_by_sk (sk, list);if (*found_dup_sk) ret = false;
@@ -660,6 +672,7 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)if (ret)__sk_nulls_add_node_rcu (sk, list); +unlock:spin_unlock (lock);return ret;
net/ipv4/inet_timewait_sock.c +4 -4
@@ -91,10 +91,10 @@ void inet_twsk_put(struct inet_timewait_sock *tw) }EXPORT_SYMBOL_GPL (inet_twsk_put); -static void inet_twsk_add_node_rcu (struct inet_timewait_sock *tw, -struct hlist_nulls_head *list) +static void inet_twsk_add_node_tail_rcu (struct inet_timewait_sock *tw, +struct hlist_nulls_head *list) { -hlist_nulls_add_head_rcu (&tw->tw_node, list); +hlist_nulls_add_tail_rcu (&tw->tw_node, list); } static void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,
@@ -147,7 +147,7 @@ void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,spin_lock (lock); -inet_twsk_add_node_rcu (tw, &ehead->chain); +inet_twsk_add_node_tail_rcu (tw, &ehead->chain);/* Step 3: Remove SK from hash chain */ if (__sk_nulls_del_node_init_rcu (sk))
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 127/313 usb: dwc3: fix extcon dependency
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 7d80dbd708c18c683dd34f79b600a05307707ce8 ]
The dwc3 core support now links against the extcon subsystem, so it cannot be built-in when extcon is a loadable module:
arm-linux-gnueabi-ld: drivers/usb/dwc3/core.o: in function `dwc3_get_extcon':
core.c:(.text+0x572): undefined reference to `extcon_get_edev_by_phandle'
arm-linux-gnueabi-ld: core.c:(.text+0x596): undefined reference to `extcon_get_extcon_dev'
arm-linux-gnueabi-ld: core.c:(.text+0x5ea): undefined reference to `extcon_find_edev_by_node'
There was already a Kconfig dependency in the dual-role support, but this is now needed for the entire dwc3 driver.
It is still possible to build dwc3 without extcon, but this prevents it from being set to built-in when extcon is a loadable module.
--- drivers/usb/dwc3/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/Kconfig +1 -1
@@ -3,6 +3,7 @@ config USB_DWC3 tristate "DesignWare USB3 DRD Core Support" depends on (USB || USB_GADGET) && HAS_DMA + depends on (EXTCON || EXTCON=n) select USB_XHCI_PLATFORM if USB_XHCI_HCD select USB_ROLE_SWITCH if USB_DWC3_DUAL_ROLE help
@@ -44,7 +45,6 @@ config USB_DWC3_GADGET config USB_DWC3_DUAL_ROLE bool "Dual Role mode" depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3)) - depends on (EXTCON=y || EXTCON=USB_DWC3) help This is the default mode of working of DWC3 controller where both host and gadget features are enabled.
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 128/313 ptdma: pt_core_execute_cmd() should use spinlock
In reply to Greg Kroah-HartmanFrom: Eric Pilmore <[email protected]>
[ Upstream commit 95e5fda3b5f9ed8239b145da3fa01e641cf5d53c ]
The interrupt handler (pt_core_irq_handler()) of the ptdma driver can be called from interrupt context. The code flow in this function can lead down to pt_core_execute_cmd() which will attempt to grab a mutex, which is not appropriate in interrupt context and ultimately leads to a kernel panic. The fix here changes this mutex to a spinlock, which has been verified to resolve the issue.
--- drivers/dma/ptdma/ptdma-dev.c | 7 ++++--- drivers/dma/ptdma/ptdma.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/dma/ptdma/ptdma-dev.c +4 -3
@@ -71,12 +71,13 @@ static int pt_core_execute_cmd(struct ptdma_desc *desc, struct pt_cmd_queue *cmdbool soc =FIELD_GET (DWORD0_SOC , desc->dw0);u8 *q_desc = (u8 *)&cmd_q->qbase[cmd_q->qidx];u32 tail; +unsigned long flags;if (soc) { desc->dw0 |=FIELD_PREP (DWORD0_IOC , desc->dw0); desc->dw0 &= ~DWORD0_SOC ; } -mutex_lock (&cmd_q->q_mutex); +spin_lock_irqsave (&cmd_q->q_lock, flags);/* Copy 32-byte command descriptor to hw queue. */ memcpy (q_desc, desc,32 );
@@ -91,7 +92,7 @@ static int pt_core_execute_cmd(struct ptdma_desc *desc, struct pt_cmd_queue *cmd/* Turn the queue back on using our cached control register */ pt_start_queue (cmd_q); -mutex_unlock (&cmd_q->q_mutex); +spin_unlock_irqrestore (&cmd_q->q_lock, flags);return 0 ; }
@@ -199,7 +200,7 @@ int pt_core_init(struct pt_device *pt) cmd_q->pt = pt; cmd_q->dma_pool = dma_pool; -mutex_init (&cmd_q->q_mutex); +spin_lock_init (&cmd_q->q_lock);/* Page alignment satisfies our needs for N <= 128 */ cmd_q->qsize =Q_SIZE (Q_DESC_SIZE );
drivers/dma/ptdma/ptdma.h +1 -1
@@ -196,7 +196,7 @@ struct pt_cmd_queue {struct ptdma_desc *qbase;/* Aligned queue start address (per requirement) */ -struct mutex q_mutex____cacheline_aligned ; +spinlock_t q_lock____cacheline_aligned ;unsigned int qidx;unsigned int qsize;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 129/313 device property: fix of node refcount leak in fwnode_graph_get_next_endpoint()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 39af728649b05e88a2b40e714feeee6451c3f18e ]
The 'parent' returned by fwnode_graph_get_port_parent() with refcount incremented when 'prev' is not NULL, it needs be put when finish using it.
Because the parent is const, introduce a new variable to store the returned fwnode, then put it before returning from fwnode_graph_get_next_endpoint().
--- drivers/base/property.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/base/property.c +12 -6
@@ -989,26 +989,32 @@ struct fwnode_handle * fwnode_graph_get_next_endpoint(const struct fwnode_handle *fwnode, struct fwnode_handle *prev) { + struct fwnode_handle *ep, *port_parent = NULL;const struct fwnode_handle *parent; -struct fwnode_handle *ep;/* * If this function is in a loop and the previous iteration returned * an endpoint from fwnode->secondary, then we need to use the secondary * as parent rather than @fwnode. */ -if (prev) - parent =fwnode_graph_get_port_parent (prev); -else +if (prev) { + port_parent =fwnode_graph_get_port_parent (prev); + parent = port_parent; + }else { parent = fwnode; + }if (IS_ERR_OR_NULL (parent))return NULL ; ep =fwnode_call_ptr_op (parent, graph_get_next_endpoint, prev);if (ep) -return ep; + goto out_put_port_parent; + + ep =fwnode_graph_get_next_endpoint (parent->secondary,NULL ); -return fwnode_graph_get_next_endpoint (parent->secondary,NULL ); +out_put_port_parent: +fwnode_handle_put (port_parent); +return ep; }EXPORT_SYMBOL_GPL (fwnode_graph_get_next_endpoint);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 130/313 w1: fix deadloop in __w1_remove_master_device()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 25d5648802f12ae486076ceca5d7ddf1fef792b2 ]
I got a deadloop report while doing device(ds2482) add/remove test:
[ 162.241881] w1_master_driver w1_bus_master1: Waiting for w1_bus_master1 to become free: refcnt=1. [ 163.272251] w1_master_driver w1_bus_master1: Waiting for w1_bus_master1 to become free: refcnt=1. [ 164.296157] w1_master_driver w1_bus_master1: Waiting for w1_bus_master1 to become free: refcnt=1. ...
__w1_remove_master_device() can't return, because the dev->refcnt is not zero.
w1_add_master_device() |
w1_alloc_dev() |
atomic_set(&dev->refcnt, 2) |
kthread_run() |
|__w1_remove_master_device()
| kthread_stop()
// KTHREAD_SHOULD_STOP is set, |
// threadfn(w1_process) won't be |
// called. |
kthread() |
| // refcnt will never be 0, it's deadloop.
| while (atomic_read(&dev->refcnt)) {...}After calling w1_add_master_device(), w1_process() is not really invoked, before w1_process() starting, if kthread_stop() is called in __w1_remove_master_device(), w1_process() will never be called, the refcnt can not be decreased, then it causes deadloop in remove function because of non-zero refcnt.
We need to make sure w1_process() is really started, so move the set refcnt into w1_process() to fix this problem.
--- drivers/w1/w1.c | 2 ++ drivers/w1/w1_int.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/w1/w1.c +2 -0
@@ -1166,6 +1166,8 @@ int w1_process(void *data)/* remainder if it woke up early */ unsigned long jremain =0 ; +atomic_inc (&dev->refcnt); +for (;;) {if (!jremain && dev->search_count) {
drivers/w1/w1_int.c +2 -3
@@ -51,10 +51,9 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl, dev->search_count = w1_search_count; dev->enable_pullup = w1_enable_pullup; -/* 1 for w1_process to decrement -* 1 for __w1_remove_master_device to decrement +/* For __w1_remove_master_device to decrement */ -atomic_set (&dev->refcnt,2 ); +atomic_set (&dev->refcnt,1 );INIT_LIST_HEAD (&dev->slist);INIT_LIST_HEAD (&dev->async_list);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 104/313 Bluetooth: Fix possible deadlock in rfcomm_sk_state_change
In reply to Greg Kroah-HartmanFrom: Ying Hsu <[email protected]>
[ Upstream commit 1d80d57ffcb55488f0ec0b77928d4f82d16b6a90 ]
syzbot reports a possible deadlock in rfcomm_sk_state_change [1]. While rfcomm_sock_connect acquires the sk lock and waits for the rfcomm lock, rfcomm_sock_release could have the rfcomm lock and hit a deadlock for acquiring the sk lock. Here's a simplified flow:
rfcomm_sock_connect:
lock_sock(sk)
rfcomm_dlc_open:
rfcomm_lock()
rfcomm_sock_release:
rfcomm_sock_shutdown:
rfcomm_lock()
__rfcomm_dlc_close:
rfcomm_k_state_change:
lock_sock(sk)This patch drops the sk lock before calling rfcomm_dlc_open to avoid the possible deadlock and holds sk's reference count to prevent use-after-free after rfcomm_dlc_open completes.
--- net/bluetooth/rfcomm/sock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/bluetooth/rfcomm/sock.c +6 -1
@@ -391,6 +391,7 @@ static int rfcomm_sock_connect(struct socket *sock, struct sockaddr *addr, int a addr->sa_family != AF_BLUETOOTH)return -EINVAL ; +sock_hold (sk);lock_sock (sk);if (sk->sk_state !=BT_OPEN && sk->sk_state !=BT_BOUND ) {
@@ -410,14 +411,18 @@ static int rfcomm_sock_connect(struct socket *sock, struct sockaddr *addr, int a d->sec_level =rfcomm_pi (sk)->sec_level; d->role_switch =rfcomm_pi (sk)->role_switch; +/* Drop sock lock to avoid potential deadlock with the RFCOMM lock */ +release_sock (sk); err =rfcomm_dlc_open (d, &rfcomm_pi (sk)->src, &sa->rc_bdaddr, sa->rc_channel); -if (!err) +lock_sock (sk); +if (!err && !sock_flag (sk,SOCK_ZAPPED )) err =bt_sock_wait_state (sk,BT_CONNECTED ,sock_sndtimeo (sk, flags &O_NONBLOCK )); done:release_sock (sk); +sock_put (sk);return err; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 131/313 w1: fix WARNING after calling w1_process()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 36225a7c72e9e3e1ce4001b6ce72849f5c9a2d3b ]
I got the following WARNING message while removing driver(ds2482):
------------[ cut here ]------------ do not call blocking ops when !TASK_RUNNING; state=1 set at [<000000002d50bfb6>] w1_process+0x9e/0x1d0 [wire] WARNING: CPU: 0 PID: 262 at kernel/sched/core.c:9817 __might_sleep+0x98/0xa0 CPU: 0 PID: 262 Comm: w1_bus_master1 Tainted: G N 6.1.0-rc3+ #307 RIP: 0010:__might_sleep+0x98/0xa0 Call Trace: exit_signals+0x6c/0x550 do_exit+0x2b4/0x17e0 kthread_exit+0x52/0x60 kthread+0x16d/0x1e0 ret_from_fork+0x1f/0x30
The state of task is set to TASK_INTERRUPTIBLE in loop in w1_process(), set it to TASK_RUNNING when it breaks out of the loop to avoid the warning.
--- drivers/w1/w1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/w1/w1.c +3 -1
@@ -1195,8 +1195,10 @@ int w1_process(void *data)*/ mutex_unlock (&dev->list_mutex); -if (kthread_should_stop ()) +if (kthread_should_stop ()) { +__set_current_state (TASK_RUNNING );break ; + }/* Only sleep when the search is active. */ if (dev->search_count) {
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 132/313 driver core: Fix test_async_probe_init saves device in wrong array
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit 9be182da0a7526f1b9a3777a336f83baa2e64d23 ]
In test_async_probe_init, second set of asynchronous devices are saved in sync_dev[sync_id], which should be async_dev[async_id]. This makes these devices not unregistered when exit.
Quoted 3 lines
modprobe
test_async_driver_probe&& \
modprobe -rtest_async_driver_probe&& \
modprobetest_async_driver_probe
...
Quoted 2 lines
sysfs: cannot create duplicate filename '/devices/platform/test_async_driver.4'
kobject_add_internalfailed for test_async_driver.4 with-EEXIST,
don't try to register things with the same name in the same directory.
--- drivers/base/test/test_async_driver_probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/test/test_async_driver_probe.c +1 -1
@@ -145,7 +145,7 @@ static int __init test_async_probe_init(void) calltime =ktime_get ();for_each_online_cpu (cpu) { nid =cpu_to_node (cpu); - pdev = &sync_dev[sync_id]; + pdev = &async_dev[async_id]; *pdev = test_platform_device_register_node("test_async_driver", async_id,
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 105/313 net: ipa: disable ipa interrupt during suspend
In reply to Greg Kroah-HartmanFrom: Caleb Connolly <[email protected]>
[ Upstream commit 9ec9b2a30853ba843b70ea16f196e5fe3327be5f ]
The IPA interrupt can fire when pm_runtime is disabled due to it racing with the PM suspend/resume code. This causes a splat in the interrupt handler when it tries to call pm_runtime_get().
Explicitly disable the interrupt in our ->suspend callback, and re-enable it in ->resume to avoid this. If there is an interrupt pending it will be handled after resuming. The interrupt is a wake_irq, as a result even when disabled if it fires it will cause the system to wake from suspend as well as cancel any suspend transition that may be in progress. If there is an interrupt pending, the ipa_isr_thread handler will be called after resuming.
--- drivers/net/ipa/ipa_interrupt.c | 10 ++++++++++ drivers/net/ipa/ipa_interrupt.h | 16 ++++++++++++++++ drivers/net/ipa/ipa_power.c | 17 +++++++++++++++++ 3 files changed, 43 insertions(+)
drivers/net/ipa/ipa_interrupt.c +10 -0
@@ -127,6 +127,16 @@ static irqreturn_t ipa_isr_thread(int irq, void *dev_id)return IRQ_HANDLED ; } +void ipa_interrupt_irq_disable (struct ipa *ipa) +{ +disable_irq (ipa->interrupt->irq); +} + +void ipa_interrupt_irq_enable (struct ipa *ipa) +{ +enable_irq (ipa->interrupt->irq); +} +/* Common function used to enable/disable TX_SUSPEND for an endpoint */ static void ipa_interrupt_suspend_control (struct ipa_interrupt *interrupt,u32 endpoint_id,bool enable)
drivers/net/ipa/ipa_interrupt.h +16 -0
@@ -85,6 +85,22 @@ void ipa_interrupt_suspend_clear_all(struct ipa_interrupt *interrupt);*/ void ipa_interrupt_simulate_suspend (struct ipa_interrupt *interrupt); +/** +* ipa_interrupt_irq_enable() - Enable IPA interrupts +* @ipa: IPA pointer +* +* This enables the IPA interrupt line +*/ +void ipa_interrupt_irq_enable (struct ipa *ipa); + +/** +* ipa_interrupt_irq_disable() - Disable IPA interrupts +* @ipa: IPA pointer +* +* This disables the IPA interrupt line +*/ +void ipa_interrupt_irq_disable (struct ipa *ipa); +/** * ipa_interrupt_config() - Configure the IPA interrupt framework * @ipa: IPA pointer
drivers/net/ipa/ipa_power.c +17 -0
@@ -181,6 +181,17 @@ static int ipa_suspend(struct device *dev)__set_bit (IPA_POWER_FLAG_SYSTEM , ipa->power->flags); +/* Increment the disable depth to ensure that the IRQ won't +* be re-enabled until the matching _enable call in +* ipa_resume(). We do this to ensure that the interrupt +* handler won't run whilst PM runtime is disabled. +* +* Note that disabling the IRQ is NOT the same as disabling +* irq wake. If wakeup is enabled for the IPA then the IRQ +* will still cause the system to wake up, see irq_set_irq_wake(). +*/ +ipa_interrupt_irq_disable (ipa); +return pm_runtime_force_suspend (dev); }
@@ -193,6 +204,12 @@ static int ipa_resume(struct device *dev)__clear_bit (IPA_POWER_FLAG_SYSTEM , ipa->power->flags); +/* Now that PM runtime is enabled again it's safe +* to turn the IRQ back on and process any data +* that was received during suspend. +*/ +ipa_interrupt_irq_enable (ipa); +return ret; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 106/313 net/mlx5e: Avoid false lock dependency warning on tc_ht even more
In reply to Greg Kroah-HartmanFrom: Vlad Buslov <[email protected]>
[ Upstream commit 5aa56105930374928d567744595fd7ac525d0688 ]
The cited commit changed class of tc_ht internal mutex in order to avoid false lock dependency with fs_core node and flow_table hash table structures. However, hash table implementation internally also includes a workqueue task with its own lockdep map which causes similar bogus lockdep splat[0]. Fix it by also adding dedicated class for hash table workqueue work structure of tc_ht.
[0]:
[ 1139.672465] ======================================================
[ 1139.673552] WARNING: possible circular locking dependency detected
[ 1139.674635] 6.1.0_for_upstream_debug_2022_12_12_17_02 #1 Not tainted
[ 1139.675734] ------------------------------------------------------
[ 1139.676801] modprobe/5998 is trying to acquire lock:
[ 1139.677726] ffff88811e7b93b8 (&node->lock){++++}-{3:3}, at: down_write_ref_node+0x7c/0xe0 [mlx5_core]
[ 1139.679662]
but task is already holding lock:
[ 1139.680703] ffff88813c1f96a0 (&tc_ht_lock_key){+.+.}-{3:3}, at: rhashtable_free_and_destroy+0x38/0x6f0
[ 1139.682223]
which lock already depends on the new lock.[ 1139.683640]
the existing dependency chain (in reverse order) is:
[ 1139.684887]
-> #2 (&tc_ht_lock_key){+.+.}-{3:3}:
[ 1139.685975] __mutex_lock+0x12c/0x14b0
[ 1139.686659] rht_deferred_worker+0x35/0x1540
[ 1139.687405] process_one_work+0x7c2/0x1310
[ 1139.688134] worker_thread+0x59d/0xec0
[ 1139.688820] kthread+0x28f/0x330
[ 1139.689444] ret_from_fork+0x1f/0x30
[ 1139.690106]
-> #1 ((work_completion)(&ht->run_work)){+.+.}-{0:0}:
[ 1139.691250] __flush_work+0xe8/0x900
[ 1139.691915] __cancel_work_timer+0x2ca/0x3f0
[ 1139.692655] rhashtable_free_and_destroy+0x22/0x6f0
[ 1139.693472] del_sw_flow_table+0x22/0xb0 [mlx5_core]
[ 1139.694592] tree_put_node+0x24c/0x450 [mlx5_core]
[ 1139.695686] tree_remove_node+0x6e/0x100 [mlx5_core]
[ 1139.696803] mlx5_destroy_flow_table+0x187/0x690 [mlx5_core]
[ 1139.698017] mlx5e_tc_nic_cleanup+0x2f8/0x400 [mlx5_core]
[ 1139.699217] mlx5e_cleanup_nic_rx+0x2b/0x210 [mlx5_core]
[ 1139.700397] mlx5e_detach_netdev+0x19d/0x2b0 [mlx5_core]
[ 1139.701571] mlx5e_suspend+0xdb/0x140 [mlx5_core]
[ 1139.702665] mlx5e_remove+0x89/0x190 [mlx5_core]
[ 1139.703756] auxiliary_bus_remove+0x52/0x70
[ 1139.704492] device_release_driver_internal+0x3c1/0x600
[ 1139.705360] bus_remove_device+0x2a5/0x560
[ 1139.706080] device_del+0x492/0xb80
[ 1139.706724] mlx5_rescan_drivers_locked+0x194/0x6a0 [mlx5_core]
[ 1139.707961] mlx5_unregister_device+0x7a/0xa0 [mlx5_core]
[ 1139.709138] mlx5_uninit_one+0x5f/0x160 [mlx5_core]
[ 1139.710252] remove_one+0xd1/0x160 [mlx5_core]
[ 1139.711297] pci_device_remove+0x96/0x1c0
[ 1139.722721] device_release_driver_internal+0x3c1/0x600
[ 1139.723590] unbind_store+0x1b1/0x200
[ 1139.724259] kernfs_fop_write_iter+0x348/0x520
[ 1139.725019] vfs_write+0x7b2/0xbf0
[ 1139.725658] ksys_write+0xf3/0x1d0
[ 1139.726292] do_syscall_64+0x3d/0x90
[ 1139.726942] entry_SYSCALL_64_after_hwframe+0x46/0xb0
[ 1139.727769]
-> #0 (&node->lock){++++}-{3:3}:
[ 1139.728698] __lock_acquire+0x2cf5/0x62f0
[ 1139.729415] lock_acquire+0x1c1/0x540
[ 1139.730076] down_write+0x8e/0x1f0
[ 1139.730709] down_write_ref_node+0x7c/0xe0 [mlx5_core]
[ 1139.731841] mlx5_del_flow_rules+0x6f/0x610 [mlx5_core]
[ 1139.732982] __mlx5_eswitch_del_rule+0xdd/0x560 [mlx5_core]
[ 1139.734207] mlx5_eswitch_del_offloaded_rule+0x14/0x20 [mlx5_core]
[ 1139.735491] mlx5e_tc_rule_unoffload+0x104/0x2b0 [mlx5_core]
[ 1139.736716] mlx5e_tc_unoffload_fdb_rules+0x10c/0x1f0 [mlx5_core]
[ 1139.738007] mlx5e_tc_del_fdb_flow+0xc3c/0xfa0 [mlx5_core]
[ 1139.739213] mlx5e_tc_del_flow+0x146/0xa20 [mlx5_core]
[ 1139.740377] _mlx5e_tc_del_flow+0x38/0x60 [mlx5_core]
[ 1139.741534] rhashtable_free_and_destroy+0x3be/0x6f0
[ 1139.742351] mlx5e_tc_ht_cleanup+0x1b/0x30 [mlx5_core]
[ 1139.743512] mlx5e_cleanup_rep_tx+0x4a/0xe0 [mlx5_core]
[ 1139.744683] mlx5e_detach_netdev+0x1ca/0x2b0 [mlx5_core]
[ 1139.745860] mlx5e_netdev_change_profile+0xd9/0x1c0 [mlx5_core]
[ 1139.747098] mlx5e_netdev_attach_nic_profile+0x1b/0x30 [mlx5_core]
[ 1139.748372] mlx5e_vport_rep_unload+0x16a/0x1b0 [mlx5_core]
[ 1139.749590] __esw_offloads_unload_rep+0xb1/0xd0 [mlx5_core]
[ 1139.750813] mlx5_eswitch_unregister_vport_reps+0x409/0x5f0 [mlx5_core]
[ 1139.752147] mlx5e_rep_remove+0x62/0x80 [mlx5_core]
[ 1139.753293] auxiliary_bus_remove+0x52/0x70
[ 1139.754028] device_release_driver_internal+0x3c1/0x600
[ 1139.754885] driver_detach+0xc1/0x180
[ 1139.755553] bus_remove_driver+0xef/0x2e0
[ 1139.756260] auxiliary_driver_unregister+0x16/0x50
[ 1139.757059] mlx5e_rep_cleanup+0x19/0x30 [mlx5_core]
[ 1139.758207] mlx5e_cleanup+0x12/0x30 [mlx5_core]
[ 1139.759295] mlx5_cleanup+0xc/0x49 [mlx5_core]
[ 1139.760384] __x64_sys_delete_module+0x2b5/0x450
[ 1139.761166] do_syscall_64+0x3d/0x90
[ 1139.761827] entry_SYSCALL_64_after_hwframe+0x46/0xb0
[ 1139.762663]
other info that might help us debug this:[ 1139.763925] Chain exists of:
&node->lock --> (work_completion)(&ht->run_work) --> &tc_ht_lock_key[ 1139.765743] Possible unsafe locking scenario:
[ 1139.766688] CPU0 CPU1
[ 1139.767399] ---- ----
[ 1139.768111] lock(&tc_ht_lock_key);
[ 1139.768704] lock((work_completion)(&ht->run_work));
[ 1139.769869] lock(&tc_ht_lock_key);
[ 1139.770770] lock(&node->lock);
[ 1139.771326]
*** DEADLOCK ***[ 1139.772345] 2 locks held by modprobe/5998:
[ 1139.772994] #0: ffff88813c1ff0e8 (&dev->mutex){....}-{3:3}, at: device_release_driver_internal+0x8d/0x600
[ 1139.774399] #1: ffff88813c1f96a0 (&tc_ht_lock_key){+.+.}-{3:3}, at: rhashtable_free_and_destroy+0x38/0x6f0
[ 1139.775822]
stack backtrace:
[ 1139.776579] CPU: 3 PID: 5998 Comm: modprobe Not tainted 6.1.0_for_upstream_debug_2022_12_12_17_02 #1
[ 1139.777935] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
[ 1139.779529] Call Trace:
[ 1139.779992] <TASK>
[ 1139.780409] dump_stack_lvl+0x57/0x7d
[ 1139.781015] check_noncircular+0x278/0x300
[ 1139.781687] ? print_circular_bug+0x460/0x460
[ 1139.782381] ? rcu_read_lock_sched_held+0x3f/0x70
[ 1139.783121] ? lock_release+0x487/0x7c0
[ 1139.783759] ? orc_find.part.0+0x1f1/0x330
[ 1139.784423] ? mark_lock.part.0+0xef/0x2fc0
[ 1139.785091] __lock_acquire+0x2cf5/0x62f0
[ 1139.785754] ? register_lock_class+0x18e0/0x18e0
[ 1139.786483] lock_acquire+0x1c1/0x540
[ 1139.787093] ? down_write_ref_node+0x7c/0xe0 [mlx5_core]
[ 1139.788195] ? lockdep_hardirqs_on_prepare+0x3f0/0x3f0
[ 1139.788978] ? register_lock_class+0x18e0/0x18e0
[ 1139.789715] down_write+0x8e/0x1f0
[ 1139.790292] ? down_write_ref_node+0x7c/0xe0 [mlx5_core]
[ 1139.791380] ? down_write_killable+0x220/0x220
[ 1139.792080] ? find_held_lock+0x2d/0x110
[ 1139.792713] down_write_ref_node+0x7c/0xe0 [mlx5_core]
[ 1139.793795] mlx5_del_flow_rules+0x6f/0x610 [mlx5_core]
[ 1139.794879] __mlx5_eswitch_del_rule+0xdd/0x560 [mlx5_core]
[ 1139.796032] ? __esw_offloads_unload_rep+0xd0/0xd0 [mlx5_core]
[ 1139.797227] ? xa_load+0x11a/0x200
[ 1139.797800] ? __xa_clear_mark+0xf0/0xf0
[ 1139.798438] mlx5_eswitch_del_offloaded_rule+0x14/0x20 [mlx5_core]
[ 1139.799660] mlx5e_tc_rule_unoffload+0x104/0x2b0 [mlx5_core]
[ 1139.800821] mlx5e_tc_unoffload_fdb_rules+0x10c/0x1f0 [mlx5_core]
[ 1139.802049] ? mlx5_eswitch_get_uplink_priv+0x25/0x80 [mlx5_core]
[ 1139.803260] mlx5e_tc_del_fdb_flow+0xc3c/0xfa0 [mlx5_core]
[ 1139.804398] ? __cancel_work_timer+0x1c2/0x3f0
[ 1139.805099] ? mlx5e_tc_unoffload_from_slow_path+0x460/0x460 [mlx5_core]
[ 1139.806387] mlx5e_tc_del_flow+0x146/0xa20 [mlx5_core]
[ 1139.807481] _mlx5e_tc_del_flow+0x38/0x60 [mlx5_core]
[ 1139.808564] rhashtable_free_and_destroy+0x3be/0x6f0
[ 1139.809336] ? mlx5e_tc_del_flow+0xa20/0xa20 [mlx5_core]
[ 1139.809336] ? mlx5e_tc_del_flow+0xa20/0xa20 [mlx5_core]
[ 1139.810455] mlx5e_tc_ht_cleanup+0x1b/0x30 [mlx5_core]
[ 1139.811552] mlx5e_cleanup_rep_tx+0x4a/0xe0 [mlx5_core]
[ 1139.812655] mlx5e_detach_netdev+0x1ca/0x2b0 [mlx5_core]
[ 1139.813768] mlx5e_netdev_change_profile+0xd9/0x1c0 [mlx5_core]
[ 1139.814952] mlx5e_netdev_attach_nic_profile+0x1b/0x30 [mlx5_core]
[ 1139.816166] mlx5e_vport_rep_unload+0x16a/0x1b0 [mlx5_core]
[ 1139.817336] __esw_offloads_unload_rep+0xb1/0xd0 [mlx5_core]
[ 1139.818507] mlx5_eswitch_unregister_vport_reps+0x409/0x5f0 [mlx5_core]
[ 1139.819788] ? mlx5_eswitch_uplink_get_proto_dev+0x30/0x30 [mlx5_core]
[ 1139.821051] ? kernfs_find_ns+0x137/0x310
[ 1139.821705] mlx5e_rep_remove+0x62/0x80 [mlx5_core]
[ 1139.822778] auxiliary_bus_remove+0x52/0x70
[ 1139.823449] device_release_driver_internal+0x3c1/0x600
[ 1139.824240] driver_detach+0xc1/0x180
[ 1139.824842] bus_remove_driver+0xef/0x2e0
[ 1139.825504] auxiliary_driver_unregister+0x16/0x50
[ 1139.826245] mlx5e_rep_cleanup+0x19/0x30 [mlx5_core]
[ 1139.827322] mlx5e_cleanup+0x12/0x30 [mlx5_core]
[ 1139.828345] mlx5_cleanup+0xc/0x49 [mlx5_core]
[ 1139.829382] __x64_sys_delete_module+0x2b5/0x450
[ 1139.830119] ? module_flags+0x300/0x300
[ 1139.830750] ? task_work_func_match+0x50/0x50
[ 1139.831440] ? task_work_cancel+0x20/0x20
[ 1139.832088] ? lockdep_hardirqs_on_prepare+0x273/0x3f0
[ 1139.832873] ? syscall_enter_from_user_mode+0x1d/0x50
[ 1139.833661] ? trace_hardirqs_on+0x2d/0x100
[ 1139.834328] do_syscall_64+0x3d/0x90
[ 1139.834922] entry_SYSCALL_64_after_hwframe+0x46/0xb0
[ 1139.835700] RIP: 0033:0x7f153e71288b
[ 1139.836302] Code: 73 01 c3 48 8b 0d 9d 75 0e 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa b8 b0 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 6d 75 0e 00 f7 d8 64 89 01 48
[ 1139.838866] RSP: 002b:00007ffe0a3ed938 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0
[ 1139.840020] RAX: ffffffffffffffda RBX: 0000564c2cbf8220 RCX: 00007f153e71288b
[ 1139.841043] RDX: 0000000000000000 RSI: 0000000000000800 RDI: 0000564c2cbf8288
[ 1139.842072] RBP: 0000564c2cbf8220 R08: 0000000000000000 R09: 0000000000000000
[ 1139.843094] R10: 00007f153e7a3ac0 R11: 0000000000000206 R12: 0000564c2cbf8288
[ 1139.844118] R13: 0000000000000000 R14: 0000564c2cbf7ae8 R15: 00007ffe0a3efcb8--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +3 -0
@@ -157,6 +157,7 @@ struct mlx5_fs_chains *mlx5e_nic_chains(struct mlx5e_tc_table *tc)* it's different than the ht->mutex here. */ static struct lock_class_key tc_ht_lock_key; +static struct lock_class_key tc_ht_wq_key;static void mlx5e_put_flow_tunnel_id (struct mlx5e_tc_flow *flow);static void free_flow_post_acts (struct mlx5e_tc_flow *flow);
@@ -4971,6 +4972,7 @@ int mlx5e_tc_nic_init(struct mlx5e_priv *priv)return err;lockdep_set_class (&tc->ht.mutex, &tc_ht_lock_key); +lockdep_init_map (&tc->ht.run_work.lockdep_map,"tc_ht_wq_key" , &tc_ht_wq_key,0 ); mapping_id =mlx5_query_nic_system_image_guid (dev);
@@ -5077,6 +5079,7 @@ int mlx5e_tc_ht_init(struct rhashtable *tc_ht)return err;lockdep_set_class (&tc_ht->mutex, &tc_ht_lock_key); +lockdep_init_map (&tc_ht->run_work.lockdep_map,"tc_ht_wq_key" , &tc_ht_wq_key,0 );return 0 ; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 107/313 net/mlx5: E-switch, Fix setting of reserved fields on MODIFY_SCHEDULING_ELEMENT
In reply to Greg Kroah-HartmanFrom: Maor Dickman <[email protected]>
[ Upstream commit f51471d1935ce1f504fce6c115ce3bfbc32032b0 ]
According to HW spec element_type, element_attributes and parent_element_id fields should be reserved (0x0) when calling MODIFY_SCHEDULING_ELEMENT command.
This patch remove initialization of these fields when calling the command.
--- .../net/ethernet/mellanox/mlx5/core/esw/qos.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +3 -15
@@ -22,15 +22,13 @@ struct mlx5_esw_rate_group { };static int esw_qos_tsar_config (struct mlx5_core_dev *dev,u32 *sched_ctx, -u32 parent_ix,u32 tsar_ix, -u32 max_rate,u32 bw_share) +u32 tsar_ix,u32 max_rate,u32 bw_share) {u32 bitmask =0 ;if (!MLX5_CAP_GEN (dev, qos) || !MLX5_CAP_QOS (dev, esw_scheduling))return -EOPNOTSUPP ; -MLX5_SET (scheduling_context, sched_ctx, parent_element_id, parent_ix);MLX5_SET (scheduling_context, sched_ctx, max_average_bw, max_rate);MLX5_SET (scheduling_context, sched_ctx, bw_share, bw_share); bitmask |=MODIFY_SCHEDULING_ELEMENT_IN_MODIFY_BITMASK_MAX_AVERAGE_BW ;
@@ -51,7 +49,7 @@ static int esw_qos_group_config(struct mlx5_eswitch *esw, struct mlx5_esw_rate_gint err; err =esw_qos_tsar_config (dev, sched_ctx, - esw->qos.root_tsar_ix, group->tsar_ix, + group->tsar_ix, max_rate, bw_share);if (err)NL_SET_ERR_MSG_MOD (extack,"E-Switch modify group TSAR element failed" );
@@ -67,23 +65,13 @@ static int esw_qos_vport_config(struct mlx5_eswitch *esw, struct netlink_ext_ack *extack) {u32 sched_ctx[MLX5_ST_SZ_DW (scheduling_context)] = {}; -struct mlx5_esw_rate_group *group = vport->qos.group;struct mlx5_core_dev *dev = esw->dev; -u32 parent_tsar_ix; -void *vport_elem;int err;if (!vport->qos.enabled)return -EIO ; - parent_tsar_ix = group ? group->tsar_ix : esw->qos.root_tsar_ix; -MLX5_SET (scheduling_context, sched_ctx, element_type, -SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT ); - vport_elem =MLX5_ADDR_OF (scheduling_context, sched_ctx, - element_attributes); -MLX5_SET (vport_element, vport_elem, vport_number, vport->vport); - - err =esw_qos_tsar_config (dev, sched_ctx, parent_tsar_ix, vport->qos.esw_tsar_ix, + err =esw_qos_tsar_config (dev, sched_ctx, vport->qos.esw_tsar_ix, max_rate, bw_share);if (err) { esw_warn(esw->dev,
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 108/313 net/mlx5e: QoS, Fix wrongfully setting parent_element_id on MODIFY_SCHEDULING_ELEMENT
In reply to Greg Kroah-HartmanFrom: Maor Dickman <[email protected]>
[ Upstream commit 4ddf77f9bc76092d268bd3af447d60d9cc62b652 ]
According to HW spec parent_element_id field should be reserved (0x0) when calling MODIFY_SCHEDULING_ELEMENT command.
This patch remove the wrong initialization of reserved field, parent_element_id, on mlx5_qos_update_node.
--- drivers/net/ethernet/mellanox/mlx5/core/en/htb.c | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/qos.c | 3 +-- drivers/net/ethernet/mellanox/mlx5/core/qos.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/htb.c +2 -2
@@ -637,7 +637,7 @@ mlx5e_htb_update_children(struct mlx5e_htb *htb, struct mlx5e_qos_node *node,if (child->bw_share == old_bw_share)continue ; - err_one =mlx5_qos_update_node (htb->mdev, child->hw_id, child->bw_share, + err_one =mlx5_qos_update_node (htb->mdev, child->bw_share, child->max_average_bw, child->hw_id);if (!err && err_one) { err = err_one;
@@ -671,7 +671,7 @@ mlx5e_htb_node_modify(struct mlx5e_htb *htb, u16 classid, u64 rate, u64 ceil,mlx5e_htb_convert_rate (htb, rate, node->parent, &bw_share);mlx5e_htb_convert_ceil (htb, ceil, &max_average_bw); - err =mlx5_qos_update_node (htb->mdev, node->parent->hw_id, bw_share, + err =mlx5_qos_update_node (htb->mdev, bw_share, max_average_bw, node->hw_id);if (err) {NL_SET_ERR_MSG_MOD (extack,"Firmware error when modifying a node." );
drivers/net/ethernet/mellanox/mlx5/core/qos.c +1 -2
@@ -62,13 +62,12 @@ int mlx5_qos_create_root_node(struct mlx5_core_dev *mdev, u32 *id)return mlx5_qos_create_inner_node (mdev,MLX5_QOS_DEFAULT_DWRR_UID ,0 ,0 , id); } -int mlx5_qos_update_node (struct mlx5_core_dev *mdev,u32 parent_id, +int mlx5_qos_update_node (struct mlx5_core_dev *mdev,u32 bw_share,u32 max_avg_bw,u32 id) {u32 sched_ctx[MLX5_ST_SZ_DW (scheduling_context)] = {0 };u32 bitmask =0 ; -MLX5_SET (scheduling_context, sched_ctx, parent_element_id, parent_id);MLX5_SET (scheduling_context, sched_ctx, bw_share, bw_share);MLX5_SET (scheduling_context, sched_ctx, max_average_bw, max_avg_bw);
drivers/net/ethernet/mellanox/mlx5/core/qos.h +1 -1
@@ -23,7 +23,7 @@ int mlx5_qos_create_leaf_node(struct mlx5_core_dev *mdev, u32 parent_id,int mlx5_qos_create_inner_node (struct mlx5_core_dev *mdev,u32 parent_id,u32 bw_share,u32 max_avg_bw,u32 *id);int mlx5_qos_create_root_node (struct mlx5_core_dev *mdev,u32 *id); -int mlx5_qos_update_node (struct mlx5_core_dev *mdev,u32 parent_id,u32 bw_share, +int mlx5_qos_update_node (struct mlx5_core_dev *mdev,u32 bw_share,u32 max_avg_bw,u32 id);int mlx5_qos_destroy_node (struct mlx5_core_dev *mdev,u32 id);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 109/313 net/mlx5e: Set decap action based on attr for sample
In reply to Greg Kroah-HartmanFrom: Chris Mi <[email protected]>
[ Upstream commit ffa99b534732f90077f346c62094cab3d1ccddce ]
Currently decap action is set based on tunnel_id. That means it is set unconditionally. But for decap, ct and sample actions, decap is done before ct. No need to decap again in sample.
And the actions are set correctly when parsing. So set decap action based on attr instead of tunnel_id.
--- drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c +2 -3
@@ -477,7 +477,6 @@ mlx5e_tc_sample_offload(struct mlx5e_tc_psample *tc_psample,struct mlx5e_sample_flow *sample_flow;struct mlx5e_sample_attr *sample_attr;struct mlx5_flow_attr *pre_attr; -u32 tunnel_id = attr->tunnel_id;struct mlx5_eswitch *esw;u32 default_tbl_id;u32 obj_id;
@@ -522,7 +521,7 @@ mlx5e_tc_sample_offload(struct mlx5e_tc_psample *tc_psample, restore_obj.sample.group_id = sample_attr->group_num; restore_obj.sample.rate = sample_attr->rate; restore_obj.sample.trunc_size = sample_attr->trunc_size; - restore_obj.sample.tunnel_id = tunnel_id; + restore_obj.sample.tunnel_id = attr->tunnel_id; err =mapping_add (esw->offloads.reg_c0_obj_pool, &restore_obj, &obj_id);if (err) goto err_obj_id;
@@ -548,7 +547,7 @@ mlx5e_tc_sample_offload(struct mlx5e_tc_psample *tc_psample,/* For decap action, do decap in the original flow table instead of the * default flow table. */ -if (tunnel_id) +if (attr->action &MLX5_FLOW_CONTEXT_ACTION_DECAP ) pre_attr->action |=MLX5_FLOW_CONTEXT_ACTION_DECAP ; pre_attr->modify_hdr = sample_flow->restore->modify_hdr; pre_attr->flags =MLX5_ATTR_FLAG_SAMPLE ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 110/313 net/mlx5: E-switch, Fix switchdev mode after devlink reload
In reply to Greg Kroah-HartmanFrom: Chris Mi <[email protected]>
[ Upstream commit 7c83d1f4c5adae9583e7fca1e3e830d6b061522d ]
The cited commit removes eswitch mode none. So after devlink reload in switchdev mode, eswitch mode is not changed. But actually eswitch is disabled during devlink reload.
Fix it by setting eswitch mode to legacy when disabling eswitch which is called by reload_down.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +1 -0
@@ -1421,6 +1421,7 @@ void mlx5_eswitch_disable(struct mlx5_eswitch *esw)mlx5_lag_disable_change (esw->dev);down_write (&esw->mode_lock);mlx5_eswitch_disable_locked (esw); + esw->mode =MLX5_ESWITCH_LEGACY ;up_write (&esw->mode_lock);mlx5_lag_enable_change (esw->dev); }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 101/313 Bluetooth: ISO: Avoid circular locking dependency
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 241f51931c35085449502c10f64fb3ecd6e02171 ]
This attempts to avoid circular locking dependency between sock_lock and hdev_lock:
WARNING: possible circular locking dependency detected 6.0.0-rc7-03728-g18dd8ab0a783 #3 Not tainted
------------------------------------------------------
kworker/u3:2/53 is trying to acquire lock:ffff888000254130 (sk_lock-AF_BLUETOOTH-BTPROTO_ISO){+.+.}-{0:0}, at:iso_conn_del+0xbd/0x1d0
but task is already holding lock:ffffffff9f39a080 (hci_cb_list_lock){+.+.}-{3:3}, at:hci_le_cis_estabilished_evt+0x1b5/0x500
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (hci_cb_list_lock){+.+.}-{3:3}:
__mutex_lock+0x10e/0xfe0
hci_le_remote_feat_complete_evt+0x17f/0x320
hci_event_packet+0x39c/0x7d0
hci_rx_work+0x2bf/0x950
process_one_work+0x569/0x980
worker_thread+0x2a3/0x6f0
kthread+0x153/0x180
ret_from_fork+0x22/0x30
-> #1 (&hdev->lock){+.+.}-{3:3}:
__mutex_lock+0x10e/0xfe0
iso_connect_cis+0x6f/0x5a0
iso_sock_connect+0x1af/0x710
__sys_connect+0x17e/0x1b0
__x64_sys_connect+0x37/0x50
do_syscall_64+0x43/0x90
entry_SYSCALL_64_after_hwframe+0x62/0xcc
-> #0 (sk_lock-AF_BLUETOOTH-BTPROTO_ISO){+.+.}-{0:0}:
__lock_acquire+0x1b51/0x33d0
lock_acquire+0x16f/0x3b0
lock_sock_nested+0x32/0x80
iso_conn_del+0xbd/0x1d0
iso_connect_cfm+0x226/0x680
hci_le_cis_estabilished_evt+0x1ed/0x500
hci_event_packet+0x39c/0x7d0
hci_rx_work+0x2bf/0x950
process_one_work+0x569/0x980
worker_thread+0x2a3/0x6f0
kthread+0x153/0x180
ret_from_fork+0x22/0x30
other info that might help us debug this:
Chain exists of:
sk_lock-AF_BLUETOOTH-BTPROTO_ISO --> &hdev->lock --> hci_cb_list_lock
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(hci_cb_list_lock);
lock(&hdev->lock);
lock(hci_cb_list_lock);
lock(sk_lock-AF_BLUETOOTH-BTPROTO_ISO);
*** DEADLOCK ***
4 locks held by kworker/u3:2/53:
#0: ffff8880021d9130 ((wq_completion)hci0#2){+.+.}-{0:0}, at:
process_one_work+0x4ad/0x980
#1: ffff888002387de0 ((work_completion)(&hdev->rx_work)){+.+.}-{0:0},
at: process_one_work+0x4ad/0x980
#2: ffff888001ac0070 (&hdev->lock){+.+.}-{3:3}, at:
hci_le_cis_estabilished_evt+0xc3/0x500
#3: ffffffff9f39a080 (hci_cb_list_lock){+.+.}-{3:3}, at:
hci_le_cis_estabilished_evt+0x1b5/0x500Stable-dep-of: 6a5ad251b7cd ("Bluetooth: ISO: Fix possible circular locking dependency")
--- net/bluetooth/iso.c | 61 ++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 23 deletions(-)
net/bluetooth/iso.c +38 -23
@@ -261,13 +261,13 @@ static int iso_connect_bis(struct sock *sk)if (!bis_capable (hdev)) { err = -EOPNOTSUPP ; - goto done; + goto unlock; }/* Fail if out PHYs are marked as disabled */ if (!iso_pi (sk)->qos.out.phy) { err = -EINVAL ; - goto done; + goto unlock; } hcon = hci_connect_bis(hdev, &iso_pi(sk)->dst, iso_pi(sk)->dst_type,
@@ -275,22 +275,27 @@ static int iso_connect_bis(struct sock *sk) iso_pi(sk)->base);if (IS_ERR (hcon)) { err =PTR_ERR (hcon); - goto done; + goto unlock; } conn =iso_conn_add (hcon);if (!conn) {hci_conn_drop (hcon); err = -ENOMEM ; - goto done; + goto unlock; } +hci_dev_unlock (hdev); +hci_dev_put (hdev); + +lock_sock (sk); +/* Update source addr of the socket */ bacpy (&iso_pi (sk)->src, &hcon->src); err =iso_chan_add (conn, sk,NULL );if (err) - goto done; + goto release;if (hcon->state ==BT_CONNECTED ) {iso_sock_clear_timer (sk);
@@ -300,7 +305,11 @@ static int iso_connect_bis(struct sock *sk)iso_sock_set_timer (sk, sk->sk_sndtimeo); } -done: +release: +release_sock (sk); +return err; + +unlock:hci_dev_unlock (hdev);hci_dev_put (hdev);return err;
@@ -324,13 +333,13 @@ static int iso_connect_cis(struct sock *sk)if (!cis_central_capable (hdev)) { err = -EOPNOTSUPP ; - goto done; + goto unlock; }/* Fail if either PHYs are marked as disabled */ if (!iso_pi (sk)->qos.in.phy && !iso_pi (sk)->qos.out.phy) { err = -EINVAL ; - goto done; + goto unlock; }/* Just bind if DEFER_SETUP has been set */
@@ -340,7 +349,7 @@ static int iso_connect_cis(struct sock *sk) &iso_pi(sk)->qos);if (IS_ERR (hcon)) { err =PTR_ERR (hcon); - goto done; + goto unlock; } }else { hcon = hci_connect_cis(hdev, &iso_pi(sk)->dst,
@@ -348,7 +357,7 @@ static int iso_connect_cis(struct sock *sk) &iso_pi(sk)->qos);if (IS_ERR (hcon)) { err =PTR_ERR (hcon); - goto done; + goto unlock; } }
@@ -356,15 +365,20 @@ static int iso_connect_cis(struct sock *sk)if (!conn) {hci_conn_drop (hcon); err = -ENOMEM ; - goto done; + goto unlock; } +hci_dev_unlock (hdev); +hci_dev_put (hdev); + +lock_sock (sk); +/* Update source addr of the socket */ bacpy (&iso_pi (sk)->src, &hcon->src); err =iso_chan_add (conn, sk,NULL );if (err) - goto done; + goto release;if (hcon->state ==BT_CONNECTED ) {iso_sock_clear_timer (sk);
@@ -377,7 +391,11 @@ static int iso_connect_cis(struct sock *sk)iso_sock_set_timer (sk, sk->sk_sndtimeo); } -done: +release: +release_sock (sk); +return err; + +unlock:hci_dev_unlock (hdev);hci_dev_put (hdev);return err;
@@ -831,20 +849,23 @@ static int iso_sock_connect(struct socket *sock, struct sockaddr *addr,bacpy (&iso_pi (sk)->dst, &sa->iso_bdaddr);iso_pi (sk)->dst_type = sa->iso_bdaddr_type; +release_sock (sk); +if (bacmp (&iso_pi (sk)->dst,BDADDR_ANY )) err =iso_connect_cis (sk);else err =iso_connect_bis (sk);if (err) - goto done; +return err; + +lock_sock (sk);if (!test_bit (BT_SK_DEFER_SETUP , &bt_sk (sk)->flags)) { err =bt_sock_wait_state (sk,BT_CONNECTED ,sock_sndtimeo (sk, flags &O_NONBLOCK )); } -done:release_sock (sk);return err; }
@@ -1099,28 +1120,22 @@ static int iso_sock_recvmsg(struct socket *sock, struct msghdr *msg, {struct sock *sk = sock->sk;struct iso_pinfo *pi =iso_pi (sk); -int err;BT_DBG ("sk %p" , sk); -lock_sock (sk); -if (test_and_clear_bit (BT_SK_DEFER_SETUP , &bt_sk (sk)->flags)) {switch (sk->sk_state) {case BT_CONNECT2 : +lock_sock (sk);iso_conn_defer_accept (pi->conn->hcon); sk->sk_state =BT_CONFIG ;release_sock (sk);return 0 ;case BT_CONNECT : - err =iso_connect_cis (sk); -release_sock (sk); -return err; +return iso_connect_cis (sk); } } -release_sock (sk); -return bt_sock_recvmsg (sock, msg, len, flags); }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 134/313 net: dsa: microchip: ksz9477: port map correction in ALU table entry register
In reply to Greg Kroah-HartmanFrom: Rakesh Sankaranarayanan <[email protected]>
[ Upstream commit 6c977c5c2e4c5d8ad1b604724cc344e38f96fe9b ]
ALU table entry 2 register in KSZ9477 have bit positions reserved for forwarding port map. This field is referred in ksz9477_fdb_del() for clearing forward port map and alu table.
But current fdb_del refer ALU table entry 3 register for accessing forward port map. Update ksz9477_fdb_del() to get forward port map from correct alu table entry register.
With this bug, issue can be observed while deleting static MAC entries. Delete any specific MAC entry using "bridge fdb del" command. This should clear all the specified MAC entries. But it is observed that entries with self static alone are retained.
Tested on LAN9370 EVB since ksz9477_fdb_del() is used common across LAN937x and KSZ series.
--- drivers/net/dsa/microchip/ksz9477.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +2 -2
@@ -548,10 +548,10 @@ int ksz9477_fdb_del(struct ksz_device *dev, int port,ksz_read32 (dev,REG_SW_ALU_VAL_D , &alu_table[3 ]);/* clear forwarding port */ - alu_table[2 ] &= ~BIT (port); + alu_table[1 ] &= ~BIT (port);/* if there is no port to forward, clear table */ -if ((alu_table[2 ] &ALU_V_PORT_MAP ) ==0 ) { +if ((alu_table[1 ] &ALU_V_PORT_MAP ) ==0 ) { alu_table[0 ] =0 ; alu_table[1 ] =0 ; alu_table[2 ] =0 ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 143/313 ASoC: SOF: pm: Always tear down pipelines before DSP suspend
In reply to Greg Kroah-HartmanFrom: Ranjani Sridharan <[email protected]>
[ Upstream commit d185e0689abc98ef55fb7a7d75aa0c48a0ed5838 ]
When the DSP is suspended while the firmware is in the crashed state, we skip tearing down the pipelines. This means that the widget reference counts will not get to reset to 0 before suspend. This will lead to errors with resuming audio after system resume. To fix this, invoke the tear_down_all_pipelines op before skipping to DSP suspend.
--- sound/soc/sof/pm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/sof/pm.c +3 -3
@@ -192,6 +192,9 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)if (runtime_suspend && !sof_ops (sdev)->runtime_suspend)return 0 ; +if (tplg_ops && tplg_ops->tear_down_all_pipelines) + tplg_ops->tear_down_all_pipelines (sdev, false); +if (sdev->fw_state !=SOF_FW_BOOT_COMPLETE ) goto suspend;
@@ -216,9 +219,6 @@ static int sof_suspend(struct device *dev, bool runtime_suspend) goto suspend; } -if (tplg_ops->tear_down_all_pipelines) - tplg_ops->tear_down_all_pipelines (sdev, false); -/* suspend DMA trace */ sof_fw_trace_suspend (sdev, pm_state);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 144/313 ASoC: SOF: Add FW state to debugfs
In reply to Greg Kroah-HartmanFrom: Curtis Malainey <[email protected]>
[ Upstream commit 9a9134fd56f6ba614ff7b2b3b0bac0bf1d0dc0c9 ]
Allow system health detection mechanisms to check the FW state, this will allow them to check if the FW is in its "crashed" state going forward to help automatically diagnose driver state.
--- sound/soc/sof/debug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/sof/debug.c +3 -1
@@ -353,7 +353,9 @@ int snd_sof_dbg_init(struct snd_sof_dev *sdev)return err; } -return 0 ; +return snd_sof_debugfs_buf_item (sdev, &sdev->fw_state, +sizeof (sdev->fw_state), +"fw_state" ,0444 ); }EXPORT_SYMBOL_GPL (snd_sof_dbg_init);
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 145/313 ASoC: amd: yc: Add Razer Blade 14 2022 into DMI table
In reply to Greg Kroah-HartmanFrom: Wim Van Boven <[email protected]>
[ Upstream commit 68506a173dd700c2bd794dcc3489edcdb8ee35c6 ]
Razer Blade 14 (2022) - RZ09-0427 needs the quirk to enable the built in microphone
--- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/amd/yc/acp6x-mach.c +7 -0
@@ -220,6 +220,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 14 2022"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Razer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Blade 14 (2022) - RZ09-0427"), + } + }, {} };
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 146/313 spi: cadence: Fix busy cycles calculation
In reply to Greg Kroah-HartmanFrom: Witold Sadowski <[email protected]>
[ Upstream commit e8bb8f19e73a1e855e54788f8673b9b49e46b5cd ]
If xSPI is in x2/x4/x8 mode to calculate busy cycles, busy bits count must be divided by the number of lanes.
If opcommand is using 8 busy bits, but SPI is in x4 mode, there will be only 2 busy cycles.
--- drivers/spi/spi-cadence-xspi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/spi/spi-cadence-xspi.c +4 -1
@@ -177,7 +177,10 @@#define CDNS_XSPI_CMD_FLD_DSEQ_CMD_3 (op) ( \ FIELD_PREP(CDNS_XSPI_CMD_DSEQ_R3_DCNT_H, \ ((op)->data.nbytes >> 16) & 0xffff) | \ - FIELD_PREP(CDNS_XSPI_CMD_DSEQ_R3_NUM_OF_DUMMY, (op)->dummy.nbytes * 8)) + FIELD_PREP(CDNS_XSPI_CMD_DSEQ_R3_NUM_OF_DUMMY, \ + (op)->dummy.buswidth != 0 ? \ + (((op)->dummy.nbytes * 8) / (op)->dummy.buswidth) : \ + 0))#define CDNS_XSPI_CMD_FLD_DSEQ_CMD_4 (op, chipsel) ( \ FIELD_PREP(CDNS_XSPI_CMD_DSEQ_R4_BANK, chipsel) | \
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 147/313 cpufreq: CPPC: Add u64 casts to avoid overflowing
In reply to Greg Kroah-HartmanFrom: Pierre Gondois <[email protected]>
[ Upstream commit f5f94b9c8b805d87ff185caf9779c3a4d07819e3 ]
The fields of the _CPC object are unsigned 32-bits values. To avoid overflows while using _CPC's values, add 'u64' casts.
--- drivers/cpufreq/cppc_cpufreq.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/cpufreq/cppc_cpufreq.c +6 -5
@@ -487,7 +487,8 @@ static unsigned int get_perf_level_count(struct cpufreq_policy *policy) cpu_data = policy->driver_data; perf_caps = &cpu_data->perf_caps; max_cap =arch_scale_cpu_capacity (cpu); - min_cap =div_u64 (max_cap * perf_caps->lowest_perf, perf_caps->highest_perf); + min_cap =div_u64 ((u64 )max_cap * perf_caps->lowest_perf, + perf_caps->highest_perf);if ((min_cap ==0 ) || (max_cap < min_cap))return 0 ;return 1 + max_cap /CPPC_EM_CAP_STEP - min_cap /CPPC_EM_CAP_STEP ;
@@ -519,10 +520,10 @@ static int cppc_get_cpu_power(struct device *cpu_dev, cpu_data = policy->driver_data; perf_caps = &cpu_data->perf_caps; max_cap =arch_scale_cpu_capacity (cpu_dev->id); - min_cap =div_u64 (max_cap * perf_caps->lowest_perf, - perf_caps->highest_perf); - - perf_step =CPPC_EM_CAP_STEP * perf_caps->highest_perf / max_cap; + min_cap =div_u64 ((u64 )max_cap * perf_caps->lowest_perf, + perf_caps->highest_perf); + perf_step =div_u64 ((u64 )CPPC_EM_CAP_STEP * perf_caps->highest_perf, + max_cap); min_step = min_cap /CPPC_EM_CAP_STEP ; max_step = max_cap /CPPC_EM_CAP_STEP ;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 148/313 cpufreq: Add Tegra234 to cpufreq-dt-platdev blocklist
In reply to Greg Kroah-HartmanFrom: Sumit Gupta <[email protected]>
[ Upstream commit 01c5bb0cc2a39fbc56ff9a5ef28b79447f0c2351 ]
Tegra234 platform uses the tegra194-cpufreq driver, so add it to the blocklist in cpufreq-dt-platdev driver to avoid the cpufreq driver registration from there.
--- drivers/cpufreq/cpufreq-dt-platdev.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/cpufreq-dt-platdev.c +1 -0
@@ -135,6 +135,7 @@ static const struct of_device_id blocklist[] __initconst = { { .compatible = "nvidia,tegra30", }, { .compatible = "nvidia,tegra124", }, { .compatible = "nvidia,tegra210", }, + { .compatible = "nvidia,tegra234", }, { .compatible = "qcom,apq8096", }, { .compatible = "qcom,msm8996", },
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 149/313 ASoC: mediatek: mt8186: support rt5682s_max98360
In reply to Greg Kroah-HartmanFrom: tongjian <[email protected]>
[ Upstream commit 6e1dbf694d7cd1737ee14866e9e05016ccc9ac40 ]
Add support for using the rt5682s codec together with max98360a on MT8186-MT6366-RT1019-RT5682S machines.
--- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +21 -1
@@ -991,6 +991,21 @@ static struct snd_soc_card mt8186_mt6366_rt1019_rt5682s_soc_card = { .num_configs = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_codec_conf), }; +static struct snd_soc_card mt8186_mt6366_rt5682s_max98360_soc_card = { + .name ="mt8186_rt5682s_max98360" , + .owner =THIS_MODULE , + .dai_link = mt8186_mt6366_rt1019_rt5682s_dai_links, + .num_links =ARRAY_SIZE (mt8186_mt6366_rt1019_rt5682s_dai_links), + .controls = mt8186_mt6366_rt1019_rt5682s_controls, + .num_controls =ARRAY_SIZE (mt8186_mt6366_rt1019_rt5682s_controls), + .dapm_widgets = mt8186_mt6366_rt1019_rt5682s_widgets, + .num_dapm_widgets =ARRAY_SIZE (mt8186_mt6366_rt1019_rt5682s_widgets), + .dapm_routes = mt8186_mt6366_rt1019_rt5682s_routes, + .num_dapm_routes =ARRAY_SIZE (mt8186_mt6366_rt1019_rt5682s_routes), + .codec_conf = mt8186_mt6366_rt1019_rt5682s_codec_conf, + .num_configs =ARRAY_SIZE (mt8186_mt6366_rt1019_rt5682s_codec_conf), +}; +static int mt8186_mt6366_rt1019_rt5682s_dev_probe (struct platform_device *pdev) {struct snd_soc_card *card;
@@ -1132,9 +1147,14 @@ static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev)#if IS_ENABLED (CONFIG_OF )static const struct of_device_id mt8186_mt6366_rt1019_rt5682s_dt_match[] = { - { .compatible ="mediatek,mt8186-mt6366-rt1019-rt5682s-sound" , + { + .compatible ="mediatek,mt8186-mt6366-rt1019-rt5682s-sound" , .data = &mt8186_mt6366_rt1019_rt5682s_soc_card, }, + { + .compatible ="mediatek,mt8186-mt6366-rt5682s-max98360-sound" , + .data = &mt8186_mt6366_rt5682s_max98360_soc_card, + }, {} };#endif
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 150/313 ASoC: mediatek: mt8186: Add machine support for max98357a
In reply to Greg Kroah-HartmanFrom: Allen-KH Cheng <[email protected]>
[ Upstream commit 8a54f666db581bbf07494cca44a0124acbced581 ]
Add support for mt8186 with mt6366 and max98357a.
--- sound/soc/mediatek/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/mediatek/Kconfig +2 -1
@@ -182,9 +182,10 @@ config SND_SOC_MT8186_MT6366_DA7219_MAX98357 If unsure select "N". config SND_SOC_MT8186_MT6366_RT1019_RT5682S - tristate "ASoC Audio driver for MT8186 with RT1019 RT5682S codec" + tristate "ASoC Audio driver for MT8186 with RT1019 RT5682S MAX98357A/MAX98360 codec" depends on I2C && GPIOLIB depends on SND_SOC_MT8186 && MTK_PMIC_WRAP + select SND_SOC_MAX98357A select SND_SOC_MT6358 select SND_SOC_RT1015P select SND_SOC_RT5682S
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 151/313 ASoC: amd: yc: Add ASUS M5402RA into DMI table
In reply to Greg Kroah-HartmanFrom: Aniol Martí <[email protected]>
[ Upstream commit a0dd7fcab5cd221fa960f594c586e1f9f16c02c0 ]
ASUS VivoBook 13 OLED (M5402RA) needs this quirk to get the built-in microphone working properly.
--- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/amd/yc/acp6x-mach.c +7 -0
@@ -206,6 +206,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "UM5302TA"), } }, + { + .driver_data = &acp6x_card, + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "M5402RA"), + } + }, { .driver_data = &acp6x_card, .matches = {
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 152/313 ASoC: support machine driver with max98360
In reply to Greg Kroah-HartmanFrom: Mars Chen <[email protected]>
[ Upstream commit 810948f45d99c46b60852ef2a5a2777c12d6bb3e ]
--- sound/soc/mediatek/Kconfig | 1 + 1 file changed, 1 insertion(+)
sound/soc/mediatek/Kconfig +1 -0
@@ -187,6 +187,7 @@ config SND_SOC_MT8186_MT6366_RT1019_RT5682S depends on SND_SOC_MT8186 && MTK_PMIC_WRAP select SND_SOC_MAX98357A select SND_SOC_MT6358 + select SND_SOC_MAX98357A select SND_SOC_RT1015P select SND_SOC_RT5682S select SND_SOC_BT_SCO
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 135/313 thermal: Validate new state in cur_state_store()
In reply to Greg Kroah-HartmanFrom: Viresh Kumar <[email protected]>
[ Upstream commit c408b3d1d9bbc7de5fb0304fea424ef2539da616 ]
In cur_state_store(), the new state of the cooling device is received from user-space and is not validated by the thermal core but the same is left for the individual drivers to take care of. Apart from duplicating the code it leaves possibility for introducing bugs where a driver may not do it right.
Lets make the thermal core check the new state itself and store the max value in the cooling device structure.
Stable-dep-of: 6c54b7bc8a31 ("thermal: core: call put_device() only after device_register() fails")
--- drivers/thermal/gov_fair_share.c | 6 +----- drivers/thermal/thermal_core.c | 15 +++++++-------- drivers/thermal/thermal_sysfs.c | 11 +++++------ include/linux/thermal.h | 1 + 4 files changed, 14 insertions(+), 19 deletions(-)
drivers/thermal/gov_fair_share.c +1 -5
@@ -49,11 +49,7 @@ static int get_trip_level(struct thermal_zone_device *tz)static long get_target_state (struct thermal_zone_device *tz,struct thermal_cooling_device *cdev,int percentage,int level) { -unsigned long max_state; - - cdev->ops->get_max_state (cdev, &max_state); - -return (long )(percentage * level * max_state) / (100 * tz->num_trips); +return (long )(percentage * level * cdev->max_state) / (100 * tz->num_trips); }/**
drivers/thermal/thermal_core.c +7 -8
@@ -603,8 +603,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,struct thermal_instance *pos;struct thermal_zone_device *pos1;struct thermal_cooling_device *pos2; -unsigned long max_state; -int result, ret; +int result;if (trip >= tz->num_trips || trip <0 )return -EINVAL ;
@@ -621,15 +620,11 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,if (tz != pos1 || cdev != pos2)return -EINVAL ; - ret = cdev->ops->get_max_state (cdev, &max_state); -if (ret) -return ret; -/* lower default 0, upper default max_state */ lower = lower ==THERMAL_NO_LIMIT ?0 : lower; - upper = upper ==THERMAL_NO_LIMIT ? max_state : upper; + upper = upper ==THERMAL_NO_LIMIT ? cdev->max_state : upper; -if (lower > upper || upper > max_state) +if (lower > upper || upper > cdev->max_state)return -EINVAL ; dev =kzalloc (sizeof (*dev),GFP_KERNEL );
@@ -896,6 +891,10 @@ __thermal_cooling_device_register(struct device_node *np, cdev->updated = false; cdev->device.class = &thermal_class; cdev->devdata = devdata; + +if (cdev->ops->get_max_state (cdev, &cdev->max_state)) + goto out_kfree_type; +thermal_cooling_device_setup_sysfs (cdev); ret =dev_set_name (&cdev->device,"cooling_device%d" , cdev->id);if (ret) {
drivers/thermal/thermal_sysfs.c +5 -6
@@ -589,13 +589,8 @@ static ssize_t max_state_show(struct device *dev, struct device_attribute *attr, char *buf) {struct thermal_cooling_device *cdev =to_cooling_device (dev); -unsigned long state; -int ret; - ret = cdev->ops->get_max_state (cdev, &state); -if (ret) -return ret; -return sprintf (buf,"%ld\n" , state); +return sprintf (buf,"%ld\n" , cdev->max_state); } static ssize_t cur_state_show(struct device *dev, struct device_attribute *attr,
@@ -625,6 +620,10 @@ cur_state_store(struct device *dev, struct device_attribute *attr,if ((long )state <0 )return -EINVAL ; +/* Requested state should be less than max_state + 1 */ +if (state > cdev->max_state) +return -EINVAL ; +mutex_lock (&cdev->lock); result = cdev->ops->set_cur_state (cdev, state);
include/linux/thermal.h +1 -0
@@ -100,6 +100,7 @@ struct thermal_cooling_device_ops {struct thermal_cooling_device {int id;char *type; +unsigned long max_state;struct device device;struct device_node *np;void *devdata;
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 153/313 kcsan: test: dont put the expect array on the stack
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
[ Upstream commit 5b24ac2dfd3eb3e36f794af3aa7f2828b19035bd ]
Size of the 'expect' array in the __report_matches is 1536 bytes, which is exactly the default frame size warning limit of the xtensa architecture.
As a result allmodconfig xtensa kernel builds with the gcc that does not support the compiler plugins (which otherwise would push the said warning limit to 2K) fail with the following message:
kernel/kcsan/kcsan_test.c:257:1: error: the frame size of 1680 bytes
is larger than 1536 bytes
Fix it by dynamically allocating the 'expect' array.
--- kernel/kcsan/kcsan_test.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/kcsan/kcsan_test.c +6 -1
@@ -159,7 +159,7 @@ static bool __report_matches(const struct expect_report *r)const bool is_assert = (r->access[0 ].type | r->access[1 ].type) &KCSAN_ACCESS_ASSERT ;bool ret = false;unsigned long flags; - typeof(observed.lines) expect; +typeof (*observed.lines) *expect;const char *end;char *cur;int i;
@@ -168,6 +168,10 @@ static bool __report_matches(const struct expect_report *r)if (!report_available ())return false; + expect =kmalloc (sizeof (observed.lines),GFP_KERNEL ); +if (WARN_ON (!expect)) +return false; +/* Generate expected report contents. */ /* Title */
@@ -253,6 +257,7 @@ static bool __report_matches(const struct expect_report *r) strstr(observed.lines[2], expect[1]))); out:spin_unlock_irqrestore (&observed.lock, flags); +kfree (expect);return ret; }
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 154/313 cpufreq: Add SM6375 to cpufreq-dt-platdev blocklist
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit faf28e240dd118d9521c68aeb9388b9b8f02d9d0 ]
The Qualcomm SM6375 platform uses the qcom-cpufreq-hw driver, so add it to the cpufreq-dt-platdev driver's blocklist.
--- drivers/cpufreq/cpufreq-dt-platdev.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/cpufreq-dt-platdev.c +1 -0
@@ -149,6 +149,7 @@ static const struct of_device_id blocklist[] __initconst = { { .compatible = "qcom,sdm845", }, { .compatible = "qcom,sm6115", }, { .compatible = "qcom,sm6350", }, + { .compatible = "qcom,sm6375", }, { .compatible = "qcom,sm8150", }, { .compatible = "qcom,sm8250", }, { .compatible = "qcom,sm8350", },
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 155/313 ASoC: fsl_micfil: Correct the number of steps on SX controls
In reply to Greg Kroah-HartmanFrom: Chancel Liu <[email protected]>
[ Upstream commit cdfa92eb90f5770b26a79824ef213ebdbbd988b1 ]
The parameter "max" of SOC_SINGLE_SX_TLV() means the number of steps rather than maximum value. This patch corrects the minimum value to -8 and the number of steps to 15.
--- sound/soc/fsl/fsl_micfil.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
sound/soc/fsl/fsl_micfil.c +8 -8
@@ -154,21 +154,21 @@ static int micfil_quality_set(struct snd_kcontrol *kcontrol,static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = {SOC_SINGLE_SX_TLV ("CH0 Volume" ,REG_MICFIL_OUT_CTRL , -MICFIL_OUTGAIN_CHX_SHIFT (0 ),0xF ,0x7 , gain_tlv), +MICFIL_OUTGAIN_CHX_SHIFT (0 ),0x8 ,0xF , gain_tlv),SOC_SINGLE_SX_TLV ("CH1 Volume" ,REG_MICFIL_OUT_CTRL , -MICFIL_OUTGAIN_CHX_SHIFT (1 ),0xF ,0x7 , gain_tlv), +MICFIL_OUTGAIN_CHX_SHIFT (1 ),0x8 ,0xF , gain_tlv),SOC_SINGLE_SX_TLV ("CH2 Volume" ,REG_MICFIL_OUT_CTRL , -MICFIL_OUTGAIN_CHX_SHIFT (2 ),0xF ,0x7 , gain_tlv), +MICFIL_OUTGAIN_CHX_SHIFT (2 ),0x8 ,0xF , gain_tlv),SOC_SINGLE_SX_TLV ("CH3 Volume" ,REG_MICFIL_OUT_CTRL , -MICFIL_OUTGAIN_CHX_SHIFT (3 ),0xF ,0x7 , gain_tlv), +MICFIL_OUTGAIN_CHX_SHIFT (3 ),0x8 ,0xF , gain_tlv),SOC_SINGLE_SX_TLV ("CH4 Volume" ,REG_MICFIL_OUT_CTRL , -MICFIL_OUTGAIN_CHX_SHIFT (4 ),0xF ,0x7 , gain_tlv), +MICFIL_OUTGAIN_CHX_SHIFT (4 ),0x8 ,0xF , gain_tlv),SOC_SINGLE_SX_TLV ("CH5 Volume" ,REG_MICFIL_OUT_CTRL , -MICFIL_OUTGAIN_CHX_SHIFT (5 ),0xF ,0x7 , gain_tlv), +MICFIL_OUTGAIN_CHX_SHIFT (5 ),0x8 ,0xF , gain_tlv),SOC_SINGLE_SX_TLV ("CH6 Volume" ,REG_MICFIL_OUT_CTRL , -MICFIL_OUTGAIN_CHX_SHIFT (6 ),0xF ,0x7 , gain_tlv), +MICFIL_OUTGAIN_CHX_SHIFT (6 ),0x8 ,0xF , gain_tlv),SOC_SINGLE_SX_TLV ("CH7 Volume" ,REG_MICFIL_OUT_CTRL , -MICFIL_OUTGAIN_CHX_SHIFT (7 ),0xF ,0x7 , gain_tlv), +MICFIL_OUTGAIN_CHX_SHIFT (7 ),0x8 ,0xF , gain_tlv),SOC_ENUM_EXT ("MICFIL Quality Select" , fsl_micfil_quality_enum, micfil_quality_get, micfil_quality_set),
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 156/313 drm/msm/a6xx: Avoid gx gbit halt during rpm suspend
In reply to Greg Kroah-HartmanFrom: Akhil P Oommen <[email protected]>
[ Upstream commit f4a75b5933c998e60fd812a7680e0971eb1c7cee ]
As per the downstream driver, gx gbif halt is required only during recovery sequence. So lets avoid it during regular rpm suspend.
Patchwork: https://patchwork.freedesktop.org/patch/515279/
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 15 +++++++++------ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 7 +++++++ drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + 3 files changed, 17 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +9 -6
@@ -876,7 +876,8 @@ static void a6xx_gmu_rpmh_off(struct a6xx_gmu *gmu)#define GBIF_CLIENT_HALT_MASK BIT(0)#define GBIF_ARB_HALT_MASK BIT(1) -static void a6xx_bus_clear_pending_transactions (struct adreno_gpu *adreno_gpu) +static void a6xx_bus_clear_pending_transactions (struct adreno_gpu *adreno_gpu, +bool gx_off) {struct msm_gpu *gpu = &adreno_gpu->base;
@@ -889,9 +890,11 @@ static void a6xx_bus_clear_pending_transactions(struct adreno_gpu *adreno_gpu)return ; } -/* Halt the gx side of GBIF */ -gpu_write (gpu,REG_A6XX_RBBM_GBIF_HALT ,1 ); -spin_until (gpu_read (gpu,REG_A6XX_RBBM_GBIF_HALT_ACK ) &1 ); +if (gx_off) { +/* Halt the gx side of GBIF */ +gpu_write (gpu,REG_A6XX_RBBM_GBIF_HALT ,1 ); +spin_until (gpu_read (gpu,REG_A6XX_RBBM_GBIF_HALT_ACK ) &1 ); + }/* Halt new client requests on GBIF */ gpu_write (gpu,REG_A6XX_GBIF_HALT ,GBIF_CLIENT_HALT_MASK );
@@ -929,7 +932,7 @@ static void a6xx_gmu_force_off(struct a6xx_gmu *gmu)/* Halt the gmu cm3 core */ gmu_write (gmu,REG_A6XX_GMU_CM3_SYSRESET ,1 ); -a6xx_bus_clear_pending_transactions (adreno_gpu); +a6xx_bus_clear_pending_transactions (adreno_gpu, true);/* Reset GPU core blocks */ gpu_write (gpu,REG_A6XX_RBBM_SW_RESET_CMD ,1 );
@@ -1083,7 +1086,7 @@ static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu)return ; } -a6xx_bus_clear_pending_transactions (adreno_gpu); +a6xx_bus_clear_pending_transactions (adreno_gpu, a6xx_gpu->hung);/* tell the GMU we want to slumber */ ret =a6xx_gmu_notify_slumber (gmu);
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +7 -0
@@ -1277,6 +1277,12 @@ static void a6xx_recover(struct msm_gpu *gpu)if (hang_debug)a6xx_dump (gpu); +/* +* To handle recovery specific sequences during the rpm suspend we are +* about to trigger +*/ + a6xx_gpu->hung = true; +/* Halt SQE first */ gpu_write (gpu,REG_A6XX_CP_SQE_CNTL ,3 );
@@ -1319,6 +1325,7 @@ static void a6xx_recover(struct msm_gpu *gpu)mutex_unlock (&gpu->active_lock);msm_gpu_hw_init (gpu); + a6xx_gpu->hung = false; }static const char *a6xx_uche_fault_block (struct msm_gpu *gpu,u32 mid)
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +1 -0
@@ -32,6 +32,7 @@ struct a6xx_gpu {void *llc_slice;void *htw_llc_slice;bool have_mmu500; +bool hung; };#define to_a6xx_gpu (x) container_of(x, struct a6xx_gpu, base)
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 157/313 net: usb: cdc_ether: add support for Thales Cinterion PLS62-W modem
In reply to Greg Kroah-HartmanFrom: Hui Wang <[email protected]>
[ Upstream commit eea8ce81fbb544e3caad1a1c876ba1af467b3d3c ]
This modem has 7 interfaces, 5 of them are serial interfaces and are driven by cdc_acm, while 2 of them are wwan interfaces and are driven by cdc_ether:
If 0: Abstract (modem)
If 1: Abstract (modem)
If 2: Abstract (modem)
If 3: Abstract (modem)
If 4: Abstract (modem)
If 5: Ethernet Networking
If 6: Ethernet Networking
Without this change, the 2 network interfaces will be named to usb0 and usb1, our QA think the names are confusing and filed a bug on it.
After applying this change, the name will be wwan0 and wwan1, and they could work well with modem manager.
--- drivers/net/usb/cdc_ether.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/usb/cdc_ether.c +6 -0
@@ -1001,6 +1001,12 @@ static const struct usb_device_id products[] = { USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), .driver_info = (unsigned long)&wwan_info, +}, { +/* Cinterion PLS62-W modem by GEMALTO/THALES */ +USB_DEVICE_AND_INTERFACE_INFO (0x1e2d ,0x005b ,USB_CLASS_COMM , +USB_CDC_SUBCLASS_ETHERNET , + USB_CDC_PROTO_NONE), + .driver_info = (unsigned long )&wwan_info, }, {/* Cinterion PLS83/PLS63 modem by GEMALTO/THALES */ USB_DEVICE_AND_INTERFACE_INFO(0x1e2d, 0x0069, USB_CLASS_COMM,
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerPATCH 158/313 drm: Add orientation quirk for Lenovo ideapad D330-10IGL
In reply to Greg Kroah-HartmanFrom: Patrick Thompson <[email protected]>
[ Upstream commit 0688773f0710528e1ab302c3d6317e269f2e2e6e ]
Panel is 800x1280 but mounted on a detachable form factor sideways.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_panel_orientation_quirks.c +6 -0
@@ -304,6 +304,12 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad D330-10IGM"), }, .driver_data = (void *)&lcd1200x1920_rightside_up, + }, { /* Lenovo Ideapad D330-10IGL (HD) */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"LENOVO" ), + DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad D330-10IGL"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, }, { /* Lenovo Yoga Book X90F / X91F / X91L */ .matches = {/* Non exact match to match all versions */
Signature · 1 line
2.39.0