From: Sasha Levin Date: Fri, 12 Jun 2020 01:39:58 +0000 (-0400) Subject: Fixes for 4.4 X-Git-Tag: v5.4.47~116 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9663c90b6da38b71f9ed97528363a1b4eb9126f7;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/ath9k_htc-silence-undersized-packet-warnings.patch b/queue-4.4/ath9k_htc-silence-undersized-packet-warnings.patch new file mode 100644 index 00000000000..1759a098cc4 --- /dev/null +++ b/queue-4.4/ath9k_htc-silence-undersized-packet-warnings.patch @@ -0,0 +1,49 @@ +From 7748f6bf5588e9db95135d13bce279c587627d66 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 May 2020 06:44:43 +0900 +Subject: ath9k_htc: Silence undersized packet warnings + +From: Masashi Honma + +[ Upstream commit 450edd2805982d14ed79733a82927d2857b27cac ] + +Some devices like TP-Link TL-WN722N produces this kind of messages +frequently. + +kernel: ath: phy0: Short RX data len, dropping (dlen: 4) + +This warning is useful for developers to recognize that the device +(Wi-Fi dongle or USB hub etc) is noisy but not for general users. So +this patch make this warning to debug message. + +Reported-By: Denis +Ref: https://bugzilla.kernel.org/show_bug.cgi?id=207539 +Fixes: cd486e627e67 ("ath9k_htc: Discard undersized packets") +Signed-off-by: Masashi Honma +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20200504214443.4485-1-masashi.honma@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +index 0d757ced49ba..91d199481a37 100644 +--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c ++++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +@@ -998,9 +998,9 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv, + * which are not PHY_ERROR (short radar pulses have a length of 3) + */ + if (unlikely(!rs_datalen || (rs_datalen < 10 && !is_phyerr))) { +- ath_warn(common, +- "Short RX data len, dropping (dlen: %d)\n", +- rs_datalen); ++ ath_dbg(common, ANY, ++ "Short RX data len, dropping (dlen: %d)\n", ++ rs_datalen); + goto rx_next; + } + +-- +2.25.1 + diff --git a/queue-4.4/perf-probe-accept-the-instance-number-of-kretprobe-e.patch b/queue-4.4/perf-probe-accept-the-instance-number-of-kretprobe-e.patch new file mode 100644 index 00000000000..0e48d5771a7 --- /dev/null +++ b/queue-4.4/perf-probe-accept-the-instance-number-of-kretprobe-e.patch @@ -0,0 +1,70 @@ +From 9b745e66449e099c73c43270a332ea493fd2dbb6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 May 2020 23:29:12 +0900 +Subject: perf probe: Accept the instance number of kretprobe event + +From: Masami Hiramatsu + +[ Upstream commit c6aab66a728b6518772c74bd9dff66e1a1c652fd ] + +Since the commit 6a13a0d7b4d1 ("ftrace/kprobe: Show the maxactive number +on kprobe_events") introduced to show the instance number of kretprobe +events, the length of the 1st format of the kprobe event will not 1, but +it can be longer. This caused a parser error in perf-probe. + +Skip the length check the 1st format of the kprobe event to accept this +instance number. + +Without this fix: + + # perf probe -a vfs_read%return + Added new event: + probe:vfs_read__return (on vfs_read%return) + + You can now use it in all perf tools, such as: + + perf record -e probe:vfs_read__return -aR sleep 1 + + # perf probe -l + Semantic error :Failed to parse event name: r16:probe/vfs_read__return + Error: Failed to show event list. + +And with this fixes: + + # perf probe -a vfs_read%return + ... + # perf probe -l + probe:vfs_read__return (on vfs_read%return) + +Fixes: 6a13a0d7b4d1 ("ftrace/kprobe: Show the maxactive number on kprobe_events") +Reported-by: Yuxuan Shui +Signed-off-by: Masami Hiramatsu +Tested-by: Yuxuan Shui +Cc: Jiri Olsa +Cc: Namhyung Kim +Cc: stable@vger.kernel.org +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207587 +Link: http://lore.kernel.org/lkml/158877535215.26469.1113127926699134067.stgit@devnote2 +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/util/probe-event.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c +index 0195b7e8c54a..209164fd16c2 100644 +--- a/tools/perf/util/probe-event.c ++++ b/tools/perf/util/probe-event.c +@@ -1527,8 +1527,7 @@ int parse_probe_trace_command(const char *cmd, struct probe_trace_event *tev) + fmt1_str = strtok_r(argv0_str, ":", &fmt); + fmt2_str = strtok_r(NULL, "/", &fmt); + fmt3_str = strtok_r(NULL, " \t", &fmt); +- if (fmt1_str == NULL || strlen(fmt1_str) != 1 || fmt2_str == NULL +- || fmt3_str == NULL) { ++ if (fmt1_str == NULL || fmt2_str == NULL || fmt3_str == NULL) { + semantic_error("Failed to parse event name: %s\n", argv[0]); + ret = -EINVAL; + goto out; +-- +2.25.1 + diff --git a/queue-4.4/series b/queue-4.4/series index 4b4c39fcf3d..0f89d8c25d0 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -6,3 +6,5 @@ pwm-fsl-ftm-use-flat-regmap-cache.patch igb-improve-handling-of-disconnected-adapters.patch arm-8977-1-ptrace-fix-mask-for-thumb-breakpoint-hook.patch sched-fair-don-t-numa-balance-for-kthreads.patch +ath9k_htc-silence-undersized-packet-warnings.patch +perf-probe-accept-the-instance-number-of-kretprobe-e.patch