[4.9,093/171] af_packet: set defaule value for tmo

Message ID	20200102220600.081205580@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=x1Uk=2X=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Xiao Jiangfeng <xiaojiangfeng@huawei.com>, Mao Wenan <maowenan@huawei.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 4.9 093/171] af_packet: set defaule value for tmo Date: Thu, 2 Jan 2020 23:07:04 +0100 Message-Id: <20200102220600.081205580@linuxfoundation.org> In-Reply-To: <20200102220546.960200039@linuxfoundation.org> References: <20200102220546.960200039@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.9,002/171] btrfs: do not leak reloc root if we fail to read the fs root [4.9,003/171] btrfs: handle ENOENT in btrfs_uuid_tree_iterate [4.9,005/171] ALSA: hda/ca0132 - Keep power on during processing DSP response [4.9,007/171] drm: mst: Fix query_payload ack reply struct [4.9,008/171] drm/bridge: analogix-anx78xx: silence -EPROBE_DEFER warnings [4.9,010/171] spi: Add call to spi_slave_abort() function when spidev driver is released [4.9,013/171] rtlwifi: prevent memory leak in rtl_usb_probe [4.9,015/171] IB/iser: bound protection_sg size by data_sg size [4.9,018/171] media: i2c: ov2659: Fix missing 720p register config [4.9,019/171] media: ov6650: Fix stored frame format not in sync with hardware [4.9,020/171] tools/power/cpupower: Fix initializer override in hsw_ext_cstates [4.9,021/171] usb: renesas_usbhs: add suspend event support in gadget mode [4.9,023/171] regulator: max8907: Fix the usage of uninitialized variable in max8907_regulator_pr... [4.9,025/171] media: cec-funcs.h: add status_req checks [4.9,026/171] samples: pktgen: fix proc_cmd command result check logic [4.9,028/171] media: ti-vpe: vpe: fix a v4l2-compliance warning about invalid pixel format [4.9,031/171] extcon: sm5502: Reset registers during initialization [4.9,034/171] perf report: Add warning when libunwind not compiled in [4.9,035/171] usb: usbfs: Suppress problematic bind and unbind uevents. [4.9,038/171] x86/mce: Lower throttling MCE messages priority to warning [4.9,040/171] rtl8xxxu: fix RTL8723BU connection failure issue after warm reboot [4.9,041/171] x86/ioapic: Prevent inconsistent state when moving an interrupt [4.9,042/171] arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill() [4.9,044/171] pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B [4.9,047/171] spi: img-spfi: fix potential double release [4.9,048/171] ALSA: timer: Limit max amount of slave instances [4.9,050/171] perf probe: Fix to find range-only function instance [4.9,053/171] perf probe: Fix to probe an inline function which has no entry pc [4.9,055/171] perf probe: Fix to show inlined function callsite without entry_pc [4.9,057/171] perf probe: Skip overlapped location on searching variables [4.9,058/171] perf probe: Return a better scope DIE if there is no best scope [4.9,059/171] perf probe: Fix to show calling lines of inlined functions [4.9,062/171] ath10k: fix get invalid tx rate for Mesh metric [4.9,064/171] media: si470x-i2c: add missed operations in remove [4.9,066/171] spi: pxa2xx: Add missed security checks [4.9,068/171] s390/disassembler: dont hide instruction addresses [4.9,070/171] cpufreq: Register drivers only after CPU devices have been registered [4.9,072/171] iwlwifi: mvm: fix unaligned read of rx_pkt_status [4.9,073/171] spi: tegra20-slink: add missed clk_unprepare [4.9,076/171] btrfs: dont prematurely free work in run_ordered_work() [4.9,079/171] iwlwifi: check kasprintf() return value [4.9,080/171] fbtft: Make sure string is NULL terminated [4.9,083/171] libtraceevent: Fix memory leakage in copy_filter_type [4.9,084/171] net: phy: initialise phydev speed and duplex sanely [4.9,085/171] btrfs: dont prematurely free work in reada_start_machine_worker() [4.9,089/171] btrfs: do not call synchronize_srcu() in inode_tree_del [4.9,090/171] btrfs: return error pointer from alloc_test_extent_buffer [4.9,093/171] af_packet: set defaule value for tmo [4.9,095/171] mod_devicetable: fix PHY module format [4.9,098/171] net: qlogic: Fix error paths in ql_alloc_large_buffers() [4.9,099/171] net: usb: lan78xx: Fix suspend/resume PHY register access error [4.9,101/171] net: dst: Force 4-byte alignment of dst_metrics [4.9,103/171] USB: EHCI: Do not return -EPIPE when hub is disconnected [4.9,105/171] staging: comedi: gsc_hpdi: check dma_alloc_coherent() return value [4.9,106/171] ext4: fix ext4_empty_dir() for directories with holes [4.9,107/171] ext4: check for directory entries too close to block end [4.9,109/171] mmc: sdhci-of-esdhc: fix P2020 errata handling [4.9,112/171] scsi: lpfc: Fix locking on mailbox command completion [4.9,114/171] iommu/tegra-smmu: Fix page tables in > 4 GiB memory [4.9,117/171] scsi: csiostor: Dont enable IRQs too early [4.9,118/171] powerpc/pseries: Mark accumulate_stolen_time() as notrace [4.9,120/171] dma-debug: add a schedule point in debug_dma_dump_mappings() [4.9,123/171] powerpc/book3s64/hash: Add cond_resched to avoid soft lockup warning [4.9,127/171] clk: qcom: Allow constant ratio freq tables for rcg [4.9,130/171] mfd: mfd-core: Honour Device Trees request to disable a child-device [4.9,131/171] fs/quota: handle overflows of sysctl fs.quota.* and report as unsigned long [4.9,133/171] scsi: ufs: fix potential bug which ends in system hang [4.9,134/171] powerpc/pseries/cmm: Implement release() function for sysfs device [4.9,136/171] scsi: atari_scsi: sun3_scsi: Set sg_tablesize to 1 instead of SG_NONE [4.9,137/171] clk: pxa: fix one of the pxa RTC clocks [4.9,139/171] HID: Improve Windows Precision Touchpad detection. [4.9,141/171] scsi: pm80xx: Fix for SATA device discovery [4.9,144/171] gpio: mpc8xxx: Dont overwrite default irq_set_type callback [4.9,145/171] scripts/kallsyms: fix definitely-lost memory leak [4.9,146/171] cdrom: respect device capabilities during opening action [4.9,149/171] s390/cpum_sf: Check for SDBT and SDB consistency [4.9,151/171] kernel: sysctl: make drop_caches write-only [4.9,152/171] x86/mce: Fix possibly incorrect severity calculation on AMD [4.9,154/171] ALSA: hda - Downgrade error message for single-cmd fallback [4.9,157/171] filldir[64]: remove WARN_ON_ONCE() for bad directory entries [4.9,158/171] netfilter: ebtables: compat: reject all padding in matches/watchers [4.9,161/171] net: icmp: fix data-race in cmp_global_allow() [4.9,163/171] tty/serial: atmel: fix out of range clock divider handling [4.9,165/171] mmc: sdhci: Update the tuning failed messages to pr_debug level [4.9,168/171] tcp/dccp: fix possible race __inet_lookup_established() [4.9,169/171] tcp: do not send empty skb from tcp_write_xmit() [4.9,170/171] gtp: fix wrong condition in gtp_genl_dump_pdp()

