6.7.5-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainercover 6.7.5-rc1 review
This is the start of the stable review cycle for the 6.7.5 release. There are 124 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Feb 2024 17:18:29 +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.7.5-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.7.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.7.5-rc1
Michael Lass <[email protected]>
net: Fix from address in memcpy_to_iter_csum()
Jens Axboe <[email protected]>
io_uring/net: limit inline multishot retries
Jens Axboe <[email protected]>
io_uring/poll: add requeue return code from poll multishot handling
Greg Kroah-Hartman <[email protected]>
Revert "ASoC: amd: Add new dmi entries for acp5x platform"
Kent Overstreet <[email protected]>
bcachefs: time_stats: Check for last_event == 0 when updating freq stats
Guoyu Ou <[email protected]>
bcachefs: unlock parent dir if entry is not found in subvolume deletion
Christoph Hellwig <[email protected]>
bcachefs: fix incorrect usage of REQ_OP_FLUSH
Su Yue <[email protected]>
bcachefs: grab s_umount only if snapshotting
Su Yue <[email protected]>
bcachefs: kvfree bch_fs::snapshots in bch2_fs_snapshots_exit
Kent Overstreet <[email protected]>
bcachefs: bch2_kthread_io_clock_wait() no longer sleeps until full amount
Kent Overstreet <[email protected]>
bcachefs: Add missing bch2_moving_ctxt_flush_all()
Daniel Hill <[email protected]>
bcachefs: rebalance should wakeup on shutdown if disabled
Kent Overstreet <[email protected]>
bcachefs: Don't pass memcmp() as a pointer
Al Viro <[email protected]>
bch2_ioctl_subvolume_destroy(): fix locking
Al Viro <[email protected]>
new helper: user_path_locked_at()
Johan Hovold <[email protected]>
PCI/ASPM: Fix deadlock when enabling ASPM
Jens Axboe <[email protected]>
io_uring/rw: ensure poll based multishot read retries appropriately
Jens Axboe <[email protected]>
io_uring/net: un-indent mshot retry path in io_recv_finish()
Jens Axboe <[email protected]>
io_uring/poll: move poll execution helpers higher up
Jens Axboe <[email protected]>
io_uring/net: fix sr->len for IORING_OP_RECV with MSG_WAITALL and buffers
Emmanuel Grumbach <[email protected]>
wifi: iwlwifi: mvm: fix a battery life regression
Hans de Goede <[email protected]>
Input: atkbd - skip ATKBD_CMD_SETLEDS when skipping ATKBD_CMD_GETID
Werner Sembach <[email protected]>
Input: i8042 - fix strange behavior of touchpad on Clevo NS70PU
Frederic Weisbecker <[email protected]>
hrtimer: Report offline hrtimer enqueue
Heikki Krogerus <[email protected]>
usb: dwc3: pci: add support for the Intel Arrow Lake-H
Michal Pecio <[email protected]>
xhci: handle isoc Babble and Buffer Overrun events properly
Mathias Nyman <[email protected]>
xhci: process isoc TD properly when there was a transaction error mid TD.
Prashanth K <[email protected]>
usb: host: xhci-plat: Add support for XHCI_SG_TRB_CACHE_SIZE_QUIRK
Prashanth K <[email protected]>
usb: dwc3: host: Set XHCI_SG_TRB_CACHE_SIZE_QUIRK
Qiuxu Zhuo <[email protected]>
x86/lib: Revert to _ASM_EXTABLE_UA() for {get,put}_user() fixups
Mario Limonciello <[email protected]>
Revert "drm/amd/pm: fix the high voltage and temperature issue"
Badhri Jagan Sridharan <[email protected]>
Revert "usb: typec: tcpm: fix cc role at port reset"
Leonard Dallmayr <[email protected]>
USB: serial: cp210x: add ID for IMST iM871A-USB
Puliang Lu <[email protected]>
USB: serial: option: add Fibocom FM101-GL variant
JackBB Wu <[email protected]>
USB: serial: qcserial: add new usb-id for Dell Wireless DW5826e
Sean Young <[email protected]>
ALSA: usb-audio: add quirk for RODE NT-USB+
Julian Sikorski <[email protected]>
ALSA: usb-audio: Add a quirk for Yamaha YIT-W12TX transmitter
Alexander Tsoy <[email protected]>
ALSA: usb-audio: Add delay quirk for MOTU M Series 2nd revision
Tejun Heo <[email protected]>
blk-iocost: Fix an UBSAN shift-out-of-bounds warning
Muhammad Usama Anjum <[email protected]>
selftests: core: include linux/close_range.h for CLOSE_RANGE_* macros
Maurizio Lombardi <[email protected]>
nvme-host: fix the updating of the firmware version
Ben Dooks <[email protected]>
riscv: declare overflow_stack as exported from traps.c
Alexandre Ghiti <[email protected]>
riscv: Fix arch_hugetlb_migration_supported() for NAPOT
Xiubo Li <[email protected]>
ceph: always set initial i_blkbits to CEPH_FSCRYPT_BLOCK_SHIFT
Xiubo Li <[email protected]>
libceph: just wait for more data to be available on the socket
Xiubo Li <[email protected]>
libceph: rename read_sparse_msg_*() to read_partial_sparse_msg_*()
Alexandre Ghiti <[email protected]>
riscv: Flush the tlb when a page directory is freed
Ming Lei <[email protected]>
scsi: core: Move scsi_host_busy() out of host lock if it is for per-command
Alexandre Ghiti <[email protected]>
riscv: Fix hugetlb_mask_last_page() when NAPOT is enabled
Alexandre Ghiti <[email protected]>
riscv: Fix set_huge_pte_at() for NAPOT mapping
Vincent Chen <[email protected]>
riscv: mm: execute local TLB flush after populating vmemmap
Alexandre Ghiti <[email protected]>
mm: Introduce flush_cache_vmap_early()
Dan Carpenter <[email protected]>
fs/ntfs3: Fix an NULL dereference bug
Florian Westphal <[email protected]>
netfilter: nft_set_pipapo: remove scratch_aligned pointer
Florian Westphal <[email protected]>
netfilter: nft_set_pipapo: add helper to release pcpu scratch area
Florian Westphal <[email protected]>
netfilter: nft_set_pipapo: store index in scratch maps
Florian Westphal <[email protected]>
netfilter: nfnetlink_queue: un-break NF_REPEAT
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: use timestamp to check for set element timeout
Pablo Neira Ayuso <[email protected]>
netfilter: nft_ct: reject direction for ct id
Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_pipapo: remove static in nft_pipapo_get()
Srinivasan Shanmugam <[email protected]>
drm/amd/display: Implement bounds check for stream encoder creation in DCN301
Srinivasan Shanmugam <[email protected]>
drm/amd/display: Add NULL test for 'timing generator' in 'dcn21_set_pipe()'
Srinivasan Shanmugam <[email protected]>
drm/amd/display: Fix 'panel_cntl' could be null in 'dcn21_set_backlight_level()'
Pablo Neira Ayuso <[email protected]>
netfilter: nft_compat: restrict match/target protocol to u16
Pablo Neira Ayuso <[email protected]>
netfilter: nft_compat: reject unused compat flag
Pablo Neira Ayuso <[email protected]>
netfilter: nft_compat: narrow down revision to unsigned 8-bits
Jakub Kicinski <[email protected]>
selftests: cmsg_ipv6: repeat the exact packet
Eric Dumazet <[email protected]>
ppp_async: limit MRU to 64K
Jiri Pirko <[email protected]>
devlink: avoid potential loop in devlink_rel_nested_in_notify_work()
Kuniyuki Iwashima <[email protected]>
af_unix: Call kfree_skb() for dead unix_(sk)->oob_skb in GC.
Shigeru Yoshida <[email protected]>
tipc: Check the bearer type before calling tipc_udp_nl_bearer_add()
Paolo Abeni <[email protected]>
selftests: net: let big_tcp test cope with slow env
David Howells <[email protected]>
rxrpc: Fix counting of new acks and nacks
David Howells <[email protected]>
rxrpc: Fix response to PING RESPONSE ACKs to a dead call
David Howells <[email protected]>
rxrpc: Fix delayed ACKs to not set the reference serial number
David Howells <[email protected]>
rxrpc: Fix generation of serial numbers to skip zero
Ard Biesheuvel <[email protected]>
x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section
Dan Carpenter <[email protected]>
drm/i915/gvt: Fix uninitialized variable in handle_mmio()
Eric Dumazet <[email protected]>
inet: read sk->sk_family once in inet_recv_error()
Zhang Rui <[email protected]>
hwmon: (coretemp) Fix bogus core_id to attr name mapping
Zhang Rui <[email protected]>
hwmon: (coretemp) Fix out-of-bounds memory access
Loic Prylli <[email protected]>
hwmon: (aspeed-pwm-tacho) mutex for tach reading
Zhipeng Lu <[email protected]>
octeontx2-pf: Fix a memleak otx2_sq_init
Zhipeng Lu <[email protected]>
atm: idt77252: fix a memleak in open_card_ubr0
Antoine Tenart <[email protected]>
tunnels: fix out of bounds access when building IPv6 PMTU error
Gerhard Engleder <[email protected]>
tsnep: Fix mapping for zero copy XDP_TX action
Paolo Abeni <[email protected]>
selftests: net: avoid just another constant wait
Paolo Abeni <[email protected]>
selftests: net: fix tcp listener handling in pmtu.sh
Yujie Liu <[email protected]>
selftests/net: change shebang to bash to support "source"
Hangbin Liu <[email protected]>
selftests/net: convert pmtu.sh to run it in unique namespace
Hangbin Liu <[email protected]>
selftests/net: convert unicast_extensions.sh to run it in unique namespace
Paolo Abeni <[email protected]>
selftests: net: cut more slack for gro fwd tests.
Ivan Vecera <[email protected]>
net: atlantic: Fix DMA mapping for PTP hwts ring
Eric Dumazet <[email protected]>
netdevsim: avoid potential loop in nsim_dev_trap_report_work()
Kees Cook <[email protected]>
wifi: brcmfmac: Adjust n_channels usage for __counted_by
Miri Korenblit <[email protected]>
wifi: iwlwifi: exit eSR only after the FW does
Johannes Berg <[email protected]>
wifi: mac80211: fix waiting for beacons logic
Johannes Berg <[email protected]>
wifi: mac80211: fix unsolicited broadcast probe config
Johannes Berg <[email protected]>
wifi: mac80211: fix RCU use in TDLS fast-xmit
Johannes Berg <[email protected]>
wifi: mac80211: improve CSA/ECSA connection refusal
Johannes Berg <[email protected]>
wifi: cfg80211: detect stuck ECSA element in probe resp
Benjamin Berg <[email protected]>
wifi: cfg80211: consume both probe response and beacon IEs
Furong Xu <[email protected]>
net: stmmac: xgmac: fix handling of DPP safety error for DMA channels
Ard Biesheuvel <[email protected]>
x86/efistub: Avoid placing the kernel below LOAD_PHYSICAL_ADDR
Ard Biesheuvel <[email protected]>
x86/efistub: Give up if memory attribute protocol returns an error
Benjamin Berg <[email protected]>
wifi: iwlwifi: mvm: skip adding debugfs symlink for reconfig
Abhinav Kumar <[email protected]>
drm/msm/dpu: check for valid hw_pp in dpu_encoder_helper_phys_cleanup
Kuogee Hsieh <[email protected]>
drm/msm/dp: return correct Colorimetry for DP_TEST_DYNAMIC_RANGE_CEA case
Kuogee Hsieh <[email protected]>
drm/msms/dp: fixed link clock divider bits be over written in BPC unknown case
Shyam Prasad N <[email protected]>
cifs: failure to add channel on iface should bump up weight
Shyam Prasad N <[email protected]>
cifs: avoid redundant calls to disable multichannel
Tony Lindgren <[email protected]>
phy: ti: phy-omap-usb2: Fix NULL pointer dereference for SRP
Frank Li <[email protected]>
dmaengine: fix is_slave_direction() return false when DMA_DEV_TO_DEV
James Clark <[email protected]>
perf evlist: Fix evlist__new_default() for > 1 core PMU
Thomas Richter <[email protected]>
perf test: Fix 'perf script' tests on s390
Ian Rogers <[email protected]>
perf tests: Add perf script test
Yoshihiro Shimoda <[email protected]>
phy: renesas: rcar-gen3-usb2: Fix returning wrong error code
Mantas Pucka <[email protected]>
phy: qcom-qmp-usb: fix serdes init sequence for IPQ6018
Mantas Pucka <[email protected]>
phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq6018
Christophe JAILLET <[email protected]>
dmaengine: fsl-qdma: Fix a memory leak related to the queue command DMA
Christophe JAILLET <[email protected]>
dmaengine: fsl-qdma: Fix a memory leak related to the status queue DMA
Jai Luthra <[email protected]>
dmaengine: ti: k3-udma: Report short packet errors
Guanhua Gao <[email protected]>
dmaengine: fsl-dpaa2-qdma: Fix the size of dma pools
Baokun Li <[email protected]>
ext4: regenerate buddy after block freeing failed if under fc replay
-------------
Diffstat:
Makefile | 4 +- arch/arc/include/asm/cacheflush.h | 1 + arch/arm/include/asm/cacheflush.h | 2 + arch/csky/abiv1/inc/abi/cacheflush.h | 1 + arch/csky/abiv2/inc/abi/cacheflush.h | 1 + arch/m68k/include/asm/cacheflush_mm.h | 1 + arch/mips/include/asm/cacheflush.h | 2 + arch/nios2/include/asm/cacheflush.h | 1 + arch/parisc/include/asm/cacheflush.h | 1 + arch/riscv/include/asm/cacheflush.h | 3 +- arch/riscv/include/asm/hugetlb.h | 3 + arch/riscv/include/asm/stacktrace.h | 5 + arch/riscv/include/asm/tlb.h | 2 +- arch/riscv/include/asm/tlbflush.h | 2 + arch/riscv/mm/hugetlbpage.c | 78 ++++++++++++- arch/riscv/mm/init.c | 4 + arch/riscv/mm/tlbflush.c | 6 + arch/sh/include/asm/cacheflush.h | 1 + arch/sparc/include/asm/cacheflush_32.h | 1 + arch/sparc/include/asm/cacheflush_64.h | 1 + arch/x86/boot/header.S | 14 +-- arch/x86/boot/setup.ld | 6 +- arch/x86/lib/getuser.S | 24 ++-- arch/x86/lib/putuser.S | 20 ++-- arch/xtensa/include/asm/cacheflush.h | 6 +- block/blk-iocost.c | 7 ++ drivers/atm/idt77252.c | 2 + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 10 +- drivers/dma/fsl-qdma.c | 28 ++--- drivers/dma/ti/k3-udma.c | 10 +- drivers/firmware/efi/libstub/efistub.h | 3 +- drivers/firmware/efi/libstub/kaslr.c | 2 +- drivers/firmware/efi/libstub/randomalloc.c | 12 +- drivers/firmware/efi/libstub/x86-stub.c | 25 ++-- drivers/firmware/efi/libstub/x86-stub.h | 4 +- drivers/firmware/efi/libstub/zboot.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 ++-- .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 63 +++++----- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 33 +----- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 - .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 8 +- drivers/gpu/drm/i915/gvt/handlers.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 5 - drivers/gpu/drm/msm/dp/dp_link.c | 22 ++-- drivers/gpu/drm/msm/dp/dp_reg.h | 3 + drivers/hwmon/aspeed-pwm-tacho.c | 7 ++ drivers/hwmon/coretemp.c | 40 ++++--- drivers/input/keyboard/atkbd.c | 13 ++- drivers/input/serio/i8042-acpipnpio.h | 6 + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 4 +- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 13 +++ drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 1 + drivers/net/ethernet/engleder/tsnep_main.c | 16 ++- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 14 ++- drivers/net/ethernet/stmicro/stmmac/common.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 3 + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 57 ++++++++- drivers/net/netdevsim/dev.c | 8 +- drivers/net/ppp/ppp_async.c | 4 + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 +- drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 +- .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 9 +- drivers/nvme/host/core.c | 7 +- drivers/pci/bus.c | 49 +++++--- drivers/pci/controller/dwc/pcie-qcom.c | 2 +- drivers/pci/pci.c | 78 ++++++++----- drivers/pci/pci.h | 4 +- drivers/pci/pcie/aspm.c | 13 ++- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 30 ++++- drivers/phy/renesas/phy-rcar-gen3-usb2.c | 4 - drivers/phy/ti/phy-omap-usb2.c | 4 +- drivers/scsi/scsi_error.c | 3 +- drivers/scsi/scsi_lib.c | 4 +- drivers/usb/dwc3/dwc3-pci.c | 4 + drivers/usb/dwc3/host.c | 4 +- drivers/usb/host/xhci-plat.c | 3 + drivers/usb/host/xhci-ring.c | 80 ++++++++++--- drivers/usb/host/xhci.h | 1 + drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/option.c | 1 + drivers/usb/serial/qcserial.c | 2 + drivers/usb/typec/tcpm/tcpm.c | 3 +- fs/bcachefs/clock.c | 4 +- fs/bcachefs/fs-io.c | 2 +- fs/bcachefs/fs-ioctl.c | 42 +++---- fs/bcachefs/journal_io.c | 3 +- fs/bcachefs/move.c | 2 +- fs/bcachefs/move.h | 1 + fs/bcachefs/rebalance.c | 13 ++- fs/bcachefs/replicas.c | 10 +- fs/bcachefs/snapshot.c | 2 +- fs/bcachefs/util.c | 5 +- fs/ceph/inode.c | 2 + fs/ext4/mballoc.c | 20 ++++ fs/namei.c | 16 ++- fs/ntfs3/ntfs_fs.h | 2 +- fs/smb/client/sess.c | 2 + fs/smb/client/smb2pdu.c | 2 +- include/asm-generic/cacheflush.h | 6 + include/linux/ceph/messenger.h | 2 +- include/linux/dmaengine.h | 3 +- include/linux/hrtimer.h | 4 +- include/linux/namei.h | 1 + include/linux/pci.h | 5 + include/net/cfg80211.h | 4 + include/net/netfilter/nf_tables.h | 16 ++- include/trace/events/rxrpc.h | 8 +- include/uapi/linux/netfilter/nf_tables.h | 2 + io_uring/io_uring.h | 7 ++ io_uring/net.c | 54 ++++++--- io_uring/poll.c | 49 ++++---- io_uring/poll.h | 9 ++ io_uring/rw.c | 10 +- kernel/time/hrtimer.c | 3 + mm/percpu.c | 8 +- net/ceph/messenger_v1.c | 33 +++--- net/ceph/messenger_v2.c | 4 +- net/ceph/osd_client.c | 9 +- net/core/datagram.c | 2 +- net/devlink/core.c | 12 +- net/ipv4/af_inet.c | 6 +- net/ipv4/ip_tunnel_core.c | 2 +- net/mac80211/cfg.c | 14 +-- net/mac80211/mlme.c | 106 ++++++++++++----- net/mac80211/tx.c | 7 +- net/netfilter/nf_tables_api.c | 4 +- net/netfilter/nfnetlink_queue.c | 13 ++- net/netfilter/nft_compat.c | 17 ++- net/netfilter/nft_ct.c | 3 + net/netfilter/nft_set_hash.c | 8 +- net/netfilter/nft_set_pipapo.c | 128 +++++++++++---------- net/netfilter/nft_set_pipapo.h | 18 ++- net/netfilter/nft_set_pipapo_avx2.c | 17 ++- net/netfilter/nft_set_rbtree.c | 11 +- net/rxrpc/ar-internal.h | 37 ++++-- net/rxrpc/call_event.c | 12 +- net/rxrpc/call_object.c | 1 + net/rxrpc/conn_event.c | 10 +- net/rxrpc/input.c | 115 +++++++++++++++--- net/rxrpc/output.c | 8 +- net/rxrpc/proc.c | 2 +- net/rxrpc/rxkad.c | 4 +- net/tipc/bearer.c | 6 + net/unix/garbage.c | 11 ++ net/wireless/scan.c | 63 +++++++++- sound/soc/amd/acp-config.c | 15 +-- sound/usb/quirks.c | 6 + tools/perf/tests/shell/script.sh | 73 ++++++++++++ tools/perf/util/evlist.c | 9 +- tools/testing/selftests/core/close_range_test.c | 1 + tools/testing/selftests/net/big_tcp.sh | 4 +- tools/testing/selftests/net/cmsg_ipv6.sh | 4 +- tools/testing/selftests/net/pmtu.sh | 52 +++++---- tools/testing/selftests/net/udpgro_fwd.sh | 14 ++- tools/testing/selftests/net/udpgso_bench_rx.c | 2 +- tools/testing/selftests/net/unicast_extensions.sh | 93 +++++++-------- 160 files changed, 1538 insertions(+), 715 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/124 ext4: regenerate buddy after block freeing failed if under fc replay
6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit c9b528c35795b711331ed36dc3dbee90d5812d4e ]
This mostly reverts commit 6bd97bf273bd ("ext4: remove redundant mb_regenerate_buddy()") and reintroduces mb_regenerate_buddy(). Based on code in mb_free_blocks(), fast commit replay can end up marking as free blocks that are already marked as such. This causes corruption of the buddy bitmap so we need to regenerate it in that case.
--- fs/ext4/mballoc.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
fs/ext4/mballoc.c +20 -0
@@ -1233,6 +1233,24 @@ void ext4_mb_generate_buddy(struct super_block *sb,atomic64_add (period, &sbi->s_mb_generation_time); } +static void mb_regenerate_buddy (struct ext4_buddy *e4b) +{ +int count; +int order =1 ; +void *buddy; + +while ((buddy =mb_find_buddy (e4b, order++, &count))) +mb_set_bits (buddy,0 , count); + + e4b->bd_info->bb_fragments =0 ; +memset (e4b->bd_info->bb_counters,0 , +sizeof (*e4b->bd_info->bb_counters) * + (e4b->bd_sb->s_blocksize_bits +2 )); + +ext4_mb_generate_buddy (e4b->bd_sb, e4b->bd_buddy, + e4b->bd_bitmap, e4b->bd_group, e4b->bd_info); +} +/* The buddy information is attached the buddy cache inode * for convenience. The information regarding each group * is loaded via ext4_mb_load_buddy. The information involve
@@ -1921,6 +1939,8 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,ext4_mark_group_bitmap_corrupted ( sb, e4b->bd_group,EXT4_GROUP_INFO_BBITMAP_CORRUPT ); + }else { +mb_regenerate_buddy (e4b); } goto done; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 2/124 dmaengine: fsl-dpaa2-qdma: Fix the size of dma pools
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guanhua Gao <[email protected]>
[ Upstream commit b73e43dcd7a8be26880ef8ff336053b29e79dbc5 ]
In case of long format of qDMA command descriptor, there are one frame descriptor, three entries in the frame list and two data entries. So the size of dma_pool_create for these three fields should be the same with the total size of entries respectively, or the contents may be overwritten by the next allocated descriptor.
--- drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c +6 -4
@@ -38,15 +38,17 @@ static int dpaa2_qdma_alloc_chan_resources(struct dma_chan *chan)if (!dpaa2_chan->fd_pool) goto err; - dpaa2_chan->fl_pool =dma_pool_create ("fl_pool" , dev, -sizeof (struct dpaa2_fl_entry ), -sizeof (struct dpaa2_fl_entry ),0 ); + dpaa2_chan->fl_pool = +dma_pool_create ("fl_pool" , dev, +sizeof (struct dpaa2_fl_entry ) *3 , +sizeof (struct dpaa2_fl_entry ),0 ); +if (!dpaa2_chan->fl_pool) goto err_fd; dpaa2_chan->sdd_pool =dma_pool_create ("sdd_pool" , dev, -sizeof (struct dpaa2_qdma_sd_d ), +sizeof (struct dpaa2_qdma_sd_d ) *2 ,sizeof (struct dpaa2_qdma_sd_d ),0 );if (!dpaa2_chan->sdd_pool) goto err_fl;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 3/124 dmaengine: ti: k3-udma: Report short packet errors
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jai Luthra <[email protected]>
[ Upstream commit bc9847c9ba134cfe3398011e343dcf6588c1c902 ]
Propagate the TR response status to the device using BCDMA split-channels. For example CSI-RX driver should be able to check if a frame was not transferred completely (short packet) and needs to be discarded.
--- drivers/dma/ti/k3-udma.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/dma/ti/k3-udma.c +8 -2
@@ -3968,6 +3968,7 @@ static void udma_desc_pre_callback(struct virt_dma_chan *vc, {struct udma_chan *uc =to_udma_chan (&vc->chan);struct udma_desc *d; +u8 status;if (!vd)return ;
@@ -3977,12 +3978,12 @@ static void udma_desc_pre_callback(struct virt_dma_chan *vc,if (d->metadata_size)udma_fetch_epib (uc, d); -/* Provide residue information for the client */ if (result) {void *desc_vaddr =udma_curr_cppi5_desc_vaddr (d, d->desc_idx);if (cppi5_desc_get_type (desc_vaddr) ==CPPI5_INFO0_DESC_TYPE_VAL_HOST ) { +/* Provide residue information for the client */ result->residue = d->residue -cppi5_hdesc_get_pktlen (desc_vaddr);if (result->residue)
@@ -3991,7 +3992,12 @@ static void udma_desc_pre_callback(struct virt_dma_chan *vc, result->result =DMA_TRANS_NOERROR ; }else { result->residue =0 ; - result->result =DMA_TRANS_NOERROR ; +/* Propagate TR Response errors to the client */ + status = d->hwdesc[0 ].tr_resp_base->status; +if (status) + result->result =DMA_TRANS_ABORTED ; +else + result->result =DMA_TRANS_NOERROR ; } } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 4/124 dmaengine: fsl-qdma: Fix a memory leak related to the status queue DMA
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 968bc1d7203d384e72afe34124a1801b7af76514 ]
This dma_alloc_coherent() is undone in the remove function, but not in the error handling path of fsl_qdma_probe().
Switch to the managed version to fix the issue in the probe and simplify the remove function.
--- drivers/dma/fsl-qdma.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
drivers/dma/fsl-qdma.c +5 -13
@@ -563,11 +563,11 @@ static struct fsl_qdma_queue/* * Buffer for queue command */ - status_head->cq =dma_alloc_coherent (&pdev->dev, -sizeof (struct fsl_qdma_format ) * - status_size, - &status_head->bus_addr, -GFP_KERNEL ); + status_head->cq =dmam_alloc_coherent (&pdev->dev, +sizeof (struct fsl_qdma_format ) * + status_size, + &status_head->bus_addr, +GFP_KERNEL );if (!status_head->cq) {devm_kfree (&pdev->dev, status_head);return NULL ;
@@ -1268,8 +1268,6 @@ static void fsl_qdma_cleanup_vchan(struct dma_device *dmadev)static void fsl_qdma_remove (struct platform_device *pdev) { -int i; -struct fsl_qdma_queue *status;struct device_node *np = pdev->dev.of_node;struct fsl_qdma_engine *fsl_qdma =platform_get_drvdata (pdev);
@@ -1277,12 +1275,6 @@ static void fsl_qdma_remove(struct platform_device *pdev)fsl_qdma_cleanup_vchan (&fsl_qdma->dma_dev);of_dma_controller_free (np);dma_async_device_unregister (&fsl_qdma->dma_dev); - -for (i =0 ; i < fsl_qdma->block_number; i++) { - status = fsl_qdma->status[i]; -dma_free_coherent (&pdev->dev,sizeof (struct fsl_qdma_format ) * - status->n_cq, status->cq, status->bus_addr); - } }static const struct of_device_id fsl_qdma_dt_ids[] = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 5/124 dmaengine: fsl-qdma: Fix a memory leak related to the queue command DMA
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 3aa58cb51318e329d203857f7a191678e60bb714 ]
This dma_alloc_coherent() is undone neither in the remove function, nor in the error handling path of fsl_qdma_probe().
Switch to the managed version to fix both issues.
--- drivers/dma/fsl-qdma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/dma/fsl-qdma.c +5 -5
@@ -514,11 +514,11 @@ static struct fsl_qdma_queue queue_temp = queue_head + i + (j * queue_num); queue_temp->cq = -dma_alloc_coherent (&pdev->dev, -sizeof (struct fsl_qdma_format ) * - queue_size[i], - &queue_temp->bus_addr, -GFP_KERNEL ); +dmam_alloc_coherent (&pdev->dev, +sizeof (struct fsl_qdma_format ) * + queue_size[i], + &queue_temp->bus_addr, +GFP_KERNEL );if (!queue_temp->cq)return NULL ; queue_temp->block_base = fsl_qdma->block_base +
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 6/124 phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq6018
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mantas Pucka <[email protected]>
[ Upstream commit f74c35b630d40d414ca6b53f7b1b468dd4abf478 ]
Commit 2be22aae6b18 ("phy: qcom-qmp-usb: populate offsets configuration") introduced register offsets to the driver but for ipq8074/ipq6018 they do not match what was in the old style device tree. Example from old ipq6018.dtsi:
<0x00078200 0x130>, /* Tx */ <0x00078400 0x200>, /* Rx */ <0x00078800 0x1f8>, /* PCS */ <0x00078600 0x044>; /* PCS misc */
which would translate to:
{.., .pcs = 0x800, .pcs_misc = 0x600, .tx = 0x200, .rx = 0x400 }
but was translated to:
{.., .pcs = 0x600, .tx = 0x200, .rx = 0x400 }
So split usb_offsets and fix USB initialization for IPQ8074 and IPQ6018. Tested only on IPQ6018
--- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp-usb.c +9 -1
@@ -1276,6 +1276,14 @@ static const char * const qmp_phy_vreg_l[] = { "vdda-phy", "vdda-pll", }; +static const struct qmp_usb_offsets qmp_usb_offsets_ipq8074 = { + .serdes =0 , + .pcs =0x800 , + .pcs_misc =0x600 , + .tx =0x200 , + .rx =0x400 , +}; +static const struct qmp_usb_offsets qmp_usb_offsets_ipq9574 = { .serdes =0 , .pcs =0x800 ,
@@ -1320,7 +1328,7 @@ static const struct qmp_usb_offsets qmp_usb_offsets_v5 = {static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = { .lanes =1 , - .offsets = &qmp_usb_offsets_v3, + .offsets = &qmp_usb_offsets_ipq8074, .serdes_tbl = ipq8074_usb3_serdes_tbl, .serdes_tbl_num =ARRAY_SIZE (ipq8074_usb3_serdes_tbl),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 7/124 phy: qcom-qmp-usb: fix serdes init sequence for IPQ6018
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mantas Pucka <[email protected]>
[ Upstream commit 62a5df451ab911421da96655fcc4d1e269ff6e2f ]
Commit 23fd679249df ("phy: qcom-qmp: add USB3 PHY support for IPQ6018") noted that IPQ6018 init is identical to IPQ8074. Yet downstream uses separate serdes init sequence for IPQ6018. Since already existing IPQ9574 serdes init sequence is identical, just reuse it and fix failing USB3 mode in IPQ6018.
--- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp-usb.c +19 -1
@@ -1325,6 +1325,24 @@ static const struct qmp_usb_offsets qmp_usb_offsets_v5 = { .rx = 0x1000, }; +static const struct qmp_phy_cfg ipq6018_usb3phy_cfg = { + .lanes =1 , + + .offsets = &qmp_usb_offsets_ipq8074, + + .serdes_tbl = ipq9574_usb3_serdes_tbl, + .serdes_tbl_num =ARRAY_SIZE (ipq9574_usb3_serdes_tbl), + .tx_tbl = msm8996_usb3_tx_tbl, + .tx_tbl_num =ARRAY_SIZE (msm8996_usb3_tx_tbl), + .rx_tbl = ipq8074_usb3_rx_tbl, + .rx_tbl_num =ARRAY_SIZE (ipq8074_usb3_rx_tbl), + .pcs_tbl = ipq8074_usb3_pcs_tbl, + .pcs_tbl_num =ARRAY_SIZE (ipq8074_usb3_pcs_tbl), + .vreg_list = qmp_phy_vreg_l, + .num_vregs =ARRAY_SIZE (qmp_phy_vreg_l), + .regs = qmp_v3_usb3phy_regs_layout, +}; +static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = { .lanes =1 ,
@@ -2233,7 +2251,7 @@ static int qmp_usb_probe(struct platform_device *pdev)static const struct of_device_id qmp_usb_of_match_table[] = { { .compatible ="qcom,ipq6018-qmp-usb3-phy" , - .data = &ipq8074_usb3phy_cfg, + .data = &ipq6018_usb3phy_cfg, }, { .compatible ="qcom,ipq8074-qmp-usb3-phy" , .data = &ipq8074_usb3phy_cfg,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 8/124 phy: renesas: rcar-gen3-usb2: Fix returning wrong error code
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yoshihiro Shimoda <[email protected]>
[ Upstream commit 249abaf3bf0dd07f5ddebbb2fe2e8f4d675f074e ]
Even if device_create_file() returns error code, rcar_gen3_phy_usb2_probe() will return zero because the "ret" is variable shadowing.
--- drivers/phy/renesas/phy-rcar-gen3-usb2.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/phy/renesas/phy-rcar-gen3-usb2.c +0 -4
@@ -673,8 +673,6 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) channel->irq =platform_get_irq_optional (pdev,0 ); channel->dr_mode =rcar_gen3_get_dr_mode (dev->of_node);if (channel->dr_mode !=USB_DR_MODE_UNKNOWN ) { -int ret; - channel->is_otg_channel = true; channel->uses_otg_pins = !of_property_read_bool (dev->of_node,"renesas,no-otg-pins" );
@@ -738,8 +736,6 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) ret =PTR_ERR (provider); goto error; }else if (channel->is_otg_channel) { -int ret; - ret =device_create_file (dev, &dev_attr_role);if (ret <0 ) goto error;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 9/124 perf tests: Add perf script test
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit bb177a85e82b37d3b76e65f3f773e8502be49d9b ]
Start a new set of shell tests for testing perf script. The initial contribution is checking that some perf db-export functionality works as reported in this regression by Ben Gainey <[email protected]>:
https://lore.kernel.org/lkml/[email protected]/
Stable-dep-of: 2dac1f089add ("perf test: Fix 'perf script' tests on s390")
--- tools/perf/tests/shell/script.sh | 66 ++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100755 tools/perf/tests/shell/script.sh
tools/perf/tests/shell/script.sh new file +66 -0
@@ -0,0 +1,66 @@ +#!/bin/sh +# perf script tests +# SPDX-License-Identifier: GPL-2.0 + +set -e + +temp_dir=$(mktemp -d /tmp/perf-test-script.XXXXXXXXXX) + +perfdatafile="${temp_dir}/perf.data" +db_test="${temp_dir}/db_test.py" + +err=0 + +cleanup() +{ + trap - EXIT TERM INT + sane=$(echo "${temp_dir}" | cut -b 1-21) + if [ "${sane}" = "/tmp/perf-test-script" ] ; then + echo "--- Cleaning up ---" + rm -f "${temp_dir}/"* + rmdir "${temp_dir}" + fi +} + +trap_cleanup() +{ + cleanup + exit 1 +} + +trap trap_cleanup EXIT TERM INT + + +test_db() +{ + echo "DB test" + + # Check if python script is supported + libpython=$(perf version --build-options | grep python | grep -cv OFF) + if [ "${libpython}" != "1" ] ; then + echo "SKIP: python scripting is not supported" + err=2 + return + fi + + cat << "_end_of_file_" > "${db_test}" +perf_db_export_mode = True +perf_db_export_calls = False +perf_db_export_callchains = True + +def sample_table(*args): + print(f'sample_table({args})') + +def call_path_table(*args): + print(f'call_path_table({args}') +_end_of_file_ + perf record -g -o "${perfdatafile}" true + perf script -i "${perfdatafile}" -s "${db_test}" + echo "DB test [Success]" +} + +test_db + +cleanup + +exit $err
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 10/124 perf test: Fix perf script tests on s390
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Richter <[email protected]>
[ Upstream commit 2dac1f089add90a45d93fe8217938281532b86c7 ]
In linux next repo, test case 'perf script tests' fails on s390.
The root case is a command line invocation of 'perf record' with call-graph information. On s390 only DWARF formatted call-graphs are supported and only on software events.
Change the command line parameters for s390.
Output before:
# perf test 89 89: perf script tests : FAILED! #
Output after:
# perf test 89 89: perf script tests : Ok #
--- tools/perf/tests/shell/script.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
tools/perf/tests/shell/script.sh +8 -1
@@ -54,7 +54,14 @@ def sample_table(*args): def call_path_table(*args): print(f'call_path_table({args}') _end_of_file_ - perf record -g -o "${perfdatafile}" true + case $(uname -m) + in s390x) + cmd_flags="--call-graph dwarf -e cpu-clock";; + *) + cmd_flags="-g";; + esac + + perf record $cmd_flags -o "${perfdatafile}" true perf script -i "${perfdatafile}" -s "${db_test}" echo "DB test [Success]" }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 11/124 perf evlist: Fix evlist__new_default() for > 1 core PMU
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit 7814fe24a6211a610db0b408d87420403b5b7a36 ]
The 'Session topology' test currently fails with this message when evlist__new_default() opens more than one event:
32: Session topology :
--- start ---
templ file: /tmp/perf-test-vv5YzZ
Using CPUID 0x00000000410fd070
Opening: unknown-hardware:HG
------------------------------------------------------------
perf_event_attr:
type 0 (PERF_TYPE_HARDWARE)
config 0xb00000000
disabled 1
------------------------------------------------------------
sys_perf_event_open: pid 0 cpu -1 group_fd -1 flags 0x8 = 4
Opening: unknown-hardware:HG
------------------------------------------------------------
perf_event_attr:
type 0 (PERF_TYPE_HARDWARE)
config 0xa00000000
disabled 1
------------------------------------------------------------
sys_perf_event_open: pid 0 cpu -1 group_fd -1 flags 0x8 = 5
non matching sample_type
FAILED tests/topology.c:73 can't get session
---- end ----
Session topology: FAILED!This is because when re-opening the file and parsing the header, Perf expects that any file that has more than one event has the sample ID flag set. Perf record already sets the flag in a similar way when there is more than one event, so add the same logic to evlist__new_default().
evlist__new_default() is only currently used in tests, so I don't expect this change to have any other side effects. The other tests that use it don't save and re-open the file so don't hit this issue.
The session topology test has been failing on Arm big.LITTLE platforms since commit 251aa040244a3b17 ("perf parse-events: Wildcard most "numeric" events") when evlist__new_default() started opening multiple events for 'cycles'.
--- tools/perf/util/evlist.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
tools/perf/util/evlist.c +8 -1
@@ -103,7 +103,14 @@ struct evlist *evlist__new_default(void) err =parse_event (evlist, can_profile_kernel ?"cycles:P" :"cycles:Pu" );if (err) {evlist__delete (evlist); - evlist =NULL ; +return NULL ; + } + +if (evlist->core.nr_entries >1 ) { +struct evsel *evsel; + +evlist__for_each_entry (evlist, evsel) +evsel__set_sample_id (evsel,/*can_sample_identifier=*/ false); }return evlist;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 12/124 dmaengine: fix is_slave_direction() return false when DMA_DEV_TO_DEV
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
[ Upstream commit a22fe1d6dec7e98535b97249fdc95c2be79120bb ]
is_slave_direction() should return true when direction is DMA_DEV_TO_DEV.
--- include/linux/dmaengine.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/dmaengine.h +2 -1
@@ -953,7 +953,8 @@ static inline int dmaengine_slave_config(struct dma_chan *chan,static inline bool is_slave_direction (enum dma_transfer_direction direction) { -return (direction ==DMA_MEM_TO_DEV ) || (direction ==DMA_DEV_TO_MEM ); +return (direction ==DMA_MEM_TO_DEV ) || (direction ==DMA_DEV_TO_MEM ) || + (direction ==DMA_DEV_TO_DEV ); } static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 13/124 phy: ti: phy-omap-usb2: Fix NULL pointer dereference for SRP
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
[ Upstream commit 7104ba0f1958adb250319e68a15eff89ec4fd36d ]
If the external phy working together with phy-omap-usb2 does not implement send_srp(), we may still attempt to call it. This can happen on an idle Ethernet gadget triggering a wakeup for example:
configfs-gadget.g1 gadget.0: ECM Suspend configfs-gadget.g1 gadget.0: Port suspended. Triggering wakeup
...
Unable to handle kernel NULL pointer dereference at virtual address
00000000 when execute
...
PC is at 0x0
LR is at musb_gadget_wakeup+0x1d4/0x254 [musb_hdrc]
...musb_gadget_wakeup [musb_hdrc] from usb_gadget_wakeup+0x1c/0x3c [udc_core] usb_gadget_wakeup [udc_core] from eth_start_xmit+0x3b0/0x3d4 [u_ether] eth_start_xmit [u_ether] from dev_hard_start_xmit+0x94/0x24c dev_hard_start_xmit from sch_direct_xmit+0x104/0x2e4 sch_direct_xmit from __dev_queue_xmit+0x334/0xd88 __dev_queue_xmit from arp_solicit+0xf0/0x268arp_solicit from neigh_probe+0x54/0x7cneigh_probe from __neigh_event_send+0x22c/0x47c __neigh_event_send from neigh_resolve_output+0x14c/0x1c0 neigh_resolve_output from ip_finish_output2+0x1c8/0x628 ip_finish_output2 from ip_send_skb+0x40/0xd8ip_send_skb from udp_send_skb+0x124/0x340udp_send_skb from udp_sendmsg+0x780/0x984udp_sendmsg from __sys_sendto+0xd8/0x158__sys_sendto from ret_fast_syscall+0x0/0x58
Let's fix the issue by checking for send_srp() and set_vbus() before calling them. For USB peripheral only cases these both could be NULL.
--- drivers/phy/ti/phy-omap-usb2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/ti/phy-omap-usb2.c +2 -2
@@ -117,7 +117,7 @@ static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled) {struct omap_usb *phy =phy_to_omapusb (otg->usb_phy); -if (!phy->comparator) +if (!phy->comparator || !phy->comparator->set_vbus)return -ENODEV ;return phy->comparator->set_vbus (phy->comparator, enabled);
@@ -127,7 +127,7 @@ static int omap_usb_start_srp(struct usb_otg *otg) {struct omap_usb *phy =phy_to_omapusb (otg->usb_phy); -if (!phy->comparator) +if (!phy->comparator || !phy->comparator->start_srp)return -ENODEV ;return phy->comparator->start_srp (phy->comparator);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 14/124 cifs: avoid redundant calls to disable multichannel
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shyam Prasad N <[email protected]>
[ Upstream commit e77e15fa5eb1c830597c5ca53ea7af973bae2f78 ]
When the server reports query network interface info call as unsupported following a tree connect, it means that multichannel is unsupported, even if the server capabilities report otherwise.
When this happens, cifs_chan_skip_or_disable is called to disable multichannel on the client. However, we only need to call this when multichannel is currently setup.
--- fs/smb/client/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/smb/client/smb2pdu.c +1 -1
@@ -410,7 +410,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon, rc =SMB3_request_interfaces (xid, tcon, false);free_xid (xid); -if (rc == -EOPNOTSUPP ) { +if (rc == -EOPNOTSUPP && ses->chan_count >1 ) {/* * some servers like Azure SMB server do not advertise * that multichannel has been disabled with server
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 15/124 cifs: failure to add channel on iface should bump up weight
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shyam Prasad N <[email protected]>
[ Upstream commit 6aac002bcfd554aff6d3ebb55e1660d078d70ab0 ]
After the interface selection policy change to do a weighted round robin, each iface maintains a weight_fulfilled. When the weight_fulfilled reaches the total weight for the iface, we know that the weights can be reset and ifaces can be allocated from scratch again.
During channel allocation failures on a particular channel, weight_fulfilled is not incremented. If a few interfaces are inactive, we could end up in a situation where the active interfaces are all allocated for the total_weight, and inactive ones are all that remain. This can cause a situation where no more channels can be allocated further.
This change fixes it by increasing weight_fulfilled, even when channel allocation failure happens. This could mean that if there are temporary failures in channel allocation, the iface weights may not strictly be adhered to. But that's still okay.
--- fs/smb/client/sess.c | 2 ++ 1 file changed, 2 insertions(+)
fs/smb/client/sess.c +2 -0
@@ -269,6 +269,8 @@ int cifs_try_adding_channels(struct cifs_ses *ses) &iface->sockaddr, rc);kref_put (&iface->refcount, release_iface); +/* failure to add chan should increase weight */ + iface->weight_fulfilled++;continue ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 16/124 drm/msms/dp: fixed link clock divider bits be over written in BPC unknown case
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuogee Hsieh <[email protected]>
[ Upstream commit 77e8aad5519e04f6c1e132aaec1c5f8faf41844f ]
Since the value of DP_TEST_BIT_DEPTH_8 is already left shifted, in the BPC unknown case, the additional shift causes spill over to the other bits of the [DP_CONFIGURATION_CTRL] register.
Fix this by changing the return value of dp_link_get_test_bits_depth() in the BPC unknown case to (DP_TEST_BIT_DEPTH_8 >> DP_TEST_BIT_DEPTH_SHIFT).
Patchwork: https://patchwork.freedesktop.org/patch/573989/
--- drivers/gpu/drm/msm/dp/dp_ctrl.c | 5 ----- drivers/gpu/drm/msm/dp/dp_link.c | 10 +++++++--- 2 files changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/dp/dp_ctrl.c +0 -5
@@ -135,11 +135,6 @@ static void dp_ctrl_config_ctrl(struct dp_ctrl_private *ctrl) tbd =dp_link_get_test_bits_depth (ctrl->link, ctrl->panel->dp_mode.bpp); -if (tbd ==DP_TEST_BIT_DEPTH_UNKNOWN ) { -pr_debug ("BIT_DEPTH not set. Configure default\n" ); - tbd =DP_TEST_BIT_DEPTH_8 ; - } - config |= tbd <<DP_CONFIGURATION_CTRL_BPC_SHIFT ;/* Num of Lanes */
drivers/gpu/drm/msm/dp/dp_link.c +7 -3
@@ -1179,6 +1179,9 @@ void dp_link_reset_phy_params_vx_px(struct dp_link *dp_link)u32 dp_link_get_test_bits_depth (struct dp_link *dp_link,u32 bpp) {u32 tbd; +struct dp_link_private *link; + + link = container_of(dp_link, struct dp_link_private, dp_link);/* * Few simplistic rules and assumptions made here:
@@ -1196,12 +1199,13 @@ u32 dp_link_get_test_bits_depth(struct dp_link *dp_link, u32 bpp) tbd =DP_TEST_BIT_DEPTH_10 ;break ;default : - tbd =DP_TEST_BIT_DEPTH_UNKNOWN ; +drm_dbg_dp (link->drm_dev,"bpp=%d not supported, use bpc=8\n" , + bpp); + tbd =DP_TEST_BIT_DEPTH_8 ;break ; } -if (tbd !=DP_TEST_BIT_DEPTH_UNKNOWN ) - tbd = (tbd >>DP_TEST_BIT_DEPTH_SHIFT ); + tbd = (tbd >>DP_TEST_BIT_DEPTH_SHIFT );return tbd; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 17/124 drm/msm/dp: return correct Colorimetry for DP_TEST_DYNAMIC_RANGE_CEA case
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuogee Hsieh <[email protected]>
[ Upstream commit fcccdafd91f8bdde568b86ff70848cf83f029add ]
MSA MISC0 bit 1 to 7 contains Colorimetry Indicator Field. dp_link_get_colorimetry_config() returns wrong colorimetry value in the DP_TEST_DYNAMIC_RANGE_CEA case in the current implementation. Hence fix this problem by having dp_link_get_colorimetry_config() return defined CEA RGB colorimetry value in the case of DP_TEST_DYNAMIC_RANGE_CEA.
Changes in V2:
-- drop retrieving colorimetry from colorspace
-- drop dr = link->dp_link.test_video.test_dyn_range assignment
Changes in V3:
-- move defined MISCr0a Colorimetry vale to dp_reg.h -- rewording commit title
-- rewording commit text to more precise describe this patch
Patchwork: https://patchwork.freedesktop.org/patch/574888/
--- drivers/gpu/drm/msm/dp/dp_link.c | 12 +++++++----- drivers/gpu/drm/msm/dp/dp_reg.h | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/dp/dp_link.c +7 -5
@@ -7,6 +7,7 @@#include <drm/drm_print.h> +#include "dp_reg.h" #include "dp_link.h" #include "dp_panel.h"
@@ -1082,7 +1083,7 @@ int dp_link_process_request(struct dp_link *dp_link)int dp_link_get_colorimetry_config (struct dp_link *dp_link) { -u32 cc; +u32 cc =DP_MISC0_COLORIMERY_CFG_LEGACY_RGB ;struct dp_link_private *link;if (!dp_link) {
@@ -1096,10 +1097,11 @@ int dp_link_get_colorimetry_config(struct dp_link *dp_link)* Unless a video pattern CTS test is ongoing, use RGB_VESA * Only RGB_VESA and RGB_CEA supported for now */ -if (dp_link_is_video_pattern_requested (link)) - cc = link->dp_link.test_video.test_dyn_range; -else - cc =DP_TEST_DYNAMIC_RANGE_VESA ; +if (dp_link_is_video_pattern_requested (link)) { +if (link->dp_link.test_video.test_dyn_range & +DP_TEST_DYNAMIC_RANGE_CEA ) + cc =DP_MISC0_COLORIMERY_CFG_CEA_RGB ; + }return cc; }
drivers/gpu/drm/msm/dp/dp_reg.h +3 -0
@@ -143,6 +143,9 @@#define DP_MISC0_COLORIMETRY_CFG_SHIFT (0x00000001)#define DP_MISC0_TEST_BITS_DEPTH_SHIFT (0x00000005) +#define DP_MISC0_COLORIMERY_CFG_LEGACY_RGB (0) +#define DP_MISC0_COLORIMERY_CFG_CEA_RGB (0x04) +#define REG_DP_VALID_BOUNDARY (0x00000030)#define REG_DP_VALID_BOUNDARY_2 (0x00000034)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 18/124 drm/msm/dpu: check for valid hw_pp in dpu_encoder_helper_phys_cleanup
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abhinav Kumar <[email protected]>
[ Upstream commit 7f3d03c48b1eb6bc45ab20ca98b8b11be25f9f52 ]
The commit 8b45a26f2ba9 ("drm/msm/dpu: reserve cdm blocks for writeback in case of YUV output") introduced a smatch warning about another conditional block in dpu_encoder_helper_phys_cleanup() which had assumed hw_pp will always be valid which may not necessarily be true.
Lets fix the other conditional block by making sure hw_pp is valid before dereferencing it.
Patchwork: https://patchwork.freedesktop.org/patch/574878/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +2 -2
@@ -2075,7 +2075,7 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc) }/* reset the merge 3D HW block */ -if (phys_enc->hw_pp->merge_3d) { +if (phys_enc->hw_pp && phys_enc->hw_pp->merge_3d) { phys_enc->hw_pp->merge_3d->ops.setup_3d_mode (phys_enc->hw_pp->merge_3d,BLEND_3D_NONE );if (phys_enc->hw_ctl->ops.update_pending_flush_merge_3d)
@@ -2097,7 +2097,7 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc)if (phys_enc->hw_wb) intf_cfg.wb = phys_enc->hw_wb->idx; -if (phys_enc->hw_pp->merge_3d) +if (phys_enc->hw_pp && phys_enc->hw_pp->merge_3d) intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->idx;if (ctl->ops.reset_intf_cfg)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 19/124 wifi: iwlwifi: mvm: skip adding debugfs symlink for reconfig
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit 3a3ef3940798e85121066a859127e72a528dc32a ]
The function to add an interface may be called without a previous removal if the HW is being reconfigured. As such, only add the symlink if the hardware is not being reconfigured due to a HW_RESTART.
--- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 ++++-- drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +4 -2
@@ -1586,7 +1586,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,*/ if (vif->type ==NL80211_IFTYPE_AP || vif->type ==NL80211_IFTYPE_ADHOC ) { -iwl_mvm_vif_dbgfs_add_link (mvm, vif); +if (!test_bit (IWL_MVM_STATUS_IN_HW_RESTART , &mvm->status)) +iwl_mvm_vif_dbgfs_add_link (mvm, vif); ret =0 ; goto out; }
@@ -1626,7 +1627,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,iwl_mvm_chandef_get_primary_80 (&vif->bss_conf.chandef); } -iwl_mvm_vif_dbgfs_add_link (mvm, vif); +if (!test_bit (IWL_MVM_STATUS_IN_HW_RESTART , &mvm->status)) +iwl_mvm_vif_dbgfs_add_link (mvm, vif); if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) && vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&
drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +2 -1
@@ -81,7 +81,8 @@ static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw,ieee80211_hw_set (mvm->hw,RX_INCLUDES_FCS ); } -iwl_mvm_vif_dbgfs_add_link (mvm, vif); +if (!test_bit (IWL_MVM_STATUS_IN_HW_RESTART , &mvm->status)) +iwl_mvm_vif_dbgfs_add_link (mvm, vif); if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) && vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 20/124 x86/efistub: Give up if memory attribute protocol returns an error
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
[ Upstream commit a7a6a01f88e87dec4bf2365571dd2dc7403d52d0 ]
The recently introduced EFI memory attributes protocol should be used if it exists to ensure that the memory allocation created for the kernel permits execution. This is needed for compatibility with tightened requirements related to Windows logo certification for x86 PCs.
Currently, we simply strip the execute protect (XP) attribute from the entire range, but this might be rejected under some firmware security policies, and so in a subsequent patch, this will be changed to only strip XP from the executable region that runs early, and make it read-only (RO) as well.
In order to catch any issues early, ensure that the memory attribute protocol works as intended, and give up if it produces spurious errors.
Note that the DXE services based fallback was always based on best effort, so don't propagate any errors returned by that API.
--- drivers/firmware/efi/libstub/x86-stub.c | 24 ++++++++++++++---------- drivers/firmware/efi/libstub/x86-stub.h | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-)
drivers/firmware/efi/libstub/x86-stub.c +14 -10
@@ -223,8 +223,8 @@ static void retrieve_apple_device_properties(struct boot_params *boot_params) } } -void efi_adjust_memory_range_protection (unsigned long start, -unsigned long size) +efi_status_t efi_adjust_memory_range_protection (unsigned long start, +unsigned long size) {efi_status_t status;efi_gcd_memory_space_desc_t desc;
@@ -236,13 +236,17 @@ void efi_adjust_memory_range_protection(unsigned long start, rounded_end =roundup (start + size,EFI_PAGE_SIZE );if (memattr !=NULL ) { -efi_call_proto (memattr, clear_memory_attributes, rounded_start, - rounded_end - rounded_start,EFI_MEMORY_XP ); -return ; + status =efi_call_proto (memattr, clear_memory_attributes, + rounded_start, + rounded_end - rounded_start, +EFI_MEMORY_XP ); +if (status !=EFI_SUCCESS ) +efi_warn ("Failed to clear EFI_MEMORY_XP attribute\n" ); +return status; }if (efi_dxe_table ==NULL ) -return ; +return EFI_SUCCESS ;/* * Don't modify memory region attributes, they are
@@ -255,7 +259,7 @@ void efi_adjust_memory_range_protection(unsigned long start, status =efi_dxe_call (get_memory_space_descriptor, start, &desc);if (status !=EFI_SUCCESS ) -return ; +break ; next = desc.base_address + desc.length;
@@ -280,8 +284,10 @@ void efi_adjust_memory_range_protection(unsigned long start, unprotect_start, unprotect_start + unprotect_size, status); +break ; } } +return EFI_SUCCESS ; }static void setup_unaccepted_memory (void )
@@ -805,9 +811,7 @@ static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry) *kernel_entry = addr + entry; -efi_adjust_memory_range_protection (addr, kernel_total_size); - -return EFI_SUCCESS ; +return efi_adjust_memory_range_protection (addr, kernel_total_size); } static void __noreturn enter_kernel(unsigned long kernel_addr,
drivers/firmware/efi/libstub/x86-stub.h +2 -2
@@ -5,8 +5,8 @@extern void trampoline_32bit_src (void *,bool );extern const u16 trampoline_ljmp_imm_offset; -void efi_adjust_memory_range_protection (unsigned long start, -unsigned long size); +efi_status_t efi_adjust_memory_range_protection (unsigned long start, +unsigned long size);#ifdef CONFIG_X86_64 efi_status_t efi_setup_5level_paging (void );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 21/124 x86/efistub: Avoid placing the kernel below LOAD_PHYSICAL_ADDR
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
[ Upstream commit 2f77465b05b1270c832b5e2ee27037672ad2a10a ]
The EFI stub's kernel placement logic randomizes the physical placement of the kernel by taking all available memory into account, and picking a region at random, based on a random seed.
When KASLR is disabled, this seed is set to 0x0, and this results in the lowest available region of memory to be selected for loading the kernel, even if this is below LOAD_PHYSICAL_ADDR. Some of this memory is typically reserved for the GFP_DMA region, to accommodate masters that can only access the first 16 MiB of system memory.
Even if such devices are rare these days, we may still end up with a warning in the kernel log, as reported by Tom:
swapper/0: page allocation failure: order:10, mode:0xcc1(GFP_KERNEL|GFP_DMA), nodemask=(null),cpuset=/,mems_allowed=0
Fix this by tweaking the random allocation logic to accept a low bound on the placement, and set it to LOAD_PHYSICAL_ADDR.
--- drivers/firmware/efi/libstub/efistub.h | 3 ++- drivers/firmware/efi/libstub/kaslr.c | 2 +- drivers/firmware/efi/libstub/randomalloc.c | 12 +++++++----- drivers/firmware/efi/libstub/x86-stub.c | 1 + drivers/firmware/efi/libstub/zboot.c | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-)
drivers/firmware/efi/libstub/efistub.h +2 -1
@@ -956,7 +956,8 @@ efi_status_t efi_get_random_bytes(unsigned long size, u8 *out);efi_status_t efi_random_alloc (unsigned long size,unsigned long align,unsigned long *addr,unsigned long random_seed, -int memory_type,unsigned long alloc_limit); +int memory_type,unsigned long alloc_min, +unsigned long alloc_max);efi_status_t efi_random_get_seed (void );
drivers/firmware/efi/libstub/kaslr.c +1 -1
@@ -119,7 +119,7 @@ efi_status_t efi_kaslr_relocate_kernel(unsigned long *image_addr,*/ status =efi_random_alloc (*reserve_size, min_kimg_align, reserve_addr, phys_seed, -EFI_LOADER_CODE ,EFI_ALLOC_LIMIT ); +EFI_LOADER_CODE ,0 ,EFI_ALLOC_LIMIT );if (status !=EFI_SUCCESS )efi_warn ("efi_random_alloc() failed: 0x%lx\n" , status); }else {
drivers/firmware/efi/libstub/randomalloc.c +7 -5
@@ -17,7 +17,7 @@static unsigned long get_entry_num_slots (efi_memory_desc_t *md,unsigned long size,unsigned long align_shift, -u64 alloc_limit) +u64 alloc_min,u64 alloc_max) {unsigned long align =1UL << align_shift;u64 first_slot, last_slot, region_end;
@@ -30,11 +30,11 @@ static unsigned long get_entry_num_slots(efi_memory_desc_t *md,return 0 ; region_end =min (md->phys_addr + md->num_pages *EFI_PAGE_SIZE -1 , - alloc_limit); + alloc_max);if (region_end < size)return 0 ; - first_slot =round_up (md->phys_addr, align); + first_slot =round_up (max (md->phys_addr, alloc_min), align); last_slot =round_down (region_end - size +1 , align);if (first_slot > last_slot)
@@ -56,7 +56,8 @@ efi_status_t efi_random_alloc(unsigned long size,unsigned long *addr, unsigned long random_seed, int memory_type, - unsigned long alloc_limit) + unsigned long alloc_min, + unsigned long alloc_max) { unsigned long total_slots = 0, target_slot;unsigned long total_mirrored_slots =0 ;
@@ -78,7 +79,8 @@ efi_status_t efi_random_alloc(unsigned long size,efi_memory_desc_t *md = (void *)map->map + map_offset;unsigned long slots; - slots =get_entry_num_slots (md, size,ilog2 (align), alloc_limit); + slots =get_entry_num_slots (md, size,ilog2 (align), alloc_min, + alloc_max);MD_NUM_SLOTS (md) = slots; total_slots += slots;if (md->attribute &EFI_MEMORY_MORE_RELIABLE )
drivers/firmware/efi/libstub/x86-stub.c +1 -0
@@ -799,6 +799,7 @@ static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry) status =efi_random_alloc (alloc_size,CONFIG_PHYSICAL_ALIGN , &addr, seed[0 ],EFI_LOADER_CODE , +LOAD_PHYSICAL_ADDR ,EFI_X86_KERNEL_ALLOC_LIMIT );if (status !=EFI_SUCCESS )return status;
drivers/firmware/efi/libstub/zboot.c +1 -1
@@ -119,7 +119,7 @@ efi_zboot_entry(efi_handle_t handle, efi_system_table_t *systab) } status =efi_random_alloc (alloc_size, min_kimg_align, &image_base, - seed,EFI_LOADER_CODE ,EFI_ALLOC_LIMIT ); + seed,EFI_LOADER_CODE ,0 ,EFI_ALLOC_LIMIT );if (status !=EFI_SUCCESS ) {efi_err ("Failed to allocate memory\n" ); goto free_cmdline;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 22/124 net: stmmac: xgmac: fix handling of DPP safety error for DMA channels
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Furong Xu <[email protected]>
[ Upstream commit 46eba193d04f8bd717e525eb4110f3c46c12aec3 ]
Commit 56e58d6c8a56 ("net: stmmac: Implement Safety Features in XGMAC core") checks and reports safety errors, but leaves the Data Path Parity Errors for each channel in DMA unhandled at all, lead to a storm of interrupt.
Fix it by checking and clearing the DMA_DPP_Interrupt_Status register.
--- drivers/net/ethernet/stmicro/stmmac/common.h | 1 + .../net/ethernet/stmicro/stmmac/dwxgmac2.h | 3 + .../ethernet/stmicro/stmmac/dwxgmac2_core.c | 57 ++++++++++++++++++- 3 files changed, 60 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/common.h +1 -0
@@ -216,6 +216,7 @@ struct stmmac_safety_stats {unsigned long mac_errors[32 ];unsigned long mtl_errors[32 ];unsigned long dma_errors[32 ]; +unsigned long dma_dpp_errors[32 ]; };/* Number of fields in Safety Stats */
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +3 -0
@@ -319,6 +319,8 @@#define XGMAC_RXCEIE BIT(4)#define XGMAC_TXCEIE BIT(0)#define XGMAC_MTL_ECC_INT_STATUS 0x000010cc +#define XGMAC_MTL_DPP_CONTROL 0x000010e0 +#define XGMAC_DDPP_DISABLE BIT(0)#define XGMAC_MTL_TXQ_OPMODE (x) (0x00001100 + (0x80 * (x)))#define XGMAC_TQS GENMASK(25, 16)#define XGMAC_TQS_SHIFT 16
@@ -401,6 +403,7 @@#define XGMAC_DCEIE BIT(1)#define XGMAC_TCEIE BIT(0)#define XGMAC_DMA_ECC_INT_STATUS 0x0000306c +#define XGMAC_DMA_DPP_INT_STATUS 0x00003074#define XGMAC_DMA_CH_CONTROL (x) (0x00003100 + (0x80 * (x)))#define XGMAC_SPH BIT(24)#define XGMAC_PBLx8 BIT(16)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +56 -1
87 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 23/124 wifi: cfg80211: consume both probe response and beacon IEs
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit f510bcc21ed97911b811c5bf36ed43a0e94ab702 ]
When doing a channel switch, cfg80211_update_known_bss may be called with a BSS where both proberesp_ies and beacon_ies is set. If that happens, both need to be consumed.
Stable-dep-of: 177fbbcb4ed6 ("wifi: cfg80211: detect stuck ECSA element in probe resp")
--- net/wireless/scan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/wireless/scan.c +3 -1
@@ -1746,7 +1746,9 @@ cfg80211_update_known_bss(struct cfg80211_registered_device *rdev, new->pub.proberesp_ies);if (old)kfree_rcu ((struct cfg80211_bss_ies *)old, rcu_head); - }else if (rcu_access_pointer (new->pub.beacon_ies)) { + } + +if (rcu_access_pointer (new->pub.beacon_ies)) {const struct cfg80211_bss_ies *old; if (known->pub.hidden_beacon_bss &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 24/124 wifi: cfg80211: detect stuck ECSA element in probe resp
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 177fbbcb4ed6b306c1626a277fac3fb1c495a4c7 ]
We recently added some validation that we don't try to connect to an AP that is currently in a channel switch process, since that might want the channel to be quiet or we might not be able to connect in time to hear the switching in a beacon. This was in commit c09c4f31998b ("wifi: mac80211: don't connect to an AP while it's in a CSA process").
However, we promptly got a report that this caused new connection failures, and it turns out that the AP that we now cannot connect to is permanently advertising an extended channel switch announcement, even with quiet. The AP in question was an Asus RT-AC53, with firmware 3.0.0.4.380_10760-g21a5898.
As a first step, attempt to detect that we're dealing with such a situation, so mac80211 can use this later.
--- include/net/cfg80211.h | 4 +++ net/wireless/scan.c | 59 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-)
include/net/cfg80211.h +4 -0
@@ -2865,6 +2865,8 @@ struct cfg80211_bss_ies {* own the beacon_ies, but they're just pointers to the ones from the * @hidden_beacon_bss struct) * @proberesp_ies: the information elements from the last Probe Response frame +* @proberesp_ecsa_stuck: ECSA element is stuck in the Probe Response frame, +* cannot rely on it having valid data * @hidden_beacon_bss: in case this BSS struct represents a probe response from * a BSS that hides the SSID in its beacon, this points to the BSS struct * that holds the beacon data. @beacon_ies is still valid, of course, and
@@ -2900,6 +2902,8 @@ struct cfg80211_bss {u8 chains;s8 chain_signal[IEEE80211_MAX_CHAINS ]; + u8 proberesp_ecsa_stuck:1; +u8 bssid_index;u8 max_bssid_indicator;
net/wireless/scan.c +58 -1
72 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 25/124 wifi: mac80211: improve CSA/ECSA connection refusal
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 35e2385dbe787936c793d70755a5177d267a40aa ]
As mentioned in the previous commit, we pretty quickly found that some APs have ECSA elements stuck in their probe response, so using that to not attempt to connect while CSA is happening we never connect to such an AP.
Improve this situation by checking more carefully and ignoring the ECSA if cfg80211 has previously detected the ECSA element being stuck in the probe response.
Additionally, allow connecting to an AP that's switching to a channel it's already using, unless it's using quiet mode. In this case, we may just have to adjust bandwidth later. If it's actually switching channels, it's better not to try to connect in the middle of that.
--- net/mac80211/mlme.c | 103 ++++++++++++++++++++++++++++++++------------ 1 file changed, 76 insertions(+), 27 deletions(-)
net/mac80211/mlme.c +76 -27
@@ -7288,6 +7288,75 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,return err; } +static bool ieee80211_mgd_csa_present (struct ieee80211_sub_if_data *sdata, +const struct cfg80211_bss_ies *ies, +u8 cur_channel,bool ignore_ecsa) +{ +const struct element *csa_elem, *ecsa_elem; +struct ieee80211_channel_sw_ie *csa =NULL ; +struct ieee80211_ext_chansw_ie *ecsa =NULL ; + +if (!ies) +return false; + + csa_elem =cfg80211_find_elem (WLAN_EID_CHANNEL_SWITCH , + ies->data, ies->len); +if (csa_elem && csa_elem->datalen ==sizeof (*csa)) + csa = (void *)csa_elem->data; + + ecsa_elem =cfg80211_find_elem (WLAN_EID_EXT_CHANSWITCH_ANN , + ies->data, ies->len); +if (ecsa_elem && ecsa_elem->datalen ==sizeof (*ecsa)) + ecsa = (void *)ecsa_elem->data; + +if (csa && csa->count ==0 ) + csa =NULL ; +if (csa && !csa->mode && csa->new_ch_num == cur_channel) + csa =NULL ; + +if (ecsa && ecsa->count ==0 ) + ecsa =NULL ; +if (ecsa && !ecsa->mode && ecsa->new_ch_num == cur_channel) + ecsa =NULL ; + +if (ignore_ecsa && ecsa) { +sdata_info (sdata, +"Ignoring ECSA in probe response - was considered stuck!\n" ); +return csa; + } + +return csa || ecsa; +} + +static bool ieee80211_mgd_csa_in_process (struct ieee80211_sub_if_data *sdata, +struct cfg80211_bss *bss) +{ +u8 cur_channel; +bool ret; + + cur_channel =ieee80211_frequency_to_channel (bss->channel->center_freq); + +rcu_read_lock (); +if (ieee80211_mgd_csa_present (sdata, +rcu_dereference (bss->beacon_ies), + cur_channel, false)) { + ret = true; + goto out; + } + +if (ieee80211_mgd_csa_present (sdata, +rcu_dereference (bss->proberesp_ies), + cur_channel, bss->proberesp_ecsa_stuck)) { + ret = true; + goto out; + } + + ret = false; +out: +rcu_read_unlock (); +return ret; +} +/* config hooks */ int ieee80211_mgd_auth (struct ieee80211_sub_if_data *sdata,struct cfg80211_auth_request *req)
@@ -7296,7 +7365,6 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;struct ieee80211_mgd_auth_data *auth_data;struct ieee80211_link_data *link; -const struct element *csa_elem, *ecsa_elem;u16 auth_alg;int err;bool cont_auth;
@@ -7339,21 +7407,10 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,if (ifmgd->assoc_data)return -EBUSY ; -rcu_read_lock (); - csa_elem =ieee80211_bss_get_elem (req->bss,WLAN_EID_CHANNEL_SWITCH ); - ecsa_elem =ieee80211_bss_get_elem (req->bss, -WLAN_EID_EXT_CHANSWITCH_ANN ); -if ((csa_elem && - csa_elem->datalen ==sizeof (struct ieee80211_channel_sw_ie ) && - ((struct ieee80211_channel_sw_ie *)csa_elem->data)->count !=0 ) || - (ecsa_elem && - ecsa_elem->datalen ==sizeof (struct ieee80211_ext_chansw_ie ) && - ((struct ieee80211_ext_chansw_ie *)ecsa_elem->data)->count !=0 )) { -rcu_read_unlock (); +if (ieee80211_mgd_csa_in_process (sdata, req->bss)) {sdata_info (sdata,"AP is in CSA process, reject auth\n" );return -EINVAL ; } -rcu_read_unlock (); auth_data =kzalloc (sizeof (*auth_data) + req->auth_data_len + req->ie_len,GFP_KERNEL );
@@ -7662,7 +7719,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,struct ieee80211_local *local = sdata->local;struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;struct ieee80211_mgd_assoc_data *assoc_data; -const struct element *ssid_elem, *csa_elem, *ecsa_elem; +const struct element *ssid_elem;struct ieee80211_vif_cfg *vif_cfg = &sdata->vif.cfg;ieee80211_conn_flags_t conn_flags =0 ;struct ieee80211_link_data *link;
@@ -7685,23 +7742,15 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, cbss = req->link_id <0 ? req->bss : req->links[req->link_id].bss; -rcu_read_lock (); - ssid_elem =ieee80211_bss_get_elem (cbss,WLAN_EID_SSID ); -if (!ssid_elem || ssid_elem->datalen >sizeof (assoc_data->ssid)) { -rcu_read_unlock (); +if (ieee80211_mgd_csa_in_process (sdata, cbss)) { +sdata_info (sdata,"AP is in CSA process, reject assoc\n" );kfree (assoc_data);return -EINVAL ; } - csa_elem =ieee80211_bss_get_elem (cbss,WLAN_EID_CHANNEL_SWITCH ); - ecsa_elem =ieee80211_bss_get_elem (cbss,WLAN_EID_EXT_CHANSWITCH_ANN ); -if ((csa_elem && - csa_elem->datalen ==sizeof (struct ieee80211_channel_sw_ie ) && - ((struct ieee80211_channel_sw_ie *)csa_elem->data)->count !=0 ) || - (ecsa_elem && - ecsa_elem->datalen ==sizeof (struct ieee80211_ext_chansw_ie ) && - ((struct ieee80211_ext_chansw_ie *)ecsa_elem->data)->count !=0 )) { -sdata_info (sdata,"AP is in CSA process, reject assoc\n" ); +rcu_read_lock (); + ssid_elem =ieee80211_bss_get_elem (cbss,WLAN_EID_SSID ); +if (!ssid_elem || ssid_elem->datalen >sizeof (assoc_data->ssid)) {rcu_read_unlock ();kfree (assoc_data);return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 26/124 wifi: mac80211: fix RCU use in TDLS fast-xmit
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 9480adfe4e0f0319b9da04b44e4eebd5ad07e0cd ]
This looks up the link under RCU protection, but isn't guaranteed to actually have protection. Fix that.
--- net/mac80211/tx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/mac80211/tx.c +4 -3
@@ -3100,10 +3100,11 @@ void ieee80211_check_fast_xmit(struct sta_info *sta)/* DA SA BSSID */ build.da_offs = offsetof(struct ieee80211_hdr , addr1); build.sa_offs = offsetof(struct ieee80211_hdr , addr2); +rcu_read_lock (); link =rcu_dereference (sdata->link[tdls_link_id]); -if (WARN_ON_ONCE (!link)) -break ; -memcpy (hdr->addr3, link->u.mgd.bssid,ETH_ALEN ); +if (!WARN_ON_ONCE (!link)) +memcpy (hdr->addr3, link->u.mgd.bssid,ETH_ALEN ); +rcu_read_unlock (); build.hdr_len =24 ;break ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 27/124 wifi: mac80211: fix unsolicited broadcast probe config
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 178e9d6adc4356c2f1659f575ecea626e7fbd05a ]
There's a bug in ieee80211_set_unsol_bcast_probe_resp(), it tries to return BSS_CHANGED_UNSOL_BCAST_PROBE_RESP (which has the value 1<<31) in an int, which makes it negative and considered an error. Fix this by passing the changed flags to set separately.
--- net/mac80211/cfg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/mac80211/cfg.c +7 -7
@@ -5,7 +5,7 @@* Copyright 2006-2010 Johannes Berg <[email protected]> * Copyright 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH -* Copyright (C) 2018-2022 Intel Corporation +* Copyright (C) 2018-2024 Intel Corporation */ #include <linux/ieee80211.h>
@@ -987,7 +987,8 @@ static int ieee80211_set_unsol_bcast_probe_resp(struct ieee80211_sub_if_data *sdata, struct cfg80211_unsol_bcast_probe_resp *params, struct ieee80211_link_data *link, - struct ieee80211_bss_conf *link_conf) + struct ieee80211_bss_conf *link_conf, + u64 *changed) { struct unsol_bcast_probe_resp_data *new, *old = NULL;
@@ -1011,7 +1012,8 @@ ieee80211_set_unsol_bcast_probe_resp(struct ieee80211_sub_if_data *sdata,RCU_INIT_POINTER (link->u.ap.unsol_bcast_probe_resp,NULL ); } -return BSS_CHANGED_UNSOL_BCAST_PROBE_RESP ; + *changed |=BSS_CHANGED_UNSOL_BCAST_PROBE_RESP ; +return 0 ; } static int ieee80211_set_ftm_responder_params(
@@ -1450,10 +1452,9 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, err =ieee80211_set_unsol_bcast_probe_resp (sdata, ¶ms->unsol_bcast_probe_resp, - link, link_conf); + link, link_conf, &changed);if (err <0 ) goto error; - changed |= err; err =drv_start_ap (sdata->local, sdata, link_conf);if (err) {
@@ -1525,10 +1526,9 @@ static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev, err =ieee80211_set_unsol_bcast_probe_resp (sdata, ¶ms->unsol_bcast_probe_resp, - link, link_conf); + link, link_conf, &changed);if (err <0 )return err; - changed |= err;if (beacon->he_bss_color_valid && beacon->he_bss_color.enabled != link_conf->he_bss_color.enabled) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 28/124 wifi: mac80211: fix waiting for beacons logic
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit a0b4f2291319c5d47ecb196b90400814fdcfd126 ]
This should be waiting if we don't have a beacon yet, but somehow I managed to invert the logic. Fix that.
--- net/mac80211/mlme.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/mac80211/mlme.c +1 -2
@@ -8025,8 +8025,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,rcu_read_lock (); beacon_ies =rcu_dereference (req->bss->beacon_ies); - -if (beacon_ies) { +if (!beacon_ies) {/* * Wait up to one beacon interval ... * should this be more if we miss one?
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 29/124 wifi: iwlwifi: exit eSR only after the FW does
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 16867c38bcd3be2eb9016a3198a096f93959086e ]
Currently the driver exits eSR by calling iwl_mvm_esr_mode_inactive() before updating the FW (by deactivating one of the links), and therefore before sending the EML frame notifying that we are no longer in eSR.
This is wrong for several reasons:
1. The driver sends SMPS activation frames when we are still in eSR and SMPS should be disabled when in eSR
2. The driver restores RLC configuration as it was before eSR entering, and RLC command shouldn't be sent in eSR
Fix this by calling iwl_mvm_esr_mode_inactive() after FW update
--- drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +3 -3
@@ -438,6 +438,9 @@ __iwl_mvm_mld_unassign_vif_chanctx(struct iwl_mvm *mvm, mvmvif->ap_ibss_active = false; } +iwl_mvm_link_changed (mvm, vif, link_conf, +LINK_CONTEXT_MODIFY_ACTIVE , false); +if (iwl_mvm_is_esr_supported (mvm->fwrt.trans) && n_active >1 ) {int ret =iwl_mvm_esr_mode_inactive (mvm, vif);
@@ -449,9 +452,6 @@ __iwl_mvm_mld_unassign_vif_chanctx(struct iwl_mvm *mvm,if (vif->type ==NL80211_IFTYPE_MONITOR )iwl_mvm_mld_rm_snif_sta (mvm, vif); -iwl_mvm_link_changed (mvm, vif, link_conf, -LINK_CONTEXT_MODIFY_ACTIVE , false); -if (switching_chanctx)return ; mvmvif->link[link_id]->phy_ctxt =NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 30/124 wifi: brcmfmac: Adjust n_channels usage for __counted_by
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 5bdda0048c8d1bbe2019513b2d6200cc0d09c7bd ]
After commit e3eac9f32ec0 ("wifi: cfg80211: Annotate struct cfg80211_scan_request with __counted_by"), the compiler may enforce dynamic array indexing of req->channels to stay below n_channels. As a result, n_channels needs to be increased _before_ accessing the newly added array index. Increment it first, then use "i" for the prior index. Solves this warning in the coming GCC that has __counted_by support:
../drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c: In function 'brcmf_internal_escan_add_info':../drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:3783:46: warning: operation on 'req-> n_channels' may be undefined [-Wsequence-point]
3783 | req->channels[req->n_channels++] = chan;
| ~~~~~~~~~~~~~~~^~--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +4 -2
@@ -3779,8 +3779,10 @@ static int brcmf_internal_escan_add_info(struct cfg80211_scan_request *req,if (req->channels[i] == chan)break ; } -if (i == req->n_channels) - req->channels[req->n_channels++] = chan; +if (i == req->n_channels) { + req->n_channels++; + req->channels[i] = chan; + }for (i =0 ; i < req->n_ssids; i++) { if (req->ssids[i].ssid_len == ssid_len &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 31/124 netdevsim: avoid potential loop in nsim_dev_trap_report_work()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit ba5e1272142d051dcc57ca1d3225ad8a089f9858 ]
Many syzbot reports include the following trace [1]
If nsim_dev_trap_report_work() can not grab the mutex, it should rearm itself at least one jiffie later.
[1]
Sending NMI from CPU 1 to CPUs 0:
NMI backtrace for cpu 0
CPU: 0 PID: 32383 Comm: kworker/0:2 Not tainted 6.8.0-rc2-syzkaller-00031-g861c0981648f #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/17/2023 Workqueue: events nsim_dev_trap_report_work RIP: 0010:bytes_is_nonzero mm/kasan/generic.c:89 [inline] RIP: 0010:memory_is_nonzero mm/kasan/generic.c:104 [inline] RIP: 0010:memory_is_poisoned_n mm/kasan/generic.c:129 [inline] RIP: 0010:memory_is_poisoned mm/kasan/generic.c:161 [inline] RIP: 0010:check_region_inline mm/kasan/generic.c:180 [inline] RIP: 0010:kasan_check_range+0x101/0x190 mm/kasan/generic.c:189 Code: 07 49 39 d1 75 0a 45 3a 11 b8 01 00 00 00 7c 0b 44 89 c2 e8 21 ed ff ff 83 f0 01 5b 5d 41 5c c3 48 85 d2 74 4f 48 01 ea eb 09 <48> 83 c0 01 48 39 d0 74 41 80 38 00 74 f2 eb b6 41 bc 08 00 00 00 RSP: 0018:ffffc90012dcf998 EFLAGS: 00000046 RAX: fffffbfff258af1e RBX: fffffbfff258af1f RCX: ffffffff8168eda3 RDX: fffffbfff258af1f RSI: 0000000000000004 RDI: ffffffff92c578f0 RBP: fffffbfff258af1e R08: 0000000000000000 R09: fffffbfff258af1e R10: ffffffff92c578f3 R11: ffffffff8acbcbc0 R12: 0000000000000002 R13: ffff88806db38400 R14: 1ffff920025b9f42 R15: ffffffff92c578e8 FS: 0000000000000000(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000c00994e078 CR3: 000000002c250000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <NMI> </NMI> <TASK> instrument_atomic_read include/linux/instrumented.h:68 [inline] atomic_read include/linux/atomic/atomic-instrumented.h:32 [inline] queued_spin_is_locked include/asm-generic/qspinlock.h:57 [inline] debug_spin_unlock kernel/locking/spinlock_debug.c:101 [inline] do_raw_spin_unlock+0x53/0x230 kernel/locking/spinlock_debug.c:141 __raw_spin_unlock_irqrestore include/linux/spinlock_api_smp.h:150 [inline] _raw_spin_unlock_irqrestore+0x22/0x70 kernel/locking/spinlock.c:194 debug_object_activate+0x349/0x540 lib/debugobjects.c:726 debug_work_activate kernel/workqueue.c:578 [inline] insert_work+0x30/0x230 kernel/workqueue.c:1650 __queue_work+0x62e/0x11d0 kernel/workqueue.c:1802 __queue_delayed_work+0x1bf/0x270 kernel/workqueue.c:1953 queue_delayed_work_on+0x106/0x130 kernel/workqueue.c:1989 queue_delayed_work include/linux/workqueue.h:563 [inline] schedule_delayed_work include/linux/workqueue.h:677 [inline] nsim_dev_trap_report_work+0x9c0/0xc80 drivers/net/netdevsim/dev.c:842 process_one_work+0x886/0x15d0 kernel/workqueue.c:2633 process_scheduled_works kernel/workqueue.c:2706 [inline] worker_thread+0x8b9/0x1290 kernel/workqueue.c:2787 kthread+0x2c6/0x3a0 kernel/kthread.c:388 ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:242 </TASK>
--- drivers/net/netdevsim/dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/netdevsim/dev.c +4 -4
@@ -835,14 +835,14 @@ static void nsim_dev_trap_report_work(struct work_struct *work) trap_report_dw.work); nsim_dev = nsim_trap_data->nsim_dev; -/* For each running port and enabled packet trap, generate a UDP -* packet with a random 5-tuple and report it. -*/ if (!devl_trylock (priv_to_devlink (nsim_dev))) { -schedule_delayed_work (&nsim_dev->trap_data->trap_report_dw,0 ); +schedule_delayed_work (&nsim_dev->trap_data->trap_report_dw,1 );return ; } +/* For each running port and enabled packet trap, generate a UDP +* packet with a random 5-tuple and report it. +*/ list_for_each_entry (nsim_dev_port, &nsim_dev->port_list, list) {if (!netif_running (nsim_dev_port->ns->netdev))continue ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 32/124 net: atlantic: Fix DMA mapping for PTP hwts ring
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Vecera <[email protected]>
[ Upstream commit 2e7d3b67630dfd8f178c41fa2217aa00e79a5887 ]
Function aq_ring_hwts_rx_alloc() maps extra AQ_CFG_RXDS_DEF bytes for PTP HWTS ring but then generic aq_ring_free() does not take this into account.
Create and use a specific function to free HWTS ring to fix this issue.
Trace:
[ 215.351607] ------------[ cut here ]------------ [ 215.351612] DMA-API: atlantic 0000:4b:00.0: device driver frees DMA memory with different size [device address=0x00000000fbdd0000] [map size=34816 bytes] [unmap size=32768 bytes] [ 215.351635] WARNING: CPU: 33 PID: 10759 at kernel/dma/debug.c:988 check_unmap+0xa6f/0x2360 ... [ 215.581176] Call Trace: [ 215.583632] <TASK> [ 215.585745] ? show_trace_log_lvl+0x1c4/0x2df [ 215.590114] ? show_trace_log_lvl+0x1c4/0x2df [ 215.594497] ? debug_dma_free_coherent+0x196/0x210 [ 215.599305] ? check_unmap+0xa6f/0x2360 [ 215.603147] ? __warn+0xca/0x1d0 [ 215.606391] ? check_unmap+0xa6f/0x2360 [ 215.610237] ? report_bug+0x1ef/0x370 [ 215.613921] ? handle_bug+0x3c/0x70 [ 215.617423] ? exc_invalid_op+0x14/0x50 [ 215.621269] ? asm_exc_invalid_op+0x16/0x20 [ 215.625480] ? check_unmap+0xa6f/0x2360 [ 215.629331] ? mark_lock.part.0+0xca/0xa40 [ 215.633445] debug_dma_free_coherent+0x196/0x210 [ 215.638079] ? __pfx_debug_dma_free_coherent+0x10/0x10 [ 215.643242] ? slab_free_freelist_hook+0x11d/0x1d0 [ 215.648060] dma_free_attrs+0x6d/0x130 [ 215.651834] aq_ring_free+0x193/0x290 [atlantic] [ 215.656487] aq_ptp_ring_free+0x67/0x110 [atlantic] ... [ 216.127540] ---[ end trace 6467e5964dd2640b ]--- [ 216.132160] DMA-API: Mapped at: [ 216.132162] debug_dma_alloc_coherent+0x66/0x2f0 [ 216.132165] dma_alloc_attrs+0xf5/0x1b0 [ 216.132168] aq_ring_hwts_rx_alloc+0x150/0x1f0 [atlantic] [ 216.132193] aq_ptp_ring_alloc+0x1bb/0x540 [atlantic] [ 216.132213] aq_nic_init+0x4a1/0x760 [atlantic]
--- drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 4 ++-- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 13 +++++++++++++ drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 1 + 3 files changed, 16 insertions(+), 2 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c +2 -2
@@ -993,7 +993,7 @@ int aq_ptp_ring_alloc(struct aq_nic_s *aq_nic)return 0 ; err_exit_hwts_rx: -aq_ring_free (&aq_ptp->hwts_rx); +aq_ring_hwts_rx_free (&aq_ptp->hwts_rx); err_exit_ptp_rx:aq_ring_free (&aq_ptp->ptp_rx); err_exit_ptp_tx:
@@ -1011,7 +1011,7 @@ void aq_ptp_ring_free(struct aq_nic_s *aq_nic)aq_ring_free (&aq_ptp->ptp_tx);aq_ring_free (&aq_ptp->ptp_rx); -aq_ring_free (&aq_ptp->hwts_rx); +aq_ring_hwts_rx_free (&aq_ptp->hwts_rx);aq_ptp_skb_ring_release (&aq_ptp->skb_ring); }
drivers/net/ethernet/aquantia/atlantic/aq_ring.c +13 -0
@@ -919,6 +919,19 @@ void aq_ring_free(struct aq_ring_s *self) } } +void aq_ring_hwts_rx_free (struct aq_ring_s *self) +{ +if (!self) +return ; + +if (self->dx_ring) { +dma_free_coherent (aq_nic_get_dev (self->aq_nic), + self->size * self->dx_size +AQ_CFG_RXDS_DEF , + self->dx_ring, self->dx_ring_pa); + self->dx_ring =NULL ; + } +} +unsigned int aq_ring_fill_stats_data (struct aq_ring_s *self,u64 *data) {unsigned int count;
drivers/net/ethernet/aquantia/atlantic/aq_ring.h +1 -0
@@ -210,6 +210,7 @@ int aq_ring_rx_fill(struct aq_ring_s *self);int aq_ring_hwts_rx_alloc (struct aq_ring_s *self,struct aq_nic_s *aq_nic,unsigned int idx,unsigned int size,unsigned int dx_size); +void aq_ring_hwts_rx_free (struct aq_ring_s *self);void aq_ring_hwts_rx_clean (struct aq_ring_s *self,struct aq_nic_s *aq_nic);unsigned int aq_ring_fill_stats_data (struct aq_ring_s *self,u64 *data);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 33/124 selftests: net: cut more slack for gro fwd tests.
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit cb9f4a30fb85e1f4f149ada595a67899adb3db19 ]
The udpgro_fwd.sh self-tests are somewhat unstable. There are a few timing constraints the we struggle to meet on very slow environments.
Instead of skipping the whole tests in such envs, increase the test resilience WRT very slow hosts: increase the inter-packets timeouts, avoid resetting the counters every second and finally disable reduce the background traffic noise.
Tested with:
for I in $(seq 1 100); do
./tools/testing/selftests/kselftest_install/run_kselftest.sh \ -t net:udpgro_fwd.sh || exit -1
done
in a slow environment.
--- tools/testing/selftests/net/udpgro_fwd.sh | 14 ++++++++++++-- tools/testing/selftests/net/udpgso_bench_rx.c | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-)
tools/testing/selftests/net/udpgro_fwd.sh +12 -2
@@ -39,6 +39,10 @@ create_ns() { for ns in $NS_SRC $NS_DST; do ip netns add $ns ip -n $ns link set dev lo up + + # disable route solicitations to decrease 'noise' traffic + ip netns exec $ns sysctl -qw net.ipv6.conf.default.router_solicitations=0 + ip netns exec $ns sysctl -qw net.ipv6.conf.all.router_solicitations=0 done ip link add name veth$SRC type veth peer name veth$DST
@@ -80,6 +84,12 @@ create_vxlan_pair() { create_vxlan_endpoint $BASE$ns veth$ns $BM_NET_V6$((3 - $ns)) vxlan6$ns 6 ip -n $BASE$ns addr add dev vxlan6$ns $OL_NET_V6$ns/24 nodad done + + # preload neighbur cache, do avoid some noisy traffic + local addr_dst=$(ip -j -n $BASE$DST link show dev vxlan6$DST |jq -r '.[]["address"]') + local addr_src=$(ip -j -n $BASE$SRC link show dev vxlan6$SRC |jq -r '.[]["address"]') + ip -n $BASE$DST neigh add dev vxlan6$DST lladdr $addr_src $OL_NET_V6$SRC + ip -n $BASE$SRC neigh add dev vxlan6$SRC lladdr $addr_dst $OL_NET_V6$DST } is_ipv6() {
@@ -119,7 +129,7 @@ run_test() { # not enable GRO ip netns exec $NS_DST $ipt -A INPUT -p udp --dport 4789 ip netns exec $NS_DST $ipt -A INPUT -p udp --dport 8000 - ip netns exec $NS_DST ./udpgso_bench_rx -C 1000 -R 10 -n 10 -l 1300 $rx_args & + ip netns exec $NS_DST ./udpgso_bench_rx -C 2000 -R 100 -n 10 -l 1300 $rx_args & local spid=$! wait_local_port_listen "$NS_DST" 8000 udp ip netns exec $NS_SRC ./udpgso_bench_tx $family -M 1 -s 13000 -S 1300 -D $dst
@@ -168,7 +178,7 @@ run_bench() { # bind the sender and the receiver to different CPUs to try # get reproducible results ip netns exec $NS_DST bash -c "echo 2 > /sys/class/net/veth$DST/queues/rx-0/rps_cpus" - ip netns exec $NS_DST taskset 0x2 ./udpgso_bench_rx -C 1000 -R 10 & + ip netns exec $NS_DST taskset 0x2 ./udpgso_bench_rx -C 2000 -R 100 & local spid=$! wait_local_port_listen "$NS_DST" 8000 udp ip netns exec $NS_SRC taskset 0x1 ./udpgso_bench_tx $family -l 3 -S 1300 -D $dst
tools/testing/selftests/net/udpgso_bench_rx.c +1 -1
@@ -375,7 +375,7 @@ static void do_recv(void)do_flush_udp (fd); tnow =gettimeofday_ms (); -if (tnow > treport) { +if (!cfg_expected_pkt_nr && tnow > treport) {if (packets) fprintf(stderr, "%s rx: %6lu MB/s %8lu calls/s\n",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 34/124 selftests/net: convert unicast_extensions.sh to run it in unique namespace
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 0f4765d0b48d90ede9788c7edb2e072eee20f88e ]
Here is the test result after conversion.
# ./unicast_extensions.sh /usr/bin/which: no nettest in (/root/.local/bin:/root/bin:/usr/share/Modules/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin) ########################################################################### Unicast address extensions tests (behavior of reserved IPv4 addresses) ########################################################################### TEST: assign and ping within 240/4 (1 of 2) (is allowed) [ OK ] TEST: assign and ping within 240/4 (2 of 2) (is allowed) [ OK ] TEST: assign and ping within 0/8 (1 of 2) (is allowed) [ OK ]
...
TEST: assign and ping class D address (is forbidden) [ OK ] TEST: routing using class D (is forbidden) [ OK ] TEST: routing using 127/8 (is forbidden) [ OK ]
Stable-dep-of: e71e016ad0f6 ("selftests: net: fix tcp listener handling in pmtu.sh")
--- .../selftests/net/unicast_extensions.sh | 99 +++++++++---------- 1 file changed, 46 insertions(+), 53 deletions(-)
tools/testing/selftests/net/unicast_extensions.sh +46 -53
@@ -28,8 +28,7 @@ # These tests provide an easy way to flip the expected result of any # of these behaviors for testing kernel patches that change them. -# Kselftest framework requirement - SKIP code is 4. -ksft_skip=4 +source ./lib.sh # nettest can be run from PATH or from same directory as this selftest if ! which nettest >/dev/null; then
@@ -61,20 +60,20 @@ _do_segmenttest(){ # foo --- bar # Arguments: ip_a ip_b prefix_length test_description # - # Caller must set up foo-ns and bar-ns namespaces + # Caller must set up $foo_ns and $bar_ns namespaces # containing linked veth devices foo and bar, # respectively. - ip -n foo-ns address add $1/$3 dev foo || return 1 - ip -n foo-ns link set foo up || return 1 - ip -n bar-ns address add $2/$3 dev bar || return 1 - ip -n bar-ns link set bar up || return 1 + ip -n $foo_ns address add $1/$3 dev foo || return 1 + ip -n $foo_ns link set foo up || return 1 + ip -n $bar_ns address add $2/$3 dev bar || return 1 + ip -n $bar_ns link set bar up || return 1 - ip netns exec foo-ns timeout 2 ping -c 1 $2 || return 1 - ip netns exec bar-ns timeout 2 ping -c 1 $1 || return 1 + ip netns exec $foo_ns timeout 2 ping -c 1 $2 || return 1 + ip netns exec $bar_ns timeout 2 ping -c 1 $1 || return 1 - nettest -B -N bar-ns -O foo-ns -r $1 || return 1 - nettest -B -N foo-ns -O bar-ns -r $2 || return 1 + nettest -B -N $bar_ns -O $foo_ns -r $1 || return 1 + nettest -B -N $foo_ns -O $bar_ns -r $2 || return 1 return 0 }
@@ -88,31 +87,31 @@ _do_route_test(){ # Arguments: foo_ip foo1_ip bar1_ip bar_ip prefix_len test_description # Displays test result and returns success or failure. - # Caller must set up foo-ns, bar-ns, and router-ns + # Caller must set up $foo_ns, $bar_ns, and $router_ns # containing linked veth devices foo-foo1, bar1-bar - # (foo in foo-ns, foo1 and bar1 in router-ns, and - # bar in bar-ns). - - ip -n foo-ns address add $1/$5 dev foo || return 1 - ip -n foo-ns link set foo up || return 1 - ip -n foo-ns route add default via $2 || return 1 - ip -n bar-ns address add $4/$5 dev bar || return 1 - ip -n bar-ns link set bar up || return 1 - ip -n bar-ns route add default via $3 || return 1 - ip -n router-ns address add $2/$5 dev foo1 || return 1 - ip -n router-ns link set foo1 up || return 1 - ip -n router-ns address add $3/$5 dev bar1 || return 1 - ip -n router-ns link set bar1 up || return 1 - - echo 1 | ip netns exec router-ns tee /proc/sys/net/ipv4/ip_forward - - ip netns exec foo-ns timeout 2 ping -c 1 $2 || return 1 - ip netns exec foo-ns timeout 2 ping -c 1 $4 || return 1 - ip netns exec bar-ns timeout 2 ping -c 1 $3 || return 1 - ip netns exec bar-ns timeout 2 ping -c 1 $1 || return 1 - - nettest -B -N bar-ns -O foo-ns -r $1 || return 1 - nettest -B -N foo-ns -O bar-ns -r $4 || return 1 + # (foo in $foo_ns, foo1 and bar1 in $router_ns, and + # bar in $bar_ns). + + ip -n $foo_ns address add $1/$5 dev foo || return 1 + ip -n $foo_ns link set foo up || return 1 + ip -n $foo_ns route add default via $2 || return 1 + ip -n $bar_ns address add $4/$5 dev bar || return 1 + ip -n $bar_ns link set bar up || return 1 + ip -n $bar_ns route add default via $3 || return 1 + ip -n $router_ns address add $2/$5 dev foo1 || return 1 + ip -n $router_ns link set foo1 up || return 1 + ip -n $router_ns address add $3/$5 dev bar1 || return 1 + ip -n $router_ns link set bar1 up || return 1 + + echo 1 | ip netns exec $router_ns tee /proc/sys/net/ipv4/ip_forward + + ip netns exec $foo_ns timeout 2 ping -c 1 $2 || return 1 + ip netns exec $foo_ns timeout 2 ping -c 1 $4 || return 1 + ip netns exec $bar_ns timeout 2 ping -c 1 $3 || return 1 + ip netns exec $bar_ns timeout 2 ping -c 1 $1 || return 1 + + nettest -B -N $bar_ns -O $foo_ns -r $1 || return 1 + nettest -B -N $foo_ns -O $bar_ns -r $4 || return 1 return 0 }
@@ -121,17 +120,15 @@ segmenttest(){ # Sets up veth link and tries to connect over it. # Arguments: ip_a ip_b prefix_len test_description hide_output - ip netns add foo-ns - ip netns add bar-ns - ip link add foo netns foo-ns type veth peer name bar netns bar-ns + setup_ns foo_ns bar_ns + ip link add foo netns $foo_ns type veth peer name bar netns $bar_ns test_result=0 _do_segmenttest "$@" || test_result=1 - ip netns pids foo-ns | xargs -r kill -9 - ip netns pids bar-ns | xargs -r kill -9 - ip netns del foo-ns - ip netns del bar-ns + ip netns pids $foo_ns | xargs -r kill -9 + ip netns pids $bar_ns | xargs -r kill -9 + cleanup_ns $foo_ns $bar_ns show_output # inverted tests will expect failure instead of success
@@ -147,21 +144,17 @@ route_test(){ # Returns success or failure. hide_output - ip netns add foo-ns - ip netns add bar-ns - ip netns add router-ns - ip link add foo netns foo-ns type veth peer name foo1 netns router-ns - ip link add bar netns bar-ns type veth peer name bar1 netns router-ns + setup_ns foo_ns bar_ns router_ns + ip link add foo netns $foo_ns type veth peer name foo1 netns $router_ns + ip link add bar netns $bar_ns type veth peer name bar1 netns $router_ns test_result=0 _do_route_test "$@" || test_result=1 - ip netns pids foo-ns | xargs -r kill -9 - ip netns pids bar-ns | xargs -r kill -9 - ip netns pids router-ns | xargs -r kill -9 - ip netns del foo-ns - ip netns del bar-ns - ip netns del router-ns + ip netns pids $foo_ns | xargs -r kill -9 + ip netns pids $bar_ns | xargs -r kill -9 + ip netns pids $router_ns | xargs -r kill -9 + cleanup_ns $foo_ns $bar_ns $router_ns show_output
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 35/124 selftests/net: convert pmtu.sh to run it in unique namespace
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 378f082eaf3760cd7430fbcb1e4f8626bb6bc0ae ]
pmtu test use /bin/sh, so we need to source ./lib.sh instead of lib.sh Here is the test result after conversion.
# ./pmtu.sh TEST: ipv4: PMTU exceptions [ OK ] TEST: ipv4: PMTU exceptions - nexthop objects [ OK ] TEST: ipv6: PMTU exceptions [ OK ] TEST: ipv6: PMTU exceptions - nexthop objects [ OK ] ... TEST: ipv4: list and flush cached exceptions - nexthop objects [ OK ] TEST: ipv6: list and flush cached exceptions [ OK ] TEST: ipv6: list and flush cached exceptions - nexthop objects [ OK ] TEST: ipv4: PMTU exception w/route replace [ OK ] TEST: ipv4: PMTU exception w/route replace - nexthop objects [ OK ] TEST: ipv6: PMTU exception w/route replace [ OK ] TEST: ipv6: PMTU exception w/route replace - nexthop objects [ OK ]
Stable-dep-of: e71e016ad0f6 ("selftests: net: fix tcp listener handling in pmtu.sh")
--- tools/testing/selftests/net/pmtu.sh | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-)
tools/testing/selftests/net/pmtu.sh +9 -18
@@ -198,8 +198,7 @@ # - pmtu_ipv6_route_change # Same as above but with IPv6 -# Kselftest framework requirement - SKIP code is 4. -ksft_skip=4 +source ./lib.sh PAUSE_ON_FAIL=no VERBOSE=0
@@ -268,16 +267,6 @@ tests=" pmtu_ipv4_route_change ipv4: PMTU exception w/route replace 1 pmtu_ipv6_route_change ipv6: PMTU exception w/route replace 1" -NS_A="ns-A" -NS_B="ns-B" -NS_C="ns-C" -NS_R1="ns-R1" -NS_R2="ns-R2" -ns_a="ip netns exec ${NS_A}" -ns_b="ip netns exec ${NS_B}" -ns_c="ip netns exec ${NS_C}" -ns_r1="ip netns exec ${NS_R1}" -ns_r2="ip netns exec ${NS_R2}" # Addressing and routing for tests with routers: four network segments, with # index SEGMENT between 1 and 4, a common prefix (PREFIX4 or PREFIX6) and an # identifier ID, which is 1 for hosts (A and B), 2 for routers (R1 and R2).
@@ -543,13 +532,17 @@ setup_ip6ip6() { } setup_namespaces() { + setup_ns NS_A NS_B NS_C NS_R1 NS_R2 for n in ${NS_A} ${NS_B} ${NS_C} ${NS_R1} ${NS_R2}; do - ip netns add ${n} || return 1 - # Disable DAD, so that we don't have to wait to use the # configured IPv6 addresses ip netns exec ${n} sysctl -q net/ipv6/conf/default/accept_dad=0 done + ns_a="ip netns exec ${NS_A}" + ns_b="ip netns exec ${NS_B}" + ns_c="ip netns exec ${NS_C}" + ns_r1="ip netns exec ${NS_R1}" + ns_r2="ip netns exec ${NS_R2}" } setup_veth() {
@@ -839,7 +832,7 @@ setup_bridge() { run_cmd ${ns_a} ip link set br0 up run_cmd ${ns_c} ip link add veth_C-A type veth peer name veth_A-C - run_cmd ${ns_c} ip link set veth_A-C netns ns-A + run_cmd ${ns_c} ip link set veth_A-C netns ${NS_A} run_cmd ${ns_a} ip link set veth_A-C up run_cmd ${ns_c} ip link set veth_C-A up
@@ -944,9 +937,7 @@ cleanup() { done socat_pids= - for n in ${NS_A} ${NS_B} ${NS_C} ${NS_R1} ${NS_R2}; do - ip netns del ${n} 2> /dev/null - done + cleanup_all_ns ip link del veth_A-C 2>/dev/null ip link del veth_A-R1 2>/dev/null
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 36/124 selftests/net: change shebang to bash to support "source"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yujie Liu <[email protected]>
[ Upstream commit 05d92cb0e919239c29b3a26da1f76f1e18fed7d3 ]
The patch set [1] added a general lib.sh in net selftests, and converted several test scripts to source the lib.sh.
unicast_extensions.sh (converted in [1]) and pmtu.sh (converted in [2]) have a /bin/sh shebang which may point to various shells in different distributions, but "source" is only available in some of them. For example, "source" is a built-it function in bash, but it cannot be used in dash.
Refer to other scripts that were converted together, simply change the shebang to bash to fix the following issues when the default /bin/sh points to other shells.
not ok 51 selftests: net: unicast_extensions.sh # exit=1
v1 -> v2:
- Fix pmtu.sh which has the same issue as unicast_extensions.sh, suggested by Hangbin
- Change the style of the "source" line to be consistent with other tests, suggested by Hangbin
Stable-dep-of: e71e016ad0f6 ("selftests: net: fix tcp listener handling in pmtu.sh")
--- tools/testing/selftests/net/pmtu.sh | 4 ++-- tools/testing/selftests/net/unicast_extensions.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/net/pmtu.sh +2 -2
@@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # SPDX-License-Identifier: GPL-2.0 # # Check that route PMTU values match expectations, and that initial device MTU
@@ -198,7 +198,7 @@ # - pmtu_ipv6_route_change # Same as above but with IPv6 -source ./lib.sh +source lib.sh PAUSE_ON_FAIL=no VERBOSE=0
tools/testing/selftests/net/unicast_extensions.sh +2 -2
@@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # SPDX-License-Identifier: GPL-2.0 # # By Seth Schoen (c) 2021, for the IPv4 Unicast Extensions Project
@@ -28,7 +28,7 @@ # These tests provide an easy way to flip the expected result of any # of these behaviors for testing kernel patches that change them. -source ./lib.sh +source lib.sh # nettest can be run from PATH or from same directory as this selftest if ! which nettest >/dev/null; then
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 37/124 selftests: net: fix tcp listener handling in pmtu.sh
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit e71e016ad0f6e641a7898b8cda5f62f8e2beb2f1 ]
The pmtu.sh test uses a few TCP listener in a problematic way:
It hard-codes a constant timeout to wait for the listener starting-up in background. That introduces unneeded latency and on very slow and busy host it can fail.
Additionally the test starts again the same listener in the same namespace on the same port, just after the previous connection completed. Fast host can attempt starting the new server before the old one really closed the socket.
Address the issues using the wait_local_port_listen helper and explicitly waiting for the background listener process exit.
--- tools/testing/selftests/net/pmtu.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/net/pmtu.sh +4 -1
@@ -199,6 +199,7 @@ # Same as above but with IPv6 source lib.sh +source net_helper.sh PAUSE_ON_FAIL=no VERBOSE=0
@@ -1336,13 +1337,15 @@ test_pmtu_ipvX_over_bridged_vxlanY_or_geneveY_exception() { TCPDST="TCP:[${dst}]:50000" fi ${ns_b} socat -T 3 -u -6 TCP-LISTEN:50000 STDOUT > $tmpoutfile & + local socat_pid=$! - sleep 1 + wait_local_port_listen ${NS_B} 50000 tcp dd if=/dev/zero status=none bs=1M count=1 | ${target} socat -T 3 -u STDIN $TCPDST,connect-timeout=3 size=$(du -sb $tmpoutfile) size=${size%%/tmp/*} + wait ${socat_pid} [ $size -ne 1048576 ] && err "File size $size mismatches exepcted value in locally bridged vxlan test" && return 1 done
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 38/124 selftests: net: avoid just another constant wait
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit 691bb4e49c98a47bc643dd808453136ce78b15b4 ]
Using hard-coded constant timeout to wait for some expected event is deemed to fail sooner or later, especially in slow env.
Our CI has spotted another of such race:
# TEST: ipv6: cleanup of cached exceptions - nexthop objects [FAIL]
# can't delete veth device in a timely manner, PMTU dst likely leaked
Replace the crude sleep with a loop looking for the expected condition at low interval for a much longer range.
--- tools/testing/selftests/net/pmtu.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
tools/testing/selftests/net/pmtu.sh +13 -5
@@ -1957,6 +1957,13 @@ check_command() { return 0 } +check_running() { + pid=${1} + cmd=${2} + + [ "$(cat /proc/${pid}/cmdline 2>/dev/null | tr -d '\0')" = "{cmd}" ] +} + test_cleanup_vxlanX_exception() { outer="${1}" encap="vxlan"
@@ -1987,11 +1994,12 @@ test_cleanup_vxlanX_exception() { ${ns_a} ip link del dev veth_A-R1 & iplink_pid=$! - sleep 1 - if [ "$(cat /proc/${iplink_pid}/cmdline 2>/dev/null | tr -d '\0')" = "iplinkdeldevveth_A-R1" ]; then - err " can't delete veth device in a timely manner, PMTU dst likely leaked" - return 1 - fi + for i in $(seq 1 20); do + check_running ${iplink_pid} "iplinkdeldevveth_A-R1" || return 0 + sleep 0.1 + done + err " can't delete veth device in a timely manner, PMTU dst likely leaked" + return 1 } test_cleanup_ipv6_exception() {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 39/124 tsnep: Fix mapping for zero copy XDP_TX action
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gerhard Engleder <[email protected]>
[ Upstream commit d7f5fb33cf77247b7bf9a871aaeea72ca4f51ad7 ]
For XDP_TX action xdp_buff is converted to xdp_frame. The conversion is done by xdp_convert_buff_to_frame(). The memory type of the resulting xdp_frame depends on the memory type of the xdp_buff. For page pool based xdp_buff it produces xdp_frame with memory type MEM_TYPE_PAGE_POOL. For zero copy XSK pool based xdp_buff it produces xdp_frame with memory type MEM_TYPE_PAGE_ORDER0.
tsnep_xdp_xmit_back() is not prepared for that and uses always the page pool buffer type TSNEP_TX_TYPE_XDP_TX. This leads to invalid mappings and the transmission of undefined data.
Improve tsnep_xdp_xmit_back() to use the generic buffer type TSNEP_TX_TYPE_XDP_NDO for zero copy XDP_TX.
--- drivers/net/ethernet/engleder/tsnep_main.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/ethernet/engleder/tsnep_main.c +12 -4
@@ -719,17 +719,25 @@ static void tsnep_xdp_xmit_flush(struct tsnep_tx *tx)static bool tsnep_xdp_xmit_back (struct tsnep_adapter *adapter,struct xdp_buff *xdp, -struct netdev_queue *tx_nq,struct tsnep_tx *tx) +struct netdev_queue *tx_nq,struct tsnep_tx *tx, +bool zc) {struct xdp_frame *xdpf =xdp_convert_buff_to_frame (xdp);bool xmit; +u32 type;if (unlikely (!xdpf))return false; +/* no page pool for zero copy */ +if (zc) + type =TSNEP_TX_TYPE_XDP_NDO ; +else + type =TSNEP_TX_TYPE_XDP_TX ; +__netif_tx_lock (tx_nq,smp_processor_id ()); - xmit =tsnep_xdp_xmit_frame_ring (xdpf, tx,TSNEP_TX_TYPE_XDP_TX ); + xmit =tsnep_xdp_xmit_frame_ring (xdpf, tx, type);/* Avoid transmit queue timeout since we share it with the slow path */ if (xmit)
@@ -1273,7 +1281,7 @@ static bool tsnep_xdp_run_prog(struct tsnep_rx *rx, struct bpf_prog *prog,case XDP_PASS :return false;case XDP_TX : -if (!tsnep_xdp_xmit_back (rx->adapter, xdp, tx_nq, tx)) +if (!tsnep_xdp_xmit_back (rx->adapter, xdp, tx_nq, tx, false)) goto out_failure; *status |=TSNEP_XDP_TX ;return true;
@@ -1323,7 +1331,7 @@ static bool tsnep_xdp_run_prog_zc(struct tsnep_rx *rx, struct bpf_prog *prog,case XDP_PASS :return false;case XDP_TX : -if (!tsnep_xdp_xmit_back (rx->adapter, xdp, tx_nq, tx)) +if (!tsnep_xdp_xmit_back (rx->adapter, xdp, tx_nq, tx, true)) goto out_failure; *status |=TSNEP_XDP_TX ;return true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 40/124 tunnels: fix out of bounds access when building IPv6 PMTU error
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antoine Tenart <[email protected]>
[ Upstream commit d75abeec401f8c86b470e7028a13fcdc87e5dd06 ]
If the ICMPv6 error is built from a non-linear skb we get the following splat,
BUG: KASAN: slab-out-of-bounds in do_csum+0x220/0x240 Read of size 4 at addr ffff88811d402c80 by task netperf/820 CPU: 0 PID: 820 Comm: netperf Not tainted 6.8.0-rc1+ #543 ... kasan_report+0xd8/0x110 do_csum+0x220/0x240 csum_partial+0xc/0x20 skb_tunnel_check_pmtu+0xeb9/0x3280 vxlan_xmit_one+0x14c2/0x4080 vxlan_xmit+0xf61/0x5c00 dev_hard_start_xmit+0xfb/0x510 __dev_queue_xmit+0x7cd/0x32a0 br_dev_queue_push_xmit+0x39d/0x6a0
Use skb_checksum instead of csum_partial who cannot deal with non-linear SKBs.
--- net/ipv4/ip_tunnel_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/ip_tunnel_core.c +1 -1
@@ -332,7 +332,7 @@ static int iptunnel_pmtud_build_icmpv6(struct sk_buff *skb, int mtu) };skb_reset_network_header (skb); - csum =csum_partial (icmp6h, len,0 ); + csum =skb_checksum (skb,skb_transport_offset (skb), len,0 ); icmp6h->icmp6_cksum =csum_ipv6_magic (&nip6h->saddr, &nip6h->daddr, len,IPPROTO_ICMPV6 , csum);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 41/124 atm: idt77252: fix a memleak in open_card_ubr0
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit f3616173bf9be9bf39d131b120d6eea4e6324cb5 ]
When alloc_scq fails, card->vcs[0] (i.e. vc) should be freed. Otherwise, in the following call chain:
idt77252_init_one
|-> idt77252_dev_open
|-> open_card_ubr0
|-> alloc_scq [failed]
|-> deinit_card
|-> vfree(card->vcs);card->vcs is freed and card->vcs[0] is leaked.
--- drivers/atm/idt77252.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/atm/idt77252.c +2 -0
@@ -2930,6 +2930,8 @@ open_card_ubr0(struct idt77252_dev *card) vc->scq =alloc_scq (card, vc->class);if (!vc->scq) {printk ("%s: can't get SCQ.\n" , card->name); +kfree (card->vcs[0 ]); + card->vcs[0 ] =NULL ;return -ENOMEM ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 42/124 octeontx2-pf: Fix a memleak otx2_sq_init
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit b09b58e31b0f43d76f79b9943da3fb7c2843dcbb ]
When qmem_alloc and pfvf->hw_ops->sq_aq_init fails, sq->sg should be freed to prevent memleak.
--- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +12 -2
@@ -951,8 +951,11 @@ int otx2_sq_init(struct otx2_nic *pfvf, u16 qidx, u16 sqb_aura)if (pfvf->ptp && qidx < pfvf->hw.tx_queues) { err =qmem_alloc (pfvf->dev, &sq->timestamps, qset->sqe_cnt,sizeof (*sq->timestamps)); -if (err) +if (err) { +kfree (sq->sg); + sq->sg =NULL ;return err; + } } sq->head =0 ;
@@ -968,7 +971,14 @@ int otx2_sq_init(struct otx2_nic *pfvf, u16 qidx, u16 sqb_aura) sq->stats.bytes =0 ; sq->stats.pkts =0 ; -return pfvf->hw_ops->sq_aq_init (pfvf, qidx, sqb_aura); + err = pfvf->hw_ops->sq_aq_init (pfvf, qidx, sqb_aura); +if (err) { +kfree (sq->sg); + sq->sg =NULL ; +return err; + } + +return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 43/124 hwmon: (aspeed-pwm-tacho) mutex for tach reading
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Loic Prylli <[email protected]>
[ Upstream commit 1168491e7f53581ba7b6014a39a49cfbbb722feb ]
the ASPEED_PTCR_RESULT Register can only hold the result for a single fan input. Adding a mutex to protect the register until the reading is done.
--- drivers/hwmon/aspeed-pwm-tacho.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/hwmon/aspeed-pwm-tacho.c +7 -0
@@ -193,6 +193,8 @@ struct aspeed_pwm_tacho_data {u8 fan_tach_ch_source[16 ];struct aspeed_cooling_device *cdev[8 ];const struct attribute_group *groups[3 ]; +/* protects access to shared ASPEED_PTCR_RESULT */ +struct mutex tach_lock; };enum type {TYPEM ,TYPEN ,TYPEO };
@@ -527,6 +529,8 @@ static int aspeed_get_fan_tach_ch_rpm(struct aspeed_pwm_tacho_data *priv,u8 fan_tach_ch_source, type, mode, both;int ret; +mutex_lock (&priv->tach_lock); +regmap_write (priv->regmap,ASPEED_PTCR_TRIGGER ,0 );regmap_write (priv->regmap,ASPEED_PTCR_TRIGGER ,0x1 << fan_tach_ch);
@@ -544,6 +548,8 @@ static int aspeed_get_fan_tach_ch_rpm(struct aspeed_pwm_tacho_data *priv,ASPEED_RPM_STATUS_SLEEP_USEC , usec); +mutex_unlock (&priv->tach_lock); +/* return -ETIMEDOUT if we didn't get an answer. */ if (ret)return ret;
@@ -903,6 +909,7 @@ static int aspeed_pwm_tacho_probe(struct platform_device *pdev) priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL );if (!priv)return -ENOMEM ; +mutex_init (&priv->tach_lock); priv->regmap =devm_regmap_init (dev,NULL , (__force void *)regs, &aspeed_pwm_tacho_regmap_config);if (IS_ERR (priv->regmap))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 44/124 hwmon: (coretemp) Fix out-of-bounds memory access
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Rui <[email protected]>
[ Upstream commit 4e440abc894585a34c2904a32cd54af1742311b3 ]
Fix a bug that pdata->cpu_map[] is set before out-of-bounds check. The problem might be triggered on systems with more than 128 cores per package.
Stable-dep-of: fdaf0c8629d4 ("hwmon: (coretemp) Fix bogus core_id to attr name mapping")
--- drivers/hwmon/coretemp.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/hwmon/coretemp.c +2 -6
@@ -509,18 +509,14 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu,if (pkg_flag) { attr_no =PKG_SYSFS_ATTR_NO ; }else { - index =ida_alloc (&pdata->ida,GFP_KERNEL ); + index =ida_alloc_max (&pdata->ida,NUM_REAL_CORES -1 ,GFP_KERNEL );if (index <0 )return index; + pdata->cpu_map[index] =topology_core_id (cpu); attr_no = index +BASE_SYSFS_ATTR_NO ; } -if (attr_no >MAX_CORE_DATA -1 ) { - err = -ERANGE ; - goto ida_free; - } - tdata =init_temp_data (cpu, pkg_flag);if (!tdata) { err = -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 45/124 hwmon: (coretemp) Fix bogus core_id to attr name mapping
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Rui <[email protected]>
[ Upstream commit fdaf0c8629d4524a168cb9e4ad4231875749b28c ]
Before commit 7108b80a542b ("hwmon/coretemp: Handle large core ID value"), there is a fixed mapping between
1. cpu_core_id
2. the index in pdata->core_data[] array
3. the sysfs attr name, aka "tempX_"
The later two always equal cpu_core_id + 2.
After the commit, pdata->core_data[] index is got from ida so that it can handle sparse core ids and support more cores within a package.
However, the commit erroneously maps the sysfs attr name to pdata->core_data[] index instead of cpu_core_id + 2.
As a result, the code is not aligned with the comments, and brings user visible changes in hwmon sysfs on systems with sparse core id.
For example, before commit 7108b80a542b ("hwmon/coretemp: Handle large core ID value"),
/sys/class/hwmon/hwmon2/temp2_label:Core 0 /sys/class/hwmon/hwmon2/temp3_label:Core 1 /sys/class/hwmon/hwmon2/temp4_label:Core 2 /sys/class/hwmon/hwmon2/temp5_label:Core 3 /sys/class/hwmon/hwmon2/temp6_label:Core 4 /sys/class/hwmon/hwmon3/temp10_label:Core 8 /sys/class/hwmon/hwmon3/temp11_label:Core 9
after commit,
/sys/class/hwmon/hwmon2/temp2_label:Core 0 /sys/class/hwmon/hwmon2/temp3_label:Core 1 /sys/class/hwmon/hwmon2/temp4_label:Core 2 /sys/class/hwmon/hwmon2/temp5_label:Core 3 /sys/class/hwmon/hwmon2/temp6_label:Core 4 /sys/class/hwmon/hwmon2/temp7_label:Core 8 /sys/class/hwmon/hwmon2/temp8_label:Core 9
Restore the previous behavior and rework the code, comments and variable names to avoid future confusions.
--- drivers/hwmon/coretemp.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-)
drivers/hwmon/coretemp.c +19 -13
@@ -419,7 +419,7 @@ static ssize_t show_temp(struct device *dev, }static int create_core_attrs (struct temp_data *tdata,struct device *dev, -int attr_no) +int index) {int i; static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev,
@@ -431,13 +431,20 @@ static int create_core_attrs(struct temp_data *tdata, struct device *dev, };for (i =0 ; i < tdata->attr_size; i++) { +/* +* We map the attr number to core id of the CPU +* The attr number is always core id + 2 +* The Pkgtemp will always show up as temp1_*, if available +*/ +int attr_no = tdata->is_pkg_data ?1 : tdata->cpu_core_id +2 ; +snprintf (tdata->attr_name[i],CORETEMP_NAME_LENGTH ,"temp%d_%s" , attr_no, suffixes[i]);sysfs_attr_init (&tdata->sd_attrs[i].dev_attr.attr); tdata->sd_attrs[i].dev_attr.attr.name = tdata->attr_name[i]; tdata->sd_attrs[i].dev_attr.attr.mode =0444 ; tdata->sd_attrs[i].dev_attr.show = rd_ptr[i]; - tdata->sd_attrs[i].index = attr_no; + tdata->sd_attrs[i].index = index; tdata->attrs[i] = &tdata->sd_attrs[i].dev_attr.attr; } tdata->attr_group.attrs = tdata->attrs;
@@ -495,26 +502,25 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu,struct platform_data *pdata =platform_get_drvdata (pdev);struct cpuinfo_x86 *c = &cpu_data (cpu);u32 eax, edx; -int err, index, attr_no; +int err, index;if (!housekeeping_cpu (cpu,HK_TYPE_MISC ))return 0 ;/* -* Find attr number for sysfs: -* We map the attr number to core id of the CPU -* The attr number is always core id + 2 -* The Pkgtemp will always show up as temp1_*, if available +* Get the index of tdata in pdata->core_data[] +* tdata for package: pdata->core_data[1] +* tdata for core: pdata->core_data[2] .. pdata->core_data[NUM_REAL_CORES + 1] */ if (pkg_flag) { - attr_no =PKG_SYSFS_ATTR_NO ; + index =PKG_SYSFS_ATTR_NO ; }else { index =ida_alloc_max (&pdata->ida,NUM_REAL_CORES -1 ,GFP_KERNEL );if (index <0 )return index; pdata->cpu_map[index] =topology_core_id (cpu); - attr_no = index +BASE_SYSFS_ATTR_NO ; + index +=BASE_SYSFS_ATTR_NO ; } tdata =init_temp_data (cpu, pkg_flag);
@@ -540,20 +546,20 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu,if (get_ttarget (tdata, &pdev->dev) >=0 ) tdata->attr_size++; - pdata->core_data[attr_no] = tdata; + pdata->core_data[index] = tdata;/* Create sysfs interfaces */ - err =create_core_attrs (tdata, pdata->hwmon_dev, attr_no); + err =create_core_attrs (tdata, pdata->hwmon_dev, index);if (err) goto exit_free;return 0 ; exit_free: - pdata->core_data[attr_no] =NULL ; + pdata->core_data[index] =NULL ;kfree (tdata); ida_free:if (!pkg_flag) -ida_free (&pdata->ida, index); +ida_free (&pdata->ida, index -BASE_SYSFS_ATTR_NO );return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 46/124 inet: read sk->sk_family once in inet_recv_error()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit eef00a82c568944f113f2de738156ac591bbd5cd ]
inet_recv_error() is called without holding the socket lock.
IPv6 socket could mutate to IPv4 with IPV6_ADDRFORM socket option and trigger a KCSAN warning.
--- net/ipv4/af_inet.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/ipv4/af_inet.c +4 -2
@@ -1628,10 +1628,12 @@ EXPORT_SYMBOL(inet_current_timestamp);int inet_recv_error (struct sock *sk,struct msghdr *msg,int len,int *addr_len) { -if (sk->sk_family ==AF_INET ) +unsigned int family =READ_ONCE (sk->sk_family); + +if (family ==AF_INET )return ip_recv_error (sk, msg, len, addr_len);#if IS_ENABLED (CONFIG_IPV6 ) -if (sk->sk_family ==AF_INET6 ) +if (family ==AF_INET6 )return pingv6_ops.ipv6_recv_error (sk, msg, len, addr_len);#endif return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 47/124 drm/i915/gvt: Fix uninitialized variable in handle_mmio()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 47caa96478b99d6d1199b89467cc3e5a6cc754ee ]
This code prints the wrong variable in the warning message. It should print "i" instead of "info->offset". On the first iteration "info" is uninitialized leading to a crash and on subsequent iterations it prints the previous offset instead of the current one.
--- drivers/gpu/drm/i915/gvt/handlers.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/gvt/handlers.c +1 -2
@@ -2850,8 +2850,7 @@ static int handle_mmio(struct intel_gvt_mmio_table_iter *iter, u32 offset,for (i = start; i < end; i +=4 ) { p =intel_gvt_find_mmio_info (gvt, i);if (p) { -WARN (1 ,"dup mmio definition offset %x\n" , - info->offset); +WARN (1 ,"dup mmio definition offset %x\n" , i);/* We return -EEXIST here to make GVT-g load fail. * So duplicated MMIO can be found as soon as
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 48/124 x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
[ Upstream commit 1ad55cecf22f05f1c884adf63cc09d3c3e609ebf ]
The .compat section is a dummy PE section that contains the address of the 32-bit entrypoint of the 64-bit kernel image if it is bootable from 32-bit firmware (i.e., CONFIG_EFI_MIXED=y)
This section is only 8 bytes in size and is only referenced from the loader, and so it is placed at the end of the memory view of the image, to avoid the need for padding it to 4k, which is required for sections appearing in the middle of the image.
Unfortunately, this violates the PE/COFF spec, and even if most EFI loaders will work correctly (including the Tianocore reference implementation), PE loaders do exist that reject such images, on the basis that both the file and memory views of the file contents should be described by the section headers in a monotonically increasing manner without leaving any gaps.
So reorganize the sections to avoid this issue. This results in a slight padding overhead (< 4k) which can be avoided if desired by disabling CONFIG_EFI_MIXED (which is only needed in rare cases these days)
--- arch/x86/boot/header.S | 14 ++++++-------- arch/x86/boot/setup.ld | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-)
arch/x86/boot/header.S +6 -8
@@ -106,8 +106,7 @@ extra_header_fields: .word 0 # MinorSubsystemVersion .long 0 # Win32VersionValue - .long setup_size + ZO__end + pecompat_vsize - # SizeOfImage + .long setup_size + ZO__end # SizeOfImage .long salign # SizeOfHeaders .long 0 # CheckSum
@@ -143,7 +142,7 @@ section_table: .ascii ".setup" .byte 0 .byte 0 - .long setup_size - salign # VirtualSize + .long pecompat_fstart - salign # VirtualSize .long salign # VirtualAddress .long pecompat_fstart - salign # SizeOfRawData .long salign # PointerToRawData
@@ -156,8 +155,8 @@ section_table: #ifdef CONFIG_EFI_MIXED .asciz ".compat" - .long 8 # VirtualSize - .long setup_size + ZO__end # VirtualAddress + .long pecompat_fsize # VirtualSize + .long pecompat_fstart # VirtualAddress .long pecompat_fsize # SizeOfRawData .long pecompat_fstart # PointerToRawData
@@ -172,17 +171,16 @@ section_table: * modes this image supports. */ .pushsection ".pecompat", "a", @progbits - .balign falign - .set pecompat_vsize, salign + .balign salign .globl pecompat_fstart pecompat_fstart: .byte 0x1 # Version .byte 8 # Size .word IMAGE_FILE_MACHINE_I386 # PE machine type .long setup_size + ZO_efi32_pe_entry # Entrypoint + .byte 0x0 # Sentinel .popsection #else - .set pecompat_vsize, 0 .set pecompat_fstart, setup_size #endif .ascii ".text"
arch/x86/boot/setup.ld +3 -3
@@ -24,6 +24,9 @@ SECTIONS .text : { *(.text .text.*) } .text32 : { *(.text32) } + .pecompat : { *(.pecompat) } + PROVIDE(pecompat_fsize = setup_size - pecompat_fstart); + . = ALIGN(16); .rodata : { *(.rodata*) }
@@ -36,9 +39,6 @@ SECTIONS . = ALIGN(16); .data : { *(.data*) } - .pecompat : { *(.pecompat) } - PROVIDE(pecompat_fsize = setup_size - pecompat_fstart); - .signature : { setup_sig = .; LONG(0x5a5aaa55)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 49/124 rxrpc: Fix generation of serial numbers to skip zero
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit f31041417bf7f4a4df8b3bfb52cb31bbe805b934 ]
In the Rx protocol, every packet generated is marked with a per-connection monotonically increasing serial number. This number can be referenced in an ACK packet generated in response to an incoming packet - thereby allowing the sender to use this for RTT determination, amongst other things.
However, if the reference field in the ACK is zero, it doesn't refer to any incoming packet (it could be a ping to find out if a packet got lost, for example) - so we shouldn't generate zero serial numbers.
Fix the generation of serial numbers to retry if it comes up with a zero.
Furthermore, since the serial numbers are only ever allocated within the I/O thread this connection is bound to, there's no need for atomics so remove that too.
--- net/rxrpc/ar-internal.h | 16 +++++++++++++++- net/rxrpc/conn_event.c | 2 +- net/rxrpc/output.c | 8 ++++---- net/rxrpc/proc.c | 2 +- net/rxrpc/rxkad.c | 4 ++-- 5 files changed, 23 insertions(+), 9 deletions(-)
net/rxrpc/ar-internal.h +15 -1
@@ -507,7 +507,7 @@ struct rxrpc_connection {enum rxrpc_call_completion completion;/* Completion condition */ s32 abort_code;/* Abort code of connection abort */ int debug_id;/* debug ID for printks */ -atomic_t serial;/* packet serial number counter */ +rxrpc_serial_t tx_serial;/* Outgoing packet serial number counter */ unsigned int hi_serial;/* highest serial number received */ u32 service_id;/* Service ID, possibly upgraded */ u32 security_level;/* Security level selected */
@@ -819,6 +819,20 @@ static inline bool rxrpc_sending_to_client(const struct rxrpc_txbuf *txb)#include <trace/events/rxrpc.h> +/* +* Allocate the next serial number on a connection. 0 must be skipped. +*/ +static inline rxrpc_serial_t rxrpc_get_next_serial (struct rxrpc_connection *conn) +{ +rxrpc_serial_t serial; + + serial = conn->tx_serial; +if (serial ==0 ) + serial =1 ; + conn->tx_serial = serial +1 ; +return serial; +} +/* * af_rxrpc.c */
net/rxrpc/conn_event.c +1 -1
@@ -117,7 +117,7 @@ void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn, iov[2 ].iov_base = &ack_info; iov[2 ].iov_len =sizeof (ack_info); - serial =atomic_inc_return (&conn->serial); + serial =rxrpc_get_next_serial (conn); pkt.whdr.epoch =htonl (conn->proto.epoch); pkt.whdr.cid =htonl (conn->proto.cid | channel);
net/rxrpc/output.c +4 -4
@@ -216,7 +216,7 @@ int rxrpc_send_ack_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb) iov[0 ].iov_len =sizeof (txb->wire) +sizeof (txb->ack) + n; len = iov[0 ].iov_len; - serial =atomic_inc_return (&conn->serial); + serial =rxrpc_get_next_serial (conn); txb->wire.serial =htonl (serial); trace_rxrpc_tx_ack(call->debug_id, serial, ntohl(txb->ack.firstPacket),
@@ -302,7 +302,7 @@ int rxrpc_send_abort_packet(struct rxrpc_call *call) iov[0 ].iov_base = &pkt; iov[0 ].iov_len =sizeof (pkt); - serial =atomic_inc_return (&conn->serial); + serial =rxrpc_get_next_serial (conn); pkt.whdr.serial =htonl (serial);iov_iter_kvec (&msg.msg_iter,WRITE , iov,1 ,sizeof (pkt));
@@ -334,7 +334,7 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb)_enter ("%x,{%d}" , txb->seq, txb->len);/* Each transmission of a Tx packet needs a new serial number */ - serial =atomic_inc_return (&conn->serial); + serial =rxrpc_get_next_serial (conn); txb->wire.serial =htonl (serial); if (test_bit(RXRPC_CONN_PROBING_FOR_UPGRADE, &conn->flags) &&
@@ -558,7 +558,7 @@ void rxrpc_send_conn_abort(struct rxrpc_connection *conn) len = iov[0 ].iov_len + iov[1 ].iov_len; - serial =atomic_inc_return (&conn->serial); + serial =rxrpc_get_next_serial (conn); whdr.serial =htonl (serial);iov_iter_kvec (&msg.msg_iter,WRITE , iov,2 , len);
net/rxrpc/proc.c +1 -1
@@ -181,7 +181,7 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)atomic_read (&conn->active), state,key_serial (conn->key), -atomic_read (&conn->serial), + conn->tx_serial, conn->hi_serial, conn->channels[0 ].call_id, conn->channels[1].call_id,
net/rxrpc/rxkad.c +2 -2
@@ -664,7 +664,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn) len = iov[0 ].iov_len + iov[1 ].iov_len; - serial =atomic_inc_return (&conn->serial); + serial =rxrpc_get_next_serial (conn); whdr.serial =htonl (serial); ret =kernel_sendmsg (conn->local->socket, &msg, iov,2 , len);
@@ -721,7 +721,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn, len = iov[0 ].iov_len + iov[1 ].iov_len + iov[2 ].iov_len; - serial =atomic_inc_return (&conn->serial); + serial =rxrpc_get_next_serial (conn); whdr.serial =htonl (serial);rxrpc_local_dont_fragment (conn->local, false);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 50/124 rxrpc: Fix delayed ACKs to not set the reference serial number
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit e7870cf13d20f56bfc19f9c3e89707c69cf104ef ]
Fix the construction of delayed ACKs to not set the reference serial number as they can't be used as an RTT reference.
--- net/rxrpc/ar-internal.h | 1 - net/rxrpc/call_event.c | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-)
net/rxrpc/ar-internal.h +0 -1
@@ -693,7 +693,6 @@ struct rxrpc_call {/* Receive-phase ACK management (ACKs we send). */ u8 ackr_reason;/* reason to ACK */ u16 ackr_sack_base;/* Starting slot in SACK table ring */ -rxrpc_serial_t ackr_serial;/* serial of packet being ACK'd */ rxrpc_seq_t ackr_window;/* Base of SACK window */ rxrpc_seq_t ackr_wtop;/* Base of SACK window */ unsigned int ackr_nr_unacked;/* Number of unacked packets */
net/rxrpc/call_event.c +1 -5
@@ -43,8 +43,6 @@ void rxrpc_propose_delay_ACK(struct rxrpc_call *call, rxrpc_serial_t serial,unsigned long expiry = rxrpc_soft_ack_delay;unsigned long now = jiffies, ack_at; - call->ackr_serial = serial; -if (rxrpc_soft_ack_delay < expiry) expiry = rxrpc_soft_ack_delay;if (call->peer->srtt_us !=0 )
@@ -373,7 +371,6 @@ static void rxrpc_send_initial_ping(struct rxrpc_call *call)bool rxrpc_input_call_event (struct rxrpc_call *call,struct sk_buff *skb) {unsigned long now, next, t; -rxrpc_serial_t ackr_serial;bool resend = false, expired = false;s32 abort_code;
@@ -423,8 +420,7 @@ bool rxrpc_input_call_event(struct rxrpc_call *call, struct sk_buff *skb)if (time_after_eq (now, t)) {trace_rxrpc_timer (call, rxrpc_timer_exp_ack, now);cmpxchg (&call->delay_ack_at, t, now +MAX_JIFFY_OFFSET ); - ackr_serial =xchg (&call->ackr_serial,0 ); -rxrpc_send_ACK (call,RXRPC_ACK_DELAY , ackr_serial, +rxrpc_send_ACK (call,RXRPC_ACK_DELAY ,0 , rxrpc_propose_ack_ping_for_lost_ack); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 51/124 rxrpc: Fix response to PING RESPONSE ACKs to a dead call
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 6f769f22822aa4124b556339781b04d810f0e038 ]
Stop rxrpc from sending a DUP ACK in response to a PING RESPONSE ACK on a dead call. We may have initiated the ping but the call may have beaten the response to completion.
--- net/rxrpc/conn_event.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/rxrpc/conn_event.c +8 -0
@@ -95,6 +95,14 @@ void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn,_enter ("%d" , conn->debug_id); +if (sp && sp->hdr.type ==RXRPC_PACKET_TYPE_ACK ) { +if (skb_copy_bits (skb,sizeof (struct rxrpc_wire_header ), + &pkt.ack,sizeof (pkt.ack)) <0 ) +return ; +if (pkt.ack.reason ==RXRPC_ACK_PING_RESPONSE ) +return ; + } + chan = &conn->channels[channel];/* If the last call got moved on whilst we were waiting to run, just
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 52/124 rxrpc: Fix counting of new acks and nacks
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 41b7fa157ea1c8c3a575ca7f5f32034de9bee3ae ]
Fix the counting of new acks and nacks when parsing a packet - something that is used in congestion control.
As the code stands, it merely notes if there are any nacks whereas what we really should do is compare the previous SACK table to the new one, assuming we get two successive ACK packets with nacks in them. However, we really don't want to do that if we can avoid it as the tables might not correspond directly as one may be shifted from the other - something that will only get harder to deal with once extended ACK tables come into full use (with a capacity of up to 8192).
Instead, count the number of nacks shifted out of the old SACK, the number of nacks retained in the portion still active and the number of new acks and nacks in the new table then calculate what we need.
Note this ends up a bit of an estimate as the Rx protocol allows acks to be withdrawn by the receiver and packets requested to be retransmitted.
--- include/trace/events/rxrpc.h | 8 ++- net/rxrpc/ar-internal.h | 20 ++++-- net/rxrpc/call_event.c | 6 +- net/rxrpc/call_object.c | 1 + net/rxrpc/input.c | 115 +++++++++++++++++++++++++++++------ 5 files changed, 122 insertions(+), 28 deletions(-)
include/trace/events/rxrpc.h +5 -3
@@ -128,6 +128,7 @@ EM(rxrpc_skb_eaten_by_unshare_nomem, "ETN unshar-nm") \ EM(rxrpc_skb_get_conn_secured, "GET conn-secd") \ EM(rxrpc_skb_get_conn_work, "GET conn-work") \ + EM(rxrpc_skb_get_last_nack, "GET last-nack") \ EM(rxrpc_skb_get_local_work, "GET locl-work") \ EM(rxrpc_skb_get_reject_work, "GET rej-work ") \EM (rxrpc_skb_get_to_recvmsg,"GET to-recv " ) \
@@ -141,6 +142,7 @@ EM(rxrpc_skb_put_error_report, "PUT error-rep") \ EM(rxrpc_skb_put_input, "PUT input ") \ EM(rxrpc_skb_put_jumbo_subpacket, "PUT jumbo-sub") \ + EM(rxrpc_skb_put_last_nack, "PUT last-nack") \ EM(rxrpc_skb_put_purge, "PUT purge ") \ EM(rxrpc_skb_put_rotate, "PUT rotate ") \EM (rxrpc_skb_put_unknown,"PUT unknown " ) \
@@ -1552,7 +1554,7 @@ TRACE_EVENT(rxrpc_congest,memcpy (&__entry->sum, summary,sizeof (__entry->sum)); ), - TP_printk("c=%08x r=%08x %s q=%08x %s cw=%u ss=%u nA=%u,%u+%u r=%u b=%u u=%u d=%u l=%x%s%s%s", + TP_printk("c=%08x r=%08x %s q=%08x %s cw=%u ss=%u nA=%u,%u+%u,%u b=%u u=%u d=%u l=%x%s%s%s", __entry->call, __entry->ack_serial, __print_symbolic(__entry->sum.ack_reason, rxrpc_ack_names),
@@ -1560,9 +1562,9 @@ TRACE_EVENT(rxrpc_congest,__print_symbolic (__entry->sum.mode, rxrpc_congest_modes), __entry->sum.cwnd, __entry->sum.ssthresh, - __entry->sum.nr_acks, __entry->sum.saw_nacks, + __entry->sum.nr_acks, __entry->sum.nr_retained_nacks, __entry->sum.nr_new_acks, - __entry->sum.nr_rot_new_acks, + __entry->sum.nr_new_nacks, __entry->top - __entry->hard_ack, __entry->sum.cumulative_acks, __entry->sum.dup_acks,
net/rxrpc/ar-internal.h +15 -5
@@ -198,11 +198,19 @@ struct rxrpc_host_header {*/ struct rxrpc_skb_priv {struct rxrpc_connection *conn;/* Connection referred to (poke packet) */ -u16 offset;/* Offset of data */ -u16 len;/* Length of data */ -u8 flags; +union { +struct { +u16 offset;/* Offset of data */ +u16 len;/* Length of data */ +u8 flags;#define RXRPC_RX_VERIFIED 0x01 - + }; +struct { +rxrpc_seq_t first_ack;/* First packet in acks table */ +u8 nr_acks;/* Number of acks+nacks */ +u8 nr_nacks;/* Number of nacks */ + }; + };struct rxrpc_host_header hdr;/* RxRPC packet header from this packet */ };
@@ -689,6 +697,7 @@ struct rxrpc_call {u8 cong_dup_acks;/* Count of ACKs showing missing packets */ u8 cong_cumul_acks;/* Cumulative ACK count */ ktime_t cong_tstamp;/* Last time cwnd was changed */ +struct sk_buff *cong_last_nack;/* Last ACK with nacks received */ /* Receive-phase ACK management (ACKs we send). */ u8 ackr_reason;/* reason to ACK */
@@ -726,7 +735,8 @@ struct rxrpc_call {struct rxrpc_ack_summary {u16 nr_acks;/* Number of ACKs in packet */ u16 nr_new_acks;/* Number of new ACKs in packet */ -u16 nr_rot_new_acks;/* Number of rotated new ACKs */ +u16 nr_new_nacks;/* Number of new nacks in packet */ +u16 nr_retained_nacks;/* Number of nacks retained between ACKs */ u8 ack_reason;bool saw_nacks;/* Saw NACKs in packet */ bool new_low_nack;/* T if new low NACK found */
net/rxrpc/call_event.c +4 -2
@@ -112,6 +112,7 @@ static void rxrpc_congestion_timeout(struct rxrpc_call *call)void rxrpc_resend (struct rxrpc_call *call,struct sk_buff *ack_skb) {struct rxrpc_ackpacket *ack =NULL ; +struct rxrpc_skb_priv *sp;struct rxrpc_txbuf *txb;unsigned long resend_at;rxrpc_seq_t transmitted =READ_ONCE (call->tx_transmitted);
@@ -139,14 +140,15 @@ void rxrpc_resend(struct rxrpc_call *call, struct sk_buff *ack_skb)* explicitly NAK'd packets. */ if (ack_skb) { + sp =rxrpc_skb (ack_skb); ack = (void *)ack_skb->data +sizeof (struct rxrpc_wire_header ); -for (i =0 ; i < ack->nAcks; i++) { +for (i =0 ; i < sp->nr_acks; i++) {rxrpc_seq_t seq;if (ack->acks[i] &1 )continue ; - seq =ntohl (ack->firstPacket) + i; + seq = sp->first_ack + i;if (after (txb->seq, transmitted))break ;if (after (txb->seq, seq))
net/rxrpc/call_object.c +1 -0
@@ -686,6 +686,7 @@ static void rxrpc_destroy_call(struct work_struct *work)del_timer_sync (&call->timer); +rxrpc_free_skb (call->cong_last_nack, rxrpc_skb_put_last_nack);rxrpc_cleanup_ring (call);while ((txb =list_first_entry_or_null (&call->tx_sendmsg, struct rxrpc_txbuf, call_link))) {
net/rxrpc/input.c +97 -18
192 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 53/124 selftests: net: let big_tcp test cope with slow env
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit a19747c3b9bf6476cc36d0a3a5ef0ff92999169e ]
In very slow environments, most big TCP cases including segmentation and reassembly of big TCP packets have a good chance to fail: by default the TCP client uses write size well below 64K. If the host is low enough autocorking is unable to build real big TCP packets.
Address the issue using much larger write operations.
Note that is hard to observe the issue without an extremely slow and/or overloaded environment; reduce the TCP transfer time to allow for much easier/faster reproducibility.
--- tools/testing/selftests/net/big_tcp.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/testing/selftests/net/big_tcp.sh +3 -1
@@ -122,7 +122,9 @@ do_netperf() { local netns=$1 [ "$NF" = "6" ] && serip=$SERVER_IP6 - ip net exec $netns netperf -$NF -t TCP_STREAM -H $serip 2>&1 >/dev/null + + # use large write to be sure to generate big tcp packets + ip net exec $netns netperf -$NF -t TCP_STREAM -l 1 -H $serip -- -m 262144 2>&1 >/dev/null } do_test() {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 54/124 tipc: Check the bearer type before calling tipc_udp_nl_bearer_add()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shigeru Yoshida <[email protected]>
[ Upstream commit 3871aa01e1a779d866fa9dfdd5a836f342f4eb87 ]
syzbot reported the following general protection fault [1]:
general protection fault, probably for non-canonical address 0xdffffc0000000010: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000080-0x0000000000000087] ... RIP: 0010:tipc_udp_is_known_peer+0x9c/0x250 net/tipc/udp_media.c:291 ... Call Trace: <TASK> tipc_udp_nl_bearer_add+0x212/0x2f0 net/tipc/udp_media.c:646 tipc_nl_bearer_add+0x21e/0x360 net/tipc/bearer.c:1089 genl_family_rcv_msg_doit+0x1fc/0x2e0 net/netlink/genetlink.c:972 genl_family_rcv_msg net/netlink/genetlink.c:1052 [inline] genl_rcv_msg+0x561/0x800 net/netlink/genetlink.c:1067 netlink_rcv_skb+0x16b/0x440 net/netlink/af_netlink.c:2544 genl_rcv+0x28/0x40 net/netlink/genetlink.c:1076 netlink_unicast_kernel net/netlink/af_netlink.c:1341 [inline] netlink_unicast+0x53b/0x810 net/netlink/af_netlink.c:1367 netlink_sendmsg+0x8b7/0xd70 net/netlink/af_netlink.c:1909 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0xd5/0x180 net/socket.c:745 ____sys_sendmsg+0x6ac/0x940 net/socket.c:2584 ___sys_sendmsg+0x135/0x1d0 net/socket.c:2638 __sys_sendmsg+0x117/0x1e0 net/socket.c:2667 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x40/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b
The cause of this issue is that when tipc_nl_bearer_add() is called with the TIPC_NLA_BEARER_UDP_OPTS attribute, tipc_udp_nl_bearer_add() is called even if the bearer is not UDP.
tipc_udp_is_known_peer() called by tipc_udp_nl_bearer_add() assumes that the media_ptr field of the tipc_bearer has an udp_bearer type object, so the function goes crazy for non-UDP bearers.
This patch fixes the issue by checking the bearer type before calling tipc_udp_nl_bearer_add() in tipc_nl_bearer_add().
--- net/tipc/bearer.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/tipc/bearer.c +6 -0
@@ -1086,6 +1086,12 @@ int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info)#ifdef CONFIG_TIPC_MEDIA_UDP if (attrs[TIPC_NLA_BEARER_UDP_OPTS ]) { +if (b->media->type_id !=TIPC_MEDIA_TYPE_UDP ) { +rtnl_unlock (); +NL_SET_ERR_MSG (info->extack,"UDP option is unsupported" ); +return -EINVAL ; + } + err =tipc_udp_nl_bearer_add (b, attrs[TIPC_NLA_BEARER_UDP_OPTS ]);if (err) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 55/124 af_unix: Call kfree_skb() for dead unix_(sk)->oob_skb in GC.
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 1279f9d9dec2d7462823a18c29ad61359e0a007d ]
syzbot reported a warning [0] in __unix_gc() with a repro, which creates a socketpair and sends one socket's fd to itself using the peer.
socketpair(AF_UNIX, SOCK_STREAM, 0, [3, 4]) = 0
sendmsg(4, {msg_name=NULL, msg_namelen=0, msg_iov=[{iov_base="\360", iov_len=1}],
msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_SOCKET,
cmsg_type=SCM_RIGHTS, cmsg_data=[3]}],
msg_controllen=24, msg_flags=0}, MSG_OOB|MSG_PROBE|MSG_DONTWAIT|MSG_ZEROCOPY) = 1This forms a self-cyclic reference that GC should finally untangle but does not due to lack of MSG_OOB handling, resulting in memory leak.
Recently, commit 11498715f266 ("af_unix: Remove io_uring code for GC.") removed io_uring's dead code in GC and revealed the problem.
The code was executed at the final stage of GC and unconditionally moved all GC candidates from gc_candidates to gc_inflight_list. That papered over the reported problem by always making the following WARN_ON_ONCE(!list_empty(&gc_candidates)) false.
The problem has been there since commit 2aab4b969002 ("af_unix: fix struct pid leaks in OOB support") added full scm support for MSG_OOB while fixing another bug.
To fix this problem, we must call kfree_skb() for unix_sk(sk)->oob_skb if the socket still exists in gc_candidates after purging collected skb.
Then, we need to set NULL to oob_skb before calling kfree_skb() because it calls last fput() and triggers unix_release_sock(), where we call duplicate kfree_skb(u->oob_skb) if not NULL.
Note that the leaked socket remained being linked to a global list, so kmemleak also could not detect it. We need to check /proc/net/protocol to notice the unfreed socket.
[0]:
WARNING: CPU: 0 PID: 2863 at net/unix/garbage.c:345 __unix_gc+0xc74/0xe80 net/unix/garbage.c:345 Modules linked in: CPU: 0 PID: 2863 Comm: kworker/u4:11 Not tainted 6.8.0-rc1-syzkaller-00583-g1701940b1a02 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/25/2024 Workqueue: events_unbound __unix_gc RIP: 0010:__unix_gc+0xc74/0xe80 net/unix/garbage.c:345 Code: 8b 5c 24 50 e9 86 f8 ff ff e8 f8 e4 22 f8 31 d2 48 c7 c6 30 6a 69 89 4c 89 ef e8 97 ef ff ff e9 80 f9 ff ff e8 dd e4 22 f8 90 <0f> 0b 90 e9 7b fd ff ff 48 89 df e8 5c e7 7c f8 e9 d3 f8 ff ff e8 RSP: 0018:ffffc9000b03fba0 EFLAGS: 00010293 RAX: 0000000000000000 RBX: ffffc9000b03fc10 RCX: ffffffff816c493e RDX: ffff88802c02d940 RSI: ffffffff896982f3 RDI: ffffc9000b03fb30 RBP: ffffc9000b03fce0 R08: 0000000000000001 R09: fffff52001607f66 R10: 0000000000000003 R11: 0000000000000002 R12: dffffc0000000000 R13: ffffc9000b03fc10 R14: ffffc9000b03fc10 R15: 0000000000000001 FS: 0000000000000000(0000) GS:ffff8880b9400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00005559c8677a60 CR3: 000000000d57a000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> process_one_work+0x889/0x15e0 kernel/workqueue.c:2633 process_scheduled_works kernel/workqueue.c:2706 [inline] worker_thread+0x8b9/0x12a0 kernel/workqueue.c:2787 kthread+0x2c6/0x3b0 kernel/kthread.c:388 ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1b/0x30 arch/x86/entry/entry_64.S:242 </TASK>
--- net/unix/garbage.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
net/unix/garbage.c +11 -0
@@ -314,6 +314,17 @@ void unix_gc(void)/* Here we are. Hitlist is filled. Die. */ __skb_queue_purge (&hitlist); +#if IS_ENABLED (CONFIG_AF_UNIX_OOB ) +list_for_each_entry_safe (u, next, &gc_candidates, link) { +struct sk_buff *skb = u->oob_skb; + +if (skb) { + u->oob_skb =NULL ; +kfree_skb (skb); + } + } +#endif +spin_lock (&unix_gc_lock);/* There could be io_uring registered files, just push them back to
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 56/124 devlink: avoid potential loop in devlink_rel_nested_in_notify_work()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Pirko <[email protected]>
[ Upstream commit 58086721b7781c3e35b19c9b78c8f5a791070ba3 ]
In case devlink_rel_nested_in_notify_work() can not take the devlink lock mutex. Convert the work to delayed work and in case of reschedule do it jiffie later and avoid potential looping.
--- net/devlink/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/devlink/core.c +6 -6
@@ -46,7 +46,7 @@ struct devlink_rel {u32 obj_index;devlink_rel_notify_cb_t *notify_cb;devlink_rel_cleanup_cb_t *cleanup_cb; -struct work_struct notify_work; +struct delayed_work notify_work; } nested_in; };
@@ -70,7 +70,7 @@ static void __devlink_rel_put(struct devlink_rel *rel)static void devlink_rel_nested_in_notify_work (struct work_struct *work) { struct devlink_rel *rel = container_of(work, struct devlink_rel, - nested_in.notify_work); + nested_in.notify_work.work);struct devlink *devlink; devlink =devlinks_xa_get (rel->nested_in.devlink_index);
@@ -96,13 +96,13 @@ static void devlink_rel_nested_in_notify_work(struct work_struct *work)return ; reschedule_work: -schedule_work (&rel->nested_in.notify_work); +schedule_delayed_work (&rel->nested_in.notify_work,1 ); }static void devlink_rel_nested_in_notify_work_schedule (struct devlink_rel *rel) {__devlink_rel_get (rel); -schedule_work (&rel->nested_in.notify_work); +schedule_delayed_work (&rel->nested_in.notify_work,0 ); }static struct devlink_rel *devlink_rel_alloc (void )
@@ -123,8 +123,8 @@ static struct devlink_rel *devlink_rel_alloc(void) }refcount_set (&rel->refcount,1 ); -INIT_WORK (&rel->nested_in.notify_work, - &devlink_rel_nested_in_notify_work); +INIT_DELAYED_WORK (&rel->nested_in.notify_work, + &devlink_rel_nested_in_notify_work);return rel; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 57/124 ppp_async: limit MRU to 64K
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit cb88cb53badb8aeb3955ad6ce80b07b598e310b8 ]
syzbot triggered a warning [1] in __alloc_pages():
WARN_ON_ONCE_GFP(order > MAX_PAGE_ORDER, gfp)
Willem fixed a similar issue in commit c0a2a1b0d631 ("ppp: limit MRU to 64K")
Adopt the same sanity check for ppp_async_ioctl(PPPIOCSMRU)
[1]:
WARNING: CPU: 1 PID: 11 at mm/page_alloc.c:4543 __alloc_pages+0x308/0x698 mm/page_alloc.c:4543 Modules linked in: CPU: 1 PID: 11 Comm: kworker/u4:0 Not tainted 6.8.0-rc2-syzkaller-g41bccc98fb79 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/17/2023 Workqueue: events_unbound flush_to_ldisc pstate: 204000c5 (nzCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __alloc_pages+0x308/0x698 mm/page_alloc.c:4543 lr : __alloc_pages+0xc8/0x698 mm/page_alloc.c:4537
sp : ffff800093967580
x29: ffff800093967660 x28: ffff8000939675a0 x27: dfff800000000000
x26: ffff70001272ceb4 x25: 0000000000000000 x24: ffff8000939675c0
x23: 0000000000000000 x22: 0000000000060820 x21: 1ffff0001272ceb8
x20: ffff8000939675e0 x19: 0000000000000010 x18: ffff800093967120
x17: ffff800083bded5c x16: ffff80008ac97500 x15: 0000000000000005
x14: 1ffff0001272cebc x13: 0000000000000000 x12: 0000000000000000
x11: ffff70001272cec1 x10: 1ffff0001272cec0 x9 : 0000000000000001 x8 : ffff800091c91000 x7 : 0000000000000000 x6 : 000000000000003f x5 : 00000000ffffffff x4 : 0000000000000000 x3 : 0000000000000020 x2 : 0000000000000008 x1 : 0000000000000000 x0 : ffff8000939675e0
Call trace: __alloc_pages+0x308/0x698 mm/page_alloc.c:4543 __alloc_pages_node include/linux/gfp.h:238 [inline] alloc_pages_node include/linux/gfp.h:261 [inline] __kmalloc_large_node+0xbc/0x1fc mm/slub.c:3926 __do_kmalloc_node mm/slub.c:3969 [inline] __kmalloc_node_track_caller+0x418/0x620 mm/slub.c:4001 kmalloc_reserve+0x17c/0x23c net/core/skbuff.c:590 __alloc_skb+0x1c8/0x3d8 net/core/skbuff.c:651 __netdev_alloc_skb+0xb8/0x3e8 net/core/skbuff.c:715 netdev_alloc_skb include/linux/skbuff.h:3235 [inline] dev_alloc_skb include/linux/skbuff.h:3248 [inline] ppp_async_input drivers/net/ppp/ppp_async.c:863 [inline] ppp_asynctty_receive+0x588/0x186c drivers/net/ppp/ppp_async.c:341 tty_ldisc_receive_buf+0x12c/0x15c drivers/tty/tty_buffer.c:390 tty_port_default_receive_buf+0x74/0xac drivers/tty/tty_port.c:37 receive_buf drivers/tty/tty_buffer.c:444 [inline] flush_to_ldisc+0x284/0x6e4 drivers/tty/tty_buffer.c:494 process_one_work+0x694/0x1204 kernel/workqueue.c:2633 process_scheduled_works kernel/workqueue.c:2706 [inline] worker_thread+0x938/0xef4 kernel/workqueue.c:2787 kthread+0x288/0x310 kernel/kthread.c:388 ret_from_fork+0x10/0x20 arch/arm64/kernel/entry.S:860
--- drivers/net/ppp/ppp_async.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ppp/ppp_async.c +4 -0
@@ -460,6 +460,10 @@ ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg)case PPPIOCSMRU :if (get_user (val, p))break ; +if (val >U16_MAX ) { + err = -EINVAL ; +break ; + }if (val <PPP_MRU ) val =PPP_MRU ; ap->mru = val;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 58/124 selftests: cmsg_ipv6: repeat the exact packet
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 4b00d0c513da58b68df015968721b11396fe4ab3 ]
cmsg_ipv6 test requests tcpdump to capture 4 packets, and sends until tcpdump quits. Only the first packet is "real", however, and the rest are basic UDP packets. So if tcpdump doesn't start in time it will miss the real packet and only capture the UDP ones.
This makes the test fail on slow machine (no KVM or with debug enabled) 100% of the time, while it passes in fast environments.
Repeat the "real" / expected packet.
--- tools/testing/selftests/net/cmsg_ipv6.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/cmsg_ipv6.sh +2 -2
@@ -91,7 +91,7 @@ for ovr in setsock cmsg both diff; do check_result $? 0 "TCLASS $prot $ovr - pass" while [ -d /proc/$BG ]; do - $NSEXE ./cmsg_sender -6 -p u $TGT6 1234 + $NSEXE ./cmsg_sender -6 -p $p $m $((TOS2)) $TGT6 1234 done tcpdump -r $TMPF -v 2>&1 | grep "class $TOS2" >> /dev/null
@@ -128,7 +128,7 @@ for ovr in setsock cmsg both diff; do check_result $? 0 "HOPLIMIT $prot $ovr - pass" while [ -d /proc/$BG ]; do - $NSEXE ./cmsg_sender -6 -p u $TGT6 1234 + $NSEXE ./cmsg_sender -6 -p $p $m $LIM $TGT6 1234 done tcpdump -r $TMPF -v 2>&1 | grep "hlim $LIM[^0-9]" >> /dev/null
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 59/124 netfilter: nft_compat: narrow down revision to unsigned 8-bits
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 36fa8d697132b4bed2312d700310e8a78b000c84 ]
xt_find_revision() expects u8, restrict it to this datatype.
--- net/netfilter/nft_compat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nft_compat.c +3 -3
@@ -135,7 +135,7 @@ static void nft_target_eval_bridge(const struct nft_expr *expr,static const struct nla_policy nft_target_policy[NFTA_TARGET_MAX +1 ] = { [NFTA_TARGET_NAME ] = { .type =NLA_NUL_STRING }, - [NFTA_TARGET_REV ] = { .type =NLA_U32 }, + [NFTA_TARGET_REV ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_TARGET_INFO ] = { .type =NLA_BINARY }, };
@@ -419,7 +419,7 @@ static void nft_match_eval(const struct nft_expr *expr,static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX +1 ] = { [NFTA_MATCH_NAME ] = { .type =NLA_NUL_STRING }, - [NFTA_MATCH_REV ] = { .type =NLA_U32 }, + [NFTA_MATCH_REV ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_MATCH_INFO ] = { .type =NLA_BINARY }, };
@@ -724,7 +724,7 @@ static int nfnl_compat_get_rcu(struct sk_buff *skb,static const struct nla_policy nfnl_compat_policy_get[NFTA_COMPAT_MAX +1 ] = { [NFTA_COMPAT_NAME ] = { .type =NLA_NUL_STRING , .len =NFT_COMPAT_NAME_MAX -1 }, - [NFTA_COMPAT_REV ] = { .type =NLA_U32 }, + [NFTA_COMPAT_REV ] =NLA_POLICY_MAX (NLA_BE32 ,255 ), [NFTA_COMPAT_TYPE ] = { .type =NLA_U32 }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 60/124 netfilter: nft_compat: reject unused compat flag
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 292781c3c5485ce33bd22b2ef1b2bed709b4d672 ]
Flag (1 << 0) is ignored is set, never used, reject it it with EINVAL instead.
--- include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/netfilter/nft_compat.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -285,9 +285,11 @@ enum nft_rule_attributes {/** * enum nft_rule_compat_flags - nf_tables rule compat flags * +* @NFT_RULE_COMPAT_F_UNUSED: unused * @NFT_RULE_COMPAT_F_INV: invert the check result */ enum nft_rule_compat_flags { +NFT_RULE_COMPAT_F_UNUSED = (1 <<0 ),NFT_RULE_COMPAT_F_INV = (1 <<1 ),NFT_RULE_COMPAT_F_MASK =NFT_RULE_COMPAT_F_INV , };
net/netfilter/nft_compat.c +2 -1
@@ -212,7 +212,8 @@ static int nft_parse_compat(const struct nlattr *attr, u16 *proto, bool *inv)return -EINVAL ; flags =ntohl (nla_get_be32 (tb[NFTA_RULE_COMPAT_FLAGS ])); -if (flags & ~NFT_RULE_COMPAT_F_MASK ) +if (flags &NFT_RULE_COMPAT_F_UNUSED || + flags & ~NFT_RULE_COMPAT_F_MASK )return -EINVAL ;if (flags &NFT_RULE_COMPAT_F_INV ) *inv = true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 61/124 netfilter: nft_compat: restrict match/target protocol to u16
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit d694b754894c93fb4d71a7f3699439dec111decc ]
xt_check_{match,target} expects u16, but NFTA_RULE_COMPAT_PROTO is u32.
NLA_POLICY_MAX(NLA_BE32, 65535) cannot be used because .max in nla_policy is s16, see 3e48be05f3c7 ("netlink: add attribute range validation to policy").
--- net/netfilter/nft_compat.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/netfilter/nft_compat.c +7 -1
@@ -200,6 +200,7 @@ static const struct nla_policy nft_rule_compat_policy[NFTA_RULE_COMPAT_MAX + 1]static int nft_parse_compat (const struct nlattr *attr,u16 *proto,bool *inv) {struct nlattr *tb[NFTA_RULE_COMPAT_MAX +1 ]; +u32 l4proto;u32 flags;int err;
@@ -218,7 +219,12 @@ static int nft_parse_compat(const struct nlattr *attr, u16 *proto, bool *inv)if (flags &NFT_RULE_COMPAT_F_INV ) *inv = true; - *proto =ntohl (nla_get_be32 (tb[NFTA_RULE_COMPAT_PROTO ])); + l4proto =ntohl (nla_get_be32 (tb[NFTA_RULE_COMPAT_PROTO ])); +if (l4proto >U16_MAX ) +return -EINVAL ; + + *proto = l4proto; +return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 62/124 drm/amd/display: Fix panel_cntl could be null in dcn21_set_backlight_level()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit e96fddb32931d007db12b1fce9b5e8e4c080401b ]
'panel_cntl' structure used to control the display panel could be null, dereferencing it could lead to a null pointer access.
Fixes the below:drivers/gpu/drm/amd/amdgpu/../display/dc/hwss/dcn21/dcn21_hwseq.c:269 dcn21_set_backlight_level() error: we previously assumed 'panel_cntl' could be null (see line 250)
--- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c +20 -19
@@ -237,34 +237,35 @@ bool dcn21_set_backlight_level(struct pipe_ctx *pipe_ctx, {struct dc_context *dc = pipe_ctx->stream->ctx;struct abm *abm = pipe_ctx->stream_res.abm; +struct timing_generator *tg = pipe_ctx->stream_res.tg;struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl; +uint32_t otg_inst; + +if (!abm && !tg && !panel_cntl) +return false; + + otg_inst = tg->inst;if (dc->dc->res_pool->dmcu) {dce110_set_backlight_level (pipe_ctx, backlight_pwm_u16_16, frame_ramp);return true; } -if (abm !=NULL ) { -uint32_t otg_inst = pipe_ctx->stream_res.tg->inst; - -if (abm && panel_cntl) { -if (abm->funcs && abm->funcs->set_pipe_ex) { - abm->funcs->set_pipe_ex (abm, - otg_inst, -SET_ABM_PIPE_NORMAL , - panel_cntl->inst, - panel_cntl->pwrseq_inst); - }else { -dmub_abm_set_pipe (abm, - otg_inst, -SET_ABM_PIPE_NORMAL , - panel_cntl->inst, - panel_cntl->pwrseq_inst); - } - } +if (abm->funcs && abm->funcs->set_pipe_ex) { + abm->funcs->set_pipe_ex (abm, + otg_inst, +SET_ABM_PIPE_NORMAL , + panel_cntl->inst, + panel_cntl->pwrseq_inst); + }else { +dmub_abm_set_pipe (abm, + otg_inst, +SET_ABM_PIPE_NORMAL , + panel_cntl->inst, + panel_cntl->pwrseq_inst); } -if (abm && abm->funcs && abm->funcs->set_backlight_level_pwm) +if (abm->funcs && abm->funcs->set_backlight_level_pwm) abm->funcs->set_backlight_level_pwm (abm, backlight_pwm_u16_16, frame_ramp,0 , panel_cntl->inst);else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 63/124 drm/amd/display: Add NULL test for timing generator in dcn21_set_pipe()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit 66951d98d9bf45ba25acf37fe0747253fafdf298 ]
In "u32 otg_inst = pipe_ctx->stream_res.tg->inst;" pipe_ctx->stream_res.tg could be NULL, it is relying on the caller to ensure the tg is not NULL.
--- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c +14 -10
@@ -206,28 +206,32 @@ void dcn21_set_abm_immediate_disable(struct pipe_ctx *pipe_ctx)void dcn21_set_pipe (struct pipe_ctx *pipe_ctx) {struct abm *abm = pipe_ctx->stream_res.abm; -uint32_t otg_inst = pipe_ctx->stream_res.tg->inst; +struct timing_generator *tg = pipe_ctx->stream_res.tg;struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl;struct dmcu *dmcu = pipe_ctx->stream->ctx->dc->res_pool->dmcu; +uint32_t otg_inst; + +if (!abm && !tg && !panel_cntl) +return ; + + otg_inst = tg->inst;if (dmcu) {dce110_set_pipe (pipe_ctx);return ; } -if (abm && panel_cntl) { -if (abm->funcs && abm->funcs->set_pipe_ex) { - abm->funcs->set_pipe_ex (abm, +if (abm->funcs && abm->funcs->set_pipe_ex) { + abm->funcs->set_pipe_ex (abm, otg_inst,SET_ABM_PIPE_NORMAL , panel_cntl->inst, panel_cntl->pwrseq_inst); - }else { -dmub_abm_set_pipe (abm, otg_inst, -SET_ABM_PIPE_NORMAL , - panel_cntl->inst, - panel_cntl->pwrseq_inst); - } + }else { +dmub_abm_set_pipe (abm, otg_inst, +SET_ABM_PIPE_NORMAL , + panel_cntl->inst, + panel_cntl->pwrseq_inst); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 64/124 drm/amd/display: Implement bounds check for stream encoder creation in DCN301
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit 58fca355ad37dcb5f785d9095db5f748b79c5dc2 ]
'stream_enc_regs' array is an array of dcn10_stream_enc_registers structures. The array is initialized with four elements, corresponding to the four calls to stream_enc_regs() in the array initializer. This means that valid indices for this array are 0, 1, 2, and 3.
The error message 'stream_enc_regs' 4 <= 5 below, is indicating that there is an attempt to access this array with an index of 5, which is out of bounds. This could lead to undefined behavior
Here, eng_id is used as an index to access the stream_enc_regs array. If eng_id is 5, this would result in an out-of-bounds access on the stream_enc_regs array.
Thus fixing Buffer overflow error in dcn301_stream_encoder_create
reported by Smatch:drivers/gpu/drm/amd/amdgpu/../display/dc/resource/dcn301/dcn301_resource.c:1011 dcn301_stream_encoder_create() error: buffer overflow 'stream_enc_regs' 4 <= 5
--- drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +1 -1
@@ -999,7 +999,7 @@ static struct stream_encoder *dcn301_stream_encoder_create(enum engine_id eng_id vpg =dcn301_vpg_create (ctx, vpg_inst); afmt =dcn301_afmt_create (ctx, afmt_inst); -if (!enc1 || !vpg || !afmt) { +if (!enc1 || !vpg || !afmt || eng_id >=ARRAY_SIZE (stream_enc_regs)) {kfree (enc1);kfree (vpg);kfree (afmt);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 65/124 netfilter: nft_set_pipapo: remove static in nft_pipapo_get()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit ab0beafd52b98dfb8b8244b2c6794efbc87478db ]
This has slipped through when reducing memory footprint for set elements, remove it.
--- net/netfilter/nft_set_pipapo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_set_pipapo.c +1 -1
@@ -603,7 +603,7 @@ static struct nft_elem_priv * nft_pipapo_get(const struct net *net, const struct nft_set *set, const struct nft_set_elem *elem, unsigned int flags) { - static struct nft_pipapo_elem *e; + struct nft_pipapo_elem *e; e =pipapo_get (net, set, (const u8 *)elem->key.val.data,nft_genmask_cur (net));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 66/124 netfilter: nft_ct: reject direction for ct id
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 38ed1c7062ada30d7c11e7a7acc749bf27aa14aa ]
Direction attribute is ignored, reject it in case this ever needs to be supported
--- net/netfilter/nft_ct.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nft_ct.c +3 -0
@@ -476,6 +476,9 @@ static int nft_ct_get_init(const struct nft_ctx *ctx,break ;#endif case NFT_CT_ID : +if (tb[NFTA_CT_DIRECTION ]) +return -EINVAL ; + len =sizeof (u32);break ;default :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 67/124 netfilter: nf_tables: use timestamp to check for set element timeout
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 7395dfacfff65e9938ac0889dafa1ab01e987d15 ]
Add a timestamp field at the beginning of the transaction, store it in the nftables per-netns area.
Update set backend .insert, .deactivate and sync gc path to use the timestamp, this avoids that an element expires while control plane transaction is still unfinished.
.lookup and .update, which are used from packet path, still use the current time to check if the element has expired. And .get path and dump also since this runs lockless under rcu read size lock. Then, there is async gc which also needs to check the current time since it runs asynchronously from a workqueue.
--- include/net/netfilter/nf_tables.h | 16 ++++++++++++++-- net/netfilter/nf_tables_api.c | 4 +++- net/netfilter/nft_set_hash.c | 8 +++++++- net/netfilter/nft_set_pipapo.c | 18 +++++++++++------- net/netfilter/nft_set_rbtree.c | 11 +++++++---- 5 files changed, 42 insertions(+), 15 deletions(-)
include/net/netfilter/nf_tables.h +14 -2
@@ -798,10 +798,16 @@ static inline struct nft_set_elem_expr *nft_set_ext_expr(const struct nft_set_exreturn nft_set_ext (ext,NFT_SET_EXT_EXPRESSIONS ); } -static inline bool nft_set_elem_expired (const struct nft_set_ext *ext) +static inline bool __nft_set_elem_expired (const struct nft_set_ext *ext, +u64 tstamp) {return nft_set_ext_exists (ext,NFT_SET_EXT_EXPIRATION ) && -time_is_before_eq_jiffies64 (*nft_set_ext_expiration (ext)); +time_after_eq64 (tstamp, *nft_set_ext_expiration (ext)); +} + +static inline bool nft_set_elem_expired (const struct nft_set_ext *ext) +{ +return __nft_set_elem_expired (ext,get_jiffies_64 ()); } static inline struct nft_set_ext *nft_set_elem_ext(const struct nft_set *set,
@@ -1750,6 +1756,7 @@ struct nftables_pernet {struct list_head notify_list;struct mutex commit_mutex;u64 table_handle; +u64 tstamp;unsigned int base_seq;unsigned int gc_seq;u8 validate_state;
@@ -1762,6 +1769,11 @@ static inline struct nftables_pernet *nft_pernet(const struct net *net)return net_generic (net, nf_tables_net_id); } +static inline u64 nft_net_tstamp (const struct net *net) +{ +return nft_pernet (net)->tstamp; +} +#define __NFT_REDUCE_READONLY 1UL#define NFT_REDUCE_READONLY (void *)__NFT_REDUCE_READONLY
net/netfilter/nf_tables_api.c +3 -1
@@ -9744,6 +9744,7 @@ struct nft_trans_gc *nft_trans_gc_catchall_async(struct nft_trans_gc *gc,struct nft_trans_gc *nft_trans_gc_catchall_sync (struct nft_trans_gc *gc) {struct nft_set_elem_catchall *catchall, *next; +u64 tstamp =nft_net_tstamp (gc->net);const struct nft_set *set = gc->set;struct nft_elem_priv *elem_priv;struct nft_set_ext *ext;
@@ -9753,7 +9754,7 @@ struct nft_trans_gc *nft_trans_gc_catchall_sync(struct nft_trans_gc *gc)list_for_each_entry_safe (catchall, next, &set->catchall_list, list) { ext =nft_set_elem_ext (set, catchall->elem); -if (!nft_set_elem_expired (ext)) +if (!__nft_set_elem_expired (ext, tstamp))continue ; gc =nft_trans_gc_queue_sync (gc,GFP_KERNEL );
@@ -10539,6 +10540,7 @@ static bool nf_tables_valid_genid(struct net *net, u32 genid)bool genid_ok;mutex_lock (&nft_net->commit_mutex); + nft_net->tstamp =get_jiffies_64 (); genid_ok = genid ==0 || nft_net->base_seq == genid;if (!genid_ok)
net/netfilter/nft_set_hash.c +7 -1
@@ -36,6 +36,7 @@ struct nft_rhash_cmp_arg {const struct nft_set *set;const u32 *key;u8 genmask; +u64 tstamp; };static inline u32 nft_rhash_key (const void *data,u32 len,u32 seed)
@@ -62,7 +63,7 @@ static inline int nft_rhash_cmp(struct rhashtable_compare_arg *arg,return 1 ;if (nft_set_elem_is_dead (&he->ext))return 1 ; -if (nft_set_elem_expired (&he->ext)) +if (__nft_set_elem_expired (&he->ext, x->tstamp))return 1 ;if (!nft_set_elem_active (&he->ext, x->genmask))return 1 ;
@@ -87,6 +88,7 @@ bool nft_rhash_lookup(const struct net *net, const struct nft_set *set, .genmask = nft_genmask_cur(net), .set = set, .key = key, + .tstamp = get_jiffies_64(), }; he =rhashtable_lookup (&priv->ht, &arg, nft_rhash_params);
@@ -106,6 +108,7 @@ nft_rhash_get(const struct net *net, const struct nft_set *set, .genmask = nft_genmask_cur(net), .set = set, .key = elem->key.val.data, + .tstamp = get_jiffies_64(), }; he =rhashtable_lookup (&priv->ht, &arg, nft_rhash_params);
@@ -131,6 +134,7 @@ static bool nft_rhash_update(struct nft_set *set, const u32 *key, .genmask = NFT_GENMASK_ANY, .set = set, .key = key, + .tstamp = get_jiffies_64(), }; he =rhashtable_lookup (&priv->ht, &arg, nft_rhash_params);
@@ -175,6 +179,7 @@ static int nft_rhash_insert(const struct net *net, const struct nft_set *set, .genmask = nft_genmask_next(net), .set = set, .key = elem->key.val.data, + .tstamp = nft_net_tstamp(net), };struct nft_rhash_elem *prev;
@@ -216,6 +221,7 @@ nft_rhash_deactivate(const struct net *net, const struct nft_set *set, .genmask = nft_genmask_next(net), .set = set, .key = elem->key.val.data, + .tstamp = nft_net_tstamp(net), };rcu_read_lock ();
net/netfilter/nft_set_pipapo.c +11 -7
@@ -504,6 +504,7 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set,* @set: nftables API set representation * @data: Key data to be matched against existing elements * @genmask: If set, check that element is active in given genmask +* @tstamp: timestamp to check for expired elements * * This is essentially the same as the lookup function, except that it matches * key data against the uncommitted copy and doesn't use preallocated maps for
@@ -513,7 +514,8 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set,*/ static struct nft_pipapo_elem *pipapo_get (const struct net *net,const struct nft_set *set, -const u8 *data,u8 genmask) +const u8 *data,u8 genmask, +u64 tstamp) {struct nft_pipapo_elem *ret =ERR_PTR (-ENOENT );struct nft_pipapo *priv =nft_set_priv (set);
@@ -566,7 +568,7 @@ static struct nft_pipapo_elem *pipapo_get(const struct net *net, goto out;if (last) { -if (nft_set_elem_expired (&f->mt[b].e->ext)) +if (__nft_set_elem_expired (&f->mt[b].e->ext, tstamp)) goto next_match;if ((genmask && !nft_set_elem_active (&f->mt[b].e->ext, genmask)))
@@ -606,7 +608,7 @@ nft_pipapo_get(const struct net *net, const struct nft_set *set,struct nft_pipapo_elem *e; e =pipapo_get (net, set, (const u8 *)elem->key.val.data, -nft_genmask_cur (net)); +nft_genmask_cur (net),get_jiffies_64 ());if (IS_ERR (e))return ERR_CAST (e);
@@ -1173,6 +1175,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,struct nft_pipapo_match *m = priv->clone;u8 genmask =nft_genmask_next (net);struct nft_pipapo_elem *e, *dup; +u64 tstamp =nft_net_tstamp (net);struct nft_pipapo_field *f;const u8 *start_p, *end_p;int i, bsize_max, err =0 ;
@@ -1182,7 +1185,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,else end = start; - dup =pipapo_get (net, set, start, genmask); + dup =pipapo_get (net, set, start, genmask, tstamp);if (!IS_ERR (dup)) {/* Check if we already have the same exact entry */ const struct nft_data *dup_key, *dup_end;
@@ -1204,7 +1207,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,if (PTR_ERR (dup) == -ENOENT ) {/* Look for partially overlapping entries */ - dup =pipapo_get (net, set, end,nft_genmask_next (net)); + dup =pipapo_get (net, set, end,nft_genmask_next (net), tstamp); }if (PTR_ERR (dup) != -ENOENT ) {
@@ -1560,6 +1563,7 @@ static void pipapo_gc(struct nft_set *set, struct nft_pipapo_match *m) {struct nft_pipapo *priv =nft_set_priv (set);struct net *net =read_pnet (&set->net); +u64 tstamp =nft_net_tstamp (net);int rules_f0, first_rule =0 ;struct nft_pipapo_elem *e;struct nft_trans_gc *gc;
@@ -1594,7 +1598,7 @@ static void pipapo_gc(struct nft_set *set, struct nft_pipapo_match *m)/* synchronous gc never fails, there is no need to set on * NFT_SET_ELEM_DEAD_BIT. */ -if (nft_set_elem_expired (&e->ext)) { +if (__nft_set_elem_expired (&e->ext, tstamp)) { priv->dirty = true; gc =nft_trans_gc_queue_sync (gc,GFP_ATOMIC );
@@ -1769,7 +1773,7 @@ static void *pipapo_deactivate(const struct net *net, const struct nft_set *set, {struct nft_pipapo_elem *e; - e =pipapo_get (net, set, data,nft_genmask_next (net)); + e =pipapo_get (net, set, data,nft_genmask_next (net),nft_net_tstamp (net));if (IS_ERR (e))return NULL ;
net/netfilter/nft_set_rbtree.c +7 -4
@@ -313,6 +313,7 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,struct nft_rbtree *priv =nft_set_priv (set);u8 cur_genmask =nft_genmask_cur (net);u8 genmask =nft_genmask_next (net); +u64 tstamp =nft_net_tstamp (net);int d;/* Descend the tree to search for an existing element greater than the
@@ -360,7 +361,7 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,/* perform garbage collection to avoid bogus overlap reports * but skip new elements in this transaction. */ -if (nft_set_elem_expired (&rbe->ext) && +if (__nft_set_elem_expired (&rbe->ext, tstamp) &&nft_set_elem_active (&rbe->ext, cur_genmask)) {const struct nft_rbtree_elem *removed_end;
@@ -551,6 +552,7 @@ nft_rbtree_deactivate(const struct net *net, const struct nft_set *set,const struct nft_rbtree *priv =nft_set_priv (set);const struct rb_node *parent = priv->root.rb_node;u8 genmask =nft_genmask_next (net); +u64 tstamp =nft_net_tstamp (net);int d;while (parent !=NULL ) {
@@ -571,7 +573,7 @@ nft_rbtree_deactivate(const struct net *net, const struct nft_set *set, nft_rbtree_interval_end(this)) { parent = parent->rb_right;continue ; - } else if (nft_set_elem_expired(&rbe->ext)) { + } else if (__nft_set_elem_expired(&rbe->ext, tstamp)) {break ; } else if (!nft_set_elem_active(&rbe->ext, genmask)) { parent = parent->rb_left;
@@ -624,9 +626,10 @@ static void nft_rbtree_gc(struct nft_set *set) {struct nft_rbtree *priv =nft_set_priv (set);struct nft_rbtree_elem *rbe, *rbe_end =NULL ; +struct net *net =read_pnet (&set->net); +u64 tstamp =nft_net_tstamp (net);struct rb_node *node, *next;struct nft_trans_gc *gc; -struct net *net; set =nft_set_container_of (priv); net =read_pnet (&set->net);
@@ -648,7 +651,7 @@ static void nft_rbtree_gc(struct nft_set *set) rbe_end = rbe;continue ; } -if (!nft_set_elem_expired (&rbe->ext)) +if (!__nft_set_elem_expired (&rbe->ext, tstamp))continue ; gc =nft_trans_gc_queue_sync (gc,GFP_KERNEL );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 68/124 netfilter: nfnetlink_queue: un-break NF_REPEAT
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit f82777e8ce6c039cdcacbcf1eb8619b99a20c06d ]
Only override userspace verdict if the ct hook returns something other than ACCEPT.
Else, this replaces NF_REPEAT (run all hooks again) with NF_ACCEPT (move to next hook).
--- net/netfilter/nfnetlink_queue.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
net/netfilter/nfnetlink_queue.c +10 -3
@@ -232,18 +232,25 @@ static void nfqnl_reinject(struct nf_queue_entry *entry, unsigned int verdict)if (verdict ==NF_ACCEPT || verdict ==NF_REPEAT || verdict ==NF_STOP ) { +unsigned int ct_verdict = verdict; +rcu_read_lock (); ct_hook =rcu_dereference (nf_ct_hook);if (ct_hook) - verdict = ct_hook->update (entry->state.net, entry->skb); + ct_verdict = ct_hook->update (entry->state.net, entry->skb);rcu_read_unlock (); -switch (verdict &NF_VERDICT_MASK ) { +switch (ct_verdict &NF_VERDICT_MASK ) { +case NF_ACCEPT : +/* follow userspace verdict, could be REPEAT */ +break ;case NF_STOLEN :nf_queue_entry_free (entry);return ; +default : + verdict = ct_verdict &NF_VERDICT_MASK ; +break ; } - }nf_reinject (entry, verdict); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 69/124 netfilter: nft_set_pipapo: store index in scratch maps
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 76313d1a4aa9e30d5b43dee5efd8bcd4d8250006 ]
Pipapo needs a scratchpad area to keep state during matching. This state can be large and thus cannot reside on stack.
Each set preallocates percpu areas for this.
On each match stage, one scratchpad half starts with all-zero and the other is inited to all-ones.
At the end of each stage, the half that starts with all-ones is always zero. Before next field is tested, pointers to the two halves are swapped, i.e. resmap pointer turns into fill pointer and vice versa.
After the last field has been processed, pipapo stashes the index toggle in a percpu variable, with assumption that next packet will start with the all-zero half and sets all bits in the other to 1.
This isn't reliable.
There can be multiple sets and we can't be sure that the upper and lower half of all set scratch map is always in sync (lookups can be conditional), so one set might have swapped, but other might not have been queried.
Thus we need to keep the index per-set-and-cpu, just like the scratchpad.
Note that this bug fix is incomplete, there is a related issue.
avx2 and normal implementation might use slightly different areas of the map array space due to the avx2 alignment requirements, so m->scratch (generic/fallback implementation) and ->scratch_aligned (avx) may partially overlap. scratch and scratch_aligned are not distinct objects, the latter is just the aligned address of the former.
After this change, write to scratch_align->map_index may write to scratch->map, so this issue becomes more prominent, we can set to 1 a bit in the supposedly-all-zero area of scratch->map[].
A followup patch will remove the scratch_aligned and makes generic and avx code use the same (aligned) area.
Its done in a separate change to ease review.
--- net/netfilter/nft_set_pipapo.c | 41 ++++++++++++++++++----------- net/netfilter/nft_set_pipapo.h | 14 ++++++++-- net/netfilter/nft_set_pipapo_avx2.c | 15 +++++------ 3 files changed, 44 insertions(+), 26 deletions(-)
net/netfilter/nft_set_pipapo.c +25 -16
@@ -342,9 +342,6 @@#include "nft_set_pipapo_avx2.h" #include "nft_set_pipapo.h" -/* Current working bitmap index, toggled between field matches */ -static DEFINE_PER_CPU(bool, nft_pipapo_scratch_index); -/** * pipapo_refill() - For each set bit, set bits from selected mapping table item * @map: Bitmap to be scanned for set bits
@@ -412,6 +409,7 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, const u32 *key, const struct nft_set_ext **ext) { struct nft_pipapo *priv = nft_set_priv(set); +struct nft_pipapo_scratch *scratch;unsigned long *res_map, *fill_map;u8 genmask =nft_genmask_cur (net);const u8 *rp = (const u8 *)key;
@@ -422,15 +420,17 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set,local_bh_disable (); - map_index =raw_cpu_read (nft_pipapo_scratch_index); - m =rcu_dereference (priv->match);if (unlikely (!m || !*raw_cpu_ptr (m->scratch))) goto out; - res_map = *raw_cpu_ptr (m->scratch) + (map_index ? m->bsize_max :0 ); - fill_map = *raw_cpu_ptr (m->scratch) + (map_index ?0 : m->bsize_max); + scratch = *raw_cpu_ptr (m->scratch); + + map_index = scratch->map_index; + + res_map = scratch->map + (map_index ? m->bsize_max :0 ); + fill_map = scratch->map + (map_index ?0 : m->bsize_max);memset (res_map,0xff , m->bsize_max *sizeof (*res_map));
@@ -460,7 +460,7 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, b =pipapo_refill (res_map, f->bsize, f->rules, fill_map, f->mt, last);if (b <0 ) { -raw_cpu_write (nft_pipapo_scratch_index, map_index); + scratch->map_index = map_index;local_bh_enable ();return false;
@@ -477,7 +477,7 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set,* current inactive bitmap is clean and can be reused as * *next* bitmap (not initial) for the next packet. */ -raw_cpu_write (nft_pipapo_scratch_index, map_index); + scratch->map_index = map_index;local_bh_enable ();return true;
@@ -1123,12 +1123,12 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone,int i;for_each_possible_cpu (i) { -unsigned long *scratch; +struct nft_pipapo_scratch *scratch;#ifdef NFT_PIPAPO_ALIGN -unsigned long *scratch_aligned; +void *scratch_aligned;#endif - - scratch =kzalloc_node (bsize_max *sizeof (*scratch) *2 + + scratch =kzalloc_node (struct_size (scratch, map, + bsize_max *2 ) +NFT_PIPAPO_ALIGN_HEADROOM ,GFP_KERNEL ,cpu_to_node (i));if (!scratch) {
@@ -1147,7 +1147,16 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone, *per_cpu_ptr (clone->scratch, i) = scratch;#ifdef NFT_PIPAPO_ALIGN - scratch_aligned =NFT_PIPAPO_LT_ALIGN (scratch); +/* Align &scratch->map (not the struct itself): the extra +* %NFT_PIPAPO_ALIGN_HEADROOM bytes passed to kzalloc_node() +* above guarantee we can waste up to those bytes in order +* to align the map field regardless of its offset within +* the struct. +*/ +BUILD_BUG_ON (offsetof(struct nft_pipapo_scratch , map) >NFT_PIPAPO_ALIGN_HEADROOM ); + + scratch_aligned =NFT_PIPAPO_LT_ALIGN (&scratch->map); + scratch_aligned -= offsetof(struct nft_pipapo_scratch , map); *per_cpu_ptr (clone->scratch_aligned, i) = scratch_aligned;#endif }
@@ -2136,7 +2145,7 @@ static int nft_pipapo_init(const struct nft_set *set, m->field_count = field_count; m->bsize_max =0 ; - m->scratch = alloc_percpu(unsigned long *); + m->scratch = alloc_percpu(struct nft_pipapo_scratch *);if (!m->scratch) { err = -ENOMEM ; goto out_scratch;
@@ -2145,7 +2154,7 @@ static int nft_pipapo_init(const struct nft_set *set, *per_cpu_ptr (m->scratch, i) =NULL ;#ifdef NFT_PIPAPO_ALIGN - m->scratch_aligned = alloc_percpu(unsigned long *); + m->scratch_aligned = alloc_percpu(struct nft_pipapo_scratch *);if (!m->scratch_aligned) { err = -ENOMEM ; goto out_free;
net/netfilter/nft_set_pipapo.h +12 -2
@@ -130,6 +130,16 @@ struct nft_pipapo_field {union nft_pipapo_map_bucket *mt; }; +/** +* struct nft_pipapo_scratch - percpu data used for lookup and matching +* @map_index: Current working bitmap index, toggled between field matches +* @map: store partial matching results during lookup +*/ +struct nft_pipapo_scratch { +u8 map_index; +unsigned long map[]; +}; +/** * struct nft_pipapo_match - Data used for lookup and matching * @field_count Amount of fields in set
@@ -142,9 +152,9 @@ struct nft_pipapo_field {struct nft_pipapo_match {int field_count;#ifdef NFT_PIPAPO_ALIGN -unsigned long *__percpu *scratch_aligned; +struct nft_pipapo_scratch *__percpu *scratch_aligned;#endif -unsigned long *__percpu *scratch; +struct nft_pipapo_scratch *__percpu *scratch;size_t bsize_max;struct rcu_head rcu; struct nft_pipapo_field f[] __counted_by(field_count);
net/netfilter/nft_set_pipapo_avx2.c +7 -8
@@ -71,9 +71,6 @@#define NFT_PIPAPO_AVX2_ZERO (reg) \ asm volatile("vpxor %ymm" #reg ", %ymm" #reg ", %ymm" #reg) -/* Current working bitmap index, toggled between field matches */ -static DEFINE_PER_CPU(bool, nft_pipapo_avx2_scratch_index); -/** * nft_pipapo_avx2_prepare() - Prepare before main algorithm body *
@@ -1120,11 +1117,12 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set, const u32 *key, const struct nft_set_ext **ext) { struct nft_pipapo *priv = nft_set_priv(set); -unsigned long *res, *fill, *scratch; +struct nft_pipapo_scratch *scratch;u8 genmask =nft_genmask_cur (net);const u8 *rp = (const u8 *)key;struct nft_pipapo_match *m;struct nft_pipapo_field *f; +unsigned long *res, *fill;bool map_index;int i, ret =0 ;
@@ -1146,10 +1144,11 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set,kernel_fpu_end ();return false; } - map_index =raw_cpu_read (nft_pipapo_avx2_scratch_index); - res = scratch + (map_index ? m->bsize_max :0 ); - fill = scratch + (map_index ?0 : m->bsize_max); + map_index = scratch->map_index; + + res = scratch->map + (map_index ? m->bsize_max :0 ); + fill = scratch->map + (map_index ?0 : m->bsize_max);/* Starting map doesn't need to be set for this implementation */
@@ -1221,7 +1220,7 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set, out:if (i %2 ) -raw_cpu_write (nft_pipapo_avx2_scratch_index, !map_index); + scratch->map_index = !map_index;kernel_fpu_end ();return ret >=0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 70/124 netfilter: nft_set_pipapo: add helper to release pcpu scratch area
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 47b1c03c3c1a119435480a1e73f27197dc59131d ]
After next patch simple kfree() is not enough anymore, so add a helper for it.
Stable-dep-of: 5a8cdf6fd860 ("netfilter: nft_set_pipapo: remove scratch_aligned pointer")
--- net/netfilter/nft_set_pipapo.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-)
net/netfilter/nft_set_pipapo.c +23 -5
@@ -1110,6 +1110,24 @@ static void pipapo_map(struct nft_pipapo_match *m, f->mt[map[i].to + j].e = e; } +/** +* pipapo_free_scratch() - Free per-CPU map at original (not aligned) address +* @m: Matching data +* @cpu: CPU number +*/ +static void pipapo_free_scratch (const struct nft_pipapo_match *m,unsigned int cpu) +{ +struct nft_pipapo_scratch *s; +void *mem; + + s = *per_cpu_ptr (m->scratch, cpu); +if (!s) +return ; + + mem = s; +kfree (mem); +} +/** * pipapo_realloc_scratch() - Reallocate scratch maps for partial match results * @clone: Copy of matching data with pending insertions and deletions
@@ -1142,7 +1160,7 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone,return -ENOMEM ; } -kfree (*per_cpu_ptr (clone->scratch, i)); +pipapo_free_scratch (clone, i); *per_cpu_ptr (clone->scratch, i) = scratch;
@@ -1369,7 +1387,7 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old) } out_scratch_realloc:for_each_possible_cpu (i) -kfree (*per_cpu_ptr (new->scratch, i)); +pipapo_free_scratch (new, i);#ifdef NFT_PIPAPO_ALIGN free_percpu (new->scratch_aligned);#endif
@@ -1653,7 +1671,7 @@ static void pipapo_free_match(struct nft_pipapo_match *m)int i;for_each_possible_cpu (i) -kfree (*per_cpu_ptr (m->scratch, i)); +pipapo_free_scratch (m, i);#ifdef NFT_PIPAPO_ALIGN free_percpu (m->scratch_aligned);
@@ -2253,7 +2271,7 @@ static void nft_pipapo_destroy(const struct nft_ctx *ctx,free_percpu (m->scratch_aligned);#endif for_each_possible_cpu (cpu) -kfree (*per_cpu_ptr (m->scratch, cpu)); +pipapo_free_scratch (m, cpu);free_percpu (m->scratch);pipapo_free_fields (m);kfree (m);
@@ -2270,7 +2288,7 @@ static void nft_pipapo_destroy(const struct nft_ctx *ctx,free_percpu (priv->clone->scratch_aligned);#endif for_each_possible_cpu (cpu) -kfree (*per_cpu_ptr (priv->clone->scratch, cpu)); +pipapo_free_scratch (priv->clone, cpu);free_percpu (priv->clone->scratch);pipapo_free_fields (priv->clone);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 71/124 netfilter: nft_set_pipapo: remove scratch_aligned pointer
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 5a8cdf6fd860ac5e6d08d72edbcecee049a7fec4 ]
use ->scratch for both avx2 and the generic implementation.
After previous change the scratch->map member is always aligned properly for AVX2, so we can just use scratch->map in AVX2 too.
The alignoff delta is stored in the scratchpad so we can reconstruct the correct address to free the area again.
--- net/netfilter/nft_set_pipapo.c | 41 +++++------------------------ net/netfilter/nft_set_pipapo.h | 6 ++--- net/netfilter/nft_set_pipapo_avx2.c | 2 +- 3 files changed, 10 insertions(+), 39 deletions(-)
net/netfilter/nft_set_pipapo.c +7 -34
@@ -1125,6 +1125,7 @@ static void pipapo_free_scratch(const struct nft_pipapo_match *m, unsigned int creturn ; mem = s; + mem -= s->align_off;kfree (mem); }
@@ -1144,6 +1145,7 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone,struct nft_pipapo_scratch *scratch;#ifdef NFT_PIPAPO_ALIGN void *scratch_aligned; +u32 align_off;#endif scratch = kzalloc_node(struct_size(scratch, map, bsize_max * 2) +
@@ -1162,8 +1164,6 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone,pipapo_free_scratch (clone, i); - *per_cpu_ptr (clone->scratch, i) = scratch; -#ifdef NFT_PIPAPO_ALIGN /* Align &scratch->map (not the struct itself): the extra * %NFT_PIPAPO_ALIGN_HEADROOM bytes passed to kzalloc_node()
@@ -1175,8 +1175,12 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone, scratch_aligned =NFT_PIPAPO_LT_ALIGN (&scratch->map); scratch_aligned -= offsetof(struct nft_pipapo_scratch , map); - *per_cpu_ptr (clone->scratch_aligned, i) = scratch_aligned; + align_off = scratch_aligned - (void *)scratch; + + scratch = scratch_aligned; + scratch->align_off = align_off;#endif + *per_cpu_ptr (clone->scratch, i) = scratch; }return 0 ;
@@ -1331,11 +1335,6 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old)if (!new->scratch) goto out_scratch; -#ifdef NFT_PIPAPO_ALIGN - new->scratch_aligned =alloc_percpu (*new->scratch_aligned); -if (!new->scratch_aligned) - goto out_scratch; -#endif for_each_possible_cpu (i) *per_cpu_ptr (new->scratch, i) =NULL ;
@@ -1388,9 +1387,6 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old) out_scratch_realloc:for_each_possible_cpu (i)pipapo_free_scratch (new, i); -#ifdef NFT_PIPAPO_ALIGN -free_percpu (new->scratch_aligned); -#endif out_scratch:free_percpu (new->scratch);kfree (new);
@@ -1673,11 +1669,7 @@ static void pipapo_free_match(struct nft_pipapo_match *m)for_each_possible_cpu (i)pipapo_free_scratch (m, i); -#ifdef NFT_PIPAPO_ALIGN -free_percpu (m->scratch_aligned); -#endif free_percpu (m->scratch); -pipapo_free_fields (m);kfree (m);
@@ -2171,16 +2163,6 @@ static int nft_pipapo_init(const struct nft_set *set,for_each_possible_cpu (i) *per_cpu_ptr (m->scratch, i) =NULL ; -#ifdef NFT_PIPAPO_ALIGN - m->scratch_aligned = alloc_percpu(struct nft_pipapo_scratch *); -if (!m->scratch_aligned) { - err = -ENOMEM ; - goto out_free; - } -for_each_possible_cpu (i) - *per_cpu_ptr (m->scratch_aligned, i) =NULL ; -#endif -rcu_head_init (&m->rcu);nft_pipapo_for_each_field (f, i, m) {
@@ -2211,9 +2193,6 @@ static int nft_pipapo_init(const struct nft_set *set,return 0 ; out_free: -#ifdef NFT_PIPAPO_ALIGN -free_percpu (m->scratch_aligned); -#endif free_percpu (m->scratch); out_scratch:kfree (m);
@@ -2267,9 +2246,6 @@ static void nft_pipapo_destroy(const struct nft_ctx *ctx,nft_set_pipapo_match_destroy (ctx, set, m); -#ifdef NFT_PIPAPO_ALIGN -free_percpu (m->scratch_aligned); -#endif for_each_possible_cpu (cpu)pipapo_free_scratch (m, cpu);free_percpu (m->scratch);
@@ -2284,9 +2260,6 @@ static void nft_pipapo_destroy(const struct nft_ctx *ctx,if (priv->dirty)nft_set_pipapo_match_destroy (ctx, set, m); -#ifdef NFT_PIPAPO_ALIGN -free_percpu (priv->clone->scratch_aligned); -#endif for_each_possible_cpu (cpu)pipapo_free_scratch (priv->clone, cpu);free_percpu (priv->clone->scratch);
net/netfilter/nft_set_pipapo.h +2 -4
@@ -133,10 +133,12 @@ struct nft_pipapo_field {/** * struct nft_pipapo_scratch - percpu data used for lookup and matching * @map_index: Current working bitmap index, toggled between field matches +* @align_off: Offset to get the originally allocated address * @map: store partial matching results during lookup */ struct nft_pipapo_scratch {u8 map_index; +u32 align_off;unsigned long map[]; };
@@ -144,16 +146,12 @@ struct nft_pipapo_scratch {* struct nft_pipapo_match - Data used for lookup and matching * @field_count Amount of fields in set * @scratch: Preallocated per-CPU maps for partial matching results -* @scratch_aligned: Version of @scratch aligned to NFT_PIPAPO_ALIGN bytes * @bsize_max: Maximum lookup table bucket size of all fields, in longs * @rcu Matching data is swapped on commits * @f: Fields, with lookup and mapping tables */ struct nft_pipapo_match {int field_count; -#ifdef NFT_PIPAPO_ALIGN -struct nft_pipapo_scratch *__percpu *scratch_aligned; -#endif struct nft_pipapo_scratch *__percpu *scratch;size_t bsize_max;struct rcu_head rcu;
net/netfilter/nft_set_pipapo_avx2.c +1 -1
@@ -1139,7 +1139,7 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set,*/ kernel_fpu_begin_mask (0 ); - scratch = *raw_cpu_ptr (m->scratch_aligned); + scratch = *raw_cpu_ptr (m->scratch);if (unlikely (!scratch)) {kernel_fpu_end ();return false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 72/124 fs/ntfs3: Fix an NULL dereference bug
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit b2dd7b953c25ffd5912dda17e980e7168bebcf6c ]
The issue here is when this is called from ntfs_load_attr_list(). The "size" comes from le32_to_cpu(attr->res.data_size) so it can't overflow on a 64bit systems but on 32bit systems the "+ 1023" can overflow and the result is zero. This means that the kmalloc will succeed by returning the ZERO_SIZE_PTR and then the memcpy() will crash with an Oops on the next line.
--- fs/ntfs3/ntfs_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ntfs3/ntfs_fs.h +1 -1
@@ -473,7 +473,7 @@ bool al_delete_le(struct ntfs_inode *ni, enum ATTR_TYPE type, CLST vcn,int al_update (struct ntfs_inode *ni,int sync);static inline size_t al_aligned (size_t size) { -return (size +1023 ) & ~(size_t )1023 ; +return size_add (size,1023 ) & ~(size_t )1023 ; }/* Globals from bitfunc.c */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 73/124 mm: Introduce flush_cache_vmap_early()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Ghiti <[email protected]>
[ Upstream commit 7a92fc8b4d20680e4c20289a670d8fca2d1f2c1b ]
The pcpu setup when using the page allocator sets up a new vmalloc mapping very early in the boot process, so early that it cannot use the flush_cache_vmap() function which may depend on structures not yet initialized (for example in riscv, we currently send an IPI to flush other cpus TLB).
But on some architectures, we must call flush_cache_vmap(): for example, in riscv, some uarchs can cache invalid TLB entries so we need to flush the new established mapping to avoid taking an exception.
So fix this by introducing a new function flush_cache_vmap_early() which is called right after setting the new page table entry and before accessing this new mapping. This new function implements a local flush tlb on riscv and is no-op for other architectures (same as today).
Stable-dep-of: d9807d60c145 ("riscv: mm: execute local TLB flush after populating vmemmap")
--- arch/arc/include/asm/cacheflush.h | 1 + arch/arm/include/asm/cacheflush.h | 2 ++ arch/csky/abiv1/inc/abi/cacheflush.h | 1 + arch/csky/abiv2/inc/abi/cacheflush.h | 1 + arch/m68k/include/asm/cacheflush_mm.h | 1 + arch/mips/include/asm/cacheflush.h | 2 ++ arch/nios2/include/asm/cacheflush.h | 1 + arch/parisc/include/asm/cacheflush.h | 1 + arch/riscv/include/asm/cacheflush.h | 3 ++- arch/riscv/include/asm/tlbflush.h | 1 + arch/riscv/mm/tlbflush.c | 5 +++++ arch/sh/include/asm/cacheflush.h | 1 + arch/sparc/include/asm/cacheflush_32.h | 1 + arch/sparc/include/asm/cacheflush_64.h | 1 + arch/xtensa/include/asm/cacheflush.h | 6 ++++-- include/asm-generic/cacheflush.h | 6 ++++++ mm/percpu.c | 8 +------- 17 files changed, 32 insertions(+), 10 deletions(-)
arch/arc/include/asm/cacheflush.h +1 -0
@@ -40,6 +40,7 @@ void dma_cache_wback(phys_addr_t start, unsigned long sz);/* TBD: optimize this */ #define flush_cache_vmap (start, end) flush_cache_all() +#define flush_cache_vmap_early (start, end) do { } while (0)#define flush_cache_vunmap (start, end) flush_cache_all()#define flush_cache_dup_mm (mm)/* called on fork (VIVT only) */
arch/arm/include/asm/cacheflush.h +2 -0
@@ -340,6 +340,8 @@ static inline void flush_cache_vmap(unsigned long start, unsigned long end)dsb (ishst); } +#define flush_cache_vmap_early (start, end) do { } while (0) +static inline void flush_cache_vunmap (unsigned long start,unsigned long end) {if (!cache_is_vipt_nonaliasing ())
arch/csky/abiv1/inc/abi/cacheflush.h +1 -0
@@ -43,6 +43,7 @@ static inline void flush_anon_page(struct vm_area_struct *vma,*/ extern void flush_cache_range (struct vm_area_struct *vma,unsigned long start,unsigned long end);#define flush_cache_vmap (start, end) cache_wbinv_all() +#define flush_cache_vmap_early (start, end) do { } while (0)#define flush_cache_vunmap (start, end) cache_wbinv_all()#define flush_icache_range (start, end) cache_wbinv_range(start, end)
arch/csky/abiv2/inc/abi/cacheflush.h +1 -0
@@ -41,6 +41,7 @@ void flush_icache_mm_range(struct mm_struct *mm,void flush_icache_deferred (struct mm_struct *mm);#define flush_cache_vmap (start, end) do { } while (0) +#define flush_cache_vmap_early (start, end) do { } while (0)#define flush_cache_vunmap (start, end) do { } while (0)#define copy_to_user_page (vma, page, vaddr, dst, src, len) \
arch/m68k/include/asm/cacheflush_mm.h +1 -0
@@ -191,6 +191,7 @@ extern void cache_push_v(unsigned long vaddr, int len);#define flush_cache_all () __flush_cache_all()#define flush_cache_vmap (start, end) flush_cache_all() +#define flush_cache_vmap_early (start, end) do { } while (0)#define flush_cache_vunmap (start, end) flush_cache_all()static inline void flush_cache_mm (struct mm_struct *mm)
arch/mips/include/asm/cacheflush.h +2 -0
@@ -97,6 +97,8 @@ static inline void flush_cache_vmap(unsigned long start, unsigned long end)__flush_cache_vmap (); } +#define flush_cache_vmap_early (start, end) do { } while (0) +extern void (*__flush_cache_vunmap)(void );static inline void flush_cache_vunmap (unsigned long start,unsigned long end)
arch/nios2/include/asm/cacheflush.h +1 -0
@@ -38,6 +38,7 @@ void flush_icache_pages(struct vm_area_struct *vma, struct page *page,#define flush_icache_pages flush_icache_pages#define flush_cache_vmap (start, end) flush_dcache_range(start, end) +#define flush_cache_vmap_early (start, end) do { } while (0)#define flush_cache_vunmap (start, end) flush_dcache_range(start, end) extern void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
arch/parisc/include/asm/cacheflush.h +1 -0
@@ -41,6 +41,7 @@ void flush_kernel_vmap_range(void *vaddr, int size);void invalidate_kernel_vmap_range (void *vaddr,int size);#define flush_cache_vmap (start, end) flush_cache_all() +#define flush_cache_vmap_early (start, end) do { } while (0)#define flush_cache_vunmap (start, end) flush_cache_all()void flush_dcache_folio (struct folio *folio);
arch/riscv/include/asm/cacheflush.h +2 -1
@@ -37,7 +37,8 @@ static inline void flush_dcache_page(struct page *page) flush_icache_mm(vma->vm_mm, 0)#ifdef CONFIG_64BIT -#define flush_cache_vmap (start, end) flush_tlb_kernel_range(start, end) +#define flush_cache_vmap (start, end) flush_tlb_kernel_range(start, end) +#define flush_cache_vmap_early (start, end) local_flush_tlb_kernel_range(start, end)#endif #ifndef CONFIG_SMP
arch/riscv/include/asm/tlbflush.h +1 -0
@@ -41,6 +41,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr);void flush_tlb_range (struct vm_area_struct *vma,unsigned long start,unsigned long end);void flush_tlb_kernel_range (unsigned long start,unsigned long end); +void local_flush_tlb_kernel_range (unsigned long start,unsigned long end);#ifdef CONFIG_TRANSPARENT_HUGEPAGE #define __HAVE_ARCH_FLUSH_PMD_TLB_RANGE void flush_pmd_tlb_range(struct vm_area_struct *vma, unsigned long start,
arch/riscv/mm/tlbflush.c +5 -0
@@ -66,6 +66,11 @@ static inline void local_flush_tlb_range_asid(unsigned long start,local_flush_tlb_range_threshold_asid (start, size, stride, asid); } +void local_flush_tlb_kernel_range (unsigned long start,unsigned long end) +{ +local_flush_tlb_range_asid (start, end,PAGE_SIZE ,FLUSH_TLB_NO_ASID ); +} +static void __ipi_flush_tlb_all (void *info) {local_flush_tlb_all ();
arch/sh/include/asm/cacheflush.h +1 -0
@@ -90,6 +90,7 @@ extern void copy_from_user_page(struct vm_area_struct *vma, unsigned long len);#define flush_cache_vmap (start, end) local_flush_cache_all(NULL) +#define flush_cache_vmap_early (start, end) do { } while (0)#define flush_cache_vunmap (start, end) local_flush_cache_all(NULL)#define flush_dcache_mmap_lock (mapping) do { } while (0)
arch/sparc/include/asm/cacheflush_32.h +1 -0
@@ -48,6 +48,7 @@ static inline void flush_dcache_page(struct page *page)#define flush_dcache_mmap_unlock (mapping) do { } while (0)#define flush_cache_vmap (start, end) flush_cache_all() +#define flush_cache_vmap_early (start, end) do { } while (0)#define flush_cache_vunmap (start, end) flush_cache_all()/* When a context switch happens we must flush all user windows so that
arch/sparc/include/asm/cacheflush_64.h +1 -0
@@ -75,6 +75,7 @@ void flush_ptrace_access(struct vm_area_struct *, struct page *,#define flush_dcache_mmap_unlock (mapping) do { } while (0)#define flush_cache_vmap (start, end) do { } while (0) +#define flush_cache_vmap_early (start, end) do { } while (0)#define flush_cache_vunmap (start, end) do { } while (0)#endif /* !__ASSEMBLY__ */
arch/xtensa/include/asm/cacheflush.h +4 -2
@@ -116,8 +116,9 @@ void flush_cache_page(struct vm_area_struct*,#define flush_cache_mm (mm) flush_cache_all()#define flush_cache_dup_mm (mm) flush_cache_mm(mm) -#define flush_cache_vmap (start,end) flush_cache_all() -#define flush_cache_vunmap (start,end) flush_cache_all() +#define flush_cache_vmap (start,end) flush_cache_all() +#define flush_cache_vmap_early (start,end) do { } while (0) +#define flush_cache_vunmap (start,end) flush_cache_all()void flush_dcache_folio (struct folio *folio);#define flush_dcache_folio flush_dcache_folio
@@ -140,6 +141,7 @@ void local_flush_cache_page(struct vm_area_struct *vma,#define flush_cache_dup_mm (mm) do { } while (0)#define flush_cache_vmap (start,end) do { } while (0) +#define flush_cache_vmap_early (start,end) do { } while (0)#define flush_cache_vunmap (start,end) do { } while (0)#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
include/asm-generic/cacheflush.h +6 -0
@@ -91,6 +91,12 @@ static inline void flush_cache_vmap(unsigned long start, unsigned long end) }#endif +#ifndef flush_cache_vmap_early +static inline void flush_cache_vmap_early (unsigned long start,unsigned long end) +{ +} +#endif +#ifndef flush_cache_vunmapstatic inline void flush_cache_vunmap (unsigned long start,unsigned long end) {
mm/percpu.c +1 -7
@@ -3333,13 +3333,7 @@ int __init pcpu_page_first_chunk(size_t reserved_size, pcpu_fc_cpu_to_node_fn_tif (rc <0 )panic ("failed to map percpu area, err=%d\n" , rc); -/* -* FIXME: Archs with virtual cache should flush local -* cache for the linear mapping here - something -* equivalent to flush_cache_vmap() on the local cpu. -* flush_cache_vmap() can't be used as most supporting -* data structures are not set up yet. -*/ +flush_cache_vmap_early (unit_addr, unit_addr + ai->unit_size);/* copy static data */ memcpy ((void *)unit_addr, __per_cpu_load, ai->static_size);
Signature · 1 line
2.43.0
Re: [PATCH 6.7 073/124] mm: Introduce flush_cache_vmap_early()
Quoted 13 lines · Greg Kroah-Hartman
6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Ghiti <[email protected]>
[ Upstream commit
7a92fc8b4d20680e4c20289a670d8fca2d1f2c1b]The pcpu setup when using the page allocator sets up a new vmalloc mapping very early in the boot process, so early that it cannot use the
flush_cache_vmap()function which may depend on structures not yet initialized (for example in riscv, we currently send an IPI to flush other cpus TLB).
...
arch/riscv/mm/tlbflush.c static inline void local_flush_tlb_range_asid(unsigned long start, · line 71
Quoted 9 lines
arch/riscv/mm/tlbflush.c +3
-0@@ -66,6 +66,11 @@ static inline void local_flush_tlb_range_asid(unsigned long start,local_flush_tlb_range_threshold_asid (start, size, stride, asid); } +void local_flush_tlb_kernel_range (unsigned long start,unsigned long end) +{ +local_flush_tlb_range_asid (start, end,PAGE_SIZE ,FLUSH_TLB_NO_ASID );
This apparently requires also:
commit ebd4acc0cbeae9efea15993b11b05bd32942f3f0
Author: Alexandre Ghiti <[email protected]> Date: Tue Jan 23 14:27:30 2024 +0100
riscv: Fix wrong size passed to local_flush_tlb_range_asid()
thanks,
Signature · 2 lines
js suse labs
Re: [PATCH 6.7 073/124] mm: Introduce flush_cache_vmap_early()
Quoted 32 lines · Jiri Slaby
Quoted 13 lines · Greg Kroah-Hartman
6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Ghiti <[email protected]>
[ Upstream commit
7a92fc8b4d20680e4c20289a670d8fca2d1f2c1b]The pcpu setup when using the page allocator sets up a new vmalloc mapping very early in the boot process, so early that it cannot use the
flush_cache_vmap()function which may depend on structures not yet initialized (for example in riscv, we currently send an IPI to flush other cpus TLB)....
arch/riscv/mm/tlbflush.c static inline void · line 73
Quoted 11 lines
arch/riscv/mm/tlbflush.c +3
-0@@ -66,6 +66,11 @@ static inline void local_flush_tlb_range_asid(unsigned long start, local_flush_tlb_range_threshold_asid(start, size, stride, asid); } +void local_flush_tlb_kernel_range(unsigned long start, unsigned long end) +{ + local_flush_tlb_range_asid(start, end, PAGE_SIZE, FLUSH_TLB_NO_ASID);This apparently requires also:
commitebd4acc0cbeae9efea15993b11b05bd32942f3f0
Author: Alexandre Ghiti <[email protected]>
Date: Tue Jan 23 14:27:30 2024 +0100
Quoted 1 line
riscv: Fix wrong size passed to
local_flush_tlb_range_asid()
Ah,
the very same fix is contained in 074 as:
commit d9807d60c145836043ffa602328ea1d66dc458b1
Author: Vincent Chen <[email protected]> Date: Wed Jan 17 22:03:33 2024 +0800
riscv: mm: execute local TLB flush after populating vmemmap
So ebd4acc0c above is redundant (nothing is needed to be done here).
sorry for the noise,
Signature · 2 lines
js suse labs
Greg Kroah-Hartman
maintainerRe: [PATCH 6.7 073/124] mm: Introduce flush_cache_vmap_early()
Quoted 41 lines · Jiri Slaby
Quoted 34 lines · Jiri Slaby
Quoted 14 lines · Greg Kroah-Hartman
6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Ghiti <[email protected]>
[ Upstream commit
7a92fc8b4d20680e4c20289a670d8fca2d1f2c1b]The pcpu setup when using the page allocator sets up a new vmalloc mapping very early in the boot process, so early that it cannot use the
flush_cache_vmap()function which may depend on structures not yet initialized (for example in riscv, we currently send an IPI to flush other cpus TLB)....
arch/riscv/mm/tlbflush.c static inline void · line 74
Quoted 12 lines
arch/riscv/mm/tlbflush.c +3
-0@@ -66,6 +66,11 @@ static inline void local_flush_tlb_range_asid(unsigned long start, local_flush_tlb_range_threshold_asid(start, size, stride, asid); } +void local_flush_tlb_kernel_range(unsigned long start, unsigned long end) +{ + local_flush_tlb_range_asid(start, end, PAGE_SIZE, FLUSH_TLB_NO_ASID);This apparently requires also:
commitebd4acc0cbeae9efea15993b11b05bd32942f3f0
Author: Alexandre Ghiti <[email protected]>
Date: Tue Jan 23 14:27:30 2024 +0100Quoted 1 line
riscv: Fix wrong size passed to
local_flush_tlb_range_asid()Ah,
the very same fix is contained in 074 as:
commitd9807d60c145836043ffa602328ea1d66dc458b1
Quoted 7 lines
Author: Vincent Chen <[email protected]> Date: Wed Jan 17 22:03:33 2024 +0800riscv: mm: execute local TLB flush after populating vmemmap
So
ebd4acc0cabove is redundant (nothing is needed to be done here).
Not noise at all, thanks for checking!
greg k-h
Greg Kroah-Hartman
maintainerPATCH 74/124 riscv: mm: execute local TLB flush after populating vmemmap
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vincent Chen <[email protected]>
[ Upstream commit d9807d60c145836043ffa602328ea1d66dc458b1 ]
The spare_init() calls memmap_populate() many times to create VA to PA mapping for the VMEMMAP area, where all "struct page" are located once CONFIG_SPARSEMEM_VMEMMAP is defined. These "struct page" are later initialized in the zone_sizes_init() function. However, during this process, no sfence.vma instruction is executed for this VMEMMAP area. This omission may cause the hart to fail to perform page table walk because some data related to the address translation is invisible to the hart. To solve this issue, the local_flush_tlb_kernel_range() is called right after the sparse_init() to execute a sfence.vma instruction for this VMEMMAP area, ensuring that all data related to the address translation is visible to the hart.
--- arch/riscv/include/asm/tlbflush.h | 1 + arch/riscv/mm/init.c | 4 ++++ arch/riscv/mm/tlbflush.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-)
arch/riscv/include/asm/tlbflush.h +1 -0
@@ -67,6 +67,7 @@ static inline void flush_tlb_kernel_range(unsigned long start,#define flush_tlb_mm (mm) flush_tlb_all()#define flush_tlb_mm_range (mm, start, end, page_size) flush_tlb_all() +#define local_flush_tlb_kernel_range (start, end) flush_tlb_all()#endif /* !CONFIG_SMP || !CONFIG_MMU */ #endif /* _ASM_RISCV_TLBFLUSH_H */
arch/riscv/mm/init.c +4 -0
@@ -1385,6 +1385,10 @@ void __init misc_mem_init(void)early_memtest (min_low_pfn <<PAGE_SHIFT , max_low_pfn <<PAGE_SHIFT );arch_numa_init ();sparse_init (); +#ifdef CONFIG_SPARSEMEM_VMEMMAP +/* The entire VMEMMAP region has been populated. Flush TLB for this region */ +local_flush_tlb_kernel_range (VMEMMAP_START ,VMEMMAP_END ); +#endif zone_sizes_init ();arch_reserve_crashkernel ();memblock_dump_all ();
arch/riscv/mm/tlbflush.c +2 -1
@@ -66,9 +66,10 @@ static inline void local_flush_tlb_range_asid(unsigned long start,local_flush_tlb_range_threshold_asid (start, size, stride, asid); } +/* Flush a range of kernel pages without broadcasting */ void local_flush_tlb_kernel_range (unsigned long start,unsigned long end) { -local_flush_tlb_range_asid (start, end,PAGE_SIZE ,FLUSH_TLB_NO_ASID ); +local_flush_tlb_range_asid (start, end - start,PAGE_SIZE ,FLUSH_TLB_NO_ASID ); }static void __ipi_flush_tlb_all (void *info)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 75/124 riscv: Fix set_huge_pte_at() for NAPOT mapping
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Ghiti <[email protected]>
[ Upstream commit 1458eb2c9d88ad4b35eb6d6a4aa1d43d8fbf7f62 ]
As stated by the privileged specification, we must clear a NAPOT mapping and emit a sfence.vma before setting a new translation.
--- arch/riscv/mm/hugetlbpage.c | 42 +++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-)
arch/riscv/mm/hugetlbpage.c +40 -2
@@ -177,13 +177,36 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags)return entry; } +static void clear_flush (struct mm_struct *mm, +unsigned long addr, +pte_t *ptep, +unsigned long pgsize, +unsigned long ncontig) +{ +struct vm_area_struct vma =TLB_FLUSH_VMA (mm,0 ); +unsigned long i, saddr = addr; + +for (i =0 ; i < ncontig; i++, addr += pgsize, ptep++) +ptep_get_and_clear (mm, addr, ptep); + +flush_tlb_range (&vma, saddr, addr); +} + +/* +* When dealing with NAPOT mappings, the privileged specification indicates that +* "if an update needs to be made, the OS generally should first mark all of the +* PTEs invalid, then issue SFENCE.VMA instruction(s) covering all 4 KiB regions +* within the range, [...] then update the PTE(s), as described in Section +* 4.2.1.". That's the equivalent of the Break-Before-Make approach used by +* arm64. +*/ void set_huge_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pte,unsigned long sz) { -unsigned long hugepage_shift; +unsigned long hugepage_shift, pgsize;int i, pte_num;if (sz >=PGDIR_SIZE )
@@ -198,7 +221,22 @@ void set_huge_pte_at(struct mm_struct *mm, hugepage_shift =PAGE_SHIFT ; pte_num = sz >> hugepage_shift; -for (i =0 ; i < pte_num; i++, ptep++, addr += (1 << hugepage_shift)) + pgsize =1 << hugepage_shift; + +if (!pte_present (pte)) { +for (i =0 ; i < pte_num; i++, ptep++, addr += pgsize) +set_ptes (mm, addr, ptep, pte,1 ); +return ; + } + +if (!pte_napot (pte)) { +set_ptes (mm, addr, ptep, pte,1 ); +return ; + } + +clear_flush (mm, addr, ptep, pgsize, pte_num); + +for (i =0 ; i < pte_num; i++, ptep++, addr += pgsize)set_pte_at (mm, addr, ptep, pte); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 76/124 riscv: Fix hugetlb_mask_last_page() when NAPOT is enabled
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Ghiti <[email protected]>
[ Upstream commit a179a4bfb694f80f2709a1d0398469e787acb974 ]
When NAPOT is enabled, a new hugepage size is available and then we need to make hugetlb_mask_last_page() aware of that.
--- arch/riscv/mm/hugetlbpage.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/riscv/mm/hugetlbpage.c +20 -0
@@ -125,6 +125,26 @@ pte_t *huge_pte_offset(struct mm_struct *mm,return pte; } +unsigned long hugetlb_mask_last_page (struct hstate *h) +{ +unsigned long hp_size =huge_page_size (h); + +switch (hp_size) { +#ifndef __PAGETABLE_PMD_FOLDED +case PUD_SIZE : +return P4D_SIZE -PUD_SIZE ; +#endif +case PMD_SIZE : +return PUD_SIZE -PMD_SIZE ; +case napot_cont_size (NAPOT_CONT64KB_ORDER ): +return PMD_SIZE -napot_cont_size (NAPOT_CONT64KB_ORDER ); +default : +break ; + } + +return 0UL ; +} + static pte_t get_clear_contig(struct mm_struct *mm, unsigned long addr, pte_t *ptep,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 77/124 scsi: core: Move scsi_host_busy() out of host lock if it is for per-command
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 4e6c9011990726f4d175e2cdfebe5b0b8cce4839 ]
Commit 4373534a9850 ("scsi: core: Move scsi_host_busy() out of host lock for waking up EH handler") intended to fix a hard lockup issue triggered by EH. The core idea was to move scsi_host_busy() out of the host lock when processing individual commands for EH. However, a suggested style change inadvertently caused scsi_host_busy() to remain under the host lock. Fix this by calling scsi_host_busy() outside the lock.
--- drivers/scsi/scsi_error.c | 3 ++- drivers/scsi/scsi_lib.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/scsi/scsi_error.c +2 -1
@@ -282,11 +282,12 @@ static void scsi_eh_inc_host_failed(struct rcu_head *head) {struct scsi_cmnd *scmd =container_of (head,typeof (*scmd), rcu);struct Scsi_Host *shost = scmd->device->host; +unsigned int busy =scsi_host_busy (shost);unsigned long flags;spin_lock_irqsave (shost->host_lock, flags); shost->host_failed++; -scsi_eh_wakeup (shost,scsi_host_busy (shost)); +scsi_eh_wakeup (shost, busy);spin_unlock_irqrestore (shost->host_lock, flags); }
drivers/scsi/scsi_lib.c +3 -1
@@ -278,9 +278,11 @@ static void scsi_dec_host_busy(struct Scsi_Host *shost, struct scsi_cmnd *cmd)rcu_read_lock ();__clear_bit (SCMD_STATE_INFLIGHT , &cmd->state);if (unlikely (scsi_host_in_recovery (shost))) { +unsigned int busy =scsi_host_busy (shost); +spin_lock_irqsave (shost->host_lock, flags);if (shost->host_failed || shost->host_eh_scheduled) -scsi_eh_wakeup (shost,scsi_host_busy (shost)); +scsi_eh_wakeup (shost, busy);spin_unlock_irqrestore (shost->host_lock, flags); }rcu_read_unlock ();
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 78/124 riscv: Flush the tlb when a page directory is freed
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Ghiti <[email protected]>
[ Upstream commit 97cf301fa42e8ea6e0a24de97bc0abcdc87d9504 ]
The riscv privileged specification mandates to flush the TLB whenever a page directory is modified, so add that to tlb_flush().
--- arch/riscv/include/asm/tlb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/include/asm/tlb.h +1 -1
@@ -16,7 +16,7 @@ static void tlb_flush(struct mmu_gather *tlb);static inline void tlb_flush (struct mmu_gather *tlb) {#ifdef CONFIG_MMU -if (tlb->fullmm || tlb->need_flush_all) +if (tlb->fullmm || tlb->need_flush_all || tlb->freed_tables)flush_tlb_mm (tlb->mm);else flush_tlb_mm_range(tlb->mm, tlb->start, tlb->end,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 79/124 libceph: rename read_sparse_msg_*() to read_partial_sparse_msg_*()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiubo Li <[email protected]>
[ Upstream commit ee97302fbc0c98a25732d736fc73aaf4d62c4128 ]
These functions are supposed to behave like other read_partial_*()
handlers: the contract with messenger v1 is that the handler bails if the area of the message it's responsible for is already processed. This comes up when handling short reads from the socket.
[ idryomov: changelog ]
Stable-dep-of: 8e46a2d068c9 ("libceph: just wait for more data to be available on the socket")
--- net/ceph/messenger_v1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/ceph/messenger_v1.c +4 -4
@@ -991,7 +991,7 @@ static inline int read_partial_message_section(struct ceph_connection *con,return read_partial_message_chunk (con, section, sec_len, crc); } -static int read_sparse_msg_extent (struct ceph_connection *con,u32 *crc) +static int read_partial_sparse_msg_extent (struct ceph_connection *con,u32 *crc) {struct ceph_msg_data_cursor *cursor = &con->in_msg->cursor;bool do_bounce =ceph_test_opt (from_msgr (con->msgr),RXBOUNCE );
@@ -1026,7 +1026,7 @@ static int read_sparse_msg_extent(struct ceph_connection *con, u32 *crc)return 1 ; } -static int read_sparse_msg_data (struct ceph_connection *con) +static int read_partial_sparse_msg_data (struct ceph_connection *con) {struct ceph_msg_data_cursor *cursor = &con->in_msg->cursor;bool do_datacrc = !ceph_test_opt (from_msgr (con->msgr),NOCRC );
@@ -1043,7 +1043,7 @@ static int read_sparse_msg_data(struct ceph_connection *con) con->v1.in_sr_len, &crc); else if (cursor->sr_resid > 0) - ret =read_sparse_msg_extent (con, &crc); + ret =read_partial_sparse_msg_extent (con, &crc);if (ret <=0 ) {if (do_datacrc)
@@ -1254,7 +1254,7 @@ static int read_partial_message(struct ceph_connection *con)return -EIO ;if (m->sparse_read) - ret =read_sparse_msg_data (con); + ret =read_partial_sparse_msg_data (con);else if (ceph_test_opt (from_msgr (con->msgr),RXBOUNCE )) ret =read_partial_msg_data_bounce (con);else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 80/124 libceph: just wait for more data to be available on the socket
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiubo Li <[email protected]>
[ Upstream commit 8e46a2d068c92a905d01cbb018b00d66991585ab ]
A short read may occur while reading the message footer from the socket. Later, when the socket is ready for another read, the messenger invokes all read_partial_*() handlers, including read_partial_sparse_msg_data(). The expectation is that read_partial_sparse_msg_data() would bail, allowing the messenger to invoke read_partial() for the footer and pick up where it left off.
However read_partial_sparse_msg_data() violates that and ends up calling into the state machine in the OSD client. The sparse-read state machine assumes that it's a new op and interprets some piece of the footer as the sparse-read header and returns bogus extents/data length, etc.
To determine whether read_partial_sparse_msg_data() should bail, let's reuse cursor->total_resid. Because once it reaches to zero that means all the extents and data have been successfully received in last read, else it could break out when partially reading any of the extents and data. And then osd_sparse_read() could continue where it left off.
[ idryomov: changelog ]
--- include/linux/ceph/messenger.h | 2 +- net/ceph/messenger_v1.c | 25 +++++++++++++------------ net/ceph/messenger_v2.c | 4 ++-- net/ceph/osd_client.c | 9 +++------ 4 files changed, 19 insertions(+), 21 deletions(-)
include/linux/ceph/messenger.h +1 -1
@@ -283,7 +283,7 @@ struct ceph_msg {struct kref kref;bool more_to_follow;bool needs_out_seq; -bool sparse_read; +u64 sparse_read_total;int front_alloc_len;struct ceph_msgpool *pool;
net/ceph/messenger_v1.c +13 -12
@@ -160,8 +160,9 @@ static size_t sizeof_footer(struct ceph_connection *con)static void prepare_message_data (struct ceph_msg *msg,u32 data_len) {/* Initialize data cursor if it's not a sparse read */ -if (!msg->sparse_read) -ceph_msg_data_cursor_init (&msg->cursor, msg, data_len); +u64 len = msg->sparse_read_total ? : data_len; + +ceph_msg_data_cursor_init (&msg->cursor, msg, len); }/*
@@ -1036,7 +1037,7 @@ static int read_partial_sparse_msg_data(struct ceph_connection *con)if (do_datacrc) crc = con->in_data_crc; - do { +while (cursor->total_resid) {if (con->v1.in_sr_kvec.iov_base) ret = read_partial_message_chunk(con, &con->v1.in_sr_kvec,
@@ -1044,23 +1045,23 @@ static int read_partial_sparse_msg_data(struct ceph_connection *con) &crc); else if (cursor->sr_resid > 0) ret =read_partial_sparse_msg_extent (con, &crc); - -if (ret <=0 ) { -if (do_datacrc) - con->in_data_crc = crc; -return ret; - } +if (ret <=0 ) +break ;memset (&con->v1.in_sr_kvec,0 ,sizeof (con->v1.in_sr_kvec)); ret = con->ops->sparse_read (con, cursor, (char **)&con->v1.in_sr_kvec.iov_base); +if (ret <=0 ) { + ret = ret ? ret :1 ;/* must return > 0 to indicate success */ +break ; + } con->v1.in_sr_len = ret; - }while (ret >0 ); + }if (do_datacrc) con->in_data_crc = crc; -return ret <0 ? ret :1 ;/* must return > 0 to indicate success */ +return ret; }static int read_partial_msg_data (struct ceph_connection *con)
@@ -1253,7 +1254,7 @@ static int read_partial_message(struct ceph_connection *con)if (!m->num_data_items)return -EIO ; -if (m->sparse_read) +if (m->sparse_read_total) ret =read_partial_sparse_msg_data (con);else if (ceph_test_opt (from_msgr (con->msgr),RXBOUNCE )) ret =read_partial_msg_data_bounce (con);
net/ceph/messenger_v2.c +2 -2
@@ -1128,7 +1128,7 @@ static int decrypt_tail(struct ceph_connection *con)struct sg_table enc_sgt = {};struct sg_table sgt = {};struct page **pages =NULL ; -bool sparse = con->in_msg->sparse_read; +bool sparse = !!con->in_msg->sparse_read_total;int dpos =0 ;int tail_len;int ret;
@@ -2060,7 +2060,7 @@ static int prepare_read_tail_plain(struct ceph_connection *con) }if (data_len (msg)) { -if (msg->sparse_read) +if (msg->sparse_read_total) con->v2.in_state =IN_S_PREPARE_SPARSE_DATA ;else con->v2.in_state =IN_S_PREPARE_READ_DATA ;
net/ceph/osd_client.c +3 -6
@@ -5510,7 +5510,7 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, } m =ceph_msg_get (req->r_reply); - m->sparse_read = (bool )srlen; + m->sparse_read_total = srlen;dout ("get_reply tid %lld %p\n" , tid, m);
@@ -5777,11 +5777,8 @@ static int prep_next_sparse_read(struct ceph_connection *con, }if (o->o_sparse_op_idx <0 ) { -u64 srlen =sparse_data_requested (req); - -dout ("%s: [%d] starting new sparse read req. srlen=0x%llx\n" , - __func__, o->o_osd, srlen); -ceph_msg_data_cursor_init (cursor, con->in_msg, srlen); +dout ("%s: [%d] starting new sparse read req\n" , + __func__, o->o_osd); }else {u64 end;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 81/124 ceph: always set initial i_blkbits to CEPH_FSCRYPT_BLOCK_SHIFT
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiubo Li <[email protected]>
[ Upstream commit bbb20ea993f46743f7429092ddc52f1a5c5428ef ]
The fscrypt code will use i_blkbits to setup ci_data_unit_bits when allocating the new inode, but ceph will initiate i_blkbits ater when filling the inode, which is too late. Since ci_data_unit_bits will only be used by the fscrypt framework so initiating i_blkbits with CEPH_FSCRYPT_BLOCK_SHIFT is safe.
--- fs/ceph/inode.c | 2 ++ 1 file changed, 2 insertions(+)
fs/ceph/inode.c +2 -0
@@ -78,6 +78,8 @@ struct inode *ceph_new_inode(struct inode *dir, struct dentry *dentry,if (!inode)return ERR_PTR (-ENOMEM ); + inode->i_blkbits =CEPH_FSCRYPT_BLOCK_SHIFT ; +if (!S_ISLNK (*mode)) { err =ceph_pre_init_acls (dir, mode, as_ctx);if (err <0 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 82/124 riscv: Fix arch_hugetlb_migration_supported() for NAPOT
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Ghiti <[email protected]>
[ Upstream commit ce68c035457bdd025a9961e0ba2157323090c581 ]
arch_hugetlb_migration_supported() must be reimplemented to add support for NAPOT hugepages, which is done here.
--- arch/riscv/include/asm/hugetlb.h | 3 +++ arch/riscv/mm/hugetlbpage.c | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-)
arch/riscv/include/asm/hugetlb.h +3 -0
@@ -11,6 +11,9 @@ static inline void arch_clear_hugepage_flags(struct page *page) }#define arch_clear_hugepage_flags arch_clear_hugepage_flags +bool arch_hugetlb_migration_supported (struct hstate *h); +#define arch_hugetlb_migration_supported arch_hugetlb_migration_supported +#ifdef CONFIG_RISCV_ISA_SVNAPOT #define __HAVE_ARCH_HUGE_PTE_CLEAR void huge_pte_clear(struct mm_struct *mm, unsigned long addr,
arch/riscv/mm/hugetlbpage.c +13 -3
@@ -364,7 +364,7 @@ void huge_pte_clear(struct mm_struct *mm,pte_clear (mm, addr, ptep); } -static __init bool is_napot_size (unsigned long size) +static bool is_napot_size (unsigned long size) {unsigned long order;
@@ -392,7 +392,7 @@ arch_initcall(napot_hugetlbpages_init);#else -static __init bool is_napot_size (unsigned long size) +static bool is_napot_size (unsigned long size) {return false; }
@@ -409,7 +409,7 @@ int pmd_huge(pmd_t pmd)return pmd_leaf (pmd); } -bool __init arch_hugetlb_valid_size (unsigned long size) +static bool __hugetlb_valid_size (unsigned long size) {if (size ==HPAGE_SIZE )return true;
@@ -421,6 +421,16 @@ bool __init arch_hugetlb_valid_size(unsigned long size)return false; } +bool __init arch_hugetlb_valid_size (unsigned long size) +{ +return __hugetlb_valid_size (size); +} + +bool arch_hugetlb_migration_supported (struct hstate *h) +{ +return __hugetlb_valid_size (huge_page_size (h)); +} +#ifdef CONFIG_CONTIG_ALLOC static __init int gigantic_pages_init (void ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 83/124 riscv: declare overflow_stack as exported from traps.c
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Dooks <[email protected]>
[ Upstream commit 2cf963787529f615f7c93bdcf13a5e82029e7f38 ]
The percpu area overflow_stacks is exported from arch/riscv/kernel/traps.c for use in the entry code, but is not declared anywhere. Add the relevant declaration to arch/riscv/include/asm/stacktrace.h to silence the following sparse warning:
arch/riscv/kernel/traps.c:395:1: warning: symbol '__pcpu_scope_overflow_stack' was not declared. Should it be static?
We don't add the stackinfo_get_overflow() call as for some of the other architectures as this doesn't seem to be used yet, so just silence the warning.
--- arch/riscv/include/asm/stacktrace.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/riscv/include/asm/stacktrace.h +5 -0
@@ -21,4 +21,9 @@ static inline bool on_thread_stack(void)return !(((unsigned long )(current->stack) ^ current_stack_pointer) & ~(THREAD_SIZE -1 )); } + +#ifdef CONFIG_VMAP_STACK +DECLARE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack); +#endif /* CONFIG_VMAP_STACK */ +#endif /* _ASM_RISCV_STACKTRACE_H */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 84/124 nvme-host: fix the updating of the firmware version
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maurizio Lombardi <[email protected]>
[ Upstream commit f0377ff97509f5a4921993d5d61da000361bd884 ]
The original code didn't update the firmware version if the "next slot" of the AFI register isn't zero or if the "current slot" field is zero; in those cases it assumed that a reset was needed.
However, the NVMe specification doesn't exclude the possibility that the "next slot" value is equal to the "current slot" value, meaning that the same firmware slot will be activated after performing a controller level reset; in this case a reset is clearly not necessary and we can safely update the firmware version.
Modify the code so the kernel will report that a Controller Level Reset is needed only in the following cases:
1) If the "current slot" field is zero. This is invalid and means that something is wrong, a reset is needed.
or
2) if the "next slot" field isn't zero AND it's not equal to the "current slot" value. This means that at the next reset a different firmware slot will be activated.
--- drivers/nvme/host/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +5 -2
@@ -4107,6 +4107,7 @@ static bool nvme_ctrl_pp_status(struct nvme_ctrl *ctrl)static void nvme_get_fw_slot_info (struct nvme_ctrl *ctrl) {struct nvme_fw_slot_info_log *log; +u8 next_fw_slot, cur_fw_slot; log =kmalloc (sizeof (*log),GFP_KERNEL );if (!log)
@@ -4118,13 +4119,15 @@ static void nvme_get_fw_slot_info(struct nvme_ctrl *ctrl) goto out_free_log; } -if (log->afi &0x70 || !(log->afi &0x7 )) { + cur_fw_slot = log->afi &0x7 ; + next_fw_slot = (log->afi &0x70 ) >>4 ; +if (!cur_fw_slot || (next_fw_slot && (cur_fw_slot != next_fw_slot))) {dev_info (ctrl->device,"Firmware is activated after next Controller Level Reset\n" ); goto out_free_log; } -memcpy (ctrl->subsys->firmware_rev, &log->frs[(log->afi &0x7 ) -1 ], +memcpy (ctrl->subsys->firmware_rev, &log->frs[cur_fw_slot -1 ],sizeof (ctrl->subsys->firmware_rev)); out_free_log:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 85/124 selftests: core: include linux/close_range.h for CLOSE_RANGE_* macros
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Muhammad Usama Anjum <[email protected]>
[ Upstream commit 01c1484ac04790fe27a37f89dd3a350f99646815 ]
Correct header file is needed for getting CLOSE_RANGE_* macros. Previously it was tested with newer glibc which didn't show the need to include the header which was a mistake.
--- tools/testing/selftests/core/close_range_test.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/core/close_range_test.c +1 -0
@@ -12,6 +12,7 @@#include <syscall.h> #include <unistd.h> #include <sys/resource.h> +#include <linux/close_range.h> #include "../kselftest_harness.h" #include "../clone3/clone3_selftests.h"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 86/124 blk-iocost: Fix an UBSAN shift-out-of-bounds warning
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
[ Upstream commit 2a427b49d02995ea4a6ff93a1432c40fa4d36821 ]
When iocg_kick_delay() is called from a CPU different than the one which set the delay, @now may be in the past of @iocg->delay_at leading to the following warning:
UBSAN: shift-out-of-bounds in block/blk-iocost.c:1359:23 shift exponent 18446744073709 is too large for 64-bit type 'u64' (aka 'unsigned long long') ... Call Trace: <TASK> dump_stack_lvl+0x79/0xc0 __ubsan_handle_shift_out_of_bounds+0x2ab/0x300 iocg_kick_delay+0x222/0x230 ioc_rqos_merge+0x1d7/0x2c0 __rq_qos_merge+0x2c/0x80 bio_attempt_back_merge+0x83/0x190 blk_attempt_plug_merge+0x101/0x150 blk_mq_submit_bio+0x2b1/0x720 submit_bio_noacct_nocheck+0x320/0x3e0 __swap_writepage+0x2ab/0x9d0
The underflow itself doesn't really affect the behavior in any meaningful way; however, the past timestamp may exaggerate the delay amount calculated later in the code, which shouldn't be a material problem given the nature of the delay mechanism.
If @now is in the past, this CPU is racing another CPU which recently set up the delay and there's nothing this CPU can contribute w.r.t. the delay. Let's bail early from iocg_kick_delay() in such cases.
--- block/blk-iocost.c | 7 +++++++ 1 file changed, 7 insertions(+)
block/blk-iocost.c +7 -0
@@ -1353,6 +1353,13 @@ static bool iocg_kick_delay(struct ioc_gq *iocg, struct ioc_now *now)lockdep_assert_held (&iocg->waitq.lock); +/* +* If the delay is set by another CPU, we may be in the past. No need to +* change anything if so. This avoids decay calculation underflow. +*/ +if (time_before64 (now->now, iocg->delay_at)) +return false; +/* calculate the current delay in effect - 1/2 every second */ tdelta = now->now - iocg->delay_at;if (iocg->delay)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 87/124 ALSA: usb-audio: Add delay quirk for MOTU M Series 2nd revision
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Tsoy <[email protected]>
commit d915a6850e27efb383cd4400caadfe47792623df upstream.
Audio control requests that sets sampling frequency sometimes fail on this card. Adding delay between control messages eliminates that problem.
--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks.c +2 -0
@@ -2073,6 +2073,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_GENERIC_IMPLICIT_FB),DEVICE_FLG (0x0763 ,0x2031 ,/* M-Audio Fast Track C600 */ QUIRK_FLAG_GENERIC_IMPLICIT_FB ), +DEVICE_FLG (0x07fd ,0x000b ,/* MOTU M Series 2nd hardware revision */ +QUIRK_FLAG_CTL_MSG_DELAY_1M ),DEVICE_FLG (0x08bb ,0x2702 ,/* LineX FM Transmitter */ QUIRK_FLAG_IGNORE_CTL_ERROR ), DEVICE_FLG(0x0951, 0x16ad, /* Kingston HyperX */
Greg Kroah-Hartman
maintainerPATCH 88/124 ALSA: usb-audio: Add a quirk for Yamaha YIT-W12TX transmitter
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Julian Sikorski <[email protected]>
commit a969210066054ea109d8b7aff29a9b1c98776841 upstream.
The device fails to initialize otherwise, giving the following error:
[ 3676.671641] usb 2-1.1: 1:1: cannot get freq at ep 0x1
--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks.c +2 -0
@@ -2031,6 +2031,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_CTL_MSG_DELAY_1M | QUIRK_FLAG_IGNORE_CTL_ERROR),DEVICE_FLG (0x0499 ,0x1509 ,/* Steinberg UR22 */ QUIRK_FLAG_GENERIC_IMPLICIT_FB ), +DEVICE_FLG (0x0499 ,0x3108 ,/* Yamaha YIT-W12TX */ +QUIRK_FLAG_GET_SAMPLE_RATE ),DEVICE_FLG (0x04d8 ,0xfeea ,/* Benchmark DAC1 Pre */ QUIRK_FLAG_GET_SAMPLE_RATE ), DEVICE_FLG(0x04e8, 0xa051, /* Samsung USBC Headset (AKG) */
Greg Kroah-Hartman
maintainerPATCH 89/124 ALSA: usb-audio: add quirk for RODE NT-USB+
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Young <[email protected]>
commit 7822baa844a87cbb93308c1032c3d47d4079bb8a upstream.
The RODE NT-USB+ is marketed as a professional usb microphone, however the usb audio interface is a mess:
[ 1.130977] usb 1-5: new full-speed USB device number 2 using xhci_hcd [ 1.503906] usb 1-5: config 1 has an invalid interface number: 5 but max is 4 [ 1.503912] usb 1-5: config 1 has no interface number 4 [ 1.519689] usb 1-5: New USB device found, idVendor=19f7, idProduct=0035, bcdDevice= 1.09 [ 1.519695] usb 1-5: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 1.519697] usb 1-5: Product: RØDE NT-USB+ [ 1.519699] usb 1-5: Manufacturer: RØDE [ 1.519700] usb 1-5: SerialNumber: 1D773A1A [ 8.327495] usb 1-5: 1:1: cannot get freq at ep 0x82 [ 8.344500] usb 1-5: 1:2: cannot get freq at ep 0x82 [ 8.365499] usb 1-5: 2:1: cannot get freq at ep 0x2
Add QUIRK_FLAG_GET_SAMPLE_RATE to work around the broken sample rate get. I have asked Rode support to fix it, but they show no interest.
--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks.c +2 -0
@@ -2183,6 +2183,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_FIXED_RATE),DEVICE_FLG (0x1bcf ,0x2283 ,/* NexiGo N930AF FHD Webcam */ QUIRK_FLAG_GET_SAMPLE_RATE ), +DEVICE_FLG (0x19f7 ,0x0035 ,/* RODE NT-USB+ */ +QUIRK_FLAG_GET_SAMPLE_RATE ),/* Vendor matches */ VENDOR_FLG(0x045e, /* MS Lifecam */
Greg Kroah-Hartman
maintainerPATCH 90/124 USB: serial: qcserial: add new usb-id for Dell Wireless DW5826e
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: JackBB Wu <[email protected]>
commit 129690fb229a20b6e563a77a2c85266acecf20bc upstream.
Add support for Dell DW5826e with USB-id 0x413c:0x8217 & 0x413c:0x8218.
It is 0x413c:0x8217
T: Bus=02 Lev=01 Prnt=01 Port=05 Cnt=01 Dev#= 4 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=413c ProdID=8217 Rev= 5.04 S: Manufacturer=DELL S: Product=COMPAL Electronics EXM-G1A S: SerialNumber=359302940050401 C:* #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=qcserial E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=usbfs E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=qcserial E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=qcserial E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=87(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I:* If#= 8 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=32ms E: Ad=8e(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
It is 0x413c:0x8218
T: Bus=02 Lev=01 Prnt=01 Port=05 Cnt=01 Dev#= 3 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=413c ProdID=8218 Rev= 0.00 S: Manufacturer=DELL S: Product=COMPAL Electronics EXM-G1A S: SerialNumber=359302940050401 C:* #Ifs= 1 Cfg#= 1 Atr=a0 MxPwr= 2mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=qcserial E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/qcserial.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/qcserial.c +2 -0
@@ -184,6 +184,8 @@ static const struct usb_device_id id_tab {DEVICE_SWI(0x413c, 0x81d0)}, /* Dell Wireless 5819 */ {DEVICE_SWI(0x413c, 0x81d1)}, /* Dell Wireless 5818 */ {DEVICE_SWI(0x413c, 0x81d2)}, /* Dell Wireless 5818 */ + {DEVICE_SWI(0x413c, 0x8217)}, /* Dell Wireless DW5826e */ + {DEVICE_SWI(0x413c, 0x8218)}, /* Dell Wireless DW5826e QDL *//* Huawei devices */ {DEVICE_HWI(0x03f0, 0x581d)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */
Greg Kroah-Hartman
maintainerPATCH 91/124 USB: serial: option: add Fibocom FM101-GL variant
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Puliang Lu <[email protected]>
commit b4a1f4eaf1d798066affc6ad040f76eb1a16e1c9 upstream.
Update the USB serial option driver support for the Fibocom FM101-GL
LTE modules as there are actually several different variants.
- VID:PID 2cb7:01a3, FM101-GL are laptop M.2 cards (with MBIM interfaces for /Linux/Chrome OS)
0x01a3:mbim,gnss
Here are the outputs of usb-devices:
T: Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 3 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 P: Vendor=2cb7 ProdID=01a3 Rev=05.04 S: Manufacturer=Fibocom Wireless Inc. S: Product=Fibocom FM101-GL Module S: SerialNumber=5ccd5cd4 C: #Ifs= 3 Cfg#= 1 Atr=a0 MxPwr=896mA I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim E: Ad=0f(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=8e(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=option E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
--- drivers/usb/serial/option.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/option.c +1 -0
@@ -2269,6 +2269,7 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0111, 0xff) }, /* Fibocom FM160 (MBIM mode) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */ + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a3, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff), /* Fibocom FM101-GL (laptop MBIM) */ .driver_info = RSVD(4) }, { USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) }, /* LongSung M5710 */
Greg Kroah-Hartman
maintainerPATCH 92/124 USB: serial: cp210x: add ID for IMST iM871A-USB
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leonard Dallmayr <[email protected]>
commit 12b17b4eb82a41977eb848048137b5908d52845c upstream.
The device IMST USB-Stick for Smart Meter is a rebranded IMST iM871A-USB Wireless M-Bus USB-adapter. It is used to read wireless water, gas and electricity meters.
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -146,6 +146,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ + { USB_DEVICE(0x10C4, 0x87ED) }, /* IMST USB-Stick for Smart Meter */ { USB_DEVICE(0x10C4, 0x8856) }, /* CEL EM357 ZigBee USB Stick - LR */ { USB_DEVICE(0x10C4, 0x8857) }, /* CEL EM357 ZigBee USB Stick */ { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */
Greg Kroah-Hartman
maintainerPATCH 93/124 Revert "usb: typec: tcpm: fix cc role at port reset"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Badhri Jagan Sridharan <[email protected]>
commit b717dfbf73e842d15174699fe2c6ee4fdde8aa1f upstream.
This reverts commit 1e35f074399dece73d5df11847d4a0d7a6f49434.
Given that ERROR_RECOVERY calls into PORT_RESET for Hi-Zing the CC pins, setting CC pins to default state during PORT_RESET breaks error recovery.
4.5.2.2.2.1 ErrorRecovery State Requirements
The port shall not drive VBUS or VCONN, and shall present a high-impedance to ground (above zOPEN) on its CC1 and CC2 pins.
Hi-Zing the CC pins is the inteded behavior for PORT_RESET. CC pins are set to default state after tErrorRecovery in PORT_RESET_WAIT_OFF.
4.5.2.2.2.2 Exiting From ErrorRecovery State
A Sink shall transition to Unattached.SNK after tErrorRecovery. A Source shall transition to Unattached.SRC after tErrorRecovery.
--- drivers/usb/typec/tcpm/tcpm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/typec/tcpm/tcpm.c +1 -2
@@ -4862,8 +4862,7 @@ static void run_state_machine(struct tcpbreak ;case PORT_RESET :tcpm_reset_port (port); -tcpm_set_cc (port,tcpm_default_state (port) ==SNK_UNATTACHED ? -TYPEC_CC_RD :tcpm_rp_cc (port)); +tcpm_set_cc (port,TYPEC_CC_OPEN );tcpm_set_state (port,PORT_RESET_WAIT_OFF ,PD_T_ERROR_RECOVERY );break ;
Re: [PATCH 6.7 093/124] Revert "usb: typec: tcpm: fix cc role at port reset"
Quoted 9 lines · Greg Kroah-Hartman
6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Badhri Jagan Sridharan <[email protected]>
commit
b717dfbf73e842d15174699fe2c6ee4fdde8aa1fupstream.This reverts commit
1e35f074399dece73d5df11847d4a0d7a6f49434.
TWIMC, that patch (which is also queued for the next 6.6.y-rc) afaics is causing boot issues on rk3399-roc-pc for Mark [now CCed] with mainline. For details see:
https://lore.kernel.org/lkml/[email protected]/https://lore.kernel.org/all/[email protected]/
Ciao, Thorsten
Quoted 41 lines
Given that
ERROR_RECOVERYcalls intoPORT_RESETfor Hi-Zing the CC pins, setting CC pins to default state duringPORT_RESETbreaks error recovery.4.5.2.2.2.1 ErrorRecovery State Requirements
The port shall not drive VBUS or VCONN, and shall present a high-impedance to ground (above zOPEN) on its CC1 and CC2 pins.Hi-Zing the CC pins is the inteded behavior for
PORT_RESET. CC pins are set to default state after tErrorRecovery inPORT_RESET_WAIT_OFF.4.5.2.2.2.2 Exiting From ErrorRecovery State
A Sink shall transition to Unattached.SNK after tErrorRecovery. A Source shall transition to Unattached.SRC after tErrorRecovery.Cc Frank Wang <[email protected]>Fixes 1e35f074399d ("usb: typec: tcpm: fix cc role at port reset")Signed-off-by Badhri Jagan Sridharan <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/usb/typec/tcpm/tcpm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/usb/typec/tcpm/tcpm.c +1
-2@@ -4862,8 +4862,7 @@ static void run_state_machine(struct tcpbreak ;case PORT_RESET :tcpm_reset_port (port); -tcpm_set_cc (port,tcpm_default_state (port) ==SNK_UNATTACHED ? -TYPEC_CC_RD :tcpm_rp_cc (port)); +tcpm_set_cc (port,TYPEC_CC_OPEN );tcpm_set_state (port,PORT_RESET_WAIT_OFF ,PD_T_ERROR_RECOVERY );break ;
Greg Kroah-Hartman
maintainerRe: [PATCH 6.7 093/124] Revert "usb: typec: tcpm: fix cc role at port reset"
Quoted 9 lines · Thorsten Leemhuis
Quoted 8 lines · Greg Kroah-Hartman
6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Badhri Jagan Sridharan <[email protected]>
commit
b717dfbf73e842d15174699fe2c6ee4fdde8aa1fupstream.
Quoted 7 lines
Quoted 1 line
This reverts commit
1e35f074399dece73d5df11847d4a0d7a6f49434.TWIMC, that patch (which is also queued for the next 6.6.y-rc) afaics is causing boot issues on rk3399-roc-pc for Mark [now CCed] with mainline. For details see:
https://lore.kernel.org/lkml/[email protected]/https://lore.kernel.org/all/[email protected]/
Yeah, this is tough, this is a revert to fix a previous regression, so I think we need to stay here, at the "we fixed a regression, but the original problem is back" stage until people can figure it out and provide a working change for everyone.
thanks,
greg k-h
Re: [PATCH 6.7 093/124] Revert "usb: typec: tcpm: fix cc role at port reset"
Quoted 13 lines · Greg Kroah-Hartman
Quoted 12 lines · Thorsten Leemhuis
Quoted 6 lines · Greg Kroah-Hartman
From: Badhri Jagan Sridharan <[email protected]>
commit
b717dfbf73e842d15174699fe2c6ee4fdde8aa1fupstream.This reverts commit
1e35f074399dece73d5df11847d4a0d7a6f49434.TWIMC, that patch (which is also queued for the next 6.6.y-rc) afaics is causing boot issues on rk3399-roc-pc for Mark [now CCed] with mainline. For details see:
Quoted 6 lines
Quoted 1 line
https://lore.kernel.org/lkml/[email protected]/https://lore.kernel.org/all/[email protected]/
Yeah, this is tough, this is a revert to fix a previous regression, so I think we need to stay here, at the "we fixed a regression, but the original problem is back" stage until people can figure it out and provide a working change for everyone.
Thx for the feedback. Yeah, no worries, that's how it is sometimes. Just wanted to make sure you were aware of the latest report. :-D
Ciao, Thorsten
Re: [PATCH 6.7 093/124] Revert "usb: typec: tcpm: fix cc role at port reset"
In reply to Greg Kroah-HartmanQuoted 6 lines · Greg Kroah-Hartman
Quoted 3 lines · Thorsten Leemhuis
TWIMC, that patch (which is also queued for the next 6.6.y-rc) afaics is causing boot issues on rk3399-roc-pc for Mark [now CCed] with mainline. For details see:
Quoted 6 lines
Quoted 1 line
https://lore.kernel.org/lkml/[email protected]/https://lore.kernel.org/all/[email protected]/
Yeah, this is tough, this is a revert to fix a previous regression, so I think we need to stay here, at the "we fixed a regression, but the original problem is back" stage until people can figure it out and provide a working change for everyone.
Given that nobody from the USB side seems to have shown much interest in fixing this since I reported the regression should we not just be reverting whatever it was that triggered the need for the original revert (it's really not clear from the changelog...)? I got no response other than an "I said that would happen" to my initial report, then the revert triggered a half done patch which I can't really judge given my lack of familiarity with the code here but that's not been submitted as an actual patch.
The board has been working for years (at least three prior to the initial revert of "usb: typec: tcpm: fix cc role at port reset" which was only applied last June), presumably whatever the original revert was intended to fix has been there for a while?
This getting backported to older stables is breaking at least this board in those stables, and I would tend to rate a "remove all power from the system" bug at the very high end of the severity scale while the reverted patch was there for six months and several kernel releases.
Greg Kroah-Hartman
maintainerRe: [PATCH 6.7 093/124] Revert "usb: typec: tcpm: fix cc role at port reset"
Quoted 28 lines · Mark Brown
Quoted 6 lines · Greg Kroah-Hartman
Quoted 3 lines · Thorsten Leemhuis
TWIMC, that patch (which is also queued for the next 6.6.y-rc) afaics is causing boot issues on rk3399-roc-pc for Mark [now CCed] with mainline. For details see:
Quoted 6 lines
Quoted 1 line
https://lore.kernel.org/lkml/[email protected]/https://lore.kernel.org/all/[email protected]/
Yeah, this is tough, this is a revert to fix a previous regression, so I think we need to stay here, at the "we fixed a regression, but the original problem is back" stage until people can figure it out and provide a working change for everyone.
Given that nobody from the USB side seems to have shown much interest in fixing this since I reported the regression should we not just be reverting whatever it was that triggered the need for the original revert (it's really not clear from the changelog...)? I got no response other than an "I said that would happen" to my initial report, then the revert triggered a half done patch which I can't really judge given my lack of familiarity with the code here but that's not been submitted as an actual patch.
The board has been working for years (at least three prior to the initial revert of "usb: typec: tcpm: fix cc role at port reset" which was only applied last June), presumably whatever the original revert was intended to fix has been there for a while?
Quoted 4 lines
This getting backported to older stables is breaking at least this board in those stables, and I would tend to rate a "remove all power from the system" bug at the very high end of the severity scale while the reverted patch was there for six months and several kernel releases.
Ok, that's different, I'll queue your revert for the revert up on Monday and get this fixed up as that's not ok.
thanks,
greg k-h
Re: [PATCH 6.7 093/124] Revert "usb: typec: tcpm: fix cc role at port reset"
Quoted 9 lines · Greg Kroah-Hartman
Quoted 4 lines · Mark Brown
This getting backported to older stables is breaking at least this board in those stables, and I would tend to rate a "remove all power from the system" bug at the very high end of the severity scale while the reverted patch was there for six months and several kernel releases.
Ok, that's different, I'll queue your revert for the revert up on Monday and get this fixed up as that's not ok.
Thanks.
Greg Kroah-Hartman
maintainerRe: [PATCH 6.7 093/124] Revert "usb: typec: tcpm: fix cc role at port reset"
Quoted 8 lines · Mark Brown
Quoted 6 lines · Greg Kroah-Hartman
Quoted 4 lines · Mark Brown
This getting backported to older stables is breaking at least this board in those stables, and I would tend to rate a "remove all power from the system" bug at the very high end of the severity scale while the reverted patch was there for six months and several kernel releases.
Quoted 4 lines
Quoted 2 lines
Ok, that's different, I'll queue your revert for the revert up on Monday and get this fixed up as that's not ok.
Thanks.
Now queued up.
Greg Kroah-Hartman
maintainerPATCH 94/124 Revert "drm/amd/pm: fix the high voltage and temperature issue"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
commit c92c108403b09f75f3393588c2326ecad49ee2e2 upstream.
This reverts commit 5f38ac54e60562323ea4abb1bfb37d043ee23357. This causes issues with rebooting and the 7800XT.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 ++++--------- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 33 +------------------ drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 ---- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 8 ---- 5 files changed, 11 insertions(+), 63 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7 -17
@@ -4051,23 +4051,13 @@ int amdgpu_device_init(struct amdgpu_dev } } }else { -switch (amdgpu_ip_version (adev,MP1_HWIP ,0 )) { -case IP_VERSION (13 ,0 ,0 ): -case IP_VERSION (13 ,0 ,7 ): -case IP_VERSION (13 ,0 ,10 ): - r =psp_gpu_reset (adev); -break ; -default : - tmp = amdgpu_reset_method; -/* It should do a default reset when loading or reloading the driver, -* regardless of the module parameter reset_method. -*/ - amdgpu_reset_method =AMD_RESET_METHOD_NONE ; - r =amdgpu_asic_reset (adev); - amdgpu_reset_method = tmp; -break ; - } - + tmp = amdgpu_reset_method; +/* It should do a default reset when loading or reloading the driver, +* regardless of the module parameter reset_method. +*/ + amdgpu_reset_method =AMD_RESET_METHOD_NONE ; + r =amdgpu_asic_reset (adev); + amdgpu_reset_method = tmp;if (r) {dev_err (adev->dev,"asic reset on init failed\n" ); goto failed;
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -31
@@ -734,7 +734,7 @@ static int smu_early_init(void *handle) smu->adev = adev; smu->pm_enabled = !!amdgpu_dpm; smu->is_apu = false; - smu->smu_baco.state =SMU_BACO_STATE_NONE ; + smu->smu_baco.state =SMU_BACO_STATE_EXIT ; smu->smu_baco.platform_support = false; smu->user_dpm_profile.fan_mode =-1 ;
@@ -1746,31 +1746,10 @@ static int smu_smc_hw_cleanup(struct smureturn 0 ; } -static int smu_reset_mp1_state (struct smu_context *smu) -{ -struct amdgpu_device *adev = smu->adev; -int ret =0 ; - -if ((!adev->in_runpm) && (!adev->in_suspend) && - (!amdgpu_in_reset (adev))) -switch (amdgpu_ip_version (adev,MP1_HWIP ,0 )) { -case IP_VERSION (13 ,0 ,0 ): -case IP_VERSION (13 ,0 ,7 ): -case IP_VERSION (13 ,0 ,10 ): - ret =smu_set_mp1_state (smu,PP_MP1_STATE_UNLOAD ); -break ; -default : -break ; - } - -return ret; -} -static int smu_hw_fini (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;struct smu_context *smu = adev->powerplay.pp_handle; -int ret;if (amdgpu_sriov_vf (adev) && !amdgpu_sriov_is_pp_one_vf (adev))return 0 ;
@@ -1788,15 +1767,7 @@ static int smu_hw_fini(void *handle) adev->pm.dpm_enabled = false; - ret =smu_smc_hw_cleanup (smu); -if (ret) -return ret; - - ret =smu_reset_mp1_state (smu); -if (ret) -return ret; - -return 0 ; +return smu_smc_hw_cleanup (smu); }static void smu_late_fini (void *handle)
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +0 -1
@@ -419,7 +419,6 @@ enum smu_reset_mode {enum smu_baco_state {SMU_BACO_STATE_ENTER =0 ,SMU_BACO_STATE_EXIT , -SMU_BACO_STATE_NONE , };struct smu_baco_context {
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +1 -7
@@ -2773,13 +2773,7 @@ static int smu_v13_0_0_set_mp1_state(strswitch (mp1_state) {case PP_MP1_STATE_UNLOAD : - ret =smu_cmn_send_smc_msg_with_param (smu, - SMU_MSG_PrepareMp1ForUnload, -0x55 ,NULL ); - -if (!ret && smu->smu_baco.state ==SMU_BACO_STATE_EXIT ) - ret =smu_v13_0_disable_pmfw_state (smu); - + ret =smu_cmn_set_mp1_state (smu, mp1_state);break ;default :/* Ignore others */
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +1 -7
@@ -2500,13 +2500,7 @@ static int smu_v13_0_7_set_mp1_state(strswitch (mp1_state) {case PP_MP1_STATE_UNLOAD : - ret =smu_cmn_send_smc_msg_with_param (smu, - SMU_MSG_PrepareMp1ForUnload, -0x55 ,NULL ); - -if (!ret && smu->smu_baco.state ==SMU_BACO_STATE_EXIT ) - ret =smu_v13_0_disable_pmfw_state (smu); - + ret =smu_cmn_set_mp1_state (smu, mp1_state);break ;default :/* Ignore others */
Greg Kroah-Hartman
maintainerPATCH 95/124 x86/lib: Revert to _ASM_EXTABLE_UA() for {get,put}_user() fixups
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiuxu Zhuo <[email protected]>
commit 8eed4e00a370b37b4e5985ed983dccedd555ea9d upstream.
During memory error injection test on kernels >= v6.4, the kernel panics like below. However, this issue couldn't be reproduced on kernels <= v6.3.
mce: [Hardware Error]: CPU 296: Machine Check Exception: f Bank 1: bd80000000100134
mce: [Hardware Error]: RIP 10:<ffffffff821b9776> {__get_user_nocheck_4+0x6/0x20}
mce: [Hardware Error]: TSC 411a93533ed ADDR 346a8730040 MISC 86
mce: [Hardware Error]: PROCESSOR 0:a06d0 TIME 1706000767 SOCKET 1 APIC 211 microcode 80001490
mce: [Hardware Error]: Run the above through 'mcelog --ascii'
mce: [Hardware Error]: Machine check: Data load in unrecoverable area of kernel
Kernel panic - not syncing: Fatal local machine check
The MCA code can recover from an in-kernel #MC if the fixup type is EX_TYPE_UACCESS, explicitly indicating that the kernel is attempting to access userspace memory. However, if the fixup type is EX_TYPE_DEFAULT the only thing that is raised for an in-kernel #MC is a panic.
ex_handler_uaccess() would warn if users gave a non-canonical addresses (with bit 63 clear) to {get, put}_user(), which was unexpected.
Therefore, commit
b19b74bc99b1 ("x86/mm: Rework address range check in get_user() and put_user()")
replaced _ASM_EXTABLE_UA() with _ASM_EXTABLE() for {get, put}_user() fixups. However, the new fixup type EX_TYPE_DEFAULT results in a panic.
Commit
6014bc27561f ("x86-64: make access_ok() independent of LAM")
added the check gp_fault_address_ok() right before the WARN_ONCE() in ex_handler_uaccess() to not warn about non-canonical user addresses due to LAM.
With that in place, revert back to _ASM_EXTABLE_UA() for {get,put}_user() exception fixups in order to be able to handle in-kernel MCEs correctly again.
[ bp: Massage commit message. ]
--- arch/x86/lib/getuser.S | 24 ++++++++++++------------ arch/x86/lib/putuser.S | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-)
arch/x86/lib/getuser.S +12 -12
@@ -163,23 +163,23 @@ SYM_CODE_END(__get_user_8_handle_excepti #endif /* get_user */ - _ASM_EXTABLE(1b, __get_user_handle_exception) - _ASM_EXTABLE(2b, __get_user_handle_exception) - _ASM_EXTABLE(3b, __get_user_handle_exception) + _ASM_EXTABLE_UA(1b, __get_user_handle_exception) + _ASM_EXTABLE_UA(2b, __get_user_handle_exception) + _ASM_EXTABLE_UA(3b, __get_user_handle_exception) #ifdef CONFIG_X86_64 - _ASM_EXTABLE(4b, __get_user_handle_exception) + _ASM_EXTABLE_UA(4b, __get_user_handle_exception) #else - _ASM_EXTABLE(4b, __get_user_8_handle_exception) - _ASM_EXTABLE(5b, __get_user_8_handle_exception) + _ASM_EXTABLE_UA(4b, __get_user_8_handle_exception) + _ASM_EXTABLE_UA(5b, __get_user_8_handle_exception) #endif /* __get_user */ - _ASM_EXTABLE(6b, __get_user_handle_exception) - _ASM_EXTABLE(7b, __get_user_handle_exception) - _ASM_EXTABLE(8b, __get_user_handle_exception) + _ASM_EXTABLE_UA(6b, __get_user_handle_exception) + _ASM_EXTABLE_UA(7b, __get_user_handle_exception) + _ASM_EXTABLE_UA(8b, __get_user_handle_exception) #ifdef CONFIG_X86_64 - _ASM_EXTABLE(9b, __get_user_handle_exception) + _ASM_EXTABLE_UA(9b, __get_user_handle_exception) #else - _ASM_EXTABLE(9b, __get_user_8_handle_exception) - _ASM_EXTABLE(10b, __get_user_8_handle_exception) + _ASM_EXTABLE_UA(9b, __get_user_8_handle_exception) + _ASM_EXTABLE_UA(10b, __get_user_8_handle_exception) #endif
arch/x86/lib/putuser.S +10 -10
@@ -133,15 +133,15 @@ SYM_CODE_START_LOCAL(__put_user_handle_e RET SYM_CODE_END(__put_user_handle_exception) - _ASM_EXTABLE(1b, __put_user_handle_exception) - _ASM_EXTABLE(2b, __put_user_handle_exception) - _ASM_EXTABLE(3b, __put_user_handle_exception) - _ASM_EXTABLE(4b, __put_user_handle_exception) - _ASM_EXTABLE(5b, __put_user_handle_exception) - _ASM_EXTABLE(6b, __put_user_handle_exception) - _ASM_EXTABLE(7b, __put_user_handle_exception) - _ASM_EXTABLE(9b, __put_user_handle_exception) + _ASM_EXTABLE_UA(1b, __put_user_handle_exception) + _ASM_EXTABLE_UA(2b, __put_user_handle_exception) + _ASM_EXTABLE_UA(3b, __put_user_handle_exception) + _ASM_EXTABLE_UA(4b, __put_user_handle_exception) + _ASM_EXTABLE_UA(5b, __put_user_handle_exception) + _ASM_EXTABLE_UA(6b, __put_user_handle_exception) + _ASM_EXTABLE_UA(7b, __put_user_handle_exception) + _ASM_EXTABLE_UA(9b, __put_user_handle_exception) #ifdef CONFIG_X86_32 - _ASM_EXTABLE(8b, __put_user_handle_exception) - _ASM_EXTABLE(10b, __put_user_handle_exception) + _ASM_EXTABLE_UA(8b, __put_user_handle_exception) + _ASM_EXTABLE_UA(10b, __put_user_handle_exception) #endif
Greg Kroah-Hartman
maintainerPATCH 96/124 usb: dwc3: host: Set XHCI_SG_TRB_CACHE_SIZE_QUIRK
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prashanth K <[email protected]>
commit 817349b6d26aadd8b38283a05ce0bab106b4c765 upstream.
Upstream commit bac1ec551434 ("usb: xhci: Set quirk for XHCI_SG_TRB_CACHE_SIZE_QUIRK") introduced a new quirk in XHCI which fixes XHC timeout, which was seen on synopsys XHCs while using SG buffers. But the support for this quirk isn't present in the DWC3 layer.
We will encounter this XHCI timeout/hung issue if we run iperf loopback tests using RTL8156 ethernet adaptor on DWC3 targets with scatter-gather enabled. This gets resolved after enabling the XHCI_SG_TRB_CACHE_SIZE_QUIRK. This patch enables it using the xhci device property since its needed for DWC3 controller.
In Synopsys DWC3 databook,
Table 9-3: xHCI Debug Capability Limitations
Chained TRBs greater than TRB cache size: The debug capability driver must not create a multi-TRB TD that describes smaller than a 1K packet that spreads across 8 or more TRBs on either the IN TR or the OUT TR.
--- drivers/usb/dwc3/host.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/dwc3/host.c +3 -1
@@ -61,7 +61,7 @@ out:int dwc3_host_init (struct dwc3 *dwc) { -struct property_entry props[4 ]; +struct property_entry props[5 ];struct platform_device *xhci;int ret, irq;int prop_idx =0 ;
@@ -89,6 +89,8 @@ int dwc3_host_init(struct dwc3 *dwc)memset (props,0 ,sizeof (struct property_entry ) *ARRAY_SIZE (props)); + props[prop_idx++] =PROPERTY_ENTRY_BOOL ("xhci-sg-trb-cache-size-quirk" ); +if (dwc->usb3_lpm_capable) props[prop_idx++] =PROPERTY_ENTRY_BOOL ("usb3-lpm-capable" );
Greg Kroah-Hartman
maintainerPATCH 97/124 usb: host: xhci-plat: Add support for XHCI_SG_TRB_CACHE_SIZE_QUIRK
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prashanth K <[email protected]>
commit 520b391e3e813c1dd142d1eebb3ccfa6d08c3995 upstream.
Upstream commit bac1ec551434 ("usb: xhci: Set quirk for XHCI_SG_TRB_CACHE_SIZE_QUIRK") introduced a new quirk in XHCI which fixes XHC timeout, which was seen on synopsys XHCs while using SG buffers. Currently this quirk can only be set using xhci private data. But there are some drivers like dwc3/host.c which adds adds quirks using software node for xhci device. Hence set this xhci quirk by iterating over device properties.
--- drivers/usb/host/xhci-plat.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci-plat.c +3 -0
@@ -250,6 +250,9 @@ int xhci_plat_probe(struct platform_deviif (device_property_read_bool (tmpdev,"quirk-broken-port-ped" )) xhci->quirks |=XHCI_BROKEN_PORT_PED ; +if (device_property_read_bool (tmpdev,"xhci-sg-trb-cache-size-quirk" )) + xhci->quirks |=XHCI_SG_TRB_CACHE_SIZE_QUIRK ; +device_property_read_u32 (tmpdev,"imod-interval-ns" , &xhci->imod_interval); }
Greg Kroah-Hartman
maintainerPATCH 98/124 xhci: process isoc TD properly when there was a transaction error mid TD.
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
commit 5372c65e1311a16351ef03dd096ff576e6477674 upstream.
The last TRB of a isoc TD might not trigger an event if there was an error event for a TRB mid TD. This is seen on a NEC Corporation uPD720200 USB 3.0 Host
After an error mid a multi-TRB TD the xHC should according to xhci 4.9.1 generate events for passed TRBs with IOC flag set if it proceeds to the next TD. This event is either a copy of the original error, or a "success" transfer event.
If that event is missing then the driver and xHC host get out of sync as the driver is still expecting a transfer event for that first TD, while xHC host is already sending events for the next TD in the list. This leads to
"Transfer event TRB DMA ptr not part of current TD" messages.
As a solution we tag the isoc TDs that get error events mid TD. If an event doesn't match the first TD, then check if the tag is set, and event points to the next TD.
In that case give back the fist TD and process the next TD normally
Make sure TD status and transferred length stay valid in both cases with and without final TD completion event.
--- drivers/usb/host/xhci-ring.c | 74 ++++++++++++++++++++++++++++++++++--------- drivers/usb/host/xhci.h | 1 2 files changed, 61 insertions(+), 14 deletions(-)
drivers/usb/host/xhci-ring.c +60 -14
@@ -2375,6 +2375,9 @@ static int process_isoc_td(struct xhci_h/* handle completion code */ switch (trb_comp_code) {case COMP_SUCCESS : +/* Don't overwrite status if TD had an error, see xHCI 4.9.1 */ +if (td->error_mid_td) +break ;if (remaining) { frame->status = short_framestatus;if (xhci->quirks &XHCI_TRUST_TX_LENGTH )
@@ -2400,8 +2403,9 @@ static int process_isoc_td(struct xhci_hbreak ;case COMP_USB_TRANSACTION_ERROR : frame->status = -EPROTO ; + sum_trbs_for_length = true;if (ep_trb != td->last_trb) -return 0 ; + td->error_mid_td = true;break ;case COMP_STOPPED : sum_trbs_for_length = true;
@@ -2421,6 +2425,9 @@ static int process_isoc_td(struct xhci_hbreak ; } +if (td->urb_length_set) + goto finish_td; +if (sum_trbs_for_length) frame->actual_length =sum_trb_lengths (xhci, ep->ring, ep_trb) + ep_trb_len - remaining;
@@ -2429,6 +2436,14 @@ static int process_isoc_td(struct xhci_h td->urb->actual_length += frame->actual_length; +finish_td: +/* Don't give back TD yet if we encountered an error mid TD */ +if (td->error_mid_td && ep_trb != td->last_trb) { +xhci_dbg (xhci,"Error mid isoc TD, wait for final completion event\n" ); + td->urb_length_set = true; +return 0 ; + } +return finish_td (xhci, ep, ep_ring, td, trb_comp_code); }
@@ -2807,17 +2822,51 @@ static int handle_tx_event(struct xhci_h }if (!ep_seg) { -if (!ep->skip || - !usb_endpoint_xfer_isoc (&td->urb->ep->desc)) { -/* Some host controllers give a spurious -* successful event after a short transfer. -* Ignore it. -*/ -if ((xhci->quirks &XHCI_SPURIOUS_SUCCESS ) && - ep_ring->last_td_was_short) { - ep_ring->last_td_was_short = false; - goto cleanup; + +if (ep->skip &&usb_endpoint_xfer_isoc (&td->urb->ep->desc)) { +skip_isoc_td (xhci, td, ep, status); + goto cleanup; + } + +/* +* Some hosts give a spurious success event after a short +* transfer. Ignore it. +*/ +if ((xhci->quirks &XHCI_SPURIOUS_SUCCESS ) && + ep_ring->last_td_was_short) { + ep_ring->last_td_was_short = false; + goto cleanup; + } + +/* +* xhci 4.10.2 states isoc endpoints should continue +* processing the next TD if there was an error mid TD. +* So host like NEC don't generate an event for the last +* isoc TRB even if the IOC flag is set. +* xhci 4.9.1 states that if there are errors in mult-TRB +* TDs xHC should generate an error for that TRB, and if xHC +* proceeds to the next TD it should genete an event for +* any TRB with IOC flag on the way. Other host follow this. +* So this event might be for the next TD. +*/ +if (td->error_mid_td && + !list_is_last (&td->td_list, &ep_ring->td_list)) { +struct xhci_td *td_next =list_next_entry (td, td_list); + + ep_seg =trb_in_td (xhci, td_next->start_seg, td_next->first_trb, + td_next->last_trb, ep_trb_dma, false); +if (ep_seg) { +/* give back previous TD, start handling new */ +xhci_dbg (xhci,"Missing TD completion event after mid TD error\n" ); + ep_ring->dequeue = td->last_trb; + ep_ring->deq_seg = td->last_trb_seg; +inc_deq (xhci, ep_ring); +xhci_td_cleanup (xhci, td, ep_ring, td->status); + td = td_next; } + } + +if (!ep_seg) {/* HC is busted, give up! */ xhci_err (xhci, "ERROR Transfer event TRB DMA ptr not "
@@ -2829,9 +2878,6 @@ static int handle_tx_event(struct xhci_h ep_trb_dma, true);return -ESHUTDOWN ; } - -skip_isoc_td (xhci, td, ep, status); - goto cleanup; }if (trb_comp_code ==COMP_SHORT_PACKET ) ep_ring->last_td_was_short = true;
drivers/usb/host/xhci.h +1 -0
@@ -1547,6 +1547,7 @@ struct xhci_td {struct xhci_segment *bounce_seg;/* actual_length of the URB has already been set */ bool urb_length_set; +bool error_mid_td;unsigned int num_trbs; };
Greg Kroah-Hartman
maintainerPATCH 99/124 xhci: handle isoc Babble and Buffer Overrun events properly
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Pecio <[email protected]>
commit 7c4650ded49e5b88929ecbbb631efb8b0838e811 upstream.
xHCI 4.9 explicitly forbids assuming that the xHC has released its ownership of a multi-TRB TD when it reports an error on one of the early TRBs. Yet the driver makes such assumption and releases the TD, allowing the remaining TRBs to be freed or overwritten by new TDs.
The xHC should also report completion of the final TRB due to its IOC flag being set by us, regardless of prior errors. This event cannot be recognized if the TD has already been freed earlier, resulting in "Transfer event TRB DMA ptr not part of current TD" error message.
Fix this by reusing the logic for processing isoc Transaction Errors. This also handles hosts which fail to report the final completion.
Fix transfer length reporting on Babble errors. They may be caused by device malfunction, no guarantee that the buffer has been filled.
--- drivers/usb/host/xhci-ring.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-ring.c +5 -1
@@ -2393,9 +2393,13 @@ static int process_isoc_td(struct xhci_hcase COMP_BANDWIDTH_OVERRUN_ERROR : frame->status = -ECOMM ;break ; -case COMP_ISOCH_BUFFER_OVERRUN :case COMP_BABBLE_DETECTED_ERROR : + sum_trbs_for_length = true; + fallthrough; +case COMP_ISOCH_BUFFER_OVERRUN : frame->status = -EOVERFLOW ; +if (ep_trb != td->last_trb) + td->error_mid_td = true;break ;case COMP_INCOMPATIBLE_DEVICE_ERROR :case COMP_STALL_ERROR :
Greg Kroah-Hartman
maintainerPATCH 100/124 usb: dwc3: pci: add support for the Intel Arrow Lake-H
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heikki Krogerus <[email protected]>
commit de4b5b28c87ccae4da268a53c5df135437f5cfde upstream.
This patch adds the necessary PCI ID for Intel Arrow Lake-H devices.
--- drivers/usb/dwc3/dwc3-pci.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/dwc3/dwc3-pci.c +4 -0
@@ -51,6 +51,8 @@#define PCI_DEVICE_ID_INTEL_MTLP 0x7ec1#define PCI_DEVICE_ID_INTEL_MTLS 0x7f6f#define PCI_DEVICE_ID_INTEL_MTL 0x7e7e +#define PCI_DEVICE_ID_INTEL_ARLH 0x7ec1 +#define PCI_DEVICE_ID_INTEL_ARLH_PCH 0x777e#define PCI_DEVICE_ID_INTEL_TGL 0x9a15#define PCI_DEVICE_ID_AMD_MR 0x163a
@@ -421,6 +423,8 @@ static const struct pci_device_id dwc3_p { PCI_DEVICE_DATA(INTEL, MTLP, &dwc3_pci_intel_swnode) }, { PCI_DEVICE_DATA(INTEL, MTL, &dwc3_pci_intel_swnode) }, { PCI_DEVICE_DATA(INTEL, MTLS, &dwc3_pci_intel_swnode) }, + { PCI_DEVICE_DATA(INTEL, ARLH, &dwc3_pci_intel_swnode) }, + { PCI_DEVICE_DATA(INTEL, ARLH_PCH, &dwc3_pci_intel_swnode) }, { PCI_DEVICE_DATA(INTEL, TGL, &dwc3_pci_intel_swnode) }, { PCI_DEVICE_DATA(AMD, NL_USB, &dwc3_pci_amd_swnode) },
Greg Kroah-Hartman
maintainerPATCH 101/124 hrtimer: Report offline hrtimer enqueue
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frederic Weisbecker <[email protected]>
commit dad6a09f3148257ac1773cd90934d721d68ab595 upstream.
The hrtimers migration on CPU-down hotplug process has been moved earlier, before the CPU actually goes to die. This leaves a small window of opportunity to queue an hrtimer in a blind spot, leaving it ignored.
For example a practical case has been reported with RCU waking up a SCHED_FIFO task right before the CPUHP_AP_IDLE_DEAD stage, queuing that way a sched/rt timer to the local offline CPU.
Make sure such situations never go unnoticed and warn when that happens.
--- include/linux/hrtimer.h | 4 +++- kernel/time/hrtimer.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)
include/linux/hrtimer.h +3 -1
@@ -197,6 +197,7 @@ enum hrtimer_base_type {* @max_hang_time: Maximum time spent in hrtimer_interrupt * @softirq_expiry_lock: Lock which is taken while softirq based hrtimer are * expired +* @online: CPU is online from an hrtimers point of view * @timer_waiters: A hrtimer_cancel() invocation waits for the timer * callback to finish. * @expires_next: absolute time of the next event, is required for remote
@@ -219,7 +220,8 @@ struct hrtimer_cpu_base { unsigned int hres_active : 1, in_hrtirq : 1, hang_detected : 1, - softirq_activated : 1; + softirq_activated : 1, + online : 1;#ifdef CONFIG_HIGH_RES_TIMERS unsigned int nr_events;unsigned short nr_retries;
kernel/time/hrtimer.c +3 -0
@@ -1085,6 +1085,7 @@ static int enqueue_hrtimer(struct hrtime enum hrtimer_mode mode) {debug_activate (timer, mode); +WARN_ON_ONCE (!base->cpu_base->online); base->cpu_base->active_bases |=1 << base->index;
@@ -2183,6 +2184,7 @@ int hrtimers_prepare_cpu(unsigned int cp cpu_base->softirq_next_timer =NULL ; cpu_base->expires_next =KTIME_MAX ; cpu_base->softirq_expires_next =KTIME_MAX ; + cpu_base->online =1 ;hrtimer_cpu_base_init_expiry_lock (cpu_base);return 0 ; }
@@ -2250,6 +2252,7 @@ int hrtimers_cpu_dying(unsigned int dyinsmp_call_function_single (ncpu, retrigger_next_event,NULL ,0 );raw_spin_unlock (&new_base->lock); + old_base->online =0 ;raw_spin_unlock (&old_base->lock);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 102/124 Input: i8042 - fix strange behavior of touchpad on Clevo NS70PU
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Werner Sembach <[email protected]>
commit a60e6c3918d20848906ffcdfcf72ca6a8cfbcf2e upstream.
When closing the laptop lid with an external screen connected, the mouse pointer has a constant movement to the lower right corner. Opening the lid again stops this movement, but after that the touchpad does no longer register clicks.
The touchpad is connected both via i2c-hid and PS/2, the predecessor of this device (NS70MU) has the same layout in this regard and also strange behaviour caused by the psmouse and the i2c-hid driver fighting over touchpad control. This fix is reusing the same workaround by just disabling the PS/2 aux port, that is only used by the touchpad, to give the i2c-hid driver the lone control over the touchpad.
v2: Rebased on current master
--- drivers/input/serio/i8042-acpipnpio.h | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/input/serio/i8042-acpipnpio.h +6 -0
@@ -1210,6 +1210,12 @@ static const struct dmi_system_id i8042_ }, { .matches = { + DMI_MATCH(DMI_BOARD_NAME, "NS5x_7xPU"), + }, + .driver_data = (void *)(SERIO_QUIRK_NOAUX ) + }, + { + .matches = { DMI_MATCH(DMI_BOARD_NAME, "NJ50_70CU"), }, .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
Greg Kroah-Hartman
maintainerPATCH 103/124 Input: atkbd - skip ATKBD_CMD_SETLEDS when skipping ATKBD_CMD_GETID
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit 683cd8259a9b883a51973511f860976db2550a6e upstream.
After commit 936e4d49ecbc ("Input: atkbd - skip ATKBD_CMD_GETID in translated mode") the keyboard on Dell XPS 13 9350 / 9360 / 9370 models has stopped working after a suspend/resume.
The problem appears to be that atkbd_probe() fails when called from atkbd_reconnect() on resume, which on systems where ATKBD_CMD_GETID is skipped can only happen by ATKBD_CMD_SETLEDS failing. ATKBD_CMD_SETLEDS failing because ATKBD_CMD_GETID was skipped is weird, but apparently that is what is happening.
Fix this by also skipping ATKBD_CMD_SETLEDS when skipping ATKBD_CMD_GETID.
--- drivers/input/keyboard/atkbd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/input/keyboard/atkbd.c +8 -5
@@ -811,7 +811,6 @@ static int atkbd_probe(struct atkbd *atk {struct ps2dev *ps2dev = &atkbd->ps2dev;unsigned char param[2 ]; -bool skip_getid;/* * Some systems, where the bit-twiddling when testing the io-lines of the
@@ -825,6 +824,11 @@ static int atkbd_probe(struct atkbd *atk"keyboard reset failed on %s\n" , ps2dev->serio->phys); +if (atkbd_skip_getid (atkbd)) { + atkbd->id =0xab83 ; +return 0 ; + } +/* * Then we check the keyboard ID. We should get 0xab83 under normal conditions. * Some keyboards report different values, but the first byte is always 0xab or
@@ -833,18 +837,17 @@ static int atkbd_probe(struct atkbd *atk*/ param[0 ] = param[1 ] =0xa5 ;/* initialize with invalid values */ - skip_getid =atkbd_skip_getid (atkbd); -if (skip_getid ||ps2_command (ps2dev, param,ATKBD_CMD_GETID )) { +if (ps2_command (ps2dev, param,ATKBD_CMD_GETID )) {/* -* If the get ID command was skipped or failed, we check if we can at least set +* If the get ID command failed, we check if we can at least set * the LEDs on the keyboard. This should work on every keyboard out there. * It also turns the LEDs off, which we want anyway. */ param[0 ] =0 ;if (ps2_command (ps2dev, param,ATKBD_CMD_SETLEDS ))return -1 ; - atkbd->id = skip_getid ?0xab83 :0xabba ; + atkbd->id =0xabba ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 104/124 wifi: iwlwifi: mvm: fix a battery life regression
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emmanuel Grumbach <[email protected]>
commit 1fa942f31665ea5dc5d4d95893dd13723eaa97cc upstream.
Fix the DBG_CONFIG_TOKEN to not enable debug components that would prevent the device to save power.
--- drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/fw/api/debug.h +1 -1
@@ -531,7 +531,7 @@ enum iwl_fw_dbg_config_cmd_type { };/* LDBG_CFG_CMD_TYPE_API_E_VER_1 */ /* this token disables debug asserts in the firmware */ -#define IWL_FW_DBG_CONFIG_TOKEN 0x00011301 +#define IWL_FW_DBG_CONFIG_TOKEN 0x00010001/** * struct iwl_fw_dbg_config_cmd - configure FW debug
Greg Kroah-Hartman
maintainerPATCH 105/124 io_uring/net: fix sr->len for IORING_OP_RECV with MSG_WAITALL and buffers
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 72bd80252feeb3bef8724230ee15d9f7ab541c6e upstream.
If we use IORING_OP_RECV with provided buffers and pass in '0' as the length of the request, the length is retrieved from the selected buffer. If MSG_WAITALL is also set and we get a short receive, then we may hit the retry path which decrements sr->len and increments the buffer for a retry. However, the length is still zero at this point, which means that sr->len now becomes huge and import_ubuf() will cap it to MAX_RW_COUNT and subsequently return -EFAULT for the range as a whole.
Fix this by always assigning sr->len once the buffer has been selected.
--- io_uring/net.c | 1 + 1 file changed, 1 insertion(+)
io_uring/net.c +1 -0
@@ -902,6 +902,7 @@ retry_multishot:if (!buf)return -ENOBUFS ; sr->buf = buf; + sr->len = len; } ret =import_ubuf (ITER_DEST , sr->buf, len, &msg.msg_iter);
Greg Kroah-Hartman
maintainerPATCH 106/124 io_uring/poll: move poll execution helpers higher up
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit e84b01a880f635e3084a361afba41f95ff500d12 upstream.
In preparation for calling __io_poll_execute() higher up, move the functions to avoid forward declarations.
No functional changes in this patch.
--- io_uring/poll.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
io_uring/poll.c +20 -20
@@ -228,6 +228,26 @@ enum { IOU_POLL_REISSUE = 3, }; +static void __io_poll_execute (struct io_kiocb *req,int mask) +{ +unsigned flags =0 ; + +io_req_set_res (req, mask,0 ); + req->io_task_work.func = io_poll_task_func; + +trace_io_uring_task_add (req, mask); + +if (!(req->flags &REQ_F_POLL_NO_LAZY )) + flags =IOU_F_TWQ_LAZY_WAKE ; +__io_req_task_work_add (req, flags); +} + +static inline void io_poll_execute (struct io_kiocb *req,int res) +{ +if (io_poll_get_ownership (req)) +__io_poll_execute (req, res); +} +/* * All poll tw should go through this. Checks for poll events, manages * references, does rewait, etc.
@@ -364,26 +384,6 @@ void io_poll_task_func(struct io_kiocb * } } -static void __io_poll_execute (struct io_kiocb *req,int mask) -{ -unsigned flags =0 ; - -io_req_set_res (req, mask,0 ); - req->io_task_work.func = io_poll_task_func; - -trace_io_uring_task_add (req, mask); - -if (!(req->flags &REQ_F_POLL_NO_LAZY )) - flags =IOU_F_TWQ_LAZY_WAKE ; -__io_req_task_work_add (req, flags); -} - -static inline void io_poll_execute (struct io_kiocb *req,int res) -{ -if (io_poll_get_ownership (req)) -__io_poll_execute (req, res); -} -static void io_poll_cancel_req (struct io_kiocb *req) {io_poll_mark_cancelled (req);
Greg Kroah-Hartman
maintainerPATCH 107/124 io_uring/net: un-indent mshot retry path in io_recv_finish()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 91e5d765a82fb2c9d0b7ad930d8953208081ddf1 upstream.
In preparation for putting some retry logic in there, have the done path just skip straight to the end rather than have too much nesting in here.
No functional changes in this patch.
--- io_uring/net.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-)
io_uring/net.c +20 -16
@@ -645,23 +645,27 @@ static inline bool io_recv_finish(structreturn true; } -if (!mshot_finished) { -if (io_fill_cqe_req_aux (req, issue_flags &IO_URING_F_COMPLETE_DEFER , - *ret, cflags |IORING_CQE_F_MORE )) { -io_recv_prep_retry (req); -/* Known not-empty or unknown state, retry */ -if (cflags &IORING_CQE_F_SOCK_NONEMPTY || - msg->msg_inq ==-1 ) -return false; -if (issue_flags &IO_URING_F_MULTISHOT ) - *ret =IOU_ISSUE_SKIP_COMPLETE ; -else - *ret = -EAGAIN ; -return true; - } -/* Otherwise stop multishot but use the current result. */ - } +if (mshot_finished) + goto finish; +/* +* Fill CQE for this receive and see if we should keep trying to +* receive from this socket. +*/ +if (io_fill_cqe_req_aux (req, issue_flags &IO_URING_F_COMPLETE_DEFER , + *ret, cflags |IORING_CQE_F_MORE )) { +io_recv_prep_retry (req); +/* Known not-empty or unknown state, retry */ +if (cflags &IORING_CQE_F_SOCK_NONEMPTY || msg->msg_inq ==-1 ) +return false; +if (issue_flags &IO_URING_F_MULTISHOT ) + *ret =IOU_ISSUE_SKIP_COMPLETE ; +else + *ret = -EAGAIN ; +return true; + } +/* Otherwise stop multishot but use the current result. */ +finish:io_req_set_res (req, *ret, cflags);if (issue_flags &IO_URING_F_MULTISHOT )
Greg Kroah-Hartman
maintainerPATCH 108/124 io_uring/rw: ensure poll based multishot read retries appropriately
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit c79f52f0656eeb3e4a12f7f358f760077ae111b6 upstream.
io_read_mshot() always relies on poll triggering retries, and this works fine as long as we do a retry per size of the buffer being read. The buffer size is given by the size of the buffer(s) in the given buffer group ID.
But if we're reading less than what is available, then we don't always get to read everything that is available. For example, if the buffers available are 32 bytes and we have 64 bytes to read, then we'll correctly read the first 32 bytes and then wait for another poll trigger before we attempt the next read. This next poll trigger may never happen, in which case we just sit forever and never make progress, or it may trigger at some point in the future, and now we're just delivering the available data much later than we should have.
io_read_mshot() could do retries itself, but that is wasteful as we'll be going through all of __io_read() again, and most likely in vain. Rather than do that, bump our poll reference count and have io_poll_check_events() do one more loop and check with vfs_poll() if we have more data to read. If we do, io_read_mshot() will get invoked again directly and we'll read the next chunk.
io_poll_multishot_retry() must only get called from inside io_poll_issue(), which is our multishot retry handler, as we know we already "own" the request at this point.
--- io_uring/poll.h | 9 +++++++++ io_uring/rw.c | 10 +++++++++- 2 files changed, 18 insertions(+), 1 deletion(-)
io_uring/poll.h +9 -0
@@ -24,6 +24,15 @@ struct async_poll {struct io_poll *double_poll; }; +/* +* Must only be called inside issue_flags & IO_URING_F_MULTISHOT, or +* potentially other cases where we already "own" this poll request. +*/ +static inline void io_poll_multishot_retry (struct io_kiocb *req) +{ +atomic_inc (&req->poll_refs); +} +int io_poll_add_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe);int io_poll_add (struct io_kiocb *req,unsigned int issue_flags);
io_uring/rw.c +9 -1
@@ -18,6 +18,7 @@#include "opdef.h" #include "kbuf.h" #include "rsrc.h" +#include "poll.h" #include "rw.h" struct io_rw {
@@ -956,8 +957,15 @@ int io_read_mshot(struct io_kiocb *req,if (io_fill_cqe_req_aux (req, issue_flags &IO_URING_F_COMPLETE_DEFER , ret, cflags |IORING_CQE_F_MORE )) { -if (issue_flags &IO_URING_F_MULTISHOT ) +if (issue_flags &IO_URING_F_MULTISHOT ) { +/* +* Force retry, as we might have more data to +* be read and otherwise it won't get retried +* until (if ever) another poll is triggered. +*/ +io_poll_multishot_retry (req);return IOU_ISSUE_SKIP_COMPLETE ; + }return -EAGAIN ; } }
Greg Kroah-Hartman
maintainerPATCH 109/124 PCI/ASPM: Fix deadlock when enabling ASPM
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 1e560864159d002b453da42bd2c13a1805515a20 upstream.
A last minute revert in 6.7-final introduced a potential deadlock when enabling ASPM during probe of Qualcomm PCIe controllers as reported by lockdep:
============================================
WARNING: possible recursive locking detected
6.7.0 #40 Not tainted
--------------------------------------------
kworker/u16:5/90 is trying to acquire lock:
ffffacfa78ced000 (pci_bus_sem){++++}-{3:3}, at: pcie_aspm_pm_state_change+0x58/0xdc
but task is already holding lock:
ffffacfa78ced000 (pci_bus_sem){++++}-{3:3}, at: pci_walk_bus+0x34/0xbc
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(pci_bus_sem);
lock(pci_bus_sem);
*** DEADLOCK ***Call trace: print_deadlock_bug+0x25c/0x348 __lock_acquire+0x10a4/0x2064 lock_acquire+0x1e8/0x318 down_read+0x60/0x184 pcie_aspm_pm_state_change+0x58/0xdc pci_set_full_power_state+0xa8/0x114 pci_set_power_state+0xc4/0x120 qcom_pcie_enable_aspm+0x1c/0x3c [pcie_qcom] pci_walk_bus+0x64/0xbc qcom_pcie_host_post_init_2_7_0+0x28/0x34 [pcie_qcom]
The deadlock can easily be reproduced on machines like the Lenovo ThinkPad X13s by adding a delay to increase the race window during asynchronous probe where another thread can take a write lock.
Add a new pci_set_power_state_locked() and associated helper functions that can be called with the PCI bus semaphore held to avoid taking the read lock twice.
--- drivers/pci/bus.c | 49 +++++++++++++------- drivers/pci/controller/dwc/pcie-qcom.c | 2 drivers/pci/pci.c | 78 ++++++++++++++++++++++----------- drivers/pci/pci.h | 4 - drivers/pci/pcie/aspm.c | 13 +++-- include/linux/pci.h | 5 ++ 6 files changed, 101 insertions(+), 50 deletions(-)
drivers/pci/bus.c +32 -17
@@ -386,21 +386,8 @@ void pci_bus_add_devices(const struct pc }EXPORT_SYMBOL (pci_bus_add_devices); -/** pci_walk_bus - walk devices on/under bus, calling callback. -* @top bus whose devices should be walked -* @cb callback to be called for each device found -* @userdata arbitrary pointer to be passed to callback. -* -* Walk the given bus, including any bridged devices -* on buses under this bus. Call the provided callback -* on each device found. -* -* We check the return of @cb each time. If it returns anything -* other than 0, we break out. -* -*/ -void pci_walk_bus (struct pci_bus *top,int (*cb)(struct pci_dev *,void *), -void *userdata) +static void __pci_walk_bus (struct pci_bus *top,int (*cb)(struct pci_dev *,void *), +void *userdata,bool locked) {struct pci_dev *dev;struct pci_bus *bus;
@@ -408,7 +395,8 @@ void pci_walk_bus(struct pci_bus *top, iint retval; bus = top; -down_read (&pci_bus_sem); +if (!locked) +down_read (&pci_bus_sem); next = top->devices.next;for (;;) {if (next == &bus->devices) {
@@ -431,10 +419,37 @@ void pci_walk_bus(struct pci_bus *top, iif (retval)break ; } -up_read (&pci_bus_sem); +if (!locked) +up_read (&pci_bus_sem); +} + +/** +* pci_walk_bus - walk devices on/under bus, calling callback. +* @top: bus whose devices should be walked +* @cb: callback to be called for each device found +* @userdata: arbitrary pointer to be passed to callback +* +* Walk the given bus, including any bridged devices +* on buses under this bus. Call the provided callback +* on each device found. +* +* We check the return of @cb each time. If it returns anything +* other than 0, we break out. +*/ +void pci_walk_bus (struct pci_bus *top,int (*cb)(struct pci_dev *,void *),void *userdata) +{ +__pci_walk_bus (top, cb, userdata, false); }EXPORT_SYMBOL_GPL (pci_walk_bus); +void pci_walk_bus_locked (struct pci_bus *top,int (*cb)(struct pci_dev *,void *),void *userdata) +{ +lockdep_assert_held (&pci_bus_sem); + +__pci_walk_bus (top, cb, userdata, true); +} +EXPORT_SYMBOL_GPL (pci_walk_bus_locked); +struct pci_bus *pci_bus_get (struct pci_bus *bus) {if (bus)
drivers/pci/controller/dwc/pcie-qcom.c +1 -1
@@ -972,7 +972,7 @@ static int qcom_pcie_enable_aspm(struct* Downstream devices need to be in D0 state before enabling PCI PM * substates. */ -pci_set_power_state (pdev,PCI_D0 ); +pci_set_power_state_locked (pdev,PCI_D0 );pci_enable_link_state_locked (pdev,PCIE_LINK_STATE_ALL );return 0 ;
drivers/pci/pci.c +52 -26
149 lines not on this page · raw message
drivers/pci/pci.h +2 -2
@@ -569,12 +569,12 @@ int pcie_retrain_link(struct pci_dev *pd#ifdef CONFIG_PCIEASPM void pcie_aspm_init_link_state (struct pci_dev *pdev);void pcie_aspm_exit_link_state (struct pci_dev *pdev); -void pcie_aspm_pm_state_change (struct pci_dev *pdev); +void pcie_aspm_pm_state_change (struct pci_dev *pdev,bool locked);void pcie_aspm_powersave_config_link (struct pci_dev *pdev);#else static inline void pcie_aspm_init_link_state (struct pci_dev *pdev) { }static inline void pcie_aspm_exit_link_state (struct pci_dev *pdev) { } -static inline void pcie_aspm_pm_state_change (struct pci_dev *pdev) { } +static inline void pcie_aspm_pm_state_change (struct pci_dev *pdev,bool locked) { }static inline void pcie_aspm_powersave_config_link (struct pci_dev *pdev) { }#endif
drivers/pci/pcie/aspm.c +9 -4
@@ -1008,8 +1008,11 @@ void pcie_aspm_exit_link_state(struct pcup_read (&pci_bus_sem); } -/* @pdev: the root port or switch downstream port */ -void pcie_aspm_pm_state_change (struct pci_dev *pdev) +/* +* @pdev: the root port or switch downstream port +* @locked: whether pci_bus_sem is held +*/ +void pcie_aspm_pm_state_change (struct pci_dev *pdev,bool locked) {struct pcie_link_state *link = pdev->link_state;
@@ -1019,12 +1022,14 @@ void pcie_aspm_pm_state_change(struct pc* Devices changed PM state, we should recheck if latency * meets all functions' requirement */ -down_read (&pci_bus_sem); +if (!locked) +down_read (&pci_bus_sem);mutex_lock (&aspm_lock);pcie_update_aspm_capable (link->root);pcie_config_aspm_path (link);mutex_unlock (&aspm_lock); -up_read (&pci_bus_sem); +if (!locked) +up_read (&pci_bus_sem); }void pcie_aspm_powersave_config_link (struct pci_dev *pdev)
include/linux/pci.h +5 -0
@@ -1417,6 +1417,7 @@ int pci_load_and_free_saved_state(struct struct pci_saved_state **state);int pci_platform_power_transition (struct pci_dev *dev,pci_power_t state);int pci_set_power_state (struct pci_dev *dev,pci_power_t state); +int pci_set_power_state_locked (struct pci_dev *dev,pci_power_t state);pci_power_t pci_choose_state (struct pci_dev *dev,pm_message_t state);bool pci_pme_capable (struct pci_dev *dev,pci_power_t state);void pci_pme_active (struct pci_dev *dev,bool enable);
@@ -1620,6 +1621,8 @@ int pci_scan_bridge(struct pci_bus *bus,void pci_walk_bus (struct pci_bus *top,int (*cb)(struct pci_dev *,void *),void *userdata); +void pci_walk_bus_locked (struct pci_bus *top,int (*cb)(struct pci_dev *,void *), +void *userdata);int pci_cfg_space_size (struct pci_dev *dev);unsigned char pci_bus_max_busnr (struct pci_bus *bus);void pci_setup_bridge (struct pci_bus *bus);
@@ -2019,6 +2022,8 @@ static inline int pci_save_state(structstatic inline void pci_restore_state (struct pci_dev *dev) { }static inline int pci_set_power_state (struct pci_dev *dev,pci_power_t state) {return 0 ; } +static inline int pci_set_power_state_locked (struct pci_dev *dev,pci_power_t state) +{return 0 ; }static inline int pci_wake_from_d3 (struct pci_dev *dev,bool enable) {return 0 ; } static inline pci_power_t pci_choose_state(struct pci_dev *dev,
Greg Kroah-Hartman
maintainerPATCH 110/124 new helper: user_path_locked_at()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit 74d016ecc1a7974664e98d1afbf649cd4e0e0423 upstream.
Equivalent of kern_path_locked() taking dfd/userland name. User introduced in the next commit.
--- fs/namei.c | 16 +++++++++++++--- include/linux/namei.h | 1 + 2 files changed, 14 insertions(+), 3 deletions(-)
fs/namei.c +13 -3
@@ -2573,13 +2573,13 @@ static int filename_parentat(int dfd, st }/* does lookup, returns the object with parent locked */ -static struct dentry *__kern_path_locked (struct filename *name,struct path *path) +static struct dentry *__kern_path_locked (int dfd,struct filename *name,struct path *path) {struct dentry *d;struct qstr last;int type, error; - error =filename_parentat (AT_FDCWD , name,0 , path, &last, &type); + error =filename_parentat (dfd, name,0 , path, &last, &type);if (error)return ERR_PTR (error);if (unlikely (type !=LAST_NORM )) {
@@ -2598,12 +2598,22 @@ static struct dentry *__kern_path_lockedstruct dentry *kern_path_locked (const char *name,struct path *path) {struct filename *filename =getname_kernel (name); -struct dentry *res =__kern_path_locked (filename, path); +struct dentry *res =__kern_path_locked (AT_FDCWD , filename, path);putname (filename);return res; } +struct dentry *user_path_locked_at (int dfd,const char __user *name,struct path *path) +{ +struct filename *filename =getname (name); +struct dentry *res =__kern_path_locked (dfd, filename, path); + +putname (filename); +return res; +} +EXPORT_SYMBOL (user_path_locked_at); +int kern_path (const char *name,unsigned int flags,struct path *path) {struct filename *filename =getname_kernel (name);
include/linux/namei.h +1 -0
@@ -66,6 +66,7 @@ extern struct dentry *kern_path_create(iextern struct dentry *user_path_create (int ,const char __user *,struct path *,unsigned int );extern void done_path_create (struct path *,struct dentry *);extern struct dentry *kern_path_locked (const char *,struct path *); +extern struct dentry *user_path_locked_at (int ,const char __user *,struct path *);int vfs_path_parent_lookup (struct filename *filename,unsigned int flags,struct path *parent,struct qstr *last,int *type,const struct path *root);
Greg Kroah-Hartman
maintainerPATCH 111/124 bch2_ioctl_subvolume_destroy(): fix locking
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit bbe6a7c899e7f265c5a6d01a178336a405e98ed6 upstream.
make it use user_path_locked_at() to get the normal directory protection for modifications, as well as stable ->d_parent and ->d_name in victim
--- fs/bcachefs/fs-ioctl.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
fs/bcachefs/fs-ioctl.c +17 -14
@@ -451,33 +451,36 @@ static long bch2_ioctl_subvolume_create(static long bch2_ioctl_subvolume_destroy (struct bch_fs *c,struct file *filp,struct bch_ioctl_subvolume arg) { +const char __user *name = (void __user *)(unsigned long )arg.dst_ptr;struct path path;struct inode *dir; +struct dentry *victim;int ret =0 ;if (arg.flags)return -EINVAL ; - ret =user_path_at (arg.dirfd, - (const char __user *)(unsigned long )arg.dst_ptr, -LOOKUP_FOLLOW , &path); -if (ret) -return ret; + victim =user_path_locked_at (arg.dirfd, name, &path); +if (IS_ERR (victim)) +return PTR_ERR (victim); -if (path.dentry->d_sb->s_fs_info != c) { +if (victim->d_sb->s_fs_info != c) { ret = -EXDEV ; goto err; } - - dir = path.dentry->d_parent->d_inode; - - ret =__bch2_unlink (dir, path.dentry, true); -if (ret) +if (!d_is_positive (victim)) { + ret = -ENOENT ; goto err; - -fsnotify_rmdir (dir, path.dentry); -d_delete (path.dentry); + } + dir =d_inode (path.dentry); + ret =__bch2_unlink (dir, victim, true); +if (!ret) { +fsnotify_rmdir (dir, victim); +d_delete (victim); + } +inode_unlock (dir); err: +dput (victim);path_put (&path);return ret; }
Greg Kroah-Hartman
maintainerPATCH 112/124 bcachefs: Dont pass memcmp() as a pointer
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kent Overstreet <[email protected]>
commit 0124f42da70c513dc371b73688663c54e5a9666f upstream.
Some (buggy!) compilers have issues with this.
--- fs/bcachefs/replicas.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/bcachefs/replicas.c +8 -2
@@ -9,6 +9,12 @@static int bch2_cpu_replicas_to_sb_replicas (struct bch_fs *,struct bch_replicas_cpu *); +/* Some (buggy!) compilers don't allow memcmp to be passed as a pointer */ +static int bch2_memcmp (const void *l,const void *r,size_t size) +{ +return memcmp (l, r, size); +} +/* Replicas tracking - in memory: */ static void verify_replicas_entry (struct bch_replicas_entry *e)
@@ -33,7 +39,7 @@ void bch2_replicas_entry_sort(struct bchstatic void bch2_cpu_replicas_sort (struct bch_replicas_cpu *r) { -eytzinger0_sort (r->entries, r->nr, r->entry_size, memcmp,NULL ); +eytzinger0_sort (r->entries, r->nr, r->entry_size, bch2_memcmp,NULL ); } static void bch2_replicas_entry_v0_to_text(struct printbuf *out,
@@ -833,7 +839,7 @@ static int bch2_cpu_replicas_validate(stsort_cmp_size (cpu_r->entries, cpu_r->nr, cpu_r->entry_size, - memcmp,NULL ); + bch2_memcmp,NULL );for (i =0 ; i < cpu_r->nr; i++) { struct bch_replicas_entry *e =
Greg Kroah-Hartman
maintainerPATCH 113/124 bcachefs: rebalance should wakeup on shutdown if disabled
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Hill <[email protected]>
commit 0c069781ddfa4e31c169a8eced1ee90b8929d522 upstream.
--- fs/bcachefs/move.c | 2 +- fs/bcachefs/move.h | 1 + fs/bcachefs/rebalance.c | 12 ++++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-)
fs/bcachefs/move.c +1 -1
@@ -152,7 +152,7 @@ void bch2_move_ctxt_wait_for_io(struct m atomic_read(&ctxt->write_sectors) != sectors_pending); } -static void bch2_moving_ctxt_flush_all (struct moving_context *ctxt) +void bch2_moving_ctxt_flush_all (struct moving_context *ctxt) {move_ctxt_wait_event (ctxt,list_empty (&ctxt->reads));bch2_trans_unlock_long (ctxt->trans);
fs/bcachefs/move.h +1 -0
@@ -81,6 +81,7 @@ void bch2_moving_ctxt_init(struct moving struct write_point_specifier, bool);struct moving_io *bch2_moving_ctxt_next_pending_write (struct moving_context *);void bch2_moving_ctxt_do_pending_writes (struct moving_context *); +void bch2_moving_ctxt_flush_all (struct moving_context *);void bch2_move_ctxt_wait_for_io (struct moving_context *);int bch2_move_ratelimit (struct moving_context *);
fs/bcachefs/rebalance.c +10 -2
@@ -317,8 +317,16 @@ static int do_rebalance(struct moving_co BTREE_ID_rebalance_work,POS_MIN , BTREE_ITER_ALL_SNAPSHOTS); -while (!bch2_move_ratelimit (ctxt) && - !kthread_wait_freezable (r->enabled)) { +while (!bch2_move_ratelimit (ctxt)) { +if (!r->enabled) { +bch2_moving_ctxt_flush_all (ctxt); +kthread_wait_freezable (r->enabled || +kthread_should_stop ()); + } + +if (kthread_should_stop ()) +break ; +bch2_trans_begin (trans); ret =bkey_err (k =next_rebalance_entry (trans, &rebalance_work_iter));
Greg Kroah-Hartman
maintainerPATCH 114/124 bcachefs: Add missing bch2_moving_ctxt_flush_all()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kent Overstreet <[email protected]>
commit ef740a1e2939376ea4cc11cc8b923214dc1f4a41 upstream.
This fixes a bug with rebalance IOs getting stuck with reads completed, but writes never being issued.
--- fs/bcachefs/rebalance.c | 1 + 1 file changed, 1 insertion(+)
fs/bcachefs/rebalance.c +1 -0
@@ -356,6 +356,7 @@ static int do_rebalance(struct moving_co !kthread_should_stop() && !atomic64_read(&r->work_stats.sectors_seen) && !atomic64_read(&r->scan_stats.sectors_seen)) { +bch2_moving_ctxt_flush_all (ctxt);bch2_trans_unlock_long (trans);rebalance_wait (c); }
Greg Kroah-Hartman
maintainerPATCH 115/124 bcachefs: bch2_kthread_io_clock_wait() no longer sleeps until full amount
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kent Overstreet <[email protected]>
commit d92b83f592d810aded2e5f90db5f560cc8cf577b upstream.
Drop t he loop in bch2_kthread_io_clock_wait(): this allows the code that uses it to be woken up for other reasons, and fixes a bug where rebalance wouldn't wake up when a scan was requested.
This raises the possibility of spurious wakeups, but callers should always be able to handle that reasonably well.
--- fs/bcachefs/clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/bcachefs/clock.c +2 -2
@@ -109,7 +109,7 @@ void bch2_kthread_io_clock_wait(struct iif (cpu_timeout !=MAX_SCHEDULE_TIMEOUT )mod_timer (&wait.cpu_timer, cpu_timeout + jiffies); -while (1 ) { + do { set_current_state(TASK_INTERRUPTIBLE); if (kthread && kthread_should_stop()) break;
@@ -119,7 +119,7 @@ void bch2_kthread_io_clock_wait(struct ischedule ();try_to_freeze (); - } + }while (0 );__set_current_state (TASK_RUNNING );del_timer_sync (&wait.cpu_timer);
Greg Kroah-Hartman
maintainerPATCH 116/124 bcachefs: kvfree bch_fs::snapshots in bch2_fs_snapshots_exit
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Yue <[email protected]>
commit 369acf97d6fd5da620d053d0f1878ffe32eff555 upstream.
bch_fs::snapshots is allocated by kvzalloc in __snapshot_t_mut. It should be freed by kvfree not kfree.
Or umount will triger:
[ 406.829178 ] BUG: unable to handle page fault for address: ffffe7b487148008 [ 406.830676 ] #PF: supervisor read access in kernel mode [ 406.831643 ] #PF: error_code(0x0000) - not-present page [ 406.832487 ] PGD 0 P4D 0 [ 406.832898 ] Oops: 0000 [#1] PREEMPT SMP PTI [ 406.833512 ] CPU: 2 PID: 1754 Comm: umount Kdump: loaded Tainted: G OE 6.7.0-rc7-custom+ #90 [ 406.834746 ] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Arch Linux 1.16.3-1-1 04/01/2014 [ 406.835796 ] RIP: 0010:kfree+0x62/0x140 [ 406.836197 ] Code: 80 48 01 d8 0f 82 e9 00 00 00 48 c7 c2 00 00 00 80 48 2b 15 78 9f 1f 01 48 01 d0 48 c1 e8 0c 48 c1 e0 06 48 03 05 56 9f 1f 01 <48> 8b 50 08 48 89 c7 f6 c2 01 0f 85 b0 00 00 00 66 90 48 8b 07 f6 [ 406.837810 ] RSP: 0018:ffffb9d641607e48 EFLAGS: 00010286 [ 406.838213 ] RAX: ffffe7b487148000 RBX: ffffb9d645200000 RCX: ffffb9d641607dc4 [ 406.838738 ] RDX: 000065bb00000000 RSI: ffffffffc0d88b84 RDI: ffffb9d645200000 [ 406.839217 ] RBP: ffff9a4625d00068 R08: 0000000000000001 R09: 0000000000000001 [ 406.839650 ] R10: 0000000000000001 R11: 000000000000001f R12: ffff9a4625d4da80 [ 406.840055 ] R13: ffff9a4625d00000 R14: ffffffffc0e2eb20 R15: 0000000000000000 [ 406.840451 ] FS: 00007f0a264ffb80(0000) GS:ffff9a4e2d500000(0000) knlGS:0000000000000000 [ 406.840851 ] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 406.841125 ] CR2: ffffe7b487148008 CR3: 000000018c4d2000 CR4: 00000000000006f0 [ 406.841464 ] Call Trace: [ 406.841583 ] <TASK> [ 406.841682 ] ? __die+0x1f/0x70 [ 406.841828 ] ? page_fault_oops+0x159/0x470 [ 406.842014 ] ? fixup_exception+0x22/0x310 [ 406.842198 ] ? exc_page_fault+0x1ed/0x200 [ 406.842382 ] ? asm_exc_page_fault+0x22/0x30 [ 406.842574 ] ? bch2_fs_release+0x54/0x280 [bcachefs] [ 406.842842 ] ? kfree+0x62/0x140 [ 406.842988 ] ? kfree+0x104/0x140 [ 406.843138 ] bch2_fs_release+0x54/0x280 [bcachefs] [ 406.843390 ] kobject_put+0xb7/0x170 [ 406.843552 ] deactivate_locked_super+0x2f/0xa0 [ 406.843756 ] cleanup_mnt+0xba/0x150 [ 406.843917 ] task_work_run+0x59/0xa0 [ 406.844083 ] exit_to_user_mode_prepare+0x197/0x1a0 [ 406.844302 ] syscall_exit_to_user_mode+0x16/0x40 [ 406.844510 ] do_syscall_64+0x4e/0xf0 [ 406.844675 ] entry_SYSCALL_64_after_hwframe+0x6e/0x76 [ 406.844907 ] RIP: 0033:0x7f0a2664e4fb
--- fs/bcachefs/snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/snapshot.c +1 -1
@@ -1709,5 +1709,5 @@ int bch2_snapshots_read(struct bch_fs *cvoid bch2_fs_snapshots_exit (struct bch_fs *c) { -kfree (rcu_dereference_protected (c->snapshots, true)); +kvfree (rcu_dereference_protected (c->snapshots, true)); }
Greg Kroah-Hartman
maintainerPATCH 117/124 bcachefs: grab s_umount only if snapshotting
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Yue <[email protected]>
commit 2acc59dd88d27ad69b66ded80df16c042b04eeec upstream.
When I was testing mongodb over bcachefs with compression, there is a lockdep warning when snapshotting mongodb data volume.
$ cat test.sh prog=bcachefs
$prog subvolume create /mnt/data
$prog subvolume create /mnt/data/snapshots
while true;do
$prog subvolume snapshot /mnt/data /mnt/data/snapshots/$(date +%s)
sleep 1sdone
$ cat /etc/mongodb.conf systemLog: destination: file logAppend: true path: /mnt/data/mongod.log
storage:
dbPath: /mnt/data/
lockdep reports:
[ 3437.452330] ======================================================
[ 3437.452750] WARNING: possible circular locking dependency detected
[ 3437.453168] 6.7.0-rc7-custom+ #85 Tainted: G E
[ 3437.453562] ------------------------------------------------------
[ 3437.453981] bcachefs/35533 is trying to acquire lock:
[ 3437.454325] ffffa0a02b2b1418 (sb_writers#10){.+.+}-{0:0}, at: filename_create+0x62/0x190
[ 3437.454875]
but task is already holding lock:
[ 3437.455268] ffffa0a02b2b10e0 (&type->s_umount_key#48){.+.+}-{3:3}, at: bch2_fs_file_ioctl+0x232/0xc90 [bcachefs]
[ 3437.456009]
which lock already depends on the new lock.[ 3437.456553]
the existing dependency chain (in reverse order) is:
[ 3437.457054]
-> #3 (&type->s_umount_key#48){.+.+}-{3:3}:
[ 3437.457507] down_read+0x3e/0x170
[ 3437.457772] bch2_fs_file_ioctl+0x232/0xc90 [bcachefs]
[ 3437.458206] __x64_sys_ioctl+0x93/0xd0
[ 3437.458498] do_syscall_64+0x42/0xf0
[ 3437.458779] entry_SYSCALL_64_after_hwframe+0x6e/0x76
[ 3437.459155]
-> #2 (&c->snapshot_create_lock){++++}-{3:3}:
[ 3437.459615] down_read+0x3e/0x170
[ 3437.459878] bch2_truncate+0x82/0x110 [bcachefs]
[ 3437.460276] bchfs_truncate+0x254/0x3c0 [bcachefs]
[ 3437.460686] notify_change+0x1f1/0x4a0
[ 3437.461283] do_truncate+0x7f/0xd0
[ 3437.461555] path_openat+0xa57/0xce0
[ 3437.461836] do_filp_open+0xb4/0x160
[ 3437.462116] do_sys_openat2+0x91/0xc0
[ 3437.462402] __x64_sys_openat+0x53/0xa0
[ 3437.462701] do_syscall_64+0x42/0xf0
[ 3437.462982] entry_SYSCALL_64_after_hwframe+0x6e/0x76
[ 3437.463359]
-> #1 (&sb->s_type->i_mutex_key#15){+.+.}-{3:3}:
[ 3437.463843] down_write+0x3b/0xc0
[ 3437.464223] bch2_write_iter+0x5b/0xcc0 [bcachefs]
[ 3437.464493] vfs_write+0x21b/0x4c0
[ 3437.464653] ksys_write+0x69/0xf0
[ 3437.464839] do_syscall_64+0x42/0xf0
[ 3437.465009] entry_SYSCALL_64_after_hwframe+0x6e/0x76
[ 3437.465231]
-> #0 (sb_writers#10){.+.+}-{0:0}:
[ 3437.465471] __lock_acquire+0x1455/0x21b0
[ 3437.465656] lock_acquire+0xc6/0x2b0
[ 3437.465822] mnt_want_write+0x46/0x1a0
[ 3437.465996] filename_create+0x62/0x190
[ 3437.466175] user_path_create+0x2d/0x50
[ 3437.466352] bch2_fs_file_ioctl+0x2ec/0xc90 [bcachefs]
[ 3437.466617] __x64_sys_ioctl+0x93/0xd0
[ 3437.466791] do_syscall_64+0x42/0xf0
[ 3437.466957] entry_SYSCALL_64_after_hwframe+0x6e/0x76
[ 3437.467180]
other info that might help us debug this:[ 3437.469670] 2 locks held by bcachefs/35533:
other info that might help us debug this:[ 3437.467507] Chain exists of:
sb_writers#10 --> &c->snapshot_create_lock --> &type->s_umount_key#48[ 3437.467979] Possible unsafe locking scenario:
[ 3437.468223] CPU0 CPU1
[ 3437.468405] ---- ----
[ 3437.468585] rlock(&type->s_umount_key#48);
[ 3437.468758] lock(&c->snapshot_create_lock);
[ 3437.469030] lock(&type->s_umount_key#48);
[ 3437.469291] rlock(sb_writers#10);
[ 3437.469434]
*** DEADLOCK ***[ 3437.469670] 2 locks held by bcachefs/35533:
[ 3437.469838] #0: ffffa0a02ce00a88 (&c->snapshot_create_lock){++++}-{3:3}, at: bch2_fs_file_ioctl+0x1e3/0xc90 [bcachefs]
[ 3437.470294] #1: ffffa0a02b2b10e0 (&type->s_umount_key#48){.+.+}-{3:3}, at: bch2_fs_file_ioctl+0x232/0xc90 [bcachefs]
[ 3437.470744]
stack backtrace:
[ 3437.470922] CPU: 7 PID: 35533 Comm: bcachefs Kdump: loaded Tainted: G E 6.7.0-rc7-custom+ #85
[ 3437.471313] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Arch Linux 1.16.3-1-1 04/01/2014
[ 3437.471694] Call Trace:
[ 3437.471795] <TASK>
[ 3437.471884] dump_stack_lvl+0x57/0x90
[ 3437.472035] check_noncircular+0x132/0x150
[ 3437.472202] __lock_acquire+0x1455/0x21b0
[ 3437.472369] lock_acquire+0xc6/0x2b0
[ 3437.472518] ? filename_create+0x62/0x190
[ 3437.472683] ? lock_is_held_type+0x97/0x110
[ 3437.472856] mnt_want_write+0x46/0x1a0
[ 3437.473025] ? filename_create+0x62/0x190
[ 3437.473204] filename_create+0x62/0x190
[ 3437.473380] user_path_create+0x2d/0x50
[ 3437.473555] bch2_fs_file_ioctl+0x2ec/0xc90 [bcachefs]
[ 3437.473819] ? lock_acquire+0xc6/0x2b0
[ 3437.474002] ? __fget_files+0x2a/0x190
[ 3437.474195] ? __fget_files+0xbc/0x190
[ 3437.474380] ? lock_release+0xc5/0x270
[ 3437.474567] ? __x64_sys_ioctl+0x93/0xd0
[ 3437.474764] ? __pfx_bch2_fs_file_ioctl+0x10/0x10 [bcachefs]
[ 3437.475090] __x64_sys_ioctl+0x93/0xd0
[ 3437.475277] do_syscall_64+0x42/0xf0
[ 3437.475454] entry_SYSCALL_64_after_hwframe+0x6e/0x76
[ 3437.475691] RIP: 0033:0x7f2743c313af======================================================
In __bch2_ioctl_subvolume_create(), we grab s_umount unconditionally and unlock it at the end of the function. There is a comment "why do we need this lock?" about the lock coming from commit 42d237320e98 ("bcachefs: Snapshot creation, deletion") The reason is that __bch2_ioctl_subvolume_create() calls sync_inodes_sb() which enforce locked s_umount to writeback all dirty nodes before doing snapshot works.
Fix it by read locking s_umount for snapshotting only and unlocking s_umount after sync_inodes_sb().
--- fs/bcachefs/fs-ioctl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
fs/bcachefs/fs-ioctl.c +5 -6
@@ -345,11 +345,12 @@ static long __bch2_ioctl_subvolume_creatif (arg.flags &BCH_SUBVOL_SNAPSHOT_RO ) create_flags |=BCH_CREATE_SNAPSHOT_RO ; -/* why do we need this lock? */ -down_read (&c->vfs_sb->s_umount); - -if (arg.flags &BCH_SUBVOL_SNAPSHOT_CREATE ) +if (arg.flags &BCH_SUBVOL_SNAPSHOT_CREATE ) { +/* sync_inodes_sb enforce s_umount is locked */ +down_read (&c->vfs_sb->s_umount);sync_inodes_sb (c->vfs_sb); +up_read (&c->vfs_sb->s_umount); + } retry:if (arg.src_ptr) { error = user_path_at(arg.dirfd,
@@ -433,8 +434,6 @@ err2: goto retry; } err1: -up_read (&c->vfs_sb->s_umount); -return error; }
Greg Kroah-Hartman
maintainerPATCH 118/124 bcachefs: fix incorrect usage of REQ_OP_FLUSH
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
commit 3e44f325f6f75078cdcd44cd337f517ba3650d05 upstream.
REQ_OP_FLUSH is only for internal use in the blk-mq and request based drivers. File systems and other block layer consumers must use REQ_OP_WRITE | REQ_PREFLUSH as documented in Documentation/block/writeback_cache_control.rst.
While REQ_OP_FLUSH appears to work for blk-mq drivers it does not get the proper flush state machine handling, and completely fails for any bio based drivers, including all the stacking drivers. The block layer will also get a check in 6.8 to reject this use case entirely.
[Note: completely untested, but as this never got fixed since the original bug report in November:
https://bugzilla.kernel.org/show_bug.cgi?id=218184
and the the discussion in December:
https://lore.kernel.org/all/[email protected]/T/
this seems to be best way to force it]
--- fs/bcachefs/fs-io.c | 2 +- fs/bcachefs/journal_io.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
fs/bcachefs/fs-io.c +1 -1
@@ -79,7 +79,7 @@ void bch2_inode_flush_nocow_writes_asynccontinue ; bio =container_of (bio_alloc_bioset (ca->disk_sb.bdev,0 , -REQ_OP_FLUSH , +REQ_OP_WRITE |REQ_PREFLUSH ,GFP_KERNEL , &c->nocow_flush_bioset), struct nocow_flush, bio);
fs/bcachefs/journal_io.c +2 -1
@@ -1948,7 +1948,8 @@ CLOSURE_CALLBACK(bch2_journal_write)percpu_ref_get (&ca->io_ref); bio = ca->journal.bio; -bio_reset (bio, ca->disk_sb.bdev,REQ_OP_FLUSH ); +bio_reset (bio, ca->disk_sb.bdev, +REQ_OP_WRITE |REQ_PREFLUSH ); bio->bi_end_io = journal_write_endio; bio->bi_private = ca;closure_bio_submit (bio, cl);
Greg Kroah-Hartman
maintainerPATCH 119/124 bcachefs: unlock parent dir if entry is not found in subvolume deletion
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guoyu Ou <[email protected]>
commit 6bb3f7f4c3f4da8e09de188f2f63e8f741bba3bd upstream.
Parent dir is locked by user_path_locked_at() before validating the required dentry. It should be unlocked if we can not perform the deletion.
This fixes the problem:
$ bcachefs subvolume delete not-exist-entry BCH_IOCTL_SUBVOLUME_DESTROY ioctl error: No such file or directory $ bcachefs subvolume delete not-exist-entry
the second will stuck because the parent dir is locked in the previous deletion.
--- fs/bcachefs/fs-ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/bcachefs/fs-ioctl.c +2 -2
@@ -463,6 +463,7 @@ static long bch2_ioctl_subvolume_destroyif (IS_ERR (victim))return PTR_ERR (victim); + dir =d_inode (path.dentry);if (victim->d_sb->s_fs_info != c) { ret = -EXDEV ; goto err;
@@ -471,14 +472,13 @@ static long bch2_ioctl_subvolume_destroy ret = -ENOENT ; goto err; } - dir =d_inode (path.dentry); ret =__bch2_unlink (dir, victim, true);if (!ret) {fsnotify_rmdir (dir, victim);d_delete (victim); } -inode_unlock (dir); err: +inode_unlock (dir);dput (victim);path_put (&path);return ret;
Greg Kroah-Hartman
maintainerPATCH 120/124 bcachefs: time_stats: Check for last_event == 0 when updating freq stats
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kent Overstreet <[email protected]>
commit 7b508b323b2ec45be59769bd4e4aeba729c52cf6 upstream.
This fixes spurious outliers in the frequency stats.
--- fs/bcachefs/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/bcachefs/util.c +3 -2
@@ -362,14 +362,15 @@ static inline void bch2_time_stats_updatbch2_quantiles_update (&stats->quantiles, duration); } -if (time_after64 (end, stats->last_event)) { +if (stats->last_event &&time_after64 (end, stats->last_event)) { freq = end - stats->last_event;mean_and_variance_update (&stats->freq_stats, freq);mean_and_variance_weighted_update (&stats->freq_stats_weighted, freq); stats->max_freq =max (stats->max_freq, freq); stats->min_freq =min (stats->min_freq, freq); - stats->last_event = end; } + + stats->last_event = end; } static noinline void bch2_time_stats_clear_buffer(struct bch2_time_stats *stats,
Greg Kroah-Hartman
maintainerPATCH 121/124 Revert "ASoC: amd: Add new dmi entries for acp5x platform"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
This reverts commit 4b6986b170f2f23e390bbd2d50784caa9cb67093 which is commit c3ab23a10771bbe06300e5374efa809789c65455 upstream.
--- sound/soc/amd/acp-config.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
sound/soc/amd/acp-config.c +1 -14
@@ -3,7 +3,7 @@// This file is provided under a dual BSD/GPLv2 license. When using or // redistributing this file, you may do so under either license. // -// Copyright(c) 2021, 2023 Advanced Micro Devices, Inc. +// Copyright(c) 2021 Advanced Micro Devices, Inc. // // Authors: Ajit Kumar Pandey <[email protected]> //
@@ -45,19 +45,6 @@ static const struct config_entry config_ }, }, {} - }, - }, - { - .flags = FLAG_AMD_LEGACY, - .device = ACP_PCI_DEV_ID, - .dmi_table = (const struct dmi_system_id []) { - { - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"Valve" ), -DMI_MATCH (DMI_PRODUCT_NAME ,"Jupiter" ), - }, - }, - {} }, }, {
Greg Kroah-Hartman
maintainerPATCH 122/124 io_uring/poll: add requeue return code from poll multishot handling
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
Commit 704ea888d646cb9d715662944cf389c823252ee0 upstream.
Since our poll handling is edge triggered, multishot handlers retry internally until they know that no more data is available. In preparation for limiting these retries, add an internal return code, IOU_REQUEUE, which can be used to inform the poll backend about the handler wanting to retry, but that this should happen through a normal task_work requeue rather than keep hammering on the issue side for this one request.
No functional changes in this patch, nobody is using this return code just yet.
--- io_uring/io_uring.h | 7 +++++++ io_uring/poll.c | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
io_uring/io_uring.h +7 -0
@@ -31,6 +31,13 @@ enum {IOU_ISSUE_SKIP_COMPLETE = -EIOCBQUEUED ,/* +* Requeue the task_work to restart operations on this request. The +* actual value isn't important, should just be not an otherwise +* valid error code, yet less than -MAX_ERRNO and valid internally. +*/ + IOU_REQUEUE = -3072, + +/* * Intended only when both IO_URING_F_MULTISHOT is passed * to indicate to the poll runner that multishot should be * removed and the result is set on req->cqe.res.
io_uring/poll.c +8 -1
@@ -226,6 +226,7 @@ enum {IOU_POLL_NO_ACTION =1 ,IOU_POLL_REMOVE_POLL_USE_RES =2 ,IOU_POLL_REISSUE =3 , + IOU_POLL_REQUEUE = 4, };static void __io_poll_execute (struct io_kiocb *req,int mask)
@@ -329,6 +330,8 @@ static int io_poll_check_events(struct iint ret =io_poll_issue (req, ts);if (ret ==IOU_STOP_MULTISHOT )return IOU_POLL_REMOVE_POLL_USE_RES ; +else if (ret ==IOU_REQUEUE ) +return IOU_POLL_REQUEUE ;if (ret <0 )return ret; }
@@ -351,8 +354,12 @@ void io_poll_task_func(struct io_kiocb *int ret; ret =io_poll_check_events (req, ts); -if (ret ==IOU_POLL_NO_ACTION ) +if (ret ==IOU_POLL_NO_ACTION ) {return ; + }else if (ret ==IOU_POLL_REQUEUE ) { +__io_poll_execute (req,0 ); +return ; + }io_poll_remove_entries (req);io_poll_tw_hash_eject (req, ts);
Greg Kroah-Hartman
maintainerPATCH 123/124 io_uring/net: limit inline multishot retries
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
Commit 76b367a2d83163cf19173d5cb0b562acbabc8eac upstream.
If we have multiple clients and some/all are flooding the receives to such an extent that we can retry a LOT handling multishot receives, then we can be starving some clients and hence serving traffic in an imbalanced fashion.
Limit multishot retry attempts to some arbitrary value, whose only purpose serves to ensure that we don't keep serving a single connection for way too long. We default to 32 retries, which should be more than enough to provide fairness, yet not so small that we'll spend too much time requeuing rather than handling traffic.
Cc: [email protected]
Depends-on: 704ea888d646 ("io_uring/poll: add requeue return code from poll multishot handling")
Depends-on: 1e5d765a82f ("io_uring/net: un-indent mshot retry path in io_recv_finish()")
Depends-on: e84b01a880f6 ("io_uring/poll: move poll execution helpers higher up")
--- io_uring/net.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
io_uring/net.c +20 -3
@@ -60,6 +60,7 @@ struct io_sr_msg {unsigned len;unsigned done_io;unsigned msg_flags; +unsigned nr_multishot_loops;u16 flags;/* initialised and used only by !msg send variants */ u16 addr_len;
@@ -70,6 +71,13 @@ struct io_sr_msg {struct io_kiocb *notif; }; +/* +* Number of times we'll try and do receives if there's more data. If we +* exceed this limit, then add us to the back of the queue and retry from +* there. This helps fairness between flooding clients. +*/ +#define MULTISHOT_MAX_RETRY 32 +static inline bool io_check_multishot (struct io_kiocb *req,unsigned int issue_flags) {
@@ -611,6 +619,7 @@ int io_recvmsg_prep(struct io_kiocb *req sr->msg_flags |=MSG_CMSG_COMPAT ;#endif sr->done_io =0 ; + sr->nr_multishot_loops =0 ;return 0 ; }
@@ -654,12 +663,20 @@ static inline bool io_recv_finish(struct*/ if (io_fill_cqe_req_aux (req, issue_flags &IO_URING_F_COMPLETE_DEFER , *ret, cflags |IORING_CQE_F_MORE )) { + struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg); +int mshot_retry_ret =IOU_ISSUE_SKIP_COMPLETE ; +io_recv_prep_retry (req);/* Known not-empty or unknown state, retry */ -if (cflags &IORING_CQE_F_SOCK_NONEMPTY || msg->msg_inq ==-1 ) -return false; +if (cflags &IORING_CQE_F_SOCK_NONEMPTY || msg->msg_inq ==-1 ) { +if (sr->nr_multishot_loops++ <MULTISHOT_MAX_RETRY ) +return false; +/* mshot retries exceeded, force a requeue */ + sr->nr_multishot_loops =0 ; + mshot_retry_ret =IOU_REQUEUE ; + }if (issue_flags &IO_URING_F_MULTISHOT ) - *ret =IOU_ISSUE_SKIP_COMPLETE ; + *ret = mshot_retry_ret;else *ret = -EAGAIN ;return true;
Greg Kroah-Hartman
maintainerPATCH 124/124 net: Fix from address in memcpy_to_iter_csum()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Lass <[email protected]>
commit fe92f874f09145a6951deacaa4961390238bbe0d upstream.
While inlining csum_and_memcpy() into memcpy_to_iter_csum(), the from address passed to csum_partial_copy_nocheck() was accidentally changed. This causes a regression in applications using UDP, as for example OpenAFS, causing loss of datagrams.
--- net/core/datagram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/datagram.c +1 -1
@@ -751,7 +751,7 @@ size_t memcpy_to_iter_csum(void *iter_to size_t len, void *from, void *priv2) { __wsum *csum = priv2; -__wsum next =csum_partial_copy_nocheck (from, iter_to, len); +__wsum next =csum_partial_copy_nocheck (from + progress, iter_to, len); *csum =csum_block_add (*csum, next, progress);return 0 ;
Works fine on my desktop with model name : AMD Ryzen 5 5600 6-Core
Processor and Arch Linux
Den tis 13 feb. 2024 kl 18:35 skrev Greg Kroah-Hartman <[email protected]>:
Quoted 566 lines
This is the start of the stable review cycle for the 6.7.5 release. There are 124 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Feb 2024 17:18:29 +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.7.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.7.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 6.7.5-rc1Michael Lass <[email protected]>
net: Fix from address inmemcpy_to_iter_csum()Jens Axboe <[email protected]>
io_uring/net: limit inline multishot retriesJens Axboe <[email protected]>
io_uring/poll: add requeue return code from poll multishot handlingGreg Kroah-Hartman <[email protected]>
Revert "ASoC: amd: Add new dmi entries for acp5x platform"Kent Overstreet <[email protected]>
bcachefs: time_stats: Check for last_event == 0 when updating freq statsGuoyu Ou <[email protected]>
bcachefs: unlock parent dir if entry is not found in subvolume deletionChristoph Hellwig <[email protected]>
bcachefs: fix incorrect usage ofREQ_OP_FLUSHSu Yue <[email protected]>
bcachefs: grabs_umountonly if snapshottingSu Yue <[email protected]>
bcachefs: kvfreebch_fs::snapshotsinbch2_fs_snapshots_exitKent Overstreet <[email protected]>
bcachefs:bch2_kthread_io_clock_wait()no longer sleeps until full amountKent Overstreet <[email protected]>
bcachefs: Add missingbch2_moving_ctxt_flush_all()Daniel Hill <[email protected]>
bcachefs: rebalance should wakeup on shutdown if disabledKent Overstreet <[email protected]>
bcachefs: Don't passmemcmp()as a pointerAl Viro <[email protected]>
bch2_ioctl_subvolume_destroy(): fix lockingAl Viro <[email protected]>
new helper:user_path_locked_at()Johan Hovold <[email protected]>
PCI/ASPM: Fix deadlock when enabling ASPMJens Axboe <[email protected]>
io_uring/rw: ensure poll based multishot read retries appropriatelyJens Axboe <[email protected]>
io_uring/net: un-indent mshot retry path inio_recv_finish()Jens Axboe <[email protected]>
io_uring/poll: move poll execution helpers higher upJens Axboe <[email protected]>
io_uring/net: fix sr->len for IORING_OP_RECV with MSG_WAITALL and buffersEmmanuel Grumbach <[email protected]>
wifi: iwlwifi: mvm: fix a battery life regressionHans de Goede <[email protected]>
Input: atkbd - skipATKBD_CMD_SETLEDSwhen skippingATKBD_CMD_GETIDWerner Sembach <[email protected]>
Input: i8042 - fix strange behavior of touchpad on Clevo NS70PUFrederic Weisbecker <[email protected]>
hrtimer: Report offline hrtimer enqueueHeikki Krogerus <[email protected]>
usb: dwc3: pci: add support for the Intel Arrow Lake-HMichal Pecio <[email protected]>
xhci: handle isoc Babble and Buffer Overrun events properlyMathias Nyman <[email protected]>
xhci: process isoc TD properly when there was a transaction error mid TD.Prashanth K <[email protected]>
usb: host: xhci-plat: Add support forXHCI_SG_TRB_CACHE_SIZE_QUIRKPrashanth K <[email protected]>
usb: dwc3: host: SetXHCI_SG_TRB_CACHE_SIZE_QUIRKQiuxu Zhuo <[email protected]>
x86/lib: Revert to_ASM_EXTABLE_UA()for {get,put}_user() fixupsMario Limonciello <[email protected]>
Revert "drm/amd/pm: fix the high voltage and temperature issue"Badhri Jagan Sridharan <[email protected]>
Revert "usb: typec: tcpm: fix cc role at port reset"Leonard Dallmayr <[email protected]>
USB: serial: cp210x: add ID for IMST iM871A-USBPuliang Lu <[email protected]>
USB: serial: option: add Fibocom FM101-GL variantJackBB Wu <[email protected]>
USB: serial: qcserial: add new usb-id for Dell Wireless DW5826eSean Young <[email protected]>
ALSA: usb-audio: add quirk for RODE NT-USB+Julian Sikorski <[email protected]>
ALSA: usb-audio: Add a quirk for Yamaha YIT-W12TX transmitterAlexander Tsoy <[email protected]>
ALSA: usb-audio: Add delay quirk for MOTU M Series 2nd revisionTejun Heo <[email protected]>
blk-iocost: Fix an UBSAN shift-out-of-bounds warningMuhammad Usama Anjum <[email protected]>
selftests: core: includelinux/close_range.hfor CLOSE_RANGE_* macrosMaurizio Lombardi <[email protected]>
nvme-host: fix the updating of the firmware versionBen Dooks <[email protected]>
riscv: declareoverflow_stackas exported fromtraps.cAlexandre Ghiti <[email protected]>
riscv: Fixarch_hugetlb_migration_supported()for NAPOTXiubo Li <[email protected]>
ceph: always set initiali_blkbitstoCEPH_FSCRYPT_BLOCK_SHIFTXiubo Li <[email protected]>
libceph: just wait for more data to be available on the socketXiubo Li <[email protected]>
libceph: rename read_sparse_msg_*() to read_partial_sparse_msg_*()Alexandre Ghiti <[email protected]>
riscv: Flush the tlb when a page directory is freedMing Lei <[email protected]>
scsi: core: Movescsi_host_busy()out of host lock if it is for per-commandAlexandre Ghiti <[email protected]>
riscv: Fixhugetlb_mask_last_page()when NAPOT is enabledAlexandre Ghiti <[email protected]>
riscv: Fixset_huge_pte_at()for NAPOT mappingVincent Chen <[email protected]>
riscv: mm: execute local TLB flush after populating vmemmapAlexandre Ghiti <[email protected]>
mm: Introduceflush_cache_vmap_early()Dan Carpenter <[email protected]>
fs/ntfs3: Fix an NULL dereference bugFlorian Westphal <[email protected]>
netfilter:nft_set_pipapo: removescratch_alignedpointerFlorian Westphal <[email protected]>
netfilter:nft_set_pipapo: add helper to release pcpu scratch areaFlorian Westphal <[email protected]>
netfilter:nft_set_pipapo: store index in scratch mapsFlorian Westphal <[email protected]>
netfilter:nfnetlink_queue: un-breakNF_REPEATPablo Neira Ayuso <[email protected]>
netfilter:nf_tables: use timestamp to check for set element timeoutPablo Neira Ayuso <[email protected]>
netfilter:nft_ct: reject direction for ct idPablo Neira Ayuso <[email protected]>
netfilter:nft_set_pipapo: remove static innft_pipapo_get()Srinivasan Shanmugam <[email protected]>
drm/amd/display: Implement bounds check for stream encoder creation in DCN301Srinivasan Shanmugam <[email protected]>
drm/amd/display: Add NULL test for 'timing generator' in 'dcn21_set_pipe()'Srinivasan Shanmugam <[email protected]>
drm/amd/display: Fix 'panel_cntl' could be null in 'dcn21_set_backlight_level()'Pablo Neira Ayuso <[email protected]>
netfilter:nft_compat: restrict match/target protocol to u16Pablo Neira Ayuso <[email protected]>
netfilter:nft_compat: reject unused compat flagPablo Neira Ayuso <[email protected]>
netfilter:nft_compat: narrow down revision to unsigned 8-bitsJakub Kicinski <[email protected]>
selftests:cmsg_ipv6: repeat the exact packetEric Dumazet <[email protected]>
ppp_async: limit MRU to 64KJiri Pirko <[email protected]>
devlink: avoid potential loop indevlink_rel_nested_in_notify_work()Kuniyuki Iwashima <[email protected]>
af_unix: Call kfree_skb() for dead unix_(sk)->oob_skb in GC.Shigeru Yoshida <[email protected]>
tipc: Check the bearer type before callingtipc_udp_nl_bearer_add()Paolo Abeni <[email protected]>
selftests: net: letbig_tcptest cope with slow envDavid Howells <[email protected]>
rxrpc: Fix counting of new acks and nacksDavid Howells <[email protected]>
rxrpc: Fix response to PING RESPONSE ACKs to a dead callDavid Howells <[email protected]>
rxrpc: Fix delayed ACKs to not set the reference serial numberDavid Howells <[email protected]>
rxrpc: Fix generation of serial numbers to skip zeroArd Biesheuvel <[email protected]>
x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat sectionDan Carpenter <[email protected]>
drm/i915/gvt: Fix uninitialized variable inhandle_mmio()Eric Dumazet <[email protected]>
inet: read sk->sk_family once in inet_recv_error()Zhang Rui <[email protected]>
hwmon: (coretemp) Fix boguscore_idto attr name mappingZhang Rui <[email protected]>
hwmon: (coretemp) Fix out-of-bounds memory accessLoic Prylli <[email protected]>
hwmon: (aspeed-pwm-tacho) mutex for tach readingZhipeng Lu <[email protected]>
octeontx2-pf: Fix a memleakotx2_sq_initZhipeng Lu <[email protected]>
atm: idt77252: fix a memleak inopen_card_ubr0Antoine Tenart <[email protected]>
tunnels: fix out of bounds access when building IPv6 PMTU errorGerhard Engleder <[email protected]>
tsnep: Fix mapping for zero copyXDP_TXactionPaolo Abeni <[email protected]>
selftests: net: avoid just another constant waitPaolo Abeni <[email protected]>
selftests: net: fix tcp listener handling inpmtu.shYujie Liu <[email protected]>
selftests/net: change shebang to bash to support "source"Hangbin Liu <[email protected]>
selftests/net: convertpmtu.shto run it in unique namespaceHangbin Liu <[email protected]>
selftests/net: convertunicast_extensions.shto run it in unique namespacePaolo Abeni <[email protected]>
selftests: net: cut more slack for gro fwd tests.Ivan Vecera <[email protected]>
net: atlantic: Fix DMA mapping for PTP hwts ringEric Dumazet <[email protected]>
netdevsim: avoid potential loop innsim_dev_trap_report_work()Kees Cook <[email protected]>
wifi: brcmfmac: Adjustn_channelsusage for__counted_byMiri Korenblit <[email protected]>
wifi: iwlwifi: exit eSR only after the FW doesJohannes Berg <[email protected]>
wifi: mac80211: fix waiting for beacons logicJohannes Berg <[email protected]>
wifi: mac80211: fix unsolicited broadcast probe configJohannes Berg <[email protected]>
wifi: mac80211: fix RCU use in TDLS fast-xmitJohannes Berg <[email protected]>
wifi: mac80211: improve CSA/ECSA connection refusalJohannes Berg <[email protected]>
wifi: cfg80211: detect stuck ECSA element in probe respBenjamin Berg <[email protected]>
wifi: cfg80211: consume both probe response and beacon IEsFurong Xu <[email protected]>
net: stmmac: xgmac: fix handling of DPP safety error for DMA channelsArd Biesheuvel <[email protected]>
x86/efistub: Avoid placing the kernel belowLOAD_PHYSICAL_ADDRArd Biesheuvel <[email protected]>
x86/efistub: Give up if memory attribute protocol returns an errorBenjamin Berg <[email protected]>
wifi: iwlwifi: mvm: skip adding debugfs symlink for reconfigAbhinav Kumar <[email protected]>
drm/msm/dpu: check for validhw_ppindpu_encoder_helper_phys_cleanupKuogee Hsieh <[email protected]>
drm/msm/dp: return correct Colorimetry forDP_TEST_DYNAMIC_RANGE_CEAcaseKuogee Hsieh <[email protected]>
drm/msms/dp: fixed link clock divider bits be over written in BPC unknown caseShyam Prasad N <[email protected]>
cifs: failure to add channel on iface should bump up weightShyam Prasad N <[email protected]>
cifs: avoid redundant calls to disable multichannelTony Lindgren <[email protected]>
phy: ti: phy-omap-usb2: Fix NULL pointer dereference for SRPFrank Li <[email protected]>
dmaengine: fixis_slave_direction()return false whenDMA_DEV_TO_DEVJames Clark <[email protected]>
perf evlist: Fixevlist__new_default()for > 1 core PMUThomas Richter <[email protected]>
perf test: Fix 'perf script' tests on s390Ian Rogers <[email protected]>
perf tests: Add perf script testYoshihiro Shimoda <[email protected]>
phy: renesas: rcar-gen3-usb2: Fix returning wrong error codeMantas Pucka <[email protected]>
phy: qcom-qmp-usb: fix serdes init sequence for IPQ6018Mantas Pucka <[email protected]>
phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq6018Christophe JAILLET <[email protected]>
dmaengine: fsl-qdma: Fix a memory leak related to the queue command DMAChristophe JAILLET <[email protected]>
dmaengine: fsl-qdma: Fix a memory leak related to the status queue DMAJai Luthra <[email protected]>
dmaengine: ti: k3-udma: Report short packet errorsGuanhua Gao <[email protected]>
dmaengine: fsl-dpaa2-qdma: Fix the size of dma poolsBaokun Li <[email protected]>
ext4: regenerate buddy after block freeing failed if under fc replay-------------
Diffstat:
Makefile | 4 +- arch/arc/include/asm/cacheflush.h | 1 + arch/arm/include/asm/cacheflush.h | 2 + arch/csky/abiv1/inc/abi/cacheflush.h | 1 + arch/csky/abiv2/inc/abi/cacheflush.h | 1 + arch/m68k/include/asm/cacheflush_mm.h | 1 + arch/mips/include/asm/cacheflush.h | 2 + arch/nios2/include/asm/cacheflush.h | 1 + arch/parisc/include/asm/cacheflush.h | 1 + arch/riscv/include/asm/cacheflush.h | 3 +- arch/riscv/include/asm/hugetlb.h | 3 + arch/riscv/include/asm/stacktrace.h | 5 + arch/riscv/include/asm/tlb.h | 2 +- arch/riscv/include/asm/tlbflush.h | 2 + arch/riscv/mm/hugetlbpage.c | 78 ++++++++++++- arch/riscv/mm/init.c | 4 + arch/riscv/mm/tlbflush.c | 6 + arch/sh/include/asm/cacheflush.h | 1 + arch/sparc/include/asm/cacheflush_32.h | 1 + arch/sparc/include/asm/cacheflush_64.h | 1 + arch/x86/boot/header.S | 14 +-- arch/x86/boot/setup.ld | 6 +- arch/x86/lib/getuser.S | 24 ++-- arch/x86/lib/putuser.S | 20 ++-- arch/xtensa/include/asm/cacheflush.h | 6 +- block/blk-iocost.c | 7 ++ drivers/atm/idt77252.c | 2 + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 10 +- drivers/dma/fsl-qdma.c | 28 ++--- drivers/dma/ti/k3-udma.c | 10 +- drivers/firmware/efi/libstub/efistub.h | 3 +- drivers/firmware/efi/libstub/kaslr.c | 2 +- drivers/firmware/efi/libstub/randomalloc.c | 12 +- drivers/firmware/efi/libstub/x86-stub.c | 25 ++-- drivers/firmware/efi/libstub/x86-stub.h | 4 +- drivers/firmware/efi/libstub/zboot.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 ++-- .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 63 +++++----- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 33 +----- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 - .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 8 +- drivers/gpu/drm/i915/gvt/handlers.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 5 - drivers/gpu/drm/msm/dp/dp_link.c | 22 ++-- drivers/gpu/drm/msm/dp/dp_reg.h | 3 + drivers/hwmon/aspeed-pwm-tacho.c | 7 ++ drivers/hwmon/coretemp.c | 40 ++++--- drivers/input/keyboard/atkbd.c | 13 ++- drivers/input/serio/i8042-acpipnpio.h | 6 + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 4 +- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 13 +++ drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 1 + drivers/net/ethernet/engleder/tsnep_main.c | 16 ++- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 14 ++- drivers/net/ethernet/stmicro/stmmac/common.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 3 + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 57 ++++++++- drivers/net/netdevsim/dev.c | 8 +- drivers/net/ppp/ppp_async.c | 4 + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 +- drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 +- .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 9 +- drivers/nvme/host/core.c | 7 +- drivers/pci/bus.c | 49 +++++--- drivers/pci/controller/dwc/pcie-qcom.c | 2 +- drivers/pci/pci.c | 78 ++++++++----- drivers/pci/pci.h | 4 +- drivers/pci/pcie/aspm.c | 13 ++- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 30 ++++- drivers/phy/renesas/phy-rcar-gen3-usb2.c | 4 - drivers/phy/ti/phy-omap-usb2.c | 4 +- drivers/scsi/scsi_error.c | 3 +- drivers/scsi/scsi_lib.c | 4 +- drivers/usb/dwc3/dwc3-pci.c | 4 + drivers/usb/dwc3/host.c | 4 +- drivers/usb/host/xhci-plat.c | 3 + drivers/usb/host/xhci-ring.c | 80 ++++++++++--- drivers/usb/host/xhci.h | 1 + drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/option.c | 1 + drivers/usb/serial/qcserial.c | 2 + drivers/usb/typec/tcpm/tcpm.c | 3 +- fs/bcachefs/clock.c | 4 +- fs/bcachefs/fs-io.c | 2 +- fs/bcachefs/fs-ioctl.c | 42 +++---- fs/bcachefs/journal_io.c | 3 +- fs/bcachefs/move.c | 2 +- fs/bcachefs/move.h | 1 + fs/bcachefs/rebalance.c | 13 ++- fs/bcachefs/replicas.c | 10 +- fs/bcachefs/snapshot.c | 2 +- fs/bcachefs/util.c | 5 +- fs/ceph/inode.c | 2 + fs/ext4/mballoc.c | 20 ++++ fs/namei.c | 16 ++- fs/ntfs3/ntfs_fs.h | 2 +- fs/smb/client/sess.c | 2 + fs/smb/client/smb2pdu.c | 2 +- include/asm-generic/cacheflush.h | 6 + include/linux/ceph/messenger.h | 2 +- include/linux/dmaengine.h | 3 +- include/linux/hrtimer.h | 4 +- include/linux/namei.h | 1 + include/linux/pci.h | 5 + include/net/cfg80211.h | 4 + include/net/netfilter/nf_tables.h | 16 ++- include/trace/events/rxrpc.h | 8 +- include/uapi/linux/netfilter/nf_tables.h | 2 + io_uring/io_uring.h | 7 ++ io_uring/net.c | 54 ++++++--- io_uring/poll.c | 49 ++++---- io_uring/poll.h | 9 ++ io_uring/rw.c | 10 +- kernel/time/hrtimer.c | 3 + mm/percpu.c | 8 +- net/ceph/messenger_v1.c | 33 +++--- net/ceph/messenger_v2.c | 4 +- net/ceph/osd_client.c | 9 +- net/core/datagram.c | 2 +- net/devlink/core.c | 12 +- net/ipv4/af_inet.c | 6 +- net/ipv4/ip_tunnel_core.c | 2 +- net/mac80211/cfg.c | 14 +-- net/mac80211/mlme.c | 106 ++++++++++++----- net/mac80211/tx.c | 7 +- net/netfilter/nf_tables_api.c | 4 +- net/netfilter/nfnetlink_queue.c | 13 ++- net/netfilter/nft_compat.c | 17 ++- net/netfilter/nft_ct.c | 3 + net/netfilter/nft_set_hash.c | 8 +- net/netfilter/nft_set_pipapo.c | 128 +++++++++++---------- net/netfilter/nft_set_pipapo.h | 18 ++- net/netfilter/nft_set_pipapo_avx2.c | 17 ++- net/netfilter/nft_set_rbtree.c | 11 +- net/rxrpc/ar-internal.h | 37 ++++-- net/rxrpc/call_event.c | 12 +- net/rxrpc/call_object.c | 1 + net/rxrpc/conn_event.c | 10 +- net/rxrpc/input.c | 115 +++++++++++++++--- net/rxrpc/output.c | 8 +- net/rxrpc/proc.c | 2 +- net/rxrpc/rxkad.c | 4 +- net/tipc/bearer.c | 6 + net/unix/garbage.c | 11 ++ net/wireless/scan.c | 63 +++++++++- sound/soc/amd/acp-config.c | 15 +-- sound/usb/quirks.c | 6 + tools/perf/tests/shell/script.sh | 73 ++++++++++++ tools/perf/util/evlist.c | 9 +- tools/testing/selftests/core/close_range_test.c | 1 + tools/testing/selftests/net/big_tcp.sh | 4 +- tools/testing/selftests/net/cmsg_ipv6.sh | 4 +- tools/testing/selftests/net/pmtu.sh | 52 +++++---- tools/testing/selftests/net/udpgro_fwd.sh | 14 ++- tools/testing/selftests/net/udpgso_bench_rx.c | 2 +- tools/testing/selftests/net/unicast_extensions.sh | 93 +++++++-------- 160 files changed, 1538 insertions(+), 715 deletions(-)
Hello,
Quoted 5 lines · On Tue, 13 Feb 2024 18:20:22 +0100 Greg Kroah-Hartman…
This is the start of the stable review cycle for the 6.7.5 release. There are 124 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.
Quoted 8 lines
Responses should be made by Thu, 15 Feb 2024 17:18:29 +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.7.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.7.y
and the diffstat can be found below.
This rc kernel passes DAMON functionality test[1] on my test machine. Attaching the test results summary below. Please note that I retrieved the kernel from linux-stable-rc tree[2].
[1] https://github.com/awslabs/damon-tests/tree/next/corr
[2] 93a4df567f73 ("Linux 6.7.5-rc1")
Thanks,
SJ
[...]
---
ok 1 selftests: damon: debugfs_attrs.sh
ok 2 selftests: damon: debugfs_schemes.sh
ok 3 selftests: damon: debugfs_target_ids.sh
ok 4 selftests: damon: debugfs_empty_targets.sh
ok 5 selftests: damon: debugfs_huge_count_read_write.sh
ok 6 selftests: damon: debugfs_duplicate_context_creation.sh
ok 7 selftests: damon: debugfs_rm_non_contexts.sh
ok 8 selftests: damon: sysfs.sh
ok 9 selftests: damon: sysfs_update_removed_scheme_dir.sh
ok 10 selftests: damon: reclaim.sh
ok 11 selftests: damon: lru_sort.sh
ok 1 selftests: damon-tests: kunit.sh
ok 2 selftests: damon-tests: huge_count_read_write.sh
ok 3 selftests: damon-tests: buffer_overflow.sh
ok 4 selftests: damon-tests: rm_contexts.sh
ok 5 selftests: damon-tests: record_null_deref.sh
ok 6 selftests: damon-tests: dbgfs_target_ids_read_before_terminate_race.sh ok 7 selftests: damon-tests: dbgfs_target_ids_pid_leak.sh
ok 8 selftests: damon-tests: damo_tests.sh
ok 9 selftests: damon-tests: masim-record.sh
ok 10 selftests: damon-tests: build_i386.sh
ok 11 selftests: damon-tests: build_arm64.sh
ok 12 selftests: damon-tests: build_m68k.sh
ok 13 selftests: damon-tests: build_i386_idle_flag.sh
ok 14 selftests: damon-tests: build_i386_highpte.sh
ok 15 selftests: damon-tests: build_nomemcg.sh
[33m
[92mPASS [39m
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.7.5 release. There are 124 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Feb 2024 17:18:29 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.7.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.7.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 9 lines
This is the start of the stable review cycle for the 6.7.5 release. There are 124 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Feb 2024 17:18:29 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.7.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.7.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my x86_64 and ARM64 test systems. No errors or regressions.
Thanks.
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.7.5 release. There are 124 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Feb 2024 17:18:29 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.7.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.7.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.7.5 release. There are 124 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.
Successfully compiled and installed the kernel on my computer (Acer Aspire E15, Intel Core i3 Haswell). No noticeable regressions.
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.7.5 release. There are 124 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Feb 2024 17:18:29 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.7.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.7.y
and the diffstat can be found below.thanks,
greg k-h
Builds are failing for Tegra ...
Test results for stable-v6.7:
10 builds: 3 pass, 7 fail
6 boots: 6 pass, 0 fail
18 tests: 18 pass, 0 failLinux version: 6.7.5-rc1-g93a4df567f73
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra30-cardhu-a04
Builds failed: aarch64+defconfig+jetson, arm+multi_v7
Same cause as reported here [0].
Jon
[0] https://lore.kernel.org/linux-tegra/[email protected]/T/#u
Signature · 1 line
nvpublic
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.7.5 release. There are 124 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Feb 2024 17:18:29 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.7.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.7.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 6.7.5-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-6.7.y
* git commit: 93a4df567f730b1297234a01ec53517a02cbe64e
* git describe: v6.7.4-125-g93a4df567f73
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.7.y/build/v6.7.4-125-g93a4df567f73
## Test Regressions (compared to v6.7.4)
## Metric Regressions (compared to v6.7.4)
## Test Fixes (compared to v6.7.4)
## Metric Fixes (compared to v6.7.4)
## Test result summary
total: 146978, pass: 127001, fail: 2214, skip: 17594, xfail: 169
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 145 total, 129 passed, 16 failed
* arm64: 52 total, 46 passed, 6 failed
* i386: 41 total, 40 passed, 1 failed
* mips: 26 total, 25 passed, 1 failed
* parisc: 4 total, 4 passed, 0 failed
* powerpc: 36 total, 33 passed, 3 failed
* riscv: 18 total, 18 passed, 0 failed
* s390: 13 total, 12 passed, 1 failed
* sh: 10 total, 10 passed, 0 failed
* sparc: 8 total, 8 passed, 0 failed
* x86_64: 46 total, 45 passed, 1 failed
## Test suites summary
* boot
* kselftest-android
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-exec
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-filesystems-epoll
* kselftest-firmware
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-user_events
* kselftest-vDSO
* kselftest-vm
* kselftest-watchdog
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* perf
* rcutorture
* timesync-off
* v4l2-compliance
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.7.5 release. There are 124 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Feb 2024 17:18:29 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.7.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.7.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.7.5 release. There are 124 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 15 Feb 2024 17:18:29 +0000. Anything received after that time might be too late.
No regressions in my system.
Thanks,
- Ricardo.
Quoted 558 lines
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.7.5-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.7.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 6.7.5-rc1Michael Lass <[email protected]>
net: Fix from address inmemcpy_to_iter_csum()Jens Axboe <[email protected]>
io_uring/net: limit inline multishot retriesJens Axboe <[email protected]>
io_uring/poll: add requeue return code from poll multishot handlingGreg Kroah-Hartman <[email protected]>
Revert "ASoC: amd: Add new dmi entries for acp5x platform"Kent Overstreet <[email protected]>
bcachefs: time_stats: Check for last_event == 0 when updating freq statsGuoyu Ou <[email protected]>
bcachefs: unlock parent dir if entry is not found in subvolume deletionChristoph Hellwig <[email protected]>
bcachefs: fix incorrect usage ofREQ_OP_FLUSHSu Yue <[email protected]>
bcachefs: grabs_umountonly if snapshottingSu Yue <[email protected]>
bcachefs: kvfreebch_fs::snapshotsinbch2_fs_snapshots_exitKent Overstreet <[email protected]>
bcachefs:bch2_kthread_io_clock_wait()no longer sleeps until full amountKent Overstreet <[email protected]>
bcachefs: Add missingbch2_moving_ctxt_flush_all()Daniel Hill <[email protected]>
bcachefs: rebalance should wakeup on shutdown if disabledKent Overstreet <[email protected]>
bcachefs: Don't passmemcmp()as a pointerAl Viro <[email protected]>
bch2_ioctl_subvolume_destroy(): fix lockingAl Viro <[email protected]>
new helper:user_path_locked_at()Johan Hovold <[email protected]>
PCI/ASPM: Fix deadlock when enabling ASPMJens Axboe <[email protected]>
io_uring/rw: ensure poll based multishot read retries appropriatelyJens Axboe <[email protected]>
io_uring/net: un-indent mshot retry path inio_recv_finish()Jens Axboe <[email protected]>
io_uring/poll: move poll execution helpers higher upJens Axboe <[email protected]>
io_uring/net: fix sr->len for IORING_OP_RECV with MSG_WAITALL and buffersEmmanuel Grumbach <[email protected]>
wifi: iwlwifi: mvm: fix a battery life regressionHans de Goede <[email protected]>
Input: atkbd - skipATKBD_CMD_SETLEDSwhen skippingATKBD_CMD_GETIDWerner Sembach <[email protected]>
Input: i8042 - fix strange behavior of touchpad on Clevo NS70PUFrederic Weisbecker <[email protected]>
hrtimer: Report offline hrtimer enqueueHeikki Krogerus <[email protected]>
usb: dwc3: pci: add support for the Intel Arrow Lake-HMichal Pecio <[email protected]>
xhci: handle isoc Babble and Buffer Overrun events properlyMathias Nyman <[email protected]>
xhci: process isoc TD properly when there was a transaction error mid TD.Prashanth K <[email protected]>
usb: host: xhci-plat: Add support forXHCI_SG_TRB_CACHE_SIZE_QUIRKPrashanth K <[email protected]>
usb: dwc3: host: SetXHCI_SG_TRB_CACHE_SIZE_QUIRKQiuxu Zhuo <[email protected]>
x86/lib: Revert to_ASM_EXTABLE_UA()for {get,put}_user() fixupsMario Limonciello <[email protected]>
Revert "drm/amd/pm: fix the high voltage and temperature issue"Badhri Jagan Sridharan <[email protected]>
Revert "usb: typec: tcpm: fix cc role at port reset"Leonard Dallmayr <[email protected]>
USB: serial: cp210x: add ID for IMST iM871A-USBPuliang Lu <[email protected]>
USB: serial: option: add Fibocom FM101-GL variantJackBB Wu <[email protected]>
USB: serial: qcserial: add new usb-id for Dell Wireless DW5826eSean Young <[email protected]>
ALSA: usb-audio: add quirk for RODE NT-USB+Julian Sikorski <[email protected]>
ALSA: usb-audio: Add a quirk for Yamaha YIT-W12TX transmitterAlexander Tsoy <[email protected]>
ALSA: usb-audio: Add delay quirk for MOTU M Series 2nd revisionTejun Heo <[email protected]>
blk-iocost: Fix an UBSAN shift-out-of-bounds warningMuhammad Usama Anjum <[email protected]>
selftests: core: includelinux/close_range.hfor CLOSE_RANGE_* macrosMaurizio Lombardi <[email protected]>
nvme-host: fix the updating of the firmware versionBen Dooks <[email protected]>
riscv: declareoverflow_stackas exported fromtraps.cAlexandre Ghiti <[email protected]>
riscv: Fixarch_hugetlb_migration_supported()for NAPOTXiubo Li <[email protected]>
ceph: always set initiali_blkbitstoCEPH_FSCRYPT_BLOCK_SHIFTXiubo Li <[email protected]>
libceph: just wait for more data to be available on the socketXiubo Li <[email protected]>
libceph: rename read_sparse_msg_*() to read_partial_sparse_msg_*()Alexandre Ghiti <[email protected]>
riscv: Flush the tlb when a page directory is freedMing Lei <[email protected]>
scsi: core: Movescsi_host_busy()out of host lock if it is for per-commandAlexandre Ghiti <[email protected]>
riscv: Fixhugetlb_mask_last_page()when NAPOT is enabledAlexandre Ghiti <[email protected]>
riscv: Fixset_huge_pte_at()for NAPOT mappingVincent Chen <[email protected]>
riscv: mm: execute local TLB flush after populating vmemmapAlexandre Ghiti <[email protected]>
mm: Introduceflush_cache_vmap_early()Dan Carpenter <[email protected]>
fs/ntfs3: Fix an NULL dereference bugFlorian Westphal <[email protected]>
netfilter:nft_set_pipapo: removescratch_alignedpointerFlorian Westphal <[email protected]>
netfilter:nft_set_pipapo: add helper to release pcpu scratch areaFlorian Westphal <[email protected]>
netfilter:nft_set_pipapo: store index in scratch mapsFlorian Westphal <[email protected]>
netfilter:nfnetlink_queue: un-breakNF_REPEATPablo Neira Ayuso <[email protected]>
netfilter:nf_tables: use timestamp to check for set element timeoutPablo Neira Ayuso <[email protected]>
netfilter:nft_ct: reject direction for ct idPablo Neira Ayuso <[email protected]>
netfilter:nft_set_pipapo: remove static innft_pipapo_get()Srinivasan Shanmugam <[email protected]>
drm/amd/display: Implement bounds check for stream encoder creation in DCN301Srinivasan Shanmugam <[email protected]>
drm/amd/display: Add NULL test for 'timing generator' in 'dcn21_set_pipe()'Srinivasan Shanmugam <[email protected]>
drm/amd/display: Fix 'panel_cntl' could be null in 'dcn21_set_backlight_level()'Pablo Neira Ayuso <[email protected]>
netfilter:nft_compat: restrict match/target protocol to u16Pablo Neira Ayuso <[email protected]>
netfilter:nft_compat: reject unused compat flagPablo Neira Ayuso <[email protected]>
netfilter:nft_compat: narrow down revision to unsigned 8-bitsJakub Kicinski <[email protected]>
selftests:cmsg_ipv6: repeat the exact packetEric Dumazet <[email protected]>
ppp_async: limit MRU to 64KJiri Pirko <[email protected]>
devlink: avoid potential loop indevlink_rel_nested_in_notify_work()Kuniyuki Iwashima <[email protected]>
af_unix: Call kfree_skb() for dead unix_(sk)->oob_skb in GC.Shigeru Yoshida <[email protected]>
tipc: Check the bearer type before callingtipc_udp_nl_bearer_add()Paolo Abeni <[email protected]>
selftests: net: letbig_tcptest cope with slow envDavid Howells <[email protected]>
rxrpc: Fix counting of new acks and nacksDavid Howells <[email protected]>
rxrpc: Fix response to PING RESPONSE ACKs to a dead callDavid Howells <[email protected]>
rxrpc: Fix delayed ACKs to not set the reference serial numberDavid Howells <[email protected]>
rxrpc: Fix generation of serial numbers to skip zeroArd Biesheuvel <[email protected]>
x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat sectionDan Carpenter <[email protected]>
drm/i915/gvt: Fix uninitialized variable inhandle_mmio()Eric Dumazet <[email protected]>
inet: read sk->sk_family once in inet_recv_error()Zhang Rui <[email protected]>
hwmon: (coretemp) Fix boguscore_idto attr name mappingZhang Rui <[email protected]>
hwmon: (coretemp) Fix out-of-bounds memory accessLoic Prylli <[email protected]>
hwmon: (aspeed-pwm-tacho) mutex for tach readingZhipeng Lu <[email protected]>
octeontx2-pf: Fix a memleakotx2_sq_initZhipeng Lu <[email protected]>
atm: idt77252: fix a memleak inopen_card_ubr0Antoine Tenart <[email protected]>
tunnels: fix out of bounds access when building IPv6 PMTU errorGerhard Engleder <[email protected]>
tsnep: Fix mapping for zero copyXDP_TXactionPaolo Abeni <[email protected]>
selftests: net: avoid just another constant waitPaolo Abeni <[email protected]>
selftests: net: fix tcp listener handling inpmtu.shYujie Liu <[email protected]>
selftests/net: change shebang to bash to support "source"Hangbin Liu <[email protected]>
selftests/net: convertpmtu.shto run it in unique namespaceHangbin Liu <[email protected]>
selftests/net: convertunicast_extensions.shto run it in unique namespacePaolo Abeni <[email protected]>
selftests: net: cut more slack for gro fwd tests.Ivan Vecera <[email protected]>
net: atlantic: Fix DMA mapping for PTP hwts ringEric Dumazet <[email protected]>
netdevsim: avoid potential loop innsim_dev_trap_report_work()Kees Cook <[email protected]>
wifi: brcmfmac: Adjustn_channelsusage for__counted_byMiri Korenblit <[email protected]>
wifi: iwlwifi: exit eSR only after the FW doesJohannes Berg <[email protected]>
wifi: mac80211: fix waiting for beacons logicJohannes Berg <[email protected]>
wifi: mac80211: fix unsolicited broadcast probe configJohannes Berg <[email protected]>
wifi: mac80211: fix RCU use in TDLS fast-xmitJohannes Berg <[email protected]>
wifi: mac80211: improve CSA/ECSA connection refusalJohannes Berg <[email protected]>
wifi: cfg80211: detect stuck ECSA element in probe respBenjamin Berg <[email protected]>
wifi: cfg80211: consume both probe response and beacon IEsFurong Xu <[email protected]>
net: stmmac: xgmac: fix handling of DPP safety error for DMA channelsArd Biesheuvel <[email protected]>
x86/efistub: Avoid placing the kernel belowLOAD_PHYSICAL_ADDRArd Biesheuvel <[email protected]>
x86/efistub: Give up if memory attribute protocol returns an errorBenjamin Berg <[email protected]>
wifi: iwlwifi: mvm: skip adding debugfs symlink for reconfigAbhinav Kumar <[email protected]>
drm/msm/dpu: check for validhw_ppindpu_encoder_helper_phys_cleanupKuogee Hsieh <[email protected]>
drm/msm/dp: return correct Colorimetry forDP_TEST_DYNAMIC_RANGE_CEAcaseKuogee Hsieh <[email protected]>
drm/msms/dp: fixed link clock divider bits be over written in BPC unknown caseShyam Prasad N <[email protected]>
cifs: failure to add channel on iface should bump up weightShyam Prasad N <[email protected]>
cifs: avoid redundant calls to disable multichannelTony Lindgren <[email protected]>
phy: ti: phy-omap-usb2: Fix NULL pointer dereference for SRPFrank Li <[email protected]>
dmaengine: fixis_slave_direction()return false whenDMA_DEV_TO_DEVJames Clark <[email protected]>
perf evlist: Fixevlist__new_default()for > 1 core PMUThomas Richter <[email protected]>
perf test: Fix 'perf script' tests on s390Ian Rogers <[email protected]>
perf tests: Add perf script testYoshihiro Shimoda <[email protected]>
phy: renesas: rcar-gen3-usb2: Fix returning wrong error codeMantas Pucka <[email protected]>
phy: qcom-qmp-usb: fix serdes init sequence for IPQ6018Mantas Pucka <[email protected]>
phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq6018Christophe JAILLET <[email protected]>
dmaengine: fsl-qdma: Fix a memory leak related to the queue command DMAChristophe JAILLET <[email protected]>
dmaengine: fsl-qdma: Fix a memory leak related to the status queue DMAJai Luthra <[email protected]>
dmaengine: ti: k3-udma: Report short packet errorsGuanhua Gao <[email protected]>
dmaengine: fsl-dpaa2-qdma: Fix the size of dma poolsBaokun Li <[email protected]>
ext4: regenerate buddy after block freeing failed if under fc replay-------------
Diffstat:
Makefile | 4 +- arch/arc/include/asm/cacheflush.h | 1 + arch/arm/include/asm/cacheflush.h | 2 + arch/csky/abiv1/inc/abi/cacheflush.h | 1 + arch/csky/abiv2/inc/abi/cacheflush.h | 1 + arch/m68k/include/asm/cacheflush_mm.h | 1 + arch/mips/include/asm/cacheflush.h | 2 + arch/nios2/include/asm/cacheflush.h | 1 + arch/parisc/include/asm/cacheflush.h | 1 + arch/riscv/include/asm/cacheflush.h | 3 +- arch/riscv/include/asm/hugetlb.h | 3 + arch/riscv/include/asm/stacktrace.h | 5 + arch/riscv/include/asm/tlb.h | 2 +- arch/riscv/include/asm/tlbflush.h | 2 + arch/riscv/mm/hugetlbpage.c | 78 ++++++++++++- arch/riscv/mm/init.c | 4 + arch/riscv/mm/tlbflush.c | 6 + arch/sh/include/asm/cacheflush.h | 1 + arch/sparc/include/asm/cacheflush_32.h | 1 + arch/sparc/include/asm/cacheflush_64.h | 1 + arch/x86/boot/header.S | 14 +-- arch/x86/boot/setup.ld | 6 +- arch/x86/lib/getuser.S | 24 ++-- arch/x86/lib/putuser.S | 20 ++-- arch/xtensa/include/asm/cacheflush.h | 6 +- block/blk-iocost.c | 7 ++ drivers/atm/idt77252.c | 2 + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 10 +- drivers/dma/fsl-qdma.c | 28 ++--- drivers/dma/ti/k3-udma.c | 10 +- drivers/firmware/efi/libstub/efistub.h | 3 +- drivers/firmware/efi/libstub/kaslr.c | 2 +- drivers/firmware/efi/libstub/randomalloc.c | 12 +- drivers/firmware/efi/libstub/x86-stub.c | 25 ++-- drivers/firmware/efi/libstub/x86-stub.h | 4 +- drivers/firmware/efi/libstub/zboot.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 ++-- .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 63 +++++----- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 33 +----- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 - .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 8 +- drivers/gpu/drm/i915/gvt/handlers.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 5 - drivers/gpu/drm/msm/dp/dp_link.c | 22 ++-- drivers/gpu/drm/msm/dp/dp_reg.h | 3 + drivers/hwmon/aspeed-pwm-tacho.c | 7 ++ drivers/hwmon/coretemp.c | 40 ++++--- drivers/input/keyboard/atkbd.c | 13 ++- drivers/input/serio/i8042-acpipnpio.h | 6 + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 4 +- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 13 +++ drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 1 + drivers/net/ethernet/engleder/tsnep_main.c | 16 ++- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 14 ++- drivers/net/ethernet/stmicro/stmmac/common.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 3 + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 57 ++++++++- drivers/net/netdevsim/dev.c | 8 +- drivers/net/ppp/ppp_async.c | 4 + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 +- drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 +- .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 9 +- drivers/nvme/host/core.c | 7 +- drivers/pci/bus.c | 49 +++++--- drivers/pci/controller/dwc/pcie-qcom.c | 2 +- drivers/pci/pci.c | 78 ++++++++----- drivers/pci/pci.h | 4 +- drivers/pci/pcie/aspm.c | 13 ++- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 30 ++++- drivers/phy/renesas/phy-rcar-gen3-usb2.c | 4 - drivers/phy/ti/phy-omap-usb2.c | 4 +- drivers/scsi/scsi_error.c | 3 +- drivers/scsi/scsi_lib.c | 4 +- drivers/usb/dwc3/dwc3-pci.c | 4 + drivers/usb/dwc3/host.c | 4 +- drivers/usb/host/xhci-plat.c | 3 + drivers/usb/host/xhci-ring.c | 80 ++++++++++--- drivers/usb/host/xhci.h | 1 + drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/option.c | 1 + drivers/usb/serial/qcserial.c | 2 + drivers/usb/typec/tcpm/tcpm.c | 3 +- fs/bcachefs/clock.c | 4 +- fs/bcachefs/fs-io.c | 2 +- fs/bcachefs/fs-ioctl.c | 42 +++---- fs/bcachefs/journal_io.c | 3 +- fs/bcachefs/move.c | 2 +- fs/bcachefs/move.h | 1 + fs/bcachefs/rebalance.c | 13 ++- fs/bcachefs/replicas.c | 10 +- fs/bcachefs/snapshot.c | 2 +- fs/bcachefs/util.c | 5 +- fs/ceph/inode.c | 2 + fs/ext4/mballoc.c | 20 ++++ fs/namei.c | 16 ++- fs/ntfs3/ntfs_fs.h | 2 +- fs/smb/client/sess.c | 2 + fs/smb/client/smb2pdu.c | 2 +- include/asm-generic/cacheflush.h | 6 + include/linux/ceph/messenger.h | 2 +- include/linux/dmaengine.h | 3 +- include/linux/hrtimer.h | 4 +- include/linux/namei.h | 1 + include/linux/pci.h | 5 + include/net/cfg80211.h | 4 + include/net/netfilter/nf_tables.h | 16 ++- include/trace/events/rxrpc.h | 8 +- include/uapi/linux/netfilter/nf_tables.h | 2 + io_uring/io_uring.h | 7 ++ io_uring/net.c | 54 ++++++--- io_uring/poll.c | 49 ++++---- io_uring/poll.h | 9 ++ io_uring/rw.c | 10 +- kernel/time/hrtimer.c | 3 + mm/percpu.c | 8 +- net/ceph/messenger_v1.c | 33 +++--- net/ceph/messenger_v2.c | 4 +- net/ceph/osd_client.c | 9 +- net/core/datagram.c | 2 +- net/devlink/core.c | 12 +- net/ipv4/af_inet.c | 6 +- net/ipv4/ip_tunnel_core.c | 2 +- net/mac80211/cfg.c | 14 +-- net/mac80211/mlme.c | 106 ++++++++++++----- net/mac80211/tx.c | 7 +- net/netfilter/nf_tables_api.c | 4 +- net/netfilter/nfnetlink_queue.c | 13 ++- net/netfilter/nft_compat.c | 17 ++- net/netfilter/nft_ct.c | 3 + net/netfilter/nft_set_hash.c | 8 +- net/netfilter/nft_set_pipapo.c | 128 +++++++++++---------- net/netfilter/nft_set_pipapo.h | 18 ++- net/netfilter/nft_set_pipapo_avx2.c | 17 ++- net/netfilter/nft_set_rbtree.c | 11 +- net/rxrpc/ar-internal.h | 37 ++++-- net/rxrpc/call_event.c | 12 +- net/rxrpc/call_object.c | 1 + net/rxrpc/conn_event.c | 10 +- net/rxrpc/input.c | 115 +++++++++++++++--- net/rxrpc/output.c | 8 +- net/rxrpc/proc.c | 2 +- net/rxrpc/rxkad.c | 4 +- net/tipc/bearer.c | 6 + net/unix/garbage.c | 11 ++ net/wireless/scan.c | 63 +++++++++- sound/soc/amd/acp-config.c | 15 +-- sound/usb/quirks.c | 6 + tools/perf/tests/shell/script.sh | 73 ++++++++++++ tools/perf/util/evlist.c | 9 +- tools/testing/selftests/core/close_range_test.c | 1 + tools/testing/selftests/net/big_tcp.sh | 4 +- tools/testing/selftests/net/cmsg_ipv6.sh | 4 +- tools/testing/selftests/net/pmtu.sh | 52 +++++---- tools/testing/selftests/net/udpgro_fwd.sh | 14 ++- tools/testing/selftests/net/udpgso_bench_rx.c | 2 +- tools/testing/selftests/net/unicast_extensions.sh | 93 +++++++-------- 160 files changed, 1538 insertions(+), 715 deletions(-)