6.1.75-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainercover 6.1.75-rc1 review
This is the start of the stable review cycle for the 6.1.75 release. There are 417 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, 24 Jan 2024 23:56:49 +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.75-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.75-rc1
Alexandre Ghiti <[email protected]>
riscv: Fix wrong usage of lm_alias() when splitting a huge linear mapping
Matthew Wilcox (Oracle) <[email protected]>
block: Remove special-casing of compound pages
Marek Szyprowski <[email protected]>
i2c: s3c24xx: fix transferring more than one message in polling mode
Marek Szyprowski <[email protected]>
i2c: s3c24xx: fix read transfers in polling mode
Nikita Zhandarovich <[email protected]>
ipv6: mcast: fix data-race in ipv6_mc_down / mld_ifc_work
Amit Cohen <[email protected]>
selftests: mlxsw: qos_pfc: Adjust the test to support 8 lanes
Amit Cohen <[email protected]>
mlxsw: spectrum_acl_erp: Fix error flow of pool allocation failure
Christoph Hellwig <[email protected]>
loop: fix the the direct I/O support check when used on top of block devices
Ludvig Pärsson <[email protected]>
ethtool: netlink: Add missing ethnl_ops_begin/complete
Christophe JAILLET <[email protected]>
kdb: Fix a potential buffer overflow in kdb_local()
Fedor Pchelkin <[email protected]>
ipvs: avoid stat macros calls from preemptible context
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject NFT_SET_CONCAT with not field length description
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: skip dead set elements in netlink dump
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: do not allow mismatch field size and set key length
Pavel Tikhomirov <[email protected]>
netfilter: bridge: replace physindev with physinif in nf_bridge_info
Pavel Tikhomirov <[email protected]>
netfilter: propagate net to nf_bridge_get_physindev
Pavel Tikhomirov <[email protected]>
netfilter: nf_queue: remove excess nf_bridge variable
Pavel Tikhomirov <[email protected]>
netfilter: nfnetlink_log: use proper helper for fetching physinif
Pablo Neira Ayuso <[email protected]>
netfilter: nft_limit: do not ignore unsupported flags
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject invalid set policy
Paolo Abeni <[email protected]>
mptcp: relax check on MPC passive fallback
Hengqi Chen <[email protected]>
LoongArch: BPF: Prevent out-of-bounds memory access
Kunwu Chan <[email protected]>
net: dsa: vsc73xx: Add null pointer check to vsc73xx_gpio_probe
Hao Sun <[email protected]>
bpf: Reject variable offset alu on PTR_TO_FLOW_KEYS
Qiang Ma <[email protected]>
net: stmmac: ethtool: Fixed calltrace caused by unbalanced disable_irq_wake calls
Dafna Hirschfeld <[email protected]>
drm/amdkfd: fixes for HMM mem allocation
Deepak R Varma <[email protected]>
drm/amdkfd: Use resource_size() helper function
Michal Simek <[email protected]>
dt-bindings: gpio: xilinx: Fix node address in gpio
Nikita Yushchenko <[email protected]>
net: ravb: Fix dma_addr_t truncation in error case
Eric Dumazet <[email protected]>
udp: annotate data-races around up->pending
Jens Axboe <[email protected]>
block: ensure we hold a queue reference when using queue limits
Eric Dumazet <[email protected]>
mptcp: refine opt_mp_capable determination
Eric Dumazet <[email protected]>
mptcp: use OPTION_MPTCP_MPJ_SYN in subflow_check_req()
Eric Dumazet <[email protected]>
mptcp: use OPTION_MPTCP_MPJ_SYNACK in subflow_finish_connect()
Eric Dumazet <[email protected]>
mptcp: strict validation before using mp_opt->hmac
Eric Dumazet <[email protected]>
mptcp: mptcp_parse_option() fix for MPTCPOPT_MP_JOIN
Claudiu Beznea <[email protected]>
net: phy: micrel: populate .soft_reset for KSZ9131
Taehee Yoo <[email protected]>
amt: do not use overwrapped cb area
Sanjuán García, Jorge <[email protected]>
net: ethernet: ti: am65-cpsw: Fix max mtu to fit ethernet frames
Lin Ma <[email protected]>
net: qualcomm: rmnet: fix global oob in rmnet_policy
Niklas Schnelle <[email protected]>
s390/pci: fix max size calculation in zpci_memcpy_toio()
AngeloGioacchino Del Regno <[email protected]>
ASoC: mediatek: sof-common: Add NULL check for normal_link string
Jianjun Wang <[email protected]>
PCI: mediatek-gen3: Fix translation window size calculation
Siddharth Vadapalli <[email protected]>
PCI: keystone: Fix race condition when initializing PHYs
Maurizio Lombardi <[email protected]>
nvmet-tcp: Fix the H2C expected PDU len calculation
Arnd Bergmann <[email protected]>
nvme: trace: avoid memcpy overflow warning
Arnd Bergmann <[email protected]>
nvmet: re-fix tracing strncpy() warning
Christoph Niedermaier <[email protected]>
serial: imx: Correct clock error message in function probe()
Chunfeng Yun <[email protected]>
usb: xhci-mtk: fix a short packet issue of gen1 isoc-in transfer
Fedor Pchelkin <[email protected]>
apparmor: avoid crash when parsed profile name is empty
Jim Harris <[email protected]>
cxl/region: fix x9 interleave typo
Ian Rogers <[email protected]>
perf env: Avoid recursively taking env->bpf_progs.lock
Maurizio Lombardi <[email protected]>
nvmet-tcp: fix a crash in nvmet_req_complete()
Maurizio Lombardi <[email protected]>
nvmet-tcp: Fix a kernel panic when host sends an invalid H2C PDU length
Christophe JAILLET <[email protected]>
vdpa: Fix an error handling path in eni_vdpa_probe()
Nícolas F. R. A. Prado <[email protected]>
spmi: mtk-pmif: Serialize PMIF status check and command submission
Douglas Anderson <[email protected]>
usb: core: Fix crash w/ usb_choose_configuration() if no driver
Oliver Neukum <[email protected]>
usb: cdc-acm: return correct error code on unsupported break
Jiri Slaby (SUSE) <[email protected]>
tty: use 'if' in send_break() instead of 'goto'
Jiri Slaby (SUSE) <[email protected]>
tty: don't check for signal_pending() in send_break()
Jiri Slaby (SUSE) <[email protected]>
tty: early return from send_break() on TTY_DRIVER_HARDWARE_BREAK
Jiri Slaby (SUSE) <[email protected]>
tty: change tty_write_lock()'s ndelay parameter to bool
Namhyung Kim <[email protected]>
perf genelf: Set ELF program header addresses properly
Yicong Yang <[email protected]>
perf hisi-ptt: Fix one memory leakage in hisi_ptt_process_auxtrace_event()
Yicong Yang <[email protected]>
perf header: Fix one memory leakage in perf_event__fprintf_event_update()
Nuno Sa <[email protected]>
iio: adc: ad9467: fix scale setting
Nuno Sa <[email protected]>
iio: adc: ad9467: don't ignore error codes
Nuno Sa <[email protected]>
iio: adc: ad9467: fix reset gpio handling
Zhao Mengmeng <[email protected]>
selftests/sgx: Skip non X86_64 platform
Jo Van Bulck <[email protected]>
selftests/sgx: Include memory clobber for inline asm in test enclave
Jo Van Bulck <[email protected]>
selftests/sgx: Fix uninitialized pointer dereferences in encl_get_entry
Jo Van Bulck <[email protected]>
selftests/sgx: Fix uninitialized pointer dereference in error path
Paul Geurts <[email protected]>
serial: imx: fix tx statemachine deadlock
Sakari Ailus <[email protected]>
software node: Let args be NULL in software_node_get_reference_args
Sakari Ailus <[email protected]>
acpi: property: Let args be NULL in __acpi_node_get_property_reference
Gregory Price <[email protected]>
base/node.c: initialize the accessor list before registering
Douglas Anderson <[email protected]>
r8152: Choose our USB config with choose_configuration() rather than probe()
Douglas Anderson <[email protected]>
usb: core: Allow subclassed USB drivers to override usb_choose_configuration()
Arnaldo Carvalho de Melo <[email protected]>
libapi: Add missing linux/types.h header to get the __u64 type on io.h
Uwe Kleine-König <[email protected]>
serial: 8250: omap: Don't skip resource freeing if pm_runtime_resume_and_get() failed
Su Hui <[email protected]>
power: supply: bq256xx: fix some problem in bq256xx_hw_init
Jan Palus <[email protected]>
power: supply: cw2015: correct time_to_empty units in sysfs
Christophe JAILLET <[email protected]>
MIPS: Alchemy: Fix an out-of-bound access in db1550_dev_setup()
Christophe JAILLET <[email protected]>
MIPS: Alchemy: Fix an out-of-bound access in db1200_dev_setup()
Frederik Haxel <[email protected]>
riscv: Fixed wrong register in XIP_FIXUP_FLASH_OFFSET macro
Alexandre Ghiti <[email protected]>
riscv: Fix set_direct_map_default_noflush() to reset _PAGE_EXEC
Alexandre Ghiti <[email protected]>
riscv: Fix set_memory_XX() and set_direct_map_XX() by splitting huge linear mappings
Alexandre Ghiti <[email protected]>
riscv: Fix module_alloc() that did not reset the linear mapping permissions
Alexandre Ghiti <[email protected]>
riscv: Check if the code to patch lies in the exit section
Serge Semin <[email protected]>
mips: Fix incorrect max_low_pfn adjustment
Serge Semin <[email protected]>
mips: dmi: Fix early remap on MIPS32
Andy Shevchenko <[email protected]>
mfd: intel-lpss: Fix the fractional clock divider flags
Dang Huynh <[email protected]>
leds: aw2013: Select missing dependency REGMAP_I2C
Kunwu Chan <[email protected]>
mfd: syscon: Fix null pointer dereference in of_syscon_register()
Randy Dunlap <[email protected]>
ARM: 9330/1: davinci: also select PINCTRL
Hugo Villeneuve <[email protected]>
serial: sc16is7xx: set safe default SPI clock frequency
Hugo Villeneuve <[email protected]>
serial: sc16is7xx: add check for unsupported SPI modes during probe
Jason Gerecke <[email protected]>
HID: wacom: Correct behavior when processing some confidence == false touches
Marcelo Schmitt <[email protected]>
iio: adc: ad7091r: Pass iio_dev to event handler
Oliver Upton <[email protected]>
KVM: arm64: vgic-its: Avoid potential UAF in LPI translation cache
Marc Zyngier <[email protected]>
KVM: arm64: vgic-v4: Restore pending state on host userspace write
Kirill A. Shutemov <[email protected]>
x86/kvm: Do not try to disable kvmclock if it was not enabled
qizhong cheng <[email protected]>
PCI: mediatek: Clear interrupt status before dispatching handler
Niklas Cassel <[email protected]>
PCI: dwc: endpoint: Fix dw_pcie_ep_raise_msix_irq() alignment support
Tadeusz Struk <[email protected]>
PCI/P2PDMA: Remove reference to pci_p2pdma_map_sg()
Huang Ying <[email protected]>
cxl/port: Fix decoder initialization when nr_targets > interleave_ways
Nicolas Dichtel <[email protected]>
Revert "net: rtnetlink: Enslave device before bringing it up"
David Lin <[email protected]>
wifi: mwifiex: configure BSSID consistently when starting AP
Ilpo Järvinen <[email protected]>
wifi: rtlwifi: Convert LNKCTL change to PCIe cap RMW accessors
Ilpo Järvinen <[email protected]>
wifi: rtlwifi: Remove bogus and dangerous ASPM disable/enable code
Christian Marangi <[email protected]>
wifi: mt76: fix broken precal loading from MTD for mt7915
Isaac J. Manjarres <[email protected]>
iommu/dma: Trace bounce buffer usage when mapping buffers
Rob Clark <[email protected]>
iommu/arm-smmu-qcom: Add missing GMU entry to match table
Xi Ruoyao <[email protected]>
LoongArch: Fix and simplify fcsr initialization on execve()
Jiri Olsa <[email protected]>
bpf: Fix re-attachment branch in bpf_tracing_prog_attach
Gui-Dong Han <[email protected]>
Bluetooth: Fix atomicity violation in {min,max}_key_size_set
Stefan Berger <[email protected]>
rootfs: Fix support for rootfstype= when root= is given
Bart Van Assche <[email protected]>
md/raid1: Use blk_opf_t for read and write operations
Uwe Kleine-König <[email protected]>
pwm: Fix out-of-bounds access in of_pwm_single_xlate()
Uwe Kleine-König <[email protected]>
pwm: jz4740: Don't use dev_err_probe() in .request()
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: check if catch-all set element is active in next generation
Matthew Wilcox (Oracle) <[email protected]>
block: Fix iterating over an empty bio with bio_for_each_folio_all
Min Li <[email protected]>
block: add check that partition length needs to be aligned with block size
Mario Limonciello <[email protected]>
drm/amd: Enable PCIe PME from D3
Junxiao Bi <[email protected]>
md: bypass block throttle for superblock update
Chandrakanth patil <[email protected]>
scsi: mpi3mr: Block PEL Enable Command on Controller Reset and Unrecoverable State
Chandrakanth patil <[email protected]>
scsi: mpi3mr: Refresh sdev queue depth after controller reset
Amir Goldstein <[email protected]>
scsi: target: core: add missing file_{start,end}_write()
Bart Van Assche <[email protected]>
scsi: ufs: core: Simplify power management during async scan
Nam Cao <[email protected]>
fbdev: flush deferred IO before closing
Nam Cao <[email protected]>
fbdev: flush deferred work in fb_deferred_io_fsync()
Jens Axboe <[email protected]>
io_uring/rw: ensure io->bytes_done is always initialized
Namjae Jeon <[email protected]>
ksmbd: only v2 leases handle the directory
Namjae Jeon <[email protected]>
ksmbd: fix UAF issue in ksmbd_tcp_new_connection()
Namjae Jeon <[email protected]>
ksmbd: validate mech token in session setup
Bin Li <[email protected]>
ALSA: hda/realtek: Enable headset mic on Lenovo M70 Gen5
Yo-Jung Lin <[email protected]>
ALSA: hda/realtek: Enable mute/micmute LEDs and limit mic boost on HP ZBook
Çağhan Demir <[email protected]>
ALSA: hda/relatek: Enable Mute LED on HP Laptop 15s-fq2xxx
Takashi Iwai <[email protected]>
ALSA: oxygen: Fix right channel of capture volume mixer
Zack Rusin <[email protected]>
drm/vmwgfx: Keep a gem reference to user bos in surfaces
Zack Rusin <[email protected]>
drm/vmwgfx: Fix possible invalid drm gem put calls
Lino Sanfilippo <[email protected]>
serial: omap: do not override settings for RS485 support
Lino Sanfilippo <[email protected]>
serial: 8250_exar: Set missing rs485_supported flag
Christoph Niedermaier <[email protected]>
serial: imx: Ensure that imx_uart_rs485_config() is called with enabled clock
Lino Sanfilippo <[email protected]>
serial: core, imx: do not set RS485 enabled if it is not supported
Stefan Wahren <[email protected]>
serial: 8250_bcm2835aux: Restore clock error handling
Lino Sanfilippo <[email protected]>
serial: core: make sure RS485 cannot be enabled when it is not supported
Lino Sanfilippo <[email protected]>
serial: core: fix sanitizing check for RTS settings
Gui-Dong Han <[email protected]>
usb: mon: Fix atomicity violation in mon_bin_vma_fault
RD Babiera <[email protected]>
usb: typec: class: fix typec_altmode_put_partner to put plugs
Heikki Krogerus <[email protected]>
Revert "usb: typec: class: fix typec_altmode_put_partner to put plugs"
Frank Li <[email protected]>
usb: cdns3: Fix uvc fail when DMA cross 4k boundery since sg enabled
Frank Li <[email protected]>
usb: cdns3: fix iso transfer error when mult is not zero
Frank Li <[email protected]>
usb: cdns3: fix uvc failure work since sg support enabled
Xu Yang <[email protected]>
usb: chipidea: wait controller resume finished for wakeup irq
Thinh Nguyen <[email protected]>
Revert "usb: dwc3: don't reset device side if dwc3 was configured as host-only"
Thinh Nguyen <[email protected]>
Revert "usb: dwc3: Soft reset phy on probe for host"
Uttkarsh Aggarwal <[email protected]>
usb: dwc: ep0: Update request status in dwc3_ep0_stall_restart
Xu Yang <[email protected]>
usb: phy: mxs: remove CONFIG_USB_OTG condition for mxs_phy_is_otg_host()
Heiko Carstens <[email protected]>
tick-sched: Fix idle and iowait sleeptime accounting vs CPU hotplug
Michael Ellerman <[email protected]>
powerpc/64s: Increase default stack size to 32KB
Tony Lindgren <[email protected]>
clocksource/drivers/timer-ti-dm: Fix make W=n kerneldoc warnings
Carlos Llamas <[email protected]>
binder: fix race between mmput() and do_exit()
Jan Beulich <[email protected]>
xen-netback: don't produce zero-size SKB frags
Hans de Goede <[email protected]>
Input: atkbd - use ab83 as id when skipping the getid command
Stefan Wiehler <[email protected]>
mips/smp: Call rcutree_report_cpu_starting() earlier
Carlos Llamas <[email protected]>
binder: fix unused alloc->free_async_space
Carlos Llamas <[email protected]>
binder: fix async space check for 0-sized buffers
David Howells <[email protected]>
keys, dns: Fix size check of V1 server-list header
Jordan Rome <[email protected]>
selftests/bpf: Add assert for user stacks in test_task_stack
Geert Uytterhoeven <[email protected]>
of: unittest: Fix of_count_phandle_with_args() expected value message
Dario Binacchi <[email protected]>
fbdev: imxfb: fix left margin setting
Christian A. Ehrhardt <[email protected]>
of: Fix double free in of_parse_phandle_with_args_map
Li Nan <[email protected]>
ksmbd: validate the zero field of packet header
Mirsad Todorovac <[email protected]>
kselftest/alsa - mixer-test: Fix the print format specifier warning
Mirsad Todorovac <[email protected]>
kselftest/alsa - mixer-test: fix the number of parameters to ksft_exit_fail_msg()
Zhipeng Lu <[email protected]>
drm/amd/pm/smu7: fix a memleak in smu7_hwmgr_backend_init
Srinivasan Shanmugam <[email protected]>
drm/amdkfd: Confirm list is non-empty before utilizing list_first_entry in kfd_topology.c
Sergey Gorenko <[email protected]>
IB/iser: Prevent invalidating wrong MR
Peter Robinson <[email protected]>
mmc: sdhci_omap: Fix TI SoC dependencies
Peter Robinson <[email protected]>
mmc: sdhci_am654: Fix TI SoC dependencies
Geoffrey D. Bennett <[email protected]>
ALSA: scarlett2: Add clamp() in scarlett2_mixer_ctl_put()
Geoffrey D. Bennett <[email protected]>
ALSA: scarlett2: Add missing error checks to *_ctl_get()
Geoffrey D. Bennett <[email protected]>
ALSA: scarlett2: Allow passing any output to line_out_remap()
Geoffrey D. Bennett <[email protected]>
ALSA: scarlett2: Add missing error check to scarlett2_usb_set_config()
Geoffrey D. Bennett <[email protected]>
ALSA: scarlett2: Add missing error check to scarlett2_config_save()
Hans de Goede <[email protected]>
ASoC: rt5645: Drop double EF20 entry from dmi_platform_data[]
Philipp Zabel <[email protected]>
pwm: stm32: Fix enable count for clk in .probe()
Philipp Zabel <[email protected]>
pwm: stm32: Use hweight32 in stm32_pwm_detect_channels
Uwe Kleine-König <[email protected]>
pwm: stm32: Use regmap_clear_bits and regmap_set_bits where applicable
Théo Lebrun <[email protected]>
clk: fixed-rate: fix clk_hw_register_fixed_rate_with_accuracy_parent_hw
Xingyuan Mo <[email protected]>
accel/habanalabs: fix information leak in sec_attest_info()
Nícolas F. R. A. Prado <[email protected]>
drm/mediatek: dp: Add phy_mtk_dp module as pre-dependency
Su Hui <[email protected]>
clk: si5341: fix an error code problem in si5341_output_clk_set_rate
Vignesh Raghavendra <[email protected]>
watchdog: rti_wdt: Drop runtime pm reference count when watchdog is unused
Stefan Wahren <[email protected]>
watchdog: bcm2835_wdt: Fix WDIOC_SETTIMEOUT handling
Jerry Hoemann <[email protected]>
watchdog/hpwdt: Only claim UNKNOWN NMI if from iLO
Curtis Klein <[email protected]>
watchdog: set cdev owner before adding
Jay Buddhabhatti <[email protected]>
drivers: clk: zynqmp: update divider round rate logic
Jay Buddhabhatti <[email protected]>
drivers: clk: zynqmp: calculate closest mux rate
Satya Priya Kakitapalli <[email protected]>
clk: qcom: videocc-sm8150: Add missing PLL config property
Satya Priya Kakitapalli <[email protected]>
clk: qcom: videocc-sm8150: Update the videocc resets
Satya Priya Kakitapalli <[email protected]>
dt-bindings: clock: Update the videocc resets for sm8150
Zhiguo Niu <[email protected]>
f2fs: fix to check return value of f2fs_recover_xattr_data
Zhipeng Lu <[email protected]>
drm/amd/pm: fix a double-free in amdgpu_parse_extended_power_table
Zhipeng Lu <[email protected]>
gpu/drm/radeon: fix two memleaks in radeon_vm_init
Zhipeng Lu <[email protected]>
drivers/amd/pm: fix a use-after-free in kv_parse_power_table
Zhipeng Lu <[email protected]>
drm/amd/pm: fix a double-free in si_dpm_init
Alex Deucher <[email protected]>
drm/amdgpu/debugfs: fix error code when smc register accessors are NULL
Hsiao Chien Sung <[email protected]>
drm/mediatek: Fix underrun in VDO1 when switches off the layer
Hsiao Chien Sung <[email protected]>
drm/mediatek: Return error if MDP RDMA failed to enable the clock
Jessica Zhang <[email protected]>
drm/msm/dpu: Drop enable and frame_count parameters from dpu_hw_setup_misr()
Jessica Zhang <[email protected]>
drm/msm/dpu: Set input_sel bit for INTF
Claudiu Beznea <[email protected]>
clk: renesas: rzg2l: Check reset monitor registers
Claudiu Beznea <[email protected]>
clk: renesas: rzg2l-cpg: Reuse code in rzg2l_cpg_reset()
Christophe JAILLET <[email protected]>
media: dvb-frontends: m88ds3103: Fix a memory leak in an error handling path of m88ds3103_probe()
Dan Carpenter <[email protected]>
media: dvbdev: drop refcount on error path in dvb_device_open()
Chao Yu <[email protected]>
f2fs: fix to update iostat correctly in f2fs_filemap_fault()
Chao Yu <[email protected]>
f2fs: fix to check compress file in f2fs_move_file_range()
Chao Yu <[email protected]>
f2fs: fix to wait on block writeback for post_read case
Chris Morgan <[email protected]>
drm/panel: st7701: Fix AVCL calculation
Tomi Valkeinen <[email protected]>
media: rkisp1: Fix media device memory leak
Mehdi Djait <[email protected]>
media: dt-bindings: media: rkisp1: Fix the port description for the parallel interface
Tomi Valkeinen <[email protected]>
media: imx-mipi-csis: Fix clock handling in remove()
Satya Priya Kakitapalli <[email protected]>
clk: qcom: gpucc-sm8150: Update the gpu_cc_pll1 config
Chengchang Tang <[email protected]>
RDMA/hns: Fix memory leak in free_mr_init()
Zhipeng Lu <[email protected]>
media: cx231xx: fix a memleak in cx231xx_init_isoc
Tomi Valkeinen <[email protected]>
drm/bridge: tc358767: Fix return value on error case
Tomi Valkeinen <[email protected]>
drm/bridge: cdns-mhdp8546: Fix use of uninitialized variable
Zhipeng Lu <[email protected]>
drm/radeon/trinity_dpm: fix a memleak in trinity_parse_power_table
Zhipeng Lu <[email protected]>
drm/radeon/dpm: fix a memleak in sumo_parse_power_table
Yang Yingliang <[email protected]>
drm/radeon: check the alloc_workqueue return value in radeon_crtc_init()
AngeloGioacchino Del Regno <[email protected]>
drm/panfrost: Ignore core_mask for poweroff and disable PWRTRANS irq
Brent Lu <[email protected]>
ASoC: Intel: glk_rt5682_max98357a: fix board id mismatch
Dmitry Baryshkov <[email protected]>
drm/drv: propagate errors from drm_modeset_register_all()
Konrad Dybcio <[email protected]>
drm/msm/dsi: Use pm_runtime_resume_and_get to prevent refcnt leaks
Dmitry Baryshkov <[email protected]>
drm/msm/mdp4: flush vblank event on disable
Linus Walleij <[email protected]>
ASoC: cs35l34: Fix GPIO name and drop legacy include
Linus Walleij <[email protected]>
ASoC: cs35l33: Fix GPIO name and drop legacy include
Tomi Valkeinen <[email protected]>
drm/tidss: Fix dss reset
Tomi Valkeinen <[email protected]>
drm/tidss: Check for K2G in in dispc_softreset()
Tomi Valkeinen <[email protected]>
drm/tidss: Return error value from from softreset
Tomi Valkeinen <[email protected]>
drm/tidss: Move reset to the end of dispc_init()
Nikita Zhandarovich <[email protected]>
drm/radeon: check return value of radeon_ring_lock()
Nikita Zhandarovich <[email protected]>
drm/radeon/r100: Fix integer overflow issues in r100_cs_track_check()
Nikita Zhandarovich <[email protected]>
drm/radeon/r600_cs: Fix possible int overflows in r600_cs_check_reg()
Chao Yu <[email protected]>
f2fs: fix to avoid dirent corruption
Dario Binacchi <[email protected]>
drm/bridge: Fix typo in post_disable() description
Paul Kocialkowski <[email protected]>
media: rkvdec: Hook the (TRY_)DECODER_CMD stateless ioctls
Paul Kocialkowski <[email protected]>
media: verisilicon: Hook the (TRY_)DECODER_CMD stateless ioctls
Zheng Wang <[email protected]>
media: mtk-jpeg: Remove cancel worker in mtk_jpeg_remove to avoid the crash of multi-core JPEG devices
kyrie wu <[email protected]>
media: mtk-jpegdec: export jpeg decoder functions
Ricardo B. Marliere <[email protected]>
media: pvrusb2: fix use after free on context disconnection
Tomi Valkeinen <[email protected]>
drm/tilcdc: Fix irq free on unload
Uwe Kleine-König <[email protected]>
drm/bridge: tpd12s015: Drop buggy __exit annotation for remove function
Abhinav Singh <[email protected]>
drm/nouveau/fence:: fix warning directly dereferencing a rcu pointer
Chris Morgan <[email protected]>
drm/panel-elida-kd35t133: hold panel in reset for unprepare
Junxian Huang <[email protected]>
RDMA/hns: Fix inappropriate err code for unsupported operations
Leon Romanovsky <[email protected]>
RDMA/usnic: Silence uninitialized symbol smatch warnings
AngeloGioacchino Del Regno <[email protected]>
drm/panfrost: Really power off GPU cores in panfrost_gpu_power_off()
Tomi Valkeinen <[email protected]>
Revert "drm/omapdrm: Annotate dma-fence critical section in commit path"
Tomi Valkeinen <[email protected]>
Revert "drm/tidss: Annotate dma-fence critical section in commit path"
Arnd Bergmann <[email protected]>
ARM: davinci: always select CONFIG_CPU_ARM926T
Eric Dumazet <[email protected]>
ip6_tunnel: fix NEXTHDR_FRAGMENT handling in ip6_tnl_parse_tlv_enc_lim()
Asmaa Mnebhi <[email protected]>
mlxbf_gige: Enable the GigE port in mlxbf_gige_open
Asmaa Mnebhi <[email protected]>
mlxbf_gige: Fix intermittent no ip issue
Tao Liu <[email protected]>
net/sched: act_ct: fix skb leak and crash on ooo frags
Eric Dumazet <[email protected]>
sctp: fix busy polling
Eric Dumazet <[email protected]>
sctp: support MSG_ERRQUEUE flag in recvmsg()
John Fastabend <[email protected]>
bpf: sockmap, fix proto update hook to avoid dup calls
Christoph Hellwig <[email protected]>
null_blk: don't cap max_hw_sectors to BLK_DEF_MAX_SECTORS
Keith Busch <[email protected]>
block: make BLK_DEF_MAX_SECTORS unsigned
Francesco Dolcini <[email protected]>
Bluetooth: btmtkuart: fix recv_buf() return value
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix bogus check for re-auth no supported with non-ssp
Florian Westphal <[email protected]>
netfilter: nf_tables: mark newset as dead on transaction abort
Johannes Berg <[email protected]>
wifi: iwlwifi: mvm: send TX path flush in rfkill
Johannes Berg <[email protected]>
wifi: iwlwifi: mvm: set siso/mimo chains to 1 in FW SMPS request
Su Hui <[email protected]>
wifi: rtlwifi: rtl8192se: using calculate_bit_shift()
Su Hui <[email protected]>
wifi: rtlwifi: rtl8192ee: using calculate_bit_shift()
Su Hui <[email protected]>
wifi: rtlwifi: rtl8192de: using calculate_bit_shift()
Su Hui <[email protected]>
wifi: rtlwifi: rtl8192ce: using calculate_bit_shift()
Su Hui <[email protected]>
wifi: rtlwifi: rtl8192cu: using calculate_bit_shift()
Su Hui <[email protected]>
wifi: rtlwifi: rtl8192c: using calculate_bit_shift()
Su Hui <[email protected]>
wifi: rtlwifi: rtl8188ee: phy: using calculate_bit_shift()
Su Hui <[email protected]>
wifi: rtlwifi: add calculate_bit_shift()
Konrad Dybcio <[email protected]>
arm64: dts: qcom: ipq6018: Fix up indentation
Konrad Dybcio <[email protected]>
arm64: dts: qcom: ipq6018: Pad addresses to 8 hex digits
Konrad Dybcio <[email protected]>
arm64: dts: qcom: ipq6018: Use lowercase hex
Christian Marangi <[email protected]>
arm64: dts: qcom: ipq6018: improve pcie phy pcs reg table
Chukun Pan <[email protected]>
arm64: dts: qcom: ipq6018: fix clock rates for GCC_USB0_MOCK_UTMI_CLK
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sc7280: Mark SDHCI hosts as cache-coherent
Li Nan <[email protected]>
block: add check of 'minors' and 'first_minor' in device_add_disk()
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm8150-hdk: fix SS USB regulators
Atul Dhudase <[email protected]>
soc: qcom: llcc: Fix dis_cap_alloc and retain_on_pc configuration
Joakim Zhang <[email protected]>
dma-mapping: clear dev->dma_mem to NULL after freeing it
Arseniy Krasnov <[email protected]>
virtio/vsock: fix logic which reduces credit update messages
Leone Fernando <[email protected]>
ipmr: support IP_PKTINFO on cache report IGMP msg
Hangbin Liu <[email protected]>
selftests/net: fix grep checking for fib_nexthop_multiprefix
Ahmad Fatoum <[email protected]>
ARM: dts: stm32: don't mix SCMI and non-SCMI board compatibles
Yihang Li <[email protected]>
scsi: hisi_sas: Correct the number of global debugfs registers
Yihang Li <[email protected]>
scsi: hisi_sas: Rollback some operations if FLR failed
Yihang Li <[email protected]>
scsi: hisi_sas: Replace with standard error code return value
Adam Ford <[email protected]>
arm64: dts: imx8mm: Reduce GPU to nominal speed
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: white-hawk-cpu: Fix missing serial console pin control
Li Nan <[email protected]>
block: Set memalloc_noio to false on device_add_disk() error path
YiFei Zhu <[email protected]>
selftests/bpf: Relax time_tai test for equal timestamps in tai_forward
Ming Yen Hsieh <[email protected]>
wifi: mt76: mt7921: fix country count limitation for CLC
Moudy Ho <[email protected]>
arm64: dts: mediatek: mt8183: correct MDP3 DMA-related nodes
Moudy Ho <[email protected]>
dt-bindings: media: mediatek: mdp3: correct RDMA and WROT node with generic names
Johan Hovold <[email protected]>
arm64: dts: hisilicon: hikey970-pmic: fix regulator cells properties
Andrei Matei <[email protected]>
bpf: Fix verification of indirect var-off stack access
Wang Zhao <[email protected]>
wifi: mt76: mt7921s: fix workqueue problem causes STA association fail
Johan Hovold <[email protected]>
arm64: dts: qcom: sc7280: fix usb_2 wakeup interrupt types
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sc7280: Mark Adreno SMMU as DMA coherent
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sc7280: Fix up GPU SIDs
Nia Espera <[email protected]>
arm64: dts: qcom: sm8350: Fix DMA0 address
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: sdm845-db845c: correct LED panic indicator
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: qrb5165-rb5: correct LED panic indicator
Artem Chernyshev <[email protected]>
scsi: fnic: Return error if vmalloc() failed
Andrii Nakryiko <[email protected]>
bpf: fix check for attempt to corrupt spilled pointer
Hangbin Liu <[email protected]>
selftests/net: specify the interface when do arping
Hou Tao <[email protected]>
bpf: Defer the free of inner map when necessary
Hou Tao <[email protected]>
bpf: Add map and need_defer parameters to .map_fd_put_ptr()
Anton Protopopov <[email protected]>
bpf: add percpu stats for bpf_map elements insertions/deletions
Paul E. McKenney <[email protected]>
rcu-tasks: Provide rcu_trace_implies_rcu_gp()
Douglas Anderson <[email protected]>
arm64: dts: qcom: sm6350: Make watchdog bark interrupt edge triggered
Douglas Anderson <[email protected]>
arm64: dts: qcom: sc8280xp: Make watchdog bark interrupt edge triggered
Douglas Anderson <[email protected]>
arm64: dts: qcom: sm8250: Make watchdog bark interrupt edge triggered
Douglas Anderson <[email protected]>
arm64: dts: qcom: sm8150: Make watchdog bark interrupt edge triggered
Douglas Anderson <[email protected]>
arm64: dts: qcom: sdm845: Make watchdog bark interrupt edge triggered
Douglas Anderson <[email protected]>
arm64: dts: qcom: sc7280: Make watchdog bark interrupt edge triggered
Luca Weiss <[email protected]>
arm64: dts: qcom: sc7280: Mark some nodes as 'reserved'
Douglas Anderson <[email protected]>
arm64: dts: qcom: sc7180: Make watchdog bark interrupt edge triggered
Krzysztof Kozlowski <[email protected]>
ARM: dts: qcom: sdx65: correct SPMI node name
Andrii Nakryiko <[email protected]>
bpf: enforce precision of R0 on callback return
Yu Kuai <[email protected]>
md: synchronize flush io with array reconfiguration
Jeroen van Ingen Schenau <[email protected]>
selftests/bpf: Fix erroneous bitmask operation
Tomi Valkeinen <[email protected]>
arm64: dts: ti: k3-am65-main: Fix DSS irq trigger type
Nitin Yadav <[email protected]>
arm64: dts: ti: k3-am62a-main: Fix GPIO pin count in DT nodes
Su Hui <[email protected]>
wifi: rtlwifi: rtl8821ae: phy: fix an undefined bitwise shift behavior
Dmitry Rokosov <[email protected]>
firmware: meson_sm: populate platform devices from sm device tree data
Christophe JAILLET <[email protected]>
firmware: ti_sci: Fix an off-by-one in ti_sci_debugfs_create()
Peter Delevoryas <[email protected]>
net/ncsi: Fix netlink major/minor version numbers
Dmitry Baryshkov <[email protected]>
ARM: dts: qcom: apq8064: correct XOADC register address
Arnd Bergmann <[email protected]>
wifi: libertas: stop selecting wext
Luca Weiss <[email protected]>
wifi: ath11k: Defer on rproc_get failure
Jordan Rome <[email protected]>
bpf: Add crosstask check to __bpf_get_stack
Florian Lehner <[email protected]>
bpf, lpm: Fix check prefixlen before walking trie
Chih-Kang Chang <[email protected]>
wifi: rtw88: fix RX filter in FIF_ALLMULTI flag
Dan Carpenter <[email protected]>
wifi: plfxlc: check for allocation failure in plfxlc_usb_wreq_async()
Trond Myklebust <[email protected]>
pNFS: Fix the pnfs block driver's calculation of layoutget size
Olga Kornievskaia <[email protected]>
SUNRPC: fix _xprt_switch_find_current_entry logic
Trond Myklebust <[email protected]>
NFSv4.1/pnfs: Ensure we handle the error NFS4ERR_RETURNCONFLICT
Benjamin Coddington <[email protected]>
blocklayoutdriver: Fix reference leak of pnfs_device_node
Arnd Bergmann <[email protected]>
csky: fix arch_jump_label_transform_static override
Chengming Zhou <[email protected]>
crypto: scomp - fix req->dst buffer overflow
Ovidiu Panait <[email protected]>
crypto: sahara - do not resize req->src when doing hash operations
Ovidiu Panait <[email protected]>
crypto: sahara - fix processing hash requests with req->nbytes < sg->length
Ovidiu Panait <[email protected]>
crypto: sahara - improve error handling in sahara_sha_process()
Ovidiu Panait <[email protected]>
crypto: sahara - fix wait_for_completion_timeout() error handling
Ovidiu Panait <[email protected]>
crypto: sahara - fix ahash reqsize
Ovidiu Panait <[email protected]>
crypto: sahara - handle zero-length aes requests
Ovidiu Panait <[email protected]>
crypto: sahara - avoid skcipher fallback code duplication
wangyangxin <[email protected]>
crypto: virtio - Wait for tasklet to complete on device remove
Osama Muhammad <[email protected]>
gfs2: Fix kernel NULL pointer dereference in gfs2_rgrp_dump
Christian Brauner <[email protected]>
fs: indicate request originates from old mount API
Gao Xiang <[email protected]>
erofs: fix memory leak on short-lived bounced pages
Sergey Shtylyov <[email protected]>
pstore: ram_core: fix possible overflow in persistent_ram_init_ecc()
Zhiqi Song <[email protected]>
crypto: hisilicon/zip - save capability registers in probe process
Zhiqi Song <[email protected]>
crypto: hisilicon/sec2 - save capability registers in probe process
Zhiqi Song <[email protected]>
crypto: hisilicon/hpre - save capability registers in probe process
Wenkai Lin <[email protected]>
crypto: hisilicon/qm - add a function to set qm algs
Chenghai Huang <[email protected]>
crypto: hisilicon/zip - add zip comp high perf mode configuration
Zhiqi Song <[email protected]>
crypto: hisilicon/qm - save capability registers in qm init process
Ovidiu Panait <[email protected]>
crypto: sahara - fix error handling in sahara_hw_descriptor_create()
Ovidiu Panait <[email protected]>
crypto: sahara - fix processing requests with cryptlen < sg->length
Ovidiu Panait <[email protected]>
crypto: sahara - fix ahash selftest failure
Ovidiu Panait <[email protected]>
crypto: sahara - fix cbc selftest failure
Ovidiu Panait <[email protected]>
crypto: sahara - remove FLAGS_NEW_KEY logic
Nikita Zhandarovich <[email protected]>
crypto: safexcel - Add error handling for dma_map_sg() calls
Herbert Xu <[email protected]>
crypto: af_alg - Disallow multiple in-flight AIO requests
Dinghao Liu <[email protected]>
crypto: ccp - fix memleak in ccp_init_dm_workarea
Chen Ni <[email protected]>
crypto: sa2ul - Return crypto_aead_setkey to transfer the error
Gonglei (Arei) <[email protected]>
crypto: virtio - Handle dataq logic with tasklet
Mickaël Salaün <[email protected]>
selinux: Fix error priority for bind with AF_UNSPEC on PF_INET6 socket
ZhaoLong Wang <[email protected]>
mtd: Fix gluebi NULL pointer dereference caused by ftl notifier
Richard Fitzgerald <[email protected]>
kunit: debugfs: Fix unchecked dereference in debugfs_print_results()
Tony Luck <[email protected]>
ACPI: extlog: Clear Extended Error Log status when RAS_CEC handled the error
Andy Shevchenko <[email protected]>
ACPI: LPSS: Fix the fractional clock divider flags
Wolfram Sang <[email protected]>
spi: sh-msiof: Enforce fixed DTDL for R-Car H3
Ard Biesheuvel <[email protected]>
efivarfs: Free s_fs_info on unmount
Ilias Apalodimas <[email protected]>
efivarfs: force RO when remounting if SetVariable is not supported
Gavrilov Ilia <[email protected]>
calipso: fix memory leak in netlbl_calipso_add_pass()
Alexandra Diupina <[email protected]>
cpufreq: scmi: process the result of devm_of_clk_add_hw_provider()
Rob Herring <[email protected]>
cpufreq: Use of_property_present() for testing DT property presence
Rob Herring <[email protected]>
of: Add of_property_present() helper
David E. Box <[email protected]>
platform/x86/intel/vsec: Fix xa_alloc memory leak
Srinivas Pandruvada <[email protected]>
platform/x86/intel/vsec: Use mutex for ida_alloc() and ida_free()
Srinivas Pandruvada <[email protected]>
platform/x86/intel/vsec: Support private data
Srinivas Pandruvada <[email protected]>
platform/x86/intel/vsec: Enhance and Export intel_vsec_add_aux()
Chen Ni <[email protected]>
KEYS: encrypted: Add check for strsep
Nikita Kiryushin <[email protected]>
ACPI: LPIT: Avoid u32 multiplication overflow
Nikita Kiryushin <[email protected]>
ACPI: video: check for error while searching for backlight device parent
Ronald Monthero <[email protected]>
mtd: rawnand: Increment IFC_TIMEOUT_MSECS for nand controller response
Amit Kumar Mahapatra <[email protected]>
spi: spi-zynqmp-gqspi: fix driver kconfig dependencies
Kunwu Chan <[email protected]>
powerpc/imc-pmu: Add a null pointer check in update_events_in_group()
Kunwu Chan <[email protected]>
powerpc/powernv: Add a null pointer check in opal_powercap_init()
Kunwu Chan <[email protected]>
powerpc/powernv: Add a null pointer check in opal_event_init()
Kunwu Chan <[email protected]>
powerpc/powernv: Add a null pointer check to scom_debug_init_one()
Michael Ellerman <[email protected]>
selftests/powerpc: Fix error handling in FPU/VMX preemption tests
Nathan Lynch <[email protected]>
powerpc/pseries/memhp: Fix access beyond end of drmem array
Randy Dunlap <[email protected]>
powerpc/44x: select I2C for CURRITUCK
Masahiro Yamada <[email protected]>
powerpc: add crtsavres.o to always-y instead of extra-y
Masahiro Yamada <[email protected]>
powerpc: remove checks for binutils older than 2.25
Arnd Bergmann <[email protected]>
EDAC/thunderx: Fix possible out-of-bounds string access
Yazen Ghannam <[email protected]>
x86/mce/inject: Clear test status value
Colin Ian King <[email protected]>
x86/lib: Fix overflow when counting digits
-------------
Diffstat:
.../devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml | 2 +- .../bindings/media/mediatek,mdp3-rdma.yaml | 29 ++- .../bindings/media/mediatek,mdp3-wrot.yaml | 23 +- .../devicetree/bindings/media/rockchip-isp1.yaml | 11 +- Documentation/driver-api/pci/p2pdma.rst | 16 +- Makefile | 4 +- arch/arm/boot/dts/qcom-apq8064.dtsi | 2 +- arch/arm/boot/dts/qcom-sdx65.dtsi | 2 +- arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts | 2 +- arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts | 2 +- arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts | 2 +- arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts | 3 +- arch/arm/mach-davinci/Kconfig | 2 + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 4 +- arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi | 3 - arch/arm64/boot/dts/mediatek/mt8183.dtsi | 6 +- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 73 +++--- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +- arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 24 ++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 20 +- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 12 +- arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 +- .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 3 + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 4 +- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 +- arch/arm64/kvm/vgic/vgic-its.c | 5 + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 27 +- arch/csky/include/asm/jump_label.h | 5 + arch/loongarch/include/asm/elf.h | 5 - arch/loongarch/kernel/elf.c | 5 - arch/loongarch/kernel/process.c | 1 + arch/loongarch/net/bpf_jit.c | 5 +- arch/mips/alchemy/devboards/db1200.c | 2 +- arch/mips/alchemy/devboards/db1550.c | 2 +- arch/mips/include/asm/dmi.h | 2 +- arch/mips/kernel/setup.c | 4 +- arch/mips/kernel/smp.c | 4 +- arch/powerpc/Kconfig | 1 + arch/powerpc/Makefile | 17 +- arch/powerpc/lib/Makefile | 4 +- arch/powerpc/perf/imc-pmu.c | 6 + arch/powerpc/platforms/44x/Kconfig | 1 + arch/powerpc/platforms/powernv/opal-irqchip.c | 2 + arch/powerpc/platforms/powernv/opal-powercap.c | 6 + arch/powerpc/platforms/powernv/opal-xscom.c | 5 + arch/powerpc/platforms/pseries/hotplug-memory.c | 9 +- arch/riscv/include/asm/sections.h | 1 + arch/riscv/include/asm/xip_fixup.h | 2 +- arch/riscv/kernel/module.c | 3 +- arch/riscv/kernel/patch.c | 11 +- arch/riscv/kernel/vmlinux-xip.lds.S | 2 + arch/riscv/kernel/vmlinux.lds.S | 2 + arch/riscv/mm/pageattr.c | 275 ++++++++++++++++++--- arch/s390/include/asm/pci_io.h | 32 +-- arch/s390/pci/pci_mmio.c | 12 +- arch/x86/kernel/cpu/mce/inject.c | 1 + arch/x86/kernel/kvmclock.c | 12 +- arch/x86/lib/misc.c | 2 +- block/bio.c | 38 +-- block/blk-mq.c | 16 +- block/blk-settings.c | 2 +- block/genhd.c | 5 +- block/ioctl.c | 11 +- crypto/af_alg.c | 14 +- crypto/scompress.c | 6 + drivers/acpi/acpi_extlog.c | 7 +- drivers/acpi/acpi_lpit.c | 2 +- drivers/acpi/acpi_lpss.c | 3 +- drivers/acpi/acpi_video.c | 12 +- drivers/acpi/property.c | 4 + drivers/android/binder_alloc.c | 22 +- drivers/base/node.c | 9 +- drivers/base/swnode.c | 3 + drivers/block/loop.c | 52 ++-- drivers/block/null_blk/main.c | 13 +- drivers/bluetooth/btmtkuart.c | 11 +- drivers/clk/clk-si5341.c | 4 +- drivers/clk/qcom/gpucc-sm8150.c | 4 +- drivers/clk/qcom/videocc-sm8150.c | 5 + drivers/clk/renesas/rzg2l-cpg.c | 91 ++++--- drivers/clk/zynqmp/clk-mux-zynqmp.c | 2 +- drivers/clk/zynqmp/divider.c | 66 +---- drivers/clocksource/timer-ti-dm.c | 4 +- drivers/cpufreq/cpufreq-dt-platdev.c | 2 +- drivers/cpufreq/imx-cpufreq-dt.c | 2 +- drivers/cpufreq/imx6q-cpufreq.c | 4 +- drivers/cpufreq/scmi-cpufreq.c | 7 +- drivers/cpufreq/tegra20-cpufreq.c | 2 +- drivers/crypto/ccp/ccp-ops.c | 5 +- drivers/crypto/hisilicon/hpre/hpre_main.c | 122 ++++----- drivers/crypto/hisilicon/qm.c | 98 +++++++- drivers/crypto/hisilicon/sec2/sec.h | 7 + drivers/crypto/hisilicon/sec2/sec_crypto.c | 13 +- drivers/crypto/hisilicon/sec2/sec_main.c | 70 +++--- drivers/crypto/hisilicon/zip/zip_main.c | 175 +++++++++---- drivers/crypto/inside-secure/safexcel_cipher.c | 19 +- drivers/crypto/sa2ul.c | 3 +- drivers/crypto/sahara.c | 248 ++++++++----------- drivers/crypto/virtio/virtio_crypto_common.h | 2 + drivers/crypto/virtio/virtio_crypto_core.c | 26 +- drivers/cxl/core/port.c | 2 +- drivers/cxl/core/region.c | 2 +- drivers/edac/thunderx_edac.c | 10 +- drivers/firmware/meson/meson_sm.c | 5 +- drivers/firmware/ti_sci.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 21 +- drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 4 +- drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 52 +--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 5 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 6 +- .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 3 +- drivers/gpu/drm/bridge/tc358767.c | 2 +- drivers/gpu/drm/bridge/ti-tpd12s015.c | 4 +- drivers/gpu/drm/drm_drv.c | 10 +- drivers/gpu/drm/mediatek/mtk_disp_merge.c | 2 +- drivers/gpu/drm/mediatek/mtk_dp.c | 1 + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 6 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 6 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 20 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 8 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 9 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 +- drivers/gpu/drm/nouveau/nv04_fence.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 9 +- drivers/gpu/drm/panel/panel-elida-kd35t133.c | 2 + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gpu.c | 70 ++++-- drivers/gpu/drm/radeon/r100.c | 4 +- drivers/gpu/drm/radeon/r600_cs.c | 4 +- drivers/gpu/drm/radeon/radeon_display.c | 7 +- drivers/gpu/drm/radeon/radeon_vm.c | 8 +- drivers/gpu/drm/radeon/si.c | 4 + drivers/gpu/drm/radeon/sumo_dpm.c | 4 +- drivers/gpu/drm/radeon/trinity_dpm.c | 4 +- drivers/gpu/drm/tidss/tidss_dispc.c | 63 ++++- drivers/gpu/drm/tidss/tidss_kms.c | 4 - drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 7 +- drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 20 ++ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 12 +- drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 24 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 10 +- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 18 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 27 +- drivers/hid/wacom_wac.c | 32 +-- drivers/i2c/busses/i2c-s3c2410.c | 40 +-- drivers/iio/adc/ad7091r-base.c | 6 +- drivers/iio/adc/ad9467.c | 105 ++++++-- drivers/iio/adc/adi-axi-adc.c | 74 ++---- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 6 +- drivers/infiniband/hw/hns/hns_roce_pd.c | 2 +- drivers/infiniband/hw/mthca/mthca_cmd.c | 4 +- drivers/infiniband/hw/mthca/mthca_main.c | 2 +- drivers/infiniband/ulp/iser/iscsi_iser.h | 2 - drivers/infiniband/ulp/iser/iser_initiator.c | 5 +- drivers/infiniband/ulp/iser/iser_memory.c | 8 +- drivers/infiniband/ulp/iser/iser_verbs.c | 1 - drivers/input/keyboard/atkbd.c | 12 +- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 + drivers/iommu/dma-iommu.c | 3 + drivers/leds/Kconfig | 1 + drivers/md/md.c | 29 ++- drivers/md/raid1.c | 12 +- drivers/media/dvb-core/dvbdev.c | 2 + drivers/media/dvb-frontends/m88ds3103.c | 7 +- .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 - .../media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 6 + drivers/media/platform/nxp/imx-mipi-csis.c | 4 +- .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 6 +- drivers/media/platform/verisilicon/hantro_drv.c | 2 + drivers/media/platform/verisilicon/hantro_v4l2.c | 3 + drivers/media/usb/cx231xx/cx231xx-core.c | 2 + drivers/media/usb/pvrusb2/pvrusb2-context.c | 3 +- drivers/mfd/intel-lpss.c | 2 +- drivers/mfd/syscon.c | 4 + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 2 +- drivers/mmc/host/Kconfig | 10 +- drivers/mtd/mtd_blkdevs.c | 4 +- drivers/mtd/nand/raw/fsl_ifc_nand.c | 2 +- drivers/net/amt.c | 6 +- drivers/net/dsa/vitesse-vsc73xx-core.c | 2 + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 26 +- .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c | 6 +- .../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 8 +- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 10 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 5 +- drivers/net/phy/micrel.c | 1 + drivers/net/usb/r8152.c | 16 +- drivers/net/wireless/ath/ath11k/ahb.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 11 - drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- drivers/net/wireless/marvell/libertas/Kconfig | 2 - drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 + drivers/net/wireless/marvell/mwifiex/fw.h | 1 + drivers/net/wireless/marvell/mwifiex/ioctl.h | 1 + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 8 + drivers/net/wireless/mediatek/mt76/eeprom.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76.h | 3 +- drivers/net/wireless/mediatek/mt76/mt7615/sdio.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 11 +- drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 4 +- .../net/wireless/mediatek/mt76/mt7921/sdio_mac.c | 3 +- drivers/net/wireless/mediatek/mt76/sdio.c | 18 +- drivers/net/wireless/purelifi/plfxlc/usb.c | 5 +- drivers/net/wireless/realtek/rtlwifi/pci.c | 79 ++---- drivers/net/wireless/realtek/rtlwifi/pci.h | 5 - .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 14 +- .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 12 +- .../wireless/realtek/rtlwifi/rtl8192c/phy_common.h | 1 - .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.c | 6 +- .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.h | 1 - .../net/wireless/realtek/rtlwifi/rtl8192cu/phy.c | 6 +- .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 15 +- .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 16 +- .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 15 +- .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 5 +- drivers/net/wireless/realtek/rtlwifi/wifi.h | 7 + drivers/net/wireless/realtek/rtw88/mac80211.c | 4 +- drivers/net/xen-netback/netback.c | 44 +++- drivers/nvme/target/tcp.c | 20 +- drivers/nvme/target/trace.h | 5 +- drivers/of/base.c | 1 + drivers/of/unittest-data/tests-phandle.dtsi | 10 +- drivers/of/unittest.c | 74 +++--- drivers/pci/controller/dwc/pci-keystone.c | 9 + drivers/pci/controller/dwc/pcie-designware-ep.c | 1 + drivers/pci/controller/pcie-mediatek-gen3.c | 85 ++++--- drivers/pci/controller/pcie-mediatek.c | 10 +- drivers/platform/x86/intel/vsec.c | 46 +++- drivers/platform/x86/intel/vsec.h | 7 + drivers/power/supply/bq256xx_charger.c | 5 +- drivers/power/supply/cw2015_battery.c | 2 +- drivers/pwm/core.c | 2 +- drivers/pwm/pwm-jz4740.c | 7 +- drivers/pwm/pwm-stm32.c | 63 +++-- drivers/scsi/fnic/fnic_debugfs.c | 3 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 4 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 9 +- drivers/scsi/mpi3mr/mpi3mr_app.c | 16 ++ drivers/scsi/mpi3mr/mpi3mr_os.c | 10 +- drivers/soc/qcom/llcc-qcom.c | 8 +- drivers/spi/Kconfig | 3 +- drivers/spi/spi-sh-msiof.c | 17 ++ drivers/spmi/spmi-mtk-pmif.c | 20 +- drivers/staging/media/rkvdec/rkvdec.c | 3 + drivers/target/target_core_file.c | 10 +- drivers/tty/serial/8250/8250_bcm2835aux.c | 2 + drivers/tty/serial/8250/8250_exar.c | 5 +- drivers/tty/serial/8250/8250_omap.c | 2 +- drivers/tty/serial/imx.c | 36 ++- drivers/tty/serial/omap-serial.c | 27 +- drivers/tty/serial/sc16is7xx.c | 8 +- drivers/tty/serial/serial_core.c | 33 ++- drivers/tty/tty.h | 2 +- drivers/tty/tty_io.c | 35 +-- drivers/tty/tty_ioctl.c | 2 +- drivers/ufs/core/ufshcd.c | 7 +- drivers/usb/cdns3/cdns3-gadget.c | 142 ++++++++--- drivers/usb/cdns3/cdns3-gadget.h | 3 + drivers/usb/chipidea/core.c | 7 + drivers/usb/class/cdc-acm.c | 3 + drivers/usb/core/generic.c | 16 ++ drivers/usb/dwc3/core.c | 39 +-- drivers/usb/dwc3/ep0.c | 5 +- drivers/usb/host/xhci-mtk.c | 40 ++- drivers/usb/host/xhci-mtk.h | 2 + drivers/usb/mon/mon_bin.c | 7 +- drivers/usb/phy/phy-mxs-usb.c | 3 +- drivers/usb/typec/class.c | 4 +- drivers/vdpa/alibaba/eni_vdpa.c | 6 +- drivers/video/fbdev/core/fb_defio.c | 8 +- drivers/video/fbdev/imxfb.c | 27 +- drivers/watchdog/bcm2835_wdt.c | 3 +- drivers/watchdog/hpwdt.c | 2 +- drivers/watchdog/rti_wdt.c | 13 +- drivers/watchdog/watchdog_dev.c | 3 +- fs/efivarfs/super.c | 15 ++ fs/erofs/zdata.c | 5 +- fs/f2fs/data.c | 7 +- fs/f2fs/file.c | 7 +- fs/f2fs/namei.c | 2 +- fs/f2fs/node.c | 6 +- fs/f2fs/xattr.c | 11 +- fs/gfs2/rgrp.c | 2 +- fs/namespace.c | 11 + fs/nfs/blocklayout/blocklayout.c | 7 +- fs/nfs/direct.c | 5 +- fs/nfs/internal.h | 2 +- fs/nfs/nfs4proc.c | 3 + fs/nfs/pnfs.c | 3 +- fs/pstore/ram_core.c | 2 +- fs/smb/server/asn1.c | 5 + fs/smb/server/connection.c | 6 - fs/smb/server/connection.h | 2 +- fs/smb/server/oplock.c | 6 + fs/smb/server/smb2pdu.c | 22 +- fs/smb/server/smb_common.c | 6 +- fs/smb/server/transport_rdma.c | 11 +- fs/smb/server/transport_tcp.c | 13 +- include/crypto/if_alg.h | 3 + include/drm/drm_bridge.h | 2 +- include/dt-bindings/clock/qcom,videocc-sm8150.h | 4 + include/linux/bio.h | 9 +- include/linux/blkdev.h | 3 +- include/linux/bpf.h | 43 +++- include/linux/clk-provider.h | 4 +- include/linux/hisi_acc_qm.h | 20 +- include/linux/iio/adc/adi-axi-adc.h | 4 + include/linux/netfilter_bridge.h | 6 +- include/linux/of.h | 17 +- include/linux/rcupdate.h | 12 + include/linux/skbuff.h | 2 +- include/linux/usb.h | 6 + include/net/bluetooth/hci_core.h | 1 - include/uapi/linux/bpf.h | 3 + init/do_mounts.c | 9 +- io_uring/rw.c | 10 +- kernel/bpf/arraymap.c | 12 +- kernel/bpf/hashtab.c | 6 +- kernel/bpf/lpm_trie.c | 3 + kernel/bpf/map_in_map.c | 13 +- kernel/bpf/map_in_map.h | 2 +- kernel/bpf/stackmap.c | 11 +- kernel/bpf/syscall.c | 41 ++- kernel/bpf/verifier.c | 27 +- kernel/debug/kdb/kdb_main.c | 2 - kernel/dma/coherent.c | 4 +- kernel/rcu/tasks.h | 2 + kernel/time/tick-sched.c | 5 + lib/kunit/debugfs.c | 4 +- net/bluetooth/hci_conn.c | 8 +- net/bluetooth/hci_debugfs.c | 12 +- net/bluetooth/hci_event.c | 11 +- net/bridge/br_netfilter_hooks.c | 42 +++- net/bridge/br_netfilter_ipv6.c | 14 +- net/core/rtnetlink.c | 14 +- net/dns_resolver/dns_key.c | 2 +- net/ethtool/features.c | 9 +- net/ipv4/af_inet.c | 1 + net/ipv4/ipmr.c | 13 +- net/ipv4/netfilter/nf_reject_ipv4.c | 9 +- net/ipv4/udp.c | 12 +- net/ipv6/ip6_tunnel.c | 26 +- net/ipv6/mcast.c | 4 + net/ipv6/netfilter/nf_reject_ipv6.c | 11 +- net/ipv6/udp.c | 16 +- net/mptcp/options.c | 6 +- net/mptcp/subflow.c | 17 +- net/ncsi/internal.h | 7 +- net/ncsi/ncsi-netlink.c | 4 +- net/ncsi/ncsi-pkt.h | 7 +- net/ncsi/ncsi-rsp.c | 26 +- net/netfilter/ipset/ip_set_hash_netiface.c | 8 +- net/netfilter/ipvs/ip_vs_xmit.c | 4 +- net/netfilter/nf_log_syslog.c | 13 +- net/netfilter/nf_queue.c | 6 +- net/netfilter/nf_tables_api.c | 27 +- net/netfilter/nfnetlink_log.c | 8 +- net/netfilter/nft_limit.c | 19 +- net/netfilter/xt_physdev.c | 2 +- net/netlabel/netlabel_calipso.c | 49 ++-- net/sched/act_ct.c | 12 +- net/sctp/socket.c | 13 +- net/sunrpc/xprtmultipath.c | 2 +- net/unix/unix_bpf.c | 21 +- net/vmw_vsock/virtio_transport_common.c | 13 +- scripts/Makefile.compiler | 4 - security/apparmor/policy_unpack.c | 4 + security/keys/encrypted-keys/encrypted.c | 4 + security/selinux/hooks.c | 7 + sound/pci/hda/patch_realtek.c | 3 + sound/pci/oxygen/oxygen_mixer.c | 2 +- sound/soc/codecs/cs35l33.c | 4 +- sound/soc/codecs/cs35l34.c | 4 +- sound/soc/codecs/rt5645.c | 8 - sound/soc/intel/common/soc-acpi-intel-glk-match.c | 14 +- sound/soc/mediatek/common/mtk-dsp-sof-common.c | 2 +- sound/usb/mixer_scarlett_gen2.c | 223 +++++++++++------ tools/include/uapi/linux/bpf.h | 3 + tools/lib/api/io.h | 1 + tools/perf/util/bpf-event.c | 8 +- tools/perf/util/bpf-event.h | 12 +- tools/perf/util/env.c | 50 ++-- tools/perf/util/env.h | 4 + tools/perf/util/genelf.c | 6 +- tools/perf/util/header.c | 13 +- tools/perf/util/hisi-ptt.c | 1 + tools/testing/selftests/alsa/mixer-test.c | 4 +- tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 2 + tools/testing/selftests/bpf/prog_tests/time_tai.c | 2 +- .../selftests/bpf/progs/bpf_iter_task_stack.c | 5 + .../selftests/bpf/progs/xdp_synproxy_kern.c | 4 +- .../testing/selftests/drivers/net/mlxsw/qos_pfc.sh | 18 +- .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 52 +++- .../selftests/net/arp_ndisc_untracked_subnets.sh | 2 +- .../selftests/net/fib_nexthop_multiprefix.sh | 4 +- tools/testing/selftests/powerpc/math/fpu_preempt.c | 9 +- tools/testing/selftests/powerpc/math/vmx_preempt.c | 10 +- tools/testing/selftests/sgx/Makefile | 2 +- tools/testing/selftests/sgx/load.c | 9 +- tools/testing/selftests/sgx/sigstruct.c | 5 +- tools/testing/selftests/sgx/test_encl.c | 8 +- 424 files changed, 3554 insertions(+), 2119 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/417 x86/lib: Fix overflow when counting digits
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Colin Ian King <[email protected]>
[ Upstream commit a24d61c609813963aacc9f6ec8343f4fcaac7243 ]
tl;dr: The num_digits() function has a theoretical overflow issue. But it doesn't affect any actual in-tree users. Fix it by using a larger type for one of the local variables.
Long version:
There is an overflow in variable m in function num_digits when val is >= 1410065408 which leads to the digit calculation loop to iterate more times than required. This results in either more digits being counted or in some cases (for example where val is 1932683193) the value of m eventually overflows to zero and the while loop spins forever).
Currently the function num_digits is currently only being used for small values of val in the SMP boot stage for digit counting on the number of cpus and NUMA nodes, so the overflow is never encountered. However it is useful to fix the overflow issue in case the function is used for other purposes in the future. (The issue was discovered while investigating the digit counting performance in various kernel helper functions rather than any real-world use-case).
The simplest fix is to make m a long long, the overhead in multiplication speed for a long long is very minor for small values of val less than 10000 on modern processors. The alternative fix is to replace the multiplication with a constant division by 10 loop (this compiles down to an multiplication and shift) without needing to make m a long long, but this is slightly slower than the fix in this commit when measured on a range of x86 processors).
[ dhansen: subject and changelog tweaks ]
--- arch/x86/lib/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lib/misc.c +1 -1
@@ -6,7 +6,7 @@*/ int num_digits (int val) { -int m =10 ; +long long m =10 ;int d =1 ;if (val <0 ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 2/417 x86/mce/inject: Clear test status value
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yazen Ghannam <[email protected]>
[ Upstream commit 6175b407756b22e7fdc771181b7d832ebdedef5c ]
AMD systems generally allow MCA "simulation" where MCA registers can be written with valid data and the full MCA handling flow can be tested by software.
However, the platform on Scalable MCA systems, can prevent software from writing data to the MCA registers. There is no architectural way to determine this configuration. Therefore, the MCE injection module will check for this behavior by writing and reading back a test status value. This is done during module init, and the check can run on any CPU with any valid MCA bank.
If MCA_STATUS writes are ignored by the platform, then there are no side effects on the hardware state.
If the writes are not ignored, then the test status value will remain in the hardware MCA_STATUS register. It is likely that the value will not be overwritten by hardware or software, since the tested CPU and bank are arbitrary. Therefore, the user may see a spurious, synthetic MCA error reported whenever MCA is polled for this CPU.
Clear the test value immediately after writing it. It is very unlikely that a valid MCA error is logged by hardware during the test. Errors that cause an #MC won't be affected.
--- arch/x86/kernel/cpu/mce/inject.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/mce/inject.c +1 -0
@@ -747,6 +747,7 @@ static void check_hw_inj_possible(void)wrmsrl_safe (mca_msr_reg (bank,MCA_STATUS ), status);rdmsrl_safe (mca_msr_reg (bank,MCA_STATUS ), &status); +wrmsrl_safe (mca_msr_reg (bank,MCA_STATUS ),0 );if (!status) { hw_injection_possible = false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 3/417 EDAC/thunderx: Fix possible out-of-bounds string access
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 475c58e1a471e9b873e3e39958c64a2d278275c8 ]
Enabling -Wstringop-overflow globally exposes a warning for a common bug in the usage of strncat():
drivers/edac/thunderx_edac.c: In function 'thunderx_ocx_com_threaded_isr':
drivers/edac/thunderx_edac.c:1136:17: error: 'strncat' specified bound 1024 equals destination size [-Werror=stringop-overflow=]
1136 | strncat(msg, other, OCX_MESSAGE_SIZE);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
1145 | strncat(msg, other, OCX_MESSAGE_SIZE);
...
1150 | strncat(msg, other, OCX_MESSAGE_SIZE);...
Apparently the author of this driver expected strncat() to behave the way that strlcat() does, which uses the size of the destination buffer as its third argument rather than the length of the source buffer. The result is that there is no check on the size of the allocated buffer.
Change it to strlcat().
[ bp: Trim compiler output, fixup commit message. ]
--- drivers/edac/thunderx_edac.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/edac/thunderx_edac.c +5 -5
@@ -1133,7 +1133,7 @@ static irqreturn_t thunderx_ocx_com_threaded_isr(int irq, void *irq_id)decode_register (other,OCX_OTHER_SIZE , ocx_com_errors, ctx->reg_com_int); -strncat (msg, other,OCX_MESSAGE_SIZE ); +strlcat (msg, other,OCX_MESSAGE_SIZE );for (lane =0 ; lane <OCX_RX_LANES ; lane++)if (ctx->reg_com_int &BIT (lane)) {
@@ -1142,12 +1142,12 @@ static irqreturn_t thunderx_ocx_com_threaded_isr(int irq, void *irq_id) lane, ctx->reg_lane_int[lane], lane, ctx->reg_lane_stat11[lane]); -strncat (msg, other,OCX_MESSAGE_SIZE ); +strlcat (msg, other,OCX_MESSAGE_SIZE );decode_register (other,OCX_OTHER_SIZE , ocx_lane_errors, ctx->reg_lane_int[lane]); -strncat (msg, other,OCX_MESSAGE_SIZE ); +strlcat (msg, other,OCX_MESSAGE_SIZE ); }if (ctx->reg_com_int &OCX_COM_INT_CE )
@@ -1217,7 +1217,7 @@ static irqreturn_t thunderx_ocx_lnk_threaded_isr(int irq, void *irq_id)decode_register (other,OCX_OTHER_SIZE , ocx_com_link_errors, ctx->reg_com_link_int); -strncat (msg, other,OCX_MESSAGE_SIZE ); +strlcat (msg, other,OCX_MESSAGE_SIZE );if (ctx->reg_com_link_int &OCX_COM_LINK_INT_UE )edac_device_handle_ue (ocx->edac_dev,0 ,0 , msg);
@@ -1896,7 +1896,7 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id)decode_register (other,L2C_OTHER_SIZE , l2_errors, ctx->reg_int); -strncat (msg, other,L2C_MESSAGE_SIZE ); +strlcat (msg, other,L2C_MESSAGE_SIZE );if (ctx->reg_int & mask_ue)edac_device_handle_ue (l2c->edac_dev,0 ,0 , msg);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 4/417 powerpc: remove checks for binutils older than 2.25
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 54a11654de163994e32b24e3aa90ef81f4a3184d ]
Commit e4412739472b ("Documentation: raise minimum supported version of binutils to 2.25") allows us to remove the checks for old binutils.
There is no more user for ld-ifversion. Remove it as well.
Stable-dep-of: 1b1e38002648 ("powerpc: add crtsavres.o to always-y instead of extra-y")
--- arch/powerpc/Makefile | 17 +---------------- arch/powerpc/lib/Makefile | 2 +- scripts/Makefile.compiler | 4 ---- 3 files changed, 2 insertions(+), 21 deletions(-)
arch/powerpc/Makefile +1 -16
@@ -42,18 +42,13 @@ machine-$(CONFIG_PPC64) += 64 machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le UTS_MACHINE := $(subst $(space),,$(machine-y)) -# XXX This needs to be before we override LD below -ifdef CONFIG_PPC32 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o -else -ifeq ($(call ld-ifversion, -ge, 22500, y),y) +ifeq ($(CONFIG_PPC64)$(CONFIG_LD_IS_BFD),yy) # Have the linker provide sfpr if possible. # There is a corresponding test in arch/powerpc/lib/Makefile KBUILD_LDFLAGS_MODULE += --save-restore-funcs else KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o endif -endif ifdef CONFIG_CPU_LITTLE_ENDIAN KBUILD_CFLAGS += -mlittle-endian
@@ -391,17 +386,7 @@ endif endif PHONY += checkbin -# Check toolchain versions: -# - gcc-4.6 is the minimum kernel-wide version so nothing required. checkbin: - @if test "x${CONFIG_LD_IS_LLD}" != "xy" -a \ - "x$(call ld-ifversion, -le, 22400, y)" = "xy" ; then \ - echo -n '*** binutils 2.24 miscompiles weak symbols ' ; \ - echo 'in some circumstances.' ; \ - echo '*** binutils 2.23 do not define the TOC symbol ' ; \ - echo -n '*** Please use a different binutils version.' ; \ - false ; \ - fi @if test "x${CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT}" = "xy" -a \ "x${CONFIG_LD_IS_BFD}" = "xy" -a \ "${CONFIG_LD_VERSION}" = "23700" ; then \
arch/powerpc/lib/Makefile +1 -1
@@ -42,7 +42,7 @@ obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o # 64-bit linker creates .sfpr on demand for final link (vmlinux), # so it is only needed for modules, and only for older linkers which # do not support --save-restore-funcs -ifeq ($(call ld-ifversion, -lt, 22500, y),y) +ifndef CONFIG_LD_IS_BFD extra-$(CONFIG_PPC64) += crtsavres.o endif
scripts/Makefile.compiler +0 -4
@@ -72,7 +72,3 @@ clang-min-version = $(shell [ $(CONFIG_CLANG_VERSION)0 -ge $(1)0 ] && echo y) # ld-option # Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y) ld-option = $(call try-run, $(LD) $(KBUILD_LDFLAGS) $(1) -v,$(1),$(2),$(3)) - -# ld-ifversion -# Usage: $(call ld-ifversion, -ge, 22252, y) -ld-ifversion = $(shell [ $(CONFIG_LD_VERSION)0 $(1) $(2)0 ] && echo $(3) || echo $(4))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 5/417 powerpc: add crtsavres.o to always-y instead of extra-y
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 1b1e38002648819c04773647d5242990e2824264 ]
crtsavres.o is linked to modules. However, as explained in commit d0e628cd817f ("kbuild: doc: clarify the difference between extra-y and always-y"), 'make modules' does not build extra-y.
For example, the following command fails:
$ make ARCH=powerpc LLVM=1 KBUILD_MODPOST_WARN=1 mrproper ps3_defconfig modules
[snip]
LD [M] arch/powerpc/platforms/cell/spufs/spufs.ko
ld.lld: error: cannot open arch/powerpc/lib/crtsavres.o: No such file or directory
make[3]: *** [scripts/Makefile.modfinal:56: arch/powerpc/platforms/cell/spufs/spufs.ko] Error 1
make[2]: *** [Makefile:1844: modules] Error 2
make[1]: *** [/home/masahiro/workspace/linux-kbuild/Makefile:350: __build_one_by_one] Error 2
make: *** [Makefile:234: __sub-make] Error 2--- arch/powerpc/lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/lib/Makefile +1 -1
@@ -43,7 +43,7 @@ obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o # so it is only needed for modules, and only for older linkers which # do not support --save-restore-funcs ifndef CONFIG_LD_IS_BFD -extra-$(CONFIG_PPC64) += crtsavres.o +always-$(CONFIG_PPC64) += crtsavres.o endif obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 6/417 powerpc/44x: select I2C for CURRITUCK
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 4a74197b65e69c46fe6e53f7df2f4d6ce9ffe012 ]
Fix build errors when CURRITUCK=y and I2C is not builtin (=m or is not set). Fixes these build errors:
powerpc-linux-ld: arch/powerpc/platforms/44x/ppc476.o: in function `avr_halt_system':
ppc476.c:(.text+0x58): undefined reference to `i2c_smbus_write_byte_data'
powerpc-linux-ld: arch/powerpc/platforms/44x/ppc476.o: in function `ppc47x_device_probe':
ppc476.c:(.init.text+0x18): undefined reference to `i2c_register_driver'
--- arch/powerpc/platforms/44x/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/44x/Kconfig +1 -0
@@ -173,6 +173,7 @@ config ISS4xx config CURRITUCK bool "IBM Currituck (476fpe) Support" depends on PPC_47x + select I2C select SWIOTLB select 476FPE select FORCE_PCI
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 7/417 powerpc/pseries/memhp: Fix access beyond end of drmem array
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Lynch <[email protected]>
[ Upstream commit bd68ffce69f6cf8ddd3a3c32549d1d2275e49fc5 ]
dlpar_memory_remove_by_index() may access beyond the bounds of the drmem lmb array when the LMB lookup fails to match an entry with the given DRC index. When the search fails, the cursor is left pointing to &drmem_info->lmbs[drmem_info->n_lmbs], which is one element past the last valid entry in the array. The debug message at the end of the function then dereferences this pointer:
pr_debug("Failed to hot-remove memory at %llx\n",
lmb->base_addr);
This was found by inspection and confirmed with KASAN:
pseries-hotplug-mem: Attempting to hot-remove LMB, drc index 1234
==================================================================
BUG: KASAN: slab-out-of-bounds in dlpar_memory+0x298/0x1658 Read of size 8 at addr c000000364e97fd0 by task bash/949 dump_stack_lvl+0xa4/0xfc (unreliable) print_report+0x214/0x63c kasan_report+0x140/0x2e0 __asan_load8+0xa8/0xe0 dlpar_memory+0x298/0x1658 handle_dlpar_errorlog+0x130/0x1d0 dlpar_store+0x18c/0x3e0 kobj_attr_store+0x68/0xa0 sysfs_kf_write+0xc4/0x110 kernfs_fop_write_iter+0x26c/0x390 vfs_write+0x2d4/0x4e0 ksys_write+0xac/0x1a0 system_call_exception+0x268/0x530 system_call_vectored_common+0x15c/0x2ec Allocated by task 1: kasan_save_stack+0x48/0x80 kasan_set_track+0x34/0x50 kasan_save_alloc_info+0x34/0x50 __kasan_kmalloc+0xd0/0x120 __kmalloc+0x8c/0x320 kmalloc_array.constprop.0+0x48/0x5c drmem_init+0x2a0/0x41c do_one_initcall+0xe0/0x5c0 kernel_init_freeable+0x4ec/0x5a0 kernel_init+0x30/0x1e0 ret_from_kernel_user_thread+0x14/0x1c The buggy address belongs to the object at c000000364e80000 which belongs to the cache kmalloc-128k of size 131072 The buggy address is located 0 bytes to the right of allocated 98256-byte region [c000000364e80000, c000000364e97fd0)
==================================================================
pseries-hotplug-mem: Failed to hot-remove memory at 0
Log failed lookups with a separate message and dereference the cursor only when it points to a valid entry.
--- arch/powerpc/platforms/pseries/hotplug-memory.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/powerpc/platforms/pseries/hotplug-memory.c +5 -4
@@ -500,14 +500,15 @@ static int dlpar_memory_remove_by_index(u32 drc_index) } } -if (!lmb_found) +if (!lmb_found) { +pr_debug ("Failed to look up LMB for drc index %x\n" , drc_index); rc = -EINVAL ; - -if (rc) + }else if (rc) {pr_debug ("Failed to hot-remove memory at %llx\n" , lmb->base_addr); -else + }else {pr_debug ("Memory at %llx was hot-removed\n" , lmb->base_addr); + }return rc; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 8/417 selftests/powerpc: Fix error handling in FPU/VMX preemption tests
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit 9dbd5927408c4a0707de73ae9dd9306b184e8fee ]
The FPU & VMX preemption tests do not check for errors returned by the low-level asm routines, preempt_fpu() / preempt_vsx() respectively. That means any register corruption detected by the asm routines does not result in a test failure.
Fix it by returning the return value of the asm routines from the pthread child routines.
--- tools/testing/selftests/powerpc/math/fpu_preempt.c | 9 +++++---- tools/testing/selftests/powerpc/math/vmx_preempt.c | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-)
tools/testing/selftests/powerpc/math/fpu_preempt.c +5 -4
@@ -37,19 +37,20 @@ __thread double darray[] = {0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0,int threads_starting;int running; -extern void preempt_fpu (double *darray,int *threads_starting,int *running); +extern int preempt_fpu (double *darray,int *threads_starting,int *running);void *preempt_fpu_c (void *p) { +long rc;int i; +srand (pthread_self ());for (i =0 ; i <21 ; i++) darray[i] =rand (); -/* Test failed if it ever returns */ -preempt_fpu (darray, &threads_starting, &running); + rc =preempt_fpu (darray, &threads_starting, &running); -return p; +return (void *)rc; }int test_preempt_fpu (void )
tools/testing/selftests/powerpc/math/vmx_preempt.c +6 -4
@@ -37,19 +37,21 @@ __thread vector int varray[] = {{1, 2, 3, 4}, {5, 6, 7, 8}, {9, 10,11,12},int threads_starting;int running; -extern void preempt_vmx(vector int *varray, int *threads_starting, int *running); +extern int preempt_vmx(vector int *varray, int *threads_starting, int *running);void *preempt_vmx_c (void *p) {int i, j; +long rc; +srand (pthread_self ());for (i =0 ; i <12 ; i++)for (j =0 ; j <4 ; j++) varray[i][j] =rand (); -/* Test fails if it ever returns */ -preempt_vmx (varray, &threads_starting, &running); -return p; + rc =preempt_vmx (varray, &threads_starting, &running); + +return (void *)rc; }int test_preempt_vmx (void )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 9/417 powerpc/powernv: Add a null pointer check to scom_debug_init_one()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunwu Chan <[email protected]>
[ Upstream commit 9a260f2dd827bbc82cc60eb4f4d8c22707d80742 ]
kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure.
Add a null pointer check, and release 'ent' to avoid memory leaks.
--- arch/powerpc/platforms/powernv/opal-xscom.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/powerpc/platforms/powernv/opal-xscom.c +5 -0
@@ -165,6 +165,11 @@ static int scom_debug_init_one(struct dentry *root, struct device_node *dn, ent->chip = chip;snprintf (ent->name,16 ,"%08x" , chip); ent->path.data = (void *)kasprintf (GFP_KERNEL ,"%pOF" , dn); +if (!ent->path.data) { +kfree (ent); +return -ENOMEM ; + } + ent->path.size =strlen ((char *)ent->path.data); dir =debugfs_create_dir (ent->name, root);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 10/417 powerpc/powernv: Add a null pointer check in opal_event_init()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunwu Chan <[email protected]>
[ Upstream commit 8649829a1dd25199bbf557b2621cedb4bf9b3050 ]
kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure.
--- arch/powerpc/platforms/powernv/opal-irqchip.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/platforms/powernv/opal-irqchip.c +2 -0
@@ -275,6 +275,8 @@ int __init opal_event_init(void)else name =kasprintf (GFP_KERNEL ,"opal" ); +if (!name) +continue ;/* Install interrupt handler */ rc =request_irq (r->start, opal_interrupt, r->flags &IRQD_TRIGGER_MASK , name,NULL );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 11/417 powerpc/powernv: Add a null pointer check in opal_powercap_init()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunwu Chan <[email protected]>
[ Upstream commit e123015c0ba859cf48aa7f89c5016cc6e98e018d ]
kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure.
--- arch/powerpc/platforms/powernv/opal-powercap.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/powerpc/platforms/powernv/opal-powercap.c +6 -0
@@ -196,6 +196,12 @@ void __init opal_powercap_init(void) j =0 ; pcaps[i].pg.name =kasprintf (GFP_KERNEL ,"%pOFn" , node); +if (!pcaps[i].pg.name) { +kfree (pcaps[i].pattrs); +kfree (pcaps[i].pg.attrs); + goto out_pcaps_pattrs; + } +if (has_min) {powercap_add_attr (min,"powercap-min" , &pcaps[i].pattrs[j]);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 12/417 powerpc/imc-pmu: Add a null pointer check in update_events_in_group()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunwu Chan <[email protected]>
[ Upstream commit 0a233867a39078ebb0f575e2948593bbff5826b3 ]
kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure.
--- arch/powerpc/perf/imc-pmu.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/powerpc/perf/imc-pmu.c +6 -0
@@ -299,6 +299,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu) attr_group->attrs = attrs; do { ev_val_str = kasprintf(GFP_KERNEL, "event=0x%x", pmu->events[i].value); + if (!ev_val_str) + continue; dev_str = device_str_attr_create(pmu->events[i].name, ev_val_str); if (!dev_str) continue;
@@ -306,6 +308,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu) attrs[j++] = dev_str;if (pmu->events[i].scale) { ev_scale_str =kasprintf (GFP_KERNEL ,"%s.scale" , pmu->events[i].name); +if (!ev_scale_str) +continue ; dev_str =device_str_attr_create (ev_scale_str, pmu->events[i].scale);if (!dev_str)continue ;
@@ -315,6 +319,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu)if (pmu->events[i].unit) { ev_unit_str =kasprintf (GFP_KERNEL ,"%s.unit" , pmu->events[i].name); +if (!ev_unit_str) +continue ; dev_str =device_str_attr_create (ev_unit_str, pmu->events[i].unit);if (!dev_str)continue ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 13/417 spi: spi-zynqmp-gqspi: fix driver kconfig dependencies
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amit Kumar Mahapatra <[email protected]>
[ Upstream commit 424a8166764e462258fdccaaefbdeb07517c8b21 ]
ZynqMP GQSPI driver no longer uses spi-master framework. It had been converted to use spi-mem framework. So remove driver dependency from spi-master and replace it with spi-mem.
--- drivers/spi/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/Kconfig +2 -1
@@ -1101,9 +1101,10 @@ config SPI_ZYNQ_QSPI config SPI_ZYNQMP_GQSPI tristate "Xilinx ZynqMP GQSPI controller" - depends on (SPI_MASTER && HAS_DMA) || COMPILE_TEST + depends on (SPI_MEM && HAS_DMA) || COMPILE_TEST help Enables Xilinx GQSPI controller driver for Zynq UltraScale+ MPSoC. + This controller only supports SPI memory interface. config SPI_AMD tristate "AMD SPI controller"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 14/417 mtd: rawnand: Increment IFC_TIMEOUT_MSECS for nand controller response
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ronald Monthero <[email protected]>
[ Upstream commit 923fb6238cb3ac529aa2bf13b3b1e53762186a8b ]
Under heavy load it is likely that the controller is done with its own task but the thread unlocking the wait is not scheduled in time. Increasing IFC_TIMEOUT_MSECS allows the controller to respond within allowable timeslice of 1 sec.
fsl,ifc-nand 7e800000.nand: Controller is not responding
[<804b2047>] (nand_get_device) from [<804b5335>] (nand_write_oob+0x1b/0x4a) [<804b5335>] (nand_write_oob) from [<804a3585>] (mtd_write+0x41/0x5c) [<804a3585>] (mtd_write) from [<804c1d47>] (ubi_io_write+0x17f/0x22c) [<804c1d47>] (ubi_io_write) from [<804c047b>] (ubi_eba_write_leb+0x5b/0x1d0)
--- drivers/mtd/nand/raw/fsl_ifc_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/fsl_ifc_nand.c +1 -1
@@ -20,7 +20,7 @@#define ERR_BYTE 0xFF/* Value returned for read bytes when read failed */ -#define IFC_TIMEOUT_MSECS 500/* Maximum number of mSecs to wait +#define IFC_TIMEOUT_MSECS 1000/* Maximum timeout to wait for IFC NAND Machine */ struct fsl_ifc_ctrl ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 15/417 ACPI: video: check for error while searching for backlight device parent
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Kiryushin <[email protected]>
[ Upstream commit ccd45faf4973746c4f30ea41eec864e5cf191099 ]
If acpi_get_parent() called in acpi_video_dev_register_backlight() fails, for example, because acpi_ut_acquire_mutex() fails inside acpi_get_parent), this can lead to incorrect (uninitialized) acpi_parent handle being passed to acpi_get_pci_dev() for detecting the parent pci device.
Check acpi_get_parent() result and set parent device only in case of success.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/acpi/acpi_video.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/acpi/acpi_video.c +6 -6
@@ -1726,12 +1726,12 @@ static void acpi_video_dev_register_backlight(struct acpi_video_device *device)return ; count++; -acpi_get_parent (device->dev->handle, &acpi_parent); - - pdev =acpi_get_pci_dev (acpi_parent); -if (pdev) { - parent = &pdev->dev; -pci_dev_put (pdev); +if (ACPI_SUCCESS (acpi_get_parent (device->dev->handle, &acpi_parent))) { + pdev =acpi_get_pci_dev (acpi_parent); +if (pdev) { + parent = &pdev->dev; +pci_dev_put (pdev); + } }memset (&props,0 ,sizeof (struct backlight_properties ));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 16/417 ACPI: LPIT: Avoid u32 multiplication overflow
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Kiryushin <[email protected]>
[ Upstream commit 56d2eeda87995245300836ee4dbd13b002311782 ]
In lpit_update_residency() there is a possibility of overflow in multiplication, if tsc_khz is large enough (> UINT_MAX/1000).
Change multiplication to mul_u32_u32().
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/acpi/acpi_lpit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/acpi_lpit.c +1 -1
@@ -98,7 +98,7 @@ static void lpit_update_residency(struct lpit_residency_info *info, struct acpi_lpit_native *lpit_native) { info->frequency = lpit_native->counter_frequency ? - lpit_native->counter_frequency : tsc_khz *1000 ; + lpit_native->counter_frequency :mul_u32_u32 (tsc_khz,1000U );if (!info->frequency) info->frequency =1 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 17/417 KEYS: encrypted: Add check for strsep
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit b4af096b5df5dd131ab796c79cedc7069d8f4882 ]
Add check for strsep() in order to transfer the error.
--- security/keys/encrypted-keys/encrypted.c | 4 ++++ 1 file changed, 4 insertions(+)
security/keys/encrypted-keys/encrypted.c +4 -0
@@ -237,6 +237,10 @@ static int datablob_parse(char *datablob, const char **format,break ; } *decrypted_data =strsep (&datablob," \t" ); +if (!*decrypted_data) { +pr_info ("encrypted_key: decrypted_data is missing\n" ); +break ; + } ret =0 ;break ;case Opt_load:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 18/417 platform/x86/intel/vsec: Enhance and Export intel_vsec_add_aux()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Pandruvada <[email protected]>
[ Upstream commit 251a41116aebdbb7ff00fbc635b1c1a0f08119e6 ]
Remove static for intel_vsec_add_aux() and export this interface so that it can be used by other vsec related modules.
This driver creates aux devices by parsing PCI-VSEC, which allows individual drivers to load on those devices. Those driver may further create more devices on aux bus by parsing the PCI MMIO region.
For example, TPMI (Topology Aware Register and PM Capsule Interface) creates device nodes for power management features by parsing MMIO region.
When TPMI driver creates devices, it can reuse existing function intel_vsec_add_aux() to create aux devices with TPMI device as the parent.
Stable-dep-of: 8cbcc1dbf8a6 ("platform/x86/intel/vsec: Fix xa_alloc memory leak")
--- drivers/platform/x86/intel/vsec.c | 16 +++++++++++----- drivers/platform/x86/intel/vsec.h | 4 ++++ 2 files changed, 15 insertions(+), 5 deletions(-)
drivers/platform/x86/intel/vsec.c +11 -5
@@ -133,8 +133,9 @@ static void intel_vsec_dev_release(struct device *dev)kfree (intel_vsec_dev); } -static int intel_vsec_add_aux (struct pci_dev *pdev,struct intel_vsec_device *intel_vsec_dev, -const char *name) +int intel_vsec_add_aux (struct pci_dev *pdev,struct device *parent, +struct intel_vsec_device *intel_vsec_dev, +const char *name) {struct auxiliary_device *auxdev = &intel_vsec_dev->auxdev;int ret, id;
@@ -146,9 +147,12 @@ static int intel_vsec_add_aux(struct pci_dev *pdev, struct intel_vsec_device *inreturn ret; } +if (!parent) + parent = &pdev->dev; + auxdev->id = ret; auxdev->name = name; - auxdev->dev.parent = &pdev->dev; + auxdev->dev.parent = parent; auxdev->dev.release = intel_vsec_dev_release; ret =auxiliary_device_init (auxdev);
@@ -165,7 +169,7 @@ static int intel_vsec_add_aux(struct pci_dev *pdev, struct intel_vsec_device *inreturn ret; } - ret =devm_add_action_or_reset (&pdev->dev, intel_vsec_remove_aux, + ret =devm_add_action_or_reset (parent, intel_vsec_remove_aux, auxdev);if (ret <0 )return ret;
@@ -178,6 +182,7 @@ static int intel_vsec_add_aux(struct pci_dev *pdev, struct intel_vsec_device *inreturn 0 ; } +EXPORT_SYMBOL_NS_GPL (intel_vsec_add_aux,INTEL_VSEC );static int intel_vsec_add_dev (struct pci_dev *pdev,struct intel_vsec_header *header,struct intel_vsec_platform_info *info)
@@ -235,7 +240,8 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *heelse intel_vsec_dev->ida = &intel_vsec_ida; -return intel_vsec_add_aux (pdev, intel_vsec_dev,intel_vsec_name (header->id)); +return intel_vsec_add_aux (pdev,NULL , intel_vsec_dev, +intel_vsec_name (header->id)); } static bool intel_vsec_walk_header(struct pci_dev *pdev,
drivers/platform/x86/intel/vsec.h +4 -0
@@ -40,6 +40,10 @@ struct intel_vsec_device {int num_resources; }; +int intel_vsec_add_aux (struct pci_dev *pdev,struct device *parent, +struct intel_vsec_device *intel_vsec_dev, +const char *name); +static inline struct intel_vsec_device *dev_to_ivdev (struct device *dev) { return container_of(dev, struct intel_vsec_device, auxdev.dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 19/417 platform/x86/intel/vsec: Support private data
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Pandruvada <[email protected]>
[ Upstream commit 4ec5d0231d2e4aebe41152d57c6b4f1e7ea14f08 ]
Add fields to struct intel_vsec_device, so that core module (which creates aux bus devices) can pass private data to the client drivers.
For example there is one vsec device instance per CPU package. On a multi package system, this private data can be used to pass the package ID. This package id can be used by client drivers to change power settings for a specific CPU package by targeting MMIO space of the correct PCI device.
Stable-dep-of: 8cbcc1dbf8a6 ("platform/x86/intel/vsec: Fix xa_alloc memory leak")
--- drivers/platform/x86/intel/vsec.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/platform/x86/intel/vsec.h +2 -0
@@ -38,6 +38,8 @@ struct intel_vsec_device {struct ida *ida;struct intel_vsec_platform_info *info;int num_resources; +void *priv_data; +size_t priv_data_size; }; int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 20/417 platform/x86/intel/vsec: Use mutex for ida_alloc() and ida_free()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Pandruvada <[email protected]>
[ Upstream commit 9a90ea7d378486aa358330dafc7e8c3b27de4d84 ]
ID alloc and free functions don't have in built protection for parallel invocation of ida_alloc() and ida_free(). With the current flow in the vsec driver, there is no such scenario. But add mutex protection for potential future changes.
Stable-dep-of: 8cbcc1dbf8a6 ("platform/x86/intel/vsec: Fix xa_alloc memory leak")
--- drivers/platform/x86/intel/vsec.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/platform/x86/intel/vsec.c +9 -0
@@ -124,11 +124,16 @@ static void intel_vsec_remove_aux(void *data)auxiliary_device_uninit (data); } +static DEFINE_MUTEX (vsec_ida_lock); +static void intel_vsec_dev_release (struct device *dev) {struct intel_vsec_device *intel_vsec_dev =dev_to_ivdev (dev); +mutex_lock (&vsec_ida_lock);ida_free (intel_vsec_dev->ida, intel_vsec_dev->auxdev.id); +mutex_unlock (&vsec_ida_lock); +kfree (intel_vsec_dev->resource);kfree (intel_vsec_dev); }
@@ -140,7 +145,9 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,struct auxiliary_device *auxdev = &intel_vsec_dev->auxdev;int ret, id; +mutex_lock (&vsec_ida_lock); ret =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL ); +mutex_unlock (&vsec_ida_lock);if (ret <0 ) {kfree (intel_vsec_dev->resource);kfree (intel_vsec_dev);
@@ -157,7 +164,9 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent, ret =auxiliary_device_init (auxdev);if (ret <0 ) { +mutex_lock (&vsec_ida_lock);ida_free (intel_vsec_dev->ida, auxdev->id); +mutex_unlock (&vsec_ida_lock);kfree (intel_vsec_dev->resource);kfree (intel_vsec_dev);return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 21/417 platform/x86/intel/vsec: Fix xa_alloc memory leak
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: David E. Box <[email protected]>
[ Upstream commit 8cbcc1dbf8a62c730fadd60de761e0658547a589 ]
Commit 936874b77dd0 ("platform/x86/intel/vsec: Add PCI error recovery support to Intel PMT") added an xarray to track the list of vsec devices to be recovered after a PCI error. But it did not provide cleanup for the list leading to a memory leak that was caught by kmemleak. Do xa_alloc() before devm_add_action_or_reset() so that the list may be cleaned up with xa_erase() in the release function.
[[email protected]: Add missing xa_erase() on error-exit
--- drivers/platform/x86/intel/vsec.c | 25 +++++++++++++++---------- drivers/platform/x86/intel/vsec.h | 1 + 2 files changed, 16 insertions(+), 10 deletions(-)
drivers/platform/x86/intel/vsec.c +15 -10
@@ -130,6 +130,8 @@ static void intel_vsec_dev_release(struct device *dev) {struct intel_vsec_device *intel_vsec_dev =dev_to_ivdev (dev); +xa_erase (&auxdev_array, intel_vsec_dev->id); +mutex_lock (&vsec_ida_lock);ida_free (intel_vsec_dev->ida, intel_vsec_dev->auxdev.id);mutex_unlock (&vsec_ida_lock);
@@ -145,19 +147,28 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,struct auxiliary_device *auxdev = &intel_vsec_dev->auxdev;int ret, id; -mutex_lock (&vsec_ida_lock); - ret =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL ); -mutex_unlock (&vsec_ida_lock); + ret =xa_alloc (&auxdev_array, &intel_vsec_dev->id, intel_vsec_dev, +PMT_XA_LIMIT ,GFP_KERNEL );if (ret <0 ) {kfree (intel_vsec_dev->resource);kfree (intel_vsec_dev);return ret; } +mutex_lock (&vsec_ida_lock); + id =ida_alloc (intel_vsec_dev->ida,GFP_KERNEL ); +mutex_unlock (&vsec_ida_lock); +if (id <0 ) { +xa_erase (&auxdev_array, intel_vsec_dev->id); +kfree (intel_vsec_dev->resource); +kfree (intel_vsec_dev); +return id; + } +if (!parent) parent = &pdev->dev; - auxdev->id = ret; + auxdev->id = id; auxdev->name = name; auxdev->dev.parent = parent; auxdev->dev.release = intel_vsec_dev_release;
@@ -183,12 +194,6 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,if (ret <0 )return ret; -/* Add auxdev to list */ - ret =xa_alloc (&auxdev_array, &id, intel_vsec_dev,PMT_XA_LIMIT , -GFP_KERNEL ); -if (ret) -return ret; -return 0 ; }EXPORT_SYMBOL_NS_GPL (intel_vsec_add_aux,INTEL_VSEC );
drivers/platform/x86/intel/vsec.h +1 -0
@@ -38,6 +38,7 @@ struct intel_vsec_device {struct ida *ida;struct intel_vsec_platform_info *info;int num_resources; +int id;/* xa */ void *priv_data;size_t priv_data_size; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 22/417 of: Add of_property_present() helper
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring <[email protected]>
[ Upstream commit 9cbad37ce8122de32a1529e394b468bc101c9e7f ]
Add an of_property_present() function similar to fwnode_property_present(). of_property_read_bool() could be used directly, but it is cleaner to not use it on non-boolean properties.
Stable-dep-of: c4a5118a3ae1 ("cpufreq: scmi: process the result of devm_of_clk_add_hw_provider()")
--- include/linux/of.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
include/linux/of.h +16 -1
@@ -1155,7 +1155,8 @@ static inline int of_property_read_string_index(const struct device_node *np,* @np: device node from which the property value is to be read. * @propname: name of the property to be searched. * -* Search for a property in a device node. +* Search for a boolean property in a device node. Usage on non-boolean +* property types is deprecated. * * Return: true if the property exists false otherwise. */
@@ -1167,6 +1168,20 @@ static inline bool of_property_read_bool(const struct device_node *np,return prop ? true : false; } +/** +* of_property_present - Test if a property is present in a node +* @np: device node to search for the property. +* @propname: name of the property to be searched. +* +* Test for a property present in a device node. +* +* Return: true if the property exists false otherwise. +*/ +static inline bool of_property_present (const struct device_node *np,const char *propname) +{ +return of_property_read_bool (np, propname); +} +/** * of_property_read_u8_array - Find and read an array of u8 from a property. *
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 23/417 cpufreq: Use of_property_present() for testing DT property presence
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring <[email protected]>
[ Upstream commit b8f3a396a7ee43e6079176cc0fb8de2b95a23681 ]
It is preferred to use typed property access functions (i.e. of_property_read_<type> functions) rather than low-level of_get_property/of_find_property functions for reading properties. As part of this, convert of_get_property/of_find_property calls to the recently added of_property_present() helper when we just want to test for presence of a property and nothing more.
Stable-dep-of: c4a5118a3ae1 ("cpufreq: scmi: process the result of devm_of_clk_add_hw_provider()")
--- drivers/cpufreq/cpufreq-dt-platdev.c | 2 +- drivers/cpufreq/imx-cpufreq-dt.c | 2 +- drivers/cpufreq/imx6q-cpufreq.c | 4 ++-- drivers/cpufreq/scmi-cpufreq.c | 2 +- drivers/cpufreq/tegra20-cpufreq.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
drivers/cpufreq/cpufreq-dt-platdev.c +1 -1
@@ -176,7 +176,7 @@ static bool __init cpu0_node_has_opp_v2_prop(void)struct device_node *np =of_cpu_device_node_get (0 );bool ret = false; -if (of_get_property (np,"operating-points-v2" ,NULL )) +if (of_property_present (np,"operating-points-v2" )) ret = true;of_node_put (np);
drivers/cpufreq/imx-cpufreq-dt.c +1 -1
@@ -89,7 +89,7 @@ static int imx_cpufreq_dt_probe(struct platform_device *pdev) cpu_dev =get_cpu_device (0 ); -if (!of_find_property (cpu_dev->of_node,"cpu-supply" ,NULL )) +if (!of_property_present (cpu_dev->of_node,"cpu-supply" ))return -ENODEV ;if (of_machine_is_compatible ("fsl,imx7ulp" )) {
drivers/cpufreq/imx6q-cpufreq.c +2 -2
@@ -230,7 +230,7 @@ static int imx6q_opp_check_speed_grading(struct device *dev)u32 val;int ret; -if (of_find_property (dev->of_node,"nvmem-cells" ,NULL )) { +if (of_property_present (dev->of_node,"nvmem-cells" )) { ret =nvmem_cell_read_u32 (dev,"speed_grade" , &val);if (ret)return ret;
@@ -285,7 +285,7 @@ static int imx6ul_opp_check_speed_grading(struct device *dev)u32 val;int ret =0 ; -if (of_find_property (dev->of_node,"nvmem-cells" ,NULL )) { +if (of_property_present (dev->of_node,"nvmem-cells" )) { ret =nvmem_cell_read_u32 (dev,"speed_grade" , &val);if (ret)return ret;
drivers/cpufreq/scmi-cpufreq.c +1 -1
@@ -310,7 +310,7 @@ static int scmi_cpufreq_probe(struct scmi_device *sdev)#ifdef CONFIG_COMMON_CLK /* dummy clock provider as needed by OPP if clocks property is used */ -if (of_find_property (dev->of_node,"#clock-cells" ,NULL )) +if (of_property_present (dev->of_node,"#clock-cells" ))devm_of_clk_add_hw_provider (dev, of_clk_hw_simple_get,NULL );#endif
drivers/cpufreq/tegra20-cpufreq.c +1 -1
@@ -25,7 +25,7 @@ static bool cpu0_node_has_opp_v2_prop(void)struct device_node *np =of_cpu_device_node_get (0 );bool ret = false; -if (of_get_property (np,"operating-points-v2" ,NULL )) +if (of_property_present (np,"operating-points-v2" )) ret = true;of_node_put (np);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 24/417 cpufreq: scmi: process the result of devm_of_clk_add_hw_provider()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandra Diupina <[email protected]>
[ Upstream commit c4a5118a3ae1eadc687d84eef9431f9e13eb015c ]
devm_of_clk_add_hw_provider() may return an errno, so add a return value check
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/cpufreq/scmi-cpufreq.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/cpufreq/scmi-cpufreq.c +5 -2
@@ -310,8 +310,11 @@ static int scmi_cpufreq_probe(struct scmi_device *sdev)#ifdef CONFIG_COMMON_CLK /* dummy clock provider as needed by OPP if clocks property is used */ -if (of_property_present (dev->of_node,"#clock-cells" )) -devm_of_clk_add_hw_provider (dev, of_clk_hw_simple_get,NULL ); +if (of_property_present (dev->of_node,"#clock-cells" )) { + ret =devm_of_clk_add_hw_provider (dev, of_clk_hw_simple_get,NULL ); +if (ret) +return dev_err_probe (dev, ret,"%s: registering clock provider failed\n" , __func__); + }#endif ret =cpufreq_register_driver (&scmi_cpufreq_driver);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 25/417 calipso: fix memory leak in netlbl_calipso_add_pass()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gavrilov Ilia <[email protected]>
[ Upstream commit ec4e9d630a64df500641892f4e259e8149594a99 ]
If IPv6 support is disabled at boot (ipv6.disable=1),
the calipso_init() -> netlbl_calipso_ops_register() function isn't called, and the netlbl_calipso_ops_get() function always returns NULL. In this case, the netlbl_calipso_add_pass() function allocates memory for the doi_def variable but doesn't free it with the calipso_doi_free().
BUG: memory leak
unreferenced object 0xffff888011d68180 (size 64):
comm "syz-executor.1", pid 10746, jiffies 4295410986 (age 17.928s)
hex dump (first 32 bytes):
00 00 00 00 02 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<...>] kmalloc include/linux/slab.h:552 [inline]
[<...>] netlbl_calipso_add_pass net/netlabel/netlabel_calipso.c:76 [inline]
[<...>] netlbl_calipso_add+0x22e/0x4f0 net/netlabel/netlabel_calipso.c:111
[<...>] genl_family_rcv_msg_doit+0x22f/0x330 net/netlink/genetlink.c:739
[<...>] genl_family_rcv_msg net/netlink/genetlink.c:783 [inline]
[<...>] genl_rcv_msg+0x341/0x5a0 net/netlink/genetlink.c:800
[<...>] netlink_rcv_skb+0x14d/0x440 net/netlink/af_netlink.c:2515
[<...>] genl_rcv+0x29/0x40 net/netlink/genetlink.c:811
[<...>] netlink_unicast_kernel net/netlink/af_netlink.c:1313 [inline]
[<...>] netlink_unicast+0x54b/0x800 net/netlink/af_netlink.c:1339
[<...>] netlink_sendmsg+0x90a/0xdf0 net/netlink/af_netlink.c:1934
[<...>] sock_sendmsg_nosec net/socket.c:651 [inline]
[<...>] sock_sendmsg+0x157/0x190 net/socket.c:671
[<...>] ____sys_sendmsg+0x712/0x870 net/socket.c:2342
[<...>] ___sys_sendmsg+0xf8/0x170 net/socket.c:2396
[<...>] __sys_sendmsg+0xea/0x1b0 net/socket.c:2429
[<...>] do_syscall_64+0x30/0x40 arch/x86/entry/common.c:46
[<...>] entry_SYSCALL_64_after_hwframe+0x61/0xc6Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with Syzkaller
--- net/netlabel/netlabel_calipso.c | 49 +++++++++++++++++---------------- 1 file changed, 26 insertions(+), 23 deletions(-)
net/netlabel/netlabel_calipso.c +26 -23
@@ -54,6 +54,28 @@ static const struct nla_policy calipso_genl_policy[NLBL_CALIPSO_A_MAX + 1] = { [NLBL_CALIPSO_A_MTYPE] = { .type = NLA_U32 }, }; +static const struct netlbl_calipso_ops *calipso_ops; + +/** +* netlbl_calipso_ops_register - Register the CALIPSO operations +* @ops: ops to register +* +* Description: +* Register the CALIPSO packet engine operations. +* +*/ +const struct netlbl_calipso_ops * +netlbl_calipso_ops_register (const struct netlbl_calipso_ops *ops) +{ +return xchg (&calipso_ops, ops); +} +EXPORT_SYMBOL (netlbl_calipso_ops_register); + +static const struct netlbl_calipso_ops *netlbl_calipso_ops_get (void ) +{ +return READ_ONCE (calipso_ops); +} +/* NetLabel Command Handlers */ /**
@@ -96,15 +118,18 @@ static int netlbl_calipso_add_pass(struct genl_info *info,* */ static int netlbl_calipso_add (struct sk_buff *skb,struct genl_info *info) - {int ret_val = -EINVAL ;struct netlbl_audit audit_info; +const struct netlbl_calipso_ops *ops =netlbl_calipso_ops_get ();if (!info->attrs[NLBL_CALIPSO_A_DOI ] || !info->attrs[NLBL_CALIPSO_A_MTYPE ])return -EINVAL ; +if (!ops) +return -EOPNOTSUPP ; +netlbl_netlink_auditinfo (&audit_info);switch (nla_get_u32 (info->attrs[NLBL_CALIPSO_A_MTYPE ])) {case CALIPSO_MAP_PASS :
@@ -363,28 +388,6 @@ int __init netlbl_calipso_genl_init(void)return genl_register_family (&netlbl_calipso_gnl_family); } -static const struct netlbl_calipso_ops *calipso_ops; - -/** -* netlbl_calipso_ops_register - Register the CALIPSO operations -* @ops: ops to register -* -* Description: -* Register the CALIPSO packet engine operations. -* -*/ -const struct netlbl_calipso_ops * -netlbl_calipso_ops_register (const struct netlbl_calipso_ops *ops) -{ -return xchg (&calipso_ops, ops); -} -EXPORT_SYMBOL (netlbl_calipso_ops_register); - -static const struct netlbl_calipso_ops *netlbl_calipso_ops_get (void ) -{ -return READ_ONCE (calipso_ops); -} -/** * calipso_doi_add - Add a new DOI to the CALIPSO protocol engine * @doi_def: the DOI structure
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 26/417 efivarfs: force RO when remounting if SetVariable is not supported
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilias Apalodimas <[email protected]>
[ Upstream commit 0e8d2444168dd519fea501599d150e62718ed2fe ]
If SetVariable at runtime is not supported by the firmware we never assign a callback for that function. At the same time mount the efivarfs as RO so no one can call that. However, we never check the permission flags when someone remounts the filesystem as RW. As a result this leads to a crash looking like this:
$ mount -o remount,rw /sys/firmware/efi/efivars $ efi-updatevar -f PK.auth PK
[ 303.279166] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 [ 303.280482] Mem abort info: [ 303.280854] ESR = 0x0000000086000004 [ 303.281338] EC = 0x21: IABT (current EL), IL = 32 bits [ 303.282016] SET = 0, FnV = 0 [ 303.282414] EA = 0, S1PTW = 0 [ 303.282821] FSC = 0x04: level 0 translation fault [ 303.283771] user pgtable: 4k pages, 48-bit VAs, pgdp=000000004258c000 [ 303.284913] [0000000000000000] pgd=0000000000000000, p4d=0000000000000000 [ 303.286076] Internal error: Oops: 0000000086000004 [#1] PREEMPT SMP [ 303.286936] Modules linked in: qrtr tpm_tis tpm_tis_core crct10dif_ce arm_smccc_trng rng_core drm fuse ip_tables x_tables ipv6 [ 303.288586] CPU: 1 PID: 755 Comm: efi-updatevar Not tainted 6.3.0-rc1-00108-gc7d0c4695c68 #1 [ 303.289748] Hardware name: Unknown Unknown Product/Unknown Product, BIOS 2023.04-00627-g88336918701d 04/01/2023 [ 303.291150] pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 303.292123] pc : 0x0 [ 303.292443] lr : efivar_set_variable_locked+0x74/0xec [ 303.293156] sp : ffff800008673c10 [ 303.293619] x29: ffff800008673c10 x28: ffff0000037e8000 x27: 0000000000000000 [ 303.294592] x26: 0000000000000800 x25: ffff000002467400 x24: 0000000000000027 [ 303.295572] x23: ffffd49ea9832000 x22: ffff0000020c9800 x21: ffff000002467000 [ 303.296566] x20: 0000000000000001 x19: 00000000000007fc x18: 0000000000000000 [ 303.297531] x17: 0000000000000000 x16: 0000000000000000 x15: 0000aaaac807ab54 [ 303.298495] x14: ed37489f673633c0 x13: 71c45c606de13f80 x12: 47464259e219acf4 [ 303.299453] x11: ffff000002af7b01 x10: 0000000000000003 x9 : 0000000000000002 [ 303.300431] x8 : 0000000000000010 x7 : ffffd49ea8973230 x6 : 0000000000a85201 [ 303.301412] x5 : 0000000000000000 x4 : ffff0000020c9800 x3 : 00000000000007fc [ 303.302370] x2 : 0000000000000027 x1 : ffff000002467400 x0 : ffff000002467000 [ 303.303341] Call trace: [ 303.303679] 0x0 [ 303.303938] efivar_entry_set_get_size+0x98/0x16c [ 303.304585] efivarfs_file_write+0xd0/0x1a4 [ 303.305148] vfs_write+0xc4/0x2e4 [ 303.305601] ksys_write+0x70/0x104 [ 303.306073] __arm64_sys_write+0x1c/0x28 [ 303.306622] invoke_syscall+0x48/0x114 [ 303.307156] el0_svc_common.constprop.0+0x44/0xec [ 303.307803] do_el0_svc+0x38/0x98 [ 303.308268] el0_svc+0x2c/0x84 [ 303.308702] el0t_64_sync_handler+0xf4/0x120 [ 303.309293] el0t_64_sync+0x190/0x194 [ 303.309794] Code: ???????? ???????? ???????? ???????? (????????) [ 303.310612] ---[ end trace 0000000000000000 ]---
Fix this by adding a .reconfigure() function to the fs operations which we can use to check the requested flags and deny anything that's not RO if the firmware doesn't implement SetVariable at runtime.
--- fs/efivarfs/super.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/efivarfs/super.c +12 -0
@@ -13,6 +13,7 @@#include <linux/ucs2_string.h> #include <linux/slab.h> #include <linux/magic.h> +#include <linux/printk.h> #include "internal.h"
@@ -226,8 +227,19 @@ static int efivarfs_get_tree(struct fs_context *fc)return get_tree_single (fc, efivarfs_fill_super); } +static int efivarfs_reconfigure (struct fs_context *fc) +{ +if (!efivar_supports_writes () && !(fc->sb_flags &SB_RDONLY )) { +pr_err ("Firmware does not support SetVariableRT. Can not remount with rw\n" ); +return -EINVAL ; + } + +return 0 ; +} +static const struct fs_context_operations efivarfs_context_ops = { .get_tree = efivarfs_get_tree, + .reconfigure = efivarfs_reconfigure, };static int efivarfs_init_fs_context (struct fs_context *fc)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 27/417 efivarfs: Free s_fs_info on unmount
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
[ Upstream commit 547713d502f7b4b8efccd409cff84d731a23853b ]
Now that we allocate a s_fs_info struct on fs context creation, we should ensure that we free it again when the superblock goes away.
--- fs/efivarfs/super.c | 3 +++ 1 file changed, 3 insertions(+)
fs/efivarfs/super.c +3 -0
@@ -250,10 +250,13 @@ static int efivarfs_init_fs_context(struct fs_context *fc)static void efivarfs_kill_sb (struct super_block *sb) { +struct efivarfs_fs_info *sfi = sb->s_fs_info; +kill_litter_super (sb);/* Remove all entries and destroy */ efivar_entry_iter (efivarfs_destroy, &efivarfs_list,NULL ); +kfree (sfi); }static struct file_system_type efivarfs_type = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 28/417 spi: sh-msiof: Enforce fixed DTDL for R-Car H3
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit e5c7bcb499840551cfbe85c6df177ebc50432bf0 ]
Documentation says only DTDL of 200 is allowed for this SoC.
--- drivers/spi/spi-sh-msiof.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/spi/spi-sh-msiof.c +17 -0
@@ -30,12 +30,15 @@#include <asm/unaligned.h> +#define SH_MSIOF_FLAG_FIXED_DTDL_200 BIT(0) +struct sh_msiof_chipdata {u32 bits_per_word_mask;u16 tx_fifo_size;u16 rx_fifo_size;u16 ctlr_flags;u16 min_div_pow; +u32 flags; };struct sh_msiof_spi_priv {
@@ -1073,6 +1076,16 @@ static const struct sh_msiof_chipdata rcar_gen3_data = { .min_div_pow = 1, }; +static const struct sh_msiof_chipdata rcar_r8a7795_data = { + .bits_per_word_mask =SPI_BPW_MASK (8 ) |SPI_BPW_MASK (16 ) | +SPI_BPW_MASK (24 ) |SPI_BPW_MASK (32 ), + .tx_fifo_size =64 , + .rx_fifo_size =64 , + .ctlr_flags =SPI_CONTROLLER_MUST_TX , + .min_div_pow =1 , + .flags =SH_MSIOF_FLAG_FIXED_DTDL_200 , +}; +static const struct of_device_id sh_msiof_match[] = { { .compatible ="renesas,sh-mobile-msiof" , .data = &sh_data }, { .compatible ="renesas,msiof-r8a7743" , .data = &rcar_gen2_data },
@@ -1083,6 +1096,7 @@ static const struct of_device_id sh_msiof_match[] = { { .compatible = "renesas,msiof-r8a7793", .data = &rcar_gen2_data }, { .compatible = "renesas,msiof-r8a7794", .data = &rcar_gen2_data }, { .compatible = "renesas,rcar-gen2-msiof", .data = &rcar_gen2_data }, + { .compatible = "renesas,msiof-r8a7795", .data = &rcar_r8a7795_data }, { .compatible = "renesas,msiof-r8a7796", .data = &rcar_gen3_data }, { .compatible = "renesas,rcar-gen3-msiof", .data = &rcar_gen3_data }, { .compatible = "renesas,rcar-gen4-msiof", .data = &rcar_gen3_data },
@@ -1280,6 +1294,9 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)return -ENXIO ; } +if (chipdata->flags &SH_MSIOF_FLAG_FIXED_DTDL_200 ) + info->dtdl =200 ; +if (info->mode ==MSIOF_SPI_SLAVE ) ctlr =spi_alloc_slave (&pdev->dev,sizeof (struct sh_msiof_spi_priv ));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 29/417 ACPI: LPSS: Fix the fractional clock divider flags
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 3ebccf1d1ca74bbb78e6f8c38d1d172e468d91f8 ]
The conversion to CLK_FRAC_DIVIDER_POWER_OF_TWO_PS uses wrong flags in the parameters and hence miscalculates the values in the clock divider. Fix this by applying the flag to the proper parameter.
--- drivers/acpi/acpi_lpss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/acpi/acpi_lpss.c +2 -1
@@ -450,8 +450,9 @@ static int register_device_clock(struct acpi_device *adev,if (!clk_name)return -ENOMEM ; clk =clk_register_fractional_divider (NULL , clk_name, parent, +0 , prv_base,1 ,15 ,16 ,15 ,CLK_FRAC_DIVIDER_POWER_OF_TWO_PS , - prv_base,1 ,15 ,16 ,15 ,0 ,NULL ); +NULL ); parent = clk_name; clk_name =kasprintf (GFP_KERNEL ,"%s-update" , devname);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 30/417 ACPI: extlog: Clear Extended Error Log status when RAS_CEC handled the error
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Luck <[email protected]>
[ Upstream commit 38c872a9e96f72f2947affc0526cc05659367d3d ]
When both CONFIG_RAS_CEC and CONFIG_ACPI_EXTLOG are enabled, Linux does not clear the status word of the BIOS supplied error record for corrected errors. This may prevent logging of subsequent uncorrected errors.
Fix by clearing the status.
--- drivers/acpi/acpi_extlog.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/acpi/acpi_extlog.c +6 -1
@@ -145,9 +145,14 @@ static int extlog_print(struct notifier_block *nb, unsigned long val,static u32 err_seq; estatus =extlog_elog_entry_check (cpu, bank); -if (estatus ==NULL || (mce->kflags &MCE_HANDLED_CEC )) +if (!estatus)return NOTIFY_DONE ; +if (mce->kflags &MCE_HANDLED_CEC ) { + estatus->block_status =0 ; +return NOTIFY_DONE ; + } +memcpy (elog_buf, (void *)estatus,ELOG_ENTRY_LEN );/* clear record status to enable BIOS to update it again */ estatus->block_status =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 31/417 kunit: debugfs: Fix unchecked dereference in debugfs_print_results()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
[ Upstream commit 34dfd5bb2e5507e69d9b6d6c90f546600c7a4977 ]
Move the call to kunit_suite_has_succeeded() after the check that the kunit_suite pointer is valid.
This was found by smatch:
lib/kunit/debugfs.c:66 debugfs_print_results() warn: variable dereferenced before check 'suite' (see line 63)
--- lib/kunit/debugfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/kunit/debugfs.c +3 -1
@@ -52,12 +52,14 @@ static void debugfs_print_result(struct seq_file *seq,static int debugfs_print_results (struct seq_file *seq,void *v) {struct kunit_suite *suite = (struct kunit_suite *)seq->private; -enum kunit_status success =kunit_suite_has_succeeded (suite); +enum kunit_status success;struct kunit_case *test_case;if (!suite)return 0 ; + success =kunit_suite_has_succeeded (suite); +/* Print KTAP header so the debugfs log can be parsed as valid KTAP. */ seq_puts (seq,"KTAP version 1\n" );seq_puts (seq,"1..1\n" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 32/417 mtd: Fix gluebi NULL pointer dereference caused by ftl notifier
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: ZhaoLong Wang <[email protected]>
[ Upstream commit a43bdc376deab5fff1ceb93dca55bcab8dbdc1d6 ]
If both ftl.ko and gluebi.ko are loaded, the notifier of ftl triggers NULL pointer dereference when trying to access ‘gluebi->desc’ in gluebi_read().
ubi_gluebi_init
ubi_register_volume_notifier
ubi_enumerate_volumes
ubi_notify_all
gluebi_notify nb->notifier_call()
gluebi_create
mtd_device_register
mtd_device_parse_register
add_mtd_device
blktrans_notify_add not->add()
ftl_add_mtd tr->add_mtd()
scan_header
mtd_read
mtd_read_oob
mtd_read_oob_std
gluebi_read mtd->read()
gluebi->desc - NULLDetailed reproduction information available at the Link [1],
In the normal case, obtain gluebi->desc in the gluebi_get_device(), and access gluebi->desc in the gluebi_read(). However, gluebi_get_device() is not executed in advance in the ftl_add_mtd() process, which leads to NULL pointer dereference.
The solution for the gluebi module is to run jffs2 on the UBI volume without considering working with ftl or mtdblock [2]. Therefore, this problem can be avoided by preventing gluebi from creating the mtdblock device after creating mtd partition of the type MTD_UBIVOLUME.
--- drivers/mtd/mtd_blkdevs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/mtd_blkdevs.c +2 -2
@@ -463,7 +463,7 @@ static void blktrans_notify_add(struct mtd_info *mtd) {struct mtd_blktrans_ops *tr; -if (mtd->type ==MTD_ABSENT ) +if (mtd->type ==MTD_ABSENT || mtd->type ==MTD_UBIVOLUME )return ;list_for_each_entry (tr, &blktrans_majors, list)
@@ -503,7 +503,7 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)mutex_lock (&mtd_table_mutex);list_add (&tr->list, &blktrans_majors);mtd_for_each_device (mtd) -if (mtd->type !=MTD_ABSENT ) +if (mtd->type !=MTD_ABSENT && mtd->type !=MTD_UBIVOLUME ) tr->add_mtd (tr, mtd);mutex_unlock (&mtd_table_mutex);return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 33/417 selinux: Fix error priority for bind with AF_UNSPEC on PF_INET6 socket
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mickaël Salaün <[email protected]>
[ Upstream commit bbf5a1d0e5d0fb3bdf90205aa872636122692a50 ]
The IPv6 network stack first checks the sockaddr length (-EINVAL error) before checking the family (-EAFNOSUPPORT error).
This was discovered thanks to commit a549d055a22e ("selftests/landlock:
Add network tests").
--- security/selinux/hooks.c | 7 +++++++ 1 file changed, 7 insertions(+)
security/selinux/hooks.c +7 -0
@@ -4690,6 +4690,13 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, inreturn -EINVAL ; addr4 = (struct sockaddr_in *)address;if (family_sa ==AF_UNSPEC ) { +if (family ==PF_INET6 ) { +/* Length check from inet6_bind_sk() */ +if (addrlen <SIN6_LEN_RFC2133 ) +return -EINVAL ; +/* Family check from __inet6_bind() */ + goto err_af; + }/* see __inet_bind(), we only want to allow * AF_UNSPEC if the address is INADDR_ANY */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 34/417 crypto: virtio - Handle dataq logic with tasklet
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gonglei (Arei) <[email protected]>
[ Upstream commit fed93fb62e05c38152b0fc1dc9609639e63eed76 ]
Doing ipsec produces a spinlock recursion warning.
This is due to crypto_finalize_request() being called in the upper half. Move virtual data queue processing of virtio-crypto driver to tasklet.
--- drivers/crypto/virtio/virtio_crypto_common.h | 2 ++ drivers/crypto/virtio/virtio_crypto_core.c | 23 +++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-)
drivers/crypto/virtio/virtio_crypto_common.h +2 -0
@@ -10,6 +10,7 @@#include <linux/virtio.h> #include <linux/crypto.h> #include <linux/spinlock.h> +#include <linux/interrupt.h> #include <crypto/aead.h> #include <crypto/aes.h> #include <crypto/engine.h>
@@ -28,6 +29,7 @@ struct data_queue {char name[32 ];struct crypto_engine *engine; +struct tasklet_struct done_task; };struct virtio_crypto {
drivers/crypto/virtio/virtio_crypto_core.c +13 -10
@@ -72,27 +72,28 @@ int virtio_crypto_ctrl_vq_request(struct virtio_crypto *vcrypto, struct scatterlreturn 0 ; } -static void virtcrypto_dataq_callback (struct virtqueue *vq) +static void virtcrypto_done_task (unsigned long data) { -struct virtio_crypto *vcrypto = vq->vdev->priv; +struct data_queue *data_vq = (struct data_queue *)data; +struct virtqueue *vq = data_vq->vq;struct virtio_crypto_request *vc_req; -unsigned long flags;unsigned int len; -unsigned int qid = vq->index; -spin_lock_irqsave (&vcrypto->data_vq[qid].lock, flags);do {virtqueue_disable_cb (vq);while ((vc_req =virtqueue_get_buf (vq, &len)) !=NULL ) { -spin_unlock_irqrestore ( - &vcrypto->data_vq[qid].lock, flags);if (vc_req->alg_cb) vc_req->alg_cb (vc_req, len); -spin_lock_irqsave ( - &vcrypto->data_vq[qid].lock, flags); } }while (!virtqueue_enable_cb (vq)); -spin_unlock_irqrestore (&vcrypto->data_vq[qid].lock, flags); +} + +static void virtcrypto_dataq_callback (struct virtqueue *vq) +{ +struct virtio_crypto *vcrypto = vq->vdev->priv; +struct data_queue *dq = &vcrypto->data_vq[vq->index]; + +tasklet_schedule (&dq->done_task); }static int virtcrypto_find_vqs (struct virtio_crypto *vi)
@@ -150,6 +151,8 @@ static int virtcrypto_find_vqs(struct virtio_crypto *vi) ret = -ENOMEM ; goto err_engine; } +tasklet_init (&vi->data_vq[i].done_task, virtcrypto_done_task, + (unsigned long )&vi->data_vq[i]); }kfree (names);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 35/417 crypto: sa2ul - Return crypto_aead_setkey to transfer the error
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit ce852f1308ac738e61c5b2502517deea593a1554 ]
Return crypto_aead_setkey() in order to transfer the error if it fails.
--- drivers/crypto/sa2ul.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/crypto/sa2ul.c +1 -2
@@ -1868,9 +1868,8 @@ static int sa_aead_setkey(struct crypto_aead *authenc,crypto_aead_set_flags (ctx->fallback.aead,crypto_aead_get_flags (authenc) &CRYPTO_TFM_REQ_MASK ); -crypto_aead_setkey (ctx->fallback.aead, key, keylen); -return 0 ; +return crypto_aead_setkey (ctx->fallback.aead, key, keylen); }static int sa_aead_setauthsize (struct crypto_aead *tfm,unsigned int authsize)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 36/417 crypto: ccp - fix memleak in ccp_init_dm_workarea
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dinghao Liu <[email protected]>
[ Upstream commit a1c95dd5bc1d6a5d7a75a376c2107421b7d6240d ]
When dma_map_single() fails, wa->address is supposed to be freed by the callers of ccp_init_dm_workarea() through ccp_dm_free(). However, many of the call spots don't expect to have to call ccp_dm_free() on failure of ccp_init_dm_workarea(), which may lead to a memleak. Let's free wa->address in ccp_init_dm_workarea() when dma_map_single() fails.
--- drivers/crypto/ccp/ccp-ops.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/ccp/ccp-ops.c +4 -1
@@ -179,8 +179,11 @@ static int ccp_init_dm_workarea(struct ccp_dm_workarea *wa, wa->dma.address =dma_map_single (wa->dev, wa->address, len, dir); -if (dma_mapping_error (wa->dev, wa->dma.address)) +if (dma_mapping_error (wa->dev, wa->dma.address)) { +kfree (wa->address); + wa->address =NULL ;return -ENOMEM ; + } wa->dma.length = len; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 37/417 crypto: af_alg - Disallow multiple in-flight AIO requests
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
[ Upstream commit 67b164a871af1d736f131fd6fe78a610909f06f3 ]
Having multiple in-flight AIO requests results in unpredictable output because they all share the same IV. Fix this by only allowing one request at a time.
--- crypto/af_alg.c | 14 +++++++++++++- include/crypto/if_alg.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-)
crypto/af_alg.c +13 -1
@@ -1045,9 +1045,13 @@ EXPORT_SYMBOL_GPL(af_alg_sendpage);void af_alg_free_resources (struct af_alg_async_req *areq) {struct sock *sk = areq->sk; +struct af_alg_ctx *ctx;af_alg_free_areq_sgls (areq);sock_kfree_s (sk, areq, areq->areqlen); + + ctx =alg_sk (sk)->private; + ctx->inflight = false; }EXPORT_SYMBOL_GPL (af_alg_free_resources);
@@ -1117,11 +1121,19 @@ EXPORT_SYMBOL_GPL(af_alg_poll);struct af_alg_async_req *af_alg_alloc_areq (struct sock *sk,unsigned int areqlen) { -struct af_alg_async_req *areq =sock_kmalloc (sk, areqlen,GFP_KERNEL ); +struct af_alg_ctx *ctx =alg_sk (sk)->private; +struct af_alg_async_req *areq; + +/* Only one AIO request can be in flight. */ +if (ctx->inflight) +return ERR_PTR (-EBUSY ); + areq =sock_kmalloc (sk, areqlen,GFP_KERNEL );if (unlikely (!areq))return ERR_PTR (-ENOMEM ); + ctx->inflight = true; + areq->areqlen = areqlen; areq->sk = sk; areq->last_rsgl =NULL ;
include/crypto/if_alg.h +3 -0
@@ -138,6 +138,7 @@ struct af_alg_async_req {* recvmsg is invoked. * @init: True if metadata has been sent. * @len: Length of memory allocated for this data structure. +* @inflight: Non-zero when AIO requests are in flight. */ struct af_alg_ctx {struct list_head tsgl_list;
@@ -156,6 +157,8 @@ struct af_alg_ctx {bool init;unsigned int len; + +unsigned int inflight; };int af_alg_register_type (const struct af_alg_type *type);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 38/417 crypto: safexcel - Add error handling for dma_map_sg() calls
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
[ Upstream commit 87e02063d07708cac5bfe9fd3a6a242898758ac8 ]
Macro dma_map_sg() may return 0 on error. This patch enables checks in case of the macro failure and ensures unmapping of previously mapped buffers with dma_unmap_sg().
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- .../crypto/inside-secure/safexcel_cipher.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/crypto/inside-secure/safexcel_cipher.c +11 -8
@@ -742,9 +742,9 @@ static int safexcel_send_req(struct crypto_async_request *base, int ring, max(totlen_src, totlen_dst));return -EINVAL ; } -if (sreq->nr_src >0 ) -dma_map_sg (priv->dev, src, sreq->nr_src, -DMA_BIDIRECTIONAL ); +if (sreq->nr_src >0 && + !dma_map_sg (priv->dev, src, sreq->nr_src,DMA_BIDIRECTIONAL )) +return -EIO ; }else {if (unlikely (totlen_src && (sreq->nr_src <=0 ))) { dev_err(priv->dev, "Source buffer not large enough (need %d bytes)!",
@@ -752,8 +752,9 @@ static int safexcel_send_req(struct crypto_async_request *base, int ring,return -EINVAL ; } -if (sreq->nr_src >0 ) -dma_map_sg (priv->dev, src, sreq->nr_src,DMA_TO_DEVICE ); +if (sreq->nr_src >0 && + !dma_map_sg (priv->dev, src, sreq->nr_src,DMA_TO_DEVICE )) +return -EIO ;if (unlikely (totlen_dst && (sreq->nr_dst <=0 ))) { dev_err(priv->dev, "Dest buffer not large enough (need %d bytes)!",
@@ -762,9 +763,11 @@ static int safexcel_send_req(struct crypto_async_request *base, int ring, goto unmap; } -if (sreq->nr_dst >0 ) -dma_map_sg (priv->dev, dst, sreq->nr_dst, -DMA_FROM_DEVICE ); +if (sreq->nr_dst >0 && + !dma_map_sg (priv->dev, dst, sreq->nr_dst,DMA_FROM_DEVICE )) { + ret = -EIO ; + goto unmap; + } }memcpy (ctx->base.ctxr->data, ctx->key, ctx->key_len);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 39/417 crypto: sahara - remove FLAGS_NEW_KEY logic
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit 8fd183435728b139248a77978ea3732039341779 ]
Remove the FLAGS_NEW_KEY logic as it has the following issues:
- the wrong key may end up being used when there are multiple data streams:
t1 t2
setkey()
encrypt()
setkey()
encrypt()
encrypt() <--- key from t2 is used
- switching between encryption and decryption with the same key is not possible, as the hdr flags are only updated when a new setkey() is performed
With this change, the key is always sent along with the cryptdata when performing encryption/decryption operations.
--- drivers/crypto/sahara.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-)
drivers/crypto/sahara.c +13 -21
@@ -44,7 +44,6 @@#define FLAGS_MODE_MASK 0x000f#define FLAGS_ENCRYPT BIT(0)#define FLAGS_CBC BIT(1) -#define FLAGS_NEW_KEY BIT(3)#define SAHARA_HDR_BASE 0x00800000#define SAHARA_HDR_SKHA_ALG_AES 0
@@ -142,8 +141,6 @@ struct sahara_hw_link { };struct sahara_ctx { -unsigned long flags; -/* AES-specific context */ int keylen;u8 key[AES_KEYSIZE_128 ];
@@ -448,26 +445,22 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev)int i, j;int idx =0 ; -/* Copy new key if necessary */ -if (ctx->flags &FLAGS_NEW_KEY ) { -memcpy (dev->key_base, ctx->key, ctx->keylen); - ctx->flags &= ~FLAGS_NEW_KEY ; +memcpy (dev->key_base, ctx->key, ctx->keylen); -if (dev->flags &FLAGS_CBC ) { - dev->hw_desc[idx]->len1 =AES_BLOCK_SIZE ; - dev->hw_desc[idx]->p1 = dev->iv_phys_base; - }else { - dev->hw_desc[idx]->len1 =0 ; - dev->hw_desc[idx]->p1 =0 ; - } - dev->hw_desc[idx]->len2 = ctx->keylen; - dev->hw_desc[idx]->p2 = dev->key_phys_base; - dev->hw_desc[idx]->next = dev->hw_phys_desc[1 ]; +if (dev->flags &FLAGS_CBC ) { + dev->hw_desc[idx]->len1 =AES_BLOCK_SIZE ; + dev->hw_desc[idx]->p1 = dev->iv_phys_base; + }else { + dev->hw_desc[idx]->len1 =0 ; + dev->hw_desc[idx]->p1 =0 ; + } + dev->hw_desc[idx]->len2 = ctx->keylen; + dev->hw_desc[idx]->p2 = dev->key_phys_base; + dev->hw_desc[idx]->next = dev->hw_phys_desc[1 ]; + dev->hw_desc[idx]->hdr =sahara_aes_key_hdr (dev); - dev->hw_desc[idx]->hdr =sahara_aes_key_hdr (dev); + idx++; - idx++; - } dev->nb_in_sg =sg_nents_for_len (dev->in_sg, dev->total);if (dev->nb_in_sg <0 ) {
@@ -609,7 +602,6 @@ static int sahara_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,/* SAHARA only supports 128bit keys */ if (keylen ==AES_KEYSIZE_128 ) {memcpy (ctx->key, key, keylen); - ctx->flags |=FLAGS_NEW_KEY ;return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 40/417 crypto: sahara - fix cbc selftest failure
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit 9f10bc28c0fb676ae58aa3bfa358db8f5de124bb ]
The kernel crypto API requires that all CBC implementations update the IV buffer to contain the last ciphertext block.
This fixes the following cbc selftest error:
alg: skcipher: sahara-cbc-aes encryption test failed (wrong output IV) on test vector 0, cfg="in-place (one sglist)"
--- drivers/crypto/sahara.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
drivers/crypto/sahara.c +31 -2
@@ -149,6 +149,7 @@ struct sahara_ctx {struct sahara_aes_reqctx {unsigned long mode; +u8 iv_out[AES_BLOCK_SIZE ];struct skcipher_request fallback_req;// keep at the end };
@@ -542,8 +543,24 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev)return -EINVAL ; } +static void sahara_aes_cbc_update_iv (struct skcipher_request *req) +{ +struct crypto_skcipher *skcipher =crypto_skcipher_reqtfm (req); +struct sahara_aes_reqctx *rctx =skcipher_request_ctx (req); +unsigned int ivsize =crypto_skcipher_ivsize (skcipher); + +/* Update IV buffer to contain the last ciphertext block */ +if (rctx->mode &FLAGS_ENCRYPT ) { +sg_pcopy_to_buffer (req->dst,sg_nents (req->dst), req->iv, + ivsize, req->cryptlen - ivsize); + }else { +memcpy (req->iv, rctx->iv_out, ivsize); + } +} +static int sahara_aes_process (struct skcipher_request *req) { +struct crypto_skcipher *skcipher =crypto_skcipher_reqtfm (req);struct sahara_dev *dev = dev_ptr;struct sahara_ctx *ctx;struct sahara_aes_reqctx *rctx;
@@ -565,8 +582,17 @@ static int sahara_aes_process(struct skcipher_request *req) rctx->mode &=FLAGS_MODE_MASK ; dev->flags = (dev->flags & ~FLAGS_MODE_MASK ) | rctx->mode; -if ((dev->flags &FLAGS_CBC ) && req->iv) -memcpy (dev->iv_base, req->iv,AES_KEYSIZE_128 ); +if ((dev->flags &FLAGS_CBC ) && req->iv) { +unsigned int ivsize =crypto_skcipher_ivsize (skcipher); + +memcpy (dev->iv_base, req->iv, ivsize); + +if (!(dev->flags &FLAGS_ENCRYPT )) { +sg_pcopy_to_buffer (req->src,sg_nents (req->src), + rctx->iv_out, ivsize, + req->cryptlen - ivsize); + } + }/* assign new context to device */ dev->ctx = ctx;
@@ -589,6 +615,9 @@ static int sahara_aes_process(struct skcipher_request *req)dma_unmap_sg (dev->device, dev->in_sg, dev->nb_in_sg,DMA_TO_DEVICE ); +if ((dev->flags &FLAGS_CBC ) && req->iv) +sahara_aes_cbc_update_iv (req); +return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 41/417 crypto: sahara - fix ahash selftest failure
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit afffcf3db98b9495114b79d5381f8cc3f69476fb ]
update() calls should not modify the result buffer, so add an additional check for "rctx->last" to make sure that only the final hash value is copied into the buffer.
Fixes the following selftest failure:
alg: ahash: sahara-sha256 update() used result buffer on test vector 3, cfg="init+update+final aligned buffer"
--- drivers/crypto/sahara.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/sahara.c +1 -1
@@ -1048,7 +1048,7 @@ static int sahara_sha_process(struct ahash_request *req)memcpy (rctx->context, dev->context_base, rctx->context_size); -if (req->result) +if (req->result && rctx->last)memcpy (req->result, rctx->context, rctx->digest_size);return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 42/417 crypto: sahara - fix processing requests with cryptlen < sg->length
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit 5b8668ce3452827d27f8c34ff6ba080a8f983ed0 ]
It's not always the case that the entire sg entry needs to be processed. Currently, when cryptlen is less than sg->legth, "Descriptor length" errors are encountered.
The error was noticed when testing xts(sahara-ecb-aes) with arbitrary sized input data. To fix this, take the actual request size into account when populating the hw links.
--- drivers/crypto/sahara.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/crypto/sahara.c +7 -2
@@ -445,6 +445,7 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev)int ret;int i, j;int idx =0 ; +u32 len;memcpy (dev->key_base, ctx->key, ctx->keylen);
@@ -495,12 +496,14 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev)/* Create input links */ dev->hw_desc[idx]->p1 = dev->hw_phys_link[0 ]; sg = dev->in_sg; + len = dev->total;for (i =0 ; i < dev->nb_in_sg; i++) { - dev->hw_link[i]->len = sg->length; + dev->hw_link[i]->len =min (len, sg->length); dev->hw_link[i]->p = sg->dma_address;if (i == (dev->nb_in_sg -1 )) { dev->hw_link[i]->next =0 ; }else { + len -=min (len, sg->length); dev->hw_link[i]->next = dev->hw_phys_link[i +1 ]; sg =sg_next (sg); }
@@ -509,12 +512,14 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev)/* Create output links */ dev->hw_desc[idx]->p2 = dev->hw_phys_link[i]; sg = dev->out_sg; + len = dev->total;for (j = i; j < dev->nb_out_sg + i; j++) { - dev->hw_link[j]->len = sg->length; + dev->hw_link[j]->len =min (len, sg->length); dev->hw_link[j]->p = sg->dma_address;if (j == (dev->nb_out_sg + i -1 )) { dev->hw_link[j]->next =0 ; }else { + len -=min (len, sg->length); dev->hw_link[j]->next = dev->hw_phys_link[j +1 ]; sg =sg_next (sg); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 43/417 crypto: sahara - fix error handling in sahara_hw_descriptor_create()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit ee6e6f0a7f5b39d50a5ef5fcc006f4f693db18a7 ]
Do not call dma_unmap_sg() for scatterlists that were not mapped successfully.
--- drivers/crypto/sahara.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/crypto/sahara.c +3 -5
@@ -484,13 +484,14 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) DMA_TO_DEVICE);if (!ret) {dev_err (dev->device,"couldn't map in sg\n" ); - goto unmap_in; +return -EINVAL ; } + ret =dma_map_sg (dev->device, dev->out_sg, dev->nb_out_sg,DMA_FROM_DEVICE );if (!ret) {dev_err (dev->device,"couldn't map out sg\n" ); - goto unmap_out; + goto unmap_in; }/* Create input links */
@@ -538,9 +539,6 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev)return 0 ; -unmap_out: -dma_unmap_sg (dev->device, dev->out_sg, dev->nb_out_sg, -DMA_FROM_DEVICE ); unmap_in:dma_unmap_sg (dev->device, dev->in_sg, dev->nb_in_sg,DMA_TO_DEVICE );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 44/417 crypto: hisilicon/qm - save capability registers in qm init process
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhiqi Song <[email protected]>
[ Upstream commit cabe13d0bd2efb8dd50ed2310f57b33e1a69a0d4 ]
In previous capability register implementation, qm irq related values were read from capability registers dynamically when needed. But in abnormal scenario, e.g. the core is timeout and the device needs to soft reset and reset failed after disabling the MSE, the device can not be removed normally, causing the following call trace:
| Call trace:
| pci_irq_vector+0xfc/0x140
| hisi_qm_uninit+0x278/0x3b0 [hisi_qm]
| hpre_remove+0x16c/0x1c0 [hisi_hpre]
| pci_device_remove+0x6c/0x264
| device_release_driver_internal+0x1ec/0x3e0
| device_release_driver+0x3c/0x60
| pci_stop_bus_device+0xfc/0x22c
| pci_stop_and_remove_bus_device+0x38/0x70
| pci_iov_remove_virtfn+0x108/0x1c0
| sriov_disable+0x7c/0x1e4
| pci_disable_sriov+0x4c/0x6c
| hisi_qm_sriov_disable+0x90/0x160 [hisi_qm]
| hpre_remove+0x1a8/0x1c0 [hisi_hpre]
| pci_device_remove+0x6c/0x264
| device_release_driver_internal+0x1ec/0x3e0
| driver_detach+0x168/0x2d0
| bus_remove_driver+0xc0/0x230
| driver_unregister+0x58/0xdc
| pci_unregister_driver+0x40/0x220
| hpre_exit+0x34/0x64 [hisi_hpre]
| __arm64_sys_delete_module+0x374/0x620
[...]
| Call trace:
| free_msi_irqs+0x25c/0x300
| pci_disable_msi+0x19c/0x264
| pci_free_irq_vectors+0x4c/0x70
| hisi_qm_pci_uninit+0x44/0x90 [hisi_qm]
| hisi_qm_uninit+0x28c/0x3b0 [hisi_qm]
| hpre_remove+0x16c/0x1c0 [hisi_hpre]
| pci_device_remove+0x6c/0x264
[...]The reason for this call trace is that when the MSE is disabled, the value of capability registers in the BAR space become invalid. This will make the subsequent unregister process get the wrong irq vector through capability registers and get the wrong irq number by pci_irq_vector().
So add a capability table structure to pre-store the valid value of the irq information capability register in qm init process, avoid obtaining invalid capability register value after the MSE is disabled.
--- drivers/crypto/hisilicon/qm.c | 62 +++++++++++++++++++++++++++++------ include/linux/hisi_acc_qm.h | 12 +++++++ 2 files changed, 64 insertions(+), 10 deletions(-)
drivers/crypto/hisilicon/qm.c +52 -10
@@ -315,6 +315,13 @@ enum qm_basic_type { QM_VF_IRQ_NUM_CAP, }; +enum qm_pre_store_cap_idx { +QM_EQ_IRQ_TYPE_CAP_IDX =0x0 , +QM_AEQ_IRQ_TYPE_CAP_IDX , +QM_ABN_IRQ_TYPE_CAP_IDX , +QM_PF2VF_IRQ_TYPE_CAP_IDX , +}; +static const struct hisi_qm_cap_info qm_cap_info_comm[] = { {QM_SUPPORT_DB_ISOLATION ,0x30 ,0 ,BIT (0 ),0x0 ,0x0 ,0x0 }, {QM_SUPPORT_FUNC_QOS ,0x3100 ,0 ,BIT (8 ),0x0 ,0x0 ,0x1 },
@@ -344,6 +351,13 @@ static const struct hisi_qm_cap_info qm_basic_info[] = { {QM_VF_IRQ_NUM_CAP, 0x311c, 0, GENMASK(15, 0), 0x1, 0x2, 0x3}, }; +static const u32 qm_pre_store_caps[] = { +QM_EQ_IRQ_TYPE_CAP , +QM_AEQ_IRQ_TYPE_CAP , +QM_ABN_IRQ_TYPE_CAP , +QM_PF2VF_IRQ_TYPE_CAP , +}; + struct qm_mailbox { __le16 w0; __le16 queue_num;
@@ -4804,7 +4818,7 @@ static void qm_unregister_abnormal_irq(struct hisi_qm *qm)if (qm->fun_type ==QM_HW_VF )return ; - val =hisi_qm_get_hw_info (qm, qm_basic_info,QM_ABN_IRQ_TYPE_CAP , qm->cap_ver); + val = qm->cap_tables.qm_cap_table[QM_ABN_IRQ_TYPE_CAP_IDX ].cap_val;if (!((val >>QM_IRQ_TYPE_SHIFT ) &QM_ABN_IRQ_TYPE_MASK ))return ;
@@ -4821,7 +4835,7 @@ static int qm_register_abnormal_irq(struct hisi_qm *qm)if (qm->fun_type ==QM_HW_VF )return 0 ; - val =hisi_qm_get_hw_info (qm, qm_basic_info,QM_ABN_IRQ_TYPE_CAP , qm->cap_ver); + val = qm->cap_tables.qm_cap_table[QM_ABN_IRQ_TYPE_CAP_IDX ].cap_val;if (!((val >>QM_IRQ_TYPE_SHIFT ) &QM_ABN_IRQ_TYPE_MASK ))return 0 ;
@@ -4838,7 +4852,7 @@ static void qm_unregister_mb_cmd_irq(struct hisi_qm *qm)struct pci_dev *pdev = qm->pdev;u32 irq_vector, val; - val =hisi_qm_get_hw_info (qm, qm_basic_info,QM_PF2VF_IRQ_TYPE_CAP , qm->cap_ver); + val = qm->cap_tables.qm_cap_table[QM_PF2VF_IRQ_TYPE_CAP_IDX ].cap_val;if (!((val >>QM_IRQ_TYPE_SHIFT ) &QM_IRQ_TYPE_MASK ))return ;
@@ -4852,7 +4866,7 @@ static int qm_register_mb_cmd_irq(struct hisi_qm *qm)u32 irq_vector, val;int ret; - val =hisi_qm_get_hw_info (qm, qm_basic_info,QM_PF2VF_IRQ_TYPE_CAP , qm->cap_ver); + val = qm->cap_tables.qm_cap_table[QM_PF2VF_IRQ_TYPE_CAP_IDX ].cap_val;if (!((val >>QM_IRQ_TYPE_SHIFT ) &QM_IRQ_TYPE_MASK ))return 0 ;
@@ -4869,7 +4883,7 @@ static void qm_unregister_aeq_irq(struct hisi_qm *qm)struct pci_dev *pdev = qm->pdev;u32 irq_vector, val; - val =hisi_qm_get_hw_info (qm, qm_basic_info,QM_AEQ_IRQ_TYPE_CAP , qm->cap_ver); + val = qm->cap_tables.qm_cap_table[QM_AEQ_IRQ_TYPE_CAP_IDX ].cap_val;if (!((val >>QM_IRQ_TYPE_SHIFT ) &QM_IRQ_TYPE_MASK ))return ;
@@ -4883,7 +4897,7 @@ static int qm_register_aeq_irq(struct hisi_qm *qm)u32 irq_vector, val;int ret; - val =hisi_qm_get_hw_info (qm, qm_basic_info,QM_AEQ_IRQ_TYPE_CAP , qm->cap_ver); + val = qm->cap_tables.qm_cap_table[QM_AEQ_IRQ_TYPE_CAP_IDX ].cap_val;if (!((val >>QM_IRQ_TYPE_SHIFT ) &QM_IRQ_TYPE_MASK ))return 0 ;
@@ -4901,7 +4915,7 @@ static void qm_unregister_eq_irq(struct hisi_qm *qm)struct pci_dev *pdev = qm->pdev;u32 irq_vector, val; - val =hisi_qm_get_hw_info (qm, qm_basic_info,QM_EQ_IRQ_TYPE_CAP , qm->cap_ver); + val = qm->cap_tables.qm_cap_table[QM_EQ_IRQ_TYPE_CAP_IDX ].cap_val;if (!((val >>QM_IRQ_TYPE_SHIFT ) &QM_IRQ_TYPE_MASK ))return ;
@@ -4915,7 +4929,7 @@ static int qm_register_eq_irq(struct hisi_qm *qm)u32 irq_vector, val;int ret; - val =hisi_qm_get_hw_info (qm, qm_basic_info,QM_EQ_IRQ_TYPE_CAP , qm->cap_ver); + val = qm->cap_tables.qm_cap_table[QM_EQ_IRQ_TYPE_CAP_IDX ].cap_val;if (!((val >>QM_IRQ_TYPE_SHIFT ) &QM_IRQ_TYPE_MASK ))return 0 ;
@@ -5003,7 +5017,29 @@ static int qm_get_qp_num(struct hisi_qm *qm)return 0 ; } -static void qm_get_hw_caps (struct hisi_qm *qm) +static int qm_pre_store_irq_type_caps (struct hisi_qm *qm) +{ +struct hisi_qm_cap_record *qm_cap; +struct pci_dev *pdev = qm->pdev; +size_t i, size; + + size =ARRAY_SIZE (qm_pre_store_caps); + qm_cap =devm_kzalloc (&pdev->dev,sizeof (*qm_cap) * size,GFP_KERNEL ); +if (!qm_cap) +return -ENOMEM ; + +for (i =0 ; i < size; i++) { + qm_cap[i].type = qm_pre_store_caps[i]; + qm_cap[i].cap_val =hisi_qm_get_hw_info (qm, qm_basic_info, + qm_pre_store_caps[i], qm->cap_ver); + } + + qm->cap_tables.qm_cap_table = qm_cap; + +return 0 ; +} + +static int qm_get_hw_caps (struct hisi_qm *qm) {const struct hisi_qm_cap_info *cap_info = qm->fun_type ==QM_HW_PF ? qm_cap_info_pf : qm_cap_info_vf;
@@ -5034,6 +5070,9 @@ static void qm_get_hw_caps(struct hisi_qm *qm)if (val)set_bit (cap_info[i].type, &qm->caps); } + +/* Fetch and save the value of irq type related capability registers */ +return qm_pre_store_irq_type_caps (qm); }static int qm_get_pci_res (struct hisi_qm *qm)
@@ -5055,7 +5094,10 @@ static int qm_get_pci_res(struct hisi_qm *qm) goto err_request_mem_regions; } -qm_get_hw_caps (qm); + ret =qm_get_hw_caps (qm); +if (ret) + goto err_ioremap; +if (test_bit (QM_SUPPORT_DB_ISOLATION , &qm->caps)) { qm->db_interval =QM_QP_DB_INTERVAL ; qm->db_phys_base =pci_resource_start (pdev,PCI_BAR_4 );
include/linux/hisi_acc_qm.h +12 -0
@@ -266,6 +266,16 @@ struct hisi_qm_cap_info {u32 v3_val; }; +struct hisi_qm_cap_record { +u32 type; +u32 cap_val; +}; + +struct hisi_qm_cap_tables { +struct hisi_qm_cap_record *qm_cap_table; +struct hisi_qm_cap_record *dev_cap_table; +}; +struct hisi_qm_list {struct mutex lock;struct list_head list;
@@ -348,6 +358,8 @@ struct hisi_qm {struct qm_shaper_factor *factor;u32 mb_qos;u32 type_rate; + +struct hisi_qm_cap_tables cap_tables; };struct hisi_qp_status {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 45/417 crypto: hisilicon/zip - add zip comp high perf mode configuration
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenghai Huang <[email protected]>
[ Upstream commit a9864bae1806499ebf3757a9e71dddde5b9c48c6 ]
To meet specific application scenarios, the function of switching between the high performance mode and the high compression mode is added.
Use the perf_mode=0/1 configuration to set the compression high perf mode, 0(default, high compression mode), 1(high performance mode). These two modes only apply to the compression direction and are compatible with software algorithm in both directions.
Stable-dep-of: cf8b5156bbc8 ("crypto: hisilicon/hpre - save capability registers in probe process")
--- drivers/crypto/hisilicon/zip/zip_main.c | 65 +++++++++++++++++++++++++ 1 file changed, 65 insertions(+)
drivers/crypto/hisilicon/zip/zip_main.c +65 -0
@@ -107,6 +107,14 @@#define HZIP_CLOCK_GATED_EN (HZIP_CORE_GATED_EN | \ HZIP_CORE_GATED_OOO_EN) +/* zip comp high performance */ +#define HZIP_HIGH_PERF_OFFSET 0x301208 + +enum { +HZIP_HIGH_COMP_RATE , +HZIP_HIGH_COMP_PERF , +}; +static const char hisi_zip_name[] ="hisi_zip" ;static struct dentry *hzip_debugfs_root;
@@ -352,6 +360,37 @@ static int hzip_diff_regs_show(struct seq_file *s, void *unused)return 0 ; }DEFINE_SHOW_ATTRIBUTE (hzip_diff_regs); + +static int perf_mode_set (const char *val,const struct kernel_param *kp) +{ +int ret; +u32 n; + +if (!val) +return -EINVAL ; + + ret =kstrtou32 (val,10 , &n); +if (ret !=0 || (n !=HZIP_HIGH_COMP_PERF && + n !=HZIP_HIGH_COMP_RATE )) +return -EINVAL ; + +return param_set_int (val, kp); +} + +static const struct kernel_param_ops zip_com_perf_ops = { + .set = perf_mode_set, + .get = param_get_int, +}; + +/* +* perf_mode = 0 means enable high compression rate mode, +* perf_mode = 1 means enable high compression performance mode. +* These two modes only apply to the compression direction. +*/ +static u32 perf_mode =HZIP_HIGH_COMP_RATE ; +module_param_cb (perf_mode, &zip_com_perf_ops, &perf_mode,0444 ); +MODULE_PARM_DESC (perf_mode,"ZIP high perf mode 0(default), 1(enable)" ); +static const struct kernel_param_ops zip_uacce_mode_ops = { .set = uacce_mode_set, .get = param_get_int,
@@ -417,6 +456,28 @@ bool hisi_zip_alg_support(struct hisi_qm *qm, u32 alg)return false; } +static int hisi_zip_set_high_perf (struct hisi_qm *qm) +{ +u32 val; +int ret; + + val =readl_relaxed (qm->io_base +HZIP_HIGH_PERF_OFFSET ); +if (perf_mode ==HZIP_HIGH_COMP_PERF ) + val |=HZIP_HIGH_COMP_PERF ; +else + val &= ~HZIP_HIGH_COMP_PERF ; + +/* Set perf mode */ +writel (val, qm->io_base +HZIP_HIGH_PERF_OFFSET ); + ret =readl_relaxed_poll_timeout (qm->io_base +HZIP_HIGH_PERF_OFFSET , + val, val == perf_mode,HZIP_DELAY_1_US , +HZIP_POLL_TIMEOUT_US ); +if (ret) +pci_err (qm->pdev,"failed to set perf mode\n" ); + +return ret; +} +static int hisi_zip_set_qm_algs (struct hisi_qm *qm) {struct device *dev = &qm->pdev->dev;
@@ -1115,6 +1176,10 @@ static int hisi_zip_pf_probe_init(struct hisi_zip *hisi_zip)if (ret)return ret; + ret =hisi_zip_set_high_perf (qm); +if (ret) +return ret; +hisi_zip_open_sva_prefetch (qm);hisi_qm_dev_err_init (qm);hisi_zip_debug_regs_clear (qm);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 46/417 crypto: hisilicon/qm - add a function to set qm algs
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenkai Lin <[email protected]>
[ Upstream commit f76f0d7f20672611974d3cc705996751fc403734 ]
Extract a public function to set qm algs and remove the similar code for setting qm algs in each module.
Stable-dep-of: cf8b5156bbc8 ("crypto: hisilicon/hpre - save capability registers in probe process")
--- drivers/crypto/hisilicon/hpre/hpre_main.c | 42 ++----------------- drivers/crypto/hisilicon/qm.c | 36 +++++++++++++++++ drivers/crypto/hisilicon/sec2/sec_main.c | 47 ++++------------------ drivers/crypto/hisilicon/zip/zip_main.c | 49 ++++------------------- include/linux/hisi_acc_qm.h | 8 +++- 5 files changed, 62 insertions(+), 120 deletions(-)
drivers/crypto/hisilicon/hpre/hpre_main.c +4 -38
@@ -118,8 +118,6 @@#define HPRE_DFX_COMMON2_LEN 0xE#define HPRE_DFX_CORE_LEN 0x43 -#define HPRE_DEV_ALG_MAX_LEN 256 -static const char hpre_name[] ="hisi_hpre" ;static struct dentry *hpre_debugfs_root;static const struct pci_device_id hpre_dev_ids[] = {
@@ -135,12 +133,7 @@ struct hpre_hw_error {const char *msg; }; -struct hpre_dev_alg { -u32 alg_msk; -const char *alg; -}; - -static const struct hpre_dev_alg hpre_dev_algs[] = { +static const struct qm_dev_alg hpre_dev_algs[] = { { .alg_msk =BIT (0 ), .alg ="rsa\n"
@@ -359,35 +352,6 @@ bool hpre_check_alg_support(struct hisi_qm *qm, u32 alg)return false; } -static int hpre_set_qm_algs (struct hisi_qm *qm) -{ -struct device *dev = &qm->pdev->dev; -char *algs, *ptr; -u32 alg_msk; -int i; - -if (!qm->use_sva) -return 0 ; - - algs =devm_kzalloc (dev,HPRE_DEV_ALG_MAX_LEN *sizeof (char ),GFP_KERNEL ); -if (!algs) -return -ENOMEM ; - - alg_msk =hisi_qm_get_hw_info (qm, hpre_basic_info,HPRE_DEV_ALG_BITMAP_CAP , qm->cap_ver); - -for (i =0 ; i <ARRAY_SIZE (hpre_dev_algs); i++) -if (alg_msk & hpre_dev_algs[i].alg_msk) -strcat (algs, hpre_dev_algs[i].alg); - - ptr =strrchr (algs,'\n' ); -if (ptr) - *ptr ='\0' ; - - qm->uacce->algs = algs; - -return 0 ; -} -static int hpre_diff_regs_show (struct seq_file *s,void *unused) {struct hisi_qm *qm = s->private;
@@ -1138,6 +1102,7 @@ static void hpre_debugfs_exit(struct hisi_qm *qm)static int hpre_qm_init (struct hisi_qm *qm,struct pci_dev *pdev) { +u64 alg_msk;int ret;if (pdev->revision ==QM_HW_V1 ) {
@@ -1168,7 +1133,8 @@ static int hpre_qm_init(struct hisi_qm *qm, struct pci_dev *pdev)return ret; } - ret =hpre_set_qm_algs (qm); + alg_msk =hisi_qm_get_hw_info (qm, hpre_basic_info,HPRE_DEV_ALG_BITMAP_CAP , qm->cap_ver); + ret =hisi_qm_set_algs (qm, alg_msk, hpre_dev_algs,ARRAY_SIZE (hpre_dev_algs));if (ret) {pci_err (pdev,"Failed to set hpre algs!\n" );hisi_qm_uninit (qm);
drivers/crypto/hisilicon/qm.c +36 -0
@@ -237,6 +237,8 @@#define QM_QOS_MAX_CIR_S 11#define QM_AUTOSUSPEND_DELAY 3000 +#define QM_DEV_ALG_MAX_LEN 256 +#define QM_MK_CQC_DW3_V1 (hop_num, pg_sz, buf_sz, cqe_sz) \ (((hop_num) << QM_CQ_HOP_NUM_SHIFT) | \ ((pg_sz) << QM_CQ_PAGE_SIZE_SHIFT) | \
@@ -795,6 +797,40 @@ static void qm_get_xqc_depth(struct hisi_qm *qm, u16 *low_bits, *high_bits = (depth >>QM_XQ_DEPTH_SHIFT ) &QM_XQ_DEPTH_MASK ; } +int hisi_qm_set_algs (struct hisi_qm *qm,u64 alg_msk,const struct qm_dev_alg *dev_algs, +u32 dev_algs_size) +{ +struct device *dev = &qm->pdev->dev; +char *algs, *ptr; +int i; + +if (!qm->uacce) +return 0 ; + +if (dev_algs_size >=QM_DEV_ALG_MAX_LEN ) { +dev_err (dev,"algs size %u is equal or larger than %d.\n" , + dev_algs_size,QM_DEV_ALG_MAX_LEN ); +return -EINVAL ; + } + + algs =devm_kzalloc (dev,QM_DEV_ALG_MAX_LEN *sizeof (char ),GFP_KERNEL ); +if (!algs) +return -ENOMEM ; + +for (i =0 ; i < dev_algs_size; i++) +if (alg_msk & dev_algs[i].alg_msk) +strcat (algs, dev_algs[i].alg); + + ptr =strrchr (algs,'\n' ); +if (ptr) { + *ptr ='\0' ; + qm->uacce->algs = algs; + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (hisi_qm_set_algs); +static u32 qm_get_irq_num (struct hisi_qm *qm) {if (qm->fun_type ==QM_HW_PF )
drivers/crypto/hisilicon/sec2/sec_main.c +7 -40
84 lines not on this page · raw message
drivers/crypto/hisilicon/zip/zip_main.c +8 -41
86 lines not on this page · raw message
include/linux/hisi_acc_qm.h +7 -1
@@ -161,6 +161,11 @@ enum qm_cap_bits { QM_SUPPORT_RPM, }; +struct qm_dev_alg { +u64 alg_msk; +const char *alg; +}; +struct dfx_diff_registers {u32 *regs;u32 reg_offset;
@@ -347,7 +352,6 @@ struct hisi_qm {struct work_struct rst_work;struct work_struct cmd_process; -const char *algs;bool use_sva;bool is_frozen;
@@ -533,6 +537,8 @@ void hisi_qm_regs_dump(struct seq_file *s, struct debugfs_regset32 *regset);u32 hisi_qm_get_hw_info (struct hisi_qm *qm,const struct hisi_qm_cap_info *info_table,u32 index,bool is_read); +int hisi_qm_set_algs (struct hisi_qm *qm,u64 alg_msk,const struct qm_dev_alg *dev_algs, +u32 dev_algs_size);/* Used by VFIO ACC live migration driver */ struct pci_driver *hisi_sec_get_pf_driver (void );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 47/417 crypto: hisilicon/hpre - save capability registers in probe process
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhiqi Song <[email protected]>
[ Upstream commit cf8b5156bbc8c9376f699e8d35e9464b739e33ff ]
Pre-store the valid value of hpre alg support related capability register in hpre_qm_init(), which will be called by hpre_probe(). It can reduce the number of capability register queries and avoid obtaining incorrect values in abnormal scenarios, such as reset failed and the memory space disabled.
--- drivers/crypto/hisilicon/hpre/hpre_main.c | 82 ++++++++++++++++++----- 1 file changed, 64 insertions(+), 18 deletions(-)
drivers/crypto/hisilicon/hpre/hpre_main.c +64 -18
@@ -226,6 +226,20 @@ static const struct hisi_qm_cap_info hpre_basic_info[] = { {HPRE_CORE10_ALG_BITMAP_CAP, 0x3170, 0, GENMASK(31, 0), 0x0, 0x10, 0x10} }; +enum hpre_pre_store_cap_idx { +HPRE_CLUSTER_NUM_CAP_IDX =0x0 , +HPRE_CORE_ENABLE_BITMAP_CAP_IDX , +HPRE_DRV_ALG_BITMAP_CAP_IDX , +HPRE_DEV_ALG_BITMAP_CAP_IDX , +}; + +static const u32 hpre_pre_store_caps[] = { +HPRE_CLUSTER_NUM_CAP , +HPRE_CORE_ENABLE_BITMAP_CAP , +HPRE_DRV_ALG_BITMAP_CAP , +HPRE_DEV_ALG_BITMAP_CAP , +}; +static const struct hpre_hw_error hpre_hw_errors[] = { { .int_msk =BIT (0 ),
@@ -345,7 +359,7 @@ bool hpre_check_alg_support(struct hisi_qm *qm, u32 alg) {u32 cap_val; - cap_val =hisi_qm_get_hw_info (qm, hpre_basic_info,HPRE_DRV_ALG_BITMAP_CAP , qm->cap_ver); + cap_val = qm->cap_tables.dev_cap_table[HPRE_DRV_ALG_BITMAP_CAP_IDX ].cap_val;if (alg & cap_val)return true;
@@ -421,16 +435,6 @@ static u32 vfs_num;module_param_cb (vfs_num, &vfs_num_ops, &vfs_num,0444 );MODULE_PARM_DESC (vfs_num,"Number of VFs to enable(1-63), 0(default)" ); -static inline int hpre_cluster_num (struct hisi_qm *qm) -{ -return hisi_qm_get_hw_info (qm, hpre_basic_info,HPRE_CLUSTER_NUM_CAP , qm->cap_ver); -} - -static inline int hpre_cluster_core_mask (struct hisi_qm *qm) -{ -return hisi_qm_get_hw_info (qm, hpre_basic_info,HPRE_CORE_ENABLE_BITMAP_CAP , qm->cap_ver); -} -struct hisi_qp *hpre_create_qp (u8 type) {int node =cpu_to_node (smp_processor_id ());
@@ -497,13 +501,15 @@ static int hpre_cfg_by_dsm(struct hisi_qm *qm)static int hpre_set_cluster (struct hisi_qm *qm) { -u32 cluster_core_mask =hpre_cluster_core_mask (qm); -u8 clusters_num =hpre_cluster_num (qm);struct device *dev = &qm->pdev->dev;unsigned long offset; +u32 cluster_core_mask; +u8 clusters_num;u32 val =0 ;int ret, i; + cluster_core_mask = qm->cap_tables.dev_cap_table[HPRE_CORE_ENABLE_BITMAP_CAP_IDX ].cap_val; + clusters_num = qm->cap_tables.dev_cap_table[HPRE_CLUSTER_NUM_CAP_IDX ].cap_val;for (i =0 ; i < clusters_num; i++) { offset = i *HPRE_CLSTR_ADDR_INTRVL ;
@@ -698,11 +704,12 @@ static int hpre_set_user_domain_and_cache(struct hisi_qm *qm)static void hpre_cnt_regs_clear (struct hisi_qm *qm) { -u8 clusters_num =hpre_cluster_num (qm);unsigned long offset; +u8 clusters_num;int i;/* clear clusterX/cluster_ctrl */ + clusters_num = qm->cap_tables.dev_cap_table[HPRE_CLUSTER_NUM_CAP_IDX ].cap_val;for (i =0 ; i < clusters_num; i++) { offset =HPRE_CLSTR_BASE + i *HPRE_CLSTR_ADDR_INTRVL ;writel (0x0 , qm->io_base + offset +HPRE_CLUSTER_INQURY );
@@ -989,13 +996,14 @@ static int hpre_pf_comm_regs_debugfs_init(struct hisi_qm *qm)static int hpre_cluster_debugfs_init (struct hisi_qm *qm) { -u8 clusters_num =hpre_cluster_num (qm);struct device *dev = &qm->pdev->dev;char buf[HPRE_DBGFS_VAL_MAX_LEN ];struct debugfs_regset32 *regset;struct dentry *tmp_d; +u8 clusters_num;int i, ret; + clusters_num = qm->cap_tables.dev_cap_table[HPRE_CLUSTER_NUM_CAP_IDX ].cap_val;for (i =0 ; i < clusters_num; i++) { ret =snprintf (buf,HPRE_DBGFS_VAL_MAX_LEN ,"cluster%d" , i);if (ret >=HPRE_DBGFS_VAL_MAX_LEN )
@@ -1100,6 +1108,34 @@ static void hpre_debugfs_exit(struct hisi_qm *qm)debugfs_remove_recursive (qm->debug.debug_root); } +static int hpre_pre_store_cap_reg (struct hisi_qm *qm) +{ +struct hisi_qm_cap_record *hpre_cap; +struct device *dev = &qm->pdev->dev; +size_t i, size; + + size =ARRAY_SIZE (hpre_pre_store_caps); + hpre_cap =devm_kzalloc (dev,sizeof (*hpre_cap) * size,GFP_KERNEL ); +if (!hpre_cap) +return -ENOMEM ; + +for (i =0 ; i < size; i++) { + hpre_cap[i].type = hpre_pre_store_caps[i]; + hpre_cap[i].cap_val =hisi_qm_get_hw_info (qm, hpre_basic_info, + hpre_pre_store_caps[i], qm->cap_ver); + } + +if (hpre_cap[HPRE_CLUSTER_NUM_CAP_IDX ].cap_val >HPRE_CLUSTERS_NUM_MAX ) { +dev_err (dev,"Device cluster num %u is out of range for driver supports %d!\n" , + hpre_cap[HPRE_CLUSTER_NUM_CAP_IDX ].cap_val,HPRE_CLUSTERS_NUM_MAX ); +return -EINVAL ; + } + + qm->cap_tables.dev_cap_table = hpre_cap; + +return 0 ; +} +static int hpre_qm_init (struct hisi_qm *qm,struct pci_dev *pdev) {u64 alg_msk;
@@ -1133,7 +1169,15 @@ static int hpre_qm_init(struct hisi_qm *qm, struct pci_dev *pdev)return ret; } - alg_msk =hisi_qm_get_hw_info (qm, hpre_basic_info,HPRE_DEV_ALG_BITMAP_CAP , qm->cap_ver); +/* Fetch and save the value of capability registers */ + ret =hpre_pre_store_cap_reg (qm); +if (ret) { +pci_err (pdev,"Failed to pre-store capability registers!\n" ); +hisi_qm_uninit (qm); +return ret; + } + + alg_msk = qm->cap_tables.dev_cap_table[HPRE_DEV_ALG_BITMAP_CAP_IDX ].cap_val; ret =hisi_qm_set_algs (qm, alg_msk, hpre_dev_algs,ARRAY_SIZE (hpre_dev_algs));if (ret) {pci_err (pdev,"Failed to set hpre algs!\n" );
@@ -1147,11 +1191,12 @@ static int hpre_show_last_regs_init(struct hisi_qm *qm) {int cluster_dfx_regs_num =ARRAY_SIZE (hpre_cluster_dfx_regs);int com_dfx_regs_num =ARRAY_SIZE (hpre_com_dfx_regs); -u8 clusters_num =hpre_cluster_num (qm);struct qm_debug *debug = &qm->debug;void __iomem *io_base; +u8 clusters_num;int i, j, idx; + clusters_num = qm->cap_tables.dev_cap_table[HPRE_CLUSTER_NUM_CAP_IDX ].cap_val; debug->last_words =kcalloc (cluster_dfx_regs_num * clusters_num + com_dfx_regs_num,sizeof (unsigned int ),GFP_KERNEL );if (!debug->last_words)
@@ -1188,10 +1233,10 @@ static void hpre_show_last_dfx_regs(struct hisi_qm *qm) {int cluster_dfx_regs_num =ARRAY_SIZE (hpre_cluster_dfx_regs);int com_dfx_regs_num =ARRAY_SIZE (hpre_com_dfx_regs); -u8 clusters_num =hpre_cluster_num (qm);struct qm_debug *debug = &qm->debug;struct pci_dev *pdev = qm->pdev;void __iomem *io_base; +u8 clusters_num;int i, j, idx;u32 val;
@@ -1206,6 +1251,7 @@ static void hpre_show_last_dfx_regs(struct hisi_qm *qm) hpre_com_dfx_regs[i].name, debug->last_words[i], val); } + clusters_num = qm->cap_tables.dev_cap_table[HPRE_CLUSTER_NUM_CAP_IDX ].cap_val;for (i =0 ; i < clusters_num; i++) { io_base = qm->io_base + hpre_cluster_offsets[i];for (j =0 ; j < cluster_dfx_regs_num; j++) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 48/417 crypto: hisilicon/sec2 - save capability registers in probe process
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhiqi Song <[email protected]>
[ Upstream commit f1115b0096c3163592e04e74f5a7548c25bda957 ]
Pre-store the valid value of the sec alg support related capability register in sec_qm_init(), which will be called by probe process. It can reduce the number of capability register queries and avoid obtaining incorrect values in abnormal scenarios, such as reset failed and the memory space disabled.
--- drivers/crypto/hisilicon/sec2/sec.h | 7 ++++ drivers/crypto/hisilicon/sec2/sec_crypto.c | 13 +++++-- drivers/crypto/hisilicon/sec2/sec_main.c | 43 ++++++++++++++++++++-- 3 files changed, 57 insertions(+), 6 deletions(-)
drivers/crypto/hisilicon/sec2/sec.h +7 -0
@@ -220,6 +220,13 @@ enum sec_cap_type { SEC_CORE4_ALG_BITMAP_HIGH, }; +enum sec_cap_reg_record_idx { +SEC_DRV_ALG_BITMAP_LOW_IDX =0x0 , +SEC_DRV_ALG_BITMAP_HIGH_IDX , +SEC_DEV_ALG_BITMAP_LOW_IDX , +SEC_DEV_ALG_BITMAP_HIGH_IDX , +}; +void sec_destroy_qps (struct hisi_qp **qps,int qp_num);struct hisi_qp **sec_create_qps (void );int sec_register_to_crypto (struct hisi_qm *qm);
drivers/crypto/hisilicon/sec2/sec_crypto.c +10 -3
@@ -2546,8 +2546,12 @@ static int sec_register_aead(u64 alg_mask)int sec_register_to_crypto (struct hisi_qm *qm) { -u64 alg_mask =sec_get_alg_bitmap (qm,SEC_DRV_ALG_BITMAP_HIGH ,SEC_DRV_ALG_BITMAP_LOW ); -int ret; +u64 alg_mask; +int ret =0 ; + + alg_mask =sec_get_alg_bitmap (qm,SEC_DRV_ALG_BITMAP_HIGH_IDX , +SEC_DRV_ALG_BITMAP_LOW_IDX ); + ret =sec_register_skcipher (alg_mask);if (ret)
@@ -2562,7 +2566,10 @@ int sec_register_to_crypto(struct hisi_qm *qm)void sec_unregister_from_crypto (struct hisi_qm *qm) { -u64 alg_mask =sec_get_alg_bitmap (qm,SEC_DRV_ALG_BITMAP_HIGH ,SEC_DRV_ALG_BITMAP_LOW ); +u64 alg_mask; + + alg_mask =sec_get_alg_bitmap (qm,SEC_DRV_ALG_BITMAP_HIGH_IDX , +SEC_DRV_ALG_BITMAP_LOW_IDX );sec_unregister_aead (alg_mask,ARRAY_SIZE (sec_aeads));sec_unregister_skcipher (alg_mask,ARRAY_SIZE (sec_skciphers));
drivers/crypto/hisilicon/sec2/sec_main.c +40 -3
67 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 49/417 crypto: hisilicon/zip - save capability registers in probe process
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhiqi Song <[email protected]>
[ Upstream commit 2ff0ad847951d61c2d8b309e1ccefb26c57dcc7b ]
Pre-store the valid value of the zip alg support related capability register in hisi_zip_qm_init(), which will be called by hisi_zip_probe(). It can reduce the number of capability register queries and avoid obtaining incorrect values in abnormal scenarios, such as reset failed and the memory space disabled.
--- drivers/crypto/hisilicon/zip/zip_main.c | 73 ++++++++++++++++++++----- 1 file changed, 60 insertions(+), 13 deletions(-)
drivers/crypto/hisilicon/zip/zip_main.c +60 -13
@@ -249,6 +249,26 @@ static struct hisi_qm_cap_info zip_basic_cap_info[] = { {ZIP_CAP_MAX, 0x317c, 0, GENMASK(0, 0), 0x0, 0x0, 0x0} }; +enum zip_pre_store_cap_idx { +ZIP_CORE_NUM_CAP_IDX =0x0 , +ZIP_CLUSTER_COMP_NUM_CAP_IDX , +ZIP_CLUSTER_DECOMP_NUM_CAP_IDX , +ZIP_DECOMP_ENABLE_BITMAP_IDX , +ZIP_COMP_ENABLE_BITMAP_IDX , +ZIP_DRV_ALG_BITMAP_IDX , +ZIP_DEV_ALG_BITMAP_IDX , +}; + +static const u32 zip_pre_store_caps[] = { +ZIP_CORE_NUM_CAP , +ZIP_CLUSTER_COMP_NUM_CAP , +ZIP_CLUSTER_DECOMP_NUM_CAP , +ZIP_DECOMP_ENABLE_BITMAP , +ZIP_COMP_ENABLE_BITMAP , +ZIP_DRV_ALG_BITMAP , +ZIP_DEV_ALG_BITMAP , +}; +enum {HZIP_COMP_CORE0 ,HZIP_COMP_CORE1 ,
@@ -443,7 +463,7 @@ bool hisi_zip_alg_support(struct hisi_qm *qm, u32 alg) {u32 cap_val; - cap_val =hisi_qm_get_hw_info (qm, zip_basic_cap_info,ZIP_DRV_ALG_BITMAP , qm->cap_ver); + cap_val = qm->cap_tables.dev_cap_table[ZIP_DRV_ALG_BITMAP_IDX ].cap_val;if ((alg & cap_val) == alg)return true;
@@ -568,10 +588,8 @@ static int hisi_zip_set_user_domain_and_cache(struct hisi_qm *qm) }/* let's open all compression/decompression cores */ - dcomp_bm =hisi_qm_get_hw_info (qm, zip_basic_cap_info, -ZIP_DECOMP_ENABLE_BITMAP , qm->cap_ver); - comp_bm =hisi_qm_get_hw_info (qm, zip_basic_cap_info, -ZIP_COMP_ENABLE_BITMAP , qm->cap_ver); + dcomp_bm = qm->cap_tables.dev_cap_table[ZIP_DECOMP_ENABLE_BITMAP_IDX ].cap_val; + comp_bm = qm->cap_tables.dev_cap_table[ZIP_COMP_ENABLE_BITMAP_IDX ].cap_val;writel (HZIP_DECOMP_CHECK_ENABLE | dcomp_bm | comp_bm, base +HZIP_CLOCK_GATE_CTRL );/* enable sqc,cqc writeback */
@@ -798,9 +816,8 @@ static int hisi_zip_core_debug_init(struct hisi_qm *qm)char buf[HZIP_BUF_SIZE ];int i; - zip_core_num =hisi_qm_get_hw_info (qm, zip_basic_cap_info,ZIP_CORE_NUM_CAP , qm->cap_ver); - zip_comp_core_num =hisi_qm_get_hw_info (qm, zip_basic_cap_info,ZIP_CLUSTER_COMP_NUM_CAP , - qm->cap_ver); + zip_core_num = qm->cap_tables.dev_cap_table[ZIP_CORE_NUM_CAP_IDX ].cap_val; + zip_comp_core_num = qm->cap_tables.dev_cap_table[ZIP_CLUSTER_COMP_NUM_CAP_IDX ].cap_val;for (i =0 ; i < zip_core_num; i++) {if (i < zip_comp_core_num)
@@ -942,7 +959,7 @@ static int hisi_zip_show_last_regs_init(struct hisi_qm *qm)u32 zip_core_num;int i, j, idx; - zip_core_num =hisi_qm_get_hw_info (qm, zip_basic_cap_info,ZIP_CORE_NUM_CAP , qm->cap_ver); + zip_core_num = qm->cap_tables.dev_cap_table[ZIP_CORE_NUM_CAP_IDX ].cap_val; debug->last_words =kcalloc (core_dfx_regs_num * zip_core_num + com_dfx_regs_num,sizeof (unsigned int ),GFP_KERNEL );
@@ -998,9 +1015,9 @@ static void hisi_zip_show_last_dfx_regs(struct hisi_qm *qm) hzip_com_dfx_regs[i].name, debug->last_words[i], val); } - zip_core_num =hisi_qm_get_hw_info (qm, zip_basic_cap_info,ZIP_CORE_NUM_CAP , qm->cap_ver); - zip_comp_core_num =hisi_qm_get_hw_info (qm, zip_basic_cap_info,ZIP_CLUSTER_COMP_NUM_CAP , - qm->cap_ver); + zip_core_num = qm->cap_tables.dev_cap_table[ZIP_CORE_NUM_CAP_IDX ].cap_val; + zip_comp_core_num = qm->cap_tables.dev_cap_table[ZIP_CLUSTER_COMP_NUM_CAP_IDX ].cap_val; +for (i =0 ; i < zip_core_num; i++) {if (i < zip_comp_core_num)scnprintf (buf,sizeof (buf),"Comp_core-%d" , i);
@@ -1156,6 +1173,28 @@ static int hisi_zip_pf_probe_init(struct hisi_zip *hisi_zip)return ret; } +static int zip_pre_store_cap_reg (struct hisi_qm *qm) +{ +struct hisi_qm_cap_record *zip_cap; +struct pci_dev *pdev = qm->pdev; +size_t i, size; + + size =ARRAY_SIZE (zip_pre_store_caps); + zip_cap =devm_kzalloc (&pdev->dev,sizeof (*zip_cap) * size,GFP_KERNEL ); +if (!zip_cap) +return -ENOMEM ; + +for (i =0 ; i < size; i++) { + zip_cap[i].type = zip_pre_store_caps[i]; + zip_cap[i].cap_val =hisi_qm_get_hw_info (qm, zip_basic_cap_info, + zip_pre_store_caps[i], qm->cap_ver); + } + + qm->cap_tables.dev_cap_table = zip_cap; + +return 0 ; +} +static int hisi_zip_qm_init (struct hisi_qm *qm,struct pci_dev *pdev) {u64 alg_msk;
@@ -1194,7 +1233,15 @@ static int hisi_zip_qm_init(struct hisi_qm *qm, struct pci_dev *pdev)return ret; } - alg_msk =hisi_qm_get_hw_info (qm, zip_basic_cap_info,ZIP_DEV_ALG_BITMAP , qm->cap_ver); +/* Fetch and save the value of capability registers */ + ret =zip_pre_store_cap_reg (qm); +if (ret) { +pci_err (qm->pdev,"Failed to pre-store capability registers!\n" ); +hisi_qm_uninit (qm); +return ret; + } + + alg_msk = qm->cap_tables.dev_cap_table[ZIP_DEV_ALG_BITMAP_IDX ].cap_val; ret =hisi_qm_set_algs (qm, alg_msk, zip_dev_algs,ARRAY_SIZE (zip_dev_algs));if (ret) {pci_err (qm->pdev,"Failed to set zip algs!\n" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 50/417 pstore: ram_core: fix possible overflow in persistent_ram_init_ecc()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Shtylyov <[email protected]>
[ Upstream commit 86222a8fc16ec517de8da2604d904c9df3a08e5d ]
In persistent_ram_init_ecc(), on 64-bit arches DIV_ROUND_UP() will return 64-bit value since persistent_ram_zone::buffer_size has type size_t which is derived from the 64-bit *unsigned long*, while the ecc_blocks variable this value gets assigned to has (always 32-bit) *int* type. Even if that value fits into *int* type, an overflow is still possible when calculating the size_t typed ecc_total variable further below since there's no cast to any 64-bit type before multiplication. Declaring the ecc_blocks variable as *size_t* should fix this mess...
Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool.
--- fs/pstore/ram_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/pstore/ram_core.c +1 -1
@@ -190,7 +190,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz, {int numerr;struct persistent_ram_buffer *buffer = prz->buffer; -int ecc_blocks; +size_t ecc_blocks;size_t ecc_total;if (!ecc_info || !ecc_info->ecc_size)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 51/417 erofs: fix memory leak on short-lived bounced pages
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gao Xiang <[email protected]>
[ Upstream commit 93d6fda7f926451a0fa1121b9558d75ca47e861e ]
Both MicroLZMA and DEFLATE algorithms can use short-lived pages on demand for the overlapped inplace I/O decompression.
However, those short-lived pages are actually added to be->compressed_pages. Thus, it should be checked instead of pcl->compressed_bvecs.
The LZ4 algorithm doesn't work like this, so it won't be impacted.
--- fs/erofs/zdata.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/erofs/zdata.c +2 -3
@@ -1192,12 +1192,11 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,put_page (page); }else {for (i =0 ; i < pclusterpages; ++i) { - page = pcl->compressed_bvecs[i].page; +/* consider shortlived pages added when decompressing */ + page = be->compressed_pages[i];if (erofs_page_is_managed (sbi, page))continue ; - -/* recycle all individual short-lived pages */ (void )z_erofs_put_shortlivedpage (be->pagepool, page);WRITE_ONCE (pcl->compressed_bvecs[i].page,NULL ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 52/417 fs: indicate request originates from old mount API
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit f67d922edb4e95a4a56d07d5d40a76dd4f23a85b ]
We already communicate to filesystems when a remount request comes from the old mount API as some filesystems choose to implement different behavior in the new mount API than the old mount API to e.g., take the chance to fix significant API bugs. Allow the same for regular mount requests.
--- fs/namespace.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/namespace.c +11 -0
@@ -2693,7 +2693,12 @@ static int do_remount(struct path *path, int ms_flags, int sb_flags,if (IS_ERR (fc))return PTR_ERR (fc); +/* +* Indicate to the filesystem that the remount request is coming +* from the legacy mount system call. +*/ fc->oldapi = true; + err =parse_monolithic_mount_data (fc, data);if (!err) {down_write (&sb->s_umount);
@@ -3027,6 +3032,12 @@ static int do_new_mount(struct path *path, const char *fstype, int sb_flags,if (IS_ERR (fc))return PTR_ERR (fc); +/* +* Indicate to the filesystem that the mount request is coming +* from the legacy mount system call. +*/ + fc->oldapi = true; +if (subtype) err =vfs_parse_fs_string (fc,"subtype" , subtype,strlen (subtype));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 53/417 gfs2: Fix kernel NULL pointer dereference in gfs2_rgrp_dump
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Osama Muhammad <[email protected]>
[ Upstream commit 8877243beafa7c6bfc42022cbfdf9e39b25bd4fa ]
Syzkaller has reported a NULL pointer dereference when accessing rgd->rd_rgl in gfs2_rgrp_dump(). This can happen when creating rgd->rd_gl fails in read_rindex_entry(). Add a NULL pointer check in gfs2_rgrp_dump() to prevent that.
--- fs/gfs2/rgrp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/rgrp.c +1 -1
@@ -2306,7 +2306,7 @@ void gfs2_rgrp_dump(struct seq_file *seq, struct gfs2_rgrpd *rgd, (unsigned long long )rgd->rd_addr, rgd->rd_flags, rgd->rd_free, rgd->rd_free_clone, rgd->rd_dinodes, rgd->rd_requested, rgd->rd_reserved, rgd->rd_extfail_pt); -if (rgd->rd_sbd->sd_args.ar_rgrplvb) { +if (rgd->rd_sbd->sd_args.ar_rgrplvb && rgd->rd_rgl) {struct gfs2_rgrp_lvb *rgl = rgd->rd_rgl; gfs2_print_dbg(seq, "%s L: f:%02x b:%u i:%u\n", fs_id_buf,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 54/417 crypto: virtio - Wait for tasklet to complete on device remove
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: wangyangxin <[email protected]>
[ Upstream commit 67cc511e8d436456cc98033e6d4ba83ebfc8e672 ]
The scheduled tasklet needs to be executed on device remove.
--- drivers/crypto/virtio/virtio_crypto_core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/crypto/virtio/virtio_crypto_core.c +3 -0
@@ -499,12 +499,15 @@ static void virtcrypto_free_unused_reqs(struct virtio_crypto *vcrypto)static void virtcrypto_remove (struct virtio_device *vdev) {struct virtio_crypto *vcrypto = vdev->priv; +int i;dev_info (&vdev->dev,"Start virtcrypto_remove.\n" );flush_work (&vcrypto->config_work);if (virtcrypto_dev_started (vcrypto))virtcrypto_dev_stop (vcrypto); +for (i =0 ; i < vcrypto->max_data_queues; i++) +tasklet_kill (&vcrypto->data_vq[i].done_task);virtio_reset_device (vdev);virtcrypto_free_unused_reqs (vcrypto);virtcrypto_clear_crypto_engines (vcrypto);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 55/417 crypto: sahara - avoid skcipher fallback code duplication
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit 01d70a4bbff20ea05cadb4c208841985a7cc6596 ]
Factor out duplicated skcipher fallback handling code to a helper function sahara_aes_fallback(). Also, keep a single check if fallback is required in sahara_aes_crypt().
Stable-dep-of: d1d6351e37aa ("crypto: sahara - handle zero-length aes requests")
--- drivers/crypto/sahara.c | 85 ++++++++++++----------------------------- 1 file changed, 25 insertions(+), 60 deletions(-)
drivers/crypto/sahara.c +25 -60
@@ -649,12 +649,37 @@ static int sahara_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,return crypto_skcipher_setkey (ctx->fallback, key, keylen); } +static int sahara_aes_fallback (struct skcipher_request *req,unsigned long mode) +{ +struct sahara_aes_reqctx *rctx =skcipher_request_ctx (req); +struct sahara_ctx *ctx =crypto_skcipher_ctx ( +crypto_skcipher_reqtfm (req)); + +skcipher_request_set_tfm (&rctx->fallback_req, ctx->fallback); +skcipher_request_set_callback (&rctx->fallback_req, + req->base.flags, + req->base.complete, + req->base.data); +skcipher_request_set_crypt (&rctx->fallback_req, req->src, + req->dst, req->cryptlen, req->iv); + +if (mode &FLAGS_ENCRYPT ) +return crypto_skcipher_encrypt (&rctx->fallback_req); + +return crypto_skcipher_decrypt (&rctx->fallback_req); +} +static int sahara_aes_crypt (struct skcipher_request *req,unsigned long mode) {struct sahara_aes_reqctx *rctx =skcipher_request_ctx (req); +struct sahara_ctx *ctx =crypto_skcipher_ctx ( +crypto_skcipher_reqtfm (req));struct sahara_dev *dev = dev_ptr;int err =0 ; +if (unlikely (ctx->keylen !=AES_KEYSIZE_128 )) +return sahara_aes_fallback (req, mode); +dev_dbg (dev->device,"nbytes: %d, enc: %d, cbc: %d\n" , req->cryptlen, !!(mode &FLAGS_ENCRYPT ), !!(mode &FLAGS_CBC ));
@@ -677,81 +702,21 @@ static int sahara_aes_crypt(struct skcipher_request *req, unsigned long mode)static int sahara_aes_ecb_encrypt (struct skcipher_request *req) { -struct sahara_aes_reqctx *rctx =skcipher_request_ctx (req); -struct sahara_ctx *ctx =crypto_skcipher_ctx ( -crypto_skcipher_reqtfm (req)); - -if (unlikely (ctx->keylen !=AES_KEYSIZE_128 )) { -skcipher_request_set_tfm (&rctx->fallback_req, ctx->fallback); -skcipher_request_set_callback (&rctx->fallback_req, - req->base.flags, - req->base.complete, - req->base.data); -skcipher_request_set_crypt (&rctx->fallback_req, req->src, - req->dst, req->cryptlen, req->iv); -return crypto_skcipher_encrypt (&rctx->fallback_req); - } -return sahara_aes_crypt (req,FLAGS_ENCRYPT ); }static int sahara_aes_ecb_decrypt (struct skcipher_request *req) { -struct sahara_aes_reqctx *rctx =skcipher_request_ctx (req); -struct sahara_ctx *ctx =crypto_skcipher_ctx ( -crypto_skcipher_reqtfm (req)); - -if (unlikely (ctx->keylen !=AES_KEYSIZE_128 )) { -skcipher_request_set_tfm (&rctx->fallback_req, ctx->fallback); -skcipher_request_set_callback (&rctx->fallback_req, - req->base.flags, - req->base.complete, - req->base.data); -skcipher_request_set_crypt (&rctx->fallback_req, req->src, - req->dst, req->cryptlen, req->iv); -return crypto_skcipher_decrypt (&rctx->fallback_req); - } -return sahara_aes_crypt (req,0 ); }static int sahara_aes_cbc_encrypt (struct skcipher_request *req) { -struct sahara_aes_reqctx *rctx =skcipher_request_ctx (req); -struct sahara_ctx *ctx =crypto_skcipher_ctx ( -crypto_skcipher_reqtfm (req)); - -if (unlikely (ctx->keylen !=AES_KEYSIZE_128 )) { -skcipher_request_set_tfm (&rctx->fallback_req, ctx->fallback); -skcipher_request_set_callback (&rctx->fallback_req, - req->base.flags, - req->base.complete, - req->base.data); -skcipher_request_set_crypt (&rctx->fallback_req, req->src, - req->dst, req->cryptlen, req->iv); -return crypto_skcipher_encrypt (&rctx->fallback_req); - } -return sahara_aes_crypt (req,FLAGS_ENCRYPT |FLAGS_CBC ); }static int sahara_aes_cbc_decrypt (struct skcipher_request *req) { -struct sahara_aes_reqctx *rctx =skcipher_request_ctx (req); -struct sahara_ctx *ctx =crypto_skcipher_ctx ( -crypto_skcipher_reqtfm (req)); - -if (unlikely (ctx->keylen !=AES_KEYSIZE_128 )) { -skcipher_request_set_tfm (&rctx->fallback_req, ctx->fallback); -skcipher_request_set_callback (&rctx->fallback_req, - req->base.flags, - req->base.complete, - req->base.data); -skcipher_request_set_crypt (&rctx->fallback_req, req->src, - req->dst, req->cryptlen, req->iv); -return crypto_skcipher_decrypt (&rctx->fallback_req); - } -return sahara_aes_crypt (req,FLAGS_CBC ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 56/417 crypto: sahara - handle zero-length aes requests
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit d1d6351e37aac14b32a291731d0855996c459d11 ]
In case of a zero-length input, exit gracefully from sahara_aes_crypt().
--- drivers/crypto/sahara.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/crypto/sahara.c +3 -0
@@ -677,6 +677,9 @@ static int sahara_aes_crypt(struct skcipher_request *req, unsigned long mode)struct sahara_dev *dev = dev_ptr;int err =0 ; +if (!req->cryptlen) +return 0 ; +if (unlikely (ctx->keylen !=AES_KEYSIZE_128 ))return sahara_aes_fallback (req, mode);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 57/417 crypto: sahara - fix ahash reqsize
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit efcb50f41740ac55e6ccc4986c1a7740e21c62b4 ]
Set the reqsize for sha algorithms to sizeof(struct sahara_sha_reqctx), the extra space is not needed.
--- drivers/crypto/sahara.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/crypto/sahara.c +1 -2
@@ -1163,8 +1163,7 @@ static int sahara_sha_import(struct ahash_request *req, const void *in)static int sahara_sha_cra_init (struct crypto_tfm *tfm) {crypto_ahash_set_reqsize (__crypto_ahash_cast (tfm), -sizeof (struct sahara_sha_reqctx ) + -SHA_BUFFER_LEN +SHA256_BLOCK_SIZE ); +sizeof (struct sahara_sha_reqctx ));return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 58/417 crypto: sahara - fix wait_for_completion_timeout() error handling
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit 2dba8e1d1a7957dcbe7888846268538847b471d1 ]
The sg lists are not unmapped in case of timeout errors. Fix this.
--- drivers/crypto/sahara.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/crypto/sahara.c +10 -8
@@ -608,16 +608,17 @@ static int sahara_aes_process(struct skcipher_request *req) timeout =wait_for_completion_timeout (&dev->dma_completion,msecs_to_jiffies (SAHARA_TIMEOUT_MS )); -if (!timeout) { -dev_err (dev->device,"AES timeout\n" ); -return -ETIMEDOUT ; - }dma_unmap_sg (dev->device, dev->out_sg, dev->nb_out_sg,DMA_FROM_DEVICE );dma_unmap_sg (dev->device, dev->in_sg, dev->nb_in_sg,DMA_TO_DEVICE ); +if (!timeout) { +dev_err (dev->device,"AES timeout\n" ); +return -ETIMEDOUT ; + } +if ((dev->flags &FLAGS_CBC ) && req->iv)sahara_aes_cbc_update_iv (req);
@@ -1008,15 +1009,16 @@ static int sahara_sha_process(struct ahash_request *req) timeout =wait_for_completion_timeout (&dev->dma_completion,msecs_to_jiffies (SAHARA_TIMEOUT_MS )); -if (!timeout) { -dev_err (dev->device,"SHA timeout\n" ); -return -ETIMEDOUT ; - }if (rctx->sg_in_idx)dma_unmap_sg (dev->device, dev->in_sg, dev->nb_in_sg,DMA_TO_DEVICE ); +if (!timeout) { +dev_err (dev->device,"SHA timeout\n" ); +return -ETIMEDOUT ; + } +memcpy (rctx->context, dev->context_base, rctx->context_size);if (req->result && rctx->last)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 59/417 crypto: sahara - improve error handling in sahara_sha_process()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit 5deff027fca49a1eb3b20359333cf2ae562a2343 ]
sahara_sha_hw_data_descriptor_create() returns negative error codes on failure, so make sure the errors are correctly handled / propagated.
--- drivers/crypto/sahara.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/crypto/sahara.c +8 -2
@@ -988,7 +988,10 @@ static int sahara_sha_process(struct ahash_request *req)return ret;if (rctx->first) { -sahara_sha_hw_data_descriptor_create (dev, rctx, req,0 ); + ret =sahara_sha_hw_data_descriptor_create (dev, rctx, req,0 ); +if (ret) +return ret; + dev->hw_desc[0 ]->next =0 ; rctx->first =0 ; }else {
@@ -996,7 +999,10 @@ static int sahara_sha_process(struct ahash_request *req)sahara_sha_hw_context_descriptor_create (dev, rctx, req,0 ); dev->hw_desc[0 ]->next = dev->hw_phys_desc[1 ]; -sahara_sha_hw_data_descriptor_create (dev, rctx, req,1 ); + ret =sahara_sha_hw_data_descriptor_create (dev, rctx, req,1 ); +if (ret) +return ret; + dev->hw_desc[1 ]->next =0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 60/417 crypto: sahara - fix processing hash requests with req->nbytes < sg->length
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit 7bafa74d1ba35dcc173e1ce915e983d65905f77e ]
It's not always the case that the entire sg entry needs to be processed. Currently, when nbytes is less than sg->length, "Descriptor length" errors are encountered.
To fix this, take the actual request size into account when populating the hw links.
--- drivers/crypto/sahara.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/sahara.c +4 -1
@@ -777,6 +777,7 @@ static int sahara_sha_hw_links_create(struct sahara_dev *dev, int start) {struct scatterlist *sg; +unsigned int len;unsigned int i;int ret;
@@ -798,12 +799,14 @@ static int sahara_sha_hw_links_create(struct sahara_dev *dev,if (!ret)return -EFAULT ; + len = rctx->total;for (i = start; i < dev->nb_in_sg + start; i++) { - dev->hw_link[i]->len = sg->length; + dev->hw_link[i]->len =min (len, sg->length); dev->hw_link[i]->p = sg->dma_address;if (i == (dev->nb_in_sg + start -1 )) { dev->hw_link[i]->next =0 ; }else { + len -=min (len, sg->length); dev->hw_link[i]->next = dev->hw_phys_link[i +1 ]; sg =sg_next (sg); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 61/417 crypto: sahara - do not resize req->src when doing hash operations
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit a3c6f4f4d249cecaf2f34471aadbfb4f4ef57298 ]
When testing sahara sha256 speed performance with tcrypt (mode=404) on imx53-qsrb board, multiple "Invalid numbers of src SG." errors are reported. This was traced to sahara_walk_and_recalc() resizing req->src and causing the subsequent dma_map_sg() call to fail.
Now that the previous commit fixed sahara_sha_hw_links_create() to take into account the actual request size, rather than relying on sg->length values, the resize operation is no longer necessary.
Therefore, remove sahara_walk_and_recalc() and simplify associated logic.
--- drivers/crypto/sahara.c | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-)
drivers/crypto/sahara.c +2 -36
@@ -887,24 +887,6 @@ static int sahara_sha_hw_context_descriptor_create(struct sahara_dev *dev,return 0 ; } -static int sahara_walk_and_recalc (struct scatterlist *sg,unsigned int nbytes) -{ -if (!sg || !sg->length) -return nbytes; - -while (nbytes && sg) { -if (nbytes <= sg->length) { - sg->length = nbytes; -sg_mark_end (sg); -break ; - } - nbytes -= sg->length; - sg =sg_next (sg); - } - -return nbytes; -} -static int sahara_sha_prepare_request (struct ahash_request *req) {struct crypto_ahash *tfm =crypto_ahash_reqtfm (req);
@@ -941,36 +923,20 @@ static int sahara_sha_prepare_request(struct ahash_request *req) hash_later, 0); } -/* nbytes should now be multiple of blocksize */ - req->nbytes = req->nbytes - hash_later; - -sahara_walk_and_recalc (req->src, req->nbytes); - + rctx->total = len - hash_later;/* have data from previous operation and current */ if (rctx->buf_cnt && req->nbytes) {sg_init_table (rctx->in_sg_chain,2 );sg_set_buf (rctx->in_sg_chain, rctx->rembuf, rctx->buf_cnt); -sg_chain (rctx->in_sg_chain,2 , req->src); - - rctx->total = req->nbytes + rctx->buf_cnt; rctx->in_sg = rctx->in_sg_chain; - - req->src = rctx->in_sg_chain;/* only data from previous operation */ }else if (rctx->buf_cnt) { -if (req->src) - rctx->in_sg = req->src; -else - rctx->in_sg = rctx->in_sg_chain; -/* buf was copied into rembuf above */ + rctx->in_sg = rctx->in_sg_chain;sg_init_one (rctx->in_sg, rctx->rembuf, rctx->buf_cnt); - rctx->total = rctx->buf_cnt;/* no data from previous operation */ }else { rctx->in_sg = req->src; - rctx->total = req->nbytes; - req->src = rctx->in_sg; }/* on next call, we only have the remaining data in the buffer */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 62/417 crypto: scomp - fix req->dst buffer overflow
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengming Zhou <[email protected]>
[ Upstream commit 744e1885922a9943458954cfea917b31064b4131 ]
The req->dst buffer size should be checked before copying from the scomp_scratch->dst to avoid req->dst buffer overflow problem.
--- crypto/scompress.c | 6 ++++++ 1 file changed, 6 insertions(+)
crypto/scompress.c +6 -0
@@ -124,6 +124,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)struct crypto_scomp *scomp = *tfm_ctx;void **ctx =acomp_request_ctx (req);struct scomp_scratch *scratch; +unsigned int dlen;int ret;if (!req->src || !req->slen || req->slen >SCOMP_SCRATCH_SIZE )
@@ -135,6 +136,8 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)if (!req->dlen || req->dlen >SCOMP_SCRATCH_SIZE ) req->dlen =SCOMP_SCRATCH_SIZE ; + dlen = req->dlen; + scratch =raw_cpu_ptr (&scomp_scratch);spin_lock (&scratch->lock);
@@ -152,6 +155,9 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) ret = -ENOMEM ; goto out; } + }else if (req->dlen > dlen) { + ret = -ENOSPC ; + goto out; }scatterwalk_map_and_copy (scratch->dst, req->dst,0 , req->dlen,1 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 63/417 csky: fix arch_jump_label_transform_static override
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit ca8e45c8048a2c9503c74751d25414601f730580 ]
The arch_jump_label_transform_static() function in csky was originally meant to override the generic __weak function, but that got changed to an #ifndef check.
This showed up as a missing-prototype warning:arch/csky/kernel/jump_label.c:43:6: error: no previous prototype for 'arch_jump_label_transform_static' [-Werror=missing-prototypes]
Change the method to use the new method of having a #define and a prototype for the global function.
--- arch/csky/include/asm/jump_label.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/csky/include/asm/jump_label.h +5 -0
@@ -43,5 +43,10 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key,return true; } +enum jump_label_type ; +void arch_jump_label_transform_static (struct jump_entry *entry, +enum jump_label_type type); +#define arch_jump_label_transform_static arch_jump_label_transform_static +#endif /* __ASSEMBLY__ */ #endif /* __ASM_CSKY_JUMP_LABEL_H */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 64/417 blocklayoutdriver: Fix reference leak of pnfs_device_node
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
[ Upstream commit 1530827b90025cdf80c9b0d07a166d045a0a7b81 ]
The error path for blocklayout's device lookup is missing a reference drop for the case where a lookup finds the device, but the device is marked with NFS_DEVICEID_UNAVAILABLE.
--- fs/nfs/blocklayout/blocklayout.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfs/blocklayout/blocklayout.c +2 -0
@@ -580,6 +580,8 @@ bl_find_get_deviceid(struct nfs_server *server,nfs4_delete_deviceid (node->ld, node->nfs_client, id); goto retry; } + +nfs4_put_deviceid_node (node);return ERR_PTR (-ENODEV ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 65/417 NFSv4.1/pnfs: Ensure we handle the error NFS4ERR_RETURNCONFLICT
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit 037e56a22ff37f9a9c2330b66cff55d3d1ff9b90 ]
Once the client has processed the CB_LAYOUTRECALL, but has not yet successfully returned the layout, the server is supposed to switch to returning NFS4ERR_RETURNCONFLICT. This patch ensures that we handle that return value correctly.
--- fs/nfs/nfs4proc.c | 3 +++ 1 file changed, 3 insertions(+)
fs/nfs/nfs4proc.c +3 -0
@@ -170,6 +170,7 @@ static int nfs4_map_errors(int err)case -NFS4ERR_RESOURCE :case -NFS4ERR_LAYOUTTRYLATER :case -NFS4ERR_RECALLCONFLICT : +case -NFS4ERR_RETURNCONFLICT :return -EREMOTEIO ;case -NFS4ERR_WRONGSEC :case -NFS4ERR_WRONG_CRED :
@@ -558,6 +559,7 @@ static int nfs4_do_handle_exception(struct nfs_server *server,case -NFS4ERR_GRACE :case -NFS4ERR_LAYOUTTRYLATER :case -NFS4ERR_RECALLCONFLICT : +case -NFS4ERR_RETURNCONFLICT : exception->delay =1 ;return 0 ;
@@ -9667,6 +9669,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, status = -EBUSY ;break ;case -NFS4ERR_RECALLCONFLICT : +case -NFS4ERR_RETURNCONFLICT : status = -ERECALLCONFLICT ;break ;case -NFS4ERR_DELEG_REVOKED :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 66/417 SUNRPC: fix _xprt_switch_find_current_entry logic
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Kornievskaia <[email protected]>
[ Upstream commit 98b4e5137504a5bd9346562b1310cdc13486603b ]
Fix the logic for picking current transport entry.
--- net/sunrpc/xprtmultipath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/xprtmultipath.c +1 -1
@@ -284,7 +284,7 @@ struct rpc_xprt *_xprt_switch_find_current_entry(struct list_head *head,if (cur == pos) found = true;if (found && ((find_active &&xprt_is_active (pos)) || - (!find_active &&xprt_is_active (pos)))) + (!find_active && !xprt_is_active (pos))))return pos; }return NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 67/417 pNFS: Fix the pnfs block drivers calculation of layoutget size
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit 8a6291bf3b0eae1bf26621e6419a91682f2d6227 ]
Instead of relying on the value of the 'bytes_left' field, we should calculate the layout size based on the offset of the request that is being written out.
--- fs/nfs/blocklayout/blocklayout.c | 5 ++--- fs/nfs/direct.c | 5 +++-- fs/nfs/internal.h | 2 +- fs/nfs/pnfs.c | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-)
fs/nfs/blocklayout/blocklayout.c +2 -3
@@ -895,10 +895,9 @@ bl_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *req) }if (pgio->pg_dreq ==NULL ) - wb_size =pnfs_num_cont_bytes (pgio->pg_inode, - req->wb_index); + wb_size =pnfs_num_cont_bytes (pgio->pg_inode, req->wb_index);else - wb_size =nfs_dreq_bytes_left (pgio->pg_dreq); + wb_size =nfs_dreq_bytes_left (pgio->pg_dreq,req_offset (req));pnfs_generic_pg_init_write (pgio, req, wb_size);
fs/nfs/direct.c +3 -2
@@ -195,9 +195,10 @@ static void nfs_direct_req_release(struct nfs_direct_req *dreq)kref_put (&dreq->kref, nfs_direct_req_free); } -ssize_t nfs_dreq_bytes_left (struct nfs_direct_req *dreq) +ssize_t nfs_dreq_bytes_left (struct nfs_direct_req *dreq,loff_t offset) { -return dreq->bytes_left; +loff_t start = offset - dreq->io_start; +return dreq->max_count - start; }EXPORT_SYMBOL_GPL (nfs_dreq_bytes_left);
fs/nfs/internal.h +1 -1
@@ -640,7 +640,7 @@ extern int nfs_sillyrename(struct inode *dir, struct dentry *dentry);/* direct.c */ void nfs_init_cinfo_from_dreq (struct nfs_commit_info *cinfo,struct nfs_direct_req *dreq); -extern ssize_t nfs_dreq_bytes_left (struct nfs_direct_req *dreq); +extern ssize_t nfs_dreq_bytes_left (struct nfs_direct_req *dreq,loff_t offset);/* nfs4proc.c */ extern struct nfs_client *nfs4_init_client(struct nfs_client *clp,
fs/nfs/pnfs.c +2 -1
@@ -2729,7 +2729,8 @@ pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *rif (pgio->pg_dreq ==NULL ) rd_size =i_size_read (pgio->pg_inode) -req_offset (req);else - rd_size =nfs_dreq_bytes_left (pgio->pg_dreq); + rd_size =nfs_dreq_bytes_left (pgio->pg_dreq, +req_offset (req)); pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode, nfs_req_openctx(req),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 68/417 wifi: plfxlc: check for allocation failure in plfxlc_usb_wreq_async()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 40018a8fa9aa63ca5b26e803502138158fb0ff96 ]
Check for if the usb_alloc_urb() failed.
--- drivers/net/wireless/purelifi/plfxlc/usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/purelifi/plfxlc/usb.c +4 -1
@@ -493,9 +493,12 @@ int plfxlc_usb_wreq_async(struct plfxlc_usb *usb, const u8 *buffer, void *context) {struct usb_device *udev =interface_to_usbdev (usb->ez_usb); -struct urb *urb =usb_alloc_urb (0 ,GFP_ATOMIC ); +struct urb *urb;int r; + urb =usb_alloc_urb (0 ,GFP_ATOMIC ); +if (!urb) +return -ENOMEM ;usb_fill_bulk_urb (urb, udev,usb_sndbulkpipe (udev,EP_DATA_OUT ), (void *)buffer, buffer_len, complete_fn, context);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 69/417 wifi: rtw88: fix RX filter in FIF_ALLMULTI flag
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chih-Kang Chang <[email protected]>
[ Upstream commit 53ee0b3b99edc6a47096bffef15695f5a895386f ]
The broadcast packets will be filtered in the FIF_ALLMULTI flag in the original code, which causes beacon packets to be filtered out and disconnection. Therefore, we fix it.
--- drivers/net/wireless/realtek/rtw88/mac80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw88/mac80211.c +2 -2
@@ -266,9 +266,9 @@ static void rtw_ops_configure_filter(struct ieee80211_hw *hw,if (changed_flags &FIF_ALLMULTI ) {if (*new_flags &FIF_ALLMULTI ) - rtwdev->hal.rcr |=BIT_AM |BIT_AB ; + rtwdev->hal.rcr |=BIT_AM ;else - rtwdev->hal.rcr &= ~(BIT_AM |BIT_AB ); + rtwdev->hal.rcr &= ~(BIT_AM ); }if (changed_flags &FIF_FCSFAIL ) {if (*new_flags &FIF_FCSFAIL )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 70/417 bpf, lpm: Fix check prefixlen before walking trie
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Lehner <[email protected]>
[ Upstream commit 9b75dbeb36fcd9fc7ed51d370310d0518a387769 ]
When looking up an element in LPM trie, the condition 'matchlen == trie->max_prefixlen' will never return true, if key->prefixlen is larger than trie->max_prefixlen. Consequently all elements in the LPM trie will be visited and no element is returned in the end.
To resolve this, check key->prefixlen first before walking the LPM trie.
--- kernel/bpf/lpm_trie.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/bpf/lpm_trie.c +3 -0
@@ -231,6 +231,9 @@ static void *trie_lookup_elem(struct bpf_map *map, void *_key)struct lpm_trie_node *node, *found =NULL ;struct bpf_lpm_trie_key *key = _key; +if (key->prefixlen > trie->max_prefixlen) +return NULL ; +/* Start walking the trie from the root node ... */ for (node = rcu_dereference_check(trie->root, rcu_read_lock_bh_held());
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 71/417 bpf: Add crosstask check to __bpf_get_stack
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jordan Rome <[email protected]>
[ Upstream commit b8e3a87a627b575896e448021e5c2f8a3bc19931 ]
Currently get_perf_callchain only supports user stack walking for the current task. Passing the correct *crosstask* param will return 0 frames if the task passed to __bpf_get_stack isn't the current one instead of a single incorrect frame/address. This change passes the correct *crosstask* param but also does a preemptive check in __bpf_get_stack if the task is current and returns -EOPNOTSUPP if it is not.
This issue was found using bpf_get_task_stack inside a BPF iterator ("iter/task"), which iterates over all tasks. bpf_get_task_stack works fine for fetching kernel stacks but because get_perf_callchain relies on the caller to know if the requested *task* is the current one (via *crosstask*) it was failing in a confusing way.
It might be possible to get user stacks for all tasks utilizing something like access_process_vm but that requires the bpf program calling bpf_get_task_stack to be sleepable and would therefore be a breaking change.
--- include/uapi/linux/bpf.h | 3 +++ kernel/bpf/stackmap.c | 11 ++++++++++- tools/include/uapi/linux/bpf.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-)
include/uapi/linux/bpf.h +3 -0
@@ -4353,6 +4353,8 @@ union bpf_attr {* long bpf_get_task_stack(struct task_struct *task, void *buf, u32 size, u64 flags) * Description * Return a user or a kernel stack in bpf program provided buffer. +* Note: the user stack will only be populated if the *task* is +* the current task; all other tasks will return -EOPNOTSUPP. * To achieve this, the helper needs *task*, which is a valid * pointer to **struct task_struct**. To store the stacktrace, the * bpf program provides *buf* with a nonnegative *size*.
@@ -4364,6 +4366,7 @@ union bpf_attr {* * **BPF_F_USER_STACK** * Collect a user space stack instead of a kernel stack. +* The *task* must be the current task. * **BPF_F_USER_BUILD_ID** * Collect buildid+offset instead of ips for user stack, * only valid if **BPF_F_USER_STACK** is also specified.
kernel/bpf/stackmap.c +10 -1
@@ -391,6 +391,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task, {u32 trace_nr, copy_len, elem_size, num_elem, max_depth;bool user_build_id = flags &BPF_F_USER_BUILD_ID ; +bool crosstask = task && task != current;u32 skip = flags &BPF_F_SKIP_FIELD_MASK ;bool user = flags &BPF_F_USER_STACK ;struct perf_callchain_entry *trace;
@@ -413,6 +414,14 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task,if (task && user && !user_mode (regs)) goto err_fault; +/* get_perf_callchain does not support crosstask user stack walking +* but returns an empty stack instead of NULL. +*/ +if (crosstask && user) { + err = -EOPNOTSUPP ; + goto clear; + } + num_elem = size / elem_size; max_depth = num_elem + skip;if (sysctl_perf_event_max_stack < max_depth)
@@ -424,7 +433,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task, trace =get_callchain_entry_for_task (task, max_depth); else trace =get_perf_callchain (regs,0 , kernel, user, max_depth, - false, false); + crosstask, false);if (unlikely (!trace)) goto err_fault;
tools/include/uapi/linux/bpf.h +3 -0
@@ -4353,6 +4353,8 @@ union bpf_attr {* long bpf_get_task_stack(struct task_struct *task, void *buf, u32 size, u64 flags) * Description * Return a user or a kernel stack in bpf program provided buffer. +* Note: the user stack will only be populated if the *task* is +* the current task; all other tasks will return -EOPNOTSUPP. * To achieve this, the helper needs *task*, which is a valid * pointer to **struct task_struct**. To store the stacktrace, the * bpf program provides *buf* with a nonnegative *size*.
@@ -4364,6 +4366,7 @@ union bpf_attr {* * **BPF_F_USER_STACK** * Collect a user space stack instead of a kernel stack. +* The *task* must be the current task. * **BPF_F_USER_BUILD_ID** * Collect buildid+offset instead of ips for user stack, * only valid if **BPF_F_USER_STACK** is also specified.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 72/417 wifi: ath11k: Defer on rproc_get failure
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <[email protected]>
[ Upstream commit 2a3ec40b98b46c339adb57313d3b933ee5e7a8e8 ]
If we already have gotten the rproc_handle (meaning the "qcom,rproc" property is defined in the devicetree), it's a valid state that the remoteproc module hasn't probed yet so we should defer probing instead of just failing to probe.
This resolves a race condition when the ath11k driver probes and fails before the wpss remoteproc driver has probed, like the following:
[ 6.232360] ath11k 17a10040.wifi: failed to get rproc
[ 6.232366] ath11k 17a10040.wifi: failed to get rproc: -22
[ 6.232478] ath11k: probe of 17a10040.wifi failed with error -22
...
[ 6.252415] remoteproc remoteproc2: 8a00000.remoteproc is available
[ 6.252776] remoteproc remoteproc2: powering up 8a00000.remoteproc
[ 6.252781] remoteproc remoteproc2: Booting fw image qcom/qcm6490/fairphone5/wpss.mdt, size 7188So, defer the probe if we hit that so we can retry later once the wpss remoteproc is available.
Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-01264-QCAMSLSWPLZ-1.37886.3
--- drivers/net/wireless/ath/ath11k/ahb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath11k/ahb.c +2 -2
@@ -813,8 +813,8 @@ static int ath11k_core_get_rproc(struct ath11k_base *ab) prproc =rproc_get_by_phandle (rproc_phandle);if (!prproc) { -ath11k_err (ab,"failed to get rproc\n" ); -return -EINVAL ; +ath11k_dbg (ab,ATH11K_DBG_AHB ,"failed to get rproc, deferring\n" ); +return -EPROBE_DEFER ; } ab_ahb->tgt_rproc = prproc;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 73/417 wifi: libertas: stop selecting wext
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 8170b04c2c92eee52ea50b96db4c54662197e512 ]
Libertas no longer references the iw_handler infrastructure or wext_spy, so neither of the 'select' statements are used any more.
--- drivers/net/wireless/marvell/libertas/Kconfig | 2 -- 1 file changed, 2 deletions(-)
drivers/net/wireless/marvell/libertas/Kconfig +0 -2
@@ -2,8 +2,6 @@ config LIBERTAS tristate "Marvell 8xxx Libertas WLAN driver support" depends on CFG80211 - select WIRELESS_EXT - select WEXT_SPY select LIB80211 select FW_LOADER help
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 74/417 ARM: dts: qcom: apq8064: correct XOADC register address
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 554557542e709e190eff8a598f0cde02647d533a ]
The XOADC is present at the address 0x197 rather than just 197. It doesn't change a lot (since the driver hardcodes all register addresses), but the DT should present correct address anyway.
--- arch/arm/boot/dts/qcom-apq8064.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/qcom-apq8064.dtsi +1 -1
@@ -750,7 +750,7 @@ pwrkey@1c { xoadc: xoadc@197 { compatible = "qcom,pm8921-adc"; - reg = <197>; + reg = <0x197>; interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>; #address-cells = <2>; #size-cells = <0>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 75/417 net/ncsi: Fix netlink major/minor version numbers
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Delevoryas <[email protected]>
[ Upstream commit 3084b58bfd0b9e4b5e034f31f31b42977db35f12 ]
The netlink interface for major and minor version numbers doesn't actually return the major and minor version numbers.
It reports a u32 that contains the (major, minor, update, alpha1) components as the major version number, and then alpha2 as the minor version number.
For whatever reason, the u32 byte order was reversed (ntohl): maybe it was assumed that the encoded value was a single big-endian u32, and alpha2 was the minor version.
The correct way to get the supported NC-SI version from the network controller is to parse the Get Version ID response as described in 8.4.44 of the NC-SI spec[1].
Get Version ID Response Packet Format
Bits
+--------+--------+--------+--------+
Bytes | 31..24 | 23..16 | 15..8 | 7..0 |
+-------+--------+--------+--------+--------+
| 0..15 | NC-SI Header |
+-------+--------+--------+--------+--------+
| 16..19| Response code | Reason code |
+-------+--------+--------+--------+--------+
|20..23 | Major | Minor | Update | Alpha1 |
+-------+--------+--------+--------+--------+
|24..27 | reserved | Alpha2 |
+-------+--------+--------+--------+--------+
| .... other stuff .... |The major, minor, and update fields are all binary-coded decimal (BCD) encoded [2]. The spec provides examples below the Get Version ID response format in section 8.4.44.1, but for practical purposes, this is an example from a live network card:
root@bmc:~# ncsi-util 0x15
NC-SI Command Response:
cmd: GET_VERSION_ID(0x15)
Response: COMMAND_COMPLETED(0x0000) Reason: NO_ERROR(0x0000)
Payload length = 40 20: 0xf1 0xf1 0xf0 0x00 <<<<<<<<< (major, minor, update, alpha1)
24: 0x00 0x00 0x00 0x00 <<<<<<<<< (_, _, _, alpha2)
28: 0x6d 0x6c 0x78 0x30
32: 0x2e 0x31 0x00 0x00
36: 0x00 0x00 0x00 0x00
40: 0x16 0x1d 0x07 0xd2
44: 0x10 0x1d 0x15 0xb3
48: 0x00 0x17 0x15 0xb3
52: 0x00 0x00 0x81 0x19This should be parsed as "1.1.0".
"f" in the upper-nibble means to ignore it, contributing zero.
If both nibbles are "f", I think the whole field is supposed to be ignored. Major and minor are "required", meaning they're not supposed to be "ff", but the update field is "optional" so I think it can be ff. I think the simplest thing to do is just set the major and minor to zero instead of juggling some conditional logic or something.
bcd2bin() from "include/linux/bcd.h" seems to assume both nibbles are 0-9, so I've provided a custom BCD decoding function.
Alpha1 and alpha2 are ISO/IEC 8859-1 encoded, which just means ASCII characters as far as I can tell, although the full encoding table for non-alphabetic characters is slightly different (I think).
I imagine the alpha fields are just supposed to be alphabetic characters, but I haven't seen any network cards actually report a non-zero value for either.
If people wrote software against this netlink behavior, and were parsing the major and minor versions themselves from the u32, then this would definitely break their code.
[1] https://www.dmtf.org/sites/default/files/standards/documents/DSP0222_1.0.0.pdf
[2] https://en.wikipedia.org/wiki/Binary-coded_decimal
[2] https://en.wikipedia.org/wiki/ISO/IEC_8859-1
--- net/ncsi/internal.h | 7 +++++-- net/ncsi/ncsi-netlink.c | 4 ++-- net/ncsi/ncsi-pkt.h | 7 +++++-- net/ncsi/ncsi-rsp.c | 26 ++++++++++++++++++++++++-- 4 files changed, 36 insertions(+), 8 deletions(-)
net/ncsi/internal.h +5 -2
@@ -105,8 +105,11 @@ enum {struct ncsi_channel_version { -u32 version;/* Supported BCD encoded NCSI version */ -u32 alpha2;/* Supported BCD encoded NCSI version */ +u8 major;/* NCSI version major */ +u8 minor;/* NCSI version minor */ +u8 update;/* NCSI version update */ +char alpha1;/* NCSI version alpha1 */ +char alpha2;/* NCSI version alpha2 */ u8 fw_name[12 ];/* Firmware name string */ u32 fw_version;/* Firmware version */ u16 pci_ids[4 ];/* PCI identification */
net/ncsi/ncsi-netlink.c +2 -2
@@ -71,8 +71,8 @@ static int ncsi_write_channel_info(struct sk_buff *skb,if (nc == nc->package->preferred_channel)nla_put_flag (skb,NCSI_CHANNEL_ATTR_FORCED ); -nla_put_u32 (skb,NCSI_CHANNEL_ATTR_VERSION_MAJOR , nc->version.version); -nla_put_u32 (skb,NCSI_CHANNEL_ATTR_VERSION_MINOR , nc->version.alpha2); +nla_put_u32 (skb,NCSI_CHANNEL_ATTR_VERSION_MAJOR , nc->version.major); +nla_put_u32 (skb,NCSI_CHANNEL_ATTR_VERSION_MINOR , nc->version.minor);nla_put_string (skb,NCSI_CHANNEL_ATTR_VERSION_STR , nc->version.fw_name); vid_nest =nla_nest_start_noflag (skb,NCSI_CHANNEL_ATTR_VLAN_LIST );
net/ncsi/ncsi-pkt.h +5 -2
@@ -197,9 +197,12 @@ struct ncsi_rsp_gls_pkt {/* Get Version ID */ struct ncsi_rsp_gvi_pkt {struct ncsi_rsp_pkt_hdr rsp;/* Response header */ -__be32 ncsi_version;/* NCSI version */ +unsigned char major;/* NCSI version major */ +unsigned char minor;/* NCSI version minor */ +unsigned char update;/* NCSI version update */ +unsigned char alpha1;/* NCSI version alpha1 */ unsigned char reserved[3 ];/* Reserved */ -unsigned char alpha2;/* NCSI version */ +unsigned char alpha2;/* NCSI version alpha2 */ unsigned char fw_name[12 ];/* f/w name string */ __be32 fw_version;/* f/w version */ __be16 pci_ids[4 ];/* PCI IDs */
net/ncsi/ncsi-rsp.c +24 -2
@@ -19,6 +19,19 @@#include "ncsi-pkt.h" #include "ncsi-netlink.h" +/* Nibbles within [0xA, 0xF] add zero "0" to the returned value. +* Optional fields (encoded as 0xFF) will default to zero. +*/ +static u8 decode_bcd_u8 (u8 x) +{ +int lo = x &0xF ; +int hi = x >>4 ; + + lo = lo <0xA ? lo :0 ; + hi = hi <0xA ? hi :0 ; +return lo + hi *10 ; +} +static int ncsi_validate_rsp_pkt (struct ncsi_request *nr,unsigned short payload) {
@@ -755,9 +768,18 @@ static int ncsi_rsp_handler_gvi(struct ncsi_request *nr)if (!nc)return -ENODEV ; -/* Update to channel's version info */ +/* Update channel's version info +* +* Major, minor, and update fields are supposed to be +* unsigned integers encoded as packed BCD. +* +* Alpha1 and alpha2 are ISO/IEC 8859-1 characters. +*/ ncv = &nc->version; - ncv->version =ntohl (rsp->ncsi_version); + ncv->major =decode_bcd_u8 (rsp->major); + ncv->minor =decode_bcd_u8 (rsp->minor); + ncv->update =decode_bcd_u8 (rsp->update); + ncv->alpha1 = rsp->alpha1; ncv->alpha2 = rsp->alpha2;memcpy (ncv->fw_name, rsp->fw_name,12 ); ncv->fw_version =ntohl (rsp->fw_version);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 76/417 firmware: ti_sci: Fix an off-by-one in ti_sci_debugfs_create()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 964946b88887089f447a9b6a28c39ee97dc76360 ]
The ending NULL is not taken into account by strncat(), so switch to snprintf() to correctly build 'debug_name'.
Using snprintf() also makes the code more readable.
--- drivers/firmware/ti_sci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/firmware/ti_sci.c +5 -5
@@ -161,7 +161,7 @@ static int ti_sci_debugfs_create(struct platform_device *pdev, {struct device *dev = &pdev->dev;struct resource *res; -char debug_name[50 ] ="ti_sci_debug@" ; +char debug_name[50 ];/* Debug region is optional */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -178,10 +178,10 @@ static int ti_sci_debugfs_create(struct platform_device *pdev,/* Setup NULL termination */ info->debug_buffer[info->debug_region_size] =0 ; - info->d =debugfs_create_file (strncat (debug_name,dev_name (dev), -sizeof (debug_name) - -sizeof ("ti_sci_debug@" )), -0444 ,NULL , info, &ti_sci_debug_fops); +snprintf (debug_name,sizeof (debug_name),"ti_sci_debug@%s" , +dev_name (dev)); + info->d =debugfs_create_file (debug_name,0444 ,NULL , info, + &ti_sci_debug_fops);if (IS_ERR (info->d))return PTR_ERR (info->d);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 77/417 firmware: meson_sm: populate platform devices from sm device tree data
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Rokosov <[email protected]>
[ Upstream commit e45f243409db98d610248c843b25435e7fb0baf3 ]
In some meson boards, secure monitor device has children, for example, power secure controller. By default, secure monitor isn't the bus in terms of device tree subsystem, so the of_platform initialization code doesn't populate its device tree data. As a result, secure monitor's children aren't probed at all.
Run the 'of_platform_populate()' routine manually to resolve such issues.
Stable-dep-of: d8385d7433f9 ("firmware: meson-sm: unmap out_base shmem in error path")
--- drivers/firmware/meson/meson_sm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/firmware/meson/meson_sm.c +4 -1
@@ -313,11 +313,14 @@ static int __init meson_sm_probe(struct platform_device *pdev)platform_set_drvdata (pdev, fw); -pr_info ("secure-monitor enabled\n" ); +if (devm_of_platform_populate (dev)) + goto out_in_base;if (sysfs_create_group (&pdev->dev.kobj, &meson_sm_sysfs_attr_group)) goto out_in_base; +pr_info ("secure-monitor enabled\n" ); +return 0 ; out_in_base:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 78/417 wifi: rtlwifi: rtl8821ae: phy: fix an undefined bitwise shift behavior
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit bc8263083af60e7e57c6120edbc1f75d6c909a35 ]
Clang static checker warns:
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c:184:49:
The result of the left shift is undefined due to shifting by '32', which is greater or equal to the width of type 'u32'. [core.UndefinedBinaryOperatorResult]
If the value of the right operand is negative or is greater than or equal to the width of the promoted left operand, the behavior is undefined.[1][2]
For example, when using different gcc's compilation optimization options (-O0 or -O2), the result of '(u32)data << 32' is different. One is 0, the other is old value of data. Let _rtl8821ae_phy_calculate_bit_shift()'s return value less than 32 to fix this problem. Warn if bitmask is zero.
[1] https://stackoverflow.com/questions/11270492/what-does-the-c-standard-say-about-bitshifting-more-bits-than-the-width-of-type
[2] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf
--- drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +3 -2
@@ -29,9 +29,10 @@ static void _rtl8821ae_phy_rf_serial_write(struct ieee80211_hw *hw, u32 data);static u32 _rtl8821ae_phy_calculate_bit_shift (u32 bitmask) { -u32 i =ffs (bitmask); +if (WARN_ON_ONCE (!bitmask)) +return 0 ; -return i ? i -1 :32 ; +return __ffs (bitmask); }static bool _rtl8821ae_phy_bb8821a_config_parafile (struct ieee80211_hw *hw);/*static bool _rtl8812ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);*/
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 79/417 arm64: dts: ti: k3-am62a-main: Fix GPIO pin count in DT nodes
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nitin Yadav <[email protected]>
[ Upstream commit 7dc4af358cc382c5d20bd5b726e53ef0f526eb6d ]
Fix number of gpio pins in main_gpio0 & main_gpio1 DT nodes according to AM62A7 datasheet[0].
[0] https://www.ti.com/lit/gpn/am62a3 Section: 6.3.10 GPIO (Page No. 52-55)
--- arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/ti/k3-am62a-main.dtsi +2 -2
@@ -245,7 +245,7 @@ main_gpio0: gpio@600000 { <193>, <194>, <195>; interrupt-controller; #interrupt-cells = <2>; - ti,ngpio = <87>; + ti,ngpio = <92>; ti,davinci-gpio-unbanked = <0>; power-domains = <&k3_pds 77 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 77 0>;
@@ -263,7 +263,7 @@ main_gpio1: gpio@601000 { <183>, <184>, <185>; interrupt-controller; #interrupt-cells = <2>; - ti,ngpio = <88>; + ti,ngpio = <52>; ti,davinci-gpio-unbanked = <0>; power-domains = <&k3_pds 78 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 78 0>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 80/417 arm64: dts: ti: k3-am65-main: Fix DSS irq trigger type
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit b57160859263c083c49482b0d083a586b1517f78 ]
DSS irq trigger type is set to IRQ_TYPE_EDGE_RISING in the DT file, but the TRM says it is level triggered.
For some reason triggering on rising edge results in double the amount of expected interrupts, e.g. for normal page flipping test the number of interrupts per second is 2 * fps. It is as if the IRQ triggers on both edges. There are no other side effects to this issue than slightly increased CPU & power consumption due to the extra interrupt.
Switching to IRQ_TYPE_LEVEL_HIGH is correct and fixes the issue, so let's do that.
--- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +1 -1
@@ -856,7 +856,7 @@ dss: dss@4a00000 { assigned-clocks = <&k3_clks 67 2>; assigned-clock-parents = <&k3_clks 67 5>; - interrupts = <GIC_SPI 166 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>; dma-coherent;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 81/417 selftests/bpf: Fix erroneous bitmask operation
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeroen van Ingen Schenau <[email protected]>
[ Upstream commit b6a3451e0847d5d70fb5fa2b2a80ab9f80bf2c7b ]
xdp_synproxy_kern.c is a BPF program that generates SYN cookies on allowed TCP ports and sends SYNACKs to clients, accelerating synproxy iptables module.
Fix the bitmask operation when checking the status of an existing conntrack entry within tcp_lookup() function. Do not AND with the bit position number, but with the bitmask value to check whether the entry found has the IPS_CONFIRMED flag set.
--- tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c +2 -2
@@ -447,13 +447,13 @@ static __always_inline int tcp_lookup(void *ctx, struct header_pointers *hdr, bounsigned long status = ct->status;bpf_ct_release (ct); -if (status &IPS_CONFIRMED_BIT ) +if (status &IPS_CONFIRMED )return XDP_PASS ; }else if (ct_lookup_opts.error != -ENOENT ) {return XDP_ABORTED ; } -/* error == -ENOENT || !(status & IPS_CONFIRMED_BIT) */ +/* error == -ENOENT || !(status & IPS_CONFIRMED) */ return XDP_TX ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 82/417 md: synchronize flush io with array reconfiguration
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit fa2bbff7b0b4e211fec5e5686ef96350690597b5 ]
Currently rcu is used to protect iterating rdev from submit_flushes():
submit_flushes remove_and_add_spares
synchronize_rcu pers->hot_remove_disk() rcu_read_lock() rdev_for_each_rcu if (rdev->raid_disk >= 0) rdev->radi_disk = -1;
atomic_inc(&rdev->nr_pending)
rcu_read_unlock()
bi = bio_alloc_bioset()
bi->bi_end_io = md_end_flush
bi->private = rdev
submit_bio
// issue io for removed rdev
Fix this problem by grabbing 'acive_io' before iterating rdev, make sure that remove_and_add_spares() won't concurrent with submit_flushes().
--- drivers/md/md.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/md/md.c +16 -6
@@ -528,6 +528,9 @@ static void md_end_flush(struct bio *bio)rdev_dec_pending (rdev, mddev);if (atomic_dec_and_test (&mddev->flush_pending)) { +/* The pair is percpu_ref_get() from md_flush_request() */ +percpu_ref_put (&mddev->active_io); +/* The pre-request flush has finished */ queue_work (md_wq, &mddev->flush_work); }
@@ -547,12 +550,8 @@ static void submit_flushes(struct work_struct *ws)rdev_for_each_rcu (rdev, mddev)if (rdev->raid_disk >=0 && !test_bit (Faulty, &rdev->flags)) { -/* Take two references, one is dropped -* when request finishes, one after -* we reclaim rcu_read_lock -*/ struct bio *bi; -atomic_inc (&rdev->nr_pending); +atomic_inc (&rdev->nr_pending);rcu_read_unlock (); bi = bio_alloc_bioset(rdev->bdev, 0,
@@ -563,7 +562,6 @@ static void submit_flushes(struct work_struct *ws)atomic_inc (&mddev->flush_pending);submit_bio (bi);rcu_read_lock (); -rdev_dec_pending (rdev, mddev); }rcu_read_unlock ();if (atomic_dec_and_test (&mddev->flush_pending))
@@ -616,6 +614,18 @@ bool md_flush_request(struct mddev *mddev, struct bio *bio)/* new request after previous flush is completed */ if (ktime_after (req_start, mddev->prev_flush_start)) {WARN_ON (mddev->flush_bio); +/* +* Grab a reference to make sure mddev_suspend() will wait for +* this flush to be done. +* +* md_flush_reqeust() is called under md_handle_request() and +* 'active_io' is already grabbed, hence percpu_ref_is_zero() +* won't pass, percpu_ref_tryget_live() can't be used because +* percpu_ref_kill() can be called by mddev_suspend() +* concurrently. +*/ +WARN_ON (percpu_ref_is_zero (&mddev->active_io)); +percpu_ref_get (&mddev->active_io); mddev->flush_bio = bio; bio =NULL ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 83/417 bpf: enforce precision of R0 on callback return
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrii Nakryiko <[email protected]>
[ Upstream commit 0acd03a5bd188b0c501d285d938439618bd855c4 ]
Given verifier checks actual value, r0 has to be precise, so we need to propagate precision properly. r0 also has to be marked as read, otherwise subsequent state comparisons will ignore such register as unimportant and precision won't really help here.
--- kernel/bpf/verifier.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/bpf/verifier.c +7 -0
@@ -7284,6 +7284,13 @@ static int prepare_func_exit(struct bpf_verifier_env *env, int *insn_idx)verbose (env,"R0 not a scalar value\n" );return -EACCES ; } + +/* we are going to rely on register's precise value */ + err =mark_reg_read (env, r0, r0->parent,REG_LIVE_READ64 ); + err = err ?:mark_chain_precision (env,BPF_REG_0 ); +if (err) +return err; +if (!tnum_in (range, r0->var_off)) {verbose_invalid_scalar (env, r0, &range,"callback return" ,"R0" );return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 84/417 ARM: dts: qcom: sdx65: correct SPMI node name
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit a900ad783f507cb396e402827052e70c0c565ae9 ]
Node names should not have vendor prefixes:
qcom-sdx65-mtp.dtb: qcom,spmi@c440000: $nodename:0: 'qcom,spmi@c440000' does not match '^spmi@.*
--- arch/arm/boot/dts/qcom-sdx65.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/qcom-sdx65.dtsi +1 -1
@@ -401,7 +401,7 @@ restart@c264000 { reg = <0x0c264000 0x1000>; }; - spmi_bus: qcom,spmi@c440000 { + spmi_bus: spmi@c440000 { compatible = "qcom,spmi-pmic-arb"; reg = <0xc440000 0xd00>, <0xc600000 0x2000000>,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 85/417 arm64: dts: qcom: sc7180: Make watchdog bark interrupt edge triggered
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 7ac90b4cf107a3999b30844d7899e0331686b33b ]
On sc7180 when the watchdog timer fires your logs get filled with:
watchdog0: pretimeout event
watchdog0: pretimeout event
watchdog0: pretimeout event
...
watchdog0: pretimeout event
If you're using console-ramoops to debug crashes the above gets quite annoying since it blows away any other log messages that might have been there.
The issue is that the "bark" interrupt (AKA the "pretimeout" interrupt) remains high until the watchdog is pet. Since we've got things configured as "level" triggered we'll keep getting interrupted over and over.
Let's switch to edge triggered. Now we'll get one interrupt when the "bark" interrupt goes off and won't get another one until the "bark" interrupt is cleared and asserts again.
This matches how many older Qualcomm SoCs have things configured.
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7180.dtsi +1 -1
@@ -3378,7 +3378,7 @@ watchdog@17c10000 { compatible = "qcom,apss-wdt-sc7180", "qcom,kpss-wdt"; reg = <0 0x17c10000 0 0x1000>; clocks = <&sleep_clk>; - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; }; timer@17c20000{
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 86/417 arm64: dts: qcom: sc7280: Mark some nodes as reserved
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <[email protected]>
[ Upstream commit 6da24ba932082bae110feb917a64bb54637fa7c0 ]
With the standard Qualcomm TrustZone setup, components such as lpasscc, pdc_reset and watchdog shouldn't be touched by Linux. Mark them with the status 'reserved' and reenable them in the chrome-common dtsi.
Stable-dep-of: 6897fac411db ("arm64: dts: qcom: sc7280: Make watchdog bark interrupt edge triggered")
--- .../boot/dts/qcom/sc7280-chrome-common.dtsi | 24 +++++++++++++++++++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 8 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +24 -0
@@ -56,6 +56,26 @@ mba_mem: memory@9c700000 { }; }; +&lpass_aon { + status = "okay"; +}; + +&lpass_core { + status = "okay"; +}; + +&lpass_hm { + status = "okay"; +}; + +&lpasscc { + status = "okay"; +}; + +&pdc_reset { + status = "okay"; +}; + /* The PMIC PON code isn't compatible w/ how Chrome EC/BIOS handle things. */ &pmk8350_pon { status = "disabled";
@@ -93,6 +113,10 @@ &rmtfs_mem { reg = <0x0 0x9c900000 0x0 0x800000>; }; +&watchdog { + status = "okay"; +}; + &wifi { status = "okay";
arch/arm64/boot/dts/qcom/sc7280.dtsi +7 -1
@@ -2187,6 +2187,7 @@ lpasscc: lpasscc@3000000 { clocks = <&gcc GCC_CFG_NOC_LPASS_CLK>; clock-names = "iface"; #clock-cells = <1>; + status = "reserved"; /* Owned by ADSP firmware */ }; lpass_rx_macro: codec@3200000 {
@@ -2339,6 +2340,7 @@ lpass_aon: clock-controller@3380000 { clock-names = "bi_tcxo", "bi_tcxo_ao", "iface"; #clock-cells = <1>; #power-domain-cells = <1>; + status = "reserved"; /* Owned by ADSP firmware */ }; lpass_core: clock-controller@3900000 {
@@ -2349,6 +2351,7 @@ lpass_core: clock-controller@3900000 { power-domains = <&lpass_hm LPASS_CORE_CC_LPASS_CORE_HM_GDSC>; #clock-cells = <1>; #power-domain-cells = <1>; + status = "reserved"; /* Owned by ADSP firmware */ }; lpass_cpu: audio@3987000 {
@@ -2419,6 +2422,7 @@ lpass_hm: clock-controller@3c00000 { clock-names = "bi_tcxo"; #clock-cells = <1>; #power-domain-cells = <1>; + status = "reserved"; /* Owned by ADSP firmware */ }; lpass_ag_noc: interconnect@3c40000 {
@@ -4195,6 +4199,7 @@ pdc_reset: reset-controller@b5e0000 { compatible = "qcom,sc7280-pdc-global"; reg = <0 0x0b5e0000 0 0x20000>; #reset-cells = <1>; + status = "reserved"; /* Owned by firmware */ }; tsens0: thermal-sensor@c263000 {
@@ -5186,11 +5191,12 @@ gic-its@17a40000 { }; }; - watchdog@17c10000 { + watchdog: watchdog@17c10000 { compatible = "qcom,apss-wdt-sc7280", "qcom,kpss-wdt"; reg = <0 0x17c10000 0 0x1000>; clocks = <&sleep_clk>; interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + status = "reserved"; /* Owned by Gunyah hyp */ }; timer@17c20000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 87/417 arm64: dts: qcom: sc7280: Make watchdog bark interrupt edge triggered
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 6897fac411db7b43243f67d4fd4d3f95abf7f656 ]
As described in the patch ("arm64: dts: qcom: sc7180: Make watchdog bark interrupt edge triggered"), the Qualcomm watchdog timer's bark interrupt should be configured as edge triggered. Make the change.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -1
@@ -5195,7 +5195,7 @@ watchdog: watchdog@17c10000 { compatible = "qcom,apss-wdt-sc7280", "qcom,kpss-wdt"; reg = <0 0x17c10000 0 0x1000>; clocks = <&sleep_clk>; - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; status = "reserved"; /* Owned by Gunyah hyp */ };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 88/417 arm64: dts: qcom: sdm845: Make watchdog bark interrupt edge triggered
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 263b348499454f38d36b9442c3cf9279c571bb54 ]
As described in the patch ("arm64: dts: qcom: sc7180: Make watchdog bark interrupt edge triggered"), the Qualcomm watchdog timer's bark interrupt should be configured as edge triggered. Make the change.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -1
@@ -5019,7 +5019,7 @@ watchdog@17980000 { compatible = "qcom,apss-wdt-sdm845", "qcom,kpss-wdt"; reg = <0 0x17980000 0 0x1000>; clocks = <&sleep_clk>; - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; }; apss_shared: mailbox@17990000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 89/417 arm64: dts: qcom: sm8150: Make watchdog bark interrupt edge triggered
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 9204e9a4099212c850e1703c374ef4538080825b ]
As described in the patch ("arm64: dts: qcom: sc7180: Make watchdog bark interrupt edge triggered"), the Qualcomm watchdog timer's bark interrupt should be configured as edge triggered. Make the change.
--- arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8150.dtsi +1 -1
@@ -3940,7 +3940,7 @@ watchdog@17c10000 { compatible = "qcom,apss-wdt-sm8150", "qcom,kpss-wdt"; reg = <0 0x17c10000 0 0x1000>; clocks = <&sleep_clk>; - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; }; timer@17c20000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 90/417 arm64: dts: qcom: sm8250: Make watchdog bark interrupt edge triggered
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 735d80e2e8e5d073ae8b1fff8b1589ea284aa5af ]
As described in the patch ("arm64: dts: qcom: sc7180: Make watchdog bark interrupt edge triggered"), the Qualcomm watchdog timer's bark interrupt should be configured as edge triggered. Make the change.
--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8250.dtsi +1 -1
@@ -4879,7 +4879,7 @@ watchdog@17c10000 { compatible = "qcom,apss-wdt-sm8250", "qcom,kpss-wdt"; reg = <0 0x17c10000 0 0x1000>; clocks = <&sleep_clk>; - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; }; timer@17c20000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 91/417 arm64: dts: qcom: sc8280xp: Make watchdog bark interrupt edge triggered
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 6c4a9c7ea486da490400c84ba2768c90d228c283 ]
As described in the patch ("arm64: dts: qcom: sc7180: Make watchdog bark interrupt edge triggered"), the Qualcomm watchdog timer's bark interrupt should be configured as edge triggered. Make the change.
--- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc8280xp.dtsi +1 -1
@@ -1653,7 +1653,7 @@ watchdog@17c10000 { compatible = "qcom,apss-wdt-sc8280xp", "qcom,kpss-wdt"; reg = <0 0x17c10000 0 0x1000>; clocks = <&sleep_clk>; - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; }; timer@17c20000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 92/417 arm64: dts: qcom: sm6350: Make watchdog bark interrupt edge triggered
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 5b84bb2b8d86595544fc8272364b0f1a34b68a4f ]
As described in the patch ("arm64: dts: qcom: sc7180: Make watchdog bark interrupt edge triggered"), the Qualcomm watchdog timer's bark interrupt should be configured as edge triggered. Make the change.
--- arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm6350.dtsi +1 -1
@@ -1462,7 +1462,7 @@ watchdog@17c10000 { compatible = "qcom,apss-wdt-sm6350", "qcom,kpss-wdt"; reg = <0 0x17c10000 0 0x1000>; clocks = <&sleep_clk>; - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>; }; timer@17c20000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 93/417 rcu-tasks: Provide rcu_trace_implies_rcu_gp()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul E. McKenney <[email protected]>
[ Upstream commit e6c86c513f440bec5f1046539c7e3c6c653842da ]
As an accident of implementation, an RCU Tasks Trace grace period also acts as an RCU grace period. However, this could change at any time. This commit therefore creates an rcu_trace_implies_rcu_gp() that currently returns true to codify this accident. Code relying on this accident must call this function to verify that this accident is still happening.
Stable-dep-of: 876673364161 ("bpf: Defer the free of inner map when necessary")
--- include/linux/rcupdate.h | 12 ++++++++++++ kernel/rcu/tasks.h | 2 ++ 2 files changed, 14 insertions(+)
include/linux/rcupdate.h +12 -0
@@ -242,6 +242,18 @@ static inline void exit_tasks_rcu_stop(void) { }static inline void exit_tasks_rcu_finish (void ) { }#endif /* #else #ifdef CONFIG_TASKS_RCU_GENERIC */ +/** +* rcu_trace_implies_rcu_gp - does an RCU Tasks Trace grace period imply an RCU grace period? +* +* As an accident of implementation, an RCU Tasks Trace grace period also +* acts as an RCU grace period. However, this could change at any time. +* Code relying on this accident must call this function to verify that +* this accident is still happening. +* +* You have been warned! +*/ +static inline bool rcu_trace_implies_rcu_gp (void ) {return true; } +/** * cond_resched_tasks_rcu_qs - Report potential quiescent states to RCU *
kernel/rcu/tasks.h +2 -0
@@ -1570,6 +1570,8 @@ static void rcu_tasks_trace_postscan(struct list_head *hop) {// Wait for late-stage exiting tasks to finish exiting. // These might have passed the call to exit_tasks_rcu_finish(). + +// If you remove the following line, update rcu_trace_implies_rcu_gp()!!! synchronize_rcu ();// Any tasks that exit after this point will set // TRC_NEED_QS_CHECKED in ->trc_reader_special.b.need_qs.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 94/417 bpf: add percpu stats for bpf_map elements insertions/deletions
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Protopopov <[email protected]>
[ Upstream commit 25954730461af01f66afa9e17036b051986b007e ]
Add a generic percpu stats for bpf_map elements insertions/deletions in order to keep track of both, the current (approximate) number of elements in a map and per-cpu statistics on update/delete operations.
To expose these stats a particular map implementation should initialize the counter and adjust it as needed using the 'bpf_map_*_elem_count' helpers provided by this commit.
Stable-dep-of: 876673364161 ("bpf: Defer the free of inner map when necessary")
--- include/linux/bpf.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
include/linux/bpf.h +30 -0
@@ -249,6 +249,7 @@ struct bpf_map { } owner;bool bypass_spec_v1;bool frozen;/* write-once; write-protected by freeze_mutex */ +s64 __percpu *elem_count; };static inline bool map_value_has_spin_lock (const struct bpf_map *map)
@@ -1791,6 +1792,35 @@ bpf_map_alloc_percpu(const struct bpf_map *map, size_t size, size_t align, }#endif +static inline int +bpf_map_init_elem_count (struct bpf_map *map) +{ +size_t size =sizeof (*map->elem_count), align = size; +gfp_t flags =GFP_USER | __GFP_NOWARN; + + map->elem_count =bpf_map_alloc_percpu (map, size, align, flags); +if (!map->elem_count) +return -ENOMEM ; + +return 0 ; +} + +static inline void +bpf_map_free_elem_count (struct bpf_map *map) +{ +free_percpu (map->elem_count); +} + +static inline void bpf_map_inc_elem_count (struct bpf_map *map) +{ +this_cpu_inc (*map->elem_count); +} + +static inline void bpf_map_dec_elem_count (struct bpf_map *map) +{ +this_cpu_dec (*map->elem_count); +} +extern int sysctl_unprivileged_bpf_disabled;static inline bool bpf_allow_ptr_leaks (void )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 95/417 bpf: Add map and need_defer parameters to .map_fd_put_ptr()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hou Tao <[email protected]>
[ Upstream commit 20c20bd11a0702ce4dc9300c3da58acf551d9725 ]
map is the pointer of outer map, and need_defer needs some explanation. need_defer tells the implementation to defer the reference release of the passed element and ensure that the element is still alive before the bpf program, which may manipulate it, exits.
The following three cases will invoke map_fd_put_ptr() and different need_defer values will be passed to these callers:
1) release the reference of the old element in the map during map update or map deletion. The release must be deferred, otherwise the bpf program may incur use-after-free problem, so need_defer needs to be true.
2) release the reference of the to-be-added element in the error path of map update. The to-be-added element is not visible to any bpf program, so it is OK to pass false for need_defer parameter.
3) release the references of all elements in the map during map release. Any bpf program which has access to the map must have been exited and released, so need_defer=false will be OK.
These two parameters will be used by the following patches to fix the potential use-after-free problem for map-in-map.
Stable-dep-of: 876673364161 ("bpf: Defer the free of inner map when necessary")
--- include/linux/bpf.h | 6 +++++- kernel/bpf/arraymap.c | 12 +++++++----- kernel/bpf/hashtab.c | 6 +++--- kernel/bpf/map_in_map.c | 2 +- kernel/bpf/map_in_map.h | 2 +- 5 files changed, 17 insertions(+), 11 deletions(-)
include/linux/bpf.h +5 -1
@@ -102,7 +102,11 @@ struct bpf_map_ops {/* funcs called by prog_array and perf_event_array map */ void *(*map_fd_get_ptr)(struct bpf_map *map,struct file *map_file,int fd); -void (*map_fd_put_ptr)(void *ptr); +/* If need_defer is true, the implementation should guarantee that +* the to-be-put element is still alive before the bpf program, which +* may manipulate it, exists. +*/ +void (*map_fd_put_ptr)(struct bpf_map *map,void *ptr,bool need_defer);int (*map_gen_lookup)(struct bpf_map *map,struct bpf_insn *insn_buf);u32 (*map_fd_sys_lookup_elem)(void *ptr); void (*map_seq_show_elem)(struct bpf_map *map, void *key,
kernel/bpf/arraymap.c +7 -5
@@ -852,7 +852,7 @@ int bpf_fd_array_map_update_elem(struct bpf_map *map, struct file *map_file, }if (old_ptr) - map->ops->map_fd_put_ptr (old_ptr); + map->ops->map_fd_put_ptr (map, old_ptr, true);return 0 ; }
@@ -875,7 +875,7 @@ static int fd_array_map_delete_elem(struct bpf_map *map, void *key) }if (old_ptr) { - map->ops->map_fd_put_ptr (old_ptr); + map->ops->map_fd_put_ptr (map, old_ptr, true);return 0 ; }else {return -ENOENT ;
@@ -898,8 +898,9 @@ static void *prog_fd_array_get_ptr(struct bpf_map *map,return prog; } -static void prog_fd_array_put_ptr (void *ptr) +static void prog_fd_array_put_ptr (struct bpf_map *map,void *ptr,bool need_defer) { +/* bpf_prog is freed after one RCU or tasks trace grace period */ bpf_prog_put (ptr); }
@@ -1185,8 +1186,9 @@ static void *perf_event_fd_array_get_ptr(struct bpf_map *map,return ee; } -static void perf_event_fd_array_put_ptr (void *ptr) +static void perf_event_fd_array_put_ptr (struct bpf_map *map,void *ptr,bool need_defer) { +/* bpf_perf_event is freed after one RCU grace period */ bpf_event_entry_free_rcu (ptr); }
@@ -1239,7 +1241,7 @@ static void *cgroup_fd_array_get_ptr(struct bpf_map *map,return cgroup_get_from_fd (fd); } -static void cgroup_fd_array_put_ptr (void *ptr) +static void cgroup_fd_array_put_ptr (struct bpf_map *map,void *ptr,bool need_defer) {/* cgroup_put free cgrp after a rcu grace period */ cgroup_put (ptr);
kernel/bpf/hashtab.c +3 -3
@@ -880,7 +880,7 @@ static void htab_put_fd_value(struct bpf_htab *htab, struct htab_elem *l)if (map->ops->map_fd_put_ptr) { ptr =fd_htab_map_get_ptr (map, l); - map->ops->map_fd_put_ptr (ptr); + map->ops->map_fd_put_ptr (map, ptr, true); } }
@@ -2424,7 +2424,7 @@ static void fd_htab_map_free(struct bpf_map *map)hlist_nulls_for_each_entry_safe (l, n, head, hash_node) {void *ptr =fd_htab_map_get_ptr (map, l); - map->ops->map_fd_put_ptr (ptr); + map->ops->map_fd_put_ptr (map, ptr, false); } }
@@ -2465,7 +2465,7 @@ int bpf_fd_htab_map_update_elem(struct bpf_map *map, struct file *map_file, ret =htab_map_update_elem (map, key, &ptr, map_flags);if (ret) - map->ops->map_fd_put_ptr (ptr); + map->ops->map_fd_put_ptr (map, ptr, false);return ret; }
kernel/bpf/map_in_map.c +1 -1
@@ -115,7 +115,7 @@ void *bpf_map_fd_get_ptr(struct bpf_map *map,return inner_map; } -void bpf_map_fd_put_ptr (void *ptr) +void bpf_map_fd_put_ptr (struct bpf_map *map,void *ptr,bool need_defer) {/* ptr->ops->map_free() has to go through one * rcu grace period by itself.
kernel/bpf/map_in_map.h +1 -1
@@ -13,7 +13,7 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd);void bpf_map_meta_free (struct bpf_map *map_meta);void *bpf_map_fd_get_ptr (struct bpf_map *map,struct file *map_file,int ufd); -void bpf_map_fd_put_ptr (void *ptr); +void bpf_map_fd_put_ptr (struct bpf_map *map,void *ptr,bool need_defer);u32 bpf_map_fd_sys_lookup_elem (void *ptr);#endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 96/417 bpf: Defer the free of inner map when necessary
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hou Tao <[email protected]>
[ Upstream commit 876673364161da50eed6b472d746ef88242b2368 ]
When updating or deleting an inner map in map array or map htab, the map may still be accessed by non-sleepable program or sleepable program. However bpf_map_fd_put_ptr() decreases the ref-counter of the inner map directly through bpf_map_put(), if the ref-counter is the last one (which is true for most cases), the inner map will be freed by ops->map_free() in a kworker. But for now, most .map_free() callbacks don't use synchronize_rcu() or its variants to wait for the elapse of a RCU grace period, so after the invocation of ops->map_free completes, the bpf program which is accessing the inner map may incur use-after-free problem.
Fix the free of inner map by invoking bpf_map_free_deferred() after both one RCU grace period and one tasks trace RCU grace period if the inner map has been removed from the outer map before. The deferment is accomplished by using call_rcu() or call_rcu_tasks_trace() when releasing the last ref-counter of bpf map. The newly-added rcu_head field in bpf_map shares the same storage space with work field to reduce the size of bpf_map.
--- include/linux/bpf.h | 7 ++++++- kernel/bpf/map_in_map.c | 11 ++++++++--- kernel/bpf/syscall.c | 32 +++++++++++++++++++++++++++----- 3 files changed, 41 insertions(+), 9 deletions(-)
include/linux/bpf.h +6 -1
@@ -237,7 +237,11 @@ struct bpf_map {*/ atomic64_t refcnt____cacheline_aligned ;atomic64_t usercnt; -struct work_struct work; +/* rcu is used before freeing and work is only used during freeing */ +union { +struct work_struct work; +struct rcu_head rcu; + };struct mutex freeze_mutex;atomic64_t writecnt;/* 'Ownership' of program-containing map is claimed by the first program
@@ -253,6 +257,7 @@ struct bpf_map { } owner;bool bypass_spec_v1;bool frozen;/* write-once; write-protected by freeze_mutex */ +bool free_after_mult_rcu_gp;s64 __percpu *elem_count; };
kernel/bpf/map_in_map.c +8 -3
@@ -117,10 +117,15 @@ void *bpf_map_fd_get_ptr(struct bpf_map *map,void bpf_map_fd_put_ptr (struct bpf_map *map,void *ptr,bool need_defer) { -/* ptr->ops->map_free() has to go through one -* rcu grace period by itself. +struct bpf_map *inner_map = ptr; + +/* The inner map may still be used by both non-sleepable and sleepable +* bpf program, so free it after one RCU grace period and one tasks +* trace RCU grace period. */ -bpf_map_put (ptr); +if (need_defer) +WRITE_ONCE (inner_map->free_after_mult_rcu_gp, true); +bpf_map_put (inner_map); }u32 bpf_map_fd_sys_lookup_elem (void *ptr)
kernel/bpf/syscall.c +27 -5
@@ -628,6 +628,28 @@ static void bpf_map_put_uref(struct bpf_map *map) } } +static void bpf_map_free_in_work (struct bpf_map *map) +{ +INIT_WORK (&map->work, bpf_map_free_deferred); +/* Avoid spawning kworkers, since they all might contend +* for the same mutex like slab_mutex. +*/ +queue_work (system_unbound_wq, &map->work); +} + +static void bpf_map_free_rcu_gp (struct rcu_head *rcu) +{ +bpf_map_free_in_work (container_of(rcu ,struct bpf_map ,rcu )); +} + +static void bpf_map_free_mult_rcu_gp (struct rcu_head *rcu) +{ +if (rcu_trace_implies_rcu_gp ()) +bpf_map_free_rcu_gp (rcu); +else +call_rcu (rcu, bpf_map_free_rcu_gp); +} +/* decrement map refcnt and schedule it for freeing via workqueue * (unrelying map implementation ops->map_free() might sleep) */
@@ -637,11 +659,11 @@ static void __bpf_map_put(struct bpf_map *map, bool do_idr_lock)/* bpf_map_free_id() must be called first */ bpf_map_free_id (map, do_idr_lock);btf_put (map->btf); -INIT_WORK (&map->work, bpf_map_free_deferred); -/* Avoid spawning kworkers, since they all might contend -* for the same mutex like slab_mutex. -*/ -queue_work (system_unbound_wq, &map->work); + +if (READ_ONCE (map->free_after_mult_rcu_gp)) +call_rcu_tasks_trace (&map->rcu, bpf_map_free_mult_rcu_gp); +else +bpf_map_free_in_work (map); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 97/417 selftests/net: specify the interface when do arping
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 7f770d28f2e5abfd442ad689ba1129dd66593529 ]
When do arping, the interface need to be specified. Or we will get error: Interface "lo" is not ARPable. And the test failed. ]# ./arp_ndisc_untracked_subnets.sh
TEST: test_arp: accept_arp=0 [ OK ]
TEST: test_arp: accept_arp=1 [FAIL]
TEST: test_arp: accept_arp=2 same_subnet=0 [ OK ]
TEST: test_arp: accept_arp=2 same_subnet=1 [FAIL]After fix:
]# ./arp_ndisc_untracked_subnets.sh
TEST: test_arp: accept_arp=0 [ OK ]
TEST: test_arp: accept_arp=1 [ OK ]
TEST: test_arp: accept_arp=2 same_subnet=0 [ OK ]
TEST: test_arp: accept_arp=2 same_subnet=1 [ OK ]--- tools/testing/selftests/net/arp_ndisc_untracked_subnets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/arp_ndisc_untracked_subnets.sh +1 -1
@@ -150,7 +150,7 @@ arp_test_gratuitous() { fi # Supply arp_accept option to set up which sets it in sysctl setup ${arp_accept} - ip netns exec ${HOST_NS} arping -A -U ${HOST_ADDR} -c1 2>&1 >/dev/null + ip netns exec ${HOST_NS} arping -A -I ${HOST_INTF} -U ${HOST_ADDR} -c1 2>&1 >/dev/null if verify_arp $1 $2; then printf " TEST: %-60s [ OK ]\n" "${test_msg[*]}"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 98/417 bpf: fix check for attempt to corrupt spilled pointer
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrii Nakryiko <[email protected]>
[ Upstream commit ab125ed3ec1c10ccc36bc98c7a4256ad114a3dae ]
When register is spilled onto a stack as a 1/2/4-byte register, we set slot_type[BPF_REG_SIZE - 1] (plus potentially few more below it, depending on actual spill size). So to check if some stack slot has spilled register we need to consult slot_type[7], not slot_type[0].
To avoid the need to remember and double-check this in the future, just use is_spilled_reg() helper.
--- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/verifier.c +1 -1
@@ -3284,7 +3284,7 @@ static int check_stack_write_fixed_off(struct bpf_verifier_env *env,* so it's aligned access and [off, off + size) are within stack limits */ if (!env->allow_ptr_leaks && - state->stack[spi].slot_type[0 ] ==STACK_SPILL && +is_spilled_reg (&state->stack[spi]) && size !=BPF_REG_SIZE ) {verbose (env,"attempt to corrupt spilled pointer on stack\n" );return -EACCES ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 99/417 scsi: fnic: Return error if vmalloc() failed
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Chernyshev <[email protected]>
[ Upstream commit f5f27a332a14f43463aa0075efa3a0c662c0f4a8 ]
In fnic_init_module() exists redundant check for return value from fnic_debugfs_init(), because at moment it only can return zero. It make sense to process theoretical vmalloc() failure.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/scsi/fnic/fnic_debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/fnic/fnic_debugfs.c +2 -1
@@ -52,9 +52,10 @@ int fnic_debugfs_init(void) fc_trc_flag->fnic_trace =2 ; fc_trc_flag->fc_trace =3 ; fc_trc_flag->fc_clear =4 ; +return 0 ; } -return 0 ; +return -ENOMEM ; }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 100/417 arm64: dts: qcom: qrb5165-rb5: correct LED panic indicator
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit dc6b5562acbac0285ab3b2dad23930b6434bdfc6 ]
There is no "panic-indicator" default trigger but a property with that name:
qrb5165-rb5.dtb: leds: led-user4: Unevaluated properties are not allowed ('linux,default-trigger' was unexpected)
--- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +1 -1
@@ -63,8 +63,8 @@ led-user4 { function = LED_FUNCTION_INDICATOR; color = <LED_COLOR_ID_GREEN>; gpios = <&pm8150_gpios 10 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "panic-indicator"; default-state = "off"; + panic-indicator; }; led-wlan {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 101/417 arm64: dts: qcom: sdm845-db845c: correct LED panic indicator
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 0c90c75e663246203a2b7f6dd9e08a110f4c3c43 ]
There is no "panic-indicator" default trigger but a property with that name:
sdm845-db845c.dtb: leds: led-0: Unevaluated properties are not allowed ('linux,default-trigger' was unexpected)
--- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm845-db845c.dts +1 -1
@@ -66,8 +66,8 @@ led-0 { function = LED_FUNCTION_INDICATOR; color = <LED_COLOR_ID_GREEN>; gpios = <&pm8998_gpio 13 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "panic-indicator"; default-state = "off"; + panic-indicator; }; led-1 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 102/417 arm64: dts: qcom: sm8350: Fix DMA0 address
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nia Espera <[email protected]>
[ Upstream commit 01a9e9eb6cdbce175ddea3cbe1163daed6d54344 ]
DMA0 node downstream is specified at 0x900000, so fix the typo. Without this, enabling any i2c node using DMA0 causes a hang.
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sm8350.dtsi +2 -2
@@ -903,9 +903,9 @@ spi19: spi@894000 { }; }; - gpi_dma0: dma-controller@9800000 { + gpi_dma0: dma-controller@900000 { compatible = "qcom,sm8350-gpi-dma", "qcom,sm6350-gpi-dma"; - reg = <0 0x09800000 0 0x60000>; + reg = <0 0x00900000 0 0x60000>; interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 103/417 arm64: dts: qcom: sc7280: Fix up GPU SIDs
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 94085049fdad7a36fe14dd55e72e712fe55d6bca ]
GPU_SMMU SID 1 is meant for Adreno LPAC (Low Priority Async Compute). On platforms that support it (in firmware), it is necessary to describe that link, or Adreno register access will hang the board.
The current settings are functionally identical, *but* due to what is likely hardcoded security policies, the secure firmware rejects them, resulting in the board hanging. To avoid that, alter the settings such that SID 0 and 1 are described separately.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +2 -1
@@ -2533,7 +2533,8 @@ gpu: gpu@3d00000 { "cx_mem", "cx_dbgc"; interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>; - iommus = <&adreno_smmu 0 0x401>; + iommus = <&adreno_smmu 0 0x400>, + <&adreno_smmu 1 0x400>; operating-points-v2 = <&gpu_opp_table>; qcom,gmu = <&gmu>; interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 104/417 arm64: dts: qcom: sc7280: Mark Adreno SMMU as DMA coherent
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 31edad478534186a2718be9206ce7b19f2735f6e ]
The SMMUs on sc7280 are cache-coherent. APPS_SMMU is marked as such, mark the GPU one as well.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -0
@@ -2701,6 +2701,7 @@ adreno_smmu: iommu@3da0000 { "gpu_cc_hub_aon_clk"; power-domains = <&gpucc GPU_CC_CX_GDSC>; + dma-coherent; }; remoteproc_mpss: remoteproc@4080000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 105/417 arm64: dts: qcom: sc7280: fix usb_2 wakeup interrupt types
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 24f8aba9a7c77c7e9d814a5754798e8346c7dd28 ]
The DP/DM wakeup interrupts are edge triggered and which edge to trigger on depends on use-case and whether a Low speed or Full/High speed device is connected.
Note that only triggering on rising edges can be used to detect resume events but not disconnect events.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +2 -2
@@ -3392,8 +3392,8 @@ usb_2: usb@8cf8800 { assigned-clock-rates = <19200000>, <200000000>; interrupts-extended = <&intc GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>, - <&pdc 12 IRQ_TYPE_EDGE_RISING>, - <&pdc 13 IRQ_TYPE_EDGE_RISING>; + <&pdc 12 IRQ_TYPE_EDGE_BOTH>, + <&pdc 13 IRQ_TYPE_EDGE_BOTH>; interrupt-names = "hs_phy_irq", "dp_hs_phy_irq", "dm_hs_phy_irq";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 106/417 wifi: mt76: mt7921s: fix workqueue problem causes STA association fail
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Zhao <[email protected]>
[ Upstream commit 92184eae1d5ad804884e2c6e289d885b9e3194d1 ]
The ieee80211_queue_work function queues work into the mac80211 local->workqueue, which is widely used for mac80211 internal work processes. In the mt76 driver, both the mt76-sido-status and mt76-sdio-net threads enqueue workers to the workqueue with this function. However, in some cases, when two workers are enqueued to the workqueue almost simultaneously, the second worker may not be scheduled immediately and may get stuck for a while. This can cause timing issues. To avoid these timing conflicts caused by worker scheduling, replace the worker with an independent thread.
--- drivers/net/wireless/mediatek/mt76/mt76.h | 3 +-- .../net/wireless/mediatek/mt76/mt7615/sdio.c | 2 +- .../net/wireless/mediatek/mt76/mt7921/sdio.c | 4 +++- .../wireless/mediatek/mt76/mt7921/sdio_mac.c | 3 ++- drivers/net/wireless/mediatek/mt76/sdio.c | 18 +++++++++++------- 5 files changed, 18 insertions(+), 12 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -2
@@ -564,8 +564,7 @@ struct mt76_sdio {struct mt76_worker txrx_worker;struct mt76_worker status_worker;struct mt76_worker net_worker; - -struct work_struct stat_work; +struct mt76_worker stat_worker;u8 *xmit_buf;u32 xmit_buf_sz;
drivers/net/wireless/mediatek/mt76/mt7615/sdio.c +1 -1
@@ -205,8 +205,8 @@ static int mt7663s_suspend(struct device *dev)mt76_worker_disable (&mdev->mt76.sdio.txrx_worker);mt76_worker_disable (&mdev->mt76.sdio.status_worker);mt76_worker_disable (&mdev->mt76.sdio.net_worker); +mt76_worker_disable (&mdev->mt76.sdio.stat_worker); -cancel_work_sync (&mdev->mt76.sdio.stat_work);clear_bit (MT76_READING_STATS , &mdev->mphy.state);mt76_tx_status_check (&mdev->mt76, true);
drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +3 -1
@@ -222,7 +222,7 @@ static int mt7921s_suspend(struct device *__dev)mt76_txq_schedule_all (&dev->mphy);mt76_worker_disable (&mdev->tx_worker);mt76_worker_disable (&mdev->sdio.status_worker); -cancel_work_sync (&mdev->sdio.stat_work); +mt76_worker_disable (&mdev->sdio.stat_worker);clear_bit (MT76_READING_STATS , &dev->mphy.state);mt76_tx_status_check (mdev, true);
@@ -254,6 +254,7 @@ static int mt7921s_suspend(struct device *__dev) restore_worker:mt76_worker_enable (&mdev->tx_worker);mt76_worker_enable (&mdev->sdio.status_worker); +mt76_worker_enable (&mdev->sdio.stat_worker);if (!pm->ds_enable)mt76_connac_mcu_set_deep_sleep (mdev, false);
@@ -286,6 +287,7 @@ static int mt7921s_resume(struct device *__dev)mt76_worker_enable (&mdev->sdio.txrx_worker);mt76_worker_enable (&mdev->sdio.status_worker);mt76_worker_enable (&mdev->sdio.net_worker); +mt76_worker_enable (&mdev->sdio.stat_worker);/* restore previous ds setting */ if (!pm->ds_enable)
drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c +2 -1
@@ -107,7 +107,7 @@ int mt7921s_mac_reset(struct mt7921_dev *dev)mt76_worker_disable (&dev->mt76.sdio.txrx_worker);mt76_worker_disable (&dev->mt76.sdio.status_worker);mt76_worker_disable (&dev->mt76.sdio.net_worker); -cancel_work_sync (&dev->mt76.sdio.stat_work); +mt76_worker_disable (&dev->mt76.sdio.stat_worker);mt7921s_disable_irq (&dev->mt76);mt7921s_wfsys_reset (dev);
@@ -115,6 +115,7 @@ int mt7921s_mac_reset(struct mt7921_dev *dev)mt76_worker_enable (&dev->mt76.sdio.txrx_worker);mt76_worker_enable (&dev->mt76.sdio.status_worker);mt76_worker_enable (&dev->mt76.sdio.net_worker); +mt76_worker_enable (&dev->mt76.sdio.stat_worker); dev->fw_assert = false;clear_bit (MT76_MCU_RESET , &dev->mphy.state);
drivers/net/wireless/mediatek/mt76/sdio.c +11 -7
@@ -481,21 +481,21 @@ static void mt76s_status_worker(struct mt76_worker *w)if (dev->drv->tx_status_data && ndata_frames >0 && !test_and_set_bit (MT76_READING_STATS , &dev->phy.state) && !test_bit (MT76_STATE_SUSPEND , &dev->phy.state)) -ieee80211_queue_work (dev->hw, &dev->sdio.stat_work); +mt76_worker_schedule (&sdio->stat_worker); }while (nframes >0 );if (resched)mt76_worker_schedule (&dev->tx_worker); } -static void mt76s_tx_status_data (struct work_struct *work) +static void mt76s_tx_status_data (struct mt76_worker *worker) {struct mt76_sdio *sdio;struct mt76_dev *dev;u8 update =1 ;u16 count =0 ; - sdio = container_of(work, struct mt76_sdio, stat_work); + sdio = container_of(worker, struct mt76_sdio, stat_worker); dev = container_of(sdio, struct mt76_dev, sdio);while (true) {
@@ -508,7 +508,7 @@ static void mt76s_tx_status_data(struct work_struct *work) }if (count &&test_bit (MT76_STATE_RUNNING , &dev->phy.state)) -ieee80211_queue_work (dev->hw, &sdio->stat_work); +mt76_worker_schedule (&sdio->status_worker);else clear_bit (MT76_READING_STATS , &dev->phy.state); }
@@ -600,8 +600,8 @@ void mt76s_deinit(struct mt76_dev *dev)mt76_worker_teardown (&sdio->txrx_worker);mt76_worker_teardown (&sdio->status_worker);mt76_worker_teardown (&sdio->net_worker); +mt76_worker_teardown (&sdio->stat_worker); -cancel_work_sync (&sdio->stat_work);clear_bit (MT76_READING_STATS , &dev->phy.state);mt76_tx_status_check (dev, true);
@@ -644,10 +644,14 @@ int mt76s_init(struct mt76_dev *dev, struct sdio_func *func,if (err)return err; + err =mt76_worker_setup (dev->hw, &sdio->stat_worker, mt76s_tx_status_data, +"sdio-sta" ); +if (err) +return err; +sched_set_fifo_low (sdio->status_worker.task);sched_set_fifo_low (sdio->net_worker.task); - -INIT_WORK (&sdio->stat_work, mt76s_tx_status_data); +sched_set_fifo_low (sdio->stat_worker.task); dev->queue_ops = &sdio_queue_ops; dev->bus = bus_ops;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 107/417 bpf: Fix verification of indirect var-off stack access
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Matei <[email protected]>
[ Upstream commit a833a17aeac73b33f79433d7cee68d5cafd71e4f ]
This patch fixes a bug around the verification of possibly-zero-sized stack accesses. When the access was done through a var-offset stack pointer, check_stack_access_within_bounds was incorrectly computing the maximum-offset of a zero-sized read to be the same as the register's min offset. Instead, we have to take in account the register's maximum possible value. The patch also simplifies how the max offset is checked; the check is now simpler than for min offset.
The bug was allowing accesses to erroneously pass the check_stack_access_within_bounds() checks, only to later crash in check_stack_range_initialized() when all the possibly-affected stack slots are iterated (this time with a correct max offset). check_stack_range_initialized() is relying on check_stack_access_within_bounds() for its accesses to the stack-tracking vector to be within bounds; in the case of zero-sized accesses, we were essentially only verifying that the lowest possible slot was within bounds. We would crash when the max-offset of the stack pointer was >= 0 (which shouldn't pass verification, and hopefully is not something anyone's code attempts to do in practice).
Thanks Hao for reporting!
--- kernel/bpf/verifier.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
kernel/bpf/verifier.c +4 -10
@@ -4950,10 +4950,7 @@ static int check_stack_access_within_bounds(if (tnum_is_const (reg->var_off)) { min_off = reg->var_off.value + off; -if (access_size >0 ) - max_off = min_off + access_size -1 ; -else - max_off = min_off; + max_off = min_off + access_size; }else {if (reg->smax_value >=BPF_MAX_VAR_OFF || reg->smin_value <= -BPF_MAX_VAR_OFF ) {
@@ -4962,15 +4959,12 @@ static int check_stack_access_within_bounds(return -EACCES ; } min_off = reg->smin_value + off; -if (access_size >0 ) - max_off = reg->smax_value + off + access_size -1 ; -else - max_off = min_off; + max_off = reg->smax_value + off + access_size; } err =check_stack_slot_within_bounds (min_off, state, type); -if (!err) - err =check_stack_slot_within_bounds (max_off, state, type); +if (!err && max_off >0 ) + err = -EINVAL ;/* out of stack access into non-negative offsets */ if (err) {if (tnum_is_const (reg->var_off)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 108/417 arm64: dts: hisilicon: hikey970-pmic: fix regulator cells properties
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 44ab3ee76a5a977864ba0bb6c352dcf6206804e0 ]
The Hi6421 PMIC regulator child nodes do not have unit addresses so drop the incorrect '#address-cells' and '#size-cells' properties.
--- arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi | 3 --- 1 file changed, 3 deletions(-)
arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi +0 -3
@@ -25,9 +25,6 @@ pmic: pmic@0 { gpios = <&gpio28 0 0>; regulators { - #address-cells = <1>; - #size-cells = <0>; - ldo3: ldo3 { /* HDMI */ regulator-name = "ldo3"; regulator-min-microvolt = <1500000>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 109/417 dt-bindings: media: mediatek: mdp3: correct RDMA and WROT node with generic names
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moudy Ho <[email protected]>
[ Upstream commit f5f185bf7c42f6ca885202fefc40fc871d08a722 ]
The DMA-related nodes RDMA/WROT in MDP3 should be changed to generic names. In addition, fix improper space indent in example.
--- .../bindings/media/mediatek,mdp3-rdma.yaml | 29 +++++++++++-------- .../bindings/media/mediatek,mdp3-wrot.yaml | 23 +++++++++------ 2 files changed, 31 insertions(+), 21 deletions(-)
Documentation/devicetree/bindings/media/mediatek,mdp3-rdma.yaml +17 -12
@@ -61,6 +61,9 @@ properties: - description: used for 1st data pipe from RDMA - description: used for 2nd data pipe from RDMA + '#dma-cells': + const: 1 + required: - compatible - reg
@@ -70,6 +73,7 @@ required: - clocks - iommus - mboxes + - '#dma-cells' additionalProperties: false
@@ -80,16 +84,17 @@ examples: #include <dt-bindings/power/mt8183-power.h> #include <dt-bindings/memory/mt8183-larb-port.h> - mdp3_rdma0: mdp3-rdma0@14001000 { - compatible = "mediatek,mt8183-mdp3-rdma"; - reg = <0x14001000 0x1000>; - mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x1000 0x1000>; - mediatek,gce-events = <CMDQ_EVENT_MDP_RDMA0_SOF>, - <CMDQ_EVENT_MDP_RDMA0_EOF>; - power-domains = <&spm MT8183_POWER_DOMAIN_DISP>; - clocks = <&mmsys CLK_MM_MDP_RDMA0>, - <&mmsys CLK_MM_MDP_RSZ1>; - iommus = <&iommu>; - mboxes = <&gce 20 CMDQ_THR_PRIO_LOWEST>, - <&gce 21 CMDQ_THR_PRIO_LOWEST>; + dma-controller@14001000 { + compatible = "mediatek,mt8183-mdp3-rdma"; + reg = <0x14001000 0x1000>; + mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x1000 0x1000>; + mediatek,gce-events = <CMDQ_EVENT_MDP_RDMA0_SOF>, + <CMDQ_EVENT_MDP_RDMA0_EOF>; + power-domains = <&spm MT8183_POWER_DOMAIN_DISP>; + clocks = <&mmsys CLK_MM_MDP_RDMA0>, + <&mmsys CLK_MM_MDP_RSZ1>; + iommus = <&iommu>; + mboxes = <&gce 20 CMDQ_THR_PRIO_LOWEST>, + <&gce 21 CMDQ_THR_PRIO_LOWEST>; + #dma-cells = <1>; };
Documentation/devicetree/bindings/media/mediatek,mdp3-wrot.yaml +14 -9
@@ -50,6 +50,9 @@ properties: iommus: maxItems: 1 + '#dma-cells': + const: 1 + required: - compatible - reg
@@ -58,6 +61,7 @@ required: - power-domains - clocks - iommus + - '#dma-cells' additionalProperties: false
@@ -68,13 +72,14 @@ examples: #include <dt-bindings/power/mt8183-power.h> #include <dt-bindings/memory/mt8183-larb-port.h> - mdp3_wrot0: mdp3-wrot0@14005000 { - compatible = "mediatek,mt8183-mdp3-wrot"; - reg = <0x14005000 0x1000>; - mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x5000 0x1000>; - mediatek,gce-events = <CMDQ_EVENT_MDP_WROT0_SOF>, - <CMDQ_EVENT_MDP_WROT0_EOF>; - power-domains = <&spm MT8183_POWER_DOMAIN_DISP>; - clocks = <&mmsys CLK_MM_MDP_WROT0>; - iommus = <&iommu>; + dma-controller@14005000 { + compatible = "mediatek,mt8183-mdp3-wrot"; + reg = <0x14005000 0x1000>; + mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x5000 0x1000>; + mediatek,gce-events = <CMDQ_EVENT_MDP_WROT0_SOF>, + <CMDQ_EVENT_MDP_WROT0_EOF>; + power-domains = <&spm MT8183_POWER_DOMAIN_DISP>; + clocks = <&mmsys CLK_MM_MDP_WROT0>; + iommus = <&iommu>; + #dma-cells = <1>; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 110/417 arm64: dts: mediatek: mt8183: correct MDP3 DMA-related nodes
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moudy Ho <[email protected]>
[ Upstream commit 188ffcd7fea79af3cac441268fc99f60e87f03b3 ]
In order to generalize the node names, the DMA-related nodes corresponding to MT8183 MDP3 need to be corrected.
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/mediatek/mt8183.dtsi +4 -2
@@ -1586,7 +1586,7 @@ mmsys: syscon@14000000 { mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0 0x1000>; }; - mdp3-rdma0@14001000 { + dma-controller0@14001000 { compatible = "mediatek,mt8183-mdp3-rdma"; reg = <0 0x14001000 0 0x1000>; mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x1000 0x1000>;
@@ -1598,6 +1598,7 @@ mdp3-rdma0@14001000 { iommus = <&iommu M4U_PORT_MDP_RDMA0>; mboxes = <&gce 20 CMDQ_THR_PRIO_LOWEST 0>, <&gce 21 CMDQ_THR_PRIO_LOWEST 0>; + #dma-cells = <1>; }; mdp3-rsz0@14003000 {
@@ -1618,7 +1619,7 @@ mdp3-rsz1@14004000 { clocks = <&mmsys CLK_MM_MDP_RSZ1>; }; - mdp3-wrot0@14005000 { + dma-controller@14005000 { compatible = "mediatek,mt8183-mdp3-wrot"; reg = <0 0x14005000 0 0x1000>; mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x5000 0x1000>;
@@ -1627,6 +1628,7 @@ mdp3-wrot0@14005000 { power-domains = <&spm MT8183_POWER_DOMAIN_DISP>; clocks = <&mmsys CLK_MM_MDP_WROT0>; iommus = <&iommu M4U_PORT_MDP_WROT0>; + #dma-cells = <1>; }; mdp3-wdma@14006000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 111/417 wifi: mt76: mt7921: fix country count limitation for CLC
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Yen Hsieh <[email protected]>
[ Upstream commit fa6ad88e023ddfa6c5dcdb466d159e89f451e305 ]
Due to the increase in the number of power tables for 6Ghz on CLC, the variable nr_country is no longer sufficient to represent the total quantity. Therefore, we have switched to calculating the length of clc buf to obtain the correct power table. Additionally, the version number has been incremented to 1.
--- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +8 -3
@@ -1036,21 +1036,26 @@ int __mt7921_mcu_set_clc(struct mt7921_dev *dev, u8 *alpha2,u8 type[2 ];u8 rsvd[64 ]; }__packed req = { + .ver =1 , .idx = idx, .env = env_cap, };int ret, valid_cnt =0 ; -u8 i, *pos; +u16 buf_len =0 ; +u8 *pos;if (!clc)return 0 ; + buf_len =le16_to_cpu (clc->len) -sizeof (*clc); pos = clc->data; -for (i =0 ; i < clc->nr_country; i++) { +while (buf_len >16 ) {struct mt7921_clc_rule *rule = (struct mt7921_clc_rule *)pos;u16 len =le16_to_cpu (rule->len); +u16 offset = len +sizeof (*rule); - pos += len +sizeof (*rule); + pos += offset; + buf_len -= offset;if (rule->alpha2[0 ] != alpha2[0 ] || rule->alpha2[1 ] != alpha2[1 ])continue ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 112/417 selftests/bpf: Relax time_tai test for equal timestamps in tai_forward
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: YiFei Zhu <[email protected]>
[ Upstream commit e1ba7f64b192f083b4423644be03bb9e3dc8ae84 ]
We're observing test flakiness on an arm64 platform which might not have timestamps as precise as x86. The test log looks like:
test_time_tai:PASS:tai_open 0 nsec
test_time_tai:PASS:test_run 0 nsec
test_time_tai:PASS:tai_ts1 0 nsec
test_time_tai:PASS:tai_ts2 0 nsec
test_time_tai:FAIL:tai_forward unexpected tai_forward: actual 1702348135471494160 <= expected 1702348135471494160 test_time_tai:PASS:tai_gettime 0 nsec
test_time_tai:PASS:tai_future_ts1 0 nsec
test_time_tai:PASS:tai_future_ts2 0 nsec
test_time_tai:PASS:tai_range_ts1 0 nsec
test_time_tai:PASS:tai_range_ts2 0 nsec
#199 time_tai:FAIL
This patch changes ASSERT_GT to ASSERT_GE in the tai_forward assertion so that equal timestamps are permitted.
--- tools/testing/selftests/bpf/prog_tests/time_tai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/time_tai.c +1 -1
@@ -56,7 +56,7 @@ void test_time_tai(void)ASSERT_NEQ (ts2,0 ,"tai_ts2" );/* TAI is moving forward only */ -ASSERT_GT (ts2, ts1,"tai_forward" ); +ASSERT_GE (ts2, ts1,"tai_forward" );/* Check for future */ ret =clock_gettime (CLOCK_TAI , &now_tai);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 113/417 block: Set memalloc_noio to false on device_add_disk() error path
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Nan <[email protected]>
[ Upstream commit 5fa3d1a00c2d4ba14f1300371ad39d5456e890d7 ]
On the error path of device_add_disk(), device's memalloc_noio flag was set but not cleared. As the comment of pm_runtime_set_memalloc_noio(), "The function should be called between device_add() and device_del()". Clear this flag before device_del() now.
--- block/genhd.c | 1 + 1 file changed, 1 insertion(+)
block/genhd.c +1 -0
@@ -567,6 +567,7 @@ out_del_integrity: out_del_block_link:if (!sysfs_deprecated)sysfs_remove_link (block_depr,dev_name (ddev)); +pm_runtime_set_memalloc_noio (ddev, false); out_device_del:device_del (ddev); out_free_ext_minor:
Greg Kroah-Hartman
maintainerPATCH 114/417 arm64: dts: renesas: white-hawk-cpu: Fix missing serial console pin control
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit fc67495680f60e88bb8ca43421c1dd628928d581 ]
The pin control description for the serial console was added, but not enabled, due to missing pinctrl properties in the serial port device node.
--- arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +3 -0
@@ -125,6 +125,9 @@ &extalr_clk { }; &hscif0 { + pinctrl-0 = <&hscif0_pins>; + pinctrl-names = "default"; + status = "okay"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 115/417 arm64: dts: imx8mm: Reduce GPU to nominal speed
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 1f794d3eed5345413c2b0cf1bcccc92d77681220 ]
When the GPU nodes were added, the GPU_PLL_OUT was configured for 1000MHz, but this requires the SoC to run in overdrive mode which requires an elevated voltage operating point.
Since this may run some boards out of spec, the default clock should be set to 800MHz for nominal operating mode. Boards that run at the higher voltage can update their clocks accordingly.
--- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm.dtsi +2 -2
@@ -1303,7 +1303,7 @@ gpu_3d: gpu@38000000 { assigned-clocks = <&clk IMX8MM_CLK_GPU3D_CORE>, <&clk IMX8MM_GPU_PLL_OUT>; assigned-clock-parents = <&clk IMX8MM_GPU_PLL_OUT>; - assigned-clock-rates = <0>, <1000000000>; + assigned-clock-rates = <0>, <800000000>; power-domains = <&pgc_gpu>; };
@@ -1318,7 +1318,7 @@ gpu_2d: gpu@38008000 { assigned-clocks = <&clk IMX8MM_CLK_GPU2D_CORE>, <&clk IMX8MM_GPU_PLL_OUT>; assigned-clock-parents = <&clk IMX8MM_GPU_PLL_OUT>; - assigned-clock-rates = <0>, <1000000000>; + assigned-clock-rates = <0>, <800000000>; power-domains = <&pgc_gpu>; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 116/417 scsi: hisi_sas: Replace with standard error code return value
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihang Li <[email protected]>
[ Upstream commit d34ee535705eb43885bc0f561c63046f697355ad ]
In function hisi_sas_controller_prereset(), -ENOSYS (Function not implemented) should be returned if the driver does not support .soft_reset. Returns -EPERM (Operation not permitted) if HISI_SAS_RESETTING_BIT is already be set.
In function _suspend_v3_hw(), returns -EPERM (Operation not permitted) if HISI_SAS_RESETTING_BIT is already be set.
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 4 ++-- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_main.c +2 -2
@@ -1502,12 +1502,12 @@ EXPORT_SYMBOL_GPL(hisi_sas_controller_reset_done);static int hisi_sas_controller_prereset (struct hisi_hba *hisi_hba) {if (!hisi_hba->hw->soft_reset) -return -1 ; +return -ENOENT ;down (&hisi_hba->sem);if (test_and_set_bit (HISI_SAS_RESETTING_BIT , &hisi_hba->flags)) {up (&hisi_hba->sem); -return -1 ; +return -EPERM ; }if (hisi_sas_debugfs_enable && hisi_hba->debugfs_itct[0 ].itct)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -1
@@ -4981,7 +4981,7 @@ static int _suspend_v3_hw(struct device *device) }if (test_and_set_bit (HISI_SAS_RESETTING_BIT , &hisi_hba->flags)) -return -1 ; +return -EPERM ;dev_warn (dev,"entering suspend state\n" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 117/417 scsi: hisi_sas: Rollback some operations if FLR failed
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihang Li <[email protected]>
[ Upstream commit 7ea3e7763c50b20a8bd25cf524ea0c6463de69be ]
We obtain the semaphore and set HISI_SAS_RESETTING_BIT in hisi_sas_reset_prepare_v3_hw(), block the scsi host and set HISI_SAS_REJECT_CMD_BIT in hisi_sas_controller_reset_prepare(), released them in hisi_sas_controller_reset_done(). However, if the HW reset failure in FLR results in early return, the semaphore and flag bits will not be release.
Rollback some operations including clearing flags / releasing semaphore when FLR is failed.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +5 -0
@@ -4946,6 +4946,7 @@ static void hisi_sas_reset_done_v3_hw(struct pci_dev *pdev) {struct sas_ha_struct *sha =pci_get_drvdata (pdev);struct hisi_hba *hisi_hba = sha->lldd_ha; +struct Scsi_Host *shost = hisi_hba->shost;struct device *dev = hisi_hba->dev;int rc;
@@ -4954,6 +4955,10 @@ static void hisi_sas_reset_done_v3_hw(struct pci_dev *pdev) rc =hw_init_v3_hw (hisi_hba);if (rc) {dev_err (dev,"FLR: hw init failed rc=%d\n" , rc); +clear_bit (HISI_SAS_REJECT_CMD_BIT , &hisi_hba->flags); +scsi_unblock_requests (shost); +clear_bit (HISI_SAS_RESETTING_BIT , &hisi_hba->flags); +up (&hisi_hba->sem);return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 118/417 scsi: hisi_sas: Correct the number of global debugfs registers
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihang Li <[email protected]>
[ Upstream commit 73e33f969ef05328766b23a99b2c07bfff765009 ]
In function debugfs_debugfs_snapshot_global_reg_v3_hw() it uses debugfs_axi_reg.count (which is the number of axi debugfs registers) to acquire the number of global debugfs registers.
Use debugfs_global_reg.count to acquire the number of global debugfs registers instead.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -1
@@ -3330,7 +3330,7 @@ static void debugfs_snapshot_global_reg_v3_hw(struct hisi_hba *hisi_hba)u32 *databuf = hisi_hba->debugfs_regs[dump_index][DEBUGFS_GLOBAL ].data;int i; -for (i =0 ; i < debugfs_axi_reg.count; i++, databuf++) +for (i =0 ; i < debugfs_global_reg.count; i++, databuf++) *databuf =hisi_sas_read32 (hisi_hba,4 * i); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 119/417 ARM: dts: stm32: dont mix SCMI and non-SCMI board compatibles
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmad Fatoum <[email protected]>
[ Upstream commit bfc3c6743de0ecb169026c36cbdbc0d12d22a528 ]
The binding erroneously decreed that the SCMI variants of the ST evaluation kits are compatible with the non-SCMI variants.
This is not correct, as a kernel or bootloader compatible with the non-SCMI variant is not necessarily able to function, when direct access to resources is replaced by having to talk SCMI to the secure monitor.
The binding has been adjusted to reflect thus, so synchronize the device trees now.
--- arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts | 2 +- arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts | 2 +- arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts | 2 +- arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-)
arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts +1 -1
@@ -11,7 +11,7 @@ / { model = "STMicroelectronics STM32MP157A-DK1 SCMI Discovery Board"; - compatible = "st,stm32mp157a-dk1-scmi", "st,stm32mp157a-dk1", "st,stm32mp157"; + compatible = "st,stm32mp157a-dk1-scmi", "st,stm32mp157"; reserved-memory { optee@de000000 {
arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts +1 -1
@@ -11,7 +11,7 @@ / { model = "STMicroelectronics STM32MP157C-DK2 SCMI Discovery Board"; - compatible = "st,stm32mp157c-dk2-scmi", "st,stm32mp157c-dk2", "st,stm32mp157"; + compatible = "st,stm32mp157c-dk2-scmi", "st,stm32mp157"; reserved-memory { optee@de000000 {
arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts +1 -1
@@ -11,7 +11,7 @@ / { model = "STMicroelectronics STM32MP157C-ED1 SCMI eval daughter"; - compatible = "st,stm32mp157c-ed1-scmi", "st,stm32mp157c-ed1", "st,stm32mp157"; + compatible = "st,stm32mp157c-ed1-scmi", "st,stm32mp157"; reserved-memory { optee@fe000000 {
arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts +1 -2
@@ -11,8 +11,7 @@ / { model = "STMicroelectronics STM32MP157C-EV1 SCMI eval daughter on eval mother"; - compatible = "st,stm32mp157c-ev1-scmi", "st,stm32mp157c-ev1", "st,stm32mp157c-ed1", - "st,stm32mp157"; + compatible = "st,stm32mp157c-ev1-scmi", "st,stm32mp157c-ed1", "st,stm32mp157"; reserved-memory { optee@fe000000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 120/417 selftests/net: fix grep checking for fib_nexthop_multiprefix
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit a33e9da3470499e9ff476138f271fb52d6bfe767 ]
When running fib_nexthop_multiprefix test I saw all IPv6 test failed. e.g.
]# ./fib_nexthop_multiprefix.sh
TEST: IPv4: host 0 to host 1, mtu 1300 [ OK ]
TEST: IPv6: host 0 to host 1, mtu 1300 [FAIL]
With -v it shows
COMMAND: ip netns exec h0 /usr/sbin/ping6 -s 1350 -c5 -w5 2001:db8:101::1 PING 2001:db8:101::1(2001:db8:101::1) 1350 data bytes
From 2001:db8:100::64 icmp_seq=1 Packet too big: mtu=1300
--- 2001:db8:101::1 ping statistics ---
1 packets transmitted, 0 received, +1 errors, 100% packet loss, time 0ms
Route get
2001:db8:101::1 via 2001:db8:100::64 dev eth0 src 2001:db8:100::1 metric 1024 expires 599sec mtu 1300 pref medium Searching for:
2001:db8:101::1 from :: via 2001:db8:100::64 dev eth0 src 2001:db8:100::1 .* mtu 1300
The reason is when CONFIG_IPV6_SUBTREES is not enabled, rt6_fill_node() will not put RTA_SRC info. After fix:
]# ./fib_nexthop_multiprefix.sh
TEST: IPv4: host 0 to host 1, mtu 1300 [ OK ]
TEST: IPv6: host 0 to host 1, mtu 1300 [ OK ]
--- tools/testing/selftests/net/fib_nexthop_multiprefix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/fib_nexthop_multiprefix.sh +2 -2
@@ -209,12 +209,12 @@ validate_v6_exception() echo "Route get" ip -netns h0 -6 ro get ${dst} echo "Searching for:" - echo " ${dst} from :: via ${r1} dev eth0 src ${h0} .* mtu ${mtu}" + echo " ${dst}.* via ${r1} dev eth0 src ${h0} .* mtu ${mtu}" echo fi ip -netns h0 -6 ro get ${dst} | \ - grep -q "${dst} from :: via ${r1} dev eth0 src ${h0} .* mtu ${mtu}" + grep -q "${dst}.* via ${r1} dev eth0 src ${h0} .* mtu ${mtu}" rc=$? log_test $rc 0 "IPv6: host 0 to host ${i}, mtu ${mtu}"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 121/417 ipmr: support IP_PKTINFO on cache report IGMP msg
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leone Fernando <[email protected]>
[ Upstream commit bb7403655b3c3eb245d0ee330047cd3e20b3c4af ]
In order to support IP_PKTINFO on those packets, we need to call ipv4_pktinfo_prepare.
When sending mrouted/pimd daemons a cache report IGMP msg, it is unnecessary to set dst on the newly created skb.
It used to be necessary on older versions until
commit d826eb14ecef ("ipv4: PKTINFO doesnt need dst reference") which changed the way IP_PKTINFO struct is been retrieved.
Changes from v1:
1. Undo changes in ipv4_pktinfo_prepare function. use it directly and copy the control block.
--- net/ipv4/ipmr.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
net/ipv4/ipmr.c +6 -7
@@ -1025,6 +1025,10 @@ static int ipmr_cache_report(const struct mr_table *mrt,struct sk_buff *skb;int ret; + mroute_sk =rcu_dereference (mrt->mroute_sk); +if (!mroute_sk) +return -EINVAL ; +if (assert ==IGMPMSG_WHOLEPKT || assert ==IGMPMSG_WRVIFWHOLE ) skb =skb_realloc_headroom (pkt,sizeof (struct iphdr ));else
@@ -1069,7 +1073,8 @@ static int ipmr_cache_report(const struct mr_table *mrt, msg = (struct igmpmsg *)skb_network_header (skb); msg->im_vif = vifi; msg->im_vif_hi = vifi >>8 ; -skb_dst_set (skb,dst_clone (skb_dst (pkt))); +ipv4_pktinfo_prepare (mroute_sk, pkt); +memcpy (skb->cb, pkt->cb,sizeof (skb->cb));/* Add our header */ igmp =skb_put (skb,sizeof (struct igmphdr )); igmp->type = assert;
@@ -1079,12 +1084,6 @@ static int ipmr_cache_report(const struct mr_table *mrt, skb->transport_header = skb->network_header; } - mroute_sk =rcu_dereference (mrt->mroute_sk); -if (!mroute_sk) { -kfree_skb (skb); -return -EINVAL ; - } -igmpmsg_netlink_event (mrt, skb);/* Deliver to mrouted */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 122/417 virtio/vsock: fix logic which reduces credit update messages
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arseniy Krasnov <[email protected]>
[ Upstream commit 93b80887668226180ea5f5349cc728ca6dc700ab ]
Add one more condition for sending credit update during dequeue from stream socket: when number of bytes in the rx queue is smaller than SO_RCVLOWAT value of the socket. This is actual for non-default value of SO_RCVLOWAT (e.g. not 1) - idea is to "kick" peer to continue data transmission, because we need at least SO_RCVLOWAT bytes in our rx queue to wake up user for reading data (in corner case it is also possible to stuck both tx and rx sides, this is why 'Fixes' is used).
--- net/vmw_vsock/virtio_transport_common.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
net/vmw_vsock/virtio_transport_common.c +10 -3
@@ -366,6 +366,8 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk,struct virtio_vsock_sock *vvs = vsk->trans;size_t bytes, total =0 ;struct sk_buff *skb; +u32 fwd_cnt_delta; +bool low_rx_bytes;int err = -EFAULT ;u32 free_space;
@@ -400,7 +402,10 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, } } - free_space = vvs->buf_alloc - (vvs->fwd_cnt - vvs->last_fwd_cnt); + fwd_cnt_delta = vvs->fwd_cnt - vvs->last_fwd_cnt; + free_space = vvs->buf_alloc - fwd_cnt_delta; + low_rx_bytes = (vvs->rx_bytes < +sock_rcvlowat (sk_vsock (vsk),0 ,INT_MAX ));spin_unlock_bh (&vvs->rx_lock);
@@ -410,9 +415,11 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk,* too high causes extra messages. Too low causes transmitter * stalls. As stalls are in theory more expensive than extra * messages, we set the limit to a high value. TODO: experiment -* with different values. +* with different values. Also send credit update message when +* number of bytes in rx queue is not enough to wake up reader. */ -if (free_space <VIRTIO_VSOCK_MAX_PKT_BUF_SIZE ) +if (fwd_cnt_delta && + (free_space <VIRTIO_VSOCK_MAX_PKT_BUF_SIZE || low_rx_bytes))virtio_transport_send_credit_update (vsk);return total;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 123/417 dma-mapping: clear dev->dma_mem to NULL after freeing it
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joakim Zhang <[email protected]>
[ Upstream commit b07bc2347672cc8c7293c64499f1488278c5ca3d ]
Reproduced with below sequence:
dma_declare_coherent_memory()->dma_release_coherent_memory() ->dma_declare_coherent_memory()->"return -EBUSY" error
It will return -EBUSY from the dma_assign_coherent_memory() in dma_declare_coherent_memory(), the reason is that dev->dma_mem pointer has not been set to NULL after it's freed.
--- kernel/dma/coherent.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/dma/coherent.c +3 -1
@@ -132,8 +132,10 @@ int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,void dma_release_coherent_memory (struct device *dev) { -if (dev) +if (dev) {_dma_release_coherent_memory (dev->dma_mem); + dev->dma_mem =NULL ; + } } static void *__dma_alloc_from_coherent(struct device *dev,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 124/417 soc: qcom: llcc: Fix dis_cap_alloc and retain_on_pc configuration
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Atul Dhudase <[email protected]>
[ Upstream commit eed6e57e9f3e2beac37563eb6a0129549daa330e ]
Commit c14e64b46944 ("soc: qcom: llcc: Support chipsets that can
write to llcc") add the support for chipset where capacity based
allocation and retention through power collapse can be programmed based on content of SCT table mentioned in the llcc driver where the target like sdm845 where the entire programming related to it is controlled in firmware. However, the commit introduces a bug where capacity/retention register get overwritten each time it gets programmed for each slice and that results in misconfiguration of the register based on SCT table and that is not expected behaviour instead it should be read modify write to retain the configuration of other slices.
This issue is totally caught from code review and programming test and not through any power/perf numbers so, it is not known what impact this could make if we don't have this change however, this feature are for these targets and they should have been programmed accordingly as per their configuration mentioned in SCT table like others bits information.
This change brings one difference where it keeps capacity/retention bits of the slices that are not mentioned in SCT table in unknown state where as earlier it was initialized to zero.
--- drivers/soc/qcom/llcc-qcom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/soc/qcom/llcc-qcom.c +4 -4
@@ -680,14 +680,14 @@ static int _qcom_llcc_cfg_program(const struct llcc_slice_config *config,u32 disable_cap_alloc, retain_pc; disable_cap_alloc = config->dis_cap_alloc << config->slice_id; - ret =regmap_write (drv_data->bcast_regmap, -LLCC_TRP_SCID_DIS_CAP_ALLOC , disable_cap_alloc); + ret =regmap_update_bits (drv_data->bcast_regmap,LLCC_TRP_SCID_DIS_CAP_ALLOC , +BIT (config->slice_id), disable_cap_alloc);if (ret)return ret; retain_pc = config->retain_on_pc << config->slice_id; - ret =regmap_write (drv_data->bcast_regmap, -LLCC_TRP_PCB_ACT , retain_pc); + ret =regmap_update_bits (drv_data->bcast_regmap,LLCC_TRP_PCB_ACT , +BIT (config->slice_id), retain_pc);if (ret)return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 125/417 arm64: dts: qcom: sm8150-hdk: fix SS USB regulators
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit a509adf05b2aac31b22781f5aa09e4768a5b6c39 ]
The SM8150-HDK uses two different regulators to power up SuperSpeed USB PHYs. The L5A regulator is used for the second USB host, while the first (OTG) USB host uses different regulator, L18A. Fix the regulator for the usb_1 QMPPHY and (to remove possible confusion) drop the usb_ss_dp_core_1/_2 labels.
--- arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/sm8150-hdk.dts +8 -4
@@ -126,8 +126,6 @@ vdda_qrefs_0p875_5: vdda_sp_sensor: vdda_ufs_2ln_core_1: vdda_ufs_2ln_core_2: - vdda_usb_ss_dp_core_1: - vdda_usb_ss_dp_core_2: vdda_qlink_lv: vdda_qlink_lv_ck: vreg_l5a_0p875: ldo5 {
@@ -209,6 +207,12 @@ vreg_l17a_3p0: ldo17 { regulator-max-microvolt = <3008000>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; }; + + vreg_l18a_0p8: ldo18 { + regulator-min-microvolt = <880000>; + regulator-max-microvolt = <880000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; }; pm8150l-rpmh-regulators {
@@ -439,13 +443,13 @@ &usb_2_hsphy { &usb_1_qmpphy { status = "okay"; vdda-phy-supply = <&vreg_l3c_1p2>; - vdda-pll-supply = <&vdda_usb_ss_dp_core_1>; + vdda-pll-supply = <&vreg_l18a_0p8>; }; &usb_2_qmpphy { status = "okay"; vdda-phy-supply = <&vreg_l3c_1p2>; - vdda-pll-supply = <&vdda_usb_ss_dp_core_1>; + vdda-pll-supply = <&vreg_l5a_0p875>; }; &usb_1 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 126/417 block: add check of minors and first_minor in device_add_disk()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Nan <[email protected]>
[ Upstream commit 4c434392c4777881d01beada6701eff8c76b43fe ]
'first_minor' represents the starting minor number of disks, and 'minors' represents the number of partitions in the device. Neither of them can be greater than MINORMASK + 1.
Commit e338924bd05d ("block: check minor range in device_add_disk()") only added the check of 'first_minor + minors'. However, their sum might be less than MINORMASK but their values are wrong. Complete the checks now.
--- block/genhd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
block/genhd.c +3 -1
@@ -444,7 +444,9 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, DISK_MAX_PARTS); disk->minors =DISK_MAX_PARTS ; } -if (disk->first_minor + disk->minors >MINORMASK +1 ) +if (disk->first_minor >MINORMASK || + disk->minors >MINORMASK +1 || + disk->first_minor + disk->minors >MINORMASK +1 ) goto out_exit_elevator; }else {if (WARN_ON (disk->minors))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 127/417 arm64: dts: qcom: sc7280: Mark SDHCI hosts as cache-coherent
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 827f5fc8d912203c1f971e47d61130b13c6820ba ]
The SDHCI hosts on SC7280 are cache-coherent, just like on most fairly recent Qualcomm SoCs. Mark them as such.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sc7280.dtsi +2 -0
@@ -888,6 +888,7 @@ sdhc_1: mmc@7c4000 { bus-width = <8>; supports-cqe; + dma-coherent; qcom,dll-config = <0x0007642c>; qcom,ddr-config = <0x80040868>;
@@ -3271,6 +3272,7 @@ sdhc_2: mmc@8804000 { operating-points-v2 = <&sdhc2_opp_table>; bus-width = <4>; + dma-coherent; qcom,dll-config = <0x0007642c>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 128/417 arm64: dts: qcom: ipq6018: fix clock rates for GCC_USB0_MOCK_UTMI_CLK
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit 5c0dbe8b058436ad5daecb19c60869f832607ea3 ]
The downstream QSDK kernel [1] and GCC_USB1_MOCK_UTMI_CLK are both 24MHz. Adjust GCC_USB0_MOCK_UTMI_CLK to 24MHz to avoid the following error:
clk: couldn't set gcc_usb0_mock_utmi_clk clk rate to 20000000 (-22), current rate: 24000000
1. https://git.codelinaro.org/clo/qsdk/oss/kernel/linux-ipq-5.4/-/commit/486c8485f59
--- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +1 -1
@@ -745,7 +745,7 @@ usb3: usb@8af8800 { <&gcc GCC_USB0_MOCK_UTMI_CLK>; assigned-clock-rates = <133330000>, <133330000>, - <20000000>; + <24000000>; resets = <&gcc GCC_USB0_BCR>; status = "disabled";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 129/417 arm64: dts: qcom: ipq6018: improve pcie phy pcs reg table
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Marangi <[email protected]>
[ Upstream commit 08f399a818b0eff552b1f23c3171950a58aea78f ]
This is not a fix on its own but more a cleanup. Phy qmp pcie driver currently have a workaround to handle pcs_misc not declared and add 0x400 offset to the pcs reg if pcs_misc is not declared.
Correctly declare pcs_misc reg and reduce PCS size to the common value of 0x1f0 as done for every other qmp based pcie phy device.
Stable-dep-of: 5c0dbe8b0584 ("arm64: dts: qcom: ipq6018: fix clock rates for GCC_USB0_MOCK_UTMI_CLK")
--- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +2 -1
@@ -406,7 +406,8 @@ pcie_phy: phy@84000 { pcie_phy0: phy@84200 { reg = <0x0 0x84200 0x0 0x16c>, /* Serdes Tx */ <0x0 0x84400 0x0 0x200>, /* Serdes Rx */ - <0x0 0x84800 0x0 0x4f4>; /* PCS: Lane0, COM, PCIE */ + <0x0 0x84800 0x0 0x1f0>, /* PCS: Lane0, COM, PCIE */ + <0x0 0x84c00 0x0 0xf4>; /* pcs_misc */ #phy-cells = <0>; clocks = <&gcc GCC_PCIE0_PIPE_CLK>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 130/417 arm64: dts: qcom: ipq6018: Use lowercase hex
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 0431dba3733bf52dacf7382e7b0c1b4c0b59e88d ]
Use lowercase hex, as that's the preferred and overwhermingly present style.
Stable-dep-of: 5c0dbe8b0584 ("arm64: dts: qcom: ipq6018: fix clock rates for GCC_USB0_MOCK_UTMI_CLK")
--- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +4 -4
@@ -685,7 +685,7 @@ dwc_1: usb@7000000 { ssphy_0: ssphy@78000 { compatible = "qcom,ipq6018-qmp-usb3-phy"; - reg = <0x0 0x78000 0x0 0x1C4>; + reg = <0x0 0x78000 0x0 0x1c4>; #address-cells = <2>; #size-cells = <2>; ranges;
@@ -702,7 +702,7 @@ ssphy_0: ssphy@78000 { usb0_ssphy: phy@78200 { reg = <0x0 0x00078200 0x0 0x130>, /* Tx */ <0x0 0x00078400 0x0 0x200>, /* Rx */ - <0x0 0x00078800 0x0 0x1F8>, /* PCS */ + <0x0 0x00078800 0x0 0x1f8>, /* PCS */ <0x0 0x00078600 0x0 0x044>; /* PCS misc */ #phy-cells = <0>; #clock-cells = <0>;
@@ -727,7 +727,7 @@ qusb_phy_0: qusb@79000 { usb3: usb@8af8800 { compatible = "qcom,ipq6018-dwc3", "qcom,dwc3"; - reg = <0x0 0x8AF8800 0x0 0x400>; + reg = <0x0 0x8af8800 0x0 0x400>; #address-cells = <2>; #size-cells = <2>; ranges;
@@ -753,7 +753,7 @@ usb3: usb@8af8800 { dwc_0: usb@8a00000 { compatible = "snps,dwc3"; - reg = <0x0 0x8A00000 0x0 0xcd00>; + reg = <0x0 0x8a00000 0x0 0xcd00>; interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; phys = <&qusb_phy_0>, <&usb0_ssphy>; phy-names = "usb2-phy", "usb3-phy";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 131/417 arm64: dts: qcom: ipq6018: Pad addresses to 8 hex digits
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 647380e41520c7dbd651ebf0d9fd7dfa4928f42d ]
Some addresses were 7-hex-digits long, or less. Fix that.
Stable-dep-of: 5c0dbe8b0584 ("arm64: dts: qcom: ipq6018: fix clock rates for GCC_USB0_MOCK_UTMI_CLK")
--- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +12 -12
@@ -146,7 +146,7 @@ reserved-memory { ranges; rpm_msg_ram: memory@60000 { - reg = <0x0 0x60000 0x0 0x6000>; + reg = <0x0 0x00060000 0x0 0x6000>; no-map; };
@@ -181,7 +181,7 @@ soc: soc { prng: qrng@e1000 { compatible = "qcom,prng-ee"; - reg = <0x0 0xe3000 0x0 0x1000>; + reg = <0x0 0x000e3000 0x0 0x1000>; clocks = <&gcc GCC_PRNG_AHB_CLK>; clock-names = "core"; };
@@ -388,7 +388,7 @@ v2m@0 { pcie_phy: phy@84000 { compatible = "qcom,ipq6018-qmp-pcie-phy"; - reg = <0x0 0x84000 0x0 0x1bc>; /* Serdes PLL */ + reg = <0x0 0x00084000 0x0 0x1bc>; /* Serdes PLL */ status = "disabled"; #address-cells = <2>; #size-cells = <2>;
@@ -404,10 +404,10 @@ pcie_phy: phy@84000 { "common"; pcie_phy0: phy@84200 { - reg = <0x0 0x84200 0x0 0x16c>, /* Serdes Tx */ - <0x0 0x84400 0x0 0x200>, /* Serdes Rx */ - <0x0 0x84800 0x0 0x1f0>, /* PCS: Lane0, COM, PCIE */ - <0x0 0x84c00 0x0 0xf4>; /* pcs_misc */ + reg = <0x0 0x00084200 0x0 0x16c>, /* Serdes Tx */ + <0x0 0x00084400 0x0 0x200>, /* Serdes Rx */ + <0x0 0x00084800 0x0 0x1f0>, /* PCS: Lane0, COM, PCIE */ + <0x0 0x00084c00 0x0 0xf4>; /* pcs_misc */ #phy-cells = <0>; clocks = <&gcc GCC_PCIE0_PIPE_CLK>;
@@ -629,7 +629,7 @@ mdio: mdio@90000 { #address-cells = <1>; #size-cells = <0>; compatible = "qcom,ipq6018-mdio", "qcom,ipq4019-mdio"; - reg = <0x0 0x90000 0x0 0x64>; + reg = <0x0 0x00090000 0x0 0x64>; clocks = <&gcc GCC_MDIO_AHB_CLK>; clock-names = "gcc_mdio_ahb_clk"; status = "disabled";
@@ -637,7 +637,7 @@ mdio: mdio@90000 { qusb_phy_1: qusb@59000 { compatible = "qcom,ipq6018-qusb2-phy"; - reg = <0x0 0x059000 0x0 0x180>; + reg = <0x0 0x00059000 0x0 0x180>; #phy-cells = <0>; clocks = <&gcc GCC_USB1_PHY_CFG_AHB_CLK>,
@@ -670,7 +670,7 @@ usb2: usb@70f8800 { dwc_1: usb@7000000 { compatible = "snps,dwc3"; - reg = <0x0 0x7000000 0x0 0xcd00>; + reg = <0x0 0x07000000 0x0 0xcd00>; interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; phys = <&qusb_phy_1>; phy-names = "usb2-phy";
@@ -685,7 +685,7 @@ dwc_1: usb@7000000 { ssphy_0: ssphy@78000 { compatible = "qcom,ipq6018-qmp-usb3-phy"; - reg = <0x0 0x78000 0x0 0x1c4>; + reg = <0x0 0x00078000 0x0 0x1c4>; #address-cells = <2>; #size-cells = <2>; ranges;
@@ -714,7 +714,7 @@ usb0_ssphy: phy@78200 { qusb_phy_0: qusb@79000 { compatible = "qcom,ipq6018-qusb2-phy"; - reg = <0x0 0x079000 0x0 0x180>; + reg = <0x0 0x00079000 0x0 0x180>; #phy-cells = <0>; clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 132/417 arm64: dts: qcom: ipq6018: Fix up indentation
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit c2596b717e9d96ae57c45481acfbafe9d3d54e56 ]
The dwc3 subnode was indented using spaces for some reason and other properties were not exactly properly indented. Fix it.
Stable-dep-of: 5c0dbe8b0584 ("arm64: dts: qcom: ipq6018: fix clock rates for GCC_USB0_MOCK_UTMI_CLK")
--- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 44 +++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +22 -22
@@ -201,8 +201,8 @@ crypto: crypto@73a000 { compatible = "qcom,crypto-v5.1"; reg = <0x0 0x0073a000 0x0 0x6000>; clocks = <&gcc GCC_CRYPTO_AHB_CLK>, - <&gcc GCC_CRYPTO_AXI_CLK>, - <&gcc GCC_CRYPTO_CLK>; + <&gcc GCC_CRYPTO_AXI_CLK>, + <&gcc GCC_CRYPTO_CLK>; clock-names = "iface", "bus", "core"; dmas = <&cryptobam 2>, <&cryptobam 3>; dma-names = "rx", "tx";
@@ -272,7 +272,7 @@ blsp1_uart3: serial@78b1000 { reg = <0x0 0x078b1000 0x0 0x200>; interrupts = <GIC_SPI 306 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GCC_BLSP1_UART3_APPS_CLK>, - <&gcc GCC_BLSP1_AHB_CLK>; + <&gcc GCC_BLSP1_AHB_CLK>; clock-names = "core", "iface"; status = "disabled"; };
@@ -285,7 +285,7 @@ blsp1_spi1: spi@78b5000 { interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>; spi-max-frequency = <50000000>; clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>, - <&gcc GCC_BLSP1_AHB_CLK>; + <&gcc GCC_BLSP1_AHB_CLK>; clock-names = "core", "iface"; dmas = <&blsp_dma 12>, <&blsp_dma 13>; dma-names = "tx", "rx";
@@ -300,7 +300,7 @@ blsp1_spi2: spi@78b6000 { interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; spi-max-frequency = <50000000>; clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>, - <&gcc GCC_BLSP1_AHB_CLK>; + <&gcc GCC_BLSP1_AHB_CLK>; clock-names = "core", "iface"; dmas = <&blsp_dma 14>, <&blsp_dma 15>; dma-names = "tx", "rx";
@@ -358,8 +358,8 @@ qpic_nand: nand@79b0000 { clock-names = "core", "aon"; dmas = <&qpic_bam 0>, - <&qpic_bam 1>, - <&qpic_bam 2>; + <&qpic_bam 1>, + <&qpic_bam 2>; dma-names = "tx", "rx", "cmd"; pinctrl-0 = <&qpic_pins>; pinctrl-names = "default";
@@ -372,10 +372,10 @@ intc: interrupt-controller@b000000 { #size-cells = <2>; interrupt-controller; #interrupt-cells = <0x3>; - reg = <0x0 0x0b000000 0x0 0x1000>, /*GICD*/ - <0x0 0x0b002000 0x0 0x1000>, /*GICC*/ - <0x0 0x0b001000 0x0 0x1000>, /*GICH*/ - <0x0 0x0b004000 0x0 0x1000>; /*GICV*/ + reg = <0x0 0x0b000000 0x0 0x1000>, /*GICD*/ + <0x0 0x0b002000 0x0 0x1000>, /*GICC*/ + <0x0 0x0b001000 0x0 0x1000>, /*GICH*/ + <0x0 0x0b004000 0x0 0x1000>; /*GICV*/ interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; ranges = <0 0 0 0xb00a000 0 0xffd>;
@@ -669,17 +669,17 @@ usb2: usb@70f8800 { status = "disabled"; dwc_1: usb@7000000 { - compatible = "snps,dwc3"; - reg = <0x0 0x07000000 0x0 0xcd00>; - interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; - phys = <&qusb_phy_1>; - phy-names = "usb2-phy"; - tx-fifo-resize; - snps,is-utmi-l1-suspend; - snps,hird-threshold = /bits/ 8 <0x0>; - snps,dis_u2_susphy_quirk; - snps,dis_u3_susphy_quirk; - dr_mode = "host"; + compatible = "snps,dwc3"; + reg = <0x0 0x07000000 0x0 0xcd00>; + interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; + phys = <&qusb_phy_1>; + phy-names = "usb2-phy"; + tx-fifo-resize; + snps,is-utmi-l1-suspend; + snps,hird-threshold = /bits/ 8 <0x0>; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + dr_mode = "host"; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 133/417 wifi: rtlwifi: add calculate_bit_shift()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 52221dfddbbfb5b4e029bb2efe9bb7da33ec1e46 ]
There are many same functions like _rtl88e_phy_calculate_bit_shift(), _rtl92c_phy_calculate_bit_shift() and so on. And these functions can cause undefined bitwise shift behavior. Add calculate_bit_shift() to replace them and fix undefined behavior in subsequent patches.
Stable-dep-of: 969bc926f04b ("wifi: rtlwifi: rtl8188ee: phy: using calculate_bit_shift()")
--- drivers/net/wireless/realtek/rtlwifi/wifi.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/realtek/rtlwifi/wifi.h +7 -0
@@ -3105,4 +3105,11 @@ static inline struct ieee80211_sta *rtl_find_sta(struct ieee80211_hw *hw, return ieee80211_find_sta(mac->vif, mac_addr); } +static inline u32 calculate_bit_shift (u32 bitmask) +{ +if (WARN_ON_ONCE (!bitmask)) +return 0 ; + +return __ffs (bitmask); +}#endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 134/417 wifi: rtlwifi: rtl8188ee: phy: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 969bc926f04b438676768aeffffffb050e480b62 ]
Using calculate_bit_shift() to replace _rtl88e_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c +4 -10
@@ -16,12 +16,6 @@ static u32 _rtl88e_phy_rf_serial_read(struct ieee80211_hw *hw,static void _rtl88e_phy_rf_serial_write (struct ieee80211_hw *hw,enum radio_path rfpath,u32 offset,u32 data); -static u32 _rtl88e_phy_calculate_bit_shift (u32 bitmask) -{ -u32 i =ffs (bitmask); - -return i ? i -1 :32 ; -}static bool _rtl88e_phy_bb8188e_config_parafile (struct ieee80211_hw *hw);static bool _rtl88e_phy_config_mac_with_headerfile (struct ieee80211_hw *hw); static bool phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
@@ -51,7 +45,7 @@ u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)rtl_dbg (rtlpriv,COMP_RF ,DBG_TRACE ,"regaddr(%#x), bitmask(%#x)\n" , regaddr, bitmask); originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl88e_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
@@ -74,7 +68,7 @@ void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw,if (bitmask !=MASKDWORD ) { originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl88e_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); }
@@ -99,7 +93,7 @@ u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw, original_value =_rtl88e_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl88e_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock);
@@ -127,7 +121,7 @@ void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =_rtl88e_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl88e_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 135/417 wifi: rtlwifi: rtl8192c: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 1dedc3a6699d827d345019e921b8d8f37f694333 ]
Using calculate_bit_shift() to replace _rtl92c_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 12 ++---------- .../wireless/realtek/rtlwifi/rtl8192c/phy_common.h | 1 - 2 files changed, 2 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c +2 -10
@@ -17,7 +17,7 @@ u32 rtl92c_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)rtl_dbg (rtlpriv,COMP_RF ,DBG_TRACE ,"regaddr(%#x), bitmask(%#x)\n" , regaddr, bitmask); originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
@@ -40,7 +40,7 @@ void rtl92c_phy_set_bb_reg(struct ieee80211_hw *hw,if (bitmask !=MASKDWORD ) { originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); }
@@ -143,14 +143,6 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw, }EXPORT_SYMBOL (_rtl92c_phy_rf_serial_write); -u32 _rtl92c_phy_calculate_bit_shift (u32 bitmask) -{ -u32 i =ffs (bitmask); - -return i ? i -1 :32 ; -} -EXPORT_SYMBOL (_rtl92c_phy_calculate_bit_shift); -static void _rtl92c_phy_bb_config_1t (struct ieee80211_hw *hw) {rtl_set_bbreg (hw,RFPGA0_TXINFO ,0x3 ,0x2 );
drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h +0 -1
@@ -196,7 +196,6 @@ bool rtl92c_phy_set_rf_power_state(struct ieee80211_hw *hw,void rtl92ce_phy_set_rf_on (struct ieee80211_hw *hw);void rtl92c_phy_set_io (struct ieee80211_hw *hw);void rtl92c_bb_block_on (struct ieee80211_hw *hw); -u32 _rtl92c_phy_calculate_bit_shift (u32 bitmask);long _rtl92c_phy_txpwr_idx_to_dbm (struct ieee80211_hw *hw,enum wireless_mode wirelessmode,u8 txpwridx);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 136/417 wifi: rtlwifi: rtl8192cu: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit f4088c8fcbabadad9dd17d17ae9ba24e9e3221ec ]
Using calculate_bit_shift() to replace _rtl92c_phy_calculate_bit_shift(). And fix an undefined bitwise shift behavior problem.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c +3 -3
@@ -32,7 +32,7 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw, original_value =_rtl92c_phy_fw_rf_serial_read (hw, rfpath, regaddr); } - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
@@ -56,7 +56,7 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =_rtl92c_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
@@ -67,7 +67,7 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =_rtl92c_phy_fw_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 137/417 wifi: rtlwifi: rtl8192ce: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 3d03e8231031bcc65a48cd88ef9c71b6524ce70b ]
Using calculate_bit_shift() to replace _rtl92c_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c | 6 +++--- drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c +3 -3
@@ -39,7 +39,7 @@ u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw, rfpath, regaddr); } - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock);
@@ -110,7 +110,7 @@ void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =_rtl92c_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
@@ -122,7 +122,7 @@ void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =_rtl92c_phy_fw_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h +0 -1
@@ -94,7 +94,6 @@ u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw, enum radio_path rfpath, u32 offset);u32 _rtl92c_phy_fw_rf_serial_read (struct ieee80211_hw *hw,enum radio_path rfpath,u32 offset); -u32 _rtl92c_phy_calculate_bit_shift (u32 bitmask);void _rtl92c_phy_rf_serial_write (struct ieee80211_hw *hw,enum radio_path rfpath,u32 offset,u32 data); void _rtl92c_phy_fw_rf_serial_write(struct ieee80211_hw *hw,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 138/417 wifi: rtlwifi: rtl8192de: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit b8b2baad2e652042cf8b6339939ac2f4e6f53de4 ]
Using calculate_bit_shift() to replace _rtl92d_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c +4 -11
@@ -169,13 +169,6 @@ static const u8 channel_all[59] = { 157, 159, 161, 163, 165 }; -static u32 _rtl92d_phy_calculate_bit_shift (u32 bitmask) -{ -u32 i =ffs (bitmask); - -return i ? i -1 :32 ; -} -u32 rtl92d_phy_query_bb_reg (struct ieee80211_hw *hw,u32 regaddr,u32 bitmask) {struct rtl_priv *rtlpriv =rtl_priv (hw);
@@ -198,7 +191,7 @@ u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask) }else { originalvalue =rtl_read_dword (rtlpriv, regaddr); } - bitshift =_rtl92d_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE, "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
@@ -230,7 +223,7 @@ void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw, dbi_direct); else originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92d_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); }if (rtlhal->during_mac1init_radioa || rtlhal->during_mac0init_radiob)
@@ -317,7 +310,7 @@ u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw, regaddr, rfpath, bitmask);spin_lock (&rtlpriv->locks.rf_lock); original_value =_rtl92d_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92d_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock); rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
@@ -343,7 +336,7 @@ void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,if (bitmask !=RFREG_OFFSET_MASK ) { original_value =_rtl92d_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92d_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift)); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 139/417 wifi: rtlwifi: rtl8192ee: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 63526897fc0d086069bcab67c3a112caaec751cb ]
Using calculate_bit_shift() to replace _rtl92ee_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c +4 -12
@@ -16,7 +16,6 @@ static u32 _rtl92ee_phy_rf_serial_read(struct ieee80211_hw *hw,static void _rtl92ee_phy_rf_serial_write (struct ieee80211_hw *hw,enum radio_path rfpath,u32 offset,u32 data); -static u32 _rtl92ee_phy_calculate_bit_shift (u32 bitmask);static bool _rtl92ee_phy_bb8192ee_config_parafile (struct ieee80211_hw *hw);static bool _rtl92ee_phy_config_mac_with_headerfile (struct ieee80211_hw *hw); static bool phy_config_bb_with_hdr_file(struct ieee80211_hw *hw,
@@ -46,7 +45,7 @@ u32 rtl92ee_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)rtl_dbg (rtlpriv,COMP_RF ,DBG_TRACE ,"regaddr(%#x), bitmask(%#x)\n" , regaddr, bitmask); originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92ee_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
@@ -68,7 +67,7 @@ void rtl92ee_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr,if (bitmask !=MASKDWORD ) { originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92ee_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); }
@@ -92,7 +91,7 @@ u32 rtl92ee_phy_query_rf_reg(struct ieee80211_hw *hw,spin_lock (&rtlpriv->locks.rf_lock); original_value =_rtl92ee_phy_rf_serial_read (hw , rfpath, regaddr); - bitshift =_rtl92ee_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock);
@@ -119,7 +118,7 @@ void rtl92ee_phy_set_rf_reg(struct ieee80211_hw *hw,if (bitmask !=RFREG_OFFSET_MASK ) { original_value =_rtl92ee_phy_rf_serial_read (hw, rfpath, addr); - bitshift =_rtl92ee_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = (original_value & (~bitmask)) | (data << bitshift); }
@@ -201,13 +200,6 @@ static void _rtl92ee_phy_rf_serial_write(struct ieee80211_hw *hw, pphyreg->rf3wire_offset, data_and_addr); } -static u32 _rtl92ee_phy_calculate_bit_shift (u32 bitmask) -{ -u32 i =ffs (bitmask); - -return i ? i -1 :32 ; -} -bool rtl92ee_phy_mac_config (struct ieee80211_hw *hw) {return _rtl92ee_phy_config_mac_with_headerfile (hw);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 140/417 wifi: rtlwifi: rtl8192se: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit ac32b9317063b101a8ff3d3e885f76f87a280419 ]
Using calculate_bit_shift() to replace _rtl92s_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c +4 -11
@@ -14,13 +14,6 @@#include "hw.h" #include "table.h" -static u32 _rtl92s_phy_calculate_bit_shift (u32 bitmask) -{ -u32 i =ffs (bitmask); - -return i ? i -1 :32 ; -} -u32 rtl92s_phy_query_bb_reg (struct ieee80211_hw *hw,u32 regaddr,u32 bitmask) {struct rtl_priv *rtlpriv =rtl_priv (hw);
@@ -30,7 +23,7 @@ u32 rtl92s_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask) regaddr, bitmask); originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92s_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE, "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
@@ -52,7 +45,7 @@ void rtl92s_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask,if (bitmask !=MASKDWORD ) { originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92s_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); }
@@ -160,7 +153,7 @@ u32 rtl92s_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, original_value =_rtl92s_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92s_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock);
@@ -191,7 +184,7 @@ void rtl92s_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,if (bitmask !=RFREG_OFFSET_MASK ) { original_value =_rtl92s_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92s_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift)); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 141/417 wifi: iwlwifi: mvm: set siso/mimo chains to 1 in FW SMPS request
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit b1a2e5c310e063560760806d2cc5d2233c596067 ]
The firmware changed their mind, don't set the chains to zero, instead set them to 1 as we normally would for connections to APs that don't use MIMO.
--- drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 11 ----------- 1 file changed, 11 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +0 -11
@@ -99,17 +99,6 @@ static void iwl_mvm_phy_ctxt_set_rxchain(struct iwl_mvm *mvm, active_cnt =2 ; } -/* -* If the firmware requested it, then we know that it supports -* getting zero for the values to indicate "use one, but pick -* which one yourself", which means it can dynamically pick one -* that e.g. has better RSSI. -*/ -if (mvm->fw_static_smps_request && active_cnt ==1 && idle_cnt ==1 ) { - idle_cnt =0 ; - active_cnt =0 ; - } - *rxchain_info =cpu_to_le32 (iwl_mvm_get_valid_rx_ant (mvm) <<PHY_RX_CHAIN_VALID_POS ); *rxchain_info |=cpu_to_le32 (idle_cnt <<PHY_RX_CHAIN_CNT_POS );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 142/417 wifi: iwlwifi: mvm: send TX path flush in rfkill
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 2afc3dad39ea84a072d04ff40a417234326adc47 ]
If we want to drop packets, that's surely a good thing to do when we want to enter rfkill. Send this command despite rfkill so we can successfully clean up everything, we need to handle it separately since it has CMD_WANT_SKB, so it's not going to automatically return success when in rfkill.
--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +1 -1
@@ -2200,7 +2200,7 @@ int iwl_mvm_flush_sta_tids(struct iwl_mvm *mvm, u32 sta_id, u16 tids)WARN_ON (!iwl_mvm_has_new_tx_api (mvm));if (iwl_fw_lookup_notif_ver (mvm->fw,LONG_GROUP ,TXPATH_FLUSH ,0 ) >0 ) - cmd.flags |=CMD_WANT_SKB ; + cmd.flags |=CMD_WANT_SKB |CMD_SEND_IN_RFKILL ;IWL_DEBUG_TX_QUEUES (mvm,"flush for sta id %d tid mask 0x%x\n" , sta_id, tids);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 143/417 netfilter: nf_tables: mark newset as dead on transaction abort
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 08e4c8c5919fd405a4d709b4ba43d836894a26eb ]
If a transaction is aborted, we should mark the to-be-released NEWSET dead, just like commit path does for DEL and DESTROYSET commands.
In both cases all remaining elements will be released via set->ops->destroy().
The existing abort code does NOT post the actual release to the work queue. Also the entire __nf_tables_abort() function is wrapped in gc_seq begin/end pair.
Therefore, async gc worker will never try to release the pending set elements, as gc sequence is always stale.
It might be possible to speed up transaction aborts via work queue too, this would result in a race and a possible use-after-free.
So fix this before it becomes an issue.
--- net/netfilter/nf_tables_api.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nf_tables_api.c +1 -0
@@ -9937,6 +9937,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)nft_trans_destroy (trans);break ; } +nft_trans_set (trans)->dead =1 ;list_del_rcu (&nft_trans_set (trans)->list);break ;case NFT_MSG_DELSET :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 144/417 Bluetooth: Fix bogus check for re-auth no supported with non-ssp
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit d03376c185926098cb4d668d6458801eb785c0a5 ]
This reverts 19f8def031bfa50c579149b200bfeeb919727b27 "Bluetooth: Fix auth_complete_evt for legacy units" which seems to be working around a bug on a broken controller rather then any limitation imposed by the Bluetooth spec, in fact if there ws not possible to re-auth the command shall fail not succeed.
--- include/net/bluetooth/hci_core.h | 1 - net/bluetooth/hci_conn.c | 8 +++----- net/bluetooth/hci_event.c | 11 ++--------- 3 files changed, 5 insertions(+), 15 deletions(-)
include/net/bluetooth/hci_core.h +0 -1
@@ -942,7 +942,6 @@ void hci_inquiry_cache_flush(struct hci_dev *hdev);/* ----- HCI Connections ----- */ enum {HCI_CONN_AUTH_PEND , -HCI_CONN_REAUTH_PEND ,HCI_CONN_ENCRYPT_PEND ,HCI_CONN_RSWITCH_PEND ,HCI_CONN_MODE_CHANGE_PEND ,
net/bluetooth/hci_conn.c +3 -5
@@ -2314,12 +2314,10 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)hci_send_cmd (conn->hdev,HCI_OP_AUTH_REQUESTED ,sizeof (cp), &cp); -/* If we're already encrypted set the REAUTH_PEND flag, -* otherwise set the ENCRYPT_PEND. +/* Set the ENCRYPT_PEND to trigger encryption after +* authentication. */ -if (test_bit (HCI_CONN_ENCRYPT , &conn->flags)) -set_bit (HCI_CONN_REAUTH_PEND , &conn->flags); -else +if (!test_bit (HCI_CONN_ENCRYPT , &conn->flags))set_bit (HCI_CONN_ENCRYPT_PEND , &conn->flags); }
net/bluetooth/hci_event.c +2 -9
@@ -3511,14 +3511,8 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, void *data,if (!ev->status) {clear_bit (HCI_CONN_AUTH_FAILURE , &conn->flags); - -if (!hci_conn_ssp_enabled (conn) && -test_bit (HCI_CONN_REAUTH_PEND , &conn->flags)) { -bt_dev_info (hdev,"re-auth of legacy device is not possible." ); - }else { -set_bit (HCI_CONN_AUTH , &conn->flags); - conn->sec_level = conn->pending_sec_level; - } +set_bit (HCI_CONN_AUTH , &conn->flags); + conn->sec_level = conn->pending_sec_level; }else {if (ev->status ==HCI_ERROR_PIN_OR_KEY_MISSING )set_bit (HCI_CONN_AUTH_FAILURE , &conn->flags);
@@ -3527,7 +3521,6 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, void *data, }clear_bit (HCI_CONN_AUTH_PEND , &conn->flags); -clear_bit (HCI_CONN_REAUTH_PEND , &conn->flags);if (conn->state ==BT_CONFIG ) {if (!ev->status &&hci_conn_ssp_enabled (conn)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 145/417 Bluetooth: btmtkuart: fix recv_buf() return value
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Francesco Dolcini <[email protected]>
[ Upstream commit 64057f051f20c2a2184b9db7f8037d928d68a4f4 ]
Serdev recv_buf() callback is supposed to return the amount of bytes consumed, therefore an int in between 0 and count.
Do not return negative number in case of issue, just print an error and return count. This fixes a WARN in ttyport_receive_buf().
--- drivers/bluetooth/btmtkuart.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/bluetooth/btmtkuart.c +3 -8
@@ -337,7 +337,7 @@ mtk_stp_split(struct btmtkuart_dev *bdev, const unsigned char *data, int count,return data; } -static int btmtkuart_recv (struct hci_dev *hdev,const u8 *data,size_t count) +static void btmtkuart_recv (struct hci_dev *hdev,const u8 *data,size_t count) {struct btmtkuart_dev *bdev =hci_get_drvdata (hdev);const unsigned char *p_left = data, *p_h4;
@@ -376,25 +376,20 @@ static int btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count)bt_dev_err (bdev->hdev,"Frame reassembly failed (%d)" , err); bdev->rx_skb =NULL ; -return err; +return ; } sz_left -= sz_h4; p_left += sz_h4; } - -return 0 ; }static int btmtkuart_receive_buf (struct serdev_device *serdev,const u8 *data,size_t count) {struct btmtkuart_dev *bdev =serdev_device_get_drvdata (serdev); -int err; - err =btmtkuart_recv (bdev->hdev, data, count); -if (err <0 ) -return err; +btmtkuart_recv (bdev->hdev, data, count); bdev->hdev->stat.byte_rx += count;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 146/417 block: make BLK_DEF_MAX_SECTORS unsigned
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Keith Busch <[email protected]>
[ Upstream commit 0a26f327e46c203229e72c823dfec71a2b405ec5 ]
This is used as an unsigned value, so define it that way to avoid having to cast it.
Stable-dep-of: 9a9525de8654 ("null_blk: don't cap max_hw_sectors to BLK_DEF_MAX_SECTORS")
--- block/blk-settings.c | 2 +- drivers/block/null_blk/main.c | 3 +-- include/linux/blkdev.h | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-)
block/blk-settings.c +1 -1
@@ -135,7 +135,7 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto limits->max_hw_sectors = max_hw_sectors; max_sectors =min_not_zero (max_hw_sectors, limits->max_dev_sectors); - max_sectors = min_t(unsigned int, max_sectors, BLK_DEF_MAX_SECTORS); + max_sectors =min (max_sectors,BLK_DEF_MAX_SECTORS ); max_sectors =round_down (max_sectors, limits->logical_block_size >>SECTOR_SHIFT ); limits->max_sectors = max_sectors;
drivers/block/null_blk/main.c +1 -2
@@ -2116,8 +2116,7 @@ static int null_add_dev(struct nullb_device *dev)blk_queue_physical_block_size (nullb->q, dev->blocksize);if (!dev->max_sectors) dev->max_sectors =queue_max_hw_sectors (nullb->q); - dev->max_sectors = min_t(unsigned int, dev->max_sectors, -BLK_DEF_MAX_SECTORS ); + dev->max_sectors =min (dev->max_sectors,BLK_DEF_MAX_SECTORS );blk_queue_max_hw_sectors (nullb->q, dev->max_sectors);if (dev->virt_boundary)
include/linux/blkdev.h +2 -1
@@ -1109,11 +1109,12 @@ static inline bool bdev_is_partition(struct block_device *bdev)enum blk_default_limits {BLK_MAX_SEGMENTS =128 ,BLK_SAFE_MAX_SECTORS =255 , -BLK_DEF_MAX_SECTORS =2560 ,BLK_MAX_SEGMENT_SIZE =65536 ,BLK_SEG_BOUNDARY_MASK =0xFFFFFFFFUL , }; +#define BLK_DEF_MAX_SECTORS 2560u +static inline unsigned long queue_segment_boundary (const struct request_queue *q) {return q->limits.seg_boundary_mask;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 147/417 null_blk: dont cap max_hw_sectors to BLK_DEF_MAX_SECTORS
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 9a9525de865410047fa962867b4fcd33943b206f ]
null_blk has some rather odd capping of the max_hw_sectors value to BLK_DEF_MAX_SECTORS, which doesn't make sense - max_hw_sector is the hardware limit, and BLK_DEF_MAX_SECTORS despite the confusing name is the default cap for the max_sectors field used for normal file system I/O.
Remove all the capping, and simply leave it to the block layer or user to take up or not all of that for file system I/O.
--- drivers/block/null_blk/main.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/block/null_blk/main.c +2 -10
@@ -2114,10 +2114,8 @@ static int null_add_dev(struct nullb_device *dev)blk_queue_logical_block_size (nullb->q, dev->blocksize);blk_queue_physical_block_size (nullb->q, dev->blocksize); -if (!dev->max_sectors) - dev->max_sectors =queue_max_hw_sectors (nullb->q); - dev->max_sectors =min (dev->max_sectors,BLK_DEF_MAX_SECTORS ); -blk_queue_max_hw_sectors (nullb->q, dev->max_sectors); +if (dev->max_sectors) +blk_queue_max_hw_sectors (nullb->q, dev->max_sectors);if (dev->virt_boundary)blk_queue_virt_boundary (nullb->q,PAGE_SIZE -1 );
@@ -2217,12 +2215,6 @@ static int __init null_init(void) g_bs =PAGE_SIZE ; } -if (g_max_sectors >BLK_DEF_MAX_SECTORS ) { -pr_warn ("invalid max sectors\n" ); -pr_warn ("defaults max sectors to %u\n" ,BLK_DEF_MAX_SECTORS ); - g_max_sectors =BLK_DEF_MAX_SECTORS ; - } -if (g_home_node !=NUMA_NO_NODE && g_home_node >= nr_online_nodes) {pr_err ("invalid home_node value\n" ); g_home_node =NUMA_NO_NODE ;
Signature · 1 line
2.43.0