6.0.7-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainerPATCH 162/240 net: lan966x: Fix the rx drop counter
In reply to Greg Kroah-HartmanFrom: Horatiu Vultur <[email protected]>
[ Upstream commit f8c1c66b99a570c08b9d26e4347276f00e49bba7 ]
Currently the rx drop is calculated as the sum of multiple HW drop counters. The issue is that not all the HW drop counters were added for the rx drop counter. So if for example you have a police that drops frames, they were not see in the rx drop counter.
Fix this by updating how the rx drop counter is calculated. It is required to add also RX_RED_PRIO_* HW counters.
--- .../net/ethernet/microchip/lan966x/lan966x_ethtool.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c +9 -1
@@ -656,7 +656,15 @@ void lan966x_stats_get(struct net_device *dev, stats->rx_dropped = dev->stats.rx_dropped + lan966x->stats[idx +SYS_COUNT_RX_LONG ] + lan966x->stats[idx +SYS_COUNT_DR_LOCAL ] + - lan966x->stats[idx +SYS_COUNT_DR_TAIL ]; + lan966x->stats[idx +SYS_COUNT_DR_TAIL ] + + lan966x->stats[idx +SYS_COUNT_RX_RED_PRIO_0 ] + + lan966x->stats[idx +SYS_COUNT_RX_RED_PRIO_1 ] + + lan966x->stats[idx +SYS_COUNT_RX_RED_PRIO_2 ] + + lan966x->stats[idx +SYS_COUNT_RX_RED_PRIO_3 ] + + lan966x->stats[idx +SYS_COUNT_RX_RED_PRIO_4 ] + + lan966x->stats[idx +SYS_COUNT_RX_RED_PRIO_5 ] + + lan966x->stats[idx +SYS_COUNT_RX_RED_PRIO_6 ] + + lan966x->stats[idx +SYS_COUNT_RX_RED_PRIO_7 ];for (i =0 ; i <LAN966X_NUM_TC ; i++) { stats->rx_dropped +=
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 163/240 selftests: net: Fix cross-tree inclusion of scripts
In reply to Greg Kroah-HartmanFrom: Benjamin Poirier <[email protected]>
[ Upstream commit ae108c48b5d2b34bcef3c4fb5076f42c922c426a ]
When exporting and running a subset of selftests via kselftest, files from parts of the source tree which were not exported are not available. A few tests are trying to source such files. Address the problem by using symlinks.
The problem can be reproduced by running:
make -C tools/testing/selftests gen_tar TARGETS="drivers/net/bonding" [... extract archive ...]
./run_kselftest.sh
or:
make kselftest KBUILD_OUTPUT=/tmp/kselftests TARGETS="drivers/net/bonding"
--- tools/testing/selftests/drivers/net/bonding/Makefile | 4 +++- tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh | 2 +- .../selftests/drivers/net/bonding/net_forwarding_lib.sh | 1 + .../selftests/drivers/net/dsa/test_bridge_fdb_stress.sh | 4 ++-- tools/testing/selftests/drivers/net/team/Makefile | 4 ++++ tools/testing/selftests/drivers/net/team/dev_addr_lists.sh | 4 ++-- tools/testing/selftests/drivers/net/team/lag_lib.sh | 1 + .../testing/selftests/drivers/net/team/net_forwarding_lib.sh | 1 + tools/testing/selftests/lib.mk | 4 ++-- 9 files changed, 17 insertions(+), 8 deletions(-) create mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh create mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh create mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh
tools/testing/selftests/drivers/net/bonding/Makefile +3 -1
@@ -5,6 +5,8 @@ TEST_PROGS := bond-break-lacpdu-tx.sh \ dev_addr_lists.sh \ bond-arp-interval-causes-panic.sh -TEST_FILES := lag_lib.sh +TEST_FILES := \ + lag_lib.sh \ + net_forwarding_lib.sh include ../../../lib.mk
tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh +1 -1
@@ -14,7 +14,7 @@ ALL_TESTS=" REQUIRE_MZ=no NUM_NETIFS=0 lib_dir=$(dirname "$0") -source "$lib_dir"/../../../net/forwarding/lib.sh +source "$lib_dir"/net_forwarding_lib.sh source "$lib_dir"/lag_lib.sh
tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh new file +1 -0
@@ -0,0 +1 @@ +../../../net/forwarding/lib.sh
tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh +2 -2
@@ -18,8 +18,8 @@ NUM_NETIFS=1 REQUIRE_JQ="no" REQUIRE_MZ="no" NETIF_CREATE="no" -lib_dir=$(dirname $0)/../../../net/forwarding -source $lib_dir/lib.sh +lib_dir=$(dirname "$0") +source "$lib_dir"/lib.sh cleanup() { echo "Cleaning up"
tools/testing/selftests/drivers/net/team/Makefile +4 -0
@@ -3,4 +3,8 @@ TEST_PROGS := dev_addr_lists.sh +TEST_FILES := \ + lag_lib.sh \ + net_forwarding_lib.sh + include ../../../lib.mk
tools/testing/selftests/drivers/net/team/dev_addr_lists.sh +2 -2
@@ -11,9 +11,9 @@ ALL_TESTS=" REQUIRE_MZ=no NUM_NETIFS=0 lib_dir=$(dirname "$0") -source "$lib_dir"/../../../net/forwarding/lib.sh +source "$lib_dir"/net_forwarding_lib.sh -source "$lib_dir"/../bonding/lag_lib.sh +source "$lib_dir"/lag_lib.sh destroy()
tools/testing/selftests/drivers/net/team/lag_lib.sh new file +1 -0
@@ -0,0 +1 @@ +../bonding/lag_lib.sh
tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh new file +1 -0
@@ -0,0 +1 @@ +../../../net/forwarding/lib.sh
tools/testing/selftests/lib.mk +2 -2
@@ -70,7 +70,7 @@ endef run_tests: all ifdef building_out_of_srctree @if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then \ - rsync -aq $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \ + rsync -aLq $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \ fi @if [ "X$(TEST_PROGS)" != "X" ]; then \ $(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) \
@@ -84,7 +84,7 @@ endif define INSTALL_SINGLE_RULE $(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH)) - $(if $(INSTALL_LIST),rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/) + $(if $(INSTALL_LIST),rsync -aL $(INSTALL_LIST) $(INSTALL_PATH)/) endef define INSTALL_RULE
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 164/240 selftests: net: Fix netdev name mismatch in cleanup
In reply to Greg Kroah-HartmanFrom: Benjamin Poirier <[email protected]>
[ Upstream commit b2c0921b926ca69cc399eb356162f35340598112 ]
lag_lib.sh creates the interfaces dummy1 and dummy2 whereas dev_addr_lists.sh:destroy() deletes the interfaces dummy0 and dummy1. Fix the mismatch in names.
--- tools/testing/selftests/drivers/net/team/dev_addr_lists.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/drivers/net/team/dev_addr_lists.sh +1 -1
@@ -18,7 +18,7 @@ source "$lib_dir"/lag_lib.sh destroy() { - local ifnames=(dummy0 dummy1 team0 mv0) + local ifnames=(dummy1 dummy2 team0 mv0) local ifname for ifname in "${ifnames[@]}"; do
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 165/240 net: hinic: fix incorrect assignment issue in hinic_set_interrupt_cfg()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit c0605cd6750f2db9890c43a91ea4d77be8fb4908 ]
The value of lli_credit_cnt is incorrectly assigned, fix it.
--- drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c +1 -1
@@ -883,7 +883,7 @@ int hinic_set_interrupt_cfg(struct hinic_hwdev *hwdev,if (err)return -EINVAL ; - interrupt_info->lli_credit_cnt = temp_info.lli_timer_cnt; + interrupt_info->lli_credit_cnt = temp_info.lli_credit_cnt; interrupt_info->lli_timer_cnt = temp_info.lli_timer_cnt; err = hinic_msg_to_mgmt(&pfhwdev->pf_to_mgmt, HINIC_MOD_COMM,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 166/240 net: hinic: fix memory leak when reading function table
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 4c1f602df8956bc0decdafd7e4fc7eef50c550b1 ]
When the input parameter idx meets the expected case option in hinic_dbg_get_func_table(), read_data is not released. Fix it.
--- .../net/ethernet/huawei/hinic/hinic_debugfs.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/net/ethernet/huawei/hinic/hinic_debugfs.c +12 -6
@@ -85,6 +85,7 @@ static int hinic_dbg_get_func_table(struct hinic_dev *nic_dev, int idx)struct tag_sml_funcfg_tbl *funcfg_table_elem;struct hinic_cmd_lt_rd *read_data;u16 out_size =sizeof (*read_data); +int ret = ~0 ;int err; read_data =kzalloc (sizeof (*read_data),GFP_KERNEL );
@@ -111,20 +112,25 @@ static int hinic_dbg_get_func_table(struct hinic_dev *nic_dev, int idx)switch (idx) {case VALID : -return funcfg_table_elem->dw0.bs.valid; + ret = funcfg_table_elem->dw0.bs.valid; +break ;case RX_MODE : -return funcfg_table_elem->dw0.bs.nic_rx_mode; + ret = funcfg_table_elem->dw0.bs.nic_rx_mode; +break ;case MTU : -return funcfg_table_elem->dw1.bs.mtu; + ret = funcfg_table_elem->dw1.bs.mtu; +break ;case RQ_DEPTH : -return funcfg_table_elem->dw13.bs.cfg_rq_depth; + ret = funcfg_table_elem->dw13.bs.cfg_rq_depth; +break ;case QUEUE_NUM : -return funcfg_table_elem->dw13.bs.cfg_q_num; + ret = funcfg_table_elem->dw13.bs.cfg_q_num; +break ; }kfree (read_data); -return ~0 ; +return ret; } static ssize_t hinic_dbg_cmd_read(struct file *filp, char __user *buffer, size_t count,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 167/240 net: hinic: fix the issue of CMDQ memory leaks
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 363cc87767f6ddcfb9158ad2e2afa2f8d5c4b94e ]
When hinic_set_cmdq_depth() fails in hinic_init_cmdqs(), the cmdq memory is not released correctly. Fix it.
--- drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c +1 -1
@@ -929,7 +929,7 @@ int hinic_init_cmdqs(struct hinic_cmdqs *cmdqs, struct hinic_hwif *hwif, err_set_cmdq_depth:hinic_ceq_unregister_cb (&func_to_io->ceqs,HINIC_CEQ_CMDQ ); - +free_cmdq (&cmdqs->cmdq[HINIC_CMDQ_SYNC ]); err_cmdq_ctxt:hinic_wqs_cmdq_free (&cmdqs->cmdq_pages, cmdqs->saved_wqs,HINIC_MAX_CMDQ_TYPES );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 168/240 net: hinic: fix the issue of double release MBOX callback of VF
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 8ec2f4c6b2e11a4249bba77460f0cfe6d95a82f8 ]
In hinic_vf_func_init(), if VF fails to register information with PF through the MBOX, the MBOX callback function of VF is released once. But it is released again in hinic_init_hwdev(). Remove one.
--- drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/huawei/hinic/hinic_sriov.c +0 -1
@@ -1175,7 +1175,6 @@ int hinic_vf_func_init(struct hinic_hwdev *hwdev)dev_err (&hwdev->hwif->pdev->dev,"Failed to register VF, err: %d, status: 0x%x, out size: 0x%x\n" , err, register_info.status, out_size); -hinic_unregister_vf_mbox_cb (hwdev,HINIC_MOD_L2NIC );return -EIO ; } }else {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 169/240 net: macb: Specify PHY PM management done by MAC
In reply to Greg Kroah-HartmanFrom: Sergiu Moga <[email protected]>
[ Upstream commit 15a9dbec631cd69dfbbfc4e2cbf90c9dd8432a8f ]
The macb_resume/macb_suspend methods already call the phylink_start/phylink_stop methods during their execution so explicitly say that the PM of the PHY is done by MAC by using the mac_managed_pm flag of the struct phylink_config.
This also fixes the warning message issued during resume:
WARNING: CPU: 0 PID: 237 at drivers/net/phy/phy_device.c:323 mdio_bus_phy_resume+0x144/0x148
Depends-on: 96de900ae78e ("net: phylink: add mac_managed_pm in phylink_config structure")
--- drivers/net/ethernet/cadence/macb_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/cadence/macb_main.c +1 -0
@@ -805,6 +805,7 @@ static int macb_mii_probe(struct net_device *dev) bp->phylink_config.dev = &dev->dev; bp->phylink_config.type =PHYLINK_NETDEV ; + bp->phylink_config.mac_managed_pm = true;if (bp->phy_interface ==PHY_INTERFACE_MODE_SGMII ) { bp->phylink_config.poll_fixed_state = true;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 170/240 nfc: virtual_ncidev: Fix memory leak in virtual_nci_send()
In reply to Greg Kroah-HartmanFrom: Shang XiaoJing <[email protected]>
[ Upstream commit e840d8f4a1b323973052a1af5ad4edafcde8ae3d ]
skb should be free in virtual_nci_send(), otherwise kmemleak will report memleak.
Steps for reproduction (simulated in qemu):
cd tools/testing/selftests/nci make ./nci_dev
BUG: memory leak
unreferenced object 0xffff888107588000 (size 208):
comm "nci_dev", pid 206, jiffies 4294945376 (age 368.248s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<000000008d94c8fd>] __alloc_skb+0x1da/0x290
[<00000000278bc7f8>] nci_send_cmd+0xa3/0x350
[<0000000081256a22>] nci_reset_req+0x6b/0xa0
[<000000009e721112>] __nci_request+0x90/0x250
[<000000005d556e59>] nci_dev_up+0x217/0x5b0
[<00000000e618ce62>] nfc_dev_up+0x114/0x220
[<00000000981e226b>] nfc_genl_dev_up+0x94/0xe0
[<000000009bb03517>] genl_family_rcv_msg_doit.isra.14+0x228/0x2d0
[<00000000b7f8c101>] genl_rcv_msg+0x35c/0x640
[<00000000c94075ff>] netlink_rcv_skb+0x11e/0x350
[<00000000440cfb1e>] genl_rcv+0x24/0x40
[<0000000062593b40>] netlink_unicast+0x43f/0x640
[<000000001d0b13cc>] netlink_sendmsg+0x73a/0xbf0
[<000000003272487f>] __sys_sendto+0x324/0x370
[<00000000ef9f1747>] __x64_sys_sendto+0xdd/0x1b0
[<000000001e437841>] do_syscall_64+0x3f/0x90--- drivers/nfc/virtual_ncidev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nfc/virtual_ncidev.c +3 -0
@@ -54,16 +54,19 @@ static int virtual_nci_send(struct nci_dev *ndev, struct sk_buff *skb)mutex_lock (&nci_mutex);if (state != virtual_ncidev_enabled) {mutex_unlock (&nci_mutex); +kfree_skb (skb);return 0 ; }if (send_buff) {mutex_unlock (&nci_mutex); +kfree_skb (skb);return -1 ; } send_buff =skb_copy (skb,GFP_KERNEL );mutex_unlock (&nci_mutex);wake_up_interruptible (&wq); +consume_skb (skb);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 171/240 RISC-V: KVM: Provide UAPI for Zicbom block size
In reply to Greg Kroah-HartmanFrom: Andrew Jones <[email protected]>
[ Upstream commit afd5dde9a186b8fc5742fff707f184760c4af1a9 ]
We're about to allow guests to use the Zicbom extension. KVM userspace needs to know the cache block size in order to properly advertise it to the guest. Provide a virtual config register for userspace to get it with the GET_ONE_REG API, but setting it cannot be supported, so disallow SET_ONE_REG.
Stable-dep-of: 5c20a3a9df19 ("RISC-V: Fix compilation without RISCV_ISA_ZICBOM")
--- arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/vcpu.c | 8 ++++++++ arch/riscv/mm/dma-noncoherent.c | 2 ++ 3 files changed, 11 insertions(+)
arch/riscv/include/uapi/asm/kvm.h +1 -0
@@ -48,6 +48,7 @@ struct kvm_sregs {/* CONFIG registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ struct kvm_riscv_config {unsigned long isa; +unsigned long zicbom_block_size; };/* CORE registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */
arch/riscv/kvm/vcpu.c +8 -0
@@ -18,6 +18,7 @@#include <linux/fs.h> #include <linux/kvm_host.h> #include <asm/csr.h> +#include <asm/cacheflush.h> #include <asm/hwcap.h> const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = {
@@ -254,6 +255,11 @@ static int kvm_riscv_vcpu_get_reg_config(struct kvm_vcpu *vcpu,case KVM_REG_RISCV_CONFIG_REG (isa): reg_val = vcpu->arch.isa[0 ] &KVM_RISCV_BASE_ISA_MASK ;break ; +case KVM_REG_RISCV_CONFIG_REG (zicbom_block_size): +if (!riscv_isa_extension_available (vcpu->arch.isa,ZICBOM )) +return -EINVAL ; + reg_val = riscv_cbom_block_size; +break ;default :return -EINVAL ; }
@@ -311,6 +317,8 @@ static int kvm_riscv_vcpu_set_reg_config(struct kvm_vcpu *vcpu,return -EOPNOTSUPP ; }break ; +case KVM_REG_RISCV_CONFIG_REG (zicbom_block_size): +return -EOPNOTSUPP ;default :return -EINVAL ; }
arch/riscv/mm/dma-noncoherent.c +2 -0
@@ -13,6 +13,8 @@#include <asm/cacheflush.h> unsigned int riscv_cbom_block_size; +EXPORT_SYMBOL_GPL (riscv_cbom_block_size); +static bool noncoherent_supported; void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 172/240 RISC-V: Fix compilation without RISCV_ISA_ZICBOM
In reply to Greg Kroah-HartmanFrom: Andrew Jones <[email protected]>
[ Upstream commit 5c20a3a9df19811051441214e7f5091cb3546db0 ]
riscv_cbom_block_size and riscv_init_cbom_blocksize() should always be available and riscv_init_cbom_blocksize() should always be invoked, even when compiling without RISCV_ISA_ZICBOM enabled. This is because disabling RISCV_ISA_ZICBOM means "don't use zicbom instructions in the kernel" not "pretend there isn't zicbom, even when there is". When zicbom is available, whether the kernel enables its use with RISCV_ISA_ZICBOM or not, KVM will offer it to guests. Ensure we can build KVM and that the block size is initialized even when compiling without RISCV_ISA_ZICBOM.
--- arch/riscv/include/asm/cacheflush.h | 8 ------ arch/riscv/mm/cacheflush.c | 38 ++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 ----------------------------- 3 files changed, 38 insertions(+), 49 deletions(-)
arch/riscv/include/asm/cacheflush.h +0 -8
@@ -42,16 +42,8 @@ void flush_icache_mm(struct mm_struct *mm, bool local);#endif /* CONFIG_SMP */ -/* -* The T-Head CMO errata internally probe the CBOM block size, but otherwise -* don't depend on Zicbom. -*/ extern unsigned int riscv_cbom_block_size; -#ifdef CONFIG_RISCV_ISA_ZICBOM void riscv_init_cbom_blocksize (void ); -#else -static inline void riscv_init_cbom_blocksize (void ) { } -#endif #ifdef CONFIG_RISCV_DMA_NONCOHERENT void riscv_noncoherent_supported (void );
arch/riscv/mm/cacheflush.c +38 -0
@@ -3,6 +3,7 @@* Copyright (C) 2017 SiFive */ +#include <linux/of.h> #include <asm/cacheflush.h> #ifdef CONFIG_SMP
@@ -86,3 +87,40 @@ void flush_icache_pte(pte_t pte) flush_icache_all(); }#endif /* CONFIG_MMU */ + +unsigned int riscv_cbom_block_size; +EXPORT_SYMBOL_GPL (riscv_cbom_block_size); + +void riscv_init_cbom_blocksize (void ) +{ +struct device_node *node; +unsigned long cbom_hartid; +u32 val, probed_block_size; +int ret; + + probed_block_size =0 ; +for_each_of_cpu_node (node) { +unsigned long hartid; + + ret =riscv_of_processor_hartid (node, &hartid); +if (ret) +continue ; + +/* set block-size for cbom extension if available */ + ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); +if (ret) +continue ; + +if (!probed_block_size) { + probed_block_size = val; + cbom_hartid = hartid; + }else { +if (probed_block_size != val) +pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , + cbom_hartid, hartid); + } + } + +if (probed_block_size) + riscv_cbom_block_size = probed_block_size; +}
arch/riscv/mm/dma-noncoherent.c +0 -41
55 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 173/240 RISC-V: KVM: Fix kvm_riscv_vcpu_timer_pending() for Sstc
In reply to Greg Kroah-HartmanFrom: Anup Patel <[email protected]>
[ Upstream commit cea8896bd936135559253e9b23340cfa1cdf0caf ]
The kvm_riscv_vcpu_timer_pending() checks per-VCPU next_cycles and per-VCPU software injected VS timer interrupt. This function returns incorrect value when Sstc is available because the per-VCPU next_cycles are only updated by kvm_riscv_vcpu_timer_save() called from kvm_arch_vcpu_put(). As a result, when Sstc is available the VCPU does not block properly upon WFI traps.
To fix the above issue, we introduce kvm_riscv_vcpu_timer_sync() which will update per-VCPU next_cycles upon every VM exit instead of kvm_riscv_vcpu_timer_save().
--- arch/riscv/include/asm/kvm_vcpu_timer.h | 1 + arch/riscv/kvm/vcpu.c | 3 +++ arch/riscv/kvm/vcpu_timer.c | 17 +++++++++++++++-- 3 files changed, 19 insertions(+), 2 deletions(-)
arch/riscv/include/asm/kvm_vcpu_timer.h +1 -0
@@ -45,6 +45,7 @@ int kvm_riscv_vcpu_timer_deinit(struct kvm_vcpu *vcpu);int kvm_riscv_vcpu_timer_reset (struct kvm_vcpu *vcpu);void kvm_riscv_vcpu_timer_restore (struct kvm_vcpu *vcpu);void kvm_riscv_guest_timer_init (struct kvm *kvm); +void kvm_riscv_vcpu_timer_sync (struct kvm_vcpu *vcpu);void kvm_riscv_vcpu_timer_save (struct kvm_vcpu *vcpu);bool kvm_riscv_vcpu_timer_pending (struct kvm_vcpu *vcpu);
arch/riscv/kvm/vcpu.c +3 -0
@@ -698,6 +698,9 @@ void kvm_riscv_vcpu_sync_interrupts(struct kvm_vcpu *vcpu)clear_bit (IRQ_VS_SOFT , &v->irqs_pending); } } + +/* Sync-up timer CSRs */ +kvm_riscv_vcpu_timer_sync (vcpu); }int kvm_riscv_vcpu_set_interrupt (struct kvm_vcpu *vcpu,unsigned int irq)
arch/riscv/kvm/vcpu_timer.c +15 -2
@@ -320,20 +320,33 @@ void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu)kvm_riscv_vcpu_timer_unblocking (vcpu); } -void kvm_riscv_vcpu_timer_save (struct kvm_vcpu *vcpu) +void kvm_riscv_vcpu_timer_sync (struct kvm_vcpu *vcpu) {struct kvm_vcpu_timer *t = &vcpu->arch.timer;if (!t->sstc_enabled)return ; - t = &vcpu->arch.timer;#if defined(CONFIG_32BIT ) t->next_cycles =csr_read (CSR_VSTIMECMP ); t->next_cycles |= (u64 )csr_read (CSR_VSTIMECMPH ) <<32 ;#else t->next_cycles =csr_read (CSR_VSTIMECMP );#endif +} + +void kvm_riscv_vcpu_timer_save (struct kvm_vcpu *vcpu) +{ +struct kvm_vcpu_timer *t = &vcpu->arch.timer; + +if (!t->sstc_enabled) +return ; + +/* +* The vstimecmp CSRs are saved by kvm_riscv_vcpu_timer_sync() +* upon every VM exit so no need to save here. +*/ +/* timer should be enabled for the remaining operations */ if (unlikely (!t->init_done))return ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 174/240 x86/unwind/orc: Fix unreliable stack dump with gcov
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit 230db82413c091bc16acee72650f48d419cebe49 ]
When a console stack dump is initiated with CONFIG_GCOV_PROFILE_ALL enabled, show_trace_log_lvl() gets out of sync with the ORC unwinder, causing the stack trace to show all text addresses as unreliable:
# echo l > /proc/sysrq-trigger [ 477.521031] sysrq: Show backtrace of all active CPUs [ 477.523813] NMI backtrace for cpu 0 [ 477.524492] CPU: 0 PID: 1021 Comm: bash Not tainted 6.0.0 #65 [ 477.525295] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.0-1.fc36 04/01/2014 [ 477.526439] Call Trace: [ 477.526854] <TASK> [ 477.527216] ? dump_stack_lvl+0xc7/0x114 [ 477.527801] ? dump_stack+0x13/0x1f [ 477.528331] ? nmi_cpu_backtrace.cold+0xb5/0x10d [ 477.528998] ? lapic_can_unplug_cpu+0xa0/0xa0 [ 477.529641] ? nmi_trigger_cpumask_backtrace+0x16a/0x1f0 [ 477.530393] ? arch_trigger_cpumask_backtrace+0x1d/0x30 [ 477.531136] ? sysrq_handle_showallcpus+0x1b/0x30 [ 477.531818] ? __handle_sysrq.cold+0x4e/0x1ae [ 477.532451] ? write_sysrq_trigger+0x63/0x80 [ 477.533080] ? proc_reg_write+0x92/0x110 [ 477.533663] ? vfs_write+0x174/0x530 [ 477.534265] ? handle_mm_fault+0x16f/0x500 [ 477.534940] ? ksys_write+0x7b/0x170 [ 477.535543] ? __x64_sys_write+0x1d/0x30 [ 477.536191] ? do_syscall_64+0x6b/0x100 [ 477.536809] ? entry_SYSCALL_64_after_hwframe+0x63/0xcd [ 477.537609] </TASK>
This happens when the compiled code for show_stack() has a single word on the stack, and doesn't use a tail call to show_stack_log_lvl(). (CONFIG_GCOV_PROFILE_ALL=y is the only known case of this.) Then the __unwind_start() skip logic hits an off-by-one bug and fails to unwind all the way to the intended starting frame.
Fix it by reverting the following commit:
f1d9a2abff66 ("x86/unwind/orc: Don't skip the first frame for inactive tasks")
The original justification for that commit no longer exists. That original issue was later fixed in a different way, with the following commit:
f2ac57a4c49d ("x86/unwind/orc: Fix inactive tasks with stack pointer in %sp on GCC 10 compiled kernels")
--- arch/x86/kernel/unwind_orc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/unwind_orc.c +1 -1
@@ -713,7 +713,7 @@ void __unwind_start(struct unwind_state *state, struct task_struct *task,/* Otherwise, skip ahead to the user-specified starting frame: */ while (!unwind_done (state) && (!on_stack (&state->stack_info, first_frame,sizeof (long )) || - state->sp < (unsigned long )first_frame)) + state->sp <= (unsigned long )first_frame))unwind_next_frame (state);return ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 175/240 drm/bridge: ps8640: Add back the 50 ms mystery delay after HPD
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit cb8e30ddb7e345867f6f2da8a08291d7d9e037db ]
Back in commit 826cff3f7ebb ("drm/bridge: parade-ps8640: Enable runtime power management") we removed a mysterious 50 ms delay because "Parade's support [couldn't] explain what the delay [was] for".
While I'm always a fan of removing mysterious delays, I suspect that we need this mysterious delay to avoid some problems.
Specifically, what I found recently is that on sc7180-trogdor-homestar sometimes the AUX backlight wasn't initializing properly. Some debugging showed that the drm_dp_dpcd_read() function that the AUX backlight driver was calling was returning bogus data about 1% of the time when I booted up. This confused drm_panel_dp_aux_backlight(). From continued debugging:
- If I retried the read then the read worked just fine.
- If I added a loop to perform the same read that drm_panel_dp_aux_backlight() was doing 30 times at bootup I could see that some percentage of the time the first read would give bogus data but all 29 additional reads would always be fine.
- If I added a large delay _after_ powering on the panel but before powering on PS8640 I could still reproduce the problem.
- If I added a delay after PS8640 powered on then I couldn't reproduce the problem.
- I couldn't reproduce the problem on a board with the same panel but the ti-sn65dsi86 bridge chip.
To me, the above indicated that there was a problem with PS8640 and not the panel.
I don't really have any insight into what's going on in the MCU, but my best guess is that when the MCU itself sees the HPD go high that it does some AUX transfers itself and this is confusing things.
Let's go back and add back in the mysterious 50 ms delay. We only want to do this the first time we see HPD go high after booting the MCU, not every time we double-check HPD.
With this, the backlight initializes reliably on homestar.
--- drivers/gpu/drm/bridge/parade-ps8640.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/parade-ps8640.c +23 -2
@@ -105,6 +105,7 @@ struct ps8640 {struct gpio_desc *gpio_powerdown;struct device_link *link;bool pre_enabled; +bool need_post_hpd_delay; };static const struct regmap_config ps8640_regmap_config[] = {
@@ -173,14 +174,31 @@ static int _ps8640_wait_hpd_asserted(struct ps8640 *ps_bridge, unsigned long wai {struct regmap *map = ps_bridge->regmap[PAGE2_TOP_CNTL ];int status; +int ret;/* * Apparently something about the firmware in the chip signals that * HPD goes high by reporting GPIO9 as high (even though HPD isn't * actually connected to GPIO9). */ -return regmap_read_poll_timeout (map,PAGE2_GPIO_H , status, - status &PS_GPIO9 , wait_us /10 , wait_us); + ret =regmap_read_poll_timeout (map,PAGE2_GPIO_H , status, + status &PS_GPIO9 , wait_us /10 , wait_us); + +/* +* The first time we see HPD go high after a reset we delay an extra +* 50 ms. The best guess is that the MCU is doing "stuff" during this +* time (maybe talking to the panel) and we don't want to interrupt it. +* +* No locking is done around "need_post_hpd_delay". If we're here we +* know we're holding a PM Runtime reference and the only other place +* that touches this is PM Runtime resume. +*/ +if (!ret && ps_bridge->need_post_hpd_delay) { + ps_bridge->need_post_hpd_delay = false; +msleep (50 ); + } + +return ret; }static int ps8640_wait_hpd_asserted (struct drm_dp_aux *aux,unsigned long wait_us)
@@ -376,6 +394,9 @@ static int __maybe_unused ps8640_resume(struct device *dev)usleep_range (2000 ,2500 );gpiod_set_value (ps_bridge->gpio_reset,0 ); +/* We just reset things, so we need a delay after the first HPD */ + ps_bridge->need_post_hpd_delay = true; +/* * Mystery 200 ms delay for the "MCU to be ready". It's unclear if * this is truly necessary since the MCU will already signal that
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 176/240 x86/fpu: Fix copy_xstate_to_uabi() to copy init states correctly
In reply to Greg Kroah-HartmanFrom: Chang S. Bae <[email protected]>
[ Upstream commit 471f0aa7fa64e23766a1473b32d9ec3f0718895a ]
When an extended state component is not present in fpstate, but in init state, the function copies from init_fpstate via copy_feature().
But, dynamic states are not present in init_fpstate because of all-zeros init states. Then retrieving them from init_fpstate will explode like this:
BUG: kernel NULL pointer dereference, address: 0000000000000000 ... RIP: 0010:memcpy_erms+0x6/0x10 ? __copy_xstate_to_uabi_buf+0x381/0x870 fpu_copy_guest_fpstate_to_uabi+0x28/0x80 kvm_arch_vcpu_ioctl+0x14c/0x1460 [kvm] ? __this_cpu_preempt_check+0x13/0x20 ? vmx_vcpu_put+0x2e/0x260 [kvm_intel] kvm_vcpu_ioctl+0xea/0x6b0 [kvm] ? kvm_vcpu_ioctl+0xea/0x6b0 [kvm] ? __fget_light+0xd4/0x130 __x64_sys_ioctl+0xe3/0x910 ? debug_smp_processor_id+0x17/0x20 ? fpregs_assert_state_consistent+0x27/0x50 do_syscall_64+0x3f/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Adjust the 'mask' to zero out the userspace buffer for the features that are not available both from fpstate and from init_fpstate.
The dynamic features depend on the compacted XSAVE format. Ensure it is enabled before reading XCOMP_BV in init_fpstate.
--- arch/x86/kernel/fpu/xstate.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/x86/kernel/fpu/xstate.c +9 -0
@@ -1125,6 +1125,15 @@ void __copy_xstate_to_uabi_buf(struct membuf to, struct fpstate *fpstate,*/ mask = fpstate->user_xfeatures; +/* +* Dynamic features are not present in init_fpstate. When they are +* in an all zeros init state, remove those from 'mask' to zero +* those features in the user buffer instead of retrieving them +* from init_fpstate. +*/ +if (fpu_state_size_dynamic ()) + mask &= (header.xfeatures | xinit->header.xcomp_bv); +for_each_extended_xfeature (i, mask) {/* * If there was a feature or alignment gap, zero the space
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 177/240 amd-xgbe: Yellow carp devices do not need rrc
In reply to Greg Kroah-HartmanFrom: Raju Rangoju <[email protected]>
[ Upstream commit f97fc7ef414603189d5ba6f529407c5341c03c2a ]
Link stability issues are noticed on Yellow carp platforms when Receiver Reset Cycle is issued. Since the CDR workaround is disabled on these platforms, the Receiver Reset Cycle is not needed.
So, avoid issuing rrc on Yellow carp platforms.
--- drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 5 +++++ drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/net/ethernet/amd/xgbe/xgbe-pci.c +5 -0
@@ -285,6 +285,9 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)/* Yellow Carp devices do not need cdr workaround */ pdata->vdata->an_cdr_workaround =0 ; + +/* Yellow Carp devices do not need rrc */ + pdata->vdata->enable_rrc =0 ; }else { pdata->xpcs_window_def_reg =PCS_V2_WINDOW_DEF ; pdata->xpcs_window_sel_reg =PCS_V2_WINDOW_SELECT ;
@@ -483,6 +486,7 @@ static struct xgbe_version_data xgbe_v2a = { .tx_desc_prefetch = 5, .rx_desc_prefetch = 5, .an_cdr_workaround = 1, + .enable_rrc = 1, };static struct xgbe_version_data xgbe_v2b = {
@@ -498,6 +502,7 @@ static struct xgbe_version_data xgbe_v2b = { .tx_desc_prefetch = 5, .rx_desc_prefetch = 5, .an_cdr_workaround = 1, + .enable_rrc = 1, };static const struct pci_device_id xgbe_pci_table[] = {
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +1 -1
@@ -2640,7 +2640,7 @@ static int xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart) }/* No link, attempt a receiver reset cycle */ -if (phy_data->rrc_count++ >XGBE_RRC_FREQUENCY ) { +if (pdata->vdata->enable_rrc && phy_data->rrc_count++ >XGBE_RRC_FREQUENCY ) { phy_data->rrc_count =0 ;xgbe_phy_rrc (pdata); }
drivers/net/ethernet/amd/xgbe/xgbe.h +1 -0
@@ -1013,6 +1013,7 @@ struct xgbe_version_data {unsigned int tx_desc_prefetch;unsigned int rx_desc_prefetch;unsigned int an_cdr_workaround; +unsigned int enable_rrc; };struct xgbe_prv_data {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 178/240 amd-xgbe: fix the SFP compliance codes check for DAC cables
In reply to Greg Kroah-HartmanFrom: Raju Rangoju <[email protected]>
[ Upstream commit 09c5f6bf11ac98874339e55f4f5f79a9dbc9b375 ]
The current XGBE code assumes that offset 6 of EEPROM SFP DAC (passive) cables is NULL. However, some cables (the 5 meter and 7 meter Molex passive cables) have non-zero data at offset 6. Fix the logic by moving the passive cable check above the active checks, so as not to be improperly identified as an active cable. This will fix the issue for any passive cable that advertises 1000Base-CX in offset 6.
--- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +4 -4
@@ -1151,7 +1151,10 @@ static void xgbe_phy_sfp_parse_eeprom(struct xgbe_prv_data *pdata) }/* Determine the type of SFP */ -if (sfp_base[XGBE_SFP_BASE_10GBE_CC ] &XGBE_SFP_BASE_10GBE_CC_SR ) +if (phy_data->sfp_cable ==XGBE_SFP_CABLE_PASSIVE && +xgbe_phy_sfp_bit_rate (sfp_eeprom,XGBE_SFP_SPEED_10000 )) + phy_data->sfp_base =XGBE_SFP_BASE_10000_CR ; +else if (sfp_base[XGBE_SFP_BASE_10GBE_CC ] &XGBE_SFP_BASE_10GBE_CC_SR ) phy_data->sfp_base =XGBE_SFP_BASE_10000_SR ;else if (sfp_base[XGBE_SFP_BASE_10GBE_CC ] &XGBE_SFP_BASE_10GBE_CC_LR ) phy_data->sfp_base =XGBE_SFP_BASE_10000_LR ;
@@ -1167,9 +1170,6 @@ static void xgbe_phy_sfp_parse_eeprom(struct xgbe_prv_data *pdata) phy_data->sfp_base =XGBE_SFP_BASE_1000_CX ; else if (sfp_base[XGBE_SFP_BASE_1GBE_CC] & XGBE_SFP_BASE_1GBE_CC_T) phy_data->sfp_base = XGBE_SFP_BASE_1000_T; - else if ((phy_data->sfp_cable == XGBE_SFP_CABLE_PASSIVE) && - xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_10000)) - phy_data->sfp_base = XGBE_SFP_BASE_10000_CR;switch (phy_data->sfp_base) {case XGBE_SFP_BASE_1000_T :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 179/240 amd-xgbe: add the bit rate quirk for Molex cables
In reply to Greg Kroah-HartmanFrom: Raju Rangoju <[email protected]>
[ Upstream commit 170a9e341a3b02c0b2ea0df16ef14a33a4f41de8 ]
The offset 12 (bit-rate) of EEPROM SFP DAC (passive) cables is expected to be in the range 0x64 to 0x68. However, the 5 meter and 7 meter Molex passive cables have the rate ceiling 0x78 at offset 12.
Add a quirk for Molex passive cables to extend the rate ceiling to 0x78.
--- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +8 -1
@@ -239,6 +239,7 @@ enum xgbe_sfp_speed {#define XGBE_SFP_BASE_BR_1GBE_MAX 0x0d#define XGBE_SFP_BASE_BR_10GBE_MIN 0x64#define XGBE_SFP_BASE_BR_10GBE_MAX 0x68 +#define XGBE_MOLEX_SFP_BASE_BR_10GBE_MAX 0x78#define XGBE_SFP_BASE_CU_CABLE_LEN 18
@@ -284,6 +285,8 @@ struct xgbe_sfp_eeprom {#define XGBE_BEL_FUSE_VENDOR "BEL-FUSE "#define XGBE_BEL_FUSE_PARTNO "1GBT-SFP06 " +#define XGBE_MOLEX_VENDOR "Molex Inc. " +struct xgbe_sfp_ascii {union {char vendor[XGBE_SFP_BASE_VENDOR_NAME_LEN +1 ];
@@ -834,7 +837,11 @@ static bool xgbe_phy_sfp_bit_rate(struct xgbe_sfp_eeprom *sfp_eeprom,break ;case XGBE_SFP_SPEED_10000 : min =XGBE_SFP_BASE_BR_10GBE_MIN ; - max =XGBE_SFP_BASE_BR_10GBE_MAX ; +if (memcmp (&sfp_eeprom->base[XGBE_SFP_BASE_VENDOR_NAME ], +XGBE_MOLEX_VENDOR ,XGBE_SFP_BASE_VENDOR_NAME_LEN ) ==0 ) + max =XGBE_MOLEX_SFP_BASE_BR_10GBE_MAX ; +else + max =XGBE_SFP_BASE_BR_10GBE_MAX ;break ;default :return false;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 180/240 drm/i915/dgfx: Keep PCI autosuspend control on by default on all dGPU
In reply to Greg Kroah-HartmanFrom: Anshuman Gupta <[email protected]>
[ Upstream commit 62c52eac1ad680fc68ef6d75955127dca46e2740 ]
DGFX platforms has lmem and cpu can access the lmem objects via mmap and i915 internal i915_gem_object_pin_map() for i915 own usages. Both of these methods has pre-requisite requirement to keep GFX PCI endpoint in D0 for a supported iomem transaction over PCI link. (Refer PCIe specs 5.3.1.4.1)
Both DG1/DG2 have a known hardware bug that violates the PCIe specs and support the iomem read write transaction over PCIe bus despite endpoint is D3 state.
Due to above H/W bug, we had never observed any issue with i915 runtime PM versus lmem access.
But this issue becomes visible when PCIe gfx endpoint's upstream bridge enters to D3, at this point any lmem read/write access will be returned as unsupported request. But again this issue is not observed on every platform because it has been observed on few host machines DG1/DG2 endpoint's upstream bridge does not bind with pcieport driver. which really disables the PCIe power savings and leaves the bridge at D0 state.
We need a unique interface to read/write from lmem with runtime PM wakeref protection something similar to intel_uncore_{read, write}, keep autosuspend control to 'on' on all discrete platforms, until we have a unique interface to read/write from lmem.
This just change the default autosuspend setting of i915 on dGPU, user can still change it to 'auto'.
v2:
- Modified the commit message and subject with more information.
- Changed the Fixes tag to LMEM support commit. [Joonas]
- Changed !HAS_LMEM() Cond to !IS_DGFX(). [Rodrigo]
--- drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_runtime_pm.c +9 -2
@@ -591,8 +591,15 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)pm_runtime_use_autosuspend (kdev); } -/* Enable by default */ -pm_runtime_allow (kdev); +/* +* FIXME: Temp hammer to keep autosupend disable on lmem supported platforms. +* As per PCIe specs 5.3.1.4.1, all iomem read write request over a PCIe +* function will be unsupported in case PCIe endpoint function is in D3. +* Let's keep i915 autosuspend control 'on' till we fix all known issue +* with lmem access in D3. +*/ +if (!IS_DGFX (i915)) +pm_runtime_allow (kdev);/* * The core calls the driver load handler with an RPM reference held.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 181/240 drm/i915/dp: Reset frl trained flag before restarting FRL training
In reply to Greg Kroah-HartmanFrom: Ankit Nautiyal <[email protected]>
[ Upstream commit 63720a561b3c98199adf0c73e152807f15cc3b7f ]
For cases where DP has HDMI2.1 sink and FRL Link issues are detected, reset the flag to state FRL trained status before restarting FRL training.
--- drivers/gpu/drm/i915/display/intel_dp.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/display/intel_dp.c +2 -0
@@ -3923,6 +3923,8 @@ intel_dp_handle_hdmi_link_status_change(struct intel_dp *intel_dp)drm_dp_pcon_hdmi_frl_link_error_count (&intel_dp->aux, &intel_dp->attached_connector->base); + intel_dp->frl.is_trained = false; +/* Restart FRL training or fall back to TMDS mode */ intel_dp_check_frl_training (intel_dp); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 182/240 atlantic: fix deadlock at aq_nic_stop
In reply to Greg Kroah-HartmanFrom: Íñigo Huguet <[email protected]>
[ Upstream commit 6960d133f66ecddcd3af2b1cbd0c7dcd104268b8 ]
NIC is stopped with rtnl_lock held, and during the stop it cancels the 'service_task' work and free irqs.
However, if CONFIG_MACSEC is set, rtnl_lock is acquired both from aq_nic_service_task and aq_linkstate_threaded_isr. Then a deadlock happens if aq_nic_stop tries to cancel/disable them when they've already started their execution.
As the deadlock is caused by rtnl_lock, it causes many other processes to stall, not only atlantic related stuff.
Fix it by introducing a mutex that protects each NIC's macsec related data, and locking it instead of the rtnl_lock from the service task and the threaded IRQ.
Before this patch, all macsec data was protected with rtnl_lock, but maybe not all of it needs to be protected. With this new mutex, further efforts can be made to limit the protected data only to that which requires it. However, probably it doesn't worth it because all macsec's data accesses are infrequent, and almost all are done from macsec_ops or ethtool callbacks, called holding rtnl_lock, so macsec_mutex won't never be much contended.
The issue appeared repeteadly attaching and deattaching the NIC to a bond interface. Doing that after this patch I cannot reproduce the bug.
--- .../ethernet/aquantia/atlantic/aq_macsec.c | 96 ++++++++++++++----- .../net/ethernet/aquantia/atlantic/aq_nic.h | 2 + 2 files changed, 74 insertions(+), 24 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_macsec.c +72 -24
@@ -1451,26 +1451,57 @@ static void aq_check_txsa_expiration(struct aq_nic_s *nic) egress_sa_threshold_expired); } +#define AQ_LOCKED_MDO_DEF (mdo) \ +static int aq_locked_mdo_##mdo(struct macsec_context *ctx) \ +{ \ + struct aq_nic_s *nic = netdev_priv(ctx->netdev); \ + int ret; \ + mutex_lock(&nic->macsec_mutex); \ + ret = aq_mdo_##mdo(ctx); \ + mutex_unlock(&nic->macsec_mutex); \ + return ret; \ +} + +AQ_LOCKED_MDO_DEF (dev_open) +AQ_LOCKED_MDO_DEF (dev_stop ) +AQ_LOCKED_MDO_DEF (add_secy) +AQ_LOCKED_MDO_DEF (upd_secy) +AQ_LOCKED_MDO_DEF (del_secy) +AQ_LOCKED_MDO_DEF (add_rxsc) +AQ_LOCKED_MDO_DEF (upd_rxsc) +AQ_LOCKED_MDO_DEF (del_rxsc) +AQ_LOCKED_MDO_DEF (add_rxsa) +AQ_LOCKED_MDO_DEF (upd_rxsa) +AQ_LOCKED_MDO_DEF (del_rxsa) +AQ_LOCKED_MDO_DEF (add_txsa) +AQ_LOCKED_MDO_DEF (upd_txsa) +AQ_LOCKED_MDO_DEF (del_txsa) +AQ_LOCKED_MDO_DEF (get_dev_stats) +AQ_LOCKED_MDO_DEF (get_tx_sc_stats) +AQ_LOCKED_MDO_DEF (get_tx_sa_stats) +AQ_LOCKED_MDO_DEF (get_rx_sc_stats) +AQ_LOCKED_MDO_DEF (get_rx_sa_stats) + const struct macsec_ops aq_macsec_ops = { - .mdo_dev_open = aq_mdo_dev_open, - .mdo_dev_stop = aq_mdo_dev_stop, - .mdo_add_secy = aq_mdo_add_secy, - .mdo_upd_secy = aq_mdo_upd_secy, - .mdo_del_secy = aq_mdo_del_secy, - .mdo_add_rxsc = aq_mdo_add_rxsc, - .mdo_upd_rxsc = aq_mdo_upd_rxsc, - .mdo_del_rxsc = aq_mdo_del_rxsc, - .mdo_add_rxsa = aq_mdo_add_rxsa, - .mdo_upd_rxsa = aq_mdo_upd_rxsa, - .mdo_del_rxsa = aq_mdo_del_rxsa, - .mdo_add_txsa = aq_mdo_add_txsa, - .mdo_upd_txsa = aq_mdo_upd_txsa, - .mdo_del_txsa = aq_mdo_del_txsa, - .mdo_get_dev_stats = aq_mdo_get_dev_stats, - .mdo_get_tx_sc_stats = aq_mdo_get_tx_sc_stats, - .mdo_get_tx_sa_stats = aq_mdo_get_tx_sa_stats, - .mdo_get_rx_sc_stats = aq_mdo_get_rx_sc_stats, - .mdo_get_rx_sa_stats = aq_mdo_get_rx_sa_stats, + .mdo_dev_open = aq_locked_mdo_dev_open, + .mdo_dev_stop = aq_locked_mdo_dev_stop, + .mdo_add_secy = aq_locked_mdo_add_secy, + .mdo_upd_secy = aq_locked_mdo_upd_secy, + .mdo_del_secy = aq_locked_mdo_del_secy, + .mdo_add_rxsc = aq_locked_mdo_add_rxsc, + .mdo_upd_rxsc = aq_locked_mdo_upd_rxsc, + .mdo_del_rxsc = aq_locked_mdo_del_rxsc, + .mdo_add_rxsa = aq_locked_mdo_add_rxsa, + .mdo_upd_rxsa = aq_locked_mdo_upd_rxsa, + .mdo_del_rxsa = aq_locked_mdo_del_rxsa, + .mdo_add_txsa = aq_locked_mdo_add_txsa, + .mdo_upd_txsa = aq_locked_mdo_upd_txsa, + .mdo_del_txsa = aq_locked_mdo_del_txsa, + .mdo_get_dev_stats = aq_locked_mdo_get_dev_stats, + .mdo_get_tx_sc_stats = aq_locked_mdo_get_tx_sc_stats, + .mdo_get_tx_sa_stats = aq_locked_mdo_get_tx_sa_stats, + .mdo_get_rx_sc_stats = aq_locked_mdo_get_rx_sc_stats, + .mdo_get_rx_sa_stats = aq_locked_mdo_get_rx_sa_stats, };int aq_macsec_init (struct aq_nic_s *nic)
@@ -1492,6 +1523,7 @@ int aq_macsec_init(struct aq_nic_s *nic) nic->ndev->features |=NETIF_F_HW_MACSEC ; nic->ndev->macsec_ops = &aq_macsec_ops; +mutex_init (&nic->macsec_mutex);return 0 ; }
@@ -1515,7 +1547,7 @@ int aq_macsec_enable(struct aq_nic_s *nic)if (!nic->macsec_cfg)return 0 ; -rtnl_lock (); +mutex_lock (&nic->macsec_mutex);if (nic->aq_fw_ops->send_macsec_req) {struct macsec_cfg_request cfg = {0 };
@@ -1564,7 +1596,7 @@ int aq_macsec_enable(struct aq_nic_s *nic) ret =aq_apply_macsec_cfg (nic); unlock: -rtnl_unlock (); +mutex_unlock (&nic->macsec_mutex);return ret; }
@@ -1576,9 +1608,9 @@ void aq_macsec_work(struct aq_nic_s *nic)if (!netif_carrier_ok (nic->ndev))return ; -rtnl_lock (); +mutex_lock (&nic->macsec_mutex);aq_check_txsa_expiration (nic); -rtnl_unlock (); +mutex_unlock (&nic->macsec_mutex); }int aq_macsec_rx_sa_cnt (struct aq_nic_s *nic)
@@ -1589,21 +1621,30 @@ int aq_macsec_rx_sa_cnt(struct aq_nic_s *nic)if (!cfg)return 0 ; +mutex_lock (&nic->macsec_mutex); +for (i =0 ; i <AQ_MACSEC_MAX_SC ; i++) {if (!test_bit (i, &cfg->rxsc_idx_busy))continue ; cnt +=hweight_long (cfg->aq_rxsc[i].rx_sa_idx_busy); } +mutex_unlock (&nic->macsec_mutex);return cnt; }int aq_macsec_tx_sc_cnt (struct aq_nic_s *nic) { +int cnt; +if (!nic->macsec_cfg)return 0 ; -return hweight_long (nic->macsec_cfg->txsc_idx_busy); +mutex_lock (&nic->macsec_mutex); + cnt =hweight_long (nic->macsec_cfg->txsc_idx_busy); +mutex_unlock (&nic->macsec_mutex); + +return cnt; }int aq_macsec_tx_sa_cnt (struct aq_nic_s *nic)
@@ -1614,12 +1655,15 @@ int aq_macsec_tx_sa_cnt(struct aq_nic_s *nic)if (!cfg)return 0 ; +mutex_lock (&nic->macsec_mutex); +for (i =0 ; i <AQ_MACSEC_MAX_SC ; i++) {if (!test_bit (i, &cfg->txsc_idx_busy))continue ; cnt +=hweight_long (cfg->aq_txsc[i].tx_sa_idx_busy); } +mutex_unlock (&nic->macsec_mutex);return cnt; }
@@ -1691,6 +1735,8 @@ u64 *aq_macsec_get_stats(struct aq_nic_s *nic, u64 *data)if (!cfg)return data; +mutex_lock (&nic->macsec_mutex); +aq_macsec_update_stats (nic); common_stats = &cfg->stats;
@@ -1773,5 +1819,7 @@ u64 *aq_macsec_get_stats(struct aq_nic_s *nic, u64 *data) data += i; +mutex_unlock (&nic->macsec_mutex); +return data; }
drivers/net/ethernet/aquantia/atlantic/aq_nic.h +2 -0
@@ -157,6 +157,8 @@ struct aq_nic_s {struct mutex fwreq_mutex;#if IS_ENABLED (CONFIG_MACSEC )struct aq_macsec_cfg *macsec_cfg; +/* mutex to protect data in macsec_cfg */ +struct mutex macsec_mutex;#endif /* PTP support */ struct aq_ptp_s *aq_ptp;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 183/240 kcm: annotate data-races around kcm->rx_psock
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 15e4dabda11b0fa31d510a915d1a580f47dfc92e ]
kcm->rx_psock can be read locklessly in kcm_rfree(). Annotate the read and writes accordingly.
We do the same for kcm->rx_wait in the following patch.
syzbot reported:
BUG: KCSAN: data-race in kcm_rfree / unreserve_rx_kcm
write to 0xffff888123d827b8 of 8 bytes by task 2758 on cpu 1:
unreserve_rx_kcm+0x72/0x1f0 net/kcm/kcmsock.c:313 kcm_rcv_strparser+0x2b5/0x3a0 net/kcm/kcmsock.c:373 __strp_recv+0x64c/0xd20 net/strparser/strparser.c:301 strp_recv+0x6d/0x80 net/strparser/strparser.c:335 tcp_read_sock+0x13e/0x5a0 net/ipv4/tcp.c:1703 strp_read_sock net/strparser/strparser.c:358 [inline] do_strp_work net/strparser/strparser.c:406 [inline] strp_work+0xe8/0x180 net/strparser/strparser.c:415 process_one_work+0x3d3/0x720 kernel/workqueue.c:2289 worker_thread+0x618/0xa70 kernel/workqueue.c:2436 kthread+0x1a9/0x1e0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306
read to 0xffff888123d827b8 of 8 bytes by task 5859 on cpu 0:
kcm_rfree+0x14c/0x220 net/kcm/kcmsock.c:181 skb_release_head_state+0x8e/0x160 net/core/skbuff.c:841 skb_release_all net/core/skbuff.c:852 [inline] __kfree_skb net/core/skbuff.c:868 [inline] kfree_skb_reason+0x5c/0x260 net/core/skbuff.c:891 kfree_skb include/linux/skbuff.h:1216 [inline] kcm_recvmsg+0x226/0x2b0 net/kcm/kcmsock.c:1161 ____sys_recvmsg+0x16c/0x2e0 ___sys_recvmsg net/socket.c:2743 [inline] do_recvmmsg+0x2f1/0x710 net/socket.c:2837 __sys_recvmmsg net/socket.c:2916 [inline] __do_sys_recvmmsg net/socket.c:2939 [inline] __se_sys_recvmmsg net/socket.c:2932 [inline] __x64_sys_recvmmsg+0xde/0x160 net/socket.c:2932 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
value changed: 0xffff88812971ce00 -> 0x0000000000000000
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 5859 Comm: syz-executor.3 Not tainted 6.0.0-syzkaller-12189-g19d17ab7c68b-dirty #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/22/2022
--- net/kcm/kcmsock.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/kcm/kcmsock.c +5 -3
@@ -178,7 +178,7 @@ static void kcm_rfree(struct sk_buff *skb)/* For reading rx_wait and rx_psock without holding lock */ smp_mb__after_atomic (); -if (!kcm->rx_wait && !kcm->rx_psock && +if (!kcm->rx_wait && !READ_ONCE (kcm->rx_psock) &&sk_rmem_alloc_get (sk) < sk->sk_rcvlowat) {spin_lock_bh (&mux->rx_lock);kcm_rcv_ready (kcm);
@@ -283,7 +283,8 @@ static struct kcm_sock *reserve_rx_kcm(struct kcm_psock *psock, kcm->rx_wait = false; psock->rx_kcm = kcm; - kcm->rx_psock = psock; +/* paired with lockless reads in kcm_rfree() */ +WRITE_ONCE (kcm->rx_psock, psock);spin_unlock_bh (&mux->rx_lock);
@@ -310,7 +311,8 @@ static void unreserve_rx_kcm(struct kcm_psock *psock,spin_lock_bh (&mux->rx_lock); psock->rx_kcm =NULL ; - kcm->rx_psock =NULL ; +/* paired with lockless reads in kcm_rfree() */ +WRITE_ONCE (kcm->rx_psock,NULL );/* Commit kcm->rx_psock before sk_rmem_alloc_get to sync with * kcm_rfree
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 184/240 kcm: annotate data-races around kcm->rx_wait
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 0c745b5141a45a076f1cb9772a399f7ebcb0948a ]
kcm->rx_psock can be read locklessly in kcm_rfree(). Annotate the read and writes accordingly.
syzbot reported:
BUG: KCSAN: data-race in kcm_rcv_strparser / kcm_rfree
write to 0xffff88810784e3d0 of 1 bytes by task 1823 on cpu 1:
reserve_rx_kcm net/kcm/kcmsock.c:283 [inline] kcm_rcv_strparser+0x250/0x3a0 net/kcm/kcmsock.c:363 __strp_recv+0x64c/0xd20 net/strparser/strparser.c:301 strp_recv+0x6d/0x80 net/strparser/strparser.c:335 tcp_read_sock+0x13e/0x5a0 net/ipv4/tcp.c:1703 strp_read_sock net/strparser/strparser.c:358 [inline] do_strp_work net/strparser/strparser.c:406 [inline] strp_work+0xe8/0x180 net/strparser/strparser.c:415 process_one_work+0x3d3/0x720 kernel/workqueue.c:2289 worker_thread+0x618/0xa70 kernel/workqueue.c:2436 kthread+0x1a9/0x1e0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306
read to 0xffff88810784e3d0 of 1 bytes by task 17869 on cpu 0:
kcm_rfree+0x121/0x220 net/kcm/kcmsock.c:181 skb_release_head_state+0x8e/0x160 net/core/skbuff.c:841 skb_release_all net/core/skbuff.c:852 [inline] __kfree_skb net/core/skbuff.c:868 [inline] kfree_skb_reason+0x5c/0x260 net/core/skbuff.c:891 kfree_skb include/linux/skbuff.h:1216 [inline] kcm_recvmsg+0x226/0x2b0 net/kcm/kcmsock.c:1161 ____sys_recvmsg+0x16c/0x2e0 ___sys_recvmsg net/socket.c:2743 [inline] do_recvmmsg+0x2f1/0x710 net/socket.c:2837 __sys_recvmmsg net/socket.c:2916 [inline] __do_sys_recvmmsg net/socket.c:2939 [inline] __se_sys_recvmmsg net/socket.c:2932 [inline] __x64_sys_recvmmsg+0xde/0x160 net/socket.c:2932 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
value changed: 0x01 -> 0x00
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 17869 Comm: syz-executor.2 Not tainted 6.1.0-rc1-syzkaller-00010-gbb1a1146467a-dirty #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/22/2022
--- net/kcm/kcmsock.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
net/kcm/kcmsock.c +11 -6
@@ -162,7 +162,8 @@ static void kcm_rcv_ready(struct kcm_sock *kcm)/* Buffer limit is okay now, add to ready list */ list_add_tail (&kcm->wait_rx_list, &kcm->mux->kcm_rx_waiters); - kcm->rx_wait = true; +/* paired with lockless reads in kcm_rfree() */ +WRITE_ONCE (kcm->rx_wait, true); }static void kcm_rfree (struct sk_buff *skb)
@@ -178,7 +179,7 @@ static void kcm_rfree(struct sk_buff *skb)/* For reading rx_wait and rx_psock without holding lock */ smp_mb__after_atomic (); -if (!kcm->rx_wait && !READ_ONCE (kcm->rx_psock) && +if (!READ_ONCE (kcm->rx_wait) && !READ_ONCE (kcm->rx_psock) &&sk_rmem_alloc_get (sk) < sk->sk_rcvlowat) {spin_lock_bh (&mux->rx_lock);kcm_rcv_ready (kcm);
@@ -237,7 +238,8 @@ static void requeue_rx_msgs(struct kcm_mux *mux, struct sk_buff_head *head)if (kcm_queue_rcv_skb (&kcm->sk, skb)) {/* Should mean socket buffer full */ list_del (&kcm->wait_rx_list); - kcm->rx_wait = false; +/* paired with lockless reads in kcm_rfree() */ +WRITE_ONCE (kcm->rx_wait, false);/* Commit rx_wait to read in kcm_free */ smp_wmb ();
@@ -280,7 +282,8 @@ static struct kcm_sock *reserve_rx_kcm(struct kcm_psock *psock, kcm =list_first_entry (&mux->kcm_rx_waiters, struct kcm_sock, wait_rx_list);list_del (&kcm->wait_rx_list); - kcm->rx_wait = false; +/* paired with lockless reads in kcm_rfree() */ +WRITE_ONCE (kcm->rx_wait, false); psock->rx_kcm = kcm;/* paired with lockless reads in kcm_rfree() */
@@ -1242,7 +1245,8 @@ static void kcm_recv_disable(struct kcm_sock *kcm)if (!kcm->rx_psock) {if (kcm->rx_wait) {list_del (&kcm->wait_rx_list); - kcm->rx_wait = false; +/* paired with lockless reads in kcm_rfree() */ +WRITE_ONCE (kcm->rx_wait, false); }requeue_rx_msgs (mux, &kcm->sk.sk_receive_queue);
@@ -1795,7 +1799,8 @@ static void kcm_done(struct kcm_sock *kcm)if (kcm->rx_wait) {list_del (&kcm->wait_rx_list); - kcm->rx_wait = false; +/* paired with lockless reads in kcm_rfree() */ +WRITE_ONCE (kcm->rx_wait, false); }/* Move any pending receive messages to other kcm sockets */ requeue_rx_msgs (mux, &sk->sk_receive_queue);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 185/240 net: fix UAF issue in nfqnl_nf_hook_drop() when ops_init() failed
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit d266935ac43d57586e311a087510fe6a084af742 ]
When the ops_init() interface is invoked to initialize the net, but ops->init() fails, data is released. However, the ptr pointer in net->gen is invalid. In this case, when nfqnl_nf_hook_drop() is invoked to release the net, invalid address access occurs.
The process is as follows:setup_net()
ops_init() data = kzalloc(...) ---> alloc "data" net_assign_generic() ---> assign "date" to ptr in net->gen ... ops->init() ---> failed ... kfree(data); ---> ptr in net->gen is invalid ... ops_exit_list() ... nfqnl_nf_hook_drop() *q = nfnl_queue_pernet(net) ---> q is invalid
The following is the Call Trace information:
BUG: KASAN: use-after-free in nfqnl_nf_hook_drop+0x264/0x280 Read of size 8 at addr ffff88810396b240 by task ip/15855 Call Trace: <TASK> dump_stack_lvl+0x8e/0xd1 print_report+0x155/0x454 kasan_report+0xba/0x1f0 nfqnl_nf_hook_drop+0x264/0x280 nf_queue_nf_hook_drop+0x8b/0x1b0 __nf_unregister_net_hook+0x1ae/0x5a0 nf_unregister_net_hooks+0xde/0x130 ops_exit_list+0xb0/0x170 setup_net+0x7ac/0xbd0 copy_net_ns+0x2e6/0x6b0 create_new_namespaces+0x382/0xa50 unshare_nsproxy_namespaces+0xa6/0x1c0 ksys_unshare+0x3a4/0x7e0 __x64_sys_unshare+0x2d/0x40 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK> Allocated by task 15855: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 __kasan_kmalloc+0xa1/0xb0 __kmalloc+0x49/0xb0 ops_init+0xe7/0x410 setup_net+0x5aa/0xbd0 copy_net_ns+0x2e6/0x6b0 create_new_namespaces+0x382/0xa50 unshare_nsproxy_namespaces+0xa6/0x1c0 ksys_unshare+0x3a4/0x7e0 __x64_sys_unshare+0x2d/0x40 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Freed by task 15855: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x2a/0x40 ____kasan_slab_free+0x155/0x1b0 slab_free_freelist_hook+0x11b/0x220 __kmem_cache_free+0xa4/0x360 ops_init+0xb9/0x410 setup_net+0x5aa/0xbd0 copy_net_ns+0x2e6/0x6b0 create_new_namespaces+0x382/0xa50 unshare_nsproxy_namespaces+0xa6/0x1c0 ksys_unshare+0x3a4/0x7e0 __x64_sys_unshare+0x2d/0x40 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0
--- net/core/net_namespace.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/core/net_namespace.c +7 -0
@@ -117,6 +117,7 @@ static int net_assign_generic(struct net *net, unsigned int id, void *data)static int ops_init (const struct pernet_operations *ops,struct net *net) { +struct net_generic *ng;int err = -ENOMEM ;void *data =NULL ;
@@ -135,7 +136,13 @@ static int ops_init(const struct pernet_operations *ops, struct net *net)if (!err)return 0 ; +if (ops->id && ops->size) { cleanup: + ng =rcu_dereference_protected (net->gen, +lockdep_is_held (&pernet_ops_rwsem)); + ng->ptr[*ops->id] =NULL ; + } +kfree (data); out:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 186/240 net: lantiq_etop: dont free skb when returning NETDEV_TX_BUSY
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
[ Upstream commit 9c1eaa27ec599fcc25ed4970c0b73c247d147a2b ]
The ndo_start_xmit() method must not free skb when returning NETDEV_TX_BUSY, since caller is going to requeue freed skb.
--- drivers/net/ethernet/lantiq_etop.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/lantiq_etop.c +0 -1
@@ -485,7 +485,6 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) len = skb->len <ETH_ZLEN ?ETH_ZLEN : skb->len;if ((desc->ctl & (LTQ_DMA_OWN |LTQ_DMA_C )) || ch->skb[ch->dma.desc]) { -dev_kfree_skb_any (skb);netdev_err (dev,"tx ring full\n" );netif_tx_stop_queue (txq);return NETDEV_TX_BUSY ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 187/240 tcp: fix a signed-integer-overflow bug in tcp_add_backlog()
In reply to Greg Kroah-HartmanFrom: Lu Wei <[email protected]>
[ Upstream commit ec791d8149ff60c40ad2074af3b92a39c916a03f ]
The type of sk_rcvbuf and sk_sndbuf in struct sock is int, and in tcp_add_backlog(), the variable limit is caculated by adding sk_rcvbuf, sk_sndbuf and 64 * 1024, it may exceed the max value of int and overflow. This patch reduces the limit budget by halving the sndbuf to solve this issue since ACK packets are much smaller than the payload.
--- net/ipv4/tcp_ipv4.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv4/tcp_ipv4.c +3 -1
@@ -1853,11 +1853,13 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,__skb_push (skb, hdrlen); no_coalesce: + limit = (u32 )READ_ONCE (sk->sk_rcvbuf) + (u32)(READ_ONCE (sk->sk_sndbuf) >>1 ); +/* Only socket owner can try to collapse/prune rx queues * to reduce memory overhead, so add a little headroom here. * Few sockets backlog are possibly concurrently non empty. */ - limit =READ_ONCE (sk->sk_rcvbuf) +READ_ONCE (sk->sk_sndbuf) +64 *1024 ; + limit +=64 *1024 ;if (unlikely (sk_add_backlog (sk, skb, limit))) {bh_unlock_sock (sk);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 188/240 tcp: fix indefinite deferral of RTO with SACK reneging
In reply to Greg Kroah-HartmanFrom: Neal Cardwell <[email protected]>
[ Upstream commit 3d2af9cce3133b3bc596a9d065c6f9d93419ccfb ]
This commit fixes a bug that can cause a TCP data sender to repeatedly defer RTOs when encountering SACK reneging.
The bug is that when we're in fast recovery in a scenario with SACK reneging, every time we get an ACK we call tcp_check_sack_reneging() and it can note the apparent SACK reneging and rearm the RTO timer for srtt/2 into the future. In some SACK reneging scenarios that can happen repeatedly until the receive window fills up, at which point the sender can't send any more, the ACKs stop arriving, and the RTO fires at srtt/2 after the last ACK. But that can take far too long (O(10 secs)), since the connection is stuck in fast recovery with a low cwnd that cannot grow beyond ssthresh, even if more bandwidth is available.
This fix changes the logic in tcp_check_sack_reneging() to only rearm the RTO timer if data is cumulatively ACKed, indicating forward progress. This avoids this kind of nearly infinite loop of RTO timer re-arming. In addition, this meets the goals of tcp_check_sack_reneging() in handling Windows TCP behavior that looks temporarily like SACK reneging but is not really.
Many thanks to Jakub Kicinski and Neil Spring, who reported this issue and provided critical packet traces that enabled root-causing this issue. Also, many thanks to Jakub Kicinski for testing this fix.
--- net/ipv4/tcp_input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/tcp_input.c +2 -1
@@ -2192,7 +2192,8 @@ void tcp_enter_loss(struct sock *sk)*/ static bool tcp_check_sack_reneging (struct sock *sk,int flag) { -if (flag &FLAG_SACK_RENEGING ) { +if (flag &FLAG_SACK_RENEGING && + flag &FLAG_SND_UNA_ADVANCED ) {struct tcp_sock *tp =tcp_sk (sk);unsigned long delay =max (usecs_to_jiffies (tp->srtt_us >>4 ),msecs_to_jiffies (10 ));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 189/240 net-memcg: avoid stalls when under memory pressure
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 720ca52bcef225b967a339e0fffb6d0c7e962240 ]
As Shakeel explains the commit under Fixes had the unintended side-effect of no longer pre-loading the cached memory allowance. Even tho we previously dropped the first packet received when over memory limit - the consecutive ones would get thru by using the cache. The charging was happening in batches of 128kB, so we'd let in 128kB (truesize) worth of packets per one drop.
After the change we no longer force charge, there will be no cache filling side effects. This causes significant drops and connection stalls for workloads which use a lot of page cache, since we can't reclaim page cache under GFP_NOWAIT.
Some of the latency can be recovered by improving SACK reneg handling but nowhere near enough to get back to the pre-5.15 performance (the application I'm experimenting with still sees 5-10x worst latency).
Apply the suggested workaround of using GFP_ATOMIC. We will now be more permissive than previously as we'll drop _no_ packets in softirq when under pressure. But I can't think of any good and simple way to address that within networking.
--- include/net/sock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/sock.h +1 -1
@@ -2567,7 +2567,7 @@ static inline gfp_t gfp_any(void)static inline gfp_t gfp_memcg_charge (void ) { -return in_softirq () ?GFP_NOWAIT :GFP_KERNEL ; +return in_softirq () ?GFP_ATOMIC :GFP_KERNEL ; }static inline long sock_rcvtimeo (const struct sock *sk,bool noblock)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 190/240 drm/amdkfd: Fix memory leak in kfd_mem_dmamap_userptr()
In reply to Greg Kroah-HartmanFrom: Rafael Mendonca <[email protected]>
[ Upstream commit 90bfee142af0f0e9d3bec80e7acd5f49b230acf7 ]
If the number of pages from the userptr BO differs from the SG BO then the allocated memory for the SG table doesn't get freed before returning -EINVAL, which may lead to a memory leak in some error paths. Fix this by checking the number of pages before allocating memory for the SG table.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +3 -3
@@ -509,13 +509,13 @@ kfd_mem_dmamap_userptr(struct kgd_mem *mem,struct ttm_tt *ttm = bo->tbo.ttm;int ret; +if (WARN_ON (ttm->num_pages != src_ttm->num_pages)) +return -EINVAL ; + ttm->sg =kmalloc (sizeof (*ttm->sg),GFP_KERNEL );if (unlikely (!ttm->sg))return -ENOMEM ; -if (WARN_ON (ttm->num_pages != src_ttm->num_pages)) -return -EINVAL ; -/* Same sequence as in amdgpu_ttm_tt_pin_userptr */ ret = sg_alloc_table_from_pages(ttm->sg, src_ttm->pages, ttm->num_pages, 0,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 191/240 net: lan966x: Stop replacing tx dcbs and dcbs_buf when changing MTU
In reply to Greg Kroah-HartmanFrom: Horatiu Vultur <[email protected]>
[ Upstream commit 4a4b6848d1e932b977e6a00cda393adf7e839ff8 ]
When a frame is sent using FDMA, the skb is mapped and then the mapped address is given to an tx dcb that is different than the last used tx dcb. Once the HW finish with this frame, it would generate an interrupt and then the dcb can be reused and memory can be freed. For each dcb there is an dcb buf that contains some meta-data(is used by PTP, is it free). There is 1 to 1 relationship between dcb and dcb_buf. The following issue was observed. That sometimes after changing the MTU to allocate new tx dcbs and dcbs_buf, two frames were not transmitted. The frames were not transmitted because when reloading the tx dcbs, it was always presuming to use the first dcb but that was not always happening. Because it could be that the last tx dcb used before changing MTU was first dcb and then when it tried to get the next dcb it would take dcb 1 instead of 0. Because it is supposed to take a different dcb than the last used one. This can be fixed simply by changing tx->last_in_use to -1 when the fdma is disabled to reload the new dcb and dcbs_buff.
But there could be a different issue. For example, right after the frame is sent, the MTU is changed. Now all the dcbs and dcbs_buf will be cleared. And now get the interrupt from HW that it finished with the frame. So when we try to clear the skb, it is not possible because we lost all the dcbs_buf.
The solution here is to stop replacing the tx dcbs and dcbs_buf when changing MTU because the TX doesn't care what is the MTU size, it is only the RX that needs this information.
--- .../ethernet/microchip/lan966x/lan966x_fdma.c | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c +3 -21
@@ -309,6 +309,7 @@ static void lan966x_fdma_tx_disable(struct lan966x_tx *tx) lan966x, FDMA_CH_DB_DISCARD); tx->activated = false; + tx->last_in_use =-1 ; }static void lan966x_fdma_tx_reload (struct lan966x_tx *tx)
@@ -687,17 +688,14 @@ static int lan966x_qsys_sw_status(struct lan966x *lan966x)static int lan966x_fdma_reload (struct lan966x *lan966x,int new_mtu) { -void *rx_dcbs, *tx_dcbs, *tx_dcbs_buf; -dma_addr_t rx_dma, tx_dma; +dma_addr_t rx_dma; +void *rx_dcbs;u32 size;int err;/* Store these for later to free them */ rx_dma = lan966x->rx.dma; - tx_dma = lan966x->tx.dma; rx_dcbs = lan966x->rx.dcbs; - tx_dcbs = lan966x->tx.dcbs; - tx_dcbs_buf = lan966x->tx.dcbs_buf;napi_synchronize (&lan966x->napi);napi_disable (&lan966x->napi);
@@ -715,17 +713,6 @@ static int lan966x_fdma_reload(struct lan966x *lan966x, int new_mtu) size =ALIGN (size,PAGE_SIZE );dma_free_coherent (lan966x->dev, size, rx_dcbs, rx_dma); -lan966x_fdma_tx_disable (&lan966x->tx); - err =lan966x_fdma_tx_alloc (&lan966x->tx); -if (err) - goto restore_tx; - - size =sizeof (struct lan966x_tx_dcb ) *FDMA_DCB_MAX ; - size =ALIGN (size,PAGE_SIZE ); -dma_free_coherent (lan966x->dev, size, tx_dcbs, tx_dma); - -kfree (tx_dcbs_buf); -lan966x_fdma_wakeup_netdev (lan966x);napi_enable (&lan966x->napi);
@@ -735,11 +722,6 @@ static int lan966x_fdma_reload(struct lan966x *lan966x, int new_mtu) lan966x->rx.dcbs = rx_dcbs;lan966x_fdma_rx_start (&lan966x->rx); -restore_tx: - lan966x->tx.dma = tx_dma; - lan966x->tx.dcbs = tx_dcbs; - lan966x->tx.dcbs_buf = tx_dcbs_buf; -return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 192/240 mptcp: set msk local address earlier
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit e72e4032637f4646554794ac28a3abecc6c2416d ]
The mptcp_pm_nl_get_local_id() code assumes that the msk local address is available at that point. For passive sockets, we initialize such address at accept() time.
Depending on the running configuration and the user-space timing, a passive MPJ subflow can join the msk socket before accept() completes.
In such case, the PM assigns a wrong local id to the MPJ subflow and later PM netlink operations will end-up touching the wrong/unexpected subflow.
All the above causes sporadic self-tests failures, especially when the host is heavy loaded.
--- net/mptcp/protocol.c | 3 +-- net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-)
net/mptcp/protocol.c +1 -2
@@ -2867,7 +2867,7 @@ static void mptcp_close(struct sock *sk, long timeout)sock_put (sk); } -static void mptcp_copy_inaddrs (struct sock *msk,const struct sock *ssk) +void mptcp_copy_inaddrs (struct sock *msk,const struct sock *ssk) {#if IS_ENABLED (CONFIG_MPTCP_IPV6 )const struct ipv6_pinfo *ssk6 =inet6_sk (ssk);
@@ -3613,7 +3613,6 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,if (mptcp_is_fully_established (newsk))mptcp_pm_fully_established (msk, msk->first,GFP_KERNEL ); -mptcp_copy_inaddrs (newsk, msk->first);mptcp_rcv_space_init (msk, msk->first);mptcp_propagate_sndbuf (newsk, msk->first);
net/mptcp/protocol.h +1 -0
@@ -597,6 +597,7 @@ int mptcp_is_checksum_enabled(const struct net *net);int mptcp_allow_join_id0 (const struct net *net);unsigned int mptcp_stale_loss_cnt (const struct net *net);int mptcp_get_pm_type (const struct net *net); +void mptcp_copy_inaddrs (struct sock *msk,const struct sock *ssk);void mptcp_subflow_fully_established (struct mptcp_subflow_context *subflow,struct mptcp_options_received *mp_opt);bool __mptcp_retransmit_pending_data (struct sock *sk);
net/mptcp/subflow.c +7 -0
@@ -723,6 +723,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, goto dispose_child; } +if (new_msk) +mptcp_copy_inaddrs (new_msk, child);subflow_drop_ctx (child); goto out; }
@@ -750,6 +752,11 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, ctx->conn = new_msk; new_msk =NULL ; +/* set msk addresses early to ensure mptcp_pm_get_local_id() +* uses the correct data +*/ +mptcp_copy_inaddrs (ctx->conn, child); +/* with OoO packets we can reach here without ingress * mpc option */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 193/240 can: mscan: mpc5xxx: mpc5xxx_can_probe(): add missing put_clock() in error path
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 3e5b3418827cefb5e1cc658806f02965791b8f07 ]
The commit 1149108e2fbf ("can: mscan: improve clock API use") only adds put_clock() in mpc5xxx_can_remove() function, forgetting to add put_clock() in the error handling code.
Fix this bug by adding put_clock() in the error handling code.
--- drivers/net/can/mscan/mpc5xxx_can.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/can/mscan/mpc5xxx_can.c +5 -3
@@ -322,14 +322,14 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev) &mscan_clksrc);if (!priv->can.clock.freq) {dev_err (&ofdev->dev,"couldn't get MSCAN clock properties\n" ); - goto exit_free_mscan; + goto exit_put_clock; } err =register_mscandev (dev, mscan_clksrc);if (err) {dev_err (&ofdev->dev,"registering %s failed (err=%d)\n" ,DRV_NAME , err); - goto exit_free_mscan; + goto exit_put_clock; } dev_info(&ofdev->dev, "MSCAN at 0x%p, irq %d, clock %d Hz\n",
@@ -337,7 +337,9 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)return 0 ; -exit_free_mscan: +exit_put_clock: +if (data->put_clock) + data->put_clock (ofdev);free_candev (dev); exit_dispose_irq:irq_dispose_mapping (irq);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 194/240 can: mcp251x: mcp251x_can_probe(): add missing unregister_candev() in error path
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit b1a09b63684cea56774786ca14c13b7041ffee63 ]
In mcp251x_can_probe(), if mcp251x_gpio_setup() fails, it forgets to unregister the CAN device.
Fix this by unregistering can device in mcp251x_can_probe().
--- drivers/net/can/spi/mcp251x.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/can/spi/mcp251x.c +4 -1
@@ -1415,11 +1415,14 @@ static int mcp251x_can_probe(struct spi_device *spi) ret =mcp251x_gpio_setup (priv);if (ret) - goto error_probe; + goto out_unregister_candev;netdev_info (net,"MCP%x successfully initialized.\n" , priv->model);return 0 ; +out_unregister_candev: +unregister_candev (net); + error_probe:destroy_workqueue (priv->wq); priv->wq =NULL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 195/240 PM: hibernate: Allow hybrid sleep to work with s2idle
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
[ Upstream commit 85850af4fc47132f3f2f0dd698b90f67906600b4 ]
Hybrid sleep is currently hardcoded to only operate with S3 even on systems that might not support it.
Instead of assuming this mode is what the user wants to use, for hybrid sleep follow the setting of mem_sleep_current which will respect mem_sleep_default kernel command line and policy decisions made by the presence of the FADT low power idle bit.
--- kernel/power/hibernate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/hibernate.c +1 -1
@@ -641,7 +641,7 @@ static void power_down(void)int error;if (hibernation_mode ==HIBERNATION_SUSPEND ) { - error =suspend_devices_and_enter (PM_SUSPEND_MEM ); + error =suspend_devices_and_enter (mem_sleep_current);if (error) { hibernation_mode = hibernation_ops ? HIBERNATION_PLATFORM :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 196/240 media: vivid: s_fbuf: add more sanity checks
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit f8bcaf714abfc94818dff8c0db84d750433984f4 ]
VIDIOC_S_FBUF is by definition a scary ioctl, which is why only root can use it. But at least check if the framebuffer parameters match that of one of the framebuffer created by vivid, and reject anything else.
--- drivers/media/test-drivers/vivid/vivid-core.c | 22 +++++++++++++++++++ drivers/media/test-drivers/vivid/vivid-core.h | 2 ++ .../media/test-drivers/vivid/vivid-vid-cap.c | 9 +++++++- 3 files changed, 32 insertions(+), 1 deletion(-)
drivers/media/test-drivers/vivid/vivid-core.c +22 -0
@@ -339,6 +339,28 @@ static int vidioc_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *areturn vivid_vid_out_g_fbuf (file, fh, a); } +/* +* Only support the framebuffer of one of the vivid instances. +* Anything else is rejected. +*/ +bool vivid_validate_fb (const struct v4l2_framebuffer *a) +{ +struct vivid_dev *dev; +int i; + +for (i =0 ; i < n_devs; i++) { + dev = vivid_devs[i]; +if (!dev || !dev->video_pbase) +continue ; +if ((unsigned long )a->base == dev->video_pbase && + a->fmt.width <= dev->display_width && + a->fmt.height <= dev->display_height && + a->fmt.bytesperline <= dev->display_byte_stride) +return true; + } +return false; +} +static int vidioc_s_fbuf (struct file *file,void *fh,const struct v4l2_framebuffer *a) {struct video_device *vdev =video_devdata (file);
drivers/media/test-drivers/vivid/vivid-core.h +2 -0
@@ -610,4 +610,6 @@ static inline bool vivid_is_hdmi_out(const struct vivid_dev *dev) return dev->output_type[dev->output] == HDMI; } +bool vivid_validate_fb (const struct v4l2_framebuffer *a); +#endif
drivers/media/test-drivers/vivid/vivid-vid-cap.c +8 -1
@@ -1272,7 +1272,14 @@ int vivid_vid_cap_s_fbuf(struct file *file, void *fh,return -EINVAL ;if (a->fmt.bytesperline < (a->fmt.width * fmt->bit_depth[0 ]) /8 )return -EINVAL ; -if (a->fmt.height * a->fmt.bytesperline < a->fmt.sizeimage) +if (a->fmt.bytesperline > a->fmt.sizeimage / a->fmt.height) +return -EINVAL ; + +/* +* Only support the framebuffer of one of the vivid instances. +* Anything else is rejected. +*/ +if (!vivid_validate_fb (a))return -EINVAL ; dev->fb_vbase_cap =phys_to_virt ((unsigned long )a->base);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 197/240 media: vivid: dev->bitmap_cap wasnt freed in all cases
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 1f65ea411cc7b6ff128d82a3493d7b5648054e6f ]
Whenever the compose width/height values change, the dev->bitmap_cap vmalloc'ed array must be freed and dev->bitmap_cap set to NULL.
This was done in some places, but not all. This is only an issue if overlay support is enabled and the bitmap clipping is used.
--- .../media/test-drivers/vivid/vivid-vid-cap.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/media/test-drivers/vivid/vivid-vid-cap.c +13 -5
@@ -452,6 +452,12 @@ void vivid_update_format_cap(struct vivid_dev *dev, bool keep_controls)tpg_reset_source (&dev->tpg, dev->src_rect.width, dev->src_rect.height, dev->field_cap); dev->crop_cap = dev->src_rect; dev->crop_bounds_cap = dev->src_rect; +if (dev->bitmap_cap && + (dev->compose_cap.width != dev->crop_cap.width || + dev->compose_cap.height != dev->crop_cap.height)) { +vfree (dev->bitmap_cap); + dev->bitmap_cap =NULL ; + } dev->compose_cap = dev->crop_cap;if (V4L2_FIELD_HAS_T_OR_B (dev->field_cap)) dev->compose_cap.height /=2 ;
@@ -909,6 +915,8 @@ int vivid_vid_cap_s_selection(struct file *file, void *fh, struct v4l2_selectionstruct vivid_dev *dev =video_drvdata (file);struct v4l2_rect *crop = &dev->crop_cap;struct v4l2_rect *compose = &dev->compose_cap; +unsigned orig_compose_w = compose->width; +unsigned orig_compose_h = compose->height;unsigned factor =V4L2_FIELD_HAS_T_OR_B (dev->field_cap) ?2 :1 ;int ret;
@@ -1025,17 +1033,17 @@ int vivid_vid_cap_s_selection(struct file *file, void *fh, struct v4l2_selection s->r.height /= factor; }v4l2_rect_map_inside (&s->r, &dev->fmt_cap_rect); -if (dev->bitmap_cap && (compose->width != s->r.width || - compose->height != s->r.height)) { -vfree (dev->bitmap_cap); - dev->bitmap_cap =NULL ; - } *compose = s->r;break ;default :return -EINVAL ; } +if (dev->bitmap_cap && (compose->width != orig_compose_w || + compose->height != orig_compose_h)) { +vfree (dev->bitmap_cap); + dev->bitmap_cap =NULL ; + }tpg_s_crop_compose (&dev->tpg, crop, compose);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 198/240 media: v4l2-dv-timings: add sanity checks for blanking values
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 4b6d66a45ed34a15721cb9e11492fa1a24bc83df ]
Add sanity checks to v4l2_valid_dv_timings() to ensure that the provided blanking values are reasonable.
--- drivers/media/v4l2-core/v4l2-dv-timings.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/media/v4l2-core/v4l2-dv-timings.c +14 -0
@@ -161,6 +161,20 @@ bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t, (bt->interlaced && !(caps &V4L2_DV_BT_CAP_INTERLACED )) || (!bt->interlaced && !(caps & V4L2_DV_BT_CAP_PROGRESSIVE))) return false; + +/* sanity checks for the blanking timings */ +if (!bt->interlaced && + (bt->il_vbackporch || bt->il_vsync || bt->il_vfrontporch)) +return false; +if (bt->hfrontporch >2 * bt->width || + bt->hsync >1024 || bt->hbackporch >1024 ) +return false; +if (bt->vfrontporch >4096 || + bt->vsync >128 || bt->vbackporch >4096 ) +return false; +if (bt->interlaced && (bt->il_vfrontporch >4096 || + bt->il_vsync >128 || bt->il_vbackporch >4096 )) +return false;return fnc ==NULL ||fnc (t, fnc_handle); }EXPORT_SYMBOL_GPL (v4l2_valid_dv_timings);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 199/240 media: videodev2.h: V4L2_DV_BT_BLANKING_HEIGHT should check interlaced
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 8da7f0976b9071b528c545008de9d10cc81883b1 ]
If it is a progressive (non-interlaced) format, then ignore the interlaced timing values.
--- include/uapi/linux/videodev2.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/uapi/linux/videodev2.h +2 -1
@@ -1602,7 +1602,8 @@ struct v4l2_bt_timings { ((bt)->width + V4L2_DV_BT_BLANKING_WIDTH(bt))#define V4L2_DV_BT_BLANKING_HEIGHT (bt) \ ((bt)->vfrontporch + (bt)->vsync + (bt)->vbackporch + \ - (bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch) + ((bt)->interlaced ? \ + ((bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch) : 0))#define V4L2_DV_BT_FRAME_HEIGHT (bt) \ ((bt)->height + V4L2_DV_BT_BLANKING_HEIGHT(bt))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 200/240 media: vivid: set num_in/outputs to 0 if not supported
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 69d78a80da4ef12faf2a6f9cfa2097ab4ac43983 ]
If node_types does not have video/vbi/meta inputs or outputs, then set num_inputs/num_outputs to 0 instead of 1.
--- drivers/media/test-drivers/vivid/vivid-core.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/media/test-drivers/vivid/vivid-core.c +12 -4
@@ -942,8 +942,12 @@ static int vivid_detect_feature_set(struct vivid_dev *dev, int inst,/* how many inputs do we have and of what type? */ dev->num_inputs = num_inputs[inst]; -if (dev->num_inputs <1 ) - dev->num_inputs =1 ; +if (node_type &0x20007 ) { +if (dev->num_inputs <1 ) + dev->num_inputs =1 ; + }else { + dev->num_inputs =0 ; + }if (dev->num_inputs >=MAX_INPUTS ) dev->num_inputs =MAX_INPUTS ;for (i =0 ; i < dev->num_inputs; i++) {
@@ -960,8 +964,12 @@ static int vivid_detect_feature_set(struct vivid_dev *dev, int inst,/* how many outputs do we have and of what type? */ dev->num_outputs = num_outputs[inst]; -if (dev->num_outputs <1 ) - dev->num_outputs =1 ; +if (node_type &0x40300 ) { +if (dev->num_outputs <1 ) + dev->num_outputs =1 ; + }else { + dev->num_outputs =0 ; + }if (dev->num_outputs >=MAX_OUTPUTS ) dev->num_outputs =MAX_OUTPUTS ;for (i =0 ; i < dev->num_outputs; i++) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 201/240 perf vendor events power10: Fix hv-24x7 metric events
In reply to Greg Kroah-HartmanFrom: Kajol Jain <[email protected]>
[ Upstream commit b92dd11725a7c57f55e148c7d3ce58a86f480575 ]
Testcase stat_all_metrics.sh fails in powerpc:
90: perf all metrics test : FAILED!
The testcase "stat_all_metrics.sh" verifies perf stat result for all the metric events present in perf list. It runs perf metric events with various commands and expects non-empty metric result.
Incase of powerpc:hv-24x7 events, some of the event count can be 0 based on system configuration. And if that event used as denominator in divide equation, it can cause divide by 0 error. The current nest_metric.json file creating divide by 0 issue for some of the metric events, which results in failure of the "stat_all_metrics.sh" test case.
Most of the metrics events have cycles or an event which expect to have a larger value as denominator, so adding 1 to the denominator of the metric expression as a fix.
Result in powerpc box after this patch changes:
90: perf all metrics test : Ok
--- .../arch/powerpc/power10/nest_metrics.json | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-)
tools/perf/pmu-events/arch/powerpc/power10/nest_metrics.json +36 -36
@@ -1,13 +1,13 @@ [ { "MetricName": "VEC_GROUP_PUMP_RETRY_RATIO_P01", - "MetricExpr": "(hv_24x7@PM_PB_RTY_VG_PUMP01\\,chip\\=?@ / hv_24x7@PM_PB_VG_PUMP01\\,chip\\=?@) * 100", + "MetricExpr": "(hv_24x7@PM_PB_RTY_VG_PUMP01\\,chip\\=?@ / (1 + hv_24x7@PM_PB_VG_PUMP01\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "VEC_GROUP_PUMP_RETRY_RATIO_P23", - "MetricExpr": "(hv_24x7@PM_PB_RTY_VG_PUMP23\\,chip\\=?@ / hv_24x7@PM_PB_VG_PUMP23\\,chip\\=?@) * 100", + "MetricExpr": "(hv_24x7@PM_PB_RTY_VG_PUMP23\\,chip\\=?@ / (1 + hv_24x7@PM_PB_VG_PUMP23\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" },
@@ -61,13 +61,13 @@ }, { "MetricName": "REMOTE_NODE_PUMPS_RETRIES_RATIO_P01", - "MetricExpr": "(hv_24x7@PM_PB_RTY_RNS_PUMP01\\,chip\\=?@ / hv_24x7@PM_PB_RNS_PUMP01\\,chip\\=?@) * 100", + "MetricExpr": "(hv_24x7@PM_PB_RTY_RNS_PUMP01\\,chip\\=?@ / (1 + hv_24x7@PM_PB_RNS_PUMP01\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "REMOTE_NODE_PUMPS_RETRIES_RATIO_P23", - "MetricExpr": "(hv_24x7@PM_PB_RTY_RNS_PUMP23\\,chip\\=?@ / hv_24x7@PM_PB_RNS_PUMP23\\,chip\\=?@) * 100", + "MetricExpr": "(hv_24x7@PM_PB_RTY_RNS_PUMP23\\,chip\\=?@ / (1 + hv_24x7@PM_PB_RNS_PUMP23\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" },
@@ -151,193 +151,193 @@ }, { "MetricName": "XLINK0_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK0_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK0_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_XLINK0_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK0_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK0_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK0_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK0_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK0_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK1_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK1_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK1_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_XLINK1_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK1_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK1_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK1_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK1_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK1_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK2_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK2_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK2_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_XLINK2_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK2_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK2_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK2_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK2_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK2_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK3_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK3_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK3_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_XLINK3_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK3_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK3_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK3_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK3_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK3_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK4_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK4_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK4_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_XLINK4_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK4_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK4_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK4_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK4_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK4_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK5_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK5_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK5_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_XLINK5_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK5_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK5_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK5_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK5_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK5_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK6_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK6_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK6_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_XLINK6_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK6_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK6_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK6_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK6_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK6_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK7_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK7_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK7_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_XLINK7_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK7_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK7_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_XLINK7_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK7_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK7_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK0_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK0_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK0_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_XLINK0_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK0_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK0_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK0_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK0_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK0_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK1_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK1_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK1_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_XLINK1_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK1_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK1_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK1_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK1_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK1_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK2_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK2_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK2_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_XLINK2_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK2_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK2_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK2_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK2_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK2_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK3_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK3_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK3_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_XLINK3_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK3_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK3_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK3_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK3_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK3_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK4_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK4_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK4_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_XLINK4_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK4_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK4_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK4_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK4_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK4_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK5_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK5_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK5_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_XLINK5_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK5_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK5_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK5_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK5_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK5_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK6_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK6_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK6_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_XLINK6_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK6_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK6_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK6_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK6_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK6_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "XLINK7_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_XLINK7_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK7_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_XLINK7_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK7_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_XLINK7_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_XLINK7_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_XLINK7_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_XLINK7_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK0_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK0_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK0_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_ALINK0_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK0_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK0_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK0_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK0_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK0_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK1_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK1_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK1_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_ALINK1_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK1_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK1_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK1_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK1_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK1_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK2_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK2_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK2_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_ALINK2_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK2_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK2_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK2_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK2_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK2_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK3_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK3_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK3_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_ALINK3_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK3_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK3_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK3_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK3_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK3_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK4_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK4_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK4_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_ALINK4_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK4_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK4_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK4_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK4_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK4_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK5_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK5_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK5_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_ALINK5_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK5_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK5_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK5_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK5_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK5_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK6_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK6_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK6_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_ALINK6_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK6_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK6_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK6_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK6_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK6_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK7_OUT_TOTAL_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK7_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK7_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (hv_24x7@PM_ALINK7_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK7_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK7_OUT_ODD_TOTAL_UTIL\\,chip\\=?@ + hv_24x7@PM_ALINK7_OUT_EVEN_TOTAL_UTIL\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK7_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK7_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK0_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK0_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK0_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_ALINK0_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK0_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK0_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK0_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK0_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK0_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK1_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK1_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK1_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_ALINK1_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK1_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK1_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK1_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK1_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK1_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK2_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK2_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK2_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_ALINK2_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK2_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK2_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK2_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK2_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK2_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK3_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK3_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK3_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_ALINK3_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK3_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK3_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK3_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK3_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK3_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK4_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK4_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK4_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_ALINK4_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK4_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK4_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK4_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK4_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK4_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK5_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK5_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK5_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_ALINK5_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK5_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK5_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK5_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK5_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK5_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK6_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK6_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK6_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_ALINK6_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK6_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK6_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK6_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK6_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK6_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" }, { "MetricName": "ALINK7_OUT_DATA_UTILIZATION", - "MetricExpr": "((hv_24x7@PM_ALINK7_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK7_OUT_EVEN_DATA\\,chip\\=?@) / (hv_24x7@PM_ALINK7_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK7_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", + "MetricExpr": "((hv_24x7@PM_ALINK7_OUT_ODD_DATA\\,chip\\=?@ + hv_24x7@PM_ALINK7_OUT_EVEN_DATA\\,chip\\=?@) / (1 + hv_24x7@PM_ALINK7_OUT_ODD_AVLBL_CYCLES\\,chip\\=?@ + hv_24x7@PM_ALINK7_OUT_EVEN_AVLBL_CYCLES\\,chip\\=?@)) * 100", "ScaleUnit": "1.063%", "AggregationMode": "PerChip" },
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 202/240 perf list: Fix PMU name pai_crypto in perf list on s390
In reply to Greg Kroah-HartmanFrom: Thomas Richter <[email protected]>
[ Upstream commit 5a6c184a72a375072cffe788d93ad6052c48f16b ]
Commit e0b23af82d6f454c ("perf list: Add PMU pai_crypto event description for IBM z16") introduced the "Processor Activity Instrumentation" for cryptographic counters for z16. The PMU device driver exports the counters via sysfs files listed in directory /sys/devices/pai_crypto.
To specify an event from that PMU, use 'perf stat -e pai_crypto/XXX/'.
However the JSON file mentioned in above commit exports the counter decriptions in file pmu-events/arch/s390/cf_z16/pai.json. Rename this file to pmu-events/arch/s390/cf_z16/pai_crypto.json to make the naming consistent.
Now 'perf list' shows the counter names under pai_crypto section:
pai_crypto:
CRYPTO_ALL
[CRYPTO ALL. Unit: pai_crypto]
...
Output before was
pai:
CRYPTO_ALL
[CRYPTO ALL. Unit: pai_crypto]
...
---
.../pmu-events/arch/s390/cf_z16/{pai.json => pai_crypto.json} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename tools/perf/pmu-events/arch/s390/cf_z16/{pai.json => pai_crypto.json} (100%)tools/perf/pmu-events/arch/s390/cf_z16/pai_crypto.json renamed from tools/perf/pmu-events/arch/s390/cf_z16/pai.json +0 -0
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 203/240 ipv6: ensure sane device mtu in tunnels
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit d89d7ff01235f218dad37de84457717f699dee79 ]
Another syzbot report [1] with no reproducer hints at a bug in ip6_gre tunnel (dev:ip6gretap0)
Since ipv6 mcast code makes sure to read dev->mtu once and applies a sanity check on it (see commit b9b312a7a451 "ipv6: mcast: better catch silly mtu values"), a remaining possibility is that a layer is able to set dev->mtu to an underflowed value (high order bit set).
This could happen indeed in ip6gre_tnl_link_config_route(), ip6_tnl_link_config() and ipip6_tunnel_bind_dev()
Make sure to sanitize mtu value in a local variable before it is written once on dev->mtu, as lockless readers could catch wrong temporary value.
[1]
skbuff: skb_over_panic: text:ffff80000b7a2f38 len:40 put:40 head:ffff000149dcf200 data:ffff000149dcf2b0 tail:0xd8 end:0xc0 dev:ip6gretap0
------------[ cut here ]------------ kernel BUG at net/core/skbuff.c:120 Internal error: Oops - BUG: 00000000f2000800 [#1] PREEMPT SMP Modules linked in: CPU: 1 PID: 10241 Comm: kworker/1:1 Not tainted 6.0.0-rc7-syzkaller-18095-gbbed346d5a96 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/30/2022 Workqueue: mld mld_ifc_work pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : skb_panic+0x4c/0x50 net/core/skbuff.c:116 lr : skb_panic+0x4c/0x50 net/core/skbuff.c:116
sp : ffff800020dd3b60
x29: ffff800020dd3b70 x28: 0000000000000000 x27: ffff00010df2a800
x26: 00000000000000c0 x25: 00000000000000b0 x24: ffff000149dcf200
x23: 00000000000000c0 x22: 00000000000000d8 x21: ffff80000b7a2f38
x20: ffff00014c2f7800 x19: 0000000000000028 x18: 00000000000001a9
x17: 0000000000000000 x16: ffff80000db49158 x15: ffff000113bf1a80
x14: 0000000000000000 x13: 00000000ffffffff x12: ffff000113bf1a80
x11: ff808000081c0d5c x10: 0000000000000000 x9 : 73f125dc5c63ba00 x8 : 73f125dc5c63ba00 x7 : ffff800008161d1c x6 : 0000000000000000 x5 : 0000000000000080 x4 : 0000000000000001 x3 : 0000000000000000 x2 : ffff0001fefddcd0 x1 : 0000000100000000 x0 : 0000000000000089
Call trace: skb_panic+0x4c/0x50 net/core/skbuff.c:116 skb_over_panic net/core/skbuff.c:125 [inline] skb_put+0xd4/0xdc net/core/skbuff.c:2049 ip6_mc_hdr net/ipv6/mcast.c:1714 [inline] mld_newpack+0x14c/0x270 net/ipv6/mcast.c:1765 add_grhead net/ipv6/mcast.c:1851 [inline] add_grec+0xa20/0xae0 net/ipv6/mcast.c:1989 mld_send_cr+0x438/0x5a8 net/ipv6/mcast.c:2115 mld_ifc_work+0x38/0x290 net/ipv6/mcast.c:2653 process_one_work+0x2d8/0x504 kernel/workqueue.c:2289 worker_thread+0x340/0x610 kernel/workqueue.c:2436 kthread+0x12c/0x158 kernel/kthread.c:376 ret_from_fork+0x10/0x20 arch/arm64/kernel/entry.S:860 Code: 91011400 aa0803e1 a90027ea 94373093 (d4210000)
--- net/ipv6/ip6_gre.c | 12 +++++++----- net/ipv6/ip6_tunnel.c | 11 ++++++----- net/ipv6/sit.c | 8 +++++--- 3 files changed, 18 insertions(+), 13 deletions(-)
net/ipv6/ip6_gre.c +7 -5
@@ -1175,14 +1175,16 @@ static void ip6gre_tnl_link_config_route(struct ip6_tnl *t, int set_mtu, dev->needed_headroom = dst_len;if (set_mtu) { - dev->mtu = rt->dst.dev->mtu - t_hlen; +int mtu = rt->dst.dev->mtu - t_hlen; +if (!(t->parms.flags &IP6_TNL_F_IGN_ENCAP_LIMIT )) - dev->mtu -=8 ; + mtu -=8 ;if (dev->type ==ARPHRD_ETHER ) - dev->mtu -=ETH_HLEN ; + mtu -=ETH_HLEN ; -if (dev->mtu <IPV6_MIN_MTU ) - dev->mtu =IPV6_MIN_MTU ; +if (mtu <IPV6_MIN_MTU ) + mtu =IPV6_MIN_MTU ; +WRITE_ONCE (dev->mtu, mtu); } }ip6_rt_put (rt);
net/ipv6/ip6_tunnel.c +6 -5
@@ -1450,8 +1450,8 @@ static void ip6_tnl_link_config(struct ip6_tnl *t)struct net_device *tdev =NULL ;struct __ip6_tnl_parm *p = &t->parms;struct flowi6 *fl6 = &t->fl.u.ip6; -unsigned int mtu;int t_hlen; +int mtu;__dev_addr_set (dev, &p->laddr,sizeof (struct in6_addr ));memcpy (dev->broadcast, &p->raddr,sizeof (struct in6_addr ));
@@ -1498,12 +1498,13 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) dev->hard_header_len = tdev->hard_header_len + t_hlen; mtu = min_t(unsigned int, tdev->mtu, IP6_MAX_MTU); - dev->mtu = mtu - t_hlen; + mtu = mtu - t_hlen;if (!(t->parms.flags &IP6_TNL_F_IGN_ENCAP_LIMIT )) - dev->mtu -=8 ; + mtu -=8 ; -if (dev->mtu <IPV6_MIN_MTU ) - dev->mtu =IPV6_MIN_MTU ; +if (mtu <IPV6_MIN_MTU ) + mtu =IPV6_MIN_MTU ; +WRITE_ONCE (dev->mtu, mtu); } } }
net/ipv6/sit.c +5 -3
@@ -1124,10 +1124,12 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev)if (tdev && !netif_is_l3_master (tdev)) {int t_hlen = tunnel->hlen +sizeof (struct iphdr ); +int mtu; - dev->mtu = tdev->mtu - t_hlen; -if (dev->mtu <IPV6_MIN_MTU ) - dev->mtu =IPV6_MIN_MTU ; + mtu = tdev->mtu - t_hlen; +if (mtu <IPV6_MIN_MTU ) + mtu =IPV6_MIN_MTU ; +WRITE_ONCE (dev->mtu, mtu); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 204/240 i40e: Fix ethtool rx-flow-hash setting for X722
In reply to Greg Kroah-HartmanFrom: Slawomir Laba <[email protected]>
[ Upstream commit 54b5af5a438076082d482cab105b1bd484ab5074 ]
When enabling flow type for RSS hash via ethtool:
ethtool -N $pf rx-flow-hash tcp4|tcp6|udp4|udp6 s|d
the driver would fail to setup this setting on X722 device since it was using the mask on the register dedicated for X710 devices.
Apply a different mask on the register when setting the RSS hash for the X722 device.
When displaying the flow types enabled via ethtool:
ethtool -n $pf rx-flow-hash tcp4|tcp6|udp4|udp6
the driver would print wrong values for X722 device.
Fix this issue by testing masks for X722 device in i40e_get_rss_hash_opts function.
--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 31 ++++++++++++++----- drivers/net/ethernet/intel/i40e/i40e_type.h | 4 +++ 2 files changed, 27 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +23 -8
@@ -3185,10 +3185,17 @@ static int i40e_get_rss_hash_opts(struct i40e_pf *pf, struct ethtool_rxnfc *cmd)if (cmd->flow_type ==TCP_V4_FLOW || cmd->flow_type ==UDP_V4_FLOW ) { -if (i_set &I40E_L3_SRC_MASK ) - cmd->data |=RXH_IP_SRC ; -if (i_set &I40E_L3_DST_MASK ) - cmd->data |=RXH_IP_DST ; +if (hw->mac.type ==I40E_MAC_X722 ) { +if (i_set &I40E_X722_L3_SRC_MASK ) + cmd->data |=RXH_IP_SRC ; +if (i_set &I40E_X722_L3_DST_MASK ) + cmd->data |=RXH_IP_DST ; + }else { +if (i_set &I40E_L3_SRC_MASK ) + cmd->data |=RXH_IP_SRC ; +if (i_set &I40E_L3_DST_MASK ) + cmd->data |=RXH_IP_DST ; + } }else if (cmd->flow_type ==TCP_V6_FLOW || cmd->flow_type ==UDP_V6_FLOW ) {if (i_set &I40E_L3_V6_SRC_MASK )
@@ -3546,12 +3553,15 @@ static int i40e_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,/** * i40e_get_rss_hash_bits - Read RSS Hash bits from register +* @hw: hw structure * @nfc: pointer to user request * @i_setc: bits currently set * * Returns value of bits to be set per user request **/ -static u64 i40e_get_rss_hash_bits (struct ethtool_rxnfc *nfc,u64 i_setc) +static u64 i40e_get_rss_hash_bits (struct i40e_hw *hw, +struct ethtool_rxnfc *nfc, +u64 i_setc) {u64 i_set = i_setc;u64 src_l3 =0 , dst_l3 =0 ;
@@ -3570,8 +3580,13 @@ static u64 i40e_get_rss_hash_bits(struct ethtool_rxnfc *nfc, u64 i_setc) dst_l3 =I40E_L3_V6_DST_MASK ; }else if (nfc->flow_type ==TCP_V4_FLOW || nfc->flow_type ==UDP_V4_FLOW ) { - src_l3 =I40E_L3_SRC_MASK ; - dst_l3 =I40E_L3_DST_MASK ; +if (hw->mac.type ==I40E_MAC_X722 ) { + src_l3 =I40E_X722_L3_SRC_MASK ; + dst_l3 =I40E_X722_L3_DST_MASK ; + }else { + src_l3 =I40E_L3_SRC_MASK ; + dst_l3 =I40E_L3_DST_MASK ; + } }else {/* Any other flow type are not supported here */ return i_set;
@@ -3686,7 +3701,7 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc) flow_pctype)) | ((u64 )i40e_read_rx_ctl (hw,I40E_GLQF_HASH_INSET (1 , flow_pctype)) <<32 ); - i_set =i40e_get_rss_hash_bits (nfc, i_setc); + i_set =i40e_get_rss_hash_bits (&pf->hw, nfc, i_setc);i40e_write_rx_ctl (hw,I40E_GLQF_HASH_INSET (0 , flow_pctype), (u32 )i_set); i40e_write_rx_ctl(hw, I40E_GLQF_HASH_INSET(1, flow_pctype),
drivers/net/ethernet/intel/i40e/i40e_type.h +4 -0
@@ -1404,6 +1404,10 @@ struct i40e_lldp_variables {#define I40E_PFQF_CTL_0_HASHLUTSIZE_512 0x00010000/* INPUT SET MASK for RSS, flow director, and flexible payload */ +#define I40E_X722_L3_SRC_SHIFT 49 +#define I40E_X722_L3_SRC_MASK (0x3ULL << I40E_X722_L3_SRC_SHIFT) +#define I40E_X722_L3_DST_SHIFT 41 +#define I40E_X722_L3_DST_MASK (0x3ULL << I40E_X722_L3_DST_SHIFT)#define I40E_L3_SRC_SHIFT 47#define I40E_L3_SRC_MASK (0x3ULL << I40E_L3_SRC_SHIFT)#define I40E_L3_V6_SRC_SHIFT 43
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 205/240 i40e: Fix VF hang when reset is triggered on another VF
In reply to Greg Kroah-HartmanFrom: Sylwester Dziedziuch <[email protected]>
[ Upstream commit 52424f974bc53c26ba3f00300a00e9de9afcd972 ]
When a reset was triggered on one VF with i40e_reset_vf global PF state __I40E_VF_DISABLE was set on a PF until the reset finished. If immediately after triggering reset on one VF there is a request to reset on another it will cause a hang on VF side because VF will be notified of incoming reset but the reset will never happen because of this global state, we will get such error message:
[ +4.890195] iavf 0000:86:02.1: Never saw reset
and VF will hang waiting for the reset to be triggered.
Fix this by introducing new VF state I40E_VF_STATE_RESETTING that will be set on a VF if it is currently resetting instead of the global __I40E_VF_DISABLE PF state.
--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 43 ++++++++++++++----- .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + 2 files changed, 33 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +32 -11
@@ -1536,10 +1536,12 @@ bool i40e_reset_vf(struct i40e_vf *vf, bool flr)if (test_bit (__I40E_VF_RESETS_DISABLED, pf->state))return true; -/* If the VFs have been disabled, this means something else is -* resetting the VF, so we shouldn't continue. -*/ -if (test_and_set_bit (__I40E_VF_DISABLE, pf->state)) +/* Bail out if VFs are disabled. */ +if (test_bit (__I40E_VF_DISABLE, pf->state)) +return true; + +/* If VF is being reset already we don't need to continue. */ +if (test_and_set_bit (I40E_VF_STATE_RESETTING , &vf->vf_states))return true;i40e_trigger_vf_reset (vf, flr);
@@ -1576,7 +1578,7 @@ bool i40e_reset_vf(struct i40e_vf *vf, bool flr)i40e_cleanup_reset_vf (vf);i40e_flush (hw); -clear_bit (__I40E_VF_DISABLE, pf->state); +clear_bit (I40E_VF_STATE_RESETTING , &vf->vf_states);return true; }
@@ -1609,8 +1611,12 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr)return false;/* Begin reset on all VFs at once */ -for (v =0 ; v < pf->num_alloc_vfs; v++) -i40e_trigger_vf_reset (&pf->vf[v], flr); +for (v =0 ; v < pf->num_alloc_vfs; v++) { + vf = &pf->vf[v]; +/* If VF is being reset no need to trigger reset again */ +if (!test_bit (I40E_VF_STATE_RESETTING , &vf->vf_states)) +i40e_trigger_vf_reset (&pf->vf[v], flr); + }/* HW requires some time to make sure it can flush the FIFO for a VF * when it resets it. Poll the VPGEN_VFRSTAT register for each VF in
@@ -1626,9 +1632,11 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr)*/ while (v < pf->num_alloc_vfs) { vf = &pf->vf[v]; - reg =rd32 (hw,I40E_VPGEN_VFRSTAT (vf->vf_id)); -if (!(reg &I40E_VPGEN_VFRSTAT_VFRD_MASK )) -break ; +if (!test_bit (I40E_VF_STATE_RESETTING , &vf->vf_states)) { + reg =rd32 (hw,I40E_VPGEN_VFRSTAT (vf->vf_id)); +if (!(reg &I40E_VPGEN_VFRSTAT_VFRD_MASK )) +break ; + }/* If the current VF has finished resetting, move on * to the next VF in sequence.
@@ -1656,6 +1664,10 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr)if (pf->vf[v].lan_vsi_idx ==0 )continue ; +/* If VF is reset in another thread just continue */ +if (test_bit (I40E_VF_STATE_RESETTING , &vf->vf_states)) +continue ; +i40e_vsi_stop_rings_no_wait (pf->vsi[pf->vf[v].lan_vsi_idx]); }
@@ -1667,6 +1679,10 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr)if (pf->vf[v].lan_vsi_idx ==0 )continue ; +/* If VF is reset in another thread just continue */ +if (test_bit (I40E_VF_STATE_RESETTING , &vf->vf_states)) +continue ; +i40e_vsi_wait_queues_disabled (pf->vsi[pf->vf[v].lan_vsi_idx]); }
@@ -1676,8 +1692,13 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr)mdelay (50 );/* Finish the reset on each VF */ -for (v =0 ; v < pf->num_alloc_vfs; v++) +for (v =0 ; v < pf->num_alloc_vfs; v++) { +/* If VF is reset in another thread just continue */ +if (test_bit (I40E_VF_STATE_RESETTING , &vf->vf_states)) +continue ; +i40e_cleanup_reset_vf (&pf->vf[v]); + }i40e_flush (hw);clear_bit (__I40E_VF_DISABLE, pf->state);
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +1 -0
@@ -39,6 +39,7 @@ enum i40e_vf_states {I40E_VF_STATE_MC_PROMISC ,I40E_VF_STATE_UC_PROMISC ,I40E_VF_STATE_PRE_ENABLE , + I40E_VF_STATE_RESETTING };/* VF capabilities */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 206/240 i40e: Fix flow-type by setting GL_HASH_INSET registers
In reply to Greg Kroah-HartmanFrom: Slawomir Laba <[email protected]>
[ Upstream commit 3b32c9932853e11d71f9db012d69e92e4669ba23 ]
Fix setting bits for specific flow_type for GLQF_HASH_INSET register. In previous version all of the bits were set only in hena register, while in inset only one bit was set. In order for this working correctly on all types of cards these bits needs to be set correctly for both hena and inset registers.
--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 71 ++++++++++--------- 1 file changed, 38 insertions(+), 33 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +38 -33
@@ -3604,6 +3604,7 @@ static u64 i40e_get_rss_hash_bits(struct i40e_hw *hw,return i_set; } +#define FLOW_PCTYPES_SIZE 64/** * i40e_set_rss_hash_opt - Enable/Disable flow types for RSS hash * @pf: pointer to the physical function struct
@@ -3616,9 +3617,11 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)struct i40e_hw *hw = &pf->hw;u64 hena = (u64 )i40e_read_rx_ctl (hw,I40E_PFQF_HENA (0 )) | ((u64 )i40e_read_rx_ctl (hw,I40E_PFQF_HENA (1 )) <<32 ); -u8 flow_pctype =0 ; +DECLARE_BITMAP (flow_pctypes,FLOW_PCTYPES_SIZE );u64 i_set, i_setc; +bitmap_zero (flow_pctypes,FLOW_PCTYPES_SIZE ); +if (pf->flags &I40E_FLAG_MFP_ENABLED ) {dev_err (&pf->pdev->dev,"Change of RSS hash input set is not supported when MFP mode is enabled\n" );
@@ -3634,36 +3637,35 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)switch (nfc->flow_type) {case TCP_V4_FLOW : - flow_pctype =I40E_FILTER_PCTYPE_NONF_IPV4_TCP ; +set_bit (I40E_FILTER_PCTYPE_NONF_IPV4_TCP , flow_pctypes);if (pf->hw_features &I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE ) - hena |= -BIT_ULL (I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK ); +set_bit (I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK , + flow_pctypes);break ;case TCP_V6_FLOW : - flow_pctype =I40E_FILTER_PCTYPE_NONF_IPV6_TCP ; -if (pf->hw_features &I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE ) - hena |= -BIT_ULL (I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK ); +set_bit (I40E_FILTER_PCTYPE_NONF_IPV6_TCP , flow_pctypes);if (pf->hw_features &I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE ) - hena |= -BIT_ULL (I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK ); +set_bit (I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK , + flow_pctypes);break ;case UDP_V4_FLOW : - flow_pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; -if (pf->hw_features &I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE ) - hena |= -BIT_ULL (I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP ) | -BIT_ULL (I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP ); - +set_bit (I40E_FILTER_PCTYPE_NONF_IPV4_UDP , flow_pctypes); +if (pf->hw_features &I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE ) { +set_bit (I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP , + flow_pctypes); +set_bit (I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP , + flow_pctypes); + } hena |=BIT_ULL (I40E_FILTER_PCTYPE_FRAG_IPV4 );break ;case UDP_V6_FLOW : - flow_pctype =I40E_FILTER_PCTYPE_NONF_IPV6_UDP ; -if (pf->hw_features &I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE ) - hena |= -BIT_ULL (I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP ) | -BIT_ULL (I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP ); - +set_bit (I40E_FILTER_PCTYPE_NONF_IPV6_UDP , flow_pctypes); +if (pf->hw_features &I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE ) { +set_bit (I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP , + flow_pctypes); +set_bit (I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP , + flow_pctypes); + } hena |=BIT_ULL (I40E_FILTER_PCTYPE_FRAG_IPV6 );break ;case AH_ESP_V4_FLOW :
@@ -3696,17 +3698,20 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)return -EINVAL ; } -if (flow_pctype) { - i_setc = (u64 )i40e_read_rx_ctl (hw,I40E_GLQF_HASH_INSET (0 , - flow_pctype)) | - ((u64 )i40e_read_rx_ctl (hw,I40E_GLQF_HASH_INSET (1 , - flow_pctype)) <<32 ); - i_set =i40e_get_rss_hash_bits (&pf->hw, nfc, i_setc); -i40e_write_rx_ctl (hw,I40E_GLQF_HASH_INSET (0 , flow_pctype), - (u32 )i_set); -i40e_write_rx_ctl (hw,I40E_GLQF_HASH_INSET (1 , flow_pctype), - (u32)(i_set >>32 )); - hena |=BIT_ULL (flow_pctype); +if (bitmap_weight (flow_pctypes,FLOW_PCTYPES_SIZE )) { +u8 flow_id; + +for_each_set_bit (flow_id, flow_pctypes,FLOW_PCTYPES_SIZE ) { + i_setc = (u64 )i40e_read_rx_ctl (hw,I40E_GLQF_HASH_INSET (0 , flow_id)) | + ((u64 )i40e_read_rx_ctl (hw,I40E_GLQF_HASH_INSET (1 , flow_id)) <<32 ); + i_set =i40e_get_rss_hash_bits (&pf->hw, nfc, i_setc); + +i40e_write_rx_ctl (hw,I40E_GLQF_HASH_INSET (0 , flow_id), + (u32 )i_set); +i40e_write_rx_ctl (hw,I40E_GLQF_HASH_INSET (1 , flow_id), + (u32)(i_set >>32 )); + hena |=BIT_ULL (flow_id); + } }i40e_write_rx_ctl (hw,I40E_PFQF_HENA (0 ), (u32 )hena);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 207/240 net: ksz884x: fix missing pci_disable_device() on error in pcidev_init()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 5da6d65590a0698199df44d095e54b0ed1708178 ]
pci_disable_device() need be called while module exiting, switch to use pcim_enable(), pci_disable_device() will be called in pcim_release() while unbinding device.
--- drivers/net/ethernet/micrel/ksz884x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/micrel/ksz884x.c +1 -1
@@ -6851,7 +6851,7 @@ static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id)char banner[sizeof (version)];struct ksz_switch *sw =NULL ; - result =pci_enable_device (pdev); + result =pcim_enable_device (pdev);if (result)return result;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 208/240 riscv: jump_label: mark arguments as const to satisfy asm constraints
In reply to Greg Kroah-HartmanFrom: Jisheng Zhang <[email protected]>
[ Upstream commit 89fd4a1df829187d4d35f6a520cc531de622e6f0 ]
Samuel reported that the static branch usage in cpu_relax() breaks building with CONFIG_CC_OPTIMIZE_FOR_SIZE:
In file included from <command-line>:./arch/riscv/include/asm/jump_label.h: In function 'cpu_relax':././include/linux/compiler_types.h:285:33: warning: 'asm' operand 0 probably does not match constraints
285 | #define asm_volatile_goto(x...) asm goto(x)
| ^~~./arch/riscv/include/asm/jump_label.h:41:9: note: in expansion of macro 'asm_volatile_goto'
41 | asm_volatile_goto(
| ^~~~~~~~~~~~~~~~~././include/linux/compiler_types.h:285:33: error: impossible constraint in 'asm'
285 | #define asm_volatile_goto(x...) asm goto(x)
| ^~~./arch/riscv/include/asm/jump_label.h:41:9: note: in expansion of macro 'asm_volatile_goto'
41 | asm_volatile_goto(
| ^~~~~~~~~~~~~~~~~make[1]: *** [scripts/Makefile.build:249:arch/riscv/kernel/vdso/vgettimeofday.o] Error 1
make: *** [arch/riscv/Makefile:128: vdso_prepare] Error 2
Maybe "-Os" prevents GCC from detecting that the key/branch arguments can be treated as constants and used as immediate operands. Inspired by x86's commit 864b435514b2("x86/jump_label: Mark arguments as const to satisfy asm constraints"), and as pointed out by Steven: "The "i" constraint needs to be a constant.", let's do similar modifications to riscv.
Tested by CC_OPTIMIZE_FOR_SIZE + gcc and CC_OPTIMIZE_FOR_SIZE + clang.
--- arch/riscv/include/asm/jump_label.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/riscv/include/asm/jump_label.h +4 -4
@@ -14,8 +14,8 @@#define JUMP_LABEL_NOP_SIZE 4 -static __always_inline bool arch_static_branch(struct static_key *key, -bool branch) +static __always_inline bool arch_static_branch(struct static_key * const key, +const bool branch) {asm_volatile_goto ( " .option push \n\t"
@@ -35,8 +35,8 @@ static __always_inline bool arch_static_branch(struct static_key *key,return true; } -static __always_inline bool arch_static_branch_jump(struct static_key *key, -bool branch) +static __always_inline bool arch_static_branch_jump(struct static_key * const key, +const bool branch) {asm_volatile_goto ( " .option push \n\t"
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 209/240 PM: domains: Fix handling of unavailable/disabled idle states
In reply to Greg Kroah-HartmanFrom: Sudeep Holla <[email protected]>
[ Upstream commit e0c57a5c70c13317238cb19a7ded0eab4a5f7de5 ]
Platforms can provide the information about the availability of each idle states via status flag. Platforms may have to disable one or more idle states for various reasons like broken firmware or other unmet dependencies.
Fix handling of such unavailable/disabled idle states by ignoring them while parsing the states.
--- drivers/base/power/domain.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/base/power/domain.c +4 -0
@@ -2950,6 +2950,10 @@ static int genpd_iterate_idle_states(struct device_node *dn, np = it.node;if (!of_match_node (idle_state_match, np))continue ; + +if (!of_device_is_available (np)) +continue ; +if (states) { ret =genpd_parse_state (&states[i], np);if (ret) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 210/240 perf vendor events arm64: Fix incorrect Hisi hip08 L3 metrics
In reply to Greg Kroah-HartmanFrom: Shang XiaoJing <[email protected]>
[ Upstream commit e9229d5b6254a75291536f582652c599957344d2 ]
Commit 0cc177cfc95d565e ("perf vendor events arm64: Add Hisi hip08 L3 metrics") add L3 metrics of hip08, but some metrics (IF_BP_MISP_BR_RET, IF_BP_MISP_BR_RET, IF_BP_MISP_BR_BL) have incorrect event number due to the mistakes in document, which caused incorrect result. Fix the incorrect metrics.
Before:
65,811,214,308 armv8_pmuv3_0/event=0x1014/ # 18.87 push_branch
# -40.19 other_branch
3,564,316,780 BR_MIS_PRED # 0.51 indirect_branch
# 21.81 pop_branch
After:
6,537,146,245 BR_MIS_PRED # 0.48 indirect_branch
# 0.47 pop_branch # 0.00 push_branch # 0.05 other_branch
--- .../perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json +3 -3
@@ -112,21 +112,21 @@ "MetricName": "indirect_branch" }, { - "MetricExpr": "(armv8_pmuv3_0@event\\=0x1014@ + armv8_pmuv3_0@event\\=0x1018@) / BR_MIS_PRED", + "MetricExpr": "(armv8_pmuv3_0@event\\=0x1013@ + armv8_pmuv3_0@event\\=0x1016@) / BR_MIS_PRED", "PublicDescription": "Push branch L3 topdown metric", "BriefDescription": "Push branch L3 topdown metric", "MetricGroup": "TopDownL3", "MetricName": "push_branch" }, { - "MetricExpr": "armv8_pmuv3_0@event\\=0x100c@ / BR_MIS_PRED", + "MetricExpr": "armv8_pmuv3_0@event\\=0x100d@ / BR_MIS_PRED", "PublicDescription": "Pop branch L3 topdown metric", "BriefDescription": "Pop branch L3 topdown metric", "MetricGroup": "TopDownL3", "MetricName": "pop_branch" }, { - "MetricExpr": "(BR_MIS_PRED - armv8_pmuv3_0@event\\=0x1010@ - armv8_pmuv3_0@event\\=0x1014@ - armv8_pmuv3_0@event\\=0x1018@ - armv8_pmuv3_0@event\\=0x100c@) / BR_MIS_PRED", + "MetricExpr": "(BR_MIS_PRED - armv8_pmuv3_0@event\\=0x1010@ - armv8_pmuv3_0@event\\=0x1013@ - armv8_pmuv3_0@event\\=0x1016@ - armv8_pmuv3_0@event\\=0x100d@) / BR_MIS_PRED", "PublicDescription": "Other branch L3 topdown metric", "BriefDescription": "Other branch L3 topdown metric", "MetricGroup": "TopDownL3",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 211/240 net: fec: limit register access on i.MX6UL
In reply to Greg Kroah-HartmanFrom: Juergen Borleis <[email protected]>
[ Upstream commit 0a8b43b12dd78daa77a7dc007b92770d262a2714 ]
Using 'ethtool -d […]' on an i.MX6UL leads to a kernel crash:
Unhandled fault: external abort on non-linefetch (0x1008) at […]
due to this SoC has less registers in its FEC implementation compared to other i.MX6 variants. Thus, a run-time decision is required to avoid access to non-existing registers.
--- drivers/net/ethernet/freescale/fec_main.c | 46 ++++++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +44 -2
@@ -2347,6 +2347,31 @@ static u32 fec_enet_register_offset[] = {IEEE_R_DROP ,IEEE_R_FRAME_OK ,IEEE_R_CRC ,IEEE_R_ALIGN ,IEEE_R_MACERR ,IEEE_R_FDXFC ,IEEE_R_OCTETS_OK }; +/* for i.MX6ul */ +static u32 fec_enet_register_offset_6ul[] = { +FEC_IEVENT ,FEC_IMASK ,FEC_R_DES_ACTIVE_0 ,FEC_X_DES_ACTIVE_0 , +FEC_ECNTRL ,FEC_MII_DATA ,FEC_MII_SPEED ,FEC_MIB_CTRLSTAT ,FEC_R_CNTRL , +FEC_X_CNTRL ,FEC_ADDR_LOW ,FEC_ADDR_HIGH ,FEC_OPD ,FEC_TXIC0 ,FEC_RXIC0 , +FEC_HASH_TABLE_HIGH ,FEC_HASH_TABLE_LOW ,FEC_GRP_HASH_TABLE_HIGH , +FEC_GRP_HASH_TABLE_LOW ,FEC_X_WMRK ,FEC_R_DES_START_0 , +FEC_X_DES_START_0 ,FEC_R_BUFF_SIZE_0 ,FEC_R_FIFO_RSFL ,FEC_R_FIFO_RSEM , +FEC_R_FIFO_RAEM ,FEC_R_FIFO_RAFL ,FEC_RACC , +RMON_T_DROP ,RMON_T_PACKETS ,RMON_T_BC_PKT ,RMON_T_MC_PKT , +RMON_T_CRC_ALIGN ,RMON_T_UNDERSIZE ,RMON_T_OVERSIZE ,RMON_T_FRAG , +RMON_T_JAB ,RMON_T_COL ,RMON_T_P64 ,RMON_T_P65TO127 ,RMON_T_P128TO255 , +RMON_T_P256TO511 ,RMON_T_P512TO1023 ,RMON_T_P1024TO2047 , +RMON_T_P_GTE2048 ,RMON_T_OCTETS , +IEEE_T_DROP ,IEEE_T_FRAME_OK ,IEEE_T_1COL ,IEEE_T_MCOL ,IEEE_T_DEF , +IEEE_T_LCOL ,IEEE_T_EXCOL ,IEEE_T_MACERR ,IEEE_T_CSERR ,IEEE_T_SQE , +IEEE_T_FDXFC ,IEEE_T_OCTETS_OK , +RMON_R_PACKETS ,RMON_R_BC_PKT ,RMON_R_MC_PKT ,RMON_R_CRC_ALIGN , +RMON_R_UNDERSIZE ,RMON_R_OVERSIZE ,RMON_R_FRAG ,RMON_R_JAB , +RMON_R_RESVD_O ,RMON_R_P64 ,RMON_R_P65TO127 ,RMON_R_P128TO255 , +RMON_R_P256TO511 ,RMON_R_P512TO1023 ,RMON_R_P1024TO2047 , +RMON_R_P_GTE2048 ,RMON_R_OCTETS , +IEEE_R_DROP ,IEEE_R_FRAME_OK ,IEEE_R_CRC ,IEEE_R_ALIGN ,IEEE_R_MACERR , +IEEE_R_FDXFC ,IEEE_R_OCTETS_OK +};#else static __u32 fec_enet_register_version =1 ; static u32 fec_enet_register_offset[] = {
@@ -2371,7 +2396,24 @@ static void fec_enet_get_regs(struct net_device *ndev,u32 *buf = (u32 *)regbuf;u32 i, off;int ret; +#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ + defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM ) || \ + defined(CONFIG_ARM64 ) || defined(CONFIG_COMPILE_TEST ) +u32 *reg_list; +u32 reg_cnt; +if (!of_machine_is_compatible ("fsl,imx6ul" )) { + reg_list = fec_enet_register_offset; + reg_cnt =ARRAY_SIZE (fec_enet_register_offset); + }else { + reg_list = fec_enet_register_offset_6ul; + reg_cnt =ARRAY_SIZE (fec_enet_register_offset_6ul); + } +#else +/* coldfire */ +static u32 *reg_list = fec_enet_register_offset; +static const u32 reg_cnt =ARRAY_SIZE (fec_enet_register_offset); +#endif ret =pm_runtime_resume_and_get (dev);if (ret <0 )return ;
@@ -2380,8 +2422,8 @@ static void fec_enet_get_regs(struct net_device *ndev,memset (buf,0 , regs->len); -for (i =0 ; i <ARRAY_SIZE (fec_enet_register_offset); i++) { - off = fec_enet_register_offset[i]; +for (i =0 ; i < reg_cnt; i++) { + off = reg_list[i];if ((off ==FEC_R_BOUND || off ==FEC_R_FSTART ) && !(fep->quirks &FEC_QUIRK_HAS_FRREG ))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 212/240 net: ethernet: ave: Fix MAC to be in charge of PHY PM
In reply to Greg Kroah-HartmanFrom: Kunihiko Hayashi <[email protected]>
[ Upstream commit e2badb4bd33abe13ddc35975bd7f7f8693955a4b ]
The phylib callback is called after MAC driver's own resume callback is called. For AVE driver, after resuming immediately, PHY state machine is in PHY_NOLINK because there is a time lag from link-down to link-up due to autoneg. The result is WARN_ON() dump in mdio_bus_phy_resume().
Since ave_resume() itself calls phy_resume(), AVE driver should manage PHY PM. To indicate that MAC driver manages PHY PM, set phydev->mac_managed_pm to true to avoid the unnecessary phylib call and add missing phy_init_hw() to ave_resume().
--- drivers/net/ethernet/socionext/sni_ave.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/socionext/sni_ave.c +6 -0
@@ -1229,6 +1229,8 @@ static int ave_init(struct net_device *ndev)phy_support_asym_pause (phydev); + phydev->mac_managed_pm = true; +phy_attached_info (phydev);return 0 ;
@@ -1757,6 +1759,10 @@ static int ave_resume(struct device *dev)ave_global_reset (ndev); + ret =phy_init_hw (ndev->phydev); +if (ret) +return ret; +ave_ethtool_get_wol (ndev, &wol); wol.wolopts = priv->wolopts;__ave_ethtool_set_wol (ndev, &wol);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 213/240 ALSA: aoa: i2sbus: fix possible memory leak in i2sbus_add_dev()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 4a4c8482e370d697738a78dcd7bf2780832cb712 ]
dev_set_name() in soundbus_add_one() allocates memory for name, it need be freed when of_device_register() fails, call soundbus_dev_put() to give up the reference that hold in device_initialize(), so that it can be freed in kobject_cleanup() when the refcount hit to 0. And other resources are also freed in i2sbus_release_dev(), so it can return 0 directly.
--- sound/aoa/soundbus/i2sbus/core.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/aoa/soundbus/i2sbus/core.c +4 -0
@@ -302,6 +302,10 @@ static int i2sbus_add_dev(struct macio_dev *macio,if (soundbus_add_one (&dev->sound)) {printk (KERN_DEBUG "i2sbus: device registration error!\n" ); +if (dev->sound.ofdev.dev.kobj.state_initialized) { +soundbus_dev_put (&dev->sound); +return 0 ; + } goto err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 214/240 ALSA: aoa: Fix I2S device accounting
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit f1fae475f10a26b7e34da4ff2e2f19b7feb3548e ]
i2sbus_add_dev() is supposed to return the number of probed devices, i.e. either 1 or 0. However, i2sbus_add_dev() has one error handling that returns -ENODEV; this will screw up the accumulation number counted in the caller, i2sbus_probe().
Fix the return value to 0 and add the comment for better understanding for readers.
--- sound/aoa/soundbus/i2sbus/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/aoa/soundbus/i2sbus/core.c +2 -1
@@ -147,6 +147,7 @@ static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index,return rc; } +/* Returns 1 if added, 0 for otherwise; don't return a negative value! */ /* FIXME: look at device node refcounting */ static int i2sbus_add_dev(struct macio_dev *macio, struct i2sbus_control *control,
@@ -213,7 +214,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,* either as the second one in that case is just a modem. */ if (!ok) {kfree (dev); -return -ENODEV ; +return 0 ; }mutex_init (&dev->lock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 215/240 openvswitch: switch from WARN to pr_warn
In reply to Greg Kroah-HartmanFrom: Aaron Conole <[email protected]>
[ Upstream commit fd954cc1919e35cb92f78671cab6e42d661945a3 ]
As noted by Paolo Abeni, pr_warn doesn't generate any splat and can still preserve the warning to the user that feature downgrade occurred. We likely cannot introduce other kinds of checks / enforcement here because syzbot can generate different genl versions to the datapath.
--- net/openvswitch/datapath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/openvswitch/datapath.c +2 -1
@@ -1606,7 +1606,8 @@ static void ovs_dp_reset_user_features(struct sk_buff *skb,if (IS_ERR (dp))return ; -WARN (dp->user_features,"Dropping previously announced user features\n" ); +pr_warn ("%s: Dropping previously announced user features\n" , +ovs_dp_name (dp)); dp->user_features =0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 216/240 net: ehea: fix possible memory leak in ehea_register_port()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 0e7ce23a917a9cc83ca3c779fbba836bca3bcf1e ]
If of_device_register() returns error, the of node and the name allocated in dev_set_name() is leaked, call put_device() to give up the reference that was set in device_initialize(), so that of node is put in logical_port_release() and the name is freed in kobject_cleanup().
--- drivers/net/ethernet/ibm/ehea/ehea_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/ibm/ehea/ehea_main.c +1 -0
@@ -2900,6 +2900,7 @@ static struct device *ehea_register_port(struct ehea_port *port, ret =of_device_register (&port->ofdev);if (ret) {pr_err ("failed to register device. ret=%d\n" , ret); +put_device (&port->ofdev.dev); goto out; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 217/240 net: bcmsysport: Indicate MAC is in charge of PHY PM
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 9f172134dde7e4f5bf4b9139f23a1e741ec1c36e ]
Avoid the PHY library call unnecessarily into the suspend/resume functions by setting phydev->mac_managed_pm to true. The SYSTEMPORT driver essentially does exactly what mdio_bus_phy_resume() does by calling phy_resume().
--- drivers/net/ethernet/broadcom/bcmsysport.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/broadcom/bcmsysport.c +3 -0
@@ -1991,6 +1991,9 @@ static int bcm_sysport_open(struct net_device *dev) goto out_clk_disable; } +/* Indicate that the MAC is responsible for PHY PM */ + phydev->mac_managed_pm = true; +/* Reset house keeping link status */ priv->old_duplex =-1 ; priv->old_link =-1 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 218/240 nh: fix scope used to find saddr when adding non gw nh
In reply to Greg Kroah-HartmanFrom: Nicolas Dichtel <[email protected]>
[ Upstream commit bac0f937c343d651874f83b265ca8f5070ed4f06 ]
As explained by Julian, fib_nh_scope is related to fib_nh_gw4, but fib_info_update_nhc_saddr() needs the scope of the route, which is the scope "before" fib_nh_scope, ie fib_nh_scope - 1.
This patch fixes the problem described in commit 747c14307214 ("ip: fix dflt addr selection for connected nexthop").
--- net/ipv4/nexthop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/nexthop.c +1 -1
@@ -2534,7 +2534,7 @@ static int nh_create_ipv4(struct net *net, struct nexthop *nh,if (!err) { nh->nh_flags = fib_nh->fib_nh_flags;fib_info_update_nhc_saddr (net, &fib_nh->nh_common, - fib_nh->fib_nh_scope); + !fib_nh->fib_nh_scope ?0 : fib_nh->fib_nh_scope -1 ); }else {fib_nh_release (net, fib_nh); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 219/240 net: broadcom: bcm4908_enet: update TX stats after actual transmission
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit ef3556ee16c68735ec69bd08df41d1cd83b14ad3 ]
Queueing packets doesn't guarantee their transmission. Update TX stats after hardware confirms consuming submitted data.
This also fixes a possible race and NULL dereference. bcm4908_enet_start_xmit() could try to access skb after freeing it in the bcm4908_enet_poll_tx().
--- drivers/net/ethernet/broadcom/bcm4908_enet.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bcm4908_enet.c +8 -4
@@ -561,8 +561,6 @@ static int bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netdeif (++ring->write_idx == ring->length -1 ) ring->write_idx =0 ; - enet->netdev->stats.tx_bytes += skb->len; - enet->netdev->stats.tx_packets++;return NETDEV_TX_OK ; }
@@ -635,6 +633,7 @@ static int bcm4908_enet_poll_tx(struct napi_struct *napi, int weight)struct bcm4908_enet_dma_ring_bd *buf_desc;struct bcm4908_enet_dma_ring_slot *slot;struct device *dev = enet->dev; +unsigned int bytes =0 ;int handled =0 ;while (handled < weight && tx_ring->read_idx != tx_ring->write_idx) {
@@ -645,12 +644,17 @@ static int bcm4908_enet_poll_tx(struct napi_struct *napi, int weight)dma_unmap_single (dev, slot->dma_addr, slot->len,DMA_TO_DEVICE );dev_kfree_skb (slot->skb); -if (++tx_ring->read_idx == tx_ring->length) - tx_ring->read_idx =0 ; handled++; + bytes += slot->len; + +if (++tx_ring->read_idx == tx_ring->length) + tx_ring->read_idx =0 ; } + enet->netdev->stats.tx_packets += handled; + enet->netdev->stats.tx_bytes += bytes; +if (handled < weight) {napi_complete_done (napi, handled);bcm4908_enet_dma_ring_intrs_on (enet, tx_ring);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 220/240 netdevsim: fix memory leak in nsim_bus_dev_new()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit cf2010aa1c739bab067cbc90b690d28eaa0b47da ]
If device_register() failed in nsim_bus_dev_new(), the value of reference in nsim_bus_dev->dev is 1. obj->name in nsim_bus_dev->dev will not be released.
unreferenced object 0xffff88810352c480 (size 16):
comm "echo", pid 5691, jiffies 4294945921 (age 133.270s) hex dump (first 16 bytes):
6e 65 74 64 65 76 73 69 6d 31 00 00 00 00 00 00 netdevsim1......
backtrace:
[<000000005e2e5e26>] __kmalloc_node_track_caller+0x3a/0xb0
[<0000000094ca4fc8>] kvasprintf+0xc3/0x160
[<00000000aad09bcc>] kvasprintf_const+0x55/0x180
[<000000009bac868d>] kobject_set_name_vargs+0x56/0x150
[<000000007c1a5d70>] dev_set_name+0xbb/0xf0
[<00000000ad0d126b>] device_add+0x1f8/0x1cb0
[<00000000c222ae24>] new_device_store+0x3b6/0x5e0
[<0000000043593421>] bus_attr_store+0x72/0xa0
[<00000000cbb1833a>] sysfs_kf_write+0x106/0x160
[<00000000d0dedb8a>] kernfs_fop_write_iter+0x3a8/0x5a0
[<00000000770b66e2>] vfs_write+0x8f0/0xc80
[<0000000078bb39be>] ksys_write+0x106/0x210
[<00000000005e55a4>] do_syscall_64+0x35/0x80
[<00000000eaa40bbc>] entry_SYSCALL_64_after_hwframe+0x46/0xb0--- drivers/net/netdevsim/bus.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/netdevsim/bus.c +7 -2
@@ -117,6 +117,10 @@ static const struct attribute_group *nsim_bus_dev_attr_groups[] = {static void nsim_bus_dev_release (struct device *dev) { +struct nsim_bus_dev *nsim_bus_dev; + + nsim_bus_dev = container_of(dev, struct nsim_bus_dev, dev); +kfree (nsim_bus_dev); }static struct device_type nsim_bus_dev_type = {
@@ -291,6 +295,8 @@ nsim_bus_dev_new(unsigned int id, unsigned int port_count, unsigned int num_queu err_nsim_bus_dev_id_free:ida_free (&nsim_bus_dev_ids, nsim_bus_dev->dev.id); +put_device (&nsim_bus_dev->dev); + nsim_bus_dev =NULL ; err_nsim_bus_dev_free:kfree (nsim_bus_dev);return ERR_PTR (err);
@@ -300,9 +306,8 @@ static void nsim_bus_dev_del(struct nsim_bus_dev *nsim_bus_dev) {/* Disallow using nsim_bus_dev */ smp_store_release (&nsim_bus_dev->init, false); -device_unregister (&nsim_bus_dev->dev);ida_free (&nsim_bus_dev_ids, nsim_bus_dev->dev.id); -kfree (nsim_bus_dev); +device_unregister (&nsim_bus_dev->dev); }static struct device_driver nsim_driver = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 221/240 netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 6b1da9f7126f05e857da6db24c6a04aa7974d644 ]
If some items in nsim_dev_resources_register() fail, memory leak will occur. The following is the memory leak information.
unreferenced object 0xffff888074c02600 (size 128):
comm "echo", pid 8159, jiffies 4294945184 (age 493.530s) hex dump (first 32 bytes):
40 47 ea 89 ff ff ff ff 01 00 00 00 00 00 00 00 @G.............. ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................
backtrace:
[<0000000011a31c98>] kmalloc_trace+0x22/0x60
[<0000000027384c69>] devl_resource_register+0x144/0x4e0
[<00000000a16db248>] nsim_drv_probe+0x37a/0x1260
[<000000007d1f448c>] really_probe+0x20b/0xb10
[<00000000c416848a>] __driver_probe_device+0x1b3/0x4a0
[<00000000077e0351>] driver_probe_device+0x49/0x140
[<0000000054f2465a>] __device_attach_driver+0x18c/0x2a0
[<000000008538f359>] bus_for_each_drv+0x151/0x1d0
[<0000000038e09747>] __device_attach+0x1c9/0x4e0
[<00000000dd86e533>] bus_probe_device+0x1d5/0x280
[<00000000839bea35>] device_add+0xae0/0x1cb0
[<000000009c2abf46>] new_device_store+0x3b6/0x5f0
[<00000000fb823d7f>] bus_attr_store+0x72/0xa0
[<000000007acc4295>] sysfs_kf_write+0x106/0x160
[<000000005f50cb4d>] kernfs_fop_write_iter+0x3a8/0x5a0
[<0000000075eb41bf>] vfs_write+0x8f0/0xc80--- drivers/net/netdevsim/dev.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/net/netdevsim/dev.c +13 -7
@@ -442,7 +442,7 @@ static int nsim_dev_resources_register(struct devlink *devlink) ¶ms);if (err) {pr_err ("Failed to register IPv4 top resource\n" ); - goto out; + goto err_out; } err = devl_resource_register(devlink, "fib", (u64)-1,
@@ -450,7 +450,7 @@ static int nsim_dev_resources_register(struct devlink *devlink) NSIM_RESOURCE_IPV4, ¶ms);if (err) {pr_err ("Failed to register IPv4 FIB resource\n" ); -return err; + goto err_out; } err = devl_resource_register(devlink, "fib-rules", (u64)-1,
@@ -458,7 +458,7 @@ static int nsim_dev_resources_register(struct devlink *devlink) NSIM_RESOURCE_IPV4, ¶ms);if (err) {pr_err ("Failed to register IPv4 FIB rules resource\n" ); -return err; + goto err_out; }/* Resources for IPv6 */
@@ -468,7 +468,7 @@ static int nsim_dev_resources_register(struct devlink *devlink) ¶ms);if (err) {pr_err ("Failed to register IPv6 top resource\n" ); - goto out; + goto err_out; } err = devl_resource_register(devlink, "fib", (u64)-1,
@@ -476,7 +476,7 @@ static int nsim_dev_resources_register(struct devlink *devlink) NSIM_RESOURCE_IPV6, ¶ms);if (err) {pr_err ("Failed to register IPv6 FIB resource\n" ); -return err; + goto err_out; } err = devl_resource_register(devlink, "fib-rules", (u64)-1,
@@ -484,7 +484,7 @@ static int nsim_dev_resources_register(struct devlink *devlink) NSIM_RESOURCE_IPV6, ¶ms);if (err) {pr_err ("Failed to register IPv6 FIB rules resource\n" ); -return err; + goto err_out; }/* Resources for nexthops */
@@ -492,8 +492,14 @@ static int nsim_dev_resources_register(struct devlink *devlink)NSIM_RESOURCE_NEXTHOPS ,DEVLINK_RESOURCE_ID_PARENT_TOP , ¶ms); +if (err) { +pr_err ("Failed to register NEXTHOPS resource\n" ); + goto err_out; + } +return 0 ; -out: +err_out: +devl_resources_unregister (devlink);return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 222/240 netdevsim: remove dir in nsim_dev_debugfs_init() when creating ports dir failed
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit a6aa8d0ce2cfba57ac0f23293fcb3be0b9f53fba ]
Remove dir in nsim_dev_debugfs_init() when creating ports dir failed. Otherwise, the netdevsim device will not be created next time. Kernel reports an error: debugfs: Directory 'netdevsim1' with parent 'netdevsim' already present!
--- drivers/net/netdevsim/dev.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/netdevsim/dev.c +7 -4
@@ -309,8 +309,10 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)if (IS_ERR (nsim_dev->ddir))return PTR_ERR (nsim_dev->ddir); nsim_dev->ports_ddir =debugfs_create_dir ("ports" , nsim_dev->ddir); -if (IS_ERR (nsim_dev->ports_ddir)) -return PTR_ERR (nsim_dev->ports_ddir); +if (IS_ERR (nsim_dev->ports_ddir)) { + err =PTR_ERR (nsim_dev->ports_ddir); + goto err_ddir; + }debugfs_create_bool ("fw_update_status" ,0600 , nsim_dev->ddir, &nsim_dev->fw_update_status); debugfs_create_u32("fw_update_overwrite_mask", 0600, nsim_dev->ddir,
@@ -346,7 +348,7 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev) nsim_dev->nodes_ddir =debugfs_create_dir ("rate_nodes" , nsim_dev->ddir);if (IS_ERR (nsim_dev->nodes_ddir)) { err =PTR_ERR (nsim_dev->nodes_ddir); - goto err_out; + goto err_ports_ddir; } debugfs_create_bool("fail_trap_drop_counter_get", 0600, nsim_dev->ddir,
@@ -354,8 +356,9 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)nsim_udp_tunnels_debugfs_create (nsim_dev);return 0 ; -err_out: +err_ports_ddir:debugfs_remove_recursive (nsim_dev->ports_ddir); +err_ddir:debugfs_remove_recursive (nsim_dev->ddir);return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 223/240 net/mlx5e: Do not increment ESN when updating IPsec ESN state
In reply to Greg Kroah-HartmanFrom: Hyong Youb Kim <[email protected]>
[ Upstream commit 888be6b279b7257b5f6e4c9527675bff0a335596 ]
An offloaded SA stops receiving after about 2^32 + replay_window packets. For example, when SA reaches <seq-hi 0x1, seq 0x2c>, all subsequent packets get dropped with SA-icv-failure (integrity_failed).
To reproduce the bug:
- ConnectX-6 Dx with crypto enabled (FW 22.30.1004)
- ipsec.conf:
nic-offload = yes
replay-window = 32
esn = yes
salifetime=24h
- Run netperf for a long time to send more than 2^32 packets netperf -H <device-under-test> -t TCP_STREAM -l 20000
When 2^32 + replay_window packets are received, the replay window moves from the 2nd half of subspace (overlap=1) to the 1st half (overlap=0). The driver then updates the 'esn' value in NIC (i.e. seq_hi) as follows.
seq_hi = xfrm_replay_seqhi(seq_bottom)
new esn in NIC = seq_hi + 1
The +1 increment is wrong, as seq_hi already contains the correct seq_hi. For example, when seq_hi=1, the driver actually tells NIC to use seq_hi=2 (esn). This incorrect esn value causes all subsequent packets to fail integrity checks (SA-icv-failure). So, do not increment.
--- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +0 -3
@@ -101,7 +101,6 @@ static bool mlx5e_ipsec_update_esn_state(struct mlx5e_ipsec_sa_entry *sa_entry)struct xfrm_replay_state_esn *replay_esn;u32 seq_bottom =0 ;u8 overlap; -u32 *esn;if (!(sa_entry->x->props.flags &XFRM_STATE_ESN )) { sa_entry->esn_state.trigger =0 ;
@@ -116,11 +115,9 @@ static bool mlx5e_ipsec_update_esn_state(struct mlx5e_ipsec_sa_entry *sa_entry) sa_entry->esn_state.esn =xfrm_replay_seqhi (sa_entry->x,htonl (seq_bottom)); - esn = &sa_entry->esn_state.esn; sa_entry->esn_state.trigger =1 ;if (unlikely (overlap && seq_bottom <MLX5E_IPSEC_ESN_SCOPE_MID )) { - ++(*esn); sa_entry->esn_state.overlap =0 ;return true; } else if (unlikely(!overlap &&
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 224/240 net/mlx5: Wait for firmware to enable CRS before pci_restore_state
In reply to Greg Kroah-HartmanFrom: Moshe Shemesh <[email protected]>
[ Upstream commit 212b4d7251c169f87fa734e79bdec8dd413be5cf ]
After firmware reset driver should verify firmware already enabled CRS and became responsive to pci config cycles before restoring pci state. Fix that by waiting till device_id is readable through PCI again.
--- .../net/ethernet/mellanox/mlx5/core/fw_reset.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +17 -0
@@ -358,6 +358,23 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev) err = -ETIMEDOUT ; } +do { + err =pci_read_config_word (dev->pdev,PCI_DEVICE_ID , ®16); +if (err) +return err; +if (reg16 == dev_id) +break ; +msleep (20 ); + }while (!time_after (jiffies, timeout)); + +if (reg16 == dev_id) { +mlx5_core_info (dev,"Firmware responds to PCI config cycles again\n" ); + }else { +mlx5_core_err (dev,"Firmware is not responsive (0x%04x) after %llu ms\n" , + reg16,mlx5_tout_ms (dev,PCI_TOGGLE )); + err = -ETIMEDOUT ; + } + restore:list_for_each_entry (sdev, &bridge_bus->devices, bus_list) {pci_cfg_access_unlock (sdev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 225/240 net/mlx5: DR, Fix matcher disconnect error flow
In reply to Greg Kroah-HartmanFrom: Rongwei Liu <[email protected]>
[ Upstream commit 4ea9891d66410da5030dababb4b825d8e41cd7bb ]
When 2nd flow rules arrives, it will merge together with the 1st one if matcher criteria is the same.
If merge fails, driver will rollback the merge contents, and reject the 2nd rule. At rollback stage, matcher can't be disconnected unconditionally, otherise the 1st rule can't be hit anymore.
Add logic to check if the matcher should be disconnected or not.
--- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c +2 -1
@@ -1200,7 +1200,8 @@ dr_rule_create_rule_nic(struct mlx5dr_rule *rule, } remove_from_nic_tbl: -mlx5dr_matcher_remove_from_tbl_nic (dmn, nic_matcher); +if (!nic_matcher->rules) +mlx5dr_matcher_remove_from_tbl_nic (dmn, nic_matcher); free_hw_ste:mlx5dr_domain_nic_unlock (nic_dmn);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 226/240 net/mlx5e: Extend SKB room check to include PTP-SQ
In reply to Greg Kroah-HartmanFrom: Aya Levin <[email protected]>
[ Upstream commit 19b43a432e3e47db656a8269a74b50aef826950c ]
When tx_port_ts is set, the driver diverts all UPD traffic over PTP port to a dedicated PTP-SQ. The SKBs are cached until the wire-CQE arrives. When the packet size is greater then MTU, the firmware might drop it and the packet won't be transmitted to the wire, hence the wire-CQE won't reach the driver. In this case the SKBs are accumulated in the SKB fifo. Add room check to consider the PTP-SQ SKB fifo, when the SKB fifo is full, driver stops the queue resulting in a TX timeout. Devlink TX-reporter can recover from it.
--- drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 9 +++++++++ drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 6 ++++++ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 ++++++ 3 files changed, 21 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h +9 -0
@@ -6,6 +6,7 @@#include "en.h" #include "en_stats.h" +#include "en/txrx.h" #include <linux/ptp_classify.h> #define MLX5E_PTP_CHANNEL_IX 0
@@ -68,6 +69,14 @@ static inline bool mlx5e_use_ptpsq(struct sk_buff *skb) fk.ports.dst == htons(PTP_EV_PORT)); } +static inline bool mlx5e_ptpsq_fifo_has_room (struct mlx5e_txqsq *sq) +{ +if (!sq->ptpsq) +return true; + +return mlx5e_skb_fifo_has_room (&sq->ptpsq->skb_fifo); +} +int mlx5e_ptp_open (struct mlx5e_priv *priv,struct mlx5e_params *params,u8 lag_port,struct mlx5e_ptp **cp);void mlx5e_ptp_close (struct mlx5e_ptp *c);
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +6 -0
@@ -57,6 +57,12 @@ netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev);bool mlx5e_poll_tx_cq (struct mlx5e_cq *cq,int napi_budget);void mlx5e_free_txqsq_descs (struct mlx5e_txqsq *sq); +static inline bool +mlx5e_skb_fifo_has_room (struct mlx5e_skb_fifo *fifo) +{ +return (*fifo->pc - *fifo->cc) < fifo->mask; +} +static inline bool mlx5e_wqc_has_room_for (struct mlx5_wq_cyc *wq,u16 cc,u16 pc,u16 n) {
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +6 -0
@@ -391,6 +391,11 @@ mlx5e_txwqe_complete(struct mlx5e_txqsq *sq, struct sk_buff *skb,if (unlikely (sq->ptpsq)) {mlx5e_skb_cb_hwtstamp_init (skb);mlx5e_skb_fifo_push (&sq->ptpsq->skb_fifo, skb); +if (!netif_tx_queue_stopped (sq->txq) && + !mlx5e_skb_fifo_has_room (&sq->ptpsq->skb_fifo)) { +netif_tx_stop_queue (sq->txq); + sq->stats->stopped++; + }skb_get (skb); }
@@ -867,6 +872,7 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget)if (netif_tx_queue_stopped (sq->txq) &&mlx5e_wqc_has_room_for (&sq->wq, sq->cc, sq->pc, sq->stop_room) && +mlx5e_ptpsq_fifo_has_room (sq) && !test_bit (MLX5E_SQ_STATE_RECOVERING , &sq->state)) {netif_tx_wake_queue (sq->txq); stats->wake++;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 227/240 net/mlx5e: Update restore chain id for slow path packets
In reply to Greg Kroah-HartmanFrom: Paul Blakey <[email protected]>
[ Upstream commit 8dc47c0527c1586e3ebe0efd323f1d8abb181c77 ]
Currently encap slow path rules just forward to software without setting the chain id miss register, so driver doesn't restore the chain, and packets hitting this rule will restart from tc chain 0 instead of continuing to the chain the encap rule was on.
Fix this by setting the chain id miss register to the chain id mapping.
--- .../ethernet/mellanox/mlx5/core/en/tc_priv.h | 2 + .../net/ethernet/mellanox/mlx5/core/en_tc.c | 62 ++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h +2 -0
@@ -96,6 +96,7 @@ struct mlx5e_tc_flow {struct encap_flow_item encaps[MLX5_MAX_FLOW_FWD_VPORTS ];struct mlx5e_tc_flow *peer_flow;struct mlx5e_mod_hdr_handle *mh;/* attached mod header instance */ +struct mlx5e_mod_hdr_handle *slow_mh;/* attached mod header instance for slow path */ struct mlx5e_hairpin_entry *hpe;/* attached hairpin instance */ struct list_head hairpin;/* flows sharing the same hairpin */ struct list_head peer;/* flows with peer flow */
@@ -111,6 +112,7 @@ struct mlx5e_tc_flow {struct completion del_hw_done;struct mlx5_flow_attr *attr;struct list_head attrs; +u32 chain_mapping; }; struct mlx5_flow_handle *
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +60 -2
88 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 228/240 net/mlx5: ASO, Create the ASO SQ with the correct timestamp format
In reply to Greg Kroah-HartmanFrom: Saeed Mahameed <[email protected]>
[ Upstream commit 0f3caaa2c6fbf9f892bd235c9dce9eb551f8d815 ]
mlx5 SQs must select the timestamp format explicitly according to the active clock mode, select the current active timestamp mode so ASO SQ create will succeed.
This fixes the following error prints when trying to create ipsec ASO SQ while the timestamp format is real time mode.
mlx5_cmd_out_err:778:(pid 34874): CREATE_SQ(0x904) op_mod(0x0) failed, status bad parameter(0x3), syndrome (0xd61c0b), err(-22) mlx5_aso_create_sq:285:(pid 34874): Failed to open aso wq sq, err=-22
mlx5e_ipsec_init:436:(pid 34874): IPSec initialization failed, -22
--- drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c +7 -0
@@ -3,6 +3,7 @@#include <linux/mlx5/device.h> #include <linux/mlx5/transobj.h> +#include "clock.h" #include "aso.h" #include "wq.h"
@@ -179,6 +180,7 @@ static int create_aso_sq(struct mlx5_core_dev *mdev, int pdn, {void *in, *sqc, *wq;int inlen, err; +u8 ts_format; inlen =MLX5_ST_SZ_BYTES (create_sq_in) +sizeof (u64) * sq->wq_ctrl.buf.npages;
@@ -195,6 +197,11 @@ static int create_aso_sq(struct mlx5_core_dev *mdev, int pdn,MLX5_SET (sqc, sqc, state,MLX5_SQC_STATE_RST );MLX5_SET (sqc, sqc, flush_in_error_en,1 ); + ts_format =mlx5_is_real_time_sq (mdev) ? +MLX5_TIMESTAMP_FORMAT_REAL_TIME : +MLX5_TIMESTAMP_FORMAT_FREE_RUNNING ; +MLX5_SET (sqc, sqc, ts_format, ts_format); +MLX5_SET (wq, wq, wq_type,MLX5_WQ_TYPE_CYCLIC );MLX5_SET (wq, wq, uar_page, mdev->mlx5e_res.hw_objs.bfreg.index); MLX5_SET(wq, wq, log_wq_pg_sz, sq->wq_ctrl.buf.page_shift -
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 229/240 net/mlx5: Fix possible use-after-free in async command interface
In reply to Greg Kroah-HartmanFrom: Tariq Toukan <[email protected]>
[ Upstream commit bacd22df95147ed673bec4692ab2d4d585935241 ]
mlx5_cmd_cleanup_async_ctx should return only after all its callback handlers were completed. Before this patch, the below race between mlx5_cmd_cleanup_async_ctx and mlx5_cmd_exec_cb_handler was possible and lead to a use-after-free:
1. mlx5_cmd_cleanup_async_ctx is called while num_inflight is 2 (i.e. elevated by 1, a single inflight callback).
2. mlx5_cmd_cleanup_async_ctx decreases num_inflight to 1.
3. mlx5_cmd_exec_cb_handler is called, decreases num_inflight to 0 and is about to call wake_up().
4. mlx5_cmd_cleanup_async_ctx calls wait_event, which returns immediately as the condition (num_inflight == 0) holds.
5. mlx5_cmd_cleanup_async_ctx returns.
6. The caller of mlx5_cmd_cleanup_async_ctx frees the mlx5_async_ctx object.
7. mlx5_cmd_exec_cb_handler goes on and calls wake_up() on the freed object.
Fix it by syncing using a completion object. Mark it completed when num_inflight reaches 0.
Trace:
BUG: KASAN: use-after-free in do_raw_spin_lock+0x23d/0x270 Read of size 4 at addr ffff888139cd12f4 by task swapper/5/0 CPU: 5 PID: 0 Comm: swapper/5 Not tainted 6.0.0-rc3_for_upstream_debug_2022_08_30_13_10 #1 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 Call Trace: <IRQ> dump_stack_lvl+0x57/0x7d print_report.cold+0x2d5/0x684 ? do_raw_spin_lock+0x23d/0x270 kasan_report+0xb1/0x1a0 ? do_raw_spin_lock+0x23d/0x270 do_raw_spin_lock+0x23d/0x270 ? rwlock_bug.part.0+0x90/0x90 ? __delete_object+0xb8/0x100 ? lock_downgrade+0x6e0/0x6e0 _raw_spin_lock_irqsave+0x43/0x60 ? __wake_up_common_lock+0xb9/0x140 __wake_up_common_lock+0xb9/0x140 ? __wake_up_common+0x650/0x650 ? destroy_tis_callback+0x53/0x70 [mlx5_core] ? kasan_set_track+0x21/0x30 ? destroy_tis_callback+0x53/0x70 [mlx5_core] ? kfree+0x1ba/0x520 ? do_raw_spin_unlock+0x54/0x220 mlx5_cmd_exec_cb_handler+0x136/0x1a0 [mlx5_core] ? mlx5_cmd_cleanup_async_ctx+0x220/0x220 [mlx5_core] ? mlx5_cmd_cleanup_async_ctx+0x220/0x220 [mlx5_core] mlx5_cmd_comp_handler+0x65a/0x12b0 [mlx5_core] ? dump_command+0xcc0/0xcc0 [mlx5_core] ? lockdep_hardirqs_on_prepare+0x400/0x400 ? cmd_comp_notifier+0x7e/0xb0 [mlx5_core] cmd_comp_notifier+0x7e/0xb0 [mlx5_core] atomic_notifier_call_chain+0xd7/0x1d0 mlx5_eq_async_int+0x3ce/0xa20 [mlx5_core] atomic_notifier_call_chain+0xd7/0x1d0 ? irq_release+0x140/0x140 [mlx5_core] irq_int_handler+0x19/0x30 [mlx5_core] __handle_irq_event_percpu+0x1f2/0x620 handle_irq_event+0xb2/0x1d0 handle_edge_irq+0x21e/0xb00 __common_interrupt+0x79/0x1a0 common_interrupt+0x78/0xa0 </IRQ> <TASK> asm_common_interrupt+0x22/0x40 RIP: 0010:default_idle+0x42/0x60 Code: c1 83 e0 07 48 c1 e9 03 83 c0 03 0f b6 14 11 38 d0 7c 04 84 d2 75 14 8b 05 eb 47 22 02 85 c0 7e 07 0f 00 2d e0 9f 48 00 fb f4 <c3> 48 c7 c7 80 08 7f 85 e8 d1 d3 3e fe eb de 66 66 2e 0f 1f 84 00 RSP: 0018:ffff888100dbfdf0 EFLAGS: 00000242 RAX: 0000000000000001 RBX: ffffffff84ecbd48 RCX: 1ffffffff0afe110 RDX: 0000000000000004 RSI: 0000000000000000 RDI: ffffffff835cc9bc RBP: 0000000000000005 R08: 0000000000000001 R09: ffff88881dec4ac3 R10: ffffed1103bd8958 R11: 0000017d0ca571c9 R12: 0000000000000005 R13: ffffffff84f024e0 R14: 0000000000000000 R15: dffffc0000000000 ? default_idle_call+0xcc/0x450 default_idle_call+0xec/0x450 do_idle+0x394/0x450 ? arch_cpu_idle_exit+0x40/0x40 ? do_idle+0x17/0x450 cpu_startup_entry+0x19/0x20 start_secondary+0x221/0x2b0 ? set_cpu_sibling_map+0x2070/0x2070 secondary_startup_64_no_verify+0xcd/0xdb </TASK> Allocated by task 49502: kasan_save_stack+0x1e/0x40 __kasan_kmalloc+0x81/0xa0 kvmalloc_node+0x48/0xe0 mlx5e_bulk_async_init+0x35/0x110 [mlx5_core] mlx5e_tls_priv_tx_list_cleanup+0x84/0x3e0 [mlx5_core] mlx5e_ktls_cleanup_tx+0x38f/0x760 [mlx5_core] mlx5e_cleanup_nic_tx+0xa7/0x100 [mlx5_core] mlx5e_detach_netdev+0x1ca/0x2b0 [mlx5_core] mlx5e_suspend+0xdb/0x140 [mlx5_core] mlx5e_remove+0x89/0x190 [mlx5_core] auxiliary_bus_remove+0x52/0x70 device_release_driver_internal+0x40f/0x650 driver_detach+0xc1/0x180 bus_remove_driver+0x125/0x2f0 auxiliary_driver_unregister+0x16/0x50 mlx5e_cleanup+0x26/0x30 [mlx5_core] cleanup+0xc/0x4e [mlx5_core] __x64_sys_delete_module+0x2b5/0x450 do_syscall_64+0x3d/0x90 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Freed by task 49502: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_set_free_info+0x20/0x30 ____kasan_slab_free+0x11d/0x1b0 kfree+0x1ba/0x520 mlx5e_tls_priv_tx_list_cleanup+0x2e7/0x3e0 [mlx5_core] mlx5e_ktls_cleanup_tx+0x38f/0x760 [mlx5_core] mlx5e_cleanup_nic_tx+0xa7/0x100 [mlx5_core] mlx5e_detach_netdev+0x1ca/0x2b0 [mlx5_core] mlx5e_suspend+0xdb/0x140 [mlx5_core] mlx5e_remove+0x89/0x190 [mlx5_core] auxiliary_bus_remove+0x52/0x70 device_release_driver_internal+0x40f/0x650 driver_detach+0xc1/0x180 bus_remove_driver+0x125/0x2f0 auxiliary_driver_unregister+0x16/0x50 mlx5e_cleanup+0x26/0x30 [mlx5_core] cleanup+0xc/0x4e [mlx5_core] __x64_sys_delete_module+0x2b5/0x450 do_syscall_64+0x3d/0x90 entry_SYSCALL_64_after_hwframe+0x46/0xb0
--- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 10 +++++----- include/linux/mlx5/driver.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +5 -5
@@ -2004,7 +2004,7 @@ void mlx5_cmd_init_async_ctx(struct mlx5_core_dev *dev, ctx->dev = dev;/* Starts at 1 to avoid doing wake_up if we are not cleaning up */ atomic_set (&ctx->num_inflight,1 ); -init_waitqueue_head (&ctx->wait); +init_completion (&ctx->inflight_done); }EXPORT_SYMBOL (mlx5_cmd_init_async_ctx);
@@ -2018,8 +2018,8 @@ EXPORT_SYMBOL(mlx5_cmd_init_async_ctx);*/ void mlx5_cmd_cleanup_async_ctx (struct mlx5_async_ctx *ctx) { -atomic_dec (&ctx->num_inflight); -wait_event (ctx->wait,atomic_read (&ctx->num_inflight) ==0 ); +if (!atomic_dec_and_test (&ctx->num_inflight)) +wait_for_completion (&ctx->inflight_done); }EXPORT_SYMBOL (mlx5_cmd_cleanup_async_ctx);
@@ -2032,7 +2032,7 @@ static void mlx5_cmd_exec_cb_handler(int status, void *_work) status =cmd_status_err (ctx->dev, status, work->opcode, work->out); work->user_callback (status, work);if (atomic_dec_and_test (&ctx->num_inflight)) -wake_up (&ctx->wait); +complete (&ctx->inflight_done); } int mlx5_cmd_exec_cb(struct mlx5_async_ctx *ctx, void *in, int in_size,
@@ -2050,7 +2050,7 @@ int mlx5_cmd_exec_cb(struct mlx5_async_ctx *ctx, void *in, int in_size, ret =cmd_exec (ctx->dev, in, in_size, out, out_size, mlx5_cmd_exec_cb_handler, work, false);if (ret &&atomic_dec_and_test (&ctx->num_inflight)) -wake_up (&ctx->wait); +complete (&ctx->inflight_done);return ret; }
include/linux/mlx5/driver.h +1 -1
@@ -973,7 +973,7 @@ void mlx5_cmd_allowed_opcode(struct mlx5_core_dev *dev, u16 opcode);struct mlx5_async_ctx {struct mlx5_core_dev *dev;atomic_t num_inflight; -struct wait_queue_head wait; +struct completion inflight_done; };struct mlx5_async_work ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 230/240 net/mlx5e: TC, Reject forwarding from internal port to internal port
In reply to Greg Kroah-HartmanFrom: Ariel Levkovich <[email protected]>
[ Upstream commit f382a2413dae8c855226a72600812a4b37432c48 ]
Reject TC rules that forward from internal port to internal port as it is not supported.
This include rules that are explicitly have internal port as the filter device as well as rules that apply on tunnel interfaces as the route device for the tunnel interface can be an internal port.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +11 -1
@@ -4052,6 +4052,7 @@ parse_tc_fdb_actions(struct mlx5e_priv *priv,struct mlx5e_tc_flow_parse_attr *parse_attr;struct mlx5_flow_attr *attr = flow->attr;struct mlx5_esw_flow_attr *esw_attr; +struct net_device *filter_dev;int err; err =flow_action_supported (flow_action, extack);
@@ -4060,6 +4061,7 @@ parse_tc_fdb_actions(struct mlx5e_priv *priv, esw_attr = attr->esw_attr; parse_attr = attr->parse_attr; + filter_dev = parse_attr->filter_dev; parse_state = &parse_attr->parse_state;mlx5e_tc_act_init_parse_state (parse_state, flow, flow_action, extack); parse_state->ct_priv =get_ct_priv (priv);
@@ -4069,13 +4071,21 @@ parse_tc_fdb_actions(struct mlx5e_priv *priv,return err;/* Forward to/from internal port can only have 1 dest */ -if ((netif_is_ovs_master (parse_attr->filter_dev) || esw_attr->dest_int_port) && +if ((netif_is_ovs_master (filter_dev) || esw_attr->dest_int_port) && esw_attr->out_count >1 ) {NL_SET_ERR_MSG_MOD (extack,"Rules with internal port can have only one destination" );return -EOPNOTSUPP ; } +/* Forward from tunnel/internal port to internal port is not supported */ +if ((mlx5e_get_tc_tun (filter_dev) ||netif_is_ovs_master (filter_dev)) && + esw_attr->dest_int_port) { +NL_SET_ERR_MSG_MOD (extack, +"Forwarding from tunnel/internal port to internal port is not supported" ); +return -EOPNOTSUPP ; + } + err =actions_prepare_mod_hdr_actions (priv, flow, attr, extack);if (err)return err;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 231/240 net/mlx5: Update fw fatal reporter state on PCI handlers successful recover
In reply to Greg Kroah-HartmanFrom: Roy Novich <[email protected]>
[ Upstream commit 416ef713631937cf5452476a7f1041a3ae7b06c6 ]
Update devlink health fw fatal reporter state to "healthy" is needed by strictly calling devlink_health_reporter_state_update() after recovery was done by PCI error handler. This is needed when fw_fatal reporter was triggered due to PCI error. Poll health is called and set reporter state to error. Health recovery failed (since EEH didn't re-enable the PCI). PCI handlers keep on recover flow and succeed later without devlink acknowledgment. Fix this by adding devlink state update at the end of the PCI handler recovery process.
--- drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/main.c +4 -0
@@ -1833,6 +1833,10 @@ static void mlx5_pci_resume(struct pci_dev *pdev) err =mlx5_load_one (dev, false); +if (!err) +devlink_health_reporter_state_update (dev->priv.health.fw_fatal_reporter, +DEVLINK_HEALTH_REPORTER_STATE_HEALTHY ); +mlx5_pci_trace (dev,"Done, err = %d, device %s\n" , err, !err ?"recovered" :"Failed" ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 232/240 net/mlx5: Fix crash during sync firmware reset
In reply to Greg Kroah-HartmanFrom: Suresh Devarakonda <[email protected]>
[ Upstream commit aefb62a9988749703435e941704624949a80a2a9 ]
When setting Bluefield to DPU NIC mode using mlxconfig tool + sync firmware reset flow, we run into scenario where the host was not eswitch manager at the time of mlx5 driver load but becomes eswitch manager after the sync firmware reset flow. This results in null pointer access of mpfs structure during mac filter add. This change prevents null pointer access but mpfs table entries will not be added.
--- drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c +3 -3
@@ -122,7 +122,7 @@ void mlx5_mpfs_cleanup(struct mlx5_core_dev *dev) {struct mlx5_mpfs *mpfs = dev->priv.mpfs; -if (!MLX5_ESWITCH_MANAGER (dev)) +if (!mpfs)return ;WARN_ON (!hlist_empty (mpfs->hash));
@@ -137,7 +137,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac)int err =0 ;u32 index; -if (!MLX5_ESWITCH_MANAGER (dev)) +if (!mpfs)return 0 ;mutex_lock (&mpfs->lock);
@@ -185,7 +185,7 @@ int mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac)int err =0 ;u32 index; -if (!MLX5_ESWITCH_MANAGER (dev)) +if (!mpfs)return 0 ;mutex_lock (&mpfs->lock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 233/240 net: do not sense pfmemalloc status in skb_append_pagefrags()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 228ebc41dfab5b5d34cd76835ddb0ca8ee12f513 ]
skb_append_pagefrags() is used by af_unix and udp sendpage() implementation so far.
In commit 326140063946 ("tcp: TX zerocopy should not sense pfmemalloc status") we explained why we should not sense pfmemalloc status for pages owned by user space.
We should also use skb_fill_page_desc_noacc()
in skb_append_pagefrags() to avoid following KCSAN report:
BUG: KCSAN: data-race in lru_add_fn / skb_append_pagefrags
write to 0xffffea00058fc1c8 of 8 bytes by task 17319 on cpu 0:
__list_add include/linux/list.h:73 [inline] list_add include/linux/list.h:88 [inline] lruvec_add_folio include/linux/mm_inline.h:323 [inline] lru_add_fn+0x327/0x410 mm/swap.c:228 folio_batch_move_lru+0x1e1/0x2a0 mm/swap.c:246 lru_add_drain_cpu+0x73/0x250 mm/swap.c:669 lru_add_drain+0x21/0x60 mm/swap.c:773 free_pages_and_swap_cache+0x16/0x70 mm/swap_state.c:311 tlb_batch_pages_flush mm/mmu_gather.c:59 [inline] tlb_flush_mmu_free mm/mmu_gather.c:256 [inline] tlb_flush_mmu+0x5b2/0x640 mm/mmu_gather.c:263 tlb_finish_mmu+0x86/0x100 mm/mmu_gather.c:363 exit_mmap+0x190/0x4d0 mm/mmap.c:3098 __mmput+0x27/0x1b0 kernel/fork.c:1185 mmput+0x3d/0x50 kernel/fork.c:1207 copy_process+0x19fc/0x2100 kernel/fork.c:2518 kernel_clone+0x166/0x550 kernel/fork.c:2671 __do_sys_clone kernel/fork.c:2812 [inline] __se_sys_clone kernel/fork.c:2796 [inline] __x64_sys_clone+0xc3/0xf0 kernel/fork.c:2796 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
read to 0xffffea00058fc1c8 of 8 bytes by task 17325 on cpu 1:
page_is_pfmemalloc include/linux/mm.h:1817 [inline] __skb_fill_page_desc include/linux/skbuff.h:2432 [inline] skb_fill_page_desc include/linux/skbuff.h:2453 [inline] skb_append_pagefrags+0x210/0x600 net/core/skbuff.c:3974 unix_stream_sendpage+0x45e/0x990 net/unix/af_unix.c:2338 kernel_sendpage+0x184/0x300 net/socket.c:3561 sock_sendpage+0x5a/0x70 net/socket.c:1054 pipe_to_sendpage+0x128/0x160 fs/splice.c:361 splice_from_pipe_feed fs/splice.c:415 [inline] __splice_from_pipe+0x222/0x4d0 fs/splice.c:559 splice_from_pipe fs/splice.c:594 [inline] generic_splice_sendpage+0x89/0xc0 fs/splice.c:743 do_splice_from fs/splice.c:764 [inline] direct_splice_actor+0x80/0xa0 fs/splice.c:931 splice_direct_to_actor+0x305/0x620 fs/splice.c:886 do_splice_direct+0xfb/0x180 fs/splice.c:974 do_sendfile+0x3bf/0x910 fs/read_write.c:1255 __do_sys_sendfile64 fs/read_write.c:1323 [inline] __se_sys_sendfile64 fs/read_write.c:1309 [inline] __x64_sys_sendfile64+0x10c/0x150 fs/read_write.c:1309 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
value changed: 0x0000000000000000 -> 0xffffea00058fc188
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 17325 Comm: syz-executor.0 Not tainted 6.1.0-rc1-syzkaller-00158-g440b7895c990-dirty #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/11/2022
--- net/core/skbuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/skbuff.c +1 -1
@@ -3868,7 +3868,7 @@ int skb_append_pagefrags(struct sk_buff *skb, struct page *page, }else if (i <MAX_SKB_FRAGS ) {skb_zcopy_downgrade_managed (skb);get_page (page); -skb_fill_page_desc (skb, i, page, offset, size); +skb_fill_page_desc_noacc (skb, i, page, offset, size); }else {return -EMSGSIZE ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 234/240 kcm: do not sense pfmemalloc status in kcm_sendpage()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit ee15e1f38dc201fa7d63c13aa258b728dce27f4d ]
Similar to changes done in TCP in blamed commit. We should not sense pfmemalloc status in sendpage() methods.
--- net/kcm/kcmsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/kcm/kcmsock.c +1 -1
@@ -839,7 +839,7 @@ static ssize_t kcm_sendpage(struct socket *sock, struct page *page, }get_page (page); -skb_fill_page_desc (skb, i, page, offset, size); +skb_fill_page_desc_noacc (skb, i, page, offset, size);skb_shinfo (skb)->flags |=SKBFL_SHARED_FRAG ; coalesced:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 235/240 net: enetc: survive memory pressure without crashing
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 84ce1ca3fe9e1249bf21176ff162200f1c4e5ed1 ]
Under memory pressure, enetc_refill_rx_ring() may fail, and when called during the enetc_open() -> enetc_setup_rxbdr() procedure, this is not checked for.
An extreme case of memory pressure will result in exactly zero buffers being allocated for the RX ring, and in such a case it is expected that hardware drops all RX packets due to lack of buffers.
This does not happen, because the reset-default value of the consumer and produces index is 0, and this makes the ENETC think that all buffers have been initialized and that it owns them (when in reality none were).
The hardware guide explains this best:
| Configure the receive ring producer index register RBaPIR with a value | of 0. The producer index is initially configured by software but owned | by hardware after the ring has been enabled. Hardware increments the | index when a frame is received which may consume one or more BDs. | Hardware is not allowed to increment the producer index to match the | consumer index since it is used to indicate an empty condition. The ring | can hold at most RBLENR[LENGTH]-1 received BDs. | | Configure the receive ring consumer index register RBaCIR. The | consumer index is owned by software and updated during operation of the | of the BD ring by software, to indicate that any receive data occupied | in the BD has been processed and it has been prepared for new data. | - If consumer index and producer index are initialized to the same | value, it indicates that all BDs in the ring have been prepared and | hardware owns all of the entries. | - If consumer index is initialized to producer index plus N, it would | indicate N BDs have been prepared. Note that hardware cannot start if | only a single buffer is prepared due to the restrictions described in | (2). | - Software may write consumer index to match producer index anytime | while the ring is operational to indicate all received BDs prior have | been processed and new BDs prepared for hardware.
Normally, the value of rx_ring->rcir (consumer index) is brought in sync with the rx_ring->next_to_use software index, but this only happens if page allocation ever succeeded.
When PI==CI==0, the hardware appears to receive frames and write them to DMA address 0x0 (?!), then set the READY bit in the BD.
The enetc_clean_rx_ring() function (and its XDP derivative) is naturally not prepared to handle such a condition. It will attempt to process those frames using the rx_swbd structure associated with index i of the RX ring, but that structure is not fully initialized (enetc_new_page() does all of that). So what happens next is undefined behavior.
To operate using no buffer, we must initialize the CI to PI + 1, which will block the hardware from advancing the CI any further, and drop everything.
The issue was seen while adding support for zero-copy AF_XDP sockets, where buffer memory comes from user space, which can even decide to supply no buffers at all (example: "xdpsock --txonly"). However, the bug is present also with the network stack code, even though it would take a very determined person to trigger a page allocation failure at the perfect time (a series of ifup/ifdown under memory pressure should eventually reproduce it given enough retries).
--- drivers/net/ethernet/freescale/enetc/enetc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/freescale/enetc/enetc.c +5 -0
@@ -2090,7 +2090,12 @@ static void enetc_setup_rxbdr(struct enetc_hw *hw, struct enetc_bdr *rx_ring)else enetc_rxbdr_wr (hw, idx,ENETC_RBBSR ,ENETC_RXB_DMA_SIZE ); +/* Also prepare the consumer index in case page allocation never +* succeeds. In that case, hardware will never advance producer index +* to match consumer index, and will drop all frames. +*/ enetc_rxbdr_wr (hw, idx,ENETC_RBPIR ,0 ); +enetc_rxbdr_wr (hw, idx,ENETC_RBCIR ,1 );/* enable Rx ints by setting pkt thr to 1 */ enetc_rxbdr_wr (hw, idx,ENETC_RBICR0 ,ENETC_RBICR0_ICEN |0x1 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 236/240 riscv: mm: add missing memcpy in kasan_init
In reply to Greg Kroah-HartmanFrom: Qinglin Pan <[email protected]>
[ Upstream commit 9f2ac64d6ca60db99132e08628ac2899f956a0ec ]
Hi Atish,
It seems that the panic is due to the missing memcpy during kasan_init. Could you please check whether this patch is helpful?
When doing kasan_populate, the new allocated base_pud/base_p4d should contain kasan_early_shadow_{pud, p4d}'s content. Add the missing memcpy to avoid page fault when read/write kasan shadow region.
Tested on:
- qemu with sv57 and CONFIG_KASAN on.
- qemu with sv48 and CONFIG_KASAN on.
--- arch/riscv/mm/kasan_init.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/riscv/mm/kasan_init.c +6 -1
@@ -113,6 +113,8 @@ static void __init kasan_populate_pud(pgd_t *pgd, base_pud = pt_ops.get_pud_virt (pfn_to_phys (_pgd_pfn (*pgd))); }else if (pgd_none (*pgd)) { base_pud =memblock_alloc (PTRS_PER_PUD *sizeof (pud_t),PAGE_SIZE ); +memcpy (base_pud, (void *)kasan_early_shadow_pud, +sizeof (pud_t) *PTRS_PER_PUD ); }else { base_pud = (pud_t *)pgd_page_vaddr (*pgd);if (base_pud ==lm_alias (kasan_early_shadow_pud)) {
@@ -173,8 +175,11 @@ static void __init kasan_populate_p4d(pgd_t *pgd, base_p4d = pt_ops.get_p4d_virt (pfn_to_phys (_pgd_pfn (*pgd))); }else { base_p4d = (p4d_t *)pgd_page_vaddr (*pgd); -if (base_p4d ==lm_alias (kasan_early_shadow_p4d)) +if (base_p4d ==lm_alias (kasan_early_shadow_p4d)) { base_p4d =memblock_alloc (PTRS_PER_PUD *sizeof (p4d_t),PAGE_SIZE ); +memcpy (base_p4d, (void *)kasan_early_shadow_p4d, +sizeof (p4d_t) *PTRS_PER_P4D ); + } } p4dp = base_p4d +p4d_index (vaddr);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 237/240 riscv: fix detection of toolchain Zicbom support
In reply to Greg Kroah-HartmanFrom: Conor Dooley <[email protected]>
[ Upstream commit b8c86872d1dc171d8f1c137917d6913cae2fa4f2 ]
It is not sufficient to check if a toolchain supports a particular extension without checking if the linker supports that extension too. For example, Clang 15 supports Zicbom but GNU bintutils 2.35.2 does not, leading build errors like so:
riscv64-linux-gnu-ld: -march=rv64i2p0_m2p0_a2p0_c2p0_zicbom1p0_zihintpause2p0: Invalid or unknown z ISA extension: 'zicbom'
Convert CC_HAS_ZICBOM to TOOLCHAIN_HAS_ZICBOM & check if the linker also supports Zicbom.
--- arch/riscv/Kconfig | 10 ++++++---- arch/riscv/Makefile | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-)
arch/riscv/Kconfig +6 -4
@@ -402,14 +402,16 @@ config RISCV_ISA_SVPBMT If you don't know what to do here, say Y. -config CC_HAS_ZICBOM +config TOOLCHAIN_HAS_ZICBOM bool - default y if 64BIT && $(cc-option,-mabi=lp64 -march=rv64ima_zicbom) - default y if 32BIT && $(cc-option,-mabi=ilp32 -march=rv32ima_zicbom) + default y + depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64ima_zicbom) + depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32ima_zicbom) + depends on LLD_VERSION >= 150000 || LD_VERSION >= 23800 config RISCV_ISA_ZICBOM bool "Zicbom extension support for non-coherent DMA operation" - depends on CC_HAS_ZICBOM + depends on TOOLCHAIN_HAS_ZICBOM depends on !XIP_KERNEL && MMU select RISCV_DMA_NONCOHERENT select RISCV_ALTERNATIVE
arch/riscv/Makefile +1 -2
@@ -59,8 +59,7 @@ toolchain-need-zicsr-zifencei := $(call cc-option-yn, -march=$(riscv-march-y)_zi riscv-march-$(toolchain-need-zicsr-zifencei) := $(riscv-march-y)_zicsr_zifencei # Check if the toolchain supports Zicbom extension -toolchain-supports-zicbom := $(call cc-option-yn, -march=$(riscv-march-y)_zicbom) -riscv-march-$(toolchain-supports-zicbom) := $(riscv-march-y)_zicbom +riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZICBOM) := $(riscv-march-y)_zicbom # Check if the toolchain supports Zihintpause extension toolchain-supports-zihintpause := $(call cc-option-yn, -march=$(riscv-march-y)_zihintpause)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 238/240 riscv: fix detection of toolchain Zihintpause support
In reply to Greg Kroah-HartmanFrom: Conor Dooley <[email protected]>
[ Upstream commit aae538cd03bc8fc35979653d9180922d146da0ca ]
It is not sufficient to check if a toolchain supports a particular extension without checking if the linker supports that extension too. For example, Clang 15 supports Zihintpause but GNU bintutils 2.35.2 does not, leading build errors like so:
riscv64-linux-gnu-ld: -march=rv64i2p0_m2p0_a2p0_c2p0_zihintpause2p0: Invalid or unknown z ISA extension: 'zihintpause'
Add a TOOLCHAIN_HAS_ZIHINTPAUSE which checks if each of the compiler, assembler and linker support the extension. Replace the ifdef in the vdso with one depending on this new symbol.
--- arch/riscv/Kconfig | 7 +++++++ arch/riscv/Makefile | 3 +-- arch/riscv/include/asm/vdso/processor.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-)
arch/riscv/Kconfig +7 -0
@@ -426,6 +426,13 @@ config RISCV_ISA_ZICBOM If you don't know what to do here, say Y. +config TOOLCHAIN_HAS_ZIHINTPAUSE + bool + default y + depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64ima_zihintpause) + depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32ima_zihintpause) + depends on LLD_VERSION >= 150000 || LD_VERSION >= 23600 + config FPU bool "FPU support" default y
arch/riscv/Makefile +1 -2
@@ -62,8 +62,7 @@ riscv-march-$(toolchain-need-zicsr-zifencei) := $(riscv-march-y)_zicsr_zifencei riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZICBOM) := $(riscv-march-y)_zicbom # Check if the toolchain supports Zihintpause extension -toolchain-supports-zihintpause := $(call cc-option-yn, -march=$(riscv-march-y)_zihintpause) -riscv-march-$(toolchain-supports-zihintpause) := $(riscv-march-y)_zihintpause +riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE) := $(riscv-march-y)_zihintpause KBUILD_CFLAGS += -march=$(subst fd,,$(riscv-march-y)) KBUILD_AFLAGS += -march=$(riscv-march-y)
arch/riscv/include/asm/vdso/processor.h +1 -1
@@ -21,7 +21,7 @@ static inline void cpu_relax(void)* Reduce instruction retirement. * This assumes the PC changes. */ -#ifdef __riscv_zihintpause +#ifdef CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE __asm__ __volatile__ ("pause" );#else /* Encoding of the pause instruction */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 239/240 arm64: Add AMPERE1 to the Spectre-BHB affected list
In reply to Greg Kroah-HartmanFrom: D Scott Phillips <[email protected]>
[ Upstream commit 0e5d5ae837c8ce04d2ddb874ec5f920118bd9d31 ]
Per AmpereOne erratum AC03_CPU_12, "Branch history may allow control of speculative execution across software contexts," the AMPERE1 core needs the bhb clearing loop to mitigate Spectre-BHB, with a loop iteration count of 11.
--- arch/arm64/include/asm/cputype.h | 4 ++++ arch/arm64/kernel/proton-pack.c | 6 ++++++ 2 files changed, 10 insertions(+)
arch/arm64/include/asm/cputype.h +4 -0
@@ -60,6 +60,7 @@#define ARM_CPU_IMP_FUJITSU 0x46#define ARM_CPU_IMP_HISI 0x48#define ARM_CPU_IMP_APPLE 0x61 +#define ARM_CPU_IMP_AMPERE 0xC0#define ARM_CPU_PART_AEM_V8 0xD0F#define ARM_CPU_PART_FOUNDATION 0xD00
@@ -123,6 +124,8 @@#define APPLE_CPU_PART_M1_ICESTORM_MAX 0x028#define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029 +#define AMPERE_CPU_PART_AMPERE1 0xAC3 +#define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)#define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)#define MIDR_CORTEX_A72 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72)
@@ -172,6 +175,7 @@#define MIDR_APPLE_M1_FIRESTORM_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_PRO)#define MIDR_APPLE_M1_ICESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX)#define MIDR_APPLE_M1_FIRESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX) +#define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1)/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */ #define MIDR_FUJITSU_ERRATUM_010001 MIDR_FUJITSU_A64FX
arch/arm64/kernel/proton-pack.c +6 -0
@@ -868,6 +868,10 @@ u8 spectre_bhb_loop_affected(int scope) MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N1), {}, }; +static const struct midr_range spectre_bhb_k11_list[] = { +MIDR_ALL_VERSIONS (MIDR_AMPERE1 ), + {}, + };static const struct midr_range spectre_bhb_k8_list[] = {MIDR_ALL_VERSIONS (MIDR_CORTEX_A72 ),MIDR_ALL_VERSIONS (MIDR_CORTEX_A57 ),
@@ -878,6 +882,8 @@ u8 spectre_bhb_loop_affected(int scope) k =32 ; else if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k24_list)) k =24 ; + else if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k11_list)) + k =11 ; else if (is_midr_in_range_list(read_cpuid_id(), spectre_bhb_k8_list)) k =8 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 240/240 tcp/udp: Fix memory leak in ipv6_renew_options().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
commit 3c52c6bb831f6335c176a0fc7214e26f43adbd11 upstream.
syzbot reported a memory leak [0] related to IPV6_ADDRFORM.
The scenario is that while one thread is converting an IPv6 socket into IPv4 with IPV6_ADDRFORM, another thread calls do_ipv6_setsockopt() and allocates memory to inet6_sk(sk)->XXX after conversion.
Then, the converted sk with (tcp|udp)_prot never frees the IPv6 resources, which inet6_destroy_sock() should have cleaned up.
setsockopt(IPV6_ADDRFORM) setsockopt(IPV6_DSTOPTS)
+-----------------------+ +----------------------+
- do_ipv6_setsockopt(sk, ...)
- sockopt_lock_sock(sk) - do_ipv6_setsockopt(sk, ...)
- lock_sock(sk) ^._ called via tcpv6_prot
- WRITE_ONCE(sk->sk_prot, &tcp_prot) before WRITE_ONCE()
- xchg(&np->opt, NULL)
- txopt_put(opt)
- sockopt_release_sock(sk)
- release_sock(sk) - sockopt_lock_sock(sk)
- lock_sock(sk)
- ipv6_set_opt_hdr(sk, ...)
- ipv6_update_options(sk, opt)
- xchg(&inet6_sk(sk)->opt, opt) ^._ opt is never freed.
- sockopt_release_sock(sk)
- release_sock(sk)
Since IPV6_DSTOPTS allocates options under lock_sock(), we can avoid this memory leak by testing whether sk_family is changed by IPV6_ADDRFORM after acquiring the lock.
This issue exists from the initial commit between IPV6_ADDRFORM and IPV6_PKTOPTIONS.
[0]:
BUG: memory leak
unreferenced object 0xffff888009ab9f80 (size 96):
comm "syz-executor583", pid 328, jiffies 4294916198 (age 13.034s)
hex dump (first 32 bytes):
01 00 00 00 48 00 00 00 08 00 00 00 00 00 00 00 ....H...........
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<000000002ee98ae1>] kmalloc include/linux/slab.h:605 [inline]
[<000000002ee98ae1>] sock_kmalloc+0xb3/0x100 net/core/sock.c:2566
[<0000000065d7b698>] ipv6_renew_options+0x21e/0x10b0 net/ipv6/exthdrs.c:1318
[<00000000a8c756d7>] ipv6_set_opt_hdr net/ipv6/ipv6_sockglue.c:354 [inline]
[<00000000a8c756d7>] do_ipv6_setsockopt.constprop.0+0x28b7/0x4350 net/ipv6/ipv6_sockglue.c:668
[<000000002854d204>] ipv6_setsockopt+0xdf/0x190 net/ipv6/ipv6_sockglue.c:1021
[<00000000e69fdcf8>] tcp_setsockopt+0x13b/0x2620 net/ipv4/tcp.c:3789
[<0000000090da4b9b>] __sys_setsockopt+0x239/0x620 net/socket.c:2252
[<00000000b10d192f>] __do_sys_setsockopt net/socket.c:2263 [inline]
[<00000000b10d192f>] __se_sys_setsockopt net/socket.c:2260 [inline]
[<00000000b10d192f>] __x64_sys_setsockopt+0xbe/0x160 net/socket.c:2260
[<000000000a80d7aa>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
[<000000000a80d7aa>] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
[<000000004562b5c6>] entry_SYSCALL_64_after_hwframe+0x63/0xcd--- net/ipv6/ipv6_sockglue.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/ipv6/ipv6_sockglue.c +7 -0
@@ -419,6 +419,12 @@ static int do_ipv6_setsockopt(struct socrtnl_lock ();lock_sock (sk); +/* Another thread has converted the socket into IPv4 with +* IPV6_ADDRFORM concurrently. +*/ +if (unlikely (sk->sk_family !=AF_INET6 )) + goto unlock; +switch (optname) {case IPV6_ADDRFORM :
@@ -994,6 +1000,7 @@ done:break ; } +unlock:release_sock (sk);if (needs_rtnl)rtnl_unlock ();
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.7 release. There are 240 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 Fri, 04 Nov 2022 02:20:38 +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.0.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
No new regressions for Tegra ...
Test results for stable-v6.0:
11 builds: 11 pass, 0 fail
28 boots: 28 pass, 0 fail
130 tests: 129 pass, 1 failLinux version: 6.0.7-rc1-g436175d0f780
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Test failures: tegra194-p2972-0000: boot.py
Jon
Signature · 1 line
nvpublic
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.7 release. There are 240 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 cross-compiled for arm64 (bcm2711_defconfig, GCC 10.2.0) and powerpc (ps3_defconfig, GCC 12.2.0).
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.7 release. There are 240 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 Fri, 04 Nov 2022 02:20:38 +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.0.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Hey Greg,
Ran tests and boot tested on my system, no regressions found
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
NOTE:
We LKFT running same test suites on multiple configurations builds on latest toolchains and on real hardware and qemu 's.
Because of the above reason we have been finding mixed results. For example, Due to the slowness of the qemu few tests got timeout but the same test passed on real hardware.
* qemu-arm64-gcc-12-lkftconfig-debug-kmemleak, ltp-cve
- cve-2017-15299
- cve-2017-15951
tst_test.c:1524: TINFO: Timeout per run is 0h 02m 30s request_key03.c:59: TCONF: kernel doesn't support key type 'encrypted' request_key03.c:59: TCONF: kernel doesn't support key type 'trusted' <47>[ 759.437664] systemd-journald[212]: Sent WATCHDOG=1 notification. request_key03.c:135: TPASS: didn't crash while updating key of type 'user' <47>[ 869.408908] systemd-journald[212]: Sent WATCHDOG=1 notification. Test timeouted, sending SIGKILL!
tst_test.c:1569: TINFO: Killed the leftover descendant processes tst_test.c:1575: TINFO: If you are running on slow machine, try
exporting LTP_TIMEOUT_MUL > 1
tst_test.c:1577: TBROK: Test killed! (timeout?)
- cve-2020-25705
tst_kconfig.c:82: TINFO: Parsing kernel config '/proc/config.gz'
tst_test.c:1524: TINFO: Timeout per run is 0h 02m 30s
<6>[ 1826.776891] IPv6: ADDRCONF(NETDEV_CHANGE): ltp_veth1: link
becomes ready
<6>[ 1826.781937] IPv6: ADDRCONF(NETDEV_CHANGE): ltp_veth2: link
becomes ready
icmp_rate_limit01.c:230: TINFO: Batch 0: Got 100 ICMP errors
icmp_rate_limit01.c:234: TINFO: Batch 1: Got 100 ICMP errors
icmp_rate_limit01.c:234: TINFO: Batch 2: Got 100 ICMP errors
icmp_rate_limit01.c:234: TINFO: Batch 3: Got 100 ICMP errors
icmp_rate_limit01.c:234: TINFO: Batch 4: Got 100 ICMP errors
icmp_rate_limit01.c:234: TINFO: Batch 5: Got 100 ICMP errors
icmp_rate_limit01.c:234: TINFO: Batch 6: Got 100 ICMP errors
icmp_rate_limit01.c:234: TINFO: Batch 7: Got 100 ICMP errors
icmp_rate_limit01.c:238: TFAIL: ICMP rate limit not randomized,system is vulnerable
HINT: You _MAY_ be missing kernel fixes:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b38e7819cae9
HINT: You _MAY_ be vulnerable to CVE(s):
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-25705
Summary:
passed 0
failed 1
[1] https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.0.y/build/v6.0.6-241-g436175d0f780/testrun/12807800/suite/ltp-cve/test/cve-2017-15299/details/
[2] https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.0.y/build/v6.0.6-241-g436175d0f780/testrun/12807800/suite/ltp-cve/test/cve-2017-15299/log* qemu-arm64-64k-page-size, ltp-hugetlb
- hugemmap05
- hugemmap05_1
- hugemmap05_2
- hugemmap05_3
All these test failed due to ENOMEM.
hugemmap05.c:83: TBROK: mmap((nil),1610612736,3,1,3,0) failed:
ENOMEM (12)
hugemmap05.c:83: TBROK: mmap((nil),1610612736,3,1,3,0) failed:
ENOMEM (12)
These failures only seen on qemu-arm64 but test passed on
bcm2711-rpi-4-b-64k_page_size device with same config.
[3] https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.0.y/build/v6.0.6-241-g436175d0f780/testrun/12807533/suite/ltp-hugetlb/test/hugemmap05/log
[4] https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.0.y/build/v6.0.6-241-g436175d0f780/testrun/12807533/suite/ltp-hugetlb/test/hugemmap05/details/
* qemu-arm64-clang-15-lkftconfig, ltp-syscalls
- add_key05
add_key05.c:136: TFAIL: max used bytes 19991, key allow max bytes 20000
- futex_cmp_requeue01
futex_cmp_requeue01.c:68: TFAIL: process 89996 wasn't woken up:
ETIMEDOUT (110)
[5] https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.0.y/build/v6.0.6-241-g436175d0f780/testrun/12808167/suite/ltp-syscalls/test/add_key05/log* qemu-arm64-gcc-12-lkftconfig-debug-kmemleak, ltp-syscalls
- request_key03
tst_test.c:1524: TINFO: Timeout per run is 0h 02m 30s request_key03.c:59: TCONF: kernel doesn't support key type 'encrypted' request_key03.c:59: TCONF: kernel doesn't support key type 'trusted' <47>[ 4891.998441] systemd-journald[211]: Sent WATCHDOG=1 notification. request_key03.c:135: TPASS: didn't crash while updating key of type 'user' Test timeouted, sending SIGKILL!
tst_test.c:1569: TINFO: Killed the leftover descendant processes tst_test.c:1575: TINFO: If you are running on slow machine, try
exporting LTP_TIMEOUT_MUL > 1
tst_test.c:1577: TBROK: Test killed! (timeout?)
[6] https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.0.y/build/v6.0.6-241-g436175d0f780/testrun/12810384/suite/ltp-syscalls/test/request_key03/log* qemu-i386, ltp-fs_bind
- fs_bind_rbind07_sh
fs_bind_rbind07 1 TPASS: umount share2 passed as expected
umount: /scratch/ltp-BdrYN1uDRZ/LTP_fs_bind_rbind07.R6J2DAH7FB/sandbox/parent2:
target is busy.
fs_bind_rbind07 1 TFAIL: umount parent2 failed unexpectedly
fs_bind_rbind07 1 TPASS: umount parent2 passed as expected
fs_bind_rbind07 1 TPASS: umount parent1 passed as expected
fs_bind_rbind07 1 TFAIL: There are still mounts in the sandbox:\nparent2
[7] https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.0.y/build/v6.0.6-241-g436175d0f780/testrun/12808354/suite/ltp-fs_bind/test/fs_bind_rbind07_sh/log
## Build
* kernel: 6.0.7-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-6.0.y
* git commit: 436175d0f780af8302164b3102ecf0ff99f7a376
* git describe: v6.0.6-241-g436175d0f780
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.0.y/build/v6.0.6-241-g436175d0f780
## No Test Regressions (compared to v6.0.5-94-gd5a53a666fb9)
## No Metric Regressions (compared to v6.0.5-94-gd5a53a666fb9)
## No Test Fixes (compared to v6.0.5-94-gd5a53a666fb9)
## No Metric Fixes (compared to v6.0.5-94-gd5a53a666fb9)
## Test result summary
total: 160584, pass: 131298, fail: 11489, skip: 17432, xfail: 365
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 149 total, 146 passed, 3 failed
* arm64: 47 total, 47 passed, 0 failed
* i386: 37 total, 36 passed, 1 failed
* mips: 27 total, 26 passed, 1 failed
* parisc: 6 total, 6 passed, 0 failed
* powerpc: 34 total, 30 passed, 4 failed
* riscv: 12 total, 12 passed, 0 failed
* s390: 12 total, 12 passed, 0 failed
* sh: 12 total, 12 passed, 0 failed
* sparc: 6 total, 6 passed, 0 failed
* x86_64: 40 total, 40 passed, 0 failed
## Test suites summary
* fwts
* igt-gpu-tools
* kselftest-android
* kselftest-arm64
* kselftest-arm64/arm64.btitest.bti_c_func
* kselftest-arm64/arm64.btitest.bti_j_func
* kselftest-arm64/arm64.btitest.bti_jc_func
* kselftest-arm64/arm64.btitest.bti_none_func
* kselftest-arm64/arm64.btitest.nohint_func
* kselftest-arm64/arm64.btitest.paciasp_func
* kselftest-arm64/arm64.nobtitest.bti_c_func
* kselftest-arm64/arm64.nobtitest.bti_j_func
* kselftest-arm64/arm64.nobtitest.bti_jc_func
* kselftest-arm64/arm64.nobtitest.bti_none_func
* kselftest-arm64/arm64.nobtitest.nohint_func
* kselftest-arm64/arm64.nobtitest.paciasp_func
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* 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-vm
* 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-open-posix-tests
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* perf
* perf/Zstd-perf.data-compression
* rcutorture
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.7 release. There are 240 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 Fri, 04 Nov 2022 02:20:38 +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.0.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.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 735 lines
This is the start of the stable review cycle for the 6.0.7 release. There are 240 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 Fri, 04 Nov 2022 02:20:38 +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.0.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.0.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 6.0.7-rc1Kuniyuki Iwashima <[email protected]>
tcp/udp: Fix memory leak inipv6_renew_options().D Scott Phillips <[email protected]>
arm64: Add AMPERE1 to the Spectre-BHB affected listConor Dooley <[email protected]>
riscv: fix detection of toolchain Zihintpause supportConor Dooley <[email protected]>
riscv: fix detection of toolchain Zicbom supportQinglin Pan <[email protected]>
riscv: mm: add missing memcpy inkasan_initVladimir Oltean <[email protected]>
net: enetc: survive memory pressure without crashingEric Dumazet <[email protected]>
kcm: do not sense pfmemalloc status inkcm_sendpage()Eric Dumazet <[email protected]>
net: do not sense pfmemalloc status inskb_append_pagefrags()Suresh Devarakonda <[email protected]>
net/mlx5: Fix crash during sync firmware resetRoy Novich <[email protected]>
net/mlx5: Update fw fatal reporter state on PCI handlers successful recoverAriel Levkovich <[email protected]>
net/mlx5e: TC, Reject forwarding from internal port to internal portTariq Toukan <[email protected]>
net/mlx5: Fix possible use-after-free in async command interfaceSaeed Mahameed <[email protected]>
net/mlx5: ASO, Create the ASO SQ with the correct timestamp formatPaul Blakey <[email protected]>
net/mlx5e: Update restore chain id for slow path packetsAya Levin <[email protected]>
net/mlx5e: Extend SKB room check to include PTP-SQRongwei Liu <[email protected]>
net/mlx5: DR, Fix matcher disconnect error flowMoshe Shemesh <[email protected]>
net/mlx5: Wait for firmware to enable CRS beforepci_restore_stateHyong Youb Kim <[email protected]>
net/mlx5e: Do not increment ESN when updating IPsec ESN stateZhengchao Shao <[email protected]>
netdevsim: remove dir innsim_dev_debugfs_init()when creating ports dir failedZhengchao Shao <[email protected]>
netdevsim: fix memory leak innsim_drv_probe()whennsim_dev_resources_register()failedZhengchao Shao <[email protected]>
netdevsim: fix memory leak innsim_bus_dev_new()Rafał Miłecki <[email protected]>
net: broadcom:bcm4908_enet: update TX stats after actual transmissionNicolas Dichtel <[email protected]>
nh: fix scope used to find saddr when adding non gw nhFlorian Fainelli <[email protected]>
net: bcmsysport: Indicate MAC is in charge of PHY PMYang Yingliang <[email protected]>
net: ehea: fix possible memory leak inehea_register_port()Aaron Conole <[email protected]>
openvswitch: switch from WARN topr_warnTakashi Iwai <[email protected]>
ALSA: aoa: Fix I2S device accountingYang Yingliang <[email protected]>
ALSA: aoa: i2sbus: fix possible memory leak ini2sbus_add_dev()Kunihiko Hayashi <[email protected]>
net: ethernet: ave: Fix MAC to be in charge of PHY PMJuergen Borleis <[email protected]>
net: fec: limit register access on i.MX6ULShang XiaoJing <[email protected]>
perf vendor events arm64: Fix incorrect Hisi hip08 L3 metricsSudeep Holla <[email protected]>
PM: domains: Fix handling of unavailable/disabled idle statesJisheng Zhang <[email protected]>
riscv:jump_label: mark arguments as const to satisfy asm constraintsYang Yingliang <[email protected]>
net: ksz884x: fix missingpci_disable_device()on error inpcidev_init()Slawomir Laba <[email protected]>
i40e: Fix flow-type by settingGL_HASH_INSETregistersSylwester Dziedziuch <[email protected]>
i40e: Fix VF hang when reset is triggered on another VFSlawomir Laba <[email protected]>
i40e: Fix ethtool rx-flow-hash setting for X722Eric Dumazet <[email protected]>
ipv6: ensure sane device mtu in tunnelsThomas Richter <[email protected]>
perf list: Fix PMU namepai_cryptoin perf list on s390Kajol Jain <[email protected]>
perf vendor events power10: Fix hv-24x7 metric eventsHans Verkuil <[email protected]>
media: vivid: set num_in/outputs to 0 if not supportedHans Verkuil <[email protected]>
media:videodev2.h:V4L2_DV_BT_BLANKING_HEIGHTshould check 'interlaced'Hans Verkuil <[email protected]>
media: v4l2-dv-timings: add sanity checks for blanking valuesHans Verkuil <[email protected]>
media: vivid: dev->bitmap_cap wasn't freed in all casesHans Verkuil <[email protected]>
media: vivid:s_fbuf: add more sanity checksMario Limonciello <[email protected]>
PM: hibernate: Allow hybrid sleep to work with s2idleDongliang Mu <[email protected]>
can: mcp251x:mcp251x_can_probe(): add missingunregister_candev()in error pathDongliang Mu <[email protected]>
can: mscan: mpc5xxx:mpc5xxx_can_probe(): add missingput_clock()in error pathPaolo Abeni <[email protected]>
mptcp: set msk local address earlierHoratiu Vultur <[email protected]>
net: lan966x: Stop replacing tx dcbs anddcbs_bufwhen changing MTURafael Mendonca <[email protected]>
drm/amdkfd: Fix memory leak inkfd_mem_dmamap_userptr()Jakub Kicinski <[email protected]>
net-memcg: avoid stalls when under memory pressureNeal Cardwell <[email protected]>
tcp: fix indefinite deferral of RTO with SACK renegingLu Wei <[email protected]>
tcp: fix a signed-integer-overflow bug intcp_add_backlog()Zhang Changzhong <[email protected]>
net:lantiq_etop: don't free skb when returningNETDEV_TX_BUSYZhengchao Shao <[email protected]>
net: fix UAF issue innfqnl_nf_hook_drop()whenops_init()failedEric Dumazet <[email protected]>
kcm: annotate data-races around kcm->rx_waitEric Dumazet <[email protected]>
kcm: annotate data-races around kcm->rx_psockÍñigo Huguet <[email protected]>
atlantic: fix deadlock ataq_nic_stopAnkit Nautiyal <[email protected]>
drm/i915/dp: Reset frl trained flag before restarting FRL trainingAnshuman Gupta <[email protected]>
drm/i915/dgfx: Keep PCI autosuspend control 'on' by default on all dGPURaju Rangoju <[email protected]>
amd-xgbe: add the bit rate quirk for Molex cablesRaju Rangoju <[email protected]>
amd-xgbe: fix the SFP compliance codes check for DAC cablesRaju Rangoju <[email protected]>
amd-xgbe: Yellow carp devices do not need rrcChang S. Bae <[email protected]>
x86/fpu: Fixcopy_xstate_to_uabi()to copy init states correctlyDouglas Anderson <[email protected]>
drm/bridge: ps8640: Add back the 50 ms mystery delay after HPDChen Zhongjin <[email protected]>
x86/unwind/orc: Fix unreliable stack dump with gcovAnup Patel <[email protected]>
RISC-V: KVM: Fixkvm_riscv_vcpu_timer_pending()for SstcAndrew Jones <[email protected]>
RISC-V: Fix compilation withoutRISCV_ISA_ZICBOMAndrew Jones <[email protected]>
RISC-V: KVM: Provide UAPI for Zicbom block sizeShang XiaoJing <[email protected]>
nfc:virtual_ncidev: Fix memory leak invirtual_nci_send()Sergiu Moga <[email protected]>
net: macb: Specify PHY PM management done by MACZhengchao Shao <[email protected]>
net: hinic: fix the issue of double release MBOX callback of VFZhengchao Shao <[email protected]>
net: hinic: fix the issue of CMDQ memory leaksZhengchao Shao <[email protected]>
net: hinic: fix memory leak when reading function tableZhengchao Shao <[email protected]>
net: hinic: fix incorrect assignment issue inhinic_set_interrupt_cfg()Benjamin Poirier <[email protected]>
selftests: net: Fix netdev name mismatch in cleanupBenjamin Poirier <[email protected]>
selftests: net: Fix cross-tree inclusion of scriptsHoratiu Vultur <[email protected]>
net: lan966x: Fix the rx drop counterYang Yingliang <[email protected]>
net: netsec: fix error handling innetsec_register_mdio()Xin Long <[email protected]>
tipc: fix a null-ptr-deref intipc_topsrv_acceptPaul E. McKenney <[email protected]>
rcu: Keepsynchronize_rcu()from enabling irqs in early bootMaxim Levitsky <[email protected]>
perf/x86/intel/lbr: Usesetup_clear_cpu_cap()instead ofclear_cpu_cap()Yang Yingliang <[email protected]>
ALSA: ac97: fix possible memory leak insnd_ac97_dev_register()Pierre-Louis Bossart <[email protected]>
ASoC: SOF: Intel: pci-tgl: fix ADL-N descriptorKai Vehmanen <[email protected]>
ASoC: SOF: Intel: pci-tgl: use RPL specific firmware definitionsKai Vehmanen <[email protected]>
ASoC: Intel: common: add ACPI matching tables for Raptor LakeSrinivasa Rao Mandadapu <[email protected]>
ASoC: qcom: lpass-cpu: Mark HDMI TX parity register as volatileCédric Le Goater <[email protected]>
spi: aspeed: Fix window offset of CE1Sven Schnelle <[email protected]>
selftests/ftrace: fixdynamic_eventsdependency checkPierre-Louis Bossart <[email protected]>
ASoC: SOF: Intel: pci-mtl: fix firmware nameGeert Uytterhoeven <[email protected]>
ASoC: codecs: tlv320adc3xxx: Wrap adc3xxx_i2c_remove() in __exit_p()Horatiu Vultur <[email protected]>
pinctrl: ocelot: Fix incorrect trigger of the interrupt.Yang Yingliang <[email protected]>
mtd: rawnand: intel: Add missingof_node_put()inebu_nand_probe()Martin Blumenstingl <[email protected]>
mtd: rawnand: intel: Usedevm_platform_ioremap_resource_byname()Martin Blumenstingl <[email protected]>
mtd: rawnand: intel: Remove unusednand_pamember fromebu_nand_csRafał Miłecki <[email protected]>
mtd: core: add missingof_node_get()in dynamic partitions codeRandy Dunlap <[email protected]>
arc:iounmap()arg is volatileStanislav Fomichev <[email protected]>
bpf: preventdecl_tagfrom being referenced infunc_protoLin Shengwang <[email protected]>
sched/core: Fix comparison insched_group_cookie_match()Peter Zijlstra <[email protected]>
perf: Fix missing SIGTRAPsChang S. Bae <[email protected]>
x86/fpu: Exclude dynamic states frominit_fpstateChang S. Bae <[email protected]>
x86/fpu: Fix theinit_fpstatesize check with the actual sizeChang S. Bae <[email protected]>
x86/fpu: Configureinit_fpstateattributes orderlyRobert Marko <[email protected]>
spi: qup: support using GPIO as chip select lineDouglas Anderson <[email protected]>
pinctrl: qcom: Avoid glitching lines when we first mux to outputGao Xiang <[email protected]>
erofs: fix up inplace decompression success rateYue Hu <[email protected]>
erofs: fix illegal unmapped accesses inz_erofs_fill_inode_lazy()Rob Clark <[email protected]>
drm/msm/a6xx: Fix kvzalloc vsstate_kcallocusageSrinivasa Rao Mandadapu <[email protected]>
ASoC: qcom: lpass-cpu: mark HDMI TX registers as volatileGavin Shan <[email protected]>
KVM: selftests: Fix number of pages for memory slot inmemslot_modification_stress_testRandy Dunlap <[email protected]>
ASoC: codec: tlv320adc3xxx: add GPIOLIB dependencyKuogee Hsieh <[email protected]>
drm/msm/dp: clearedDP_DOWNSPREAD_CTRLregister before start link trainingNathan Huckleberry <[email protected]>
drm/msm: Fix return type ofmdp4_lvds_connector_mode_validKuogee Hsieh <[email protected]>
drm/msm/dp: addatomic_checkto bridge opsAkhil P Oommen <[email protected]>
drm/msm/a6xx: Replacekcalloc()withkvzalloc()Paul Kocialkowski <[email protected]>
media: cedrus: Add aKconfigdependency onRESET_CONTROLLERPaul Kocialkowski <[email protected]>
media: sun8i-rotate: Add aKconfigdependency onRESET_CONTROLLERPaul Kocialkowski <[email protected]>
media: sun8i-di: Add aKconfigdependency onRESET_CONTROLLERPaul Kocialkowski <[email protected]>
media: sun4i-csi: Add aKconfigdependency onRESET_CONTROLLERPaul Kocialkowski <[email protected]>
media: sun6i-csi: Add aKconfigdependency onRESET_CONTROLLERPaul Kocialkowski <[email protected]>
media: sun8i-a83t-mipi-csi2: Add aKconfigdependency onRESET_CONTROLLERPaul Kocialkowski <[email protected]>
media: sun6i-mipi-csi2: Add aKconfigdependency onRESET_CONTROLLERChristophe JAILLET <[email protected]>
media: sunxi: Fix some error handling path ofsun6i_mipi_csi2_probe()Christophe JAILLET <[email protected]>
media: sunxi: Fix some error handling path ofsun8i_a83t_mipi_csi2_probe()Dan Carpenter <[email protected]>
media: atomisp: prevent integer overflow insh_css_set_black_frame()Sakari Ailus <[email protected]>
media: sun6i-mipi-csi2: Depend onPHY_SUN6I_MIPI_DPHYChristophe JAILLET <[email protected]>
media: ov8865: Fix an error handling path inov8865_probe()Sakari Ailus <[email protected]>
media: ar0521: Fix return value check in writing initial registersYang Yingliang <[email protected]>
media: ar0521: fix error return code inar0521_power_on()Alexander Stein <[email protected]>
media: v4l2: Fixv4l2_i2c_subdev_set_namefunction documentationMing Qian <[email protected]>
media: amphion: release m2m ctx when releasing vpu instanceWei Yongjun <[email protected]>
net: ieee802154: fix error return code indgram_bind()Nicholas Piggin <[email protected]>
powerpc/64s/interrupt: Fix clear ofPACA_IRQS_HARD_DISwhen returning to soft-masked contextManank Patel <[email protected]>
ACPI: PCC: Fix unintentional integer overflowMichał Mirosław <[email protected]>
fbdev/core: Avoid uninitialized read inaperture_remove_conflicting_pci_device()Xin Long <[email protected]>
ethtool: eeprom: fix null-deref ongenl_infoin dumpHeiko Carstens <[email protected]>
s390/pci: add missingEX_TABLEentries to __pcistg_mio_inuser()/__pcilg_mio_inuser()Heiko Carstens <[email protected]>
s390/futex: add missingEX_TABLEentry to__futex_atomic_op()Heiko Carstens <[email protected]>
s390/uaccess: add missingEX_TABLEentries to__clear_user()Peter Oberparleiter <[email protected]>
s390/cio: fix out-of-bounds access oncio_ignorefreePeter Oberparleiter <[email protected]>
s390/boot: add secure boot trailerAdrian Hunter <[email protected]>
perf auxtrace: Fix address filter symbol name match for modulesPavel Kozlov <[email protected]>
ARC: mm: fix leakage of memory allocated for PTESai Krishna Potthuri <[email protected]>
Revert "pinctrl: pinctrl-zynqmp: Add support for output-enable and bias-high-impedance"Siarhei Volkau <[email protected]>
pinctrl: Ingenic: JZ4755 bug fixesSai Krishna Potthuri <[email protected]>
Revert "dt-bindings: pinctrl-zynqmp: Add output-enable configuration"Christian A. Ehrhardt <[email protected]>
kernfs: fix use-after-free in__kernfs_removeHugh Dickins <[email protected]>
mm: prep_compound_tail() clear page->privateMel Gorman <[email protected]>
mm/huge_memory: do not clobberswp_entry_tduring THP splitWaiman Long <[email protected]>
mm/kmemleak: prevent soft lockup in kmemleak_scan()'s object iteration loopsRik van Riel <[email protected]>
mm,madvise,hugetlb: fix unexpected data loss withMADV_DONTNEEDon hugetlbfsBaolin Wang <[email protected]>
mm: migrate: fix return value if all subpages of THPs are migrated successfullyPeter Xu <[email protected]>
mm/uffd: fix vma check on userfault for wpWilliam Breathitt Gray <[email protected]>
counter: 104-quad-8: Fix race getting function mode and directionWilliam Breathitt Gray <[email protected]>
counter: microchip-tcb-capture: Handle Signal1 read and SynapseSascha Hauer <[email protected]>
mmc: sdhci-esdhc-imx: Propagate ESDHC_FLAG_HS400* only on 8bit busPatrick Thompson <[email protected]>
mmc: sdhci-pci-core: Disable ES for ASUS BIOS on Jasper LakeVincent Whitchurch <[email protected]>
mmc: core: FixWRITE_ZEROESCQE handlingMatthew Ma <[email protected]>
mmc: core: Fix kernel panic when remove non-standard SDIO cardChristian Löhle <[email protected]>
mmc: queue: Cancel recovery work on cleanupChristian Löhle <[email protected]>
mmc: block: Remove error check ofhw_reseton resetBrian Norris <[email protected]>
mmc:sdhci_am654: 'select', not 'depends'REGMAP_MMIOJames Clark <[email protected]>
coresight: cti: Fix hang incti_disable_hw()Jean-Philippe Brucker <[email protected]>
random: use arch_get_random*_early() inrandom_init()Nathan Huckleberry <[email protected]>
crypto: x86/polyval - Fix crashes when keys are not 16-byte alignedJohan Hovold <[email protected]>
drm/msm/dp: fix bridge lifetimeJohan Hovold <[email protected]>
drm/msm/dp: fix IRQ lifetimeJohan Hovold <[email protected]>
drm/msm/dp: fix aux-bus EP lifetimeJohan Hovold <[email protected]>
drm/msm/dp: fix memory corruption with too many bridgesJohan Hovold <[email protected]>
drm/msm/hdmi: fix IRQ lifetimeJohan Hovold <[email protected]>
drm/msm/hdmi: fix memory corruption with too many bridgesJohan Hovold <[email protected]>
drm/msm/dsi: fix memory corruption with too many bridgesJohan Hovold <[email protected]>
drm/msm: fix use-after-free on probe deferralJesse Zhang <[email protected]>
drm/amdkfd: correct the cache info for gfx1036Prike Liang <[email protected]>
drm/amdkfd: update gfx1037 Lx cache settingJoaquín Ignacio Aramendía <[email protected]>
drm/amd/display: Revert logic for plane modifiersChengming Gui <[email protected]>
drm/amdgpu: fix pstate setting issuePrike Liang <[email protected]>
drm/amdgpu: disallow gfxoff until GC IP blocks complete s2idle resumeLijo Lazar <[email protected]>
drm/amdgpu: Remove ATC L2 access for MMHUB 2.1.xJosé Roberto de Souza <[email protected]>
drm/i915: Extend Wa_1607297627 to Alderlake-PArunpravin Paneer Selvam <[email protected]>
drm/amdgpu: Fix for BO move issueArunpravin Paneer Selvam <[email protected]>
drm/amdgpu: Fix VRAM BO swap issueManish Rangankar <[email protected]>
scsi: qla2xxx: Use transport-defined speed mask forsupported_speedsMiquel Raynal <[email protected]>
mac802154: Fix LQI recordingBernd Edlinger <[email protected]>
exec: Copy oldsighand->action under spin-lockLi Zetao <[email protected]>
fs/binfmt_elf: Fix memory leak inload_elf_binary()Rafael J. Wysocki <[email protected]>
cpufreq:intel_pstate: hybrid: Use known scaling factor for P-coresRafael J. Wysocki <[email protected]>
cpufreq:intel_pstate: Read all MSRs on the target CPUHyunwoo Kim <[email protected]>
fbdev: smscufx: Fix several use-after-free bugsHelge Deller <[email protected]>
fbdev: stifb: Fall back tocfb_fillrect()on 32-bit HCRX cardsMatti Vaittinen <[email protected]>
iio: adxl367: Fix unsafe buffer attributesMatti Vaittinen <[email protected]>
iio: adxl372: Fix unsafe buffer attributesCosmin Tanislav <[email protected]>
iio: temperature: ltc2983: allocate iio channels onceShreeya Patel <[email protected]>
iio: light: tsl2583: Fix module unloadingMatti Vaittinen <[email protected]>
tools: iio:iio_utils: fix digit calculationMathias Nyman <[email protected]>
xhci: Remove device endpoints from bandwidth list when freeing the deviceMario Limonciello <[email protected]>
xhci-pci: Set runtime PM as default policy on all xHC 1.2 or later devicesMathias Nyman <[email protected]>
xhci: Add quirk to reset host back to default state at shutdownPhillip Lougher <[email protected]>
squashfs: fix buffer release race condition in readahead codePhillip Lougher <[email protected]>
squashfs: fix extending readahead beyond end of filePhillip Lougher <[email protected]>
squashfs: fix read regression introduced in readahead codeTony O'Brien <[email protected]>
mtd: rawnand: marvell: Use correct logic for nand-keep-configLinus Walleij <[email protected]>
mtd: parsers: bcm47xxpart: Fix halfblock readsMika Westerberg <[email protected]>
mtd: spi-nor: core: Ignore-ENOTSUPPinspi_nor_init()Zhang Qilong <[email protected]>
mtd: rawnand: tegra: Fix PM disable depth imbalance in probeJens Glathe <[email protected]>
usb: xhci: addXHCI_SPURIOUS_SUCCESSto ASM1042 despite being a V0.96 controllerJustin Chen <[email protected]>
usb: bdc: change state when port disconnectedAndrey Smirnov <[email protected]>
usb: dwc3: Don't switch OTG -> peripheral if extcon is presentPatrice Chotard <[email protected]>
usb: dwc3: st: Rely on child's compatible instead of nameHeikki Krogerus <[email protected]>
usb: typec: ucsi: acpi: Implement resume callbackHeikki Krogerus <[email protected]>
usb: typec: ucsi: Check the connection on resumeThinh Nguyen <[email protected]>
usb: dwc3: gadget: Don't delay End Transfer ondelayed_statusWesley Cheng <[email protected]>
usb: dwc3: gadget: Force sending delayed status during soft disconnectThinh Nguyen <[email protected]>
usb: dwc3: gadget: Don't set IMI forno_interruptThinh Nguyen <[email protected]>
usb: dwc3: gadget: Stop processing more requests on IMIJoel Stanley <[email protected]>
usb: gadget: aspeed: Fix probe regressionJeff Vanhoof <[email protected]>
usb: gadget: uvc: fix sg handling during video encodeDan Vacura <[email protected]>
usb: gadget: uvc: fix sg handling in error caseDan Vacura <[email protected]>
usb: gadget: uvc: fix dropped frame after missed isocGreg Kroah-Hartman <[email protected]>
Revert "usb: gadget: uvc: limitisoc_sgto super speed gadgets"Michael Grzeschik <[email protected]>
usb: gadget: uvc: limitisoc_sgto super speed gadgetsHannu Hartikainen <[email protected]>
USB: addRESET_RESUMEquirk for NVIDIA Jetson devices in RCMJason A. Donenfeld <[email protected]>
ALSA: rme9652: use explicitly signed charJason A. Donenfeld <[email protected]>
ALSA: au88x0: use explicitly signed charMaciej S. Szmigiero <[email protected]>
ALSA: ca0106: Usesnd_ctl_rename()to rename a controlMaciej S. Szmigiero <[email protected]>
ALSA: usb-audio: Usesnd_ctl_rename()to rename a controlMaciej S. Szmigiero <[email protected]>
ALSA: ac97: Usesnd_ctl_rename()to rename a controlMaciej S. Szmigiero <[email protected]>
ALSA: emu10k1: Usesnd_ctl_rename()to rename a controlMaciej S. Szmigiero <[email protected]>
ALSA: hda/realtek: Usesnd_ctl_rename()to rename a controlMaciej S. Szmigiero <[email protected]>
ALSA: control: addsnd_ctl_rename()Takashi Iwai <[email protected]>
ALSA: hda/realtek: Add another HP ZBook G9 model quirksTakashi Iwai <[email protected]>
ALSA: usb-audio: Add quirks for M-Audio Fast Track C400/600Stefan Binding <[email protected]>
ALSA: hda/realtek: Add quirk for ASUS Zenbook using CS35L41Steven Rostedt (Google) <[email protected]>
ALSA: Usedel_timer_sync()before freeing timerBiju Das <[email protected]>
can:rcar_canfd: fix channel specific IRQ handling for RZ/G2LBiju Das <[email protected]>
can:rcar_canfd:rcar_canfd_handle_global_receive(): fix IRQ storm on global FIFO receive
Quoted 9 lines
Anssi Hannula <[email protected]>
can:kvaser_usb: Fix possible completions duringinit_completionYang Yingliang <[email protected]>
can: j1939: transport: j1939_session_skb_drop_old(): spin_unlock_irqrestore() before kfree_skb()Shyam Sundar S K <[email protected]>
platform/x86/amd: pmc: removeCONFIG_DEBUG_FSchecks
Compiled and booted on my x86_64 and ARM64 test systems. No errors or regressions.
Thanks.
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.7 release. There are 240 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 Fri, 04 Nov 2022 02:20:38 +0000. Anything received after that time might be too late.
Build results:
total: 152 pass: 152 fail: 0 Qemu test results: total: 500 pass: 500 fail: 0
Guenter
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.7 release. There are 240 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 Fri, 04 Nov 2022 02:20:38 +0000. Anything received after that time might be too late.
Build test (gcc version 12.2.1 20221016):
mips: 52 configs -> no failure
arm: 100 configs -> no failure
arm64: 3 configs -> no failurex86_64: 4 configs -> no failure alpha allmodconfig -> no failure csky allmodconfig -> no failure powerpc allmodconfig -> no failure riscv allmodconfig -> no failure s390 allmodconfig -> no failure xtensa allmodconfig -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
arm64: Booted on rpi4b (4GB model). No regression. [2]
[1]. https://openqa.qa.codethink.co.uk/tests/2090
[2]. https://openqa.qa.codethink.co.uk/tests/2096
Signature · 2 lines
Regards Sudip
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.0.7 release. There are 240 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 Fri, 04 Nov 2022 02:20:38 +0000. Anything received after that time might be too late.
Hi Greg,
6.0.7-rc1 tested.
Run tested on:
- Intel Alder Lake x86_64 (nuc12 i7-1260P)
In addition - build tested for:
- Allwinner A64
- Allwinner H3
- Allwinner H5
- Allwinner H6
- NXP iMX6
- NXP iMX8
- Qualcomm Dragonboard
- Rockchip RK3288
- Rockchip RK3328
- Rockchip RK3399pro
- Samsung Exynos5422
--
Rudi