Message ID

20200102220600.081205580@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Xiao Jiangfeng <xiaojiangfeng@huawei.com>,
	Mao Wenan <maowenan@huawei.com>, "David S. Miller" <davem@davemloft.net>
Subject: [PATCH 4.9 093/171] af_packet: set defaule value for tmo
Date: Thu,  2 Jan 2020 23:07:04 +0100
Message-Id: <20200102220600.081205580@linuxfoundation.org>
In-Reply-To: <20200102220546.960200039@linuxfoundation.org>
References: <20200102220546.960200039@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Greg KH Jan. 2, 2020, 10:07 p.m. UTC

From: Mao Wenan <maowenan@huawei.com>

[ Upstream commit b43d1f9f7067c6759b1051e8ecb84e82cef569fe ]

There is softlockup when using TPACKET_V3:
...
NMI watchdog: BUG: soft lockup - CPU#2 stuck for 60010ms!
(__irq_svc) from [<c0558a0c>] (_raw_spin_unlock_irqrestore+0x44/0x54)
(_raw_spin_unlock_irqrestore) from [<c027b7e8>] (mod_timer+0x210/0x25c)
(mod_timer) from [<c0549c30>]
(prb_retire_rx_blk_timer_expired+0x68/0x11c)
(prb_retire_rx_blk_timer_expired) from [<c027a7ac>]
(call_timer_fn+0x90/0x17c)
(call_timer_fn) from [<c027ab6c>] (run_timer_softirq+0x2d4/0x2fc)
(run_timer_softirq) from [<c021eaf4>] (__do_softirq+0x218/0x318)
(__do_softirq) from [<c021eea0>] (irq_exit+0x88/0xac)
(irq_exit) from [<c0240130>] (msa_irq_exit+0x11c/0x1d4)
(msa_irq_exit) from [<c0209cf0>] (handle_IPI+0x650/0x7f4)
(handle_IPI) from [<c02015bc>] (gic_handle_irq+0x108/0x118)
(gic_handle_irq) from [<c0558ee4>] (__irq_usr+0x44/0x5c)
...

If __ethtool_get_link_ksettings() is failed in
prb_calc_retire_blk_tmo(), msec and tmo will be zero, so tov_in_jiffies
is zero and the timer expire for retire_blk_timer is turn to
mod_timer(&pkc->retire_blk_timer, jiffies + 0),
which will trigger cpu usage of softirq is 100%.

Fixes: f6fb8f100b80 ("af-packet: TPACKET_V3 flexible buffer implementation.")
Tested-by: Xiao Jiangfeng <xiaojiangfeng@huawei.com>
Signed-off-by: Mao Wenan <maowenan@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/packet/af_packet.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -587,7 +587,8 @@  static int prb_calc_retire_blk_tmo(struc
 			msec = 1;
 			div = ecmd.base.speed / 1000;
 		}
-	}
+	} else
+		return DEFAULT_PRB_RETIRE_TOV;
 
 	mbits = (blk_size_in_bytes * 8) / (1024 * 1024);

[4.9,093/171] af_packet: set defaule value for tmo

Commit Message

Patch