From: Sasha Levin Date: Wed, 1 Jan 2020 02:27:31 +0000 (-0500) Subject: fixes for 4.19 X-Git-Tag: v4.4.208~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=451cd3ea118e91a68e8f17d67b125faa53599dd5;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/apparmor-fix-unsigned-len-comparison-with-less-than-.patch b/queue-4.19/apparmor-fix-unsigned-len-comparison-with-less-than-.patch new file mode 100644 index 00000000000..bf1648e12f7 --- /dev/null +++ b/queue-4.19/apparmor-fix-unsigned-len-comparison-with-less-than-.patch @@ -0,0 +1,59 @@ +From 728c075cb0dc074272b31f5b525a2036bd265a7d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Jun 2019 14:09:04 +0100 +Subject: apparmor: fix unsigned len comparison with less than zero + +From: Colin Ian King + +[ Upstream commit 00e0590dbaec6f1bcaa36a85467d7e3497ced522 ] + +The sanity check in macro update_for_len checks to see if len +is less than zero, however, len is a size_t so it can never be +less than zero, so this sanity check is a no-op. Fix this by +making len a ssize_t so the comparison will work and add ulen +that is a size_t copy of len so that the min() macro won't +throw warnings about comparing different types. + +Addresses-Coverity: ("Macro compares unsigned to 0") +Fixes: f1bd904175e8 ("apparmor: add the base fns() for domain labels") +Signed-off-by: Colin Ian King +Signed-off-by: John Johansen +Signed-off-by: Sasha Levin +--- + security/apparmor/label.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/security/apparmor/label.c b/security/apparmor/label.c +index ba11bdf9043a..2469549842d2 100644 +--- a/security/apparmor/label.c ++++ b/security/apparmor/label.c +@@ -1462,11 +1462,13 @@ static inline bool use_label_hname(struct aa_ns *ns, struct aa_label *label, + /* helper macro for snprint routines */ + #define update_for_len(total, len, size, str) \ + do { \ ++ size_t ulen = len; \ ++ \ + AA_BUG(len < 0); \ +- total += len; \ +- len = min(len, size); \ +- size -= len; \ +- str += len; \ ++ total += ulen; \ ++ ulen = min(ulen, size); \ ++ size -= ulen; \ ++ str += ulen; \ + } while (0) + + /** +@@ -1601,7 +1603,7 @@ int aa_label_snxprint(char *str, size_t size, struct aa_ns *ns, + struct aa_ns *prev_ns = NULL; + struct label_it i; + int count = 0, total = 0; +- size_t len; ++ ssize_t len; + + AA_BUG(!str && size != 0); + AA_BUG(!label); +-- +2.20.1 + diff --git a/queue-4.19/arm-8937-1-spectre-v2-remove-brahma-b53-from-hardeni.patch b/queue-4.19/arm-8937-1-spectre-v2-remove-brahma-b53-from-hardeni.patch new file mode 100644 index 00000000000..7f2dcb8e39c --- /dev/null +++ b/queue-4.19/arm-8937-1-spectre-v2-remove-brahma-b53-from-hardeni.patch @@ -0,0 +1,45 @@ +From 1cc29e5eeeea7778d8987b617c8062686121b882 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Nov 2019 04:32:04 +0100 +Subject: ARM: 8937/1: spectre-v2: remove Brahma-B53 from hardening + +From: Doug Berger + +[ Upstream commit 4ae5061a19b550dfe25397843427ed2ebab16b16 ] + +When the default processor handling was added to the function +cpu_v7_spectre_init() it only excluded other ARM implemented processor +cores. The Broadcom Brahma B53 core is not implemented by ARM so it +ended up falling through into the set of processors that attempt to use +the ARM_SMCCC_ARCH_WORKAROUND_1 service to harden the branch predictor. + +Since this workaround is not necessary for the Brahma-B53 this commit +explicitly checks for it and prevents it from applying a branch +predictor hardening workaround. + +Fixes: 10115105cb3a ("ARM: spectre-v2: add firmware based hardening") +Signed-off-by: Doug Berger +Signed-off-by: Florian Fainelli +Signed-off-by: Russell King +Signed-off-by: Sasha Levin +--- + arch/arm/mm/proc-v7-bugs.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/arm/mm/proc-v7-bugs.c b/arch/arm/mm/proc-v7-bugs.c +index 9a07916af8dd..a6554fdb56c5 100644 +--- a/arch/arm/mm/proc-v7-bugs.c ++++ b/arch/arm/mm/proc-v7-bugs.c +@@ -65,6 +65,9 @@ static void cpu_v7_spectre_init(void) + break; + + #ifdef CONFIG_ARM_PSCI ++ case ARM_CPU_PART_BRAHMA_B53: ++ /* Requires no workaround */ ++ break; + default: + /* Other ARM CPUs require no workaround */ + if (read_cpuid_implementor() == ARM_CPU_IMP_ARM) +-- +2.20.1 + diff --git a/queue-4.19/bcache-at-least-try-to-shrink-1-node-in-bch_mca_scan.patch b/queue-4.19/bcache-at-least-try-to-shrink-1-node-in-bch_mca_scan.patch new file mode 100644 index 00000000000..024dfdaec68 --- /dev/null +++ b/queue-4.19/bcache-at-least-try-to-shrink-1-node-in-bch_mca_scan.patch @@ -0,0 +1,52 @@ +From 3ba917e4dd27bca799403e6c5ba5db457704fb6c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Nov 2019 16:03:24 +0800 +Subject: bcache: at least try to shrink 1 node in bch_mca_scan() + +From: Coly Li + +[ Upstream commit 9fcc34b1a6dd4b8e5337e2b6ef45e428897eca6b ] + +In bch_mca_scan(), the number of shrinking btree node is calculated +by code like this, + unsigned long nr = sc->nr_to_scan; + + nr /= c->btree_pages; + nr = min_t(unsigned long, nr, mca_can_free(c)); +variable sc->nr_to_scan is number of objects (here is bcache B+tree +nodes' number) to shrink, and pointer variable sc is sent from memory +management code as parametr of a callback. + +If sc->nr_to_scan is smaller than c->btree_pages, after the above +calculation, variable 'nr' will be 0 and nothing will be shrunk. It is +frequeently observed that only 1 or 2 is set to sc->nr_to_scan and make +nr to be zero. Then bch_mca_scan() will do nothing more then acquiring +and releasing mutex c->bucket_lock. + +This patch checkes whether nr is 0 after the above calculation, if 0 +is the result then set 1 to variable 'n'. Then at least bch_mca_scan() +will try to shrink a single B+tree node. + +Signed-off-by: Coly Li +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/md/bcache/btree.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c +index 45f684689c35..bb40bd66a10e 100644 +--- a/drivers/md/bcache/btree.c ++++ b/drivers/md/bcache/btree.c +@@ -713,6 +713,8 @@ static unsigned long bch_mca_scan(struct shrinker *shrink, + * IO can always make forward progress: + */ + nr /= c->btree_pages; ++ if (nr == 0) ++ nr = 1; + nr = min_t(unsigned long, nr, mca_can_free(c)); + + i = 0; +-- +2.20.1 + diff --git a/queue-4.19/cdrom-respect-device-capabilities-during-opening-act.patch b/queue-4.19/cdrom-respect-device-capabilities-during-opening-act.patch new file mode 100644 index 00000000000..fe3d76e4682 --- /dev/null +++ b/queue-4.19/cdrom-respect-device-capabilities-during-opening-act.patch @@ -0,0 +1,69 @@ +From 8ad14984383a3f7eea9f81828323c0057ee5d430 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 19 Nov 2019 21:37:08 +0000 +Subject: cdrom: respect device capabilities during opening action +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Diego Elio Pettenò + +[ Upstream commit 366ba7c71ef77c08d06b18ad61b26e2df7352338 ] + +Reading the TOC only works if the device can play audio, otherwise +these commands fail (and possibly bring the device to an unhealthy +state.) + +Similarly, cdrom_mmc3_profile() should only be called if the device +supports generic packet commands. + +To: Jens Axboe +Cc: linux-kernel@vger.kernel.org +Cc: linux-scsi@vger.kernel.org +Signed-off-by: Diego Elio Pettenò +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/cdrom/cdrom.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c +index 933268b8d6a5..d3947388a3ef 100644 +--- a/drivers/cdrom/cdrom.c ++++ b/drivers/cdrom/cdrom.c +@@ -996,6 +996,12 @@ static void cdrom_count_tracks(struct cdrom_device_info *cdi, tracktype *tracks) + tracks->xa = 0; + tracks->error = 0; + cd_dbg(CD_COUNT_TRACKS, "entering cdrom_count_tracks\n"); ++ ++ if (!CDROM_CAN(CDC_PLAY_AUDIO)) { ++ tracks->error = CDS_NO_INFO; ++ return; ++ } ++ + /* Grab the TOC header so we can see how many tracks there are */ + ret = cdi->ops->audio_ioctl(cdi, CDROMREADTOCHDR, &header); + if (ret) { +@@ -1162,7 +1168,8 @@ int cdrom_open(struct cdrom_device_info *cdi, struct block_device *bdev, + ret = open_for_data(cdi); + if (ret) + goto err; +- cdrom_mmc3_profile(cdi); ++ if (CDROM_CAN(CDC_GENERIC_PACKET)) ++ cdrom_mmc3_profile(cdi); + if (mode & FMODE_WRITE) { + ret = -EROFS; + if (cdrom_open_write(cdi)) +@@ -2882,6 +2889,9 @@ int cdrom_get_last_written(struct cdrom_device_info *cdi, long *last_written) + it doesn't give enough information or fails. then we return + the toc contents. */ + use_toc: ++ if (!CDROM_CAN(CDC_PLAY_AUDIO)) ++ return -ENOSYS; ++ + toc.cdte_format = CDROM_MSF; + toc.cdte_track = CDROM_LEADOUT; + if ((ret = cdi->ops->audio_ioctl(cdi, CDROMREADTOCENTRY, &toc))) +-- +2.20.1 + diff --git a/queue-4.19/clk-clk-gpio-propagate-rate-change-to-parent.patch b/queue-4.19/clk-clk-gpio-propagate-rate-change-to-parent.patch new file mode 100644 index 00000000000..9cf241f304f --- /dev/null +++ b/queue-4.19/clk-clk-gpio-propagate-rate-change-to-parent.patch @@ -0,0 +1,49 @@ +From bf01d5dec2e3a0c301529e2257b8b10b712eb0ad Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Nov 2019 09:17:18 +0200 +Subject: clk: clk-gpio: propagate rate change to parent + +From: Michael Hennerich + +[ Upstream commit fc59462c5ce60da119568fac325c92fc6b7c6175 ] + +For an external clock source, which is gated via a GPIO, the +rate change should typically be propagated to the parent clock. + +The situation where we are requiring this propagation, is when an +external clock is connected to override an internal clock (which typically +has a fixed rate). The external clock can have a different rate than the +internal one, and may also be variable, thus requiring the rate +propagation. + +This rate change wasn't propagated until now, and it's unclear about cases +where this shouldn't be propagated. Thus, it's unclear whether this is +fixing a bug, or extending the current driver behavior. Also, it's unsure +about whether this may break any existing setups; in the case that it does, +a device-tree property may be added to disable this flag. + +Signed-off-by: Michael Hennerich +Signed-off-by: Alexandru Ardelean +Link: https://lkml.kernel.org/r/20191108071718.17985-1-alexandru.ardelean@analog.com +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/clk-gpio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c +index 40af4fbab4d2..af9cc00d2d92 100644 +--- a/drivers/clk/clk-gpio.c ++++ b/drivers/clk/clk-gpio.c +@@ -248,7 +248,7 @@ static int gpio_clk_driver_probe(struct platform_device *pdev) + else + clk = clk_register_gpio_gate(&pdev->dev, node->name, + parent_names ? parent_names[0] : NULL, gpiod, +- 0); ++ CLK_SET_RATE_PARENT); + if (IS_ERR(clk)) + return PTR_ERR(clk); + +-- +2.20.1 + diff --git a/queue-4.19/clk-pxa-fix-one-of-the-pxa-rtc-clocks.patch b/queue-4.19/clk-pxa-fix-one-of-the-pxa-rtc-clocks.patch new file mode 100644 index 00000000000..04013e48006 --- /dev/null +++ b/queue-4.19/clk-pxa-fix-one-of-the-pxa-rtc-clocks.patch @@ -0,0 +1,39 @@ +From c7c7623c593d6a93e69658eedfe22a2a23593a07 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 26 Oct 2019 21:44:20 +0200 +Subject: clk: pxa: fix one of the pxa RTC clocks + +From: Robert Jarzmik + +[ Upstream commit 46acbcb4849b2ca2e6e975e7c8130c1d61c8fd0c ] + +The pxa27x platforms have a single IP with 2 drivers, sa1100-rtc and +rtc-pxa drivers. + +A previous patch fixed the sa1100-rtc case, but the pxa-rtc wasn't +fixed. This patch completes the previous one. + +Fixes: 8b6d10345e16 ("clk: pxa: add missing pxa27x clocks for Irda and sa1100-rtc") +Signed-off-by: Robert Jarzmik +Link: https://lkml.kernel.org/r/20191026194420.11918-1-robert.jarzmik@free.fr +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/pxa/clk-pxa27x.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c +index d40b63e7bbce..b44c4cf8011a 100644 +--- a/drivers/clk/pxa/clk-pxa27x.c ++++ b/drivers/clk/pxa/clk-pxa27x.c +@@ -463,6 +463,7 @@ struct dummy_clk { + }; + static struct dummy_clk dummy_clks[] __initdata = { + DUMMY_CLK(NULL, "pxa27x-gpio", "osc_32_768khz"), ++ DUMMY_CLK(NULL, "pxa-rtc", "osc_32_768khz"), + DUMMY_CLK(NULL, "sa1100-rtc", "osc_32_768khz"), + DUMMY_CLK("UARTCLK", "pxa2xx-ir", "STUART"), + }; +-- +2.20.1 + diff --git a/queue-4.19/clk-qcom-allow-constant-ratio-freq-tables-for-rcg.patch b/queue-4.19/clk-qcom-allow-constant-ratio-freq-tables-for-rcg.patch new file mode 100644 index 00000000000..21a49f880e2 --- /dev/null +++ b/queue-4.19/clk-qcom-allow-constant-ratio-freq-tables-for-rcg.patch @@ -0,0 +1,64 @@ +From 906b35355220846461effe62c884d9043892cfb4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 31 Oct 2019 11:57:15 -0700 +Subject: clk: qcom: Allow constant ratio freq tables for rcg + +From: Jeffrey Hugo + +[ Upstream commit efd164b5520afd6fb2883b68e0d408a7de29c491 ] + +Some RCGs (the gfx_3d_src_clk in msm8998 for example) are basically just +some constant ratio from the input across the entire frequency range. It +would be great if we could specify the frequency table as a single entry +constant ratio instead of a long list, ie: + + { .src = P_GPUPLL0_OUT_EVEN, .pre_div = 3 }, + { } + +So, lets support that. + +We need to fix a corner case in qcom_find_freq() where if the freq table +is non-null, but has no frequencies, we end up returning an "entry" before +the table array, which is bad. Then, we need ignore the freq from the +table, and instead base everything on the requested freq. + +Suggested-by: Stephen Boyd +Signed-off-by: Jeffrey Hugo +Link: https://lkml.kernel.org/r/20191031185715.15504-1-jeffrey.l.hugo@gmail.com +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/qcom/clk-rcg2.c | 2 ++ + drivers/clk/qcom/common.c | 3 +++ + 2 files changed, 5 insertions(+) + +diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c +index 52208d4165f4..51b2388d80ac 100644 +--- a/drivers/clk/qcom/clk-rcg2.c ++++ b/drivers/clk/qcom/clk-rcg2.c +@@ -206,6 +206,8 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f, + if (clk_flags & CLK_SET_RATE_PARENT) { + rate = f->freq; + if (f->pre_div) { ++ if (!rate) ++ rate = req->rate; + rate /= 2; + rate *= f->pre_div + 1; + } +diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c +index db9b2471ac40..bfb6d6065a90 100644 +--- a/drivers/clk/qcom/common.c ++++ b/drivers/clk/qcom/common.c +@@ -29,6 +29,9 @@ struct freq_tbl *qcom_find_freq(const struct freq_tbl *f, unsigned long rate) + if (!f) + return NULL; + ++ if (!f->freq) ++ return f; ++ + for (; f->freq; f++) + if (rate <= f->freq) + return f; +-- +2.20.1 + diff --git a/queue-4.19/clocksource-drivers-asm9260-add-a-check-for-of_clk_g.patch b/queue-4.19/clocksource-drivers-asm9260-add-a-check-for-of_clk_g.patch new file mode 100644 index 00000000000..b3867592ba1 --- /dev/null +++ b/queue-4.19/clocksource-drivers-asm9260-add-a-check-for-of_clk_g.patch @@ -0,0 +1,38 @@ +From 0ad2892a538d8542dcd658534c4cfde2972f565e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Oct 2019 20:43:30 +0800 +Subject: clocksource/drivers/asm9260: Add a check for of_clk_get + +From: Chuhong Yuan + +[ Upstream commit 6e001f6a4cc73cd06fc7b8c633bc4906c33dd8ad ] + +asm9260_timer_init misses a check for of_clk_get. +Add a check for it and print errors like other clocksource drivers. + +Signed-off-by: Chuhong Yuan +Signed-off-by: Daniel Lezcano +Link: https://lore.kernel.org/r/20191016124330.22211-1-hslester96@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/clocksource/asm9260_timer.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/clocksource/asm9260_timer.c b/drivers/clocksource/asm9260_timer.c +index 38cd2feb87c4..0ce760776406 100644 +--- a/drivers/clocksource/asm9260_timer.c ++++ b/drivers/clocksource/asm9260_timer.c +@@ -198,6 +198,10 @@ static int __init asm9260_timer_init(struct device_node *np) + } + + clk = of_clk_get(np, 0); ++ if (IS_ERR(clk)) { ++ pr_err("Failed to get clk!\n"); ++ return PTR_ERR(clk); ++ } + + ret = clk_prepare_enable(clk); + if (ret) { +-- +2.20.1 + diff --git a/queue-4.19/clocksource-drivers-timer-of-use-unique-device-name-.patch b/queue-4.19/clocksource-drivers-timer-of-use-unique-device-name-.patch new file mode 100644 index 00000000000..75719486923 --- /dev/null +++ b/queue-4.19/clocksource-drivers-timer-of-use-unique-device-name-.patch @@ -0,0 +1,47 @@ +From b3405cce6460585c9718e3cd67a1e283e7af946e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Oct 2019 16:47:45 +0200 +Subject: clocksource/drivers/timer-of: Use unique device name instead of timer + +From: Geert Uytterhoeven + +[ Upstream commit 4411464d6f8b5e5759637235a6f2b2a85c2be0f1 ] + +If a hardware-specific driver does not provide a name, the timer-of core +falls back to device_node.name. Due to generic DT node naming policies, +that name is almost always "timer", and thus doesn't identify the actual +timer used. + +Fix this by using device_node.full_name instead, which includes the unit +addrees. + +Example impact on /proc/timer_list: + + -Clock Event Device: timer + +Clock Event Device: timer@fcfec400 + +Signed-off-by: Geert Uytterhoeven +Reviewed-by: Rob Herring +Signed-off-by: Daniel Lezcano +Link: https://lore.kernel.org/r/20191016144747.29538-3-geert+renesas@glider.be +Signed-off-by: Sasha Levin +--- + drivers/clocksource/timer-of.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c +index 06ed88a2a8a0..6e2cb3693ed8 100644 +--- a/drivers/clocksource/timer-of.c ++++ b/drivers/clocksource/timer-of.c +@@ -199,7 +199,7 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to) + } + + if (!to->clkevt.name) +- to->clkevt.name = np->name; ++ to->clkevt.name = np->full_name; + + to->np = np; + +-- +2.20.1 + diff --git a/queue-4.19/dma-debug-add-a-schedule-point-in-debug_dma_dump_map.patch b/queue-4.19/dma-debug-add-a-schedule-point-in-debug_dma_dump_map.patch new file mode 100644 index 00000000000..669f65a1030 --- /dev/null +++ b/queue-4.19/dma-debug-add-a-schedule-point-in-debug_dma_dump_map.patch @@ -0,0 +1,45 @@ +From ee27a3bca48b093a1012e9d4d3bc5cf0da43364b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Oct 2019 14:56:46 -0700 +Subject: dma-debug: add a schedule point in debug_dma_dump_mappings() + +From: Eric Dumazet + +[ Upstream commit 9ff6aa027dbb98755f0265695354f2dd07c0d1ce ] + +debug_dma_dump_mappings() can take a lot of cpu cycles : + +lpk43:/# time wc -l /sys/kernel/debug/dma-api/dump +163435 /sys/kernel/debug/dma-api/dump + +real 0m0.463s +user 0m0.003s +sys 0m0.459s + +Let's add a cond_resched() to avoid holding cpu for too long. + +Signed-off-by: Eric Dumazet +Cc: Corentin Labbe +Cc: Christoph Hellwig +Cc: Marek Szyprowski +Signed-off-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + kernel/dma/debug.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c +index c007d25bee09..3a2397444076 100644 +--- a/kernel/dma/debug.c ++++ b/kernel/dma/debug.c +@@ -442,6 +442,7 @@ void debug_dma_dump_mappings(struct device *dev) + } + + spin_unlock_irqrestore(&bucket->lock, flags); ++ cond_resched(); + } + } + +-- +2.20.1 + diff --git a/queue-4.19/dmaengine-xilinx_dma-clear-desc_pendingcount-in-xili.patch b/queue-4.19/dmaengine-xilinx_dma-clear-desc_pendingcount-in-xili.patch new file mode 100644 index 00000000000..a400697a63f --- /dev/null +++ b/queue-4.19/dmaengine-xilinx_dma-clear-desc_pendingcount-in-xili.patch @@ -0,0 +1,42 @@ +From 0366d8716bb3b2ddef61ae31197c8694b0ecb8b2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Oct 2019 20:18:24 +0530 +Subject: dmaengine: xilinx_dma: Clear desc_pendingcount in xilinx_dma_reset + +From: Nicholas Graumann + +[ Upstream commit 8a631a5a0f7d4a4a24dba8587d5d9152be0871cc ] + +Whenever we reset the channel, we need to clear desc_pendingcount +along with desc_submitcount. Otherwise when a new transaction is +submitted, the irq coalesce level could be programmed to an incorrect +value in the axidma case. + +This behavior can be observed when terminating pending transactions +with xilinx_dma_terminate_all() and then submitting new transactions +without releasing and requesting the channel. + +Signed-off-by: Nicholas Graumann +Signed-off-by: Radhey Shyam Pandey +Link: https://lore.kernel.org/r/1571150904-3988-8-git-send-email-radhey.shyam.pandey@xilinx.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/dma/xilinx/xilinx_dma.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c +index 8aec137b4fca..d56b6b0e22a8 100644 +--- a/drivers/dma/xilinx/xilinx_dma.c ++++ b/drivers/dma/xilinx/xilinx_dma.c +@@ -1427,6 +1427,7 @@ static int xilinx_dma_reset(struct xilinx_dma_chan *chan) + + chan->err = false; + chan->idle = true; ++ chan->desc_pendingcount = 0; + chan->desc_submitcount = 0; + + return err; +-- +2.20.1 + diff --git a/queue-4.19/ext4-iomap-that-extends-beyond-eof-should-be-marked-.patch b/queue-4.19/ext4-iomap-that-extends-beyond-eof-should-be-marked-.patch new file mode 100644 index 00000000000..eab6e2f8c49 --- /dev/null +++ b/queue-4.19/ext4-iomap-that-extends-beyond-eof-should-be-marked-.patch @@ -0,0 +1,61 @@ +From 9a9e106c3c12f046afcba89be3188601be682a93 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 Nov 2019 22:59:37 +1100 +Subject: ext4: iomap that extends beyond EOF should be marked dirty + +From: Matthew Bobrowski + +[ Upstream commit 2e9b51d78229d5145725a481bb5464ebc0a3f9b2 ] + +This patch addresses what Dave Chinner had discovered and fixed within +commit: 7684e2c4384d. This changes does not have any user visible +impact for ext4 as none of the current users of ext4_iomap_begin() +that extend files depend on IOMAP_F_DIRTY. + +When doing a direct IO that spans the current EOF, and there are +written blocks beyond EOF that extend beyond the current write, the +only metadata update that needs to be done is a file size extension. + +However, we don't mark such iomaps as IOMAP_F_DIRTY to indicate that +there is IO completion metadata updates required, and hence we may +fail to correctly sync file size extensions made in IO completion when +O_DSYNC writes are being used and the hardware supports FUA. + +Hence when setting IOMAP_F_DIRTY, we need to also take into account +whether the iomap spans the current EOF. If it does, then we need to +mark it dirty so that IO completion will call generic_write_sync() to +flush the inode size update to stable storage correctly. + +Signed-off-by: Matthew Bobrowski +Reviewed-by: Jan Kara +Reviewed-by: Ritesh Harjani +Link: https://lore.kernel.org/r/8b43ee9ee94bee5328da56ba0909b7d2229ef150.1572949325.git.mbobrowski@mbobrowski.org +Signed-off-by: Theodore Ts'o +Signed-off-by: Sasha Levin +--- + fs/ext4/inode.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c +index 00d0c4b8fa30..950e3dcff7b0 100644 +--- a/fs/ext4/inode.c ++++ b/fs/ext4/inode.c +@@ -3544,8 +3544,14 @@ retry: + return ret; + } + ++ /* ++ * Writes that span EOF might trigger an I/O size update on completion, ++ * so consider them to be dirty for the purposes of O_DSYNC, even if ++ * there is no other metadata changes being made or are pending here. ++ */ + iomap->flags = 0; +- if (ext4_inode_datasync_dirty(inode)) ++ if (ext4_inode_datasync_dirty(inode) || ++ offset + length > i_size_read(inode)) + iomap->flags |= IOMAP_F_DIRTY; + iomap->bdev = inode->i_sb->s_bdev; + iomap->dax_dev = sbi->s_daxdev; +-- +2.20.1 + diff --git a/queue-4.19/ext4-update-direct-i-o-read-lock-pattern-for-iocb_no.patch b/queue-4.19/ext4-update-direct-i-o-read-lock-pattern-for-iocb_no.patch new file mode 100644 index 00000000000..8c5e235036a --- /dev/null +++ b/queue-4.19/ext4-update-direct-i-o-read-lock-pattern-for-iocb_no.patch @@ -0,0 +1,47 @@ +From e3d6bf069846f2dc60128632994322977c9cd206 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 Nov 2019 22:59:22 +1100 +Subject: ext4: update direct I/O read lock pattern for IOCB_NOWAIT + +From: Matthew Bobrowski + +[ Upstream commit 548feebec7e93e58b647dba70b3303dcb569c914 ] + +This patch updates the lock pattern in ext4_direct_IO_read() to not +block on inode lock in cases of IOCB_NOWAIT direct I/O reads. The +locking condition implemented here is similar to that of 942491c9e6d6 +("xfs: fix AIM7 regression"). + +Fixes: 16c54688592c ("ext4: Allow parallel DIO reads") +Signed-off-by: Matthew Bobrowski +Reviewed-by: Jan Kara +Reviewed-by: Ritesh Harjani +Link: https://lore.kernel.org/r/c5d5e759f91747359fbd2c6f9a36240cf75ad79f.1572949325.git.mbobrowski@mbobrowski.org +Signed-off-by: Theodore Ts'o +Signed-off-by: Sasha Levin +--- + fs/ext4/inode.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c +index 215802cbc42b..00d0c4b8fa30 100644 +--- a/fs/ext4/inode.c ++++ b/fs/ext4/inode.c +@@ -3848,7 +3848,13 @@ static ssize_t ext4_direct_IO_read(struct kiocb *iocb, struct iov_iter *iter) + * writes & truncates and since we take care of writing back page cache, + * we are protected against page writeback as well. + */ +- inode_lock_shared(inode); ++ if (iocb->ki_flags & IOCB_NOWAIT) { ++ if (!inode_trylock_shared(inode)) ++ return -EAGAIN; ++ } else { ++ inode_lock_shared(inode); ++ } ++ + ret = filemap_write_and_wait_range(mapping, iocb->ki_pos, + iocb->ki_pos + count - 1); + if (ret) +-- +2.20.1 + diff --git a/queue-4.19/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch b/queue-4.19/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch new file mode 100644 index 00000000000..fa2cd4fea39 --- /dev/null +++ b/queue-4.19/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch @@ -0,0 +1,92 @@ +From 631661a7b5fb83fc16058509af78355c829e9c2d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 25 Nov 2019 11:20:36 +0800 +Subject: f2fs: choose hardlimit when softlimit is larger than hardlimit in + f2fs_statfs_project() + +From: Chengguang Xu + +[ Upstream commit 909110c060f22e65756659ec6fa957ae75777e00 ] + +Setting softlimit larger than hardlimit seems meaningless +for disk quota but currently it is allowed. In this case, +there may be a bit of comfusion for users when they run +df comamnd to directory which has project quota. + +For example, we set 20M softlimit and 10M hardlimit of +block usage limit for project quota of test_dir(project id 123). + +[root@hades f2fs]# repquota -P -a +*** Report for project quotas on device /dev/nvme0n1p8 +Block grace time: 7days; Inode grace time: 7days +Block limits File limits +Project used soft hard grace used soft hard grace +---------------------------------------------------------------------- +0 -- 4 0 0 1 0 0 +123 +- 10248 20480 10240 2 0 0 + +The result of df command as below: + +[root@hades f2fs]# df -h /mnt/f2fs/test +Filesystem Size Used Avail Use% Mounted on +/dev/nvme0n1p8 20M 11M 10M 51% /mnt/f2fs + +Even though it looks like there is another 10M free space to use, +if we write new data to diretory test(inherit project id), +the write will fail with errno(-EDQUOT). + +After this patch, the df result looks like below. + +[root@hades f2fs]# df -h /mnt/f2fs/test +Filesystem Size Used Avail Use% Mounted on +/dev/nvme0n1p8 10M 10M 0 100% /mnt/f2fs + +Signed-off-by: Chengguang Xu +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/super.c | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c +index 7a9cc64f5ca3..662c7de58b99 100644 +--- a/fs/f2fs/super.c ++++ b/fs/f2fs/super.c +@@ -1148,9 +1148,13 @@ static int f2fs_statfs_project(struct super_block *sb, + return PTR_ERR(dquot); + spin_lock(&dquot->dq_dqb_lock); + +- limit = (dquot->dq_dqb.dqb_bsoftlimit ? +- dquot->dq_dqb.dqb_bsoftlimit : +- dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits; ++ limit = 0; ++ if (dquot->dq_dqb.dqb_bsoftlimit) ++ limit = dquot->dq_dqb.dqb_bsoftlimit; ++ if (dquot->dq_dqb.dqb_bhardlimit && ++ (!limit || dquot->dq_dqb.dqb_bhardlimit < limit)) ++ limit = dquot->dq_dqb.dqb_bhardlimit; ++ + if (limit && buf->f_blocks > limit) { + curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits; + buf->f_blocks = limit; +@@ -1159,9 +1163,13 @@ static int f2fs_statfs_project(struct super_block *sb, + (buf->f_blocks - curblock) : 0; + } + +- limit = dquot->dq_dqb.dqb_isoftlimit ? +- dquot->dq_dqb.dqb_isoftlimit : +- dquot->dq_dqb.dqb_ihardlimit; ++ limit = 0; ++ if (dquot->dq_dqb.dqb_isoftlimit) ++ limit = dquot->dq_dqb.dqb_isoftlimit; ++ if (dquot->dq_dqb.dqb_ihardlimit && ++ (!limit || dquot->dq_dqb.dqb_ihardlimit < limit)) ++ limit = dquot->dq_dqb.dqb_ihardlimit; ++ + if (limit && buf->f_files > limit) { + buf->f_files = limit; + buf->f_ffree = +-- +2.20.1 + diff --git a/queue-4.19/f2fs-fix-to-update-dir-s-i_pino-during-cross_rename.patch b/queue-4.19/f2fs-fix-to-update-dir-s-i_pino-during-cross_rename.patch new file mode 100644 index 00000000000..cb61a60a206 --- /dev/null +++ b/queue-4.19/f2fs-fix-to-update-dir-s-i_pino-during-cross_rename.patch @@ -0,0 +1,94 @@ +From d827cc488adccf5d939b27fd071ea2c31f77f81f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 7 Nov 2019 14:12:05 +0800 +Subject: f2fs: fix to update dir's i_pino during cross_rename + +From: Chao Yu + +[ Upstream commit 2a60637f06ac94869b2e630eaf837110d39bf291 ] + +As Eric reported: + +RENAME_EXCHANGE support was just added to fsstress in xfstests: + + commit 65dfd40a97b6bbbd2a22538977bab355c5bc0f06 + Author: kaixuxia + Date: Thu Oct 31 14:41:48 2019 +0800 + + fsstress: add EXCHANGE renameat2 support + +This is causing xfstest generic/579 to fail due to fsck.f2fs reporting errors. +I'm not sure what the problem is, but it still happens even with all the +fs-verity stuff in the test commented out, so that the test just runs fsstress. + +generic/579 23s ... [10:02:25] +[ 7.745370] run fstests generic/579 at 2019-11-04 10:02:25 +_check_generic_filesystem: filesystem on /dev/vdc is inconsistent +(see /results/f2fs/results-default/generic/579.full for details) + [10:02:47] +Ran: generic/579 +Failures: generic/579 +Failed 1 of 1 tests +Xunit report: /results/f2fs/results-default/result.xml + +Here's the contents of 579.full: + +_check_generic_filesystem: filesystem on /dev/vdc is inconsistent +*** fsck.f2fs output *** +[ASSERT] (__chk_dots_dentries:1378) --> Bad inode number[0x24] for '..', parent parent ino is [0xd10] + +The root cause is that we forgot to update directory's i_pino during +cross_rename, fix it. + +Fixes: 32f9bc25cbda0 ("f2fs: support ->rename2()") +Signed-off-by: Chao Yu +Tested-by: Eric Biggers +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/namei.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c +index 6b23dcbf52f4..0ace2c2e3de9 100644 +--- a/fs/f2fs/namei.c ++++ b/fs/f2fs/namei.c +@@ -948,7 +948,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, + if (!old_dir_entry || whiteout) + file_lost_pino(old_inode); + else +- F2FS_I(old_inode)->i_pino = new_dir->i_ino; ++ /* adjust dir's i_pino to pass fsck check */ ++ f2fs_i_pino_write(old_inode, new_dir->i_ino); + up_write(&F2FS_I(old_inode)->i_sem); + + old_inode->i_ctime = current_time(old_inode); +@@ -1103,7 +1104,11 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, + f2fs_set_link(old_dir, old_entry, old_page, new_inode); + + down_write(&F2FS_I(old_inode)->i_sem); +- file_lost_pino(old_inode); ++ if (!old_dir_entry) ++ file_lost_pino(old_inode); ++ else ++ /* adjust dir's i_pino to pass fsck check */ ++ f2fs_i_pino_write(old_inode, new_dir->i_ino); + up_write(&F2FS_I(old_inode)->i_sem); + + old_dir->i_ctime = current_time(old_dir); +@@ -1118,7 +1123,11 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, + f2fs_set_link(new_dir, new_entry, new_page, old_inode); + + down_write(&F2FS_I(new_inode)->i_sem); +- file_lost_pino(new_inode); ++ if (!new_dir_entry) ++ file_lost_pino(new_inode); ++ else ++ /* adjust dir's i_pino to pass fsck check */ ++ f2fs_i_pino_write(new_inode, old_dir->i_ino); + up_write(&F2FS_I(new_inode)->i_sem); + + new_dir->i_ctime = current_time(new_dir); +-- +2.20.1 + diff --git a/queue-4.19/f2fs-fix-to-update-time-in-lazytime-mode.patch b/queue-4.19/f2fs-fix-to-update-time-in-lazytime-mode.patch new file mode 100644 index 00000000000..c972e1fef2e --- /dev/null +++ b/queue-4.19/f2fs-fix-to-update-time-in-lazytime-mode.patch @@ -0,0 +1,104 @@ +From e14bb33d1d3a800d6bacca821fe933e694405d5f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 27 Sep 2019 18:01:35 +0800 +Subject: f2fs: fix to update time in lazytime mode + +From: Chao Yu + +[ Upstream commit fe1897eaa6646f5a64a4cee0e6473ed9887d324b ] + +generic/018 reports an inconsistent status of atime, the +testcase is as below: +- open file with O_SYNC +- write file to construct fraged space +- calc md5 of file +- record {a,c,m}time +- defrag file --- do nothing +- umount & mount +- check {a,c,m}time + +The root cause is, as f2fs enables lazytime by default, atime +update will dirty vfs inode, rather than dirtying f2fs inode (by set +with FI_DIRTY_INODE), so later f2fs_write_inode() called from VFS will +fail to update inode page due to our skip: + +f2fs_write_inode() + if (is_inode_flag_set(inode, FI_DIRTY_INODE)) + return 0; + +So eventually, after evict(), we lose last atime for ever. + +To fix this issue, we need to check whether {a,c,m,cr}time is +consistent in between inode cache and inode page, and only skip +f2fs_update_inode() if f2fs inode is not dirty and time is +consistent as well. + +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/f2fs.h | 23 +++++++++++++++-------- + fs/f2fs/inode.c | 6 +++++- + 2 files changed, 20 insertions(+), 9 deletions(-) + +diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h +index 34e48bcf5087..72d154e71bb5 100644 +--- a/fs/f2fs/f2fs.h ++++ b/fs/f2fs/f2fs.h +@@ -2578,6 +2578,20 @@ static inline void clear_file(struct inode *inode, int type) + f2fs_mark_inode_dirty_sync(inode, true); + } + ++static inline bool f2fs_is_time_consistent(struct inode *inode) ++{ ++ if (!timespec64_equal(F2FS_I(inode)->i_disk_time, &inode->i_atime)) ++ return false; ++ if (!timespec64_equal(F2FS_I(inode)->i_disk_time + 1, &inode->i_ctime)) ++ return false; ++ if (!timespec64_equal(F2FS_I(inode)->i_disk_time + 2, &inode->i_mtime)) ++ return false; ++ if (!timespec64_equal(F2FS_I(inode)->i_disk_time + 3, ++ &F2FS_I(inode)->i_crtime)) ++ return false; ++ return true; ++} ++ + static inline bool f2fs_skip_inode_update(struct inode *inode, int dsync) + { + bool ret; +@@ -2595,14 +2609,7 @@ static inline bool f2fs_skip_inode_update(struct inode *inode, int dsync) + i_size_read(inode) & ~PAGE_MASK) + return false; + +- if (!timespec64_equal(F2FS_I(inode)->i_disk_time, &inode->i_atime)) +- return false; +- if (!timespec64_equal(F2FS_I(inode)->i_disk_time + 1, &inode->i_ctime)) +- return false; +- if (!timespec64_equal(F2FS_I(inode)->i_disk_time + 2, &inode->i_mtime)) +- return false; +- if (!timespec64_equal(F2FS_I(inode)->i_disk_time + 3, +- &F2FS_I(inode)->i_crtime)) ++ if (!f2fs_is_time_consistent(inode)) + return false; + + down_read(&F2FS_I(inode)->i_sem); +diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c +index 540d45759621..a01be7d8db86 100644 +--- a/fs/f2fs/inode.c ++++ b/fs/f2fs/inode.c +@@ -614,7 +614,11 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc) + inode->i_ino == F2FS_META_INO(sbi)) + return 0; + +- if (!is_inode_flag_set(inode, FI_DIRTY_INODE)) ++ /* ++ * atime could be updated without dirtying f2fs inode in lazytime mode ++ */ ++ if (f2fs_is_time_consistent(inode) && ++ !is_inode_flag_set(inode, FI_DIRTY_INODE)) + return 0; + + /* +-- +2.20.1 + diff --git a/queue-4.19/fs-quota-handle-overflows-of-sysctl-fs.quota.-and-re.patch b/queue-4.19/fs-quota-handle-overflows-of-sysctl-fs.quota.-and-re.patch new file mode 100644 index 00000000000..8c1a315d277 --- /dev/null +++ b/queue-4.19/fs-quota-handle-overflows-of-sysctl-fs.quota.-and-re.patch @@ -0,0 +1,148 @@ +From 3462c6138cb0868eba55c35534f6cf3f2589f826 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 10 Nov 2019 12:49:06 +0300 +Subject: fs/quota: handle overflows of sysctl fs.quota.* and report as + unsigned long + +From: Konstantin Khlebnikov + +[ Upstream commit 6fcbcec9cfc7b3c6a2c1f1a23ebacedff7073e0a ] + +Quota statistics counted as 64-bit per-cpu counter. Reading sums per-cpu +fractions as signed 64-bit int, filters negative values and then reports +lower half as signed 32-bit int. + +Result may looks like: + +fs.quota.allocated_dquots = 22327 +fs.quota.cache_hits = -489852115 +fs.quota.drops = -487288718 +fs.quota.free_dquots = 22083 +fs.quota.lookups = -486883485 +fs.quota.reads = 22327 +fs.quota.syncs = 335064 +fs.quota.writes = 3088689 + +Values bigger than 2^31-1 reported as negative. + +All counters except "allocated_dquots" and "free_dquots" are monotonic, +thus they should be reported as is without filtering negative values. + +Kernel doesn't have generic helper for 64-bit sysctl yet, +let's use at least unsigned long. + +Link: https://lore.kernel.org/r/157337934693.2078.9842146413181153727.stgit@buzz +Signed-off-by: Konstantin Khlebnikov +Signed-off-by: Jan Kara +Signed-off-by: Sasha Levin +--- + fs/quota/dquot.c | 29 +++++++++++++++++------------ + include/linux/quota.h | 2 +- + 2 files changed, 18 insertions(+), 13 deletions(-) + +diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c +index 59b00d8db22c..154f175066b3 100644 +--- a/fs/quota/dquot.c ++++ b/fs/quota/dquot.c +@@ -2853,68 +2853,73 @@ EXPORT_SYMBOL(dquot_quotactl_sysfile_ops); + static int do_proc_dqstats(struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) + { +- unsigned int type = (int *)table->data - dqstats.stat; ++ unsigned int type = (unsigned long *)table->data - dqstats.stat; ++ s64 value = percpu_counter_sum(&dqstats.counter[type]); ++ ++ /* Filter negative values for non-monotonic counters */ ++ if (value < 0 && (type == DQST_ALLOC_DQUOTS || ++ type == DQST_FREE_DQUOTS)) ++ value = 0; + + /* Update global table */ +- dqstats.stat[type] = +- percpu_counter_sum_positive(&dqstats.counter[type]); +- return proc_dointvec(table, write, buffer, lenp, ppos); ++ dqstats.stat[type] = value; ++ return proc_doulongvec_minmax(table, write, buffer, lenp, ppos); + } + + static struct ctl_table fs_dqstats_table[] = { + { + .procname = "lookups", + .data = &dqstats.stat[DQST_LOOKUPS], +- .maxlen = sizeof(int), ++ .maxlen = sizeof(unsigned long), + .mode = 0444, + .proc_handler = do_proc_dqstats, + }, + { + .procname = "drops", + .data = &dqstats.stat[DQST_DROPS], +- .maxlen = sizeof(int), ++ .maxlen = sizeof(unsigned long), + .mode = 0444, + .proc_handler = do_proc_dqstats, + }, + { + .procname = "reads", + .data = &dqstats.stat[DQST_READS], +- .maxlen = sizeof(int), ++ .maxlen = sizeof(unsigned long), + .mode = 0444, + .proc_handler = do_proc_dqstats, + }, + { + .procname = "writes", + .data = &dqstats.stat[DQST_WRITES], +- .maxlen = sizeof(int), ++ .maxlen = sizeof(unsigned long), + .mode = 0444, + .proc_handler = do_proc_dqstats, + }, + { + .procname = "cache_hits", + .data = &dqstats.stat[DQST_CACHE_HITS], +- .maxlen = sizeof(int), ++ .maxlen = sizeof(unsigned long), + .mode = 0444, + .proc_handler = do_proc_dqstats, + }, + { + .procname = "allocated_dquots", + .data = &dqstats.stat[DQST_ALLOC_DQUOTS], +- .maxlen = sizeof(int), ++ .maxlen = sizeof(unsigned long), + .mode = 0444, + .proc_handler = do_proc_dqstats, + }, + { + .procname = "free_dquots", + .data = &dqstats.stat[DQST_FREE_DQUOTS], +- .maxlen = sizeof(int), ++ .maxlen = sizeof(unsigned long), + .mode = 0444, + .proc_handler = do_proc_dqstats, + }, + { + .procname = "syncs", + .data = &dqstats.stat[DQST_SYNCS], +- .maxlen = sizeof(int), ++ .maxlen = sizeof(unsigned long), + .mode = 0444, + .proc_handler = do_proc_dqstats, + }, +diff --git a/include/linux/quota.h b/include/linux/quota.h +index f32dd270b8e3..27aab84fcbaa 100644 +--- a/include/linux/quota.h ++++ b/include/linux/quota.h +@@ -263,7 +263,7 @@ enum { + }; + + struct dqstats { +- int stat[_DQST_DQSTAT_LAST]; ++ unsigned long stat[_DQST_DQSTAT_LAST]; + struct percpu_counter counter[_DQST_DQSTAT_LAST]; + }; + +-- +2.20.1 + diff --git a/queue-4.19/gpio-mpc8xxx-don-t-overwrite-default-irq_set_type-ca.patch b/queue-4.19/gpio-mpc8xxx-don-t-overwrite-default-irq_set_type-ca.patch new file mode 100644 index 00000000000..c059cf36741 --- /dev/null +++ b/queue-4.19/gpio-mpc8xxx-don-t-overwrite-default-irq_set_type-ca.patch @@ -0,0 +1,56 @@ +From e17043d395cffd4031f0c7c874efcccb318817df Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 15 Nov 2019 14:55:51 +0200 +Subject: gpio: mpc8xxx: Don't overwrite default irq_set_type callback + +From: Vladimir Oltean + +[ Upstream commit 4e50573f39229d5e9c985fa3b4923a8b29619ade ] + +The per-SoC devtype structures can contain their own callbacks that +overwrite mpc8xxx_gpio_devtype_default. + +The clear intention is that mpc8xxx_irq_set_type is used in case the SoC +does not specify a more specific callback. But what happens is that if +the SoC doesn't specify one, its .irq_set_type is de-facto NULL, and +this overwrites mpc8xxx_irq_set_type to a no-op. This means that the +following SoCs are affected: + +- fsl,mpc8572-gpio +- fsl,ls1028a-gpio +- fsl,ls1088a-gpio + +On these boards, the irq_set_type does exactly nothing, and the GPIO +controller keeps its GPICR register in the hardware-default state. On +the LS1028A, that is ACTIVE_BOTH, which means 2 interrupts are raised +even if the IRQ client requests LEVEL_HIGH. Another implication is that +the IRQs are not checked (e.g. level-triggered interrupts are not +rejected, although they are not supported). + +Fixes: 82e39b0d8566 ("gpio: mpc8xxx: handle differences between incarnations at a single place") +Signed-off-by: Vladimir Oltean +Link: https://lore.kernel.org/r/20191115125551.31061-1-olteanv@gmail.com +Tested-by: Michael Walle +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/gpio/gpio-mpc8xxx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c +index c8673a5d9412..3f10f9599f2c 100644 +--- a/drivers/gpio/gpio-mpc8xxx.c ++++ b/drivers/gpio/gpio-mpc8xxx.c +@@ -348,7 +348,8 @@ static int mpc8xxx_probe(struct platform_device *pdev) + * It's assumed that only a single type of gpio controller is available + * on the current machine, so overwriting global data is fine. + */ +- mpc8xxx_irq_chip.irq_set_type = devtype->irq_set_type; ++ if (devtype->irq_set_type) ++ mpc8xxx_irq_chip.irq_set_type = devtype->irq_set_type; + + if (devtype->gpio_dir_out) + gc->direction_output = devtype->gpio_dir_out; +-- +2.20.1 + diff --git a/queue-4.19/hid-improve-windows-precision-touchpad-detection.patch b/queue-4.19/hid-improve-windows-precision-touchpad-detection.patch new file mode 100644 index 00000000000..6ed1aec2641 --- /dev/null +++ b/queue-4.19/hid-improve-windows-precision-touchpad-detection.patch @@ -0,0 +1,68 @@ +From 6d7c1c19f6885a20e9bf07635439c37a11e627c9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Nov 2019 20:02:46 +0900 +Subject: HID: Improve Windows Precision Touchpad detection. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Blaž Hrastnik + +[ Upstream commit 2dbc6f113acd74c66b04bf49fb027efd830b1c5a ] + +Per Microsoft spec, usage 0xC5 (page 0xFF) returns a blob containing +data used to verify the touchpad as a Windows Precision Touchpad. + + 0x85, REPORTID_PTPHQA, // REPORT_ID (PTPHQA) + 0x09, 0xC5, // USAGE (Vendor Usage 0xC5) + 0x15, 0x00, // LOGICAL_MINIMUM (0) + 0x26, 0xff, 0x00, // LOGICAL_MAXIMUM (0xff) + 0x75, 0x08, // REPORT_SIZE (8) + 0x96, 0x00, 0x01, // REPORT_COUNT (0x100 (256)) + 0xb1, 0x02, // FEATURE (Data,Var,Abs) + +However, some devices, namely Microsoft's Surface line of products +instead implement a "segmented device certification report" (usage 0xC6) +which returns the same report, but in smaller chunks. + + 0x06, 0x00, 0xff, // USAGE_PAGE (Vendor Defined) + 0x85, REPORTID_PTPHQA, // REPORT_ID (PTPHQA) + 0x09, 0xC6, // USAGE (Vendor usage for segment #) + 0x25, 0x08, // LOGICAL_MAXIMUM (8) + 0x75, 0x08, // REPORT_SIZE (8) + 0x95, 0x01, // REPORT_COUNT (1) + 0xb1, 0x02, // FEATURE (Data,Var,Abs) + 0x09, 0xC7, // USAGE (Vendor Usage) + 0x26, 0xff, 0x00, // LOGICAL_MAXIMUM (0xff) + 0x95, 0x20, // REPORT_COUNT (32) + 0xb1, 0x02, // FEATURE (Data,Var,Abs) + +By expanding Win8 touchpad detection to also look for the segmented +report, all Surface touchpads are now properly recognized by +hid-multitouch. + +Signed-off-by: Blaž Hrastnik +Signed-off-by: Benjamin Tissoires +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-core.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c +index b0c8fae7f903..3a359716fb38 100644 +--- a/drivers/hid/hid-core.c ++++ b/drivers/hid/hid-core.c +@@ -780,6 +780,10 @@ static void hid_scan_feature_usage(struct hid_parser *parser, u32 usage) + if (usage == 0xff0000c5 && parser->global.report_count == 256 && + parser->global.report_size == 8) + parser->scan_flags |= HID_SCAN_FLAG_MT_WIN_8; ++ ++ if (usage == 0xff0000c6 && parser->global.report_count == 1 && ++ parser->global.report_size == 8) ++ parser->scan_flags |= HID_SCAN_FLAG_MT_WIN_8; + } + + static void hid_scan_collection(struct hid_parser *parser, unsigned type) +-- +2.20.1 + diff --git a/queue-4.19/hid-logitech-hidpp-silence-intermittent-get_battery_.patch b/queue-4.19/hid-logitech-hidpp-silence-intermittent-get_battery_.patch new file mode 100644 index 00000000000..403a43cd10c --- /dev/null +++ b/queue-4.19/hid-logitech-hidpp-silence-intermittent-get_battery_.patch @@ -0,0 +1,46 @@ +From 709888a835d044551f1fa0b31e9217f055701eef Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Nov 2019 15:30:46 +0100 +Subject: HID: logitech-hidpp: Silence intermittent get_battery_capacity errors + +From: Hans de Goede + +[ Upstream commit 61005d65b6c7dcf61c19516e6ebe5acc02d2cdda ] + +My Logitech M185 (PID:4038) 2.4 GHz wireless HID++ mouse is causing +intermittent errors like these in the log: + +[11091.034857] logitech-hidpp-device 0003:046D:4038.0006: hidpp20_batterylevel_get_battery_capacity: received protocol error 0x09 +[12388.031260] logitech-hidpp-device 0003:046D:4038.0006: hidpp20_batterylevel_get_battery_capacity: received protocol error 0x09 +[16613.718543] logitech-hidpp-device 0003:046D:4038.0006: hidpp20_batterylevel_get_battery_capacity: received protocol error 0x09 +[23529.938728] logitech-hidpp-device 0003:046D:4038.0006: hidpp20_batterylevel_get_battery_capacity: received protocol error 0x09 + +We are already silencing error-code 0x09 (HIDPP_ERROR_RESOURCE_ERROR) +errors in other places, lets do the same in +hidpp20_batterylevel_get_battery_capacity to remove these harmless, +but scary looking errors from the dmesg output. + +Signed-off-by: Hans de Goede +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-logitech-hidpp.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c +index 034c883e57fa..504e8917b06f 100644 +--- a/drivers/hid/hid-logitech-hidpp.c ++++ b/drivers/hid/hid-logitech-hidpp.c +@@ -978,6 +978,9 @@ static int hidpp20_batterylevel_get_battery_capacity(struct hidpp_device *hidpp, + ret = hidpp_send_fap_command_sync(hidpp, feature_index, + CMD_BATTERY_LEVEL_STATUS_GET_BATTERY_LEVEL_STATUS, + NULL, 0, &response); ++ /* Ignore these intermittent errors */ ++ if (ret == HIDPP_ERROR_RESOURCE_ERROR) ++ return -EIO; + if (ret > 0) { + hid_err(hidpp->hid_dev, "%s: received protocol error 0x%02x\n", + __func__, ret); +-- +2.20.1 + diff --git a/queue-4.19/hid-quirks-add-quirk-for-hp-msu1465-pixart-oem-mouse.patch b/queue-4.19/hid-quirks-add-quirk-for-hp-msu1465-pixart-oem-mouse.patch new file mode 100644 index 00000000000..a750fe20f6d --- /dev/null +++ b/queue-4.19/hid-quirks-add-quirk-for-hp-msu1465-pixart-oem-mouse.patch @@ -0,0 +1,63 @@ +From 573d60decca2928da68b3633a0d579cbc4c48be2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Nov 2019 11:38:41 +0800 +Subject: HID: quirks: Add quirk for HP MSU1465 PIXART OEM mouse + +From: Jinke Fan + +[ Upstream commit f1a0094cbbe97a5f8aca7bdc64bfe43ac9dc6879 ] + +The PixArt OEM mouse disconnets/reconnects every minute on +Linux. All contents of dmesg are repetitive: + +[ 1465.810014] usb 1-2.2: USB disconnect, device number 20 +[ 1467.431509] usb 1-2.2: new low-speed USB device number 21 using xhci_hcd +[ 1467.654982] usb 1-2.2: New USB device found, idVendor=03f0,idProduct=1f4a, bcdDevice= 1.00 +[ 1467.654985] usb 1-2.2: New USB device strings: Mfr=1, Product=2,SerialNumber=0 +[ 1467.654987] usb 1-2.2: Product: HP USB Optical Mouse +[ 1467.654988] usb 1-2.2: Manufacturer: PixArt +[ 1467.699722] input: PixArt HP USB Optical Mouse as /devices/pci0000:00/0000:00:07.1/0000:05:00.3/usb1/1-2/1-2.2/1-2.2:1.0/0003:03F0:1F4A.0012/input/input19 +[ 1467.700124] hid-generic 0003:03F0:1F4A.0012: input,hidraw0: USB HID v1.11 Mouse [PixArt HP USB Optical Mouse] on usb-0000:05:00.3-2.2/input0 + +So add HID_QUIRK_ALWAYS_POLL for this one as well. +Test the patch, the mouse is no longer disconnected and there are no +duplicate logs in dmesg. + +Reference: +https://github.com/sriemer/fix-linux-mouse + +Signed-off-by: Jinke Fan +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-quirks.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index 02c263a4c083..1949d6fca53e 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -563,6 +563,7 @@ + #define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_094A 0x094a + #define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_0941 0x0941 + #define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_0641 0x0641 ++#define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_1f4a 0x1f4a + + #define USB_VENDOR_ID_HUION 0x256c + #define USB_DEVICE_ID_HUION_TABLET 0x006e +diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c +index a407fd2399ff..57d6fe9ed416 100644 +--- a/drivers/hid/hid-quirks.c ++++ b/drivers/hid/hid-quirks.c +@@ -96,6 +96,7 @@ static const struct hid_device_id hid_quirks[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_094A), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_0941), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_0641), HID_QUIRK_ALWAYS_POLL }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_1f4a), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6680), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_INNOMEDIA, USB_DEVICE_ID_INNEX_GENESIS_ATARI), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X), HID_QUIRK_MULTI_INPUT }, +-- +2.20.1 + diff --git a/queue-4.19/hid-rmi-check-that-the-rmi_started-bit-is-set-before.patch b/queue-4.19/hid-rmi-check-that-the-rmi_started-bit-is-set-before.patch new file mode 100644 index 00000000000..9f2b5e5ab2a --- /dev/null +++ b/queue-4.19/hid-rmi-check-that-the-rmi_started-bit-is-set-before.patch @@ -0,0 +1,47 @@ +From b68fea522b8d1b4c48584f2ee466d27dee130244 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Oct 2019 01:24:03 +0000 +Subject: HID: rmi: Check that the RMI_STARTED bit is set before unregistering + the RMI transport device + +From: Andrew Duggan + +[ Upstream commit 8725aa4fa7ded30211ebd28bb1c9bae806eb3841 ] + +In the event that the RMI device is unreachable, the calls to rmi_set_mode() or +rmi_set_page() will fail before registering the RMI transport device. When the +device is removed, rmi_remove() will call rmi_unregister_transport_device() +which will attempt to access the rmi_dev pointer which was not set. +This patch adds a check of the RMI_STARTED bit before calling +rmi_unregister_transport_device(). The RMI_STARTED bit is only set +after rmi_register_transport_device() completes successfully. + +The kernel oops was reported in this message: +https://www.spinics.net/lists/linux-input/msg58433.html + +[jkosina@suse.cz: reworded changelog as agreed with Andrew] +Signed-off-by: Andrew Duggan +Reported-by: Federico Cerutti +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-rmi.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c +index 9e33165250a3..a5b6b2be9cda 100644 +--- a/drivers/hid/hid-rmi.c ++++ b/drivers/hid/hid-rmi.c +@@ -737,7 +737,8 @@ static void rmi_remove(struct hid_device *hdev) + { + struct rmi_data *hdata = hid_get_drvdata(hdev); + +- if (hdata->device_flags & RMI_DEVICE) { ++ if ((hdata->device_flags & RMI_DEVICE) ++ && test_bit(RMI_STARTED, &hdata->flags)) { + clear_bit(RMI_STARTED, &hdata->flags); + cancel_work_sync(&hdata->reset_work); + rmi_unregister_transport_device(&hdata->xport); +-- +2.20.1 + diff --git a/queue-4.19/input-atmel_mxt_ts-disable-irq-across-suspend.patch b/queue-4.19/input-atmel_mxt_ts-disable-irq-across-suspend.patch new file mode 100644 index 00000000000..aa4d3d00e78 --- /dev/null +++ b/queue-4.19/input-atmel_mxt_ts-disable-irq-across-suspend.patch @@ -0,0 +1,54 @@ +From 4ca352cb3f4272763a5aedd8526d9e3e11f27371 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Oct 2019 14:00:21 -0700 +Subject: Input: atmel_mxt_ts - disable IRQ across suspend + +From: Evan Green + +[ Upstream commit 463fa44eec2fef50d111ed0199cf593235065c04 ] + +Across suspend and resume, we are seeing error messages like the following: + +atmel_mxt_ts i2c-PRP0001:00: __mxt_read_reg: i2c transfer failed (-121) +atmel_mxt_ts i2c-PRP0001:00: Failed to read T44 and T5 (-121) + +This occurs because the driver leaves its IRQ enabled. Upon resume, there +is an IRQ pending, but the interrupt is serviced before both the driver and +the underlying I2C bus have been resumed. This causes EREMOTEIO errors. + +Disable the IRQ in suspend, and re-enable it on resume. If there are cases +where the driver enters suspend with interrupts disabled, that's a bug we +should fix separately. + +Signed-off-by: Evan Green +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +--- + drivers/input/touchscreen/atmel_mxt_ts.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c +index a7ace07e179e..e8f98de60df3 100644 +--- a/drivers/input/touchscreen/atmel_mxt_ts.c ++++ b/drivers/input/touchscreen/atmel_mxt_ts.c +@@ -3162,6 +3162,8 @@ static int __maybe_unused mxt_suspend(struct device *dev) + + mutex_unlock(&input_dev->mutex); + ++ disable_irq(data->irq); ++ + return 0; + } + +@@ -3174,6 +3176,8 @@ static int __maybe_unused mxt_resume(struct device *dev) + if (!input_dev) + return 0; + ++ enable_irq(data->irq); ++ + mutex_lock(&input_dev->mutex); + + if (input_dev->users) +-- +2.20.1 + diff --git a/queue-4.19/iommu-rockchip-free-domain-on-.domain_free.patch b/queue-4.19/iommu-rockchip-free-domain-on-.domain_free.patch new file mode 100644 index 00000000000..bd6ed04f215 --- /dev/null +++ b/queue-4.19/iommu-rockchip-free-domain-on-.domain_free.patch @@ -0,0 +1,64 @@ +From 07b0e2506cf92ef5523e6fca996100b71d93dd42 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Oct 2019 14:29:23 -0300 +Subject: iommu: rockchip: Free domain on .domain_free + +From: Ezequiel Garcia + +[ Upstream commit 42bb97b80f2e3bf592e3e99d109b67309aa1b30e ] + +IOMMU domain resource life is well-defined, managed +by .domain_alloc and .domain_free. + +Therefore, domain-specific resources shouldn't be tied to +the device life, but instead to its domain. + +Signed-off-by: Ezequiel Garcia +Reviewed-by: Robin Murphy +Acked-by: Heiko Stuebner +Signed-off-by: Joerg Roedel +Signed-off-by: Sasha Levin +--- + drivers/iommu/rockchip-iommu.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c +index ad3e2b97469e..140b287e886c 100644 +--- a/drivers/iommu/rockchip-iommu.c ++++ b/drivers/iommu/rockchip-iommu.c +@@ -977,13 +977,13 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) + if (!dma_dev) + return NULL; + +- rk_domain = devm_kzalloc(dma_dev, sizeof(*rk_domain), GFP_KERNEL); ++ rk_domain = kzalloc(sizeof(*rk_domain), GFP_KERNEL); + if (!rk_domain) + return NULL; + + if (type == IOMMU_DOMAIN_DMA && + iommu_get_dma_cookie(&rk_domain->domain)) +- return NULL; ++ goto err_free_domain; + + /* + * rk32xx iommus use a 2 level pagetable. +@@ -1018,6 +1018,8 @@ err_free_dt: + err_put_cookie: + if (type == IOMMU_DOMAIN_DMA) + iommu_put_dma_cookie(&rk_domain->domain); ++err_free_domain: ++ kfree(rk_domain); + + return NULL; + } +@@ -1046,6 +1048,7 @@ static void rk_iommu_domain_free(struct iommu_domain *domain) + + if (domain->type == IOMMU_DOMAIN_DMA) + iommu_put_dma_cookie(&rk_domain->domain); ++ kfree(rk_domain); + } + + static int rk_iommu_add_device(struct device *dev) +-- +2.20.1 + diff --git a/queue-4.19/iommu-tegra-smmu-fix-page-tables-in-4-gib-memory.patch b/queue-4.19/iommu-tegra-smmu-fix-page-tables-in-4-gib-memory.patch new file mode 100644 index 00000000000..af801713e18 --- /dev/null +++ b/queue-4.19/iommu-tegra-smmu-fix-page-tables-in-4-gib-memory.patch @@ -0,0 +1,79 @@ +From 33ce1c3397c19f283e4da18e4957fc05d96e45fe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Oct 2019 13:50:26 +0200 +Subject: iommu/tegra-smmu: Fix page tables in > 4 GiB memory + +From: Thierry Reding + +[ Upstream commit 96d3ab802e4930a29a33934373157d6dff1b2c7e ] + +Page tables that reside in physical memory beyond the 4 GiB boundary are +currently not working properly. The reason is that when the physical +address for page directory entries is read, it gets truncated at 32 bits +and can cause crashes when passing that address to the DMA API. + +Fix this by first casting the PDE value to a dma_addr_t and then using +the page frame number mask for the SMMU instance to mask out the invalid +bits, which are typically used for mapping attributes, etc. + +Signed-off-by: Thierry Reding +Signed-off-by: Joerg Roedel +Signed-off-by: Sasha Levin +--- + drivers/iommu/tegra-smmu.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c +index 121d3cb7ddd1..fa0ecb5e6380 100644 +--- a/drivers/iommu/tegra-smmu.c ++++ b/drivers/iommu/tegra-smmu.c +@@ -164,9 +164,9 @@ static bool smmu_dma_addr_valid(struct tegra_smmu *smmu, dma_addr_t addr) + return (addr & smmu->pfn_mask) == addr; + } + +-static dma_addr_t smmu_pde_to_dma(u32 pde) ++static dma_addr_t smmu_pde_to_dma(struct tegra_smmu *smmu, u32 pde) + { +- return pde << 12; ++ return (dma_addr_t)(pde & smmu->pfn_mask) << 12; + } + + static void smmu_flush_ptc_all(struct tegra_smmu *smmu) +@@ -551,6 +551,7 @@ static u32 *tegra_smmu_pte_lookup(struct tegra_smmu_as *as, unsigned long iova, + dma_addr_t *dmap) + { + unsigned int pd_index = iova_pd_index(iova); ++ struct tegra_smmu *smmu = as->smmu; + struct page *pt_page; + u32 *pd; + +@@ -559,7 +560,7 @@ static u32 *tegra_smmu_pte_lookup(struct tegra_smmu_as *as, unsigned long iova, + return NULL; + + pd = page_address(as->pd); +- *dmap = smmu_pde_to_dma(pd[pd_index]); ++ *dmap = smmu_pde_to_dma(smmu, pd[pd_index]); + + return tegra_smmu_pte_offset(pt_page, iova); + } +@@ -601,7 +602,7 @@ static u32 *as_get_pte(struct tegra_smmu_as *as, dma_addr_t iova, + } else { + u32 *pd = page_address(as->pd); + +- *dmap = smmu_pde_to_dma(pd[pde]); ++ *dmap = smmu_pde_to_dma(smmu, pd[pde]); + } + + return tegra_smmu_pte_offset(as->pts[pde], iova); +@@ -626,7 +627,7 @@ static void tegra_smmu_pte_put_use(struct tegra_smmu_as *as, unsigned long iova) + if (--as->count[pde] == 0) { + struct tegra_smmu *smmu = as->smmu; + u32 *pd = page_address(as->pd); +- dma_addr_t pte_dma = smmu_pde_to_dma(pd[pde]); ++ dma_addr_t pte_dma = smmu_pde_to_dma(smmu, pd[pde]); + + tegra_smmu_set_pde(as, iova, 0); + +-- +2.20.1 + diff --git a/queue-4.19/irqchip-ingenic-error-out-if-irq-domain-creation-fai.patch b/queue-4.19/irqchip-ingenic-error-out-if-irq-domain-creation-fai.patch new file mode 100644 index 00000000000..6e6fab5fdf1 --- /dev/null +++ b/queue-4.19/irqchip-ingenic-error-out-if-irq-domain-creation-fai.patch @@ -0,0 +1,59 @@ +From 6aff49cb8445ff1822885941ba0553ca09554b66 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Oct 2019 19:25:22 +0800 +Subject: irqchip: ingenic: Error out if IRQ domain creation failed + +From: Paul Cercueil + +[ Upstream commit 52ecc87642f273a599c9913b29fd179c13de457b ] + +If we cannot create the IRQ domain, the driver should fail to probe +instead of succeeding with just a warning message. + +Signed-off-by: Paul Cercueil +Signed-off-by: Marc Zyngier +Link: https://lore.kernel.org/r/1570015525-27018-3-git-send-email-zhouyanjie@zoho.com +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-ingenic.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/drivers/irqchip/irq-ingenic.c b/drivers/irqchip/irq-ingenic.c +index 2ff08986b536..be6923abf9a4 100644 +--- a/drivers/irqchip/irq-ingenic.c ++++ b/drivers/irqchip/irq-ingenic.c +@@ -117,6 +117,14 @@ static int __init ingenic_intc_of_init(struct device_node *node, + goto out_unmap_irq; + } + ++ domain = irq_domain_add_legacy(node, num_chips * 32, ++ JZ4740_IRQ_BASE, 0, ++ &irq_domain_simple_ops, NULL); ++ if (!domain) { ++ err = -ENOMEM; ++ goto out_unmap_base; ++ } ++ + for (i = 0; i < num_chips; i++) { + /* Mask all irqs */ + writel(0xffffffff, intc->base + (i * CHIP_SIZE) + +@@ -143,14 +151,11 @@ static int __init ingenic_intc_of_init(struct device_node *node, + IRQ_NOPROBE | IRQ_LEVEL); + } + +- domain = irq_domain_add_legacy(node, num_chips * 32, JZ4740_IRQ_BASE, 0, +- &irq_domain_simple_ops, NULL); +- if (!domain) +- pr_warn("unable to register IRQ domain\n"); +- + setup_irq(parent_irq, &intc_cascade_action); + return 0; + ++out_unmap_base: ++ iounmap(intc->base); + out_unmap_irq: + irq_dispose_mapping(parent_irq); + out_free: +-- +2.20.1 + diff --git a/queue-4.19/irqchip-irq-bcm7038-l1-enable-parent-irq-if-necessar.patch b/queue-4.19/irqchip-irq-bcm7038-l1-enable-parent-irq-if-necessar.patch new file mode 100644 index 00000000000..cfd3dbd152f --- /dev/null +++ b/queue-4.19/irqchip-irq-bcm7038-l1-enable-parent-irq-if-necessar.patch @@ -0,0 +1,38 @@ +From 3dd25b45afeb8f8481617a70e49a730857b85fd9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Oct 2019 13:14:13 -0700 +Subject: irqchip/irq-bcm7038-l1: Enable parent IRQ if necessary + +From: Florian Fainelli + +[ Upstream commit 27eebb60357ed5aa6659442f92907c0f7368d6ae ] + +If the 'brcm,irq-can-wake' property is specified, make sure we also +enable the corresponding parent interrupt we are attached to. + +Signed-off-by: Florian Fainelli +Signed-off-by: Marc Zyngier +Link: https://lore.kernel.org/r/20191024201415.23454-4-f.fainelli@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-bcm7038-l1.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c +index 0f6e30e9009d..f53dfc5aa7c5 100644 +--- a/drivers/irqchip/irq-bcm7038-l1.c ++++ b/drivers/irqchip/irq-bcm7038-l1.c +@@ -284,6 +284,10 @@ static int __init bcm7038_l1_init_one(struct device_node *dn, + pr_err("failed to map parent interrupt %d\n", parent_irq); + return -EINVAL; + } ++ ++ if (of_property_read_bool(dn, "brcm,irq-can-wake")) ++ enable_irq_wake(parent_irq); ++ + irq_set_chained_handler_and_data(parent_irq, bcm7038_l1_irq_handle, + intc); + +-- +2.20.1 + diff --git a/queue-4.19/jbd2-fix-statistics-for-the-number-of-logged-blocks.patch b/queue-4.19/jbd2-fix-statistics-for-the-number-of-logged-blocks.patch new file mode 100644 index 00000000000..d5724057655 --- /dev/null +++ b/queue-4.19/jbd2-fix-statistics-for-the-number-of-logged-blocks.patch @@ -0,0 +1,61 @@ +From 83ca4ae793d214be99d57426c21d5d58d8b9fe74 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 Nov 2019 17:44:19 +0100 +Subject: jbd2: Fix statistics for the number of logged blocks + +From: Jan Kara + +[ Upstream commit 015c6033068208d6227612c878877919f3fcf6b6 ] + +jbd2 statistics counting number of blocks logged in a transaction was +wrong. It didn't count the commit block and more importantly it didn't +count revoke descriptor blocks. Make sure these get properly counted. + +Reviewed-by: Theodore Ts'o +Signed-off-by: Jan Kara +Link: https://lore.kernel.org/r/20191105164437.32602-13-jack@suse.cz +Signed-off-by: Theodore Ts'o +Signed-off-by: Sasha Levin +--- + fs/jbd2/commit.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c +index 24f86ffe11d7..020bd7a0d8e0 100644 +--- a/fs/jbd2/commit.c ++++ b/fs/jbd2/commit.c +@@ -724,7 +724,6 @@ start_journal_io: + submit_bh(REQ_OP_WRITE, REQ_SYNC, bh); + } + cond_resched(); +- stats.run.rs_blocks_logged += bufs; + + /* Force a new descriptor to be generated next + time round the loop. */ +@@ -811,6 +810,7 @@ start_journal_io: + if (unlikely(!buffer_uptodate(bh))) + err = -EIO; + jbd2_unfile_log_bh(bh); ++ stats.run.rs_blocks_logged++; + + /* + * The list contains temporary buffer heads created by +@@ -856,6 +856,7 @@ start_journal_io: + BUFFER_TRACE(bh, "ph5: control buffer writeout done: unfile"); + clear_buffer_jwrite(bh); + jbd2_unfile_log_bh(bh); ++ stats.run.rs_blocks_logged++; + __brelse(bh); /* One for getblk */ + /* AKPM: bforget here */ + } +@@ -877,6 +878,7 @@ start_journal_io: + } + if (cbh) + err = journal_wait_on_commit_record(journal, cbh); ++ stats.run.rs_blocks_logged++; + if (jbd2_has_feature_async_commit(journal) && + journal->j_flags & JBD2_BARRIER) { + blkdev_issue_flush(journal->j_dev, GFP_NOFS, NULL); +-- +2.20.1 + diff --git a/queue-4.19/kernel-sysctl-make-drop_caches-write-only.patch b/queue-4.19/kernel-sysctl-make-drop_caches-write-only.patch new file mode 100644 index 00000000000..aa3aab556b1 --- /dev/null +++ b/queue-4.19/kernel-sysctl-make-drop_caches-write-only.patch @@ -0,0 +1,53 @@ +From e07f25d85d7e2e5dda1e6e06866a31762af7bd73 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 30 Nov 2019 17:56:08 -0800 +Subject: kernel: sysctl: make drop_caches write-only + +From: Johannes Weiner + +[ Upstream commit 204cb79ad42f015312a5bbd7012d09c93d9b46fb ] + +Currently, the drop_caches proc file and sysctl read back the last value +written, suggesting this is somehow a stateful setting instead of a +one-time command. Make it write-only, like e.g. compact_memory. + +While mitigating a VM problem at scale in our fleet, there was confusion +about whether writing to this file will permanently switch the kernel into +a non-caching mode. This influences the decision making in a tense +situation, where tens of people are trying to fix tens of thousands of +affected machines: Do we need a rollback strategy? What are the +performance implications of operating in a non-caching state for several +days? It also caused confusion when the kernel team said we may need to +write the file several times to make sure it's effective ("But it already +reads back 3?"). + +Link: http://lkml.kernel.org/r/20191031221602.9375-1-hannes@cmpxchg.org +Signed-off-by: Johannes Weiner +Acked-by: Chris Down +Acked-by: Vlastimil Babka +Acked-by: David Hildenbrand +Acked-by: Michal Hocko +Acked-by: Alexey Dobriyan +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + kernel/sysctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index f8576509c7be..4c4fd4339d33 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -1411,7 +1411,7 @@ static struct ctl_table vm_table[] = { + .procname = "drop_caches", + .data = &sysctl_drop_caches, + .maxlen = sizeof(int), +- .mode = 0644, ++ .mode = 0200, + .proc_handler = drop_caches_sysctl_handler, + .extra1 = &one, + .extra2 = &four, +-- +2.20.1 + diff --git a/queue-4.19/leds-lm3692x-handle-failure-to-probe-the-regulator.patch b/queue-4.19/leds-lm3692x-handle-failure-to-probe-the-regulator.patch new file mode 100644 index 00000000000..a8d2c0b0f28 --- /dev/null +++ b/queue-4.19/leds-lm3692x-handle-failure-to-probe-the-regulator.patch @@ -0,0 +1,52 @@ +From 91a53fcf5a14762ea50769af00c04b848524e322 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 21 Sep 2019 14:12:10 -0700 +Subject: leds: lm3692x: Handle failure to probe the regulator +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Guido Günther + +[ Upstream commit 396128d2ffcba6e1954cfdc9a89293ff79cbfd7c ] + +Instead use devm_regulator_get_optional since the regulator +is optional and check for errors. + +Signed-off-by: Guido Günther +Acked-by: Pavel Machek +Reviewed-by: Dan Murphy +Signed-off-by: Pavel Machek +Signed-off-by: Sasha Levin +--- + drivers/leds/leds-lm3692x.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/drivers/leds/leds-lm3692x.c b/drivers/leds/leds-lm3692x.c +index 4f413a7c5f05..d79a66a73169 100644 +--- a/drivers/leds/leds-lm3692x.c ++++ b/drivers/leds/leds-lm3692x.c +@@ -337,9 +337,18 @@ static int lm3692x_probe_dt(struct lm3692x_led *led) + return ret; + } + +- led->regulator = devm_regulator_get(&led->client->dev, "vled"); +- if (IS_ERR(led->regulator)) ++ led->regulator = devm_regulator_get_optional(&led->client->dev, "vled"); ++ if (IS_ERR(led->regulator)) { ++ ret = PTR_ERR(led->regulator); ++ if (ret != -ENODEV) { ++ if (ret != -EPROBE_DEFER) ++ dev_err(&led->client->dev, ++ "Failed to get vled regulator: %d\n", ++ ret); ++ return ret; ++ } + led->regulator = NULL; ++ } + + child = device_get_next_child_node(&led->client->dev, child); + if (!child) { +-- +2.20.1 + diff --git a/queue-4.19/libfdt-define-int32_max-and-uint32_max-in-libfdt_env.patch b/queue-4.19/libfdt-define-int32_max-and-uint32_max-in-libfdt_env.patch new file mode 100644 index 00000000000..623405bc2fd --- /dev/null +++ b/queue-4.19/libfdt-define-int32_max-and-uint32_max-in-libfdt_env.patch @@ -0,0 +1,84 @@ +From 4506ed0a30d7f7e490a972650124d42c0621a30c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Nov 2019 16:12:02 +0900 +Subject: libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h + +From: Masahiro Yamada + +[ Upstream commit a8de1304b7df30e3a14f2a8b9709bb4ff31a0385 ] + +The DTC v1.5.1 added references to (U)INT32_MAX. + +This is no problem for user-space programs since defines +(U)INT32_MAX along with (u)int32_t. + +For the kernel space, libfdt_env.h needs to be adjusted before we +pull in the changes. + +In the kernel, we usually use s/u32 instead of (u)int32_t for the +fixed-width types. + +Accordingly, we already have S/U32_MAX for their max values. +So, we should not add (U)INT32_MAX to any more. + +Instead, add them to the in-kernel libfdt_env.h to compile the +latest libfdt. + +Signed-off-by: Masahiro Yamada +Signed-off-by: Rob Herring +Signed-off-by: Sasha Levin +--- + arch/arm/boot/compressed/libfdt_env.h | 4 +++- + arch/powerpc/boot/libfdt_env.h | 2 ++ + include/linux/libfdt_env.h | 3 +++ + 3 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h +index b36c0289a308..6a0f1f524466 100644 +--- a/arch/arm/boot/compressed/libfdt_env.h ++++ b/arch/arm/boot/compressed/libfdt_env.h +@@ -2,11 +2,13 @@ + #ifndef _ARM_LIBFDT_ENV_H + #define _ARM_LIBFDT_ENV_H + ++#include + #include + #include + #include + +-#define INT_MAX ((int)(~0U>>1)) ++#define INT32_MAX S32_MAX ++#define UINT32_MAX U32_MAX + + typedef __be16 fdt16_t; + typedef __be32 fdt32_t; +diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h +index 2abc8e83b95e..9757d4f6331e 100644 +--- a/arch/powerpc/boot/libfdt_env.h ++++ b/arch/powerpc/boot/libfdt_env.h +@@ -6,6 +6,8 @@ + #include + + #define INT_MAX ((int)(~0U>>1)) ++#define UINT32_MAX ((u32)~0U) ++#define INT32_MAX ((s32)(UINT32_MAX >> 1)) + + #include "of.h" + +diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h +index edb0f0c30904..1adf54aad2df 100644 +--- a/include/linux/libfdt_env.h ++++ b/include/linux/libfdt_env.h +@@ -7,6 +7,9 @@ + + #include + ++#define INT32_MAX S32_MAX ++#define UINT32_MAX U32_MAX ++ + typedef __be16 fdt16_t; + typedef __be32 fdt32_t; + typedef __be64 fdt64_t; +-- +2.20.1 + diff --git a/queue-4.19/libnvdimm-btt-fix-variable-rc-set-but-not-used.patch b/queue-4.19/libnvdimm-btt-fix-variable-rc-set-but-not-used.patch new file mode 100644 index 00000000000..0f2eecfa673 --- /dev/null +++ b/queue-4.19/libnvdimm-btt-fix-variable-rc-set-but-not-used.patch @@ -0,0 +1,50 @@ +From 345761e9756ff79e2f5b115c14e61900e318cc7c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 31 Oct 2019 10:05:19 -0400 +Subject: libnvdimm/btt: fix variable 'rc' set but not used + +From: Qian Cai + +[ Upstream commit 4e24e37d5313edca8b4ab86f240c046c731e28d6 ] + +drivers/nvdimm/btt.c: In function 'btt_read_pg': +drivers/nvdimm/btt.c:1264:8: warning: variable 'rc' set but not used +[-Wunused-but-set-variable] + int rc; + ^~ + +Add a ratelimited message in case a storm of errors is encountered. + +Fixes: d9b83c756953 ("libnvdimm, btt: rework error clearing") +Signed-off-by: Qian Cai +Reviewed-by: Vishal Verma +Link: https://lore.kernel.org/r/1572530719-32161-1-git-send-email-cai@lca.pw +Signed-off-by: Dan Williams +Signed-off-by: Sasha Levin +--- + drivers/nvdimm/btt.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c +index 0360c015f658..75ae2c508a04 100644 +--- a/drivers/nvdimm/btt.c ++++ b/drivers/nvdimm/btt.c +@@ -1260,11 +1260,11 @@ static int btt_read_pg(struct btt *btt, struct bio_integrity_payload *bip, + + ret = btt_data_read(arena, page, off, postmap, cur_len); + if (ret) { +- int rc; +- + /* Media error - set the e_flag */ +- rc = btt_map_write(arena, premap, postmap, 0, 1, +- NVDIMM_IO_ATOMIC); ++ if (btt_map_write(arena, premap, postmap, 0, 1, NVDIMM_IO_ATOMIC)) ++ dev_warn_ratelimited(to_dev(arena), ++ "Error persistently tracking bad blocks at %#x\n", ++ premap); + goto out_rtt; + } + +-- +2.20.1 + diff --git a/queue-4.19/mailbox-imx-fix-tx-doorbell-shutdown-path.patch b/queue-4.19/mailbox-imx-fix-tx-doorbell-shutdown-path.patch new file mode 100644 index 00000000000..5b45155079b --- /dev/null +++ b/queue-4.19/mailbox-imx-fix-tx-doorbell-shutdown-path.patch @@ -0,0 +1,79 @@ +From 54c1349dfd74de42c1f48272672f64d87a01d757 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Oct 2019 16:07:18 +0800 +Subject: mailbox: imx: Fix Tx doorbell shutdown path + +From: Daniel Baluta + +[ Upstream commit bf159d151a0b844be28882f39e316b5800acaa2b ] + +Tx doorbell is handled by txdb_tasklet and doesn't +have an associated IRQ. + +Anyhow, imx_mu_shutdown ignores this and tries to +free an IRQ that wasn't requested for Tx DB resulting +in the following warning: + +[ 1.967644] Trying to free already-free IRQ 26 +[ 1.972108] WARNING: CPU: 2 PID: 157 at kernel/irq/manage.c:1708 __free_irq+0xc0/0x358 +[ 1.980024] Modules linked in: +[ 1.983088] CPU: 2 PID: 157 Comm: kworker/2:1 Tainted: G +[ 1.993524] Hardware name: Freescale i.MX8QXP MEK (DT) +[ 1.998668] Workqueue: events deferred_probe_work_func +[ 2.003812] pstate: 60000085 (nZCv daIf -PAN -UAO) +[ 2.008607] pc : __free_irq+0xc0/0x358 +[ 2.012364] lr : __free_irq+0xc0/0x358 +[ 2.016111] sp : ffff00001179b7e0 +[ 2.019422] x29: ffff00001179b7e0 x28: 0000000000000018 +[ 2.024736] x27: ffff000011233000 x26: 0000000000000004 +[ 2.030053] x25: 000000000000001a x24: ffff80083bec74d4 +[ 2.035369] x23: 0000000000000000 x22: ffff80083bec7588 +[ 2.040686] x21: ffff80083b1fe8d8 x20: ffff80083bec7400 +[ 2.046003] x19: 0000000000000000 x18: ffffffffffffffff +[ 2.051320] x17: 0000000000000000 x16: 0000000000000000 +[ 2.056637] x15: ffff0000111296c8 x14: ffff00009179b517 +[ 2.061953] x13: ffff00001179b525 x12: ffff000011142000 +[ 2.067270] x11: ffff000011129f20 x10: ffff0000105da970 +[ 2.072587] x9 : 00000000ffffffd0 x8 : 0000000000000194 +[ 2.077903] x7 : 612065657266206f x6 : ffff0000111e7b09 +[ 2.083220] x5 : 0000000000000003 x4 : 0000000000000000 +[ 2.088537] x3 : 0000000000000000 x2 : 00000000ffffffff +[ 2.093854] x1 : 28b70f0a2b60a500 x0 : 0000000000000000 +[ 2.099173] Call trace: +[ 2.101618] __free_irq+0xc0/0x358 +[ 2.105021] free_irq+0x38/0x98 +[ 2.108170] imx_mu_shutdown+0x90/0xb0 +[ 2.111921] mbox_free_channel.part.2+0x24/0xb8 +[ 2.116453] mbox_free_channel+0x18/0x28 + +This bug is present from the beginning of times. + +Cc: Oleksij Rempel +Signed-off-by: Daniel Baluta +Signed-off-by: Richard Zhu +Reviewed-by: Dong Aisheng +Signed-off-by: Jassi Brar +Signed-off-by: Sasha Levin +--- + drivers/mailbox/imx-mailbox.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c +index 363d35d5e49d..2f47023cab2b 100644 +--- a/drivers/mailbox/imx-mailbox.c ++++ b/drivers/mailbox/imx-mailbox.c +@@ -214,8 +214,10 @@ static void imx_mu_shutdown(struct mbox_chan *chan) + struct imx_mu_priv *priv = to_imx_mu_priv(chan->mbox); + struct imx_mu_con_priv *cp = chan->con_priv; + +- if (cp->type == IMX_MU_TYPE_TXDB) ++ if (cp->type == IMX_MU_TYPE_TXDB) { + tasklet_kill(&cp->txdb_tasklet); ++ return; ++ } + + imx_mu_xcr_rmw(priv, 0, + IMX_MU_xCR_TIEn(cp->idx) | IMX_MU_xCR_RIEn(cp->idx)); +-- +2.20.1 + diff --git a/queue-4.19/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch b/queue-4.19/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch new file mode 100644 index 00000000000..109d17c9839 --- /dev/null +++ b/queue-4.19/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch @@ -0,0 +1,49 @@ +From 5431ded60a1249efb98425e22d09610930a3be17 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 7 Nov 2019 11:19:50 +0000 +Subject: mfd: mfd-core: Honour Device Tree's request to disable a child-device + +From: Lee Jones + +[ Upstream commit 6b5c350648b857047b47acf74a57087ad27d6183 ] + +Until now, MFD has assumed all child devices passed to it (via +mfd_cells) are to be registered. It does not take into account +requests from Device Tree and the like to disable child devices +on a per-platform basis. + +Well now it does. + +Link: https://www.spinics.net/lists/arm-kernel/msg366309.html +Link: https://lkml.org/lkml/2019/8/22/1350 + +Reported-by: Barry Song +Reported-by: Stephan Gerhold +Reviewed-by: Daniel Thompson +Reviewed-by: Mark Brown +Tested-by: Stephan Gerhold +Signed-off-by: Lee Jones +Signed-off-by: Sasha Levin +--- + drivers/mfd/mfd-core.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c +index 182973df1aed..99a9c5c56ea9 100644 +--- a/drivers/mfd/mfd-core.c ++++ b/drivers/mfd/mfd-core.c +@@ -178,6 +178,11 @@ static int mfd_add_device(struct device *parent, int id, + if (parent->of_node && cell->of_compatible) { + for_each_child_of_node(parent->of_node, np) { + if (of_device_is_compatible(np, cell->of_compatible)) { ++ if (!of_device_is_available(np)) { ++ /* Ignore disabled devices error free */ ++ ret = 0; ++ goto fail_alias; ++ } + pdev->dev.of_node = np; + pdev->dev.fwnode = &np->fwnode; + break; +-- +2.20.1 + diff --git a/queue-4.19/ocfs2-fix-passing-zero-to-ptr_err-warning.patch b/queue-4.19/ocfs2-fix-passing-zero-to-ptr_err-warning.patch new file mode 100644 index 00000000000..1055f41dd1a --- /dev/null +++ b/queue-4.19/ocfs2-fix-passing-zero-to-ptr_err-warning.patch @@ -0,0 +1,48 @@ +From 4418b91718666551ef45c5f0709ce67eeb1efe36 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 30 Nov 2019 17:49:12 -0800 +Subject: ocfs2: fix passing zero to 'PTR_ERR' warning + +From: Ding Xiang + +[ Upstream commit 188c523e1c271d537f3c9f55b6b65bf4476de32f ] + +Fix a static code checker warning: +fs/ocfs2/acl.c:331 + ocfs2_acl_chmod() warn: passing zero to 'PTR_ERR' + +Link: http://lkml.kernel.org/r/1dee278b-6c96-eec2-ce76-fe6e07c6e20f@linux.alibaba.com +Fixes: 5ee0fbd50fd ("ocfs2: revert using ocfs2_acl_chmod to avoid inode cluster lock hang") +Signed-off-by: Ding Xiang +Reviewed-by: Joseph Qi +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Changwei Ge +Cc: Gang He +Cc: Jun Piao +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/ocfs2/acl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c +index 917fadca8a7b..b73b78771915 100644 +--- a/fs/ocfs2/acl.c ++++ b/fs/ocfs2/acl.c +@@ -335,8 +335,8 @@ int ocfs2_acl_chmod(struct inode *inode, struct buffer_head *bh) + down_read(&OCFS2_I(inode)->ip_xattr_sem); + acl = ocfs2_get_acl_nolock(inode, ACL_TYPE_ACCESS, bh); + up_read(&OCFS2_I(inode)->ip_xattr_sem); +- if (IS_ERR(acl) || !acl) +- return PTR_ERR(acl); ++ if (IS_ERR_OR_NULL(acl)) ++ return PTR_ERR_OR_ZERO(acl); + ret = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode); + if (ret) + return ret; +-- +2.20.1 + diff --git a/queue-4.19/pci-rpaphp-annotate-and-correctly-byte-swap-drc-prop.patch b/queue-4.19/pci-rpaphp-annotate-and-correctly-byte-swap-drc-prop.patch new file mode 100644 index 00000000000..dd08533c521 --- /dev/null +++ b/queue-4.19/pci-rpaphp-annotate-and-correctly-byte-swap-drc-prop.patch @@ -0,0 +1,116 @@ +From eb3e1c9a0a1188e308c8ae19dcbe64f23fa15051 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 10 Nov 2019 23:21:35 -0600 +Subject: PCI: rpaphp: Annotate and correctly byte swap DRC properties + +From: Tyrel Datwyler + +[ Upstream commit 0737686778c6dbe0908d684dd5b9c05b127526ba ] + +The device tree is in big endian format and any properties directly +retrieved using OF helpers that don't explicitly byte swap should +be annotated. In particular there are several places where we grab +the opaque property value for the old ibm,drc-* properties and the +ibm,my-drc-index property. + +Fix this for better static checking by annotating values we know to +explicitly big endian, and byte swap where appropriate. + +Signed-off-by: Tyrel Datwyler +Acked-by: Bjorn Helgaas +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/1573449697-5448-9-git-send-email-tyreld@linux.ibm.com +Signed-off-by: Sasha Levin +--- + drivers/pci/hotplug/rpaphp_core.c | 29 +++++++++++++++-------------- + 1 file changed, 15 insertions(+), 14 deletions(-) + +diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c +index ccc6deeb9ccf..7d74fe875225 100644 +--- a/drivers/pci/hotplug/rpaphp_core.c ++++ b/drivers/pci/hotplug/rpaphp_core.c +@@ -154,11 +154,11 @@ static enum pci_bus_speed get_max_bus_speed(struct slot *slot) + return speed; + } + +-static int get_children_props(struct device_node *dn, const int **drc_indexes, +- const int **drc_names, const int **drc_types, +- const int **drc_power_domains) ++static int get_children_props(struct device_node *dn, const __be32 **drc_indexes, ++ const __be32 **drc_names, const __be32 **drc_types, ++ const __be32 **drc_power_domains) + { +- const int *indexes, *names, *types, *domains; ++ const __be32 *indexes, *names, *types, *domains; + + indexes = of_get_property(dn, "ibm,drc-indexes", NULL); + names = of_get_property(dn, "ibm,drc-names", NULL); +@@ -194,8 +194,8 @@ static int rpaphp_check_drc_props_v1(struct device_node *dn, char *drc_name, + char *drc_type, unsigned int my_index) + { + char *name_tmp, *type_tmp; +- const int *indexes, *names; +- const int *types, *domains; ++ const __be32 *indexes, *names; ++ const __be32 *types, *domains; + int i, rc; + + rc = get_children_props(dn->parent, &indexes, &names, &types, &domains); +@@ -208,7 +208,7 @@ static int rpaphp_check_drc_props_v1(struct device_node *dn, char *drc_name, + + /* Iterate through parent properties, looking for my-drc-index */ + for (i = 0; i < be32_to_cpu(indexes[0]); i++) { +- if ((unsigned int) indexes[i + 1] == my_index) ++ if (be32_to_cpu(indexes[i + 1]) == my_index) + break; + + name_tmp += (strlen(name_tmp) + 1); +@@ -267,7 +267,7 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name, + int rpaphp_check_drc_props(struct device_node *dn, char *drc_name, + char *drc_type) + { +- const unsigned int *my_index; ++ const __be32 *my_index; + + my_index = of_get_property(dn, "ibm,my-drc-index", NULL); + if (!my_index) { +@@ -277,10 +277,10 @@ int rpaphp_check_drc_props(struct device_node *dn, char *drc_name, + + if (of_find_property(dn->parent, "ibm,drc-info", NULL)) + return rpaphp_check_drc_props_v2(dn, drc_name, drc_type, +- *my_index); ++ be32_to_cpu(*my_index)); + else + return rpaphp_check_drc_props_v1(dn, drc_name, drc_type, +- *my_index); ++ be32_to_cpu(*my_index)); + } + EXPORT_SYMBOL_GPL(rpaphp_check_drc_props); + +@@ -311,10 +311,11 @@ static int is_php_type(char *drc_type) + * for built-in pci slots (even when the built-in slots are + * dlparable.) + */ +-static int is_php_dn(struct device_node *dn, const int **indexes, +- const int **names, const int **types, const int **power_domains) ++static int is_php_dn(struct device_node *dn, const __be32 **indexes, ++ const __be32 **names, const __be32 **types, ++ const __be32 **power_domains) + { +- const int *drc_types; ++ const __be32 *drc_types; + int rc; + + rc = get_children_props(dn, indexes, names, &drc_types, power_domains); +@@ -349,7 +350,7 @@ int rpaphp_add_slot(struct device_node *dn) + struct slot *slot; + int retval = 0; + int i; +- const int *indexes, *names, *types, *power_domains; ++ const __be32 *indexes, *names, *types, *power_domains; + char *name, *type; + + if (!dn->name || strcmp(dn->name, "pci")) +-- +2.20.1 + diff --git a/queue-4.19/pci-rpaphp-correctly-match-ibm-my-drc-index-to-drc-n.patch b/queue-4.19/pci-rpaphp-correctly-match-ibm-my-drc-index-to-drc-n.patch new file mode 100644 index 00000000000..12d3890282a --- /dev/null +++ b/queue-4.19/pci-rpaphp-correctly-match-ibm-my-drc-index-to-drc-n.patch @@ -0,0 +1,51 @@ +From 917f2ac04dfd576d8b24ddaa8e743bc6a04518a1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 10 Nov 2019 23:21:36 -0600 +Subject: PCI: rpaphp: Correctly match ibm, my-drc-index to drc-name when using + drc-info + +From: Tyrel Datwyler + +[ Upstream commit 4f9f2d3d7a434b7f882b72550194c9278f4a3925 ] + +The newer ibm,drc-info property is a condensed description of the old +ibm,drc-* properties (ie. names, types, indexes, and power-domains). +When matching a drc-index to a drc-name we need to verify that the +index is within the start and last drc-index range and map it to a +drc-name using the drc-name-prefix and logical index. + +Fix the mapping by checking that the index is within the range of the +current drc-info entry, and build the name from the drc-name-prefix +concatenated with the starting drc-name-suffix value and the sequential +index obtained by subtracting ibm,my-drc-index from this entries +drc-start-index. + +Signed-off-by: Tyrel Datwyler +Acked-by: Bjorn Helgaas +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/1573449697-5448-10-git-send-email-tyreld@linux.ibm.com +Signed-off-by: Sasha Levin +--- + drivers/pci/hotplug/rpaphp_core.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c +index 7d74fe875225..a306cad70470 100644 +--- a/drivers/pci/hotplug/rpaphp_core.c ++++ b/drivers/pci/hotplug/rpaphp_core.c +@@ -248,9 +248,10 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name, + /* Should now know end of current entry */ + + /* Found it */ +- if (my_index <= drc.last_drc_index) { ++ if (my_index >= drc.drc_index_start && my_index <= drc.last_drc_index) { ++ int index = my_index - drc.drc_index_start; + sprintf(cell_drc_name, "%s%d", drc.drc_name_prefix, +- my_index); ++ drc.drc_name_suffix_start + index); + break; + } + } +-- +2.20.1 + diff --git a/queue-4.19/pci-rpaphp-don-t-rely-on-firmware-feature-to-imply-d.patch b/queue-4.19/pci-rpaphp-don-t-rely-on-firmware-feature-to-imply-d.patch new file mode 100644 index 00000000000..a66b4b2f2ab --- /dev/null +++ b/queue-4.19/pci-rpaphp-don-t-rely-on-firmware-feature-to-imply-d.patch @@ -0,0 +1,48 @@ +From 13dea11f7a75cdd78cd936fa7a74ebfe1ce92e34 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 10 Nov 2019 23:21:32 -0600 +Subject: PCI: rpaphp: Don't rely on firmware feature to imply drc-info support + +From: Tyrel Datwyler + +[ Upstream commit 52e2b0f16574afd082cff0f0e8567b2d9f68c033 ] + +In the event that the partition is migrated to a platform with older +firmware that doesn't support the ibm,drc-info property the device +tree is modified to remove the ibm,drc-info property and replace it +with the older style ibm,drc-* properties for types, names, indexes, +and power-domains. One of the requirements of the drc-info firmware +feature is that the client is able to handle both the new property, +and old style properties at runtime. Therefore we can't rely on the +firmware feature alone to dictate which property is currently +present in the device tree. + +Fix this short coming by checking explicitly for the ibm,drc-info +property, and falling back to the older ibm,drc-* properties if it +doesn't exist. + +Signed-off-by: Tyrel Datwyler +Acked-by: Bjorn Helgaas +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/1573449697-5448-6-git-send-email-tyreld@linux.ibm.com +Signed-off-by: Sasha Levin +--- + drivers/pci/hotplug/rpaphp_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c +index f56004243591..ccc6deeb9ccf 100644 +--- a/drivers/pci/hotplug/rpaphp_core.c ++++ b/drivers/pci/hotplug/rpaphp_core.c +@@ -275,7 +275,7 @@ int rpaphp_check_drc_props(struct device_node *dn, char *drc_name, + return -EINVAL; + } + +- if (firmware_has_feature(FW_FEATURE_DRC_INFO)) ++ if (of_find_property(dn->parent, "ibm,drc-info", NULL)) + return rpaphp_check_drc_props_v2(dn, drc_name, drc_type, + *my_index); + else +-- +2.20.1 + diff --git a/queue-4.19/pci-rpaphp-fix-up-pointer-to-first-drc-info-entry.patch b/queue-4.19/pci-rpaphp-fix-up-pointer-to-first-drc-info-entry.patch new file mode 100644 index 00000000000..37b4e08c5fd --- /dev/null +++ b/queue-4.19/pci-rpaphp-fix-up-pointer-to-first-drc-info-entry.patch @@ -0,0 +1,43 @@ +From d04857d729ec856c835fbe828db370c2a1ccbbd3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 10 Nov 2019 23:21:31 -0600 +Subject: PCI: rpaphp: Fix up pointer to first drc-info entry + +From: Tyrel Datwyler + +[ Upstream commit 9723c25f99aff0451cfe6392e1b9fdd99d0bf9f0 ] + +The first entry of the ibm,drc-info property is an int encoded count +of the number of drc-info entries that follow. The "value" pointer +returned by of_prop_next_u32() is still pointing at the this value +when we call of_read_drc_info_cell(), but the helper function +expects that value to be pointing at the first element of an entry. + +Fix up by incrementing the "value" pointer to point at the first +element of the first drc-info entry prior. + +Signed-off-by: Tyrel Datwyler +Acked-by: Bjorn Helgaas +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/1573449697-5448-5-git-send-email-tyreld@linux.ibm.com +Signed-off-by: Sasha Levin +--- + drivers/pci/hotplug/rpaphp_core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c +index cc860c5f7d26..f56004243591 100644 +--- a/drivers/pci/hotplug/rpaphp_core.c ++++ b/drivers/pci/hotplug/rpaphp_core.c +@@ -239,6 +239,8 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name, + value = of_prop_next_u32(info, NULL, &entries); + if (!value) + return -EINVAL; ++ else ++ value++; + + for (j = 0; j < entries; j++) { + of_read_drc_info_cell(&info, &value, &drc); +-- +2.20.1 + diff --git a/queue-4.19/perf-regs-make-perf_reg_name-return-unknown-instead-.patch b/queue-4.19/perf-regs-make-perf_reg_name-return-unknown-instead-.patch new file mode 100644 index 00000000000..d4529ac746a --- /dev/null +++ b/queue-4.19/perf-regs-make-perf_reg_name-return-unknown-instead-.patch @@ -0,0 +1,86 @@ +From ba0fbd8ee904f5638070c6c021038df65c4459c5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 27 Nov 2019 10:13:34 -0300 +Subject: perf regs: Make perf_reg_name() return "unknown" instead of NULL + +From: Arnaldo Carvalho de Melo + +[ Upstream commit 5b596e0ff0e1852197d4c82d3314db5e43126bf7 ] + +To avoid breaking the build on arches where this is not wired up, at +least all the other features should be made available and when using +this specific routine, the "unknown" should point the user/developer to +the need to wire this up on this particular hardware architecture. + +Detected in a container mipsel debian cross build environment, where it +shows up as: + + In file included from /usr/mipsel-linux-gnu/include/stdio.h:867, + from /git/linux/tools/perf/lib/include/perf/cpumap.h:6, + from util/session.c:13: + In function 'printf', + inlined from 'regs_dump__printf' at util/session.c:1103:3, + inlined from 'regs__printf' at util/session.c:1131:2: + /usr/mipsel-linux-gnu/include/bits/stdio2.h:107:10: error: '%-5s' directive argument is null [-Werror=format-overflow=] + 107 | return __printf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ()); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +cross compiler details: + + mipsel-linux-gnu-gcc (Debian 9.2.1-8) 9.2.1 20190909 + +Also on mips64: + + In file included from /usr/mips64-linux-gnuabi64/include/stdio.h:867, + from /git/linux/tools/perf/lib/include/perf/cpumap.h:6, + from util/session.c:13: + In function 'printf', + inlined from 'regs_dump__printf' at util/session.c:1103:3, + inlined from 'regs__printf' at util/session.c:1131:2, + inlined from 'regs_user__printf' at util/session.c:1139:3, + inlined from 'dump_sample' at util/session.c:1246:3, + inlined from 'machines__deliver_event' at util/session.c:1421:3: + /usr/mips64-linux-gnuabi64/include/bits/stdio2.h:107:10: error: '%-5s' directive argument is null [-Werror=format-overflow=] + 107 | return __printf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ()); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + In function 'printf', + inlined from 'regs_dump__printf' at util/session.c:1103:3, + inlined from 'regs__printf' at util/session.c:1131:2, + inlined from 'regs_intr__printf' at util/session.c:1147:3, + inlined from 'dump_sample' at util/session.c:1249:3, + inlined from 'machines__deliver_event' at util/session.c:1421:3: + /usr/mips64-linux-gnuabi64/include/bits/stdio2.h:107:10: error: '%-5s' directive argument is null [-Werror=format-overflow=] + 107 | return __printf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ()); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +cross compiler details: + + mips64-linux-gnuabi64-gcc (Debian 9.2.1-8) 9.2.1 20190909 + +Fixes: 2bcd355b71da ("perf tools: Add interface to arch registers sets") +Cc: Adrian Hunter +Cc: Jiri Olsa +Cc: Namhyung Kim +Link: https://lkml.kernel.org/n/tip-95wjyv4o65nuaeweq31t7l1s@git.kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/util/perf_regs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/perf/util/perf_regs.h b/tools/perf/util/perf_regs.h +index c9319f8d17a6..f732e3af2bd4 100644 +--- a/tools/perf/util/perf_regs.h ++++ b/tools/perf/util/perf_regs.h +@@ -34,7 +34,7 @@ int perf_reg_value(u64 *valp, struct regs_dump *regs, int id); + + static inline const char *perf_reg_name(int id __maybe_unused) + { +- return NULL; ++ return "unknown"; + } + + static inline int perf_reg_value(u64 *valp __maybe_unused, +-- +2.20.1 + diff --git a/queue-4.19/perf-script-fix-brstackinsn-for-auxtrace.patch b/queue-4.19/perf-script-fix-brstackinsn-for-auxtrace.patch new file mode 100644 index 00000000000..517a46fa6ea --- /dev/null +++ b/queue-4.19/perf-script-fix-brstackinsn-for-auxtrace.patch @@ -0,0 +1,66 @@ +From 9e4f6535a9dee17a9b328eca5970ead8ceea7683 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 27 Nov 2019 11:53:21 +0200 +Subject: perf script: Fix brstackinsn for AUXTRACE + +From: Adrian Hunter + +[ Upstream commit 0cd032d3b5fcebf5454315400ab310746a81ca53 ] + +brstackinsn must be allowed to be set by the user when AUX area data has +been captured because, in that case, the branch stack might be +synthesized on the fly. This fixes the following error: + +Before: + + $ perf record -e '{intel_pt//,cpu/mem_inst_retired.all_loads,aux-sample-size=8192/pp}:u' grep -rqs jhgjhg /boot + [ perf record: Woken up 19 times to write data ] + [ perf record: Captured and wrote 2.274 MB perf.data ] + $ perf script -F +brstackinsn --xed --itrace=i1usl100 | head + Display of branch stack assembler requested, but non all-branch filter set + Hint: run 'perf record -b ...' + +After: + + $ perf record -e '{intel_pt//,cpu/mem_inst_retired.all_loads,aux-sample-size=8192/pp}:u' grep -rqs jhgjhg /boot + [ perf record: Woken up 19 times to write data ] + [ perf record: Captured and wrote 2.274 MB perf.data ] + $ perf script -F +brstackinsn --xed --itrace=i1usl100 | head + grep 13759 [002] 8091.310257: 1862 instructions:uH: 5641d58069eb bmexec+0x86b (/bin/grep) + bmexec+2485: + 00005641d5806b35 jnz 0x5641d5806bd0 # MISPRED + 00005641d5806bd0 movzxb (%r13,%rdx,1), %eax + 00005641d5806bd6 add %rdi, %rax + 00005641d5806bd9 movzxb -0x1(%rax), %edx + 00005641d5806bdd cmp %rax, %r14 + 00005641d5806be0 jnb 0x5641d58069c0 # MISPRED + mismatch of LBR data and executable + 00005641d58069c0 movzxb (%r13,%rdx,1), %edi + +Fixes: 48d02a1d5c13 ("perf script: Add 'brstackinsn' for branch stacks") +Reported-by: Andi Kleen +Signed-off-by: Adrian Hunter +Cc: Jiri Olsa +Link: http://lore.kernel.org/lkml/20191127095322.15417-1-adrian.hunter@intel.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/builtin-script.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c +index a4c78499c838..1200973c77cb 100644 +--- a/tools/perf/builtin-script.c ++++ b/tools/perf/builtin-script.c +@@ -428,7 +428,7 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel, + "selected. Hence, no address to lookup the source line number.\n"); + return -EINVAL; + } +- if (PRINT_FIELD(BRSTACKINSN) && ++ if (PRINT_FIELD(BRSTACKINSN) && !allow_user_set && + !(perf_evlist__combined_branch_type(session->evlist) & + PERF_SAMPLE_BRANCH_ANY)) { + pr_err("Display of branch stack assembler requested, but non all-branch filter set\n" +-- +2.20.1 + diff --git a/queue-4.19/powerpc-book3s64-hash-add-cond_resched-to-avoid-soft.patch b/queue-4.19/powerpc-book3s64-hash-add-cond_resched-to-avoid-soft.patch new file mode 100644 index 00000000000..2325e4257df --- /dev/null +++ b/queue-4.19/powerpc-book3s64-hash-add-cond_resched-to-avoid-soft.patch @@ -0,0 +1,77 @@ +From 933a0dbe333f1205f1f0a57a4c982519b68706d2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Oct 2019 14:16:56 +0530 +Subject: powerpc/book3s64/hash: Add cond_resched to avoid soft lockup warning + +From: Aneesh Kumar K.V + +[ Upstream commit 16f6b67cf03cb43db7104acb2ca877bdc2606c92 ] + +With large memory (8TB and more) hotplug, we can get soft lockup +warnings as below. These were caused by a long loop without any +explicit cond_resched which is a problem for !PREEMPT kernels. + +Avoid this using cond_resched() while inserting hash page table +entries. We already do similar cond_resched() in __add_pages(), see +commit f64ac5e6e306 ("mm, memory_hotplug: add scheduling point to +__add_pages"). + + rcu: 3-....: (24002 ticks this GP) idle=13e/1/0x4000000000000002 softirq=722/722 fqs=12001 + (t=24003 jiffies g=4285 q=2002) + NMI backtrace for cpu 3 + CPU: 3 PID: 3870 Comm: ndctl Not tainted 5.3.0-197.18-default+ #2 + Call Trace: + dump_stack+0xb0/0xf4 (unreliable) + nmi_cpu_backtrace+0x124/0x130 + nmi_trigger_cpumask_backtrace+0x1ac/0x1f0 + arch_trigger_cpumask_backtrace+0x28/0x3c + rcu_dump_cpu_stacks+0xf8/0x154 + rcu_sched_clock_irq+0x878/0xb40 + update_process_times+0x48/0x90 + tick_sched_handle.isra.16+0x4c/0x80 + tick_sched_timer+0x68/0xe0 + __hrtimer_run_queues+0x180/0x430 + hrtimer_interrupt+0x110/0x300 + timer_interrupt+0x108/0x2f0 + decrementer_common+0x114/0x120 + --- interrupt: 901 at arch_add_memory+0xc0/0x130 + LR = arch_add_memory+0x74/0x130 + memremap_pages+0x494/0x650 + devm_memremap_pages+0x3c/0xa0 + pmem_attach_disk+0x188/0x750 + nvdimm_bus_probe+0xac/0x2c0 + really_probe+0x148/0x570 + driver_probe_device+0x19c/0x1d0 + device_driver_attach+0xcc/0x100 + bind_store+0x134/0x1c0 + drv_attr_store+0x44/0x60 + sysfs_kf_write+0x64/0x90 + kernfs_fop_write+0x1a0/0x270 + __vfs_write+0x3c/0x70 + vfs_write+0xd0/0x260 + ksys_write+0xdc/0x130 + system_call+0x5c/0x68 + +Signed-off-by: Aneesh Kumar K.V +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20191001084656.31277-1-aneesh.kumar@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/mm/hash_utils_64.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c +index 11b41383e167..8894c8f300ea 100644 +--- a/arch/powerpc/mm/hash_utils_64.c ++++ b/arch/powerpc/mm/hash_utils_64.c +@@ -307,6 +307,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, + if (ret < 0) + break; + ++ cond_resched(); + #ifdef CONFIG_DEBUG_PAGEALLOC + if (debug_pagealloc_enabled() && + (paddr >> PAGE_SHIFT) < linear_map_hash_count) +-- +2.20.1 + diff --git a/queue-4.19/powerpc-don-t-add-mabi-flags-when-building-with-clan.patch b/queue-4.19/powerpc-don-t-add-mabi-flags-when-building-with-clan.patch new file mode 100644 index 00000000000..c7f52c5f3ed --- /dev/null +++ b/queue-4.19/powerpc-don-t-add-mabi-flags-when-building-with-clan.patch @@ -0,0 +1,97 @@ +From 4464b047863f56299ed53f3e0710efb08086177a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 18 Nov 2019 21:57:10 -0700 +Subject: powerpc: Don't add -mabi= flags when building with Clang + +From: Nathan Chancellor + +[ Upstream commit 465bfd9c44dea6b55962b5788a23ac87a467c923 ] + +When building pseries_defconfig, building vdso32 errors out: + + error: unknown target ABI 'elfv1' + +This happens because -m32 in clang changes the target to 32-bit, +which does not allow the ABI to be changed. + +Commit 4dc831aa8813 ("powerpc: Fix compiling a BE kernel with a +powerpc64le toolchain") added these flags to fix building big endian +kernels with a little endian GCC. + +Clang doesn't need -mabi because the target triple controls the +default value. -mlittle-endian and -mbig-endian manipulate the triple +into either powerpc64-* or powerpc64le-*, which properly sets the +default ABI. + +Adding a debug print out in the PPC64TargetInfo constructor after line +383 above shows this: + + $ echo | ./clang -E --target=powerpc64-linux -mbig-endian -o /dev/null - + Default ABI: elfv1 + + $ echo | ./clang -E --target=powerpc64-linux -mlittle-endian -o /dev/null - + Default ABI: elfv2 + + $ echo | ./clang -E --target=powerpc64le-linux -mbig-endian -o /dev/null - + Default ABI: elfv1 + + $ echo | ./clang -E --target=powerpc64le-linux -mlittle-endian -o /dev/null - + Default ABI: elfv2 + +Don't specify -mabi when building with clang to avoid the build error +with -m32 and not change any code generation. + +-mcall-aixdesc is not an implemented flag in clang so it can be safely +excluded as well, see commit 238abecde8ad ("powerpc: Don't use gcc +specific options on clang"). + +pseries_defconfig successfully builds after this patch and +powernv_defconfig and ppc44x_defconfig don't regress. + +Reviewed-by: Daniel Axtens +Signed-off-by: Nathan Chancellor +[mpe: Trim clang links in change log] +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20191119045712.39633-2-natechancellor@gmail.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile +index dfcb698ec8f3..e43321f46a3b 100644 +--- a/arch/powerpc/Makefile ++++ b/arch/powerpc/Makefile +@@ -90,11 +90,13 @@ MULTIPLEWORD := -mmultiple + endif + + ifdef CONFIG_PPC64 ++ifndef CONFIG_CC_IS_CLANG + cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(call cc-option,-mabi=elfv1) + cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(call cc-option,-mcall-aixdesc) + aflags-$(CONFIG_CPU_BIG_ENDIAN) += $(call cc-option,-mabi=elfv1) + aflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -mabi=elfv2 + endif ++endif + + ifneq ($(cc-name),clang) + cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -mno-strict-align +@@ -134,6 +136,7 @@ endif + endif + + CFLAGS-$(CONFIG_PPC64) := $(call cc-option,-mtraceback=no) ++ifndef CONFIG_CC_IS_CLANG + ifdef CONFIG_CPU_LITTLE_ENDIAN + CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc)) + AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2) +@@ -142,6 +145,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1) + CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcall-aixdesc) + AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1) + endif ++endif + CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcmodel=medium,$(call cc-option,-mminimal-toc)) + CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mno-pointers-to-nested-functions) + +-- +2.20.1 + diff --git a/queue-4.19/powerpc-pseries-cmm-implement-release-function-for-s.patch b/queue-4.19/powerpc-pseries-cmm-implement-release-function-for-s.patch new file mode 100644 index 00000000000..93ee6c579c5 --- /dev/null +++ b/queue-4.19/powerpc-pseries-cmm-implement-release-function-for-s.patch @@ -0,0 +1,52 @@ +From 3f7df5c3259e9778bae25972ede2171e8d9b44c3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 31 Oct 2019 15:29:22 +0100 +Subject: powerpc/pseries/cmm: Implement release() function for sysfs device + +From: David Hildenbrand + +[ Upstream commit 7d8212747435c534c8d564fbef4541a463c976ff ] + +When unloading the module, one gets + ------------[ cut here ]------------ + Device 'cmm0' does not have a release() function, it is broken and must be fixed. See Documentation/kobject.txt. + WARNING: CPU: 0 PID: 19308 at drivers/base/core.c:1244 .device_release+0xcc/0xf0 + ... + +We only have one static fake device. There is nothing to do when +releasing the device (via cmm_exit()). + +Signed-off-by: David Hildenbrand +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20191031142933.10779-2-david@redhat.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/pseries/cmm.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c +index 25427a48feae..502ebcc6c3cb 100644 +--- a/arch/powerpc/platforms/pseries/cmm.c ++++ b/arch/powerpc/platforms/pseries/cmm.c +@@ -425,6 +425,10 @@ static struct bus_type cmm_subsys = { + .dev_name = "cmm", + }; + ++static void cmm_release_device(struct device *dev) ++{ ++} ++ + /** + * cmm_sysfs_register - Register with sysfs + * +@@ -440,6 +444,7 @@ static int cmm_sysfs_register(struct device *dev) + + dev->id = 0; + dev->bus = &cmm_subsys; ++ dev->release = cmm_release_device; + + if ((rc = device_register(dev))) + goto subsys_unregister; +-- +2.20.1 + diff --git a/queue-4.19/powerpc-pseries-don-t-fail-hash-page-table-insert-fo.patch b/queue-4.19/powerpc-pseries-don-t-fail-hash-page-table-insert-fo.patch new file mode 100644 index 00000000000..4b8351cac0b --- /dev/null +++ b/queue-4.19/powerpc-pseries-don-t-fail-hash-page-table-insert-fo.patch @@ -0,0 +1,67 @@ +From ea02057cb7e92a508f452d110869a520e04764b1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Oct 2019 15:05:41 +0530 +Subject: powerpc/pseries: Don't fail hash page table insert for bolted mapping + +From: Aneesh Kumar K.V + +[ Upstream commit 75838a3290cd4ebbd1f567f310ba04b6ef017ce4 ] + +If the hypervisor returned H_PTEG_FULL for H_ENTER hcall, retry a hash page table +insert by removing a random entry from the group. + +After some runtime, it is very well possible to find all the 8 hash page table +entry slot in the hpte group used for mapping. Don't fail a bolted entry insert +in that case. With Storage class memory a user can find this error easily since +a namespace enable/disable is equivalent to memory add/remove. + +This results in failures as reported below: + +$ ndctl create-namespace -r region1 -t pmem -m devdax -a 65536 -s 100M +libndctl: ndctl_dax_enable: dax1.3: failed to enable + Error: namespace1.2: failed to enable + +failed to create namespace: No such device or address + +In kernel log we find the details as below: + +Unable to create mapping for hot added memory 0xc000042006000000..0xc00004200d000000: -1 +dax_pmem: probe of dax1.3 failed with error -14 + +This indicates that we failed to create a bolted hash table entry for direct-map +address backing the namespace. + +We also observe failures such that not all namespaces will be enabled with +ndctl enable-namespace all command. + +Signed-off-by: Aneesh Kumar K.V +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20191024093542.29777-2-aneesh.kumar@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/mm/hash_utils_64.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c +index b1007e9a31ba..11b41383e167 100644 +--- a/arch/powerpc/mm/hash_utils_64.c ++++ b/arch/powerpc/mm/hash_utils_64.c +@@ -296,7 +296,14 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, + ret = mmu_hash_ops.hpte_insert(hpteg, vpn, paddr, tprot, + HPTE_V_BOLTED, psize, psize, + ssize); +- ++ if (ret == -1) { ++ /* Try to remove a non bolted entry */ ++ ret = mmu_hash_ops.hpte_remove(hpteg); ++ if (ret != -1) ++ ret = mmu_hash_ops.hpte_insert(hpteg, vpn, paddr, tprot, ++ HPTE_V_BOLTED, psize, psize, ++ ssize); ++ } + if (ret < 0) + break; + +-- +2.20.1 + diff --git a/queue-4.19/powerpc-pseries-mark-accumulate_stolen_time-as-notra.patch b/queue-4.19/powerpc-pseries-mark-accumulate_stolen_time-as-notra.patch new file mode 100644 index 00000000000..e082649ef97 --- /dev/null +++ b/queue-4.19/powerpc-pseries-mark-accumulate_stolen_time-as-notra.patch @@ -0,0 +1,52 @@ +From 64352fe558d04d0ca9d045d42b48300effb378fd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 13 Oct 2019 21:23:51 +1100 +Subject: powerpc/pseries: Mark accumulate_stolen_time() as notrace + +From: Michael Ellerman + +[ Upstream commit eb8e20f89093b64f48975c74ccb114e6775cee22 ] + +accumulate_stolen_time() is called prior to interrupt state being +reconciled, which can trip the warning in arch_local_irq_restore(): + + WARNING: CPU: 5 PID: 1017 at arch/powerpc/kernel/irq.c:258 .arch_local_irq_restore+0x9c/0x130 + ... + NIP .arch_local_irq_restore+0x9c/0x130 + LR .rb_start_commit+0x38/0x80 + Call Trace: + .ring_buffer_lock_reserve+0xe4/0x620 + .trace_function+0x44/0x210 + .function_trace_call+0x148/0x170 + .ftrace_ops_no_ops+0x180/0x1d0 + ftrace_call+0x4/0x8 + .accumulate_stolen_time+0x1c/0xb0 + decrementer_common+0x124/0x160 + +For now just mark it as notrace. We may change the ordering to call it +after interrupt state has been reconciled, but that is a larger +change. + +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20191024055932.27940-1-mpe@ellerman.id.au +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/time.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c +index 8487ad686462..5449e76cf2df 100644 +--- a/arch/powerpc/kernel/time.c ++++ b/arch/powerpc/kernel/time.c +@@ -235,7 +235,7 @@ static u64 scan_dispatch_log(u64 stop_tb) + * Accumulate stolen time by scanning the dispatch trace log. + * Called on entry from user mode. + */ +-void accumulate_stolen_time(void) ++void notrace accumulate_stolen_time(void) + { + u64 sst, ust; + unsigned long save_irq_soft_mask = irq_soft_mask_return(); +-- +2.20.1 + diff --git a/queue-4.19/powerpc-security-book3s64-report-l1tf-status-in-sysf.patch b/queue-4.19/powerpc-security-book3s64-report-l1tf-status-in-sysf.patch new file mode 100644 index 00000000000..cfd082c201b --- /dev/null +++ b/queue-4.19/powerpc-security-book3s64-report-l1tf-status-in-sysf.patch @@ -0,0 +1,45 @@ +From 97259e58b13d36685094ed497517a8f073f8495b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Oct 2019 12:07:59 -0700 +Subject: powerpc/security/book3s64: Report L1TF status in sysfs + +From: Anthony Steinhauser + +[ Upstream commit 8e6b6da91ac9b9ec5a925b6cb13f287a54bd547d ] + +Some PowerPC CPUs are vulnerable to L1TF to the same extent as to +Meltdown. It is also mitigated by flushing the L1D on privilege +transition. + +Currently the sysfs gives a false negative on L1TF on CPUs that I +verified to be vulnerable, a Power9 Talos II Boston 004e 1202, PowerNV +T2P9D01. + +Signed-off-by: Anthony Steinhauser +Signed-off-by: Michael Ellerman +[mpe: Just have cpu_show_l1tf() call cpu_show_meltdown() directly] +Link: https://lore.kernel.org/r/20191029190759.84821-1-asteinhauser@google.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/security.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c +index a5c5940d970a..a4354c4f6bc5 100644 +--- a/arch/powerpc/kernel/security.c ++++ b/arch/powerpc/kernel/security.c +@@ -160,6 +160,11 @@ ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, cha + + return sprintf(buf, "Vulnerable\n"); + } ++ ++ssize_t cpu_show_l1tf(struct device *dev, struct device_attribute *attr, char *buf) ++{ ++ return cpu_show_meltdown(dev, attr, buf); ++} + #endif + + ssize_t cpu_show_spectre_v1(struct device *dev, struct device_attribute *attr, char *buf) +-- +2.20.1 + diff --git a/queue-4.19/powerpc-security-fix-wrong-message-when-rfi-flush-is.patch b/queue-4.19/powerpc-security-fix-wrong-message-when-rfi-flush-is.patch new file mode 100644 index 00000000000..9dcc7e935b9 --- /dev/null +++ b/queue-4.19/powerpc-security-fix-wrong-message-when-rfi-flush-is.patch @@ -0,0 +1,95 @@ +From cd81b8aac7506bf6f9f2bd84b65eff888cc7c1ed Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 May 2019 18:09:07 -0300 +Subject: powerpc/security: Fix wrong message when RFI Flush is disable + +From: Gustavo L. F. Walbon + +[ Upstream commit 4e706af3cd8e1d0503c25332b30cad33c97ed442 ] + +The issue was showing "Mitigation" message via sysfs whatever the +state of "RFI Flush", but it should show "Vulnerable" when it is +disabled. + +If you have "L1D private" feature enabled and not "RFI Flush" you are +vulnerable to meltdown attacks. + +"RFI Flush" is the key feature to mitigate the meltdown whatever the +"L1D private" state. + +SEC_FTR_L1D_THREAD_PRIV is a feature for Power9 only. + +So the message should be as the truth table shows: + + CPU | L1D private | RFI Flush | sysfs + ----|-------------|-----------|------------------------------------- + P9 | False | False | Vulnerable + P9 | False | True | Mitigation: RFI Flush + P9 | True | False | Vulnerable: L1D private per thread + P9 | True | True | Mitigation: RFI Flush, L1D private per thread + P8 | False | False | Vulnerable + P8 | False | True | Mitigation: RFI Flush + +Output before this fix: + # cat /sys/devices/system/cpu/vulnerabilities/meltdown + Mitigation: RFI Flush, L1D private per thread + # echo 0 > /sys/kernel/debug/powerpc/rfi_flush + # cat /sys/devices/system/cpu/vulnerabilities/meltdown + Mitigation: L1D private per thread + +Output after fix: + # cat /sys/devices/system/cpu/vulnerabilities/meltdown + Mitigation: RFI Flush, L1D private per thread + # echo 0 > /sys/kernel/debug/powerpc/rfi_flush + # cat /sys/devices/system/cpu/vulnerabilities/meltdown + Vulnerable: L1D private per thread + +Signed-off-by: Gustavo L. F. Walbon +Signed-off-by: Mauro S. M. Rodrigues +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20190502210907.42375-1-gwalbon@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/security.c | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c +index a4354c4f6bc5..6a3dde9587cc 100644 +--- a/arch/powerpc/kernel/security.c ++++ b/arch/powerpc/kernel/security.c +@@ -134,26 +134,22 @@ ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, cha + + thread_priv = security_ftr_enabled(SEC_FTR_L1D_THREAD_PRIV); + +- if (rfi_flush || thread_priv) { ++ if (rfi_flush) { + struct seq_buf s; + seq_buf_init(&s, buf, PAGE_SIZE - 1); + +- seq_buf_printf(&s, "Mitigation: "); +- +- if (rfi_flush) +- seq_buf_printf(&s, "RFI Flush"); +- +- if (rfi_flush && thread_priv) +- seq_buf_printf(&s, ", "); +- ++ seq_buf_printf(&s, "Mitigation: RFI Flush"); + if (thread_priv) +- seq_buf_printf(&s, "L1D private per thread"); ++ seq_buf_printf(&s, ", L1D private per thread"); + + seq_buf_printf(&s, "\n"); + + return s.len; + } + ++ if (thread_priv) ++ return sprintf(buf, "Vulnerable: L1D private per thread\n"); ++ + if (!security_ftr_enabled(SEC_FTR_L1D_FLUSH_HV) && + !security_ftr_enabled(SEC_FTR_L1D_FLUSH_PR)) + return sprintf(buf, "Not affected\n"); +-- +2.20.1 + diff --git a/queue-4.19/powerpc-tools-don-t-quote-objdump-in-scripts.patch b/queue-4.19/powerpc-tools-don-t-quote-objdump-in-scripts.patch new file mode 100644 index 00000000000..1c1657f97bd --- /dev/null +++ b/queue-4.19/powerpc-tools-don-t-quote-objdump-in-scripts.patch @@ -0,0 +1,67 @@ +From 592e1f47f21a18522ae09811120f4ac11e05b8c0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Oct 2019 11:47:30 +1100 +Subject: powerpc/tools: Don't quote $objdump in scripts + +From: Michael Ellerman + +[ Upstream commit e44ff9ea8f4c8a90c82f7b85bd4f5e497c841960 ] + +Some of our scripts are passed $objdump and then call it as +"$objdump". This doesn't work if it contains spaces because we're +using ccache, for example you get errors such as: + + ./arch/powerpc/tools/relocs_check.sh: line 48: ccache ppc64le-objdump: No such file or directory + ./arch/powerpc/tools/unrel_branch_check.sh: line 26: ccache ppc64le-objdump: No such file or directory + +Fix it by not quoting the string when we expand it, allowing the shell +to do the right thing for us. + +Fixes: a71aa05e1416 ("powerpc: Convert relocs_check to a shell script using grep") +Fixes: 4ea80652dc75 ("powerpc/64s: Tool to flag direct branches from unrelocated interrupt vectors") +Signed-off-by: Michael Ellerman +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20191024004730.32135-1-mpe@ellerman.id.au +Signed-off-by: Sasha Levin +--- + arch/powerpc/tools/relocs_check.sh | 2 +- + arch/powerpc/tools/unrel_branch_check.sh | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/powerpc/tools/relocs_check.sh b/arch/powerpc/tools/relocs_check.sh +index ec2d5c835170..d6c16e7faa38 100755 +--- a/arch/powerpc/tools/relocs_check.sh ++++ b/arch/powerpc/tools/relocs_check.sh +@@ -23,7 +23,7 @@ objdump="$1" + vmlinux="$2" + + bad_relocs=$( +-"$objdump" -R "$vmlinux" | ++$objdump -R "$vmlinux" | + # Only look at relocation lines. + grep -E '\:' | + awk '{print $1}' + ) + + BRANCHES=$( +-"$objdump" -R "$vmlinux" -D --start-address=0xc000000000000000 \ ++$objdump -R "$vmlinux" -D --start-address=0xc000000000000000 \ + --stop-address=${end_intr} | + grep -e "^c[0-9a-f]*:[[:space:]]*\([0-9a-f][0-9a-f][[:space:]]\)\{4\}[[:space:]]*b" | + grep -v '\<__start_initialization_multiplatform>' | +-- +2.20.1 + diff --git a/queue-4.19/s390-cpum_sf-check-for-sdbt-and-sdb-consistency.patch b/queue-4.19/s390-cpum_sf-check-for-sdbt-and-sdb-consistency.patch new file mode 100644 index 00000000000..8876c548e8a --- /dev/null +++ b/queue-4.19/s390-cpum_sf-check-for-sdbt-and-sdb-consistency.patch @@ -0,0 +1,107 @@ +From d7c61581136c2166afe685ac95fb2df754ed1906 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 22 Nov 2019 16:43:15 +0100 +Subject: s390/cpum_sf: Check for SDBT and SDB consistency + +From: Thomas Richter + +[ Upstream commit 247f265fa502e7b17a0cb0cc330e055a36aafce4 ] + +Each SBDT is located at a 4KB page and contains 512 entries. +Each entry of a SDBT points to a SDB, a 4KB page containing +sampled data. The last entry is a link to another SDBT page. + +When an event is created the function sequence executed is: + + __hw_perf_event_init() + +--> allocate_buffers() + +--> realloc_sampling_buffers() + +---> alloc_sample_data_block() + +Both functions realloc_sampling_buffers() and +alloc_sample_data_block() allocate pages and the allocation +can fail. This is handled correctly and all allocated +pages are freed and error -ENOMEM is returned to the +top calling function. Finally the event is not created. + +Once the event has been created, the amount of initially +allocated SDBT and SDB can be too low. This is detected +during measurement interrupt handling, where the amount +of lost samples is calculated. If the number of lost samples +is too high considering sampling frequency and already allocated +SBDs, the number of SDBs is enlarged during the next execution +of cpumsf_pmu_enable(). + +If more SBDs need to be allocated, functions + + realloc_sampling_buffers() + +---> alloc-sample_data_block() + +are called to allocate more pages. Page allocation may fail +and the returned error is ignored. A SDBT and SDB setup +already exists. + +However the modified SDBTs and SDBs might end up in a situation +where the first entry of an SDBT does not point to an SDB, +but another SDBT, basicly an SBDT without payload. +This can not be handled by the interrupt handler, where an SDBT +must have at least one entry pointing to an SBD. + +Add a check to avoid SDBTs with out payload (SDBs) when enlarging +the buffer setup. + +Signed-off-by: Thomas Richter +Signed-off-by: Vasily Gorbik +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/perf_cpum_sf.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c +index df92c2af99b6..5c3fd9032b74 100644 +--- a/arch/s390/kernel/perf_cpum_sf.c ++++ b/arch/s390/kernel/perf_cpum_sf.c +@@ -193,7 +193,7 @@ static int realloc_sampling_buffer(struct sf_buffer *sfb, + unsigned long num_sdb, gfp_t gfp_flags) + { + int i, rc; +- unsigned long *new, *tail; ++ unsigned long *new, *tail, *tail_prev = NULL; + + if (!sfb->sdbt || !sfb->tail) + return -EINVAL; +@@ -232,6 +232,7 @@ static int realloc_sampling_buffer(struct sf_buffer *sfb, + sfb->num_sdbt++; + /* Link current page to tail of chain */ + *tail = (unsigned long)(void *) new + 1; ++ tail_prev = tail; + tail = new; + } + +@@ -241,10 +242,22 @@ static int realloc_sampling_buffer(struct sf_buffer *sfb, + * issue, a new realloc call (if required) might succeed. + */ + rc = alloc_sample_data_block(tail, gfp_flags); +- if (rc) ++ if (rc) { ++ /* Undo last SDBT. An SDBT with no SDB at its first ++ * entry but with an SDBT entry instead can not be ++ * handled by the interrupt handler code. ++ * Avoid this situation. ++ */ ++ if (tail_prev) { ++ sfb->num_sdbt--; ++ free_page((unsigned long) new); ++ tail = tail_prev; ++ } + break; ++ } + sfb->num_sdb++; + tail++; ++ tail_prev = new = NULL; /* Allocated at least one SBD */ + } + + /* Link sampling buffer to its origin */ +-- +2.20.1 + diff --git a/queue-4.19/s390-zcrypt-handle-new-reply-code-filtered_by_hyperv.patch b/queue-4.19/s390-zcrypt-handle-new-reply-code-filtered_by_hyperv.patch new file mode 100644 index 00000000000..82ed0228093 --- /dev/null +++ b/queue-4.19/s390-zcrypt-handle-new-reply-code-filtered_by_hyperv.patch @@ -0,0 +1,51 @@ +From f056d419fa08a100cf57fa875e47c3582b510c08 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Nov 2019 11:44:31 +0100 +Subject: s390/zcrypt: handle new reply code FILTERED_BY_HYPERVISOR + +From: Harald Freudenberger + +[ Upstream commit 6733775a92eacd612ac88afa0fd922e4ffeb2bc7 ] + +This patch introduces support for a new architectured reply +code 0x8B indicating that a hypervisor layer (if any) has +rejected an ap message. + +Linux may run as a guest on top of a hypervisor like zVM +or KVM. So the crypto hardware seen by the ap bus may be +restricted by the hypervisor for example only a subset like +only clear key crypto requests may be supported. Other +requests will be filtered out - rejected by the hypervisor. +The new reply code 0x8B will appear in such cases and needs +to get recognized by the ap bus and zcrypt device driver zoo. + +Signed-off-by: Harald Freudenberger +Signed-off-by: Vasily Gorbik +Signed-off-by: Sasha Levin +--- + drivers/s390/crypto/zcrypt_error.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/s390/crypto/zcrypt_error.h b/drivers/s390/crypto/zcrypt_error.h +index 2e1a27bd97d1..2126f4cc6d37 100644 +--- a/drivers/s390/crypto/zcrypt_error.h ++++ b/drivers/s390/crypto/zcrypt_error.h +@@ -62,6 +62,7 @@ struct error_hdr { + #define REP82_ERROR_EVEN_MOD_IN_OPND 0x85 + #define REP82_ERROR_RESERVED_FIELD 0x88 + #define REP82_ERROR_INVALID_DOMAIN_PENDING 0x8A ++#define REP82_ERROR_FILTERED_BY_HYPERVISOR 0x8B + #define REP82_ERROR_TRANSPORT_FAIL 0x90 + #define REP82_ERROR_PACKET_TRUNCATED 0xA0 + #define REP82_ERROR_ZERO_BUFFER_LEN 0xB0 +@@ -92,6 +93,7 @@ static inline int convert_error(struct zcrypt_queue *zq, + case REP82_ERROR_INVALID_DOMAIN_PRECHECK: + case REP82_ERROR_INVALID_DOMAIN_PENDING: + case REP82_ERROR_INVALID_SPECIAL_CMD: ++ case REP82_ERROR_FILTERED_BY_HYPERVISOR: + // REP88_ERROR_INVALID_KEY // '82' CEX2A + // REP88_ERROR_OPERAND // '84' CEX2A + // REP88_ERROR_OPERAND_EVEN_MOD // '85' CEX2A +-- +2.20.1 + diff --git a/queue-4.19/scripts-kallsyms-fix-definitely-lost-memory-leak.patch b/queue-4.19/scripts-kallsyms-fix-definitely-lost-memory-leak.patch new file mode 100644 index 00000000000..e44fb64846f --- /dev/null +++ b/queue-4.19/scripts-kallsyms-fix-definitely-lost-memory-leak.patch @@ -0,0 +1,48 @@ +From b1f53b0f9a60b309178ec740d2d4a8894eb7c990 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 24 Nov 2019 01:04:30 +0900 +Subject: scripts/kallsyms: fix definitely-lost memory leak + +From: Masahiro Yamada + +[ Upstream commit 21915eca088dc271c970e8351290e83d938114ac ] + +build_initial_tok_table() overwrites unused sym_entry to shrink the +table size. Before the entry is overwritten, table[i].sym must be freed +since it is malloc'ed data. + +This fixes the 'definitely lost' report from valgrind. I ran valgrind +against x86_64_defconfig of v5.4-rc8 kernel, and here is the summary: + +[Before the fix] + + LEAK SUMMARY: + definitely lost: 53,184 bytes in 2,874 blocks + +[After the fix] + + LEAK SUMMARY: + definitely lost: 0 bytes in 0 blocks + +Signed-off-by: Masahiro Yamada +Signed-off-by: Sasha Levin +--- + scripts/kallsyms.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c +index 31ed7f3f0e15..4b2711c23f4e 100644 +--- a/scripts/kallsyms.c ++++ b/scripts/kallsyms.c +@@ -491,6 +491,8 @@ static void build_initial_tok_table(void) + table[pos] = table[i]; + learn_symbol(table[pos].sym, table[pos].len); + pos++; ++ } else { ++ free(table[i].sym); + } + } + table_cnt = pos; +-- +2.20.1 + diff --git a/queue-4.19/scsi-atari_scsi-sun3_scsi-set-sg_tablesize-to-1-inst.patch b/queue-4.19/scsi-atari_scsi-sun3_scsi-set-sg_tablesize-to-1-inst.patch new file mode 100644 index 00000000000..bce0306eecf --- /dev/null +++ b/queue-4.19/scsi-atari_scsi-sun3_scsi-set-sg_tablesize-to-1-inst.patch @@ -0,0 +1,163 @@ +From a9e541809f40839a3e33becd92aa74230d77167b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 2 Nov 2019 12:06:54 +1100 +Subject: scsi: atari_scsi: sun3_scsi: Set sg_tablesize to 1 instead of SG_NONE + +From: Finn Thain + +[ Upstream commit 79172ab20bfd8437b277254028efdb68484e2c21 ] + +Since the scsi subsystem adopted the blk-mq API, a host with zero +sg_tablesize crashes with a NULL pointer dereference. + +blk_queue_max_segments: set to minimum 1 +scsi 0:0:0:0: Direct-Access QEMU QEMU HARDDISK 2.5+ PQ: 0 ANSI: 5 +scsi target0:0:0: Beginning Domain Validation +scsi target0:0:0: Domain Validation skipping write tests +scsi target0:0:0: Ending Domain Validation +blk_queue_max_segments: set to minimum 1 +scsi 0:0:1:0: Direct-Access QEMU QEMU HARDDISK 2.5+ PQ: 0 ANSI: 5 +scsi target0:0:1: Beginning Domain Validation +scsi target0:0:1: Domain Validation skipping write tests +scsi target0:0:1: Ending Domain Validation +blk_queue_max_segments: set to minimum 1 +scsi 0:0:2:0: CD-ROM QEMU QEMU CD-ROM 2.5+ PQ: 0 ANSI: 5 +scsi target0:0:2: Beginning Domain Validation +scsi target0:0:2: Domain Validation skipping write tests +scsi target0:0:2: Ending Domain Validation +blk_queue_max_segments: set to minimum 1 +blk_queue_max_segments: set to minimum 1 +blk_queue_max_segments: set to minimum 1 +blk_queue_max_segments: set to minimum 1 +sr 0:0:2:0: Power-on or device reset occurred +sd 0:0:0:0: Power-on or device reset occurred +sd 0:0:1:0: Power-on or device reset occurred +sd 0:0:0:0: [sda] 10485762 512-byte logical blocks: (5.37 GB/5.00 GiB) +sd 0:0:0:0: [sda] Write Protect is off +sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA +Unable to handle kernel NULL pointer dereference at virtual address (ptrval) +Oops: 00000000 +Modules linked in: +PC: [<001cd874>] blk_mq_free_request+0x66/0xe2 +SR: 2004 SP: (ptrval) a2: 00874520 +d0: 00000000 d1: 00000000 d2: 009ba800 d3: 00000000 +d4: 00000000 d5: 08000002 a0: 0087be68 a1: 009a81e0 +Process kworker/u2:2 (pid: 15, task=(ptrval)) +Frame format=7 eff addr=0000007a ssw=0505 faddr=0000007a +wb 1 stat/addr/data: 0000 00000000 00000000 +wb 2 stat/addr/data: 0000 00000000 00000000 +wb 3 stat/addr/data: 0000 0000007a 00000000 +push data: 00000000 00000000 00000000 00000000 +Stack from 0087bd98: + 00000002 00000000 0087be72 009a7820 0087bdb4 001c4f6c 009a7820 0087bdd4 + 0024d200 009a7820 0024d0dc 0087be72 009baa00 0087be68 009a5000 0087be7c + 00265d10 009a5000 0087be72 00000003 00000000 00000000 00000000 0087be68 + 00000bb8 00000005 00000000 00000000 00000000 00000000 00265c56 00000000 + 009ba60c 0036ddf4 00000002 ffffffff 009baa00 009ba600 009a50d6 0087be74 + 00227ba0 009baa08 00000001 009baa08 009ba60c 0036ddf4 00000000 00000000 +Call Trace: [<001c4f6c>] blk_put_request+0xe/0x14 + [<0024d200>] __scsi_execute+0x124/0x174 + [<0024d0dc>] __scsi_execute+0x0/0x174 + [<00265d10>] sd_revalidate_disk+0xba/0x1f02 + [<00265c56>] sd_revalidate_disk+0x0/0x1f02 + [<0036ddf4>] strlen+0x0/0x22 + [<00227ba0>] device_add+0x3da/0x604 + [<0036ddf4>] strlen+0x0/0x22 + [<00267e64>] sd_probe+0x30c/0x4b4 + [<0002da44>] process_one_work+0x0/0x402 + [<0022b978>] really_probe+0x226/0x354 + [<0022bc34>] driver_probe_device+0xa4/0xf0 + [<0002da44>] process_one_work+0x0/0x402 + [<0022bcd0>] __driver_attach_async_helper+0x50/0x70 + [<00035dae>] async_run_entry_fn+0x36/0x130 + [<0002db88>] process_one_work+0x144/0x402 + [<0002e1aa>] worker_thread+0x0/0x570 + [<0002e29a>] worker_thread+0xf0/0x570 + [<0002e1aa>] worker_thread+0x0/0x570 + [<003768d8>] schedule+0x0/0xb8 + [<0003f58c>] __init_waitqueue_head+0x0/0x12 + [<00033e92>] kthread+0xc2/0xf6 + [<000331e8>] kthread_parkme+0x0/0x4e + [<003768d8>] schedule+0x0/0xb8 + [<00033dd0>] kthread+0x0/0xf6 + [<00002c10>] ret_from_kernel_thread+0xc/0x14 +Code: 0280 0006 0800 56c0 4400 0280 0000 00ff <52b4> 0c3a 082b 0006 0013 6706 2042 53a8 00c4 4ab9 0047 3374 6640 202d 000c 670c +Disabling lock debugging due to kernel taint + +Avoid this by setting sg_tablesize = 1. + +Link: https://lore.kernel.org/r/4567bcae94523b47d6f3b77450ba305823bca479.1572656814.git.fthain@telegraphics.com.au +Reported-and-tested-by: Michael Schmitz +Reviewed-by: Michael Schmitz +References: commit 68ab2d76e4be ("scsi: cxlflash: Set sg_tablesize to 1 instead of SG_NONE") +Signed-off-by: Finn Thain +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/atari_scsi.c | 6 +++--- + drivers/scsi/mac_scsi.c | 2 +- + drivers/scsi/sun3_scsi.c | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c +index 89f5154c40b6..764c46d7333e 100644 +--- a/drivers/scsi/atari_scsi.c ++++ b/drivers/scsi/atari_scsi.c +@@ -742,7 +742,7 @@ static int __init atari_scsi_probe(struct platform_device *pdev) + atari_scsi_template.sg_tablesize = SG_ALL; + } else { + atari_scsi_template.can_queue = 1; +- atari_scsi_template.sg_tablesize = SG_NONE; ++ atari_scsi_template.sg_tablesize = 1; + } + + if (setup_can_queue > 0) +@@ -751,8 +751,8 @@ static int __init atari_scsi_probe(struct platform_device *pdev) + if (setup_cmd_per_lun > 0) + atari_scsi_template.cmd_per_lun = setup_cmd_per_lun; + +- /* Leave sg_tablesize at 0 on a Falcon! */ +- if (ATARIHW_PRESENT(TT_SCSI) && setup_sg_tablesize >= 0) ++ /* Don't increase sg_tablesize on Falcon! */ ++ if (ATARIHW_PRESENT(TT_SCSI) && setup_sg_tablesize > 0) + atari_scsi_template.sg_tablesize = setup_sg_tablesize; + + if (setup_hostid >= 0) { +diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c +index 643321fc152d..b5050c2ede00 100644 +--- a/drivers/scsi/mac_scsi.c ++++ b/drivers/scsi/mac_scsi.c +@@ -429,7 +429,7 @@ static int __init mac_scsi_probe(struct platform_device *pdev) + mac_scsi_template.can_queue = setup_can_queue; + if (setup_cmd_per_lun > 0) + mac_scsi_template.cmd_per_lun = setup_cmd_per_lun; +- if (setup_sg_tablesize >= 0) ++ if (setup_sg_tablesize > 0) + mac_scsi_template.sg_tablesize = setup_sg_tablesize; + if (setup_hostid >= 0) + mac_scsi_template.this_id = setup_hostid & 7; +diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c +index 9492638296c8..af8a7ef9c858 100644 +--- a/drivers/scsi/sun3_scsi.c ++++ b/drivers/scsi/sun3_scsi.c +@@ -498,7 +498,7 @@ static struct scsi_host_template sun3_scsi_template = { + .eh_host_reset_handler = sun3scsi_host_reset, + .can_queue = 16, + .this_id = 7, +- .sg_tablesize = SG_NONE, ++ .sg_tablesize = 1, + .cmd_per_lun = 2, + .use_clustering = DISABLE_CLUSTERING, + .cmd_size = NCR5380_CMD_SIZE, +@@ -520,7 +520,7 @@ static int __init sun3_scsi_probe(struct platform_device *pdev) + sun3_scsi_template.can_queue = setup_can_queue; + if (setup_cmd_per_lun > 0) + sun3_scsi_template.cmd_per_lun = setup_cmd_per_lun; +- if (setup_sg_tablesize >= 0) ++ if (setup_sg_tablesize > 0) + sun3_scsi_template.sg_tablesize = setup_sg_tablesize; + if (setup_hostid >= 0) + sun3_scsi_template.this_id = setup_hostid & 7; +-- +2.20.1 + diff --git a/queue-4.19/scsi-csiostor-don-t-enable-irqs-too-early.patch b/queue-4.19/scsi-csiostor-don-t-enable-irqs-too-early.patch new file mode 100644 index 00000000000..8e8b9c9517c --- /dev/null +++ b/queue-4.19/scsi-csiostor-don-t-enable-irqs-too-early.patch @@ -0,0 +1,100 @@ +From d9950a32bf7bea929fc3b46f172b82e20d06d86a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 19 Oct 2019 11:59:13 +0300 +Subject: scsi: csiostor: Don't enable IRQs too early + +From: Dan Carpenter + +[ Upstream commit d6c9b31ac3064fbedf8961f120a4c117daa59932 ] + +These are called with IRQs disabled from csio_mgmt_tmo_handler() so we +can't call spin_unlock_irq() or it will enable IRQs prematurely. + +Fixes: a3667aaed569 ("[SCSI] csiostor: Chelsio FCoE offload driver") +Link: https://lore.kernel.org/r/20191019085913.GA14245@mwanda +Signed-off-by: Dan Carpenter +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/csiostor/csio_lnode.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/drivers/scsi/csiostor/csio_lnode.c b/drivers/scsi/csiostor/csio_lnode.c +index cc5611efc7a9..a8e29e3d3572 100644 +--- a/drivers/scsi/csiostor/csio_lnode.c ++++ b/drivers/scsi/csiostor/csio_lnode.c +@@ -301,6 +301,7 @@ csio_ln_fdmi_rhba_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req) + struct fc_fdmi_port_name *port_name; + uint8_t buf[64]; + uint8_t *fc4_type; ++ unsigned long flags; + + if (fdmi_req->wr_status != FW_SUCCESS) { + csio_ln_dbg(ln, "WR error:%x in processing fdmi rhba cmd\n", +@@ -385,13 +386,13 @@ csio_ln_fdmi_rhba_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req) + len = (uint32_t)(pld - (uint8_t *)cmd); + + /* Submit FDMI RPA request */ +- spin_lock_irq(&hw->lock); ++ spin_lock_irqsave(&hw->lock, flags); + if (csio_ln_mgmt_submit_req(fdmi_req, csio_ln_fdmi_done, + FCOE_CT, &fdmi_req->dma_buf, len)) { + CSIO_INC_STATS(ln, n_fdmi_err); + csio_ln_dbg(ln, "Failed to issue fdmi rpa req\n"); + } +- spin_unlock_irq(&hw->lock); ++ spin_unlock_irqrestore(&hw->lock, flags); + } + + /* +@@ -412,6 +413,7 @@ csio_ln_fdmi_dprt_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req) + struct fc_fdmi_rpl *reg_pl; + struct fs_fdmi_attrs *attrib_blk; + uint8_t buf[64]; ++ unsigned long flags; + + if (fdmi_req->wr_status != FW_SUCCESS) { + csio_ln_dbg(ln, "WR error:%x in processing fdmi dprt cmd\n", +@@ -491,13 +493,13 @@ csio_ln_fdmi_dprt_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req) + attrib_blk->numattrs = htonl(numattrs); + + /* Submit FDMI RHBA request */ +- spin_lock_irq(&hw->lock); ++ spin_lock_irqsave(&hw->lock, flags); + if (csio_ln_mgmt_submit_req(fdmi_req, csio_ln_fdmi_rhba_cbfn, + FCOE_CT, &fdmi_req->dma_buf, len)) { + CSIO_INC_STATS(ln, n_fdmi_err); + csio_ln_dbg(ln, "Failed to issue fdmi rhba req\n"); + } +- spin_unlock_irq(&hw->lock); ++ spin_unlock_irqrestore(&hw->lock, flags); + } + + /* +@@ -512,6 +514,7 @@ csio_ln_fdmi_dhba_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req) + void *cmd; + struct fc_fdmi_port_name *port_name; + uint32_t len; ++ unsigned long flags; + + if (fdmi_req->wr_status != FW_SUCCESS) { + csio_ln_dbg(ln, "WR error:%x in processing fdmi dhba cmd\n", +@@ -542,13 +545,13 @@ csio_ln_fdmi_dhba_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req) + len += sizeof(*port_name); + + /* Submit FDMI request */ +- spin_lock_irq(&hw->lock); ++ spin_lock_irqsave(&hw->lock, flags); + if (csio_ln_mgmt_submit_req(fdmi_req, csio_ln_fdmi_dprt_cbfn, + FCOE_CT, &fdmi_req->dma_buf, len)) { + CSIO_INC_STATS(ln, n_fdmi_err); + csio_ln_dbg(ln, "Failed to issue fdmi dprt req\n"); + } +- spin_unlock_irq(&hw->lock); ++ spin_unlock_irqrestore(&hw->lock, flags); + } + + /** +-- +2.20.1 + diff --git a/queue-4.19/scsi-hisi_sas-replace-in_softirq-check-in-hisi_sas_t.patch b/queue-4.19/scsi-hisi_sas-replace-in_softirq-check-in-hisi_sas_t.patch new file mode 100644 index 00000000000..1b5393f6d0c --- /dev/null +++ b/queue-4.19/scsi-hisi_sas-replace-in_softirq-check-in-hisi_sas_t.patch @@ -0,0 +1,85 @@ +From 24c805210330b6e6e80d1ce54e5eceb90bf2e367 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Oct 2019 22:08:11 +0800 +Subject: scsi: hisi_sas: Replace in_softirq() check in hisi_sas_task_exec() + +From: Xiang Chen + +[ Upstream commit 550c0d89d52d3bec5c299f69b4ed5d2ee6b8a9a6 ] + +For IOs from upper layer, preemption may be disabled as it may be called by +function __blk_mq_delay_run_hw_queue which will call get_cpu() (it disables +preemption). So if flags HISI_SAS_REJECT_CMD_BIT is set in function +hisi_sas_task_exec(), it may disable preempt twice after down() and up() +which will cause following call trace: + +BUG: scheduling while atomic: fio/60373/0x00000002 +Call trace: +dump_backtrace+0x0/0x150 +show_stack+0x24/0x30 +dump_stack+0xa0/0xc4 +__schedule_bug+0x68/0x88 +__schedule+0x4b8/0x548 +schedule+0x40/0xd0 +schedule_timeout+0x200/0x378 +__down+0x78/0xc8 +down+0x54/0x70 +hisi_sas_task_exec.isra.10+0x598/0x8d8 [hisi_sas_main] +hisi_sas_queue_command+0x28/0x38 [hisi_sas_main] +sas_queuecommand+0x168/0x1b0 [libsas] +scsi_queue_rq+0x2ac/0x980 +blk_mq_dispatch_rq_list+0xb0/0x550 +blk_mq_do_dispatch_sched+0x6c/0x110 +blk_mq_sched_dispatch_requests+0x114/0x1d8 +__blk_mq_run_hw_queue+0xb8/0x130 +__blk_mq_delay_run_hw_queue+0x1c0/0x220 +blk_mq_run_hw_queue+0xb0/0x128 +blk_mq_sched_insert_requests+0xdc/0x208 +blk_mq_flush_plug_list+0x1b4/0x3a0 +blk_flush_plug_list+0xdc/0x110 +blk_finish_plug+0x3c/0x50 +blkdev_direct_IO+0x404/0x550 +generic_file_read_iter+0x9c/0x848 +blkdev_read_iter+0x50/0x78 +aio_read+0xc8/0x170 +io_submit_one+0x1fc/0x8d8 +__arm64_sys_io_submit+0xdc/0x280 +el0_svc_common.constprop.0+0xe0/0x1e0 +el0_svc_handler+0x34/0x90 +el0_svc+0x10/0x14 +... + +To solve the issue, check preemptible() to avoid disabling preempt multiple +when flag HISI_SAS_REJECT_CMD_BIT is set. + +Link: https://lore.kernel.org/r/1571926105-74636-5-git-send-email-john.garry@huawei.com +Signed-off-by: Xiang Chen +Signed-off-by: John Garry +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/hisi_sas/hisi_sas_main.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c +index f35c56217694..33191673249c 100644 +--- a/drivers/scsi/hisi_sas/hisi_sas_main.c ++++ b/drivers/scsi/hisi_sas/hisi_sas_main.c +@@ -485,7 +485,13 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags, + struct hisi_sas_dq *dq = NULL; + + if (unlikely(test_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags))) { +- if (in_softirq()) ++ /* ++ * For IOs from upper layer, it may already disable preempt ++ * in the IO path, if disable preempt again in down(), ++ * function schedule() will report schedule_bug(), so check ++ * preemptible() before goto down(). ++ */ ++ if (!preemptible()) + return -EINVAL; + + down(&hisi_hba->sem); +-- +2.20.1 + diff --git a/queue-4.19/scsi-iscsi-don-t-send-data-to-unbound-connection.patch b/queue-4.19/scsi-iscsi-don-t-send-data-to-unbound-connection.patch new file mode 100644 index 00000000000..5a2760b7a1c --- /dev/null +++ b/queue-4.19/scsi-iscsi-don-t-send-data-to-unbound-connection.patch @@ -0,0 +1,96 @@ +From d7fd210c6a4a3c9b176aaf245f063eff9c6dfda6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 15 Nov 2019 19:47:35 -0500 +Subject: scsi: iscsi: Don't send data to unbound connection + +From: Anatol Pomazau + +[ Upstream commit 238191d65d7217982d69e21c1d623616da34b281 ] + +If a faulty initiator fails to bind the socket to the iSCSI connection +before emitting a command, for instance, a subsequent send_pdu, it will +crash the kernel due to a null pointer dereference in sock_sendmsg(), as +shown in the log below. This patch makes sure the bind succeeded before +trying to use the socket. + +BUG: kernel NULL pointer dereference, address: 0000000000000018 + #PF: supervisor read access in kernel mode + #PF: error_code(0x0000) - not-present page +PGD 0 P4D 0 +Oops: 0000 [#1] SMP PTI +CPU: 3 PID: 7 Comm: kworker/u8:0 Not tainted 5.4.0-rc2.iscsi+ #13 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 +[ 24.158246] Workqueue: iscsi_q_0 iscsi_xmitworker +[ 24.158883] RIP: 0010:apparmor_socket_sendmsg+0x5/0x20 +[...] +[ 24.161739] RSP: 0018:ffffab6440043ca0 EFLAGS: 00010282 +[ 24.162400] RAX: ffffffff891c1c00 RBX: ffffffff89d53968 RCX: 0000000000000001 +[ 24.163253] RDX: 0000000000000030 RSI: ffffab6440043d00 RDI: 0000000000000000 +[ 24.164104] RBP: 0000000000000030 R08: 0000000000000030 R09: 0000000000000030 +[ 24.165166] R10: ffffffff893e66a0 R11: 0000000000000018 R12: ffffab6440043d00 +[ 24.166038] R13: 0000000000000000 R14: 0000000000000000 R15: ffff9d5575a62e90 +[ 24.166919] FS: 0000000000000000(0000) GS:ffff9d557db80000(0000) knlGS:0000000000000000 +[ 24.167890] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 24.168587] CR2: 0000000000000018 CR3: 000000007a838000 CR4: 00000000000006e0 +[ 24.169451] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +[ 24.170320] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +[ 24.171214] Call Trace: +[ 24.171537] security_socket_sendmsg+0x3a/0x50 +[ 24.172079] sock_sendmsg+0x16/0x60 +[ 24.172506] iscsi_sw_tcp_xmit_segment+0x77/0x120 +[ 24.173076] iscsi_sw_tcp_pdu_xmit+0x58/0x170 +[ 24.173604] ? iscsi_dbg_trace+0x63/0x80 +[ 24.174087] iscsi_tcp_task_xmit+0x101/0x280 +[ 24.174666] iscsi_xmit_task+0x83/0x110 +[ 24.175206] iscsi_xmitworker+0x57/0x380 +[ 24.175757] ? __schedule+0x2a2/0x700 +[ 24.176273] process_one_work+0x1b5/0x360 +[ 24.176837] worker_thread+0x50/0x3c0 +[ 24.177353] kthread+0xf9/0x130 +[ 24.177799] ? process_one_work+0x360/0x360 +[ 24.178401] ? kthread_park+0x90/0x90 +[ 24.178915] ret_from_fork+0x35/0x40 +[ 24.179421] Modules linked in: +[ 24.179856] CR2: 0000000000000018 +[ 24.180327] ---[ end trace b4b7674b6df5f480 ]--- + +Signed-off-by: Anatol Pomazau +Co-developed-by: Frank Mayhar +Signed-off-by: Frank Mayhar +Co-developed-by: Bharath Ravi +Signed-off-by: Bharath Ravi +Co-developed-by: Khazhimsel Kumykov +Signed-off-by: Khazhimsel Kumykov +Co-developed-by: Gabriel Krisman Bertazi +Signed-off-by: Gabriel Krisman Bertazi +Reviewed-by: Lee Duncan +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/iscsi_tcp.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c +index 23354f206533..55181d28291e 100644 +--- a/drivers/scsi/iscsi_tcp.c ++++ b/drivers/scsi/iscsi_tcp.c +@@ -374,8 +374,16 @@ static int iscsi_sw_tcp_pdu_xmit(struct iscsi_task *task) + { + struct iscsi_conn *conn = task->conn; + unsigned int noreclaim_flag; ++ struct iscsi_tcp_conn *tcp_conn = conn->dd_data; ++ struct iscsi_sw_tcp_conn *tcp_sw_conn = tcp_conn->dd_data; + int rc = 0; + ++ if (!tcp_sw_conn->sock) { ++ iscsi_conn_printk(KERN_ERR, conn, ++ "Transport not bound to socket!\n"); ++ return -EINVAL; ++ } ++ + noreclaim_flag = memalloc_noreclaim_save(); + + while (iscsi_sw_tcp_xmit_qlen(conn)) { +-- +2.20.1 + diff --git a/queue-4.19/scsi-lpfc-fix-coverity-lpfc_cmpl_els_rsp-null-pointe.patch b/queue-4.19/scsi-lpfc-fix-coverity-lpfc_cmpl_els_rsp-null-pointe.patch new file mode 100644 index 00000000000..db231e70511 --- /dev/null +++ b/queue-4.19/scsi-lpfc-fix-coverity-lpfc_cmpl_els_rsp-null-pointe.patch @@ -0,0 +1,67 @@ +From 7319d3de39f5911eba25fc8cf8dcbae791b7f50d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Nov 2019 15:03:57 -0800 +Subject: scsi: lpfc: fix: Coverity: lpfc_cmpl_els_rsp(): Null pointer + dereferences + +From: James Smart + +[ Upstream commit 6c6d59e0fe5b86cf273d6d744a6a9768c4ecc756 ] + +Coverity reported the following: + +*** CID 101747: Null pointer dereferences (FORWARD_NULL) +/drivers/scsi/lpfc/lpfc_els.c: 4439 in lpfc_cmpl_els_rsp() +4433 kfree(mp); +4434 } +4435 mempool_free(mbox, phba->mbox_mem_pool); +4436 } +4437 out: +4438 if (ndlp && NLP_CHK_NODE_ACT(ndlp)) { +vvv CID 101747: Null pointer dereferences (FORWARD_NULL) +vvv Dereferencing null pointer "shost". +4439 spin_lock_irq(shost->host_lock); +4440 ndlp->nlp_flag &= ~(NLP_ACC_REGLOGIN | NLP_RM_DFLT_RPI); +4441 spin_unlock_irq(shost->host_lock); +4442 +4443 /* If the node is not being used by another discovery thread, +4444 * and we are sending a reject, we are done with it. + +Fix by adding a check for non-null shost in line 4438. +The scenario when shost is set to null is when ndlp is null. +As such, the ndlp check present was sufficient. But better safe +than sorry so add the shost check. + +Reported-by: coverity-bot +Addresses-Coverity-ID: 101747 ("Null pointer dereferences") +Fixes: 2e0fef85e098 ("[SCSI] lpfc: NPIV: split ports") + +CC: James Bottomley +CC: "Gustavo A. R. Silva" +CC: linux-next@vger.kernel.org +Link: https://lore.kernel.org/r/20191111230401.12958-3-jsmart2021@gmail.com +Reviewed-by: Ewan D. Milne +Signed-off-by: Dick Kennedy +Signed-off-by: James Smart +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/lpfc/lpfc_els.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c +index 4f4d1b3b3bbc..7398350b08b4 100644 +--- a/drivers/scsi/lpfc/lpfc_els.c ++++ b/drivers/scsi/lpfc/lpfc_els.c +@@ -4110,7 +4110,7 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, + mempool_free(mbox, phba->mbox_mem_pool); + } + out: +- if (ndlp && NLP_CHK_NODE_ACT(ndlp)) { ++ if (ndlp && NLP_CHK_NODE_ACT(ndlp) && shost) { + spin_lock_irq(shost->host_lock); + ndlp->nlp_flag &= ~(NLP_ACC_REGLOGIN | NLP_RM_DFLT_RPI); + spin_unlock_irq(shost->host_lock); +-- +2.20.1 + diff --git a/queue-4.19/scsi-lpfc-fix-discovery-failures-when-target-device-.patch b/queue-4.19/scsi-lpfc-fix-discovery-failures-when-target-device-.patch new file mode 100644 index 00000000000..7511aa2018c --- /dev/null +++ b/queue-4.19/scsi-lpfc-fix-discovery-failures-when-target-device-.patch @@ -0,0 +1,60 @@ +From 69f730be7a239da1ac188bd5e860e508bd048581 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 21 Sep 2019 20:58:55 -0700 +Subject: scsi: lpfc: Fix discovery failures when target device connectivity + bounces + +From: James Smart + +[ Upstream commit 3f97aed6117c7677eb16756c4ec8b86000fd5822 ] + +An issue was seen discovering all SCSI Luns when a target device undergoes +link bounce. + +The driver currently does not qualify the FC4 support on the target. +Therefore it will send a SCSI PRLI and an NVMe PRLI. The expectation is +that the target will reject the PRLI if it is not supported. If a PRLI +times out, the driver will retry. The driver will not proceed with the +device until both SCSI and NVMe PRLIs are resolved. In the failure case, +the device is FCP only and does not respond to the NVMe PRLI, thus +initiating the wait/retry loop in the driver. During that time, a RSCN is +received (device bounced) causing the driver to issue a GID_FT. The GID_FT +response comes back before the PRLI mess is resolved and it prematurely +cancels the PRLI retry logic and leaves the device in a STE_PRLI_ISSUE +state. Discovery with the target never completes or resets. + +Fix by resetting the node state back to STE_NPR_NODE when GID_FT completes, +thereby restarting the discovery process for the node. + +Link: https://lore.kernel.org/r/20190922035906.10977-10-jsmart2021@gmail.com +Signed-off-by: Dick Kennedy +Signed-off-by: James Smart +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c +index b36b3da323a0..5d657178c2b9 100644 +--- a/drivers/scsi/lpfc/lpfc_hbadisc.c ++++ b/drivers/scsi/lpfc/lpfc_hbadisc.c +@@ -5231,9 +5231,14 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did) + /* If we've already received a PLOGI from this NPort + * we don't need to try to discover it again. + */ +- if (ndlp->nlp_flag & NLP_RCV_PLOGI) ++ if (ndlp->nlp_flag & NLP_RCV_PLOGI && ++ !(ndlp->nlp_type & ++ (NLP_FCP_TARGET | NLP_NVME_TARGET))) + return NULL; + ++ ndlp->nlp_prev_state = ndlp->nlp_state; ++ lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE); ++ + spin_lock_irq(shost->host_lock); + ndlp->nlp_flag |= NLP_NPR_2B_DISC; + spin_unlock_irq(shost->host_lock); +-- +2.20.1 + diff --git a/queue-4.19/scsi-lpfc-fix-duplicate-unreg_rpi-error-in-port-offl.patch b/queue-4.19/scsi-lpfc-fix-duplicate-unreg_rpi-error-in-port-offl.patch new file mode 100644 index 00000000000..1f708761b05 --- /dev/null +++ b/queue-4.19/scsi-lpfc-fix-duplicate-unreg_rpi-error-in-port-offl.patch @@ -0,0 +1,54 @@ +From c550d34a17483d373c104257759e7920b28fb5c4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 4 Nov 2019 16:56:58 -0800 +Subject: scsi: lpfc: Fix duplicate unreg_rpi error in port offline flow + +From: James Smart + +[ Upstream commit 7cfd5639d99bec0d27af089d0c8c114330e43a72 ] + +If the driver receives a login that is later then LOGO'd by the remote port +(aka ndlp), the driver, upon the completion of the LOGO ACC transmission, +will logout the node and unregister the rpi that is being used for the +node. As part of the unreg, the node's rpi value is replaced by the +LPFC_RPI_ALLOC_ERROR value. If the port is subsequently offlined, the +offline walks the nodes and ensures they are logged out, which possibly +entails unreg'ing their rpi values. This path does not validate the node's +rpi value, thus doesn't detect that it has been unreg'd already. The +replaced rpi value is then used when accessing the rpi bitmask array which +tracks active rpi values. As the LPFC_RPI_ALLOC_ERROR value is not a valid +index for the bitmask, it may fault the system. + +Revise the rpi release code to detect when the rpi value is the replaced +RPI_ALLOC_ERROR value and ignore further release steps. + +Link: https://lore.kernel.org/r/20191105005708.7399-2-jsmart2021@gmail.com +Signed-off-by: Dick Kennedy +Signed-off-by: James Smart +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/lpfc/lpfc_sli.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c +index bd555f886d27..a801917d3c19 100644 +--- a/drivers/scsi/lpfc/lpfc_sli.c ++++ b/drivers/scsi/lpfc/lpfc_sli.c +@@ -17867,6 +17867,13 @@ lpfc_sli4_alloc_rpi(struct lpfc_hba *phba) + static void + __lpfc_sli4_free_rpi(struct lpfc_hba *phba, int rpi) + { ++ /* ++ * if the rpi value indicates a prior unreg has already ++ * been done, skip the unreg. ++ */ ++ if (rpi == LPFC_RPI_ALLOC_ERROR) ++ return; ++ + if (test_and_clear_bit(rpi, phba->sli4_hba.rpi_bmask)) { + phba->sli4_hba.rpi_count--; + phba->sli4_hba.max_cfg_param.rpi_used--; +-- +2.20.1 + diff --git a/queue-4.19/scsi-lpfc-fix-locking-on-mailbox-command-completion.patch b/queue-4.19/scsi-lpfc-fix-locking-on-mailbox-command-completion.patch new file mode 100644 index 00000000000..4964e6777d5 --- /dev/null +++ b/queue-4.19/scsi-lpfc-fix-locking-on-mailbox-command-completion.patch @@ -0,0 +1,68 @@ +From 500fdebd4b876e7d22a258c21c29e56a3d909a51 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 21 Sep 2019 20:58:53 -0700 +Subject: scsi: lpfc: Fix locking on mailbox command completion + +From: James Smart + +[ Upstream commit 07b8582430370097238b589f4e24da7613ca6dd3 ] + +Symptoms were seen of the driver not having valid data for mailbox +commands. After debugging, the following sequence was found: + +The driver maintains a port-wide pointer of the mailbox command that is +currently in execution. Once finished, the port-wide pointer is cleared +(done in lpfc_sli4_mq_release()). The next mailbox command issued will set +the next pointer and so on. + +The mailbox response data is only copied if there is a valid port-wide +pointer. + +In the failing case, it was seen that a new mailbox command was being +attempted in parallel with the completion. The parallel path was seeing +the mailbox no long in use (flag check under lock) and thus set the port +pointer. The completion path had cleared the active flag under lock, but +had not touched the port pointer. The port pointer is cleared after the +lock is released. In this case, the completion path cleared the just-set +value by the parallel path. + +Fix by making the calls that clear mbox state/port pointer while under +lock. Also slightly cleaned up the error path. + +Link: https://lore.kernel.org/r/20190922035906.10977-8-jsmart2021@gmail.com +Signed-off-by: Dick Kennedy +Signed-off-by: James Smart +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/lpfc/lpfc_sli.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c +index f459fd62e493..bd555f886d27 100644 +--- a/drivers/scsi/lpfc/lpfc_sli.c ++++ b/drivers/scsi/lpfc/lpfc_sli.c +@@ -12928,13 +12928,19 @@ send_current_mbox: + phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE; + /* Setting active mailbox pointer need to be in sync to flag clear */ + phba->sli.mbox_active = NULL; ++ if (bf_get(lpfc_trailer_consumed, mcqe)) ++ lpfc_sli4_mq_release(phba->sli4_hba.mbx_wq); + spin_unlock_irqrestore(&phba->hbalock, iflags); + /* Wake up worker thread to post the next pending mailbox command */ + lpfc_worker_wake_up(phba); ++ return workposted; ++ + out_no_mqe_complete: ++ spin_lock_irqsave(&phba->hbalock, iflags); + if (bf_get(lpfc_trailer_consumed, mcqe)) + lpfc_sli4_mq_release(phba->sli4_hba.mbx_wq); +- return workposted; ++ spin_unlock_irqrestore(&phba->hbalock, iflags); ++ return false; + } + + /** +-- +2.20.1 + diff --git a/queue-4.19/scsi-lpfc-fix-sli3-hba-in-loop-mode-not-discovering-.patch b/queue-4.19/scsi-lpfc-fix-sli3-hba-in-loop-mode-not-discovering-.patch new file mode 100644 index 00000000000..8f6996a1794 --- /dev/null +++ b/queue-4.19/scsi-lpfc-fix-sli3-hba-in-loop-mode-not-discovering-.patch @@ -0,0 +1,45 @@ +From f371748464d6e2c08844220c11947997f7b28410 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Oct 2019 14:18:20 -0700 +Subject: scsi: lpfc: Fix SLI3 hba in loop mode not discovering devices + +From: James Smart + +[ Upstream commit feff8b3d84d3d9570f893b4d83e5eab6693d6a52 ] + +When operating in private loop mode, PLOGI exchanges are racing and the +driver tries to abort it's PLOGI. But the PLOGI abort ends up terminating +the login with the other end causing the other end to abort its PLOGI as +well. Discovery never fully completes. + +Fix by disabling the PLOGI abort when private loop and letting the state +machine play out. + +Link: https://lore.kernel.org/r/20191018211832.7917-5-jsmart2021@gmail.com +Signed-off-by: Dick Kennedy +Signed-off-by: James Smart +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c +index bd8dc6a2243c..3dfed191252c 100644 +--- a/drivers/scsi/lpfc/lpfc_nportdisc.c ++++ b/drivers/scsi/lpfc/lpfc_nportdisc.c +@@ -483,8 +483,10 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, + * single discovery thread, this will cause a huge delay in + * discovery. Also this will cause multiple state machines + * running in parallel for this node. ++ * This only applies to a fabric environment. + */ +- if (ndlp->nlp_state == NLP_STE_PLOGI_ISSUE) { ++ if ((ndlp->nlp_state == NLP_STE_PLOGI_ISSUE) && ++ (vport->fc_flag & FC_FABRIC)) { + /* software abort outstanding PLOGI */ + lpfc_els_abort(phba, ndlp); + } +-- +2.20.1 + diff --git a/queue-4.19/scsi-mpt3sas-fix-clear-pending-bit-in-ioctl-status.patch b/queue-4.19/scsi-mpt3sas-fix-clear-pending-bit-in-ioctl-status.patch new file mode 100644 index 00000000000..91d02fdfed0 --- /dev/null +++ b/queue-4.19/scsi-mpt3sas-fix-clear-pending-bit-in-ioctl-status.patch @@ -0,0 +1,45 @@ +From 02dcdd48ef58ca4f11143b7b81cd9a2694440299 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Sep 2019 09:04:40 -0400 +Subject: scsi: mpt3sas: Fix clear pending bit in ioctl status + +From: Sreekanth Reddy + +[ Upstream commit 782b281883caf70289ba6a186af29441a117d23e ] + +When user issues diag register command from application with required size, +and if driver unable to allocate the memory, then it will fail the register +command. While failing the register command, driver is not currently +clearing MPT3_CMD_PENDING bit in ctl_cmds.status variable which was set +before trying to allocate the memory. As this bit is set, subsequent +register command will be failed with BUSY status even when user wants to +register the trace buffer will less memory. + +Clear MPT3_CMD_PENDING bit in ctl_cmds.status before returning the diag +register command with no memory status. + +Link: https://lore.kernel.org/r/1568379890-18347-4-git-send-email-sreekanth.reddy@broadcom.com +Signed-off-by: Sreekanth Reddy +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c +index 5e8c059ce2c9..07345016fd9c 100644 +--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c ++++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c +@@ -1597,7 +1597,8 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc, + " for diag buffers, requested size(%d)\n", + ioc->name, __func__, request_data_sz); + mpt3sas_base_free_smid(ioc, smid); +- return -ENOMEM; ++ rc = -ENOMEM; ++ goto out; + } + ioc->diag_buffer[buffer_type] = request_data; + ioc->diag_buffer_sz[buffer_type] = request_data_sz; +-- +2.20.1 + diff --git a/queue-4.19/scsi-ncr5380-add-disconnect_mask-module-parameter.patch b/queue-4.19/scsi-ncr5380-add-disconnect_mask-module-parameter.patch new file mode 100644 index 00000000000..62a1eeb2786 --- /dev/null +++ b/queue-4.19/scsi-ncr5380-add-disconnect_mask-module-parameter.patch @@ -0,0 +1,54 @@ +From e6f41f8528078d40665c8bbf2a0669950eedef67 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 16 Nov 2019 14:36:57 +1100 +Subject: scsi: NCR5380: Add disconnect_mask module parameter + +From: Finn Thain + +[ Upstream commit 0b7a223552d455bcfba6fb9cfc5eef2b5fce1491 ] + +Add a module parameter to inhibit disconnect/reselect for individual +targets. This gains compatibility with Aztec PowerMonster SCSI/SATA +adapters with buggy firmware. (No fix is available from the vendor.) + +Apparently these adapters pass-through the product/vendor of the attached +SATA device. Since they can't be identified from the response to an INQUIRY +command, a device blacklist flag won't work. + +Cc: Michael Schmitz +Link: https://lore.kernel.org/r/993b17545990f31f9fa5a98202b51102a68e7594.1573875417.git.fthain@telegraphics.com.au +Reviewed-and-tested-by: Michael Schmitz +Signed-off-by: Finn Thain +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/NCR5380.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c +index 8ec68dcc0cc4..95a3e3bf2b43 100644 +--- a/drivers/scsi/NCR5380.c ++++ b/drivers/scsi/NCR5380.c +@@ -129,6 +129,9 @@ + #define NCR5380_release_dma_irq(x) + #endif + ++static unsigned int disconnect_mask = ~0; ++module_param(disconnect_mask, int, 0444); ++ + static int do_abort(struct Scsi_Host *); + static void do_reset(struct Scsi_Host *); + static void bus_reset_cleanup(struct Scsi_Host *); +@@ -946,7 +949,8 @@ static bool NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd) + int err; + bool ret = true; + bool can_disconnect = instance->irq != NO_IRQ && +- cmd->cmnd[0] != REQUEST_SENSE; ++ cmd->cmnd[0] != REQUEST_SENSE && ++ (disconnect_mask & BIT(scmd_id(cmd))); + + NCR5380_dprint(NDEBUG_ARBITRATION, instance); + dsprintk(NDEBUG_ARBITRATION, instance, "starting arbitration, id = %d\n", +-- +2.20.1 + diff --git a/queue-4.19/scsi-pm80xx-fix-for-sata-device-discovery.patch b/queue-4.19/scsi-pm80xx-fix-for-sata-device-discovery.patch new file mode 100644 index 00000000000..a4c80ed14ad --- /dev/null +++ b/queue-4.19/scsi-pm80xx-fix-for-sata-device-discovery.patch @@ -0,0 +1,41 @@ +From 9d95e8f619f42eabd50c744cd5bb47404d00f4ae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Nov 2019 15:38:58 +0530 +Subject: scsi: pm80xx: Fix for SATA device discovery + +From: peter chang + +[ Upstream commit ce21c63ee995b7a8b7b81245f2cee521f8c3c220 ] + +Driver was missing complete() call in mpi_sata_completion which result in +SATA abort error handling timing out. That causes the device to be left in +the in_recovery state so subsequent commands sent to the device fail and +the OS removes access to it. + +Link: https://lore.kernel.org/r/20191114100910.6153-2-deepak.ukey@microchip.com +Acked-by: Jack Wang +Signed-off-by: peter chang +Signed-off-by: Deepak Ukey +Signed-off-by: Viswas G +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c +index 5021aed87f33..8627feb80261 100644 +--- a/drivers/scsi/pm8001/pm80xx_hwi.c ++++ b/drivers/scsi/pm8001/pm80xx_hwi.c +@@ -2382,6 +2382,8 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb) + pm8001_printk("task 0x%p done with io_status 0x%x" + " resp 0x%x stat 0x%x but aborted by upper layer!\n", + t, status, ts->resp, ts->stat)); ++ if (t->slow_task) ++ complete(&t->slow_task->completion); + pm8001_ccb_task_free(pm8001_ha, t, ccb, tag); + } else { + spin_unlock_irqrestore(&t->task_state_lock, flags); +-- +2.20.1 + diff --git a/queue-4.19/scsi-scsi_debug-num_tgts-must-be-0.patch b/queue-4.19/scsi-scsi_debug-num_tgts-must-be-0.patch new file mode 100644 index 00000000000..9b13d99a7e3 --- /dev/null +++ b/queue-4.19/scsi-scsi_debug-num_tgts-must-be-0.patch @@ -0,0 +1,40 @@ +From d7c5bfa39dacd3d2b864ef8727e6cc68e263a779 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 15 Nov 2019 17:37:27 +0100 +Subject: scsi: scsi_debug: num_tgts must be >= 0 + +From: Maurizio Lombardi + +[ Upstream commit aa5334c4f3014940f11bf876e919c956abef4089 ] + +Passing the parameter "num_tgts=-1" will start an infinite loop that +exhausts the system memory + +Link: https://lore.kernel.org/r/20191115163727.24626-1-mlombard@redhat.com +Signed-off-by: Maurizio Lombardi +Acked-by: Douglas Gilbert +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_debug.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c +index 65305b3848bc..a1dbae806fde 100644 +--- a/drivers/scsi/scsi_debug.c ++++ b/drivers/scsi/scsi_debug.c +@@ -5351,6 +5351,11 @@ static int __init scsi_debug_init(void) + return -EINVAL; + } + ++ if (sdebug_num_tgts < 0) { ++ pr_err("num_tgts must be >= 0\n"); ++ return -EINVAL; ++ } ++ + if (sdebug_guard > 1) { + pr_err("guard must be 0 or 1\n"); + return -EINVAL; +-- +2.20.1 + diff --git a/queue-4.19/scsi-target-compare-full-chap_a-algorithm-strings.patch b/queue-4.19/scsi-target-compare-full-chap_a-algorithm-strings.patch new file mode 100644 index 00000000000..b65c0f916e7 --- /dev/null +++ b/queue-4.19/scsi-target-compare-full-chap_a-algorithm-strings.patch @@ -0,0 +1,53 @@ +From 199b767410271e3dbecd8f1dbbbd6ddc3c51e32b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 12 Sep 2019 11:55:45 +0200 +Subject: scsi: target: compare full CHAP_A Algorithm strings + +From: David Disseldorp + +[ Upstream commit 9cef2a7955f2754257a7cddedec16edae7b587d0 ] + +RFC 2307 states: + + For CHAP [RFC1994], in the first step, the initiator MUST send: + + CHAP_A= + + Where A1,A2... are proposed algorithms, in order of preference. +... + For the Algorithm, as stated in [RFC1994], one value is required to + be implemented: + + 5 (CHAP with MD5) + +LIO currently checks for this value by only comparing a single byte in +the tokenized Algorithm string, which means that any value starting with +a '5' (e.g. "55") is interpreted as "CHAP with MD5". Fix this by +comparing the entire tokenized string. + +Reviewed-by: Lee Duncan +Reviewed-by: Mike Christie +Signed-off-by: David Disseldorp +Link: https://lore.kernel.org/r/20190912095547.22427-2-ddiss@suse.de +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/target/iscsi/iscsi_target_auth.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c +index e2fa3a3bc81d..b6bf605fa5c1 100644 +--- a/drivers/target/iscsi/iscsi_target_auth.c ++++ b/drivers/target/iscsi/iscsi_target_auth.c +@@ -78,7 +78,7 @@ static int chap_check_algorithm(const char *a_str) + if (!token) + goto out; + +- if (!strncmp(token, "5", 1)) { ++ if (!strcmp(token, "5")) { + pr_debug("Selected MD5 Algorithm\n"); + kfree(orig); + return CHAP_DIGEST_MD5; +-- +2.20.1 + diff --git a/queue-4.19/scsi-target-iscsi-wait-for-all-commands-to-finish-be.patch b/queue-4.19/scsi-target-iscsi-wait-for-all-commands-to-finish-be.patch new file mode 100644 index 00000000000..55a4d91bdcc --- /dev/null +++ b/queue-4.19/scsi-target-iscsi-wait-for-all-commands-to-finish-be.patch @@ -0,0 +1,144 @@ +From 5f4f52a4d64cba6c315a5426a0432b17194d4969 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Nov 2019 14:05:08 -0800 +Subject: scsi: target: iscsi: Wait for all commands to finish before freeing a + session + +From: Bart Van Assche + +[ Upstream commit e9d3009cb936bd0faf0719f68d98ad8afb1e613b ] + +The iSCSI target driver is the only target driver that does not wait for +ongoing commands to finish before freeing a session. Make the iSCSI target +driver wait for ongoing commands to finish before freeing a session. This +patch fixes the following KASAN complaint: + +BUG: KASAN: use-after-free in __lock_acquire+0xb1a/0x2710 +Read of size 8 at addr ffff8881154eca70 by task kworker/0:2/247 + +CPU: 0 PID: 247 Comm: kworker/0:2 Not tainted 5.4.0-rc1-dbg+ #6 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 +Workqueue: target_completion target_complete_ok_work [target_core_mod] +Call Trace: + dump_stack+0x8a/0xd6 + print_address_description.constprop.0+0x40/0x60 + __kasan_report.cold+0x1b/0x33 + kasan_report+0x16/0x20 + __asan_load8+0x58/0x90 + __lock_acquire+0xb1a/0x2710 + lock_acquire+0xd3/0x200 + _raw_spin_lock_irqsave+0x43/0x60 + target_release_cmd_kref+0x162/0x7f0 [target_core_mod] + target_put_sess_cmd+0x2e/0x40 [target_core_mod] + lio_check_stop_free+0x12/0x20 [iscsi_target_mod] + transport_cmd_check_stop_to_fabric+0xd8/0xe0 [target_core_mod] + target_complete_ok_work+0x1b0/0x790 [target_core_mod] + process_one_work+0x549/0xa40 + worker_thread+0x7a/0x5d0 + kthread+0x1bc/0x210 + ret_from_fork+0x24/0x30 + +Allocated by task 889: + save_stack+0x23/0x90 + __kasan_kmalloc.constprop.0+0xcf/0xe0 + kasan_slab_alloc+0x12/0x20 + kmem_cache_alloc+0xf6/0x360 + transport_alloc_session+0x29/0x80 [target_core_mod] + iscsi_target_login_thread+0xcd6/0x18f0 [iscsi_target_mod] + kthread+0x1bc/0x210 + ret_from_fork+0x24/0x30 + +Freed by task 1025: + save_stack+0x23/0x90 + __kasan_slab_free+0x13a/0x190 + kasan_slab_free+0x12/0x20 + kmem_cache_free+0x146/0x400 + transport_free_session+0x179/0x2f0 [target_core_mod] + transport_deregister_session+0x130/0x180 [target_core_mod] + iscsit_close_session+0x12c/0x350 [iscsi_target_mod] + iscsit_logout_post_handler+0x136/0x380 [iscsi_target_mod] + iscsit_response_queue+0x8de/0xbe0 [iscsi_target_mod] + iscsi_target_tx_thread+0x27f/0x370 [iscsi_target_mod] + kthread+0x1bc/0x210 + ret_from_fork+0x24/0x30 + +The buggy address belongs to the object at ffff8881154ec9c0 + which belongs to the cache se_sess_cache of size 352 +The buggy address is located 176 bytes inside of + 352-byte region [ffff8881154ec9c0, ffff8881154ecb20) +The buggy address belongs to the page: +page:ffffea0004553b00 refcount:1 mapcount:0 mapping:ffff888101755400 index:0x0 compound_mapcount: 0 +flags: 0x2fff000000010200(slab|head) +raw: 2fff000000010200 dead000000000100 dead000000000122 ffff888101755400 +raw: 0000000000000000 0000000080130013 00000001ffffffff 0000000000000000 +page dumped because: kasan: bad access detected + +Memory state around the buggy address: + ffff8881154ec900: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc + ffff8881154ec980: fc fc fc fc fc fc fc fc fb fb fb fb fb fb fb fb +>ffff8881154eca00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb + ^ + ffff8881154eca80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb + ffff8881154ecb00: fb fb fb fb fc fc fc fc fc fc fc fc fc fc fc fc + +Cc: Mike Christie +Link: https://lore.kernel.org/r/20191113220508.198257-3-bvanassche@acm.org +Reviewed-by: Roman Bolshakov +Signed-off-by: Bart Van Assche +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/target/iscsi/iscsi_target.c | 10 ++++++++-- + include/scsi/iscsi_proto.h | 1 + + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c +index 03e9cb156df9..317d0f3f7a14 100644 +--- a/drivers/target/iscsi/iscsi_target.c ++++ b/drivers/target/iscsi/iscsi_target.c +@@ -1157,7 +1157,9 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, + hdr->cmdsn, be32_to_cpu(hdr->data_length), payload_length, + conn->cid); + +- target_get_sess_cmd(&cmd->se_cmd, true); ++ if (target_get_sess_cmd(&cmd->se_cmd, true) < 0) ++ return iscsit_add_reject_cmd(cmd, ++ ISCSI_REASON_WAITING_FOR_LOGOUT, buf); + + cmd->sense_reason = transport_lookup_cmd_lun(&cmd->se_cmd, + scsilun_to_int(&hdr->lun)); +@@ -1998,7 +2000,9 @@ iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, + conn->sess->se_sess, 0, DMA_NONE, + TCM_SIMPLE_TAG, cmd->sense_buffer + 2); + +- target_get_sess_cmd(&cmd->se_cmd, true); ++ if (target_get_sess_cmd(&cmd->se_cmd, true) < 0) ++ return iscsit_add_reject_cmd(cmd, ++ ISCSI_REASON_WAITING_FOR_LOGOUT, buf); + + /* + * TASK_REASSIGN for ERL=2 / connection stays inside of +@@ -4204,6 +4208,8 @@ int iscsit_close_connection( + * must wait until they have completed. + */ + iscsit_check_conn_usage_count(conn); ++ target_sess_cmd_list_set_waiting(sess->se_sess); ++ target_wait_for_sess_cmds(sess->se_sess); + + ahash_request_free(conn->conn_tx_hash); + if (conn->conn_rx_hash) { +diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h +index df156f1d50b2..f0a01a54bd15 100644 +--- a/include/scsi/iscsi_proto.h ++++ b/include/scsi/iscsi_proto.h +@@ -638,6 +638,7 @@ struct iscsi_reject { + #define ISCSI_REASON_BOOKMARK_INVALID 9 + #define ISCSI_REASON_BOOKMARK_NO_RESOURCES 10 + #define ISCSI_REASON_NEGOTIATION_RESET 11 ++#define ISCSI_REASON_WAITING_FOR_LOGOUT 12 + + /* Max. number of Key=Value pairs in a text message */ + #define MAX_KEY_VALUE_PAIRS 8192 +-- +2.20.1 + diff --git a/queue-4.19/scsi-tracing-fix-handling-of-transfer-length-0-for-r.patch b/queue-4.19/scsi-tracing-fix-handling-of-transfer-length-0-for-r.patch new file mode 100644 index 00000000000..c537e06c849 --- /dev/null +++ b/queue-4.19/scsi-tracing-fix-handling-of-transfer-length-0-for-r.patch @@ -0,0 +1,55 @@ +From c393f4200cad7c6ae85add36872a2724ed57f0a2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 Nov 2019 13:55:53 -0800 +Subject: scsi: tracing: Fix handling of TRANSFER LENGTH == 0 for READ(6) and + WRITE(6) + +From: Bart Van Assche + +[ Upstream commit f6b8540f40201bff91062dd64db8e29e4ddaaa9d ] + +According to SBC-2 a TRANSFER LENGTH field of zero means that 256 logical +blocks must be transferred. Make the SCSI tracing code follow SBC-2. + +Fixes: bf8162354233 ("[SCSI] add scsi trace core functions and put trace points") +Cc: Christoph Hellwig +Cc: Hannes Reinecke +Cc: Douglas Gilbert +Link: https://lore.kernel.org/r/20191105215553.185018-1-bvanassche@acm.org +Signed-off-by: Bart Van Assche +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_trace.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c +index 0ff083bbf5b1..617a60737590 100644 +--- a/drivers/scsi/scsi_trace.c ++++ b/drivers/scsi/scsi_trace.c +@@ -30,15 +30,18 @@ static const char * + scsi_trace_rw6(struct trace_seq *p, unsigned char *cdb, int len) + { + const char *ret = trace_seq_buffer_ptr(p); +- sector_t lba = 0, txlen = 0; ++ u32 lba = 0, txlen; + + lba |= ((cdb[1] & 0x1F) << 16); + lba |= (cdb[2] << 8); + lba |= cdb[3]; +- txlen = cdb[4]; ++ /* ++ * From SBC-2: a TRANSFER LENGTH field set to zero specifies that 256 ++ * logical blocks shall be read (READ(6)) or written (WRITE(6)). ++ */ ++ txlen = cdb[4] ? cdb[4] : 256; + +- trace_seq_printf(p, "lba=%llu txlen=%llu", +- (unsigned long long)lba, (unsigned long long)txlen); ++ trace_seq_printf(p, "lba=%u txlen=%u", lba, txlen); + trace_seq_putc(p, 0); + + return ret; +-- +2.20.1 + diff --git a/queue-4.19/scsi-ufs-fix-error-handing-during-hibern8-enter.patch b/queue-4.19/scsi-ufs-fix-error-handing-during-hibern8-enter.patch new file mode 100644 index 00000000000..3fa9892e7cd --- /dev/null +++ b/queue-4.19/scsi-ufs-fix-error-handing-during-hibern8-enter.patch @@ -0,0 +1,86 @@ +From 862e13848253901a9b5bcda87e20a293a07c957c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Nov 2019 22:09:30 -0800 +Subject: scsi: ufs: Fix error handing during hibern8 enter +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Subhash Jadavani + +[ Upstream commit 6d303e4b19d694cdbebf76bcdb51ada664ee953d ] + +During clock gating (ufshcd_gate_work()), we first put the link hibern8 by +calling ufshcd_uic_hibern8_enter() and if ufshcd_uic_hibern8_enter() +returns success (0) then we gate all the clocks. Now let’s zoom in to what +ufshcd_uic_hibern8_enter() does internally: It calls +__ufshcd_uic_hibern8_enter() and if failure is encountered, link recovery +shall put the link back to the highest HS gear and returns success (0) to +ufshcd_uic_hibern8_enter() which is the issue as link is still in active +state due to recovery! Now ufshcd_uic_hibern8_enter() returns success to +ufshcd_gate_work() and hence it goes ahead with gating the UFS clock while +link is still in active state hence I believe controller would raise UIC +error interrupts. But when we service the interrupt, clocks might have +already been disabled! + +This change fixes for this by returning failure from +__ufshcd_uic_hibern8_enter() if recovery succeeds as link is still not in +hibern8, upon receiving the error ufshcd_hibern8_enter() would initiate +retry to put the link state back into hibern8. + +Link: https://lore.kernel.org/r/1573798172-20534-8-git-send-email-cang@codeaurora.org +Reviewed-by: Avri Altman +Reviewed-by: Bean Huo +Signed-off-by: Subhash Jadavani +Signed-off-by: Can Guo +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/ufs/ufshcd.c | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c +index 7510d8328d4d..3601e770da16 100644 +--- a/drivers/scsi/ufs/ufshcd.c ++++ b/drivers/scsi/ufs/ufshcd.c +@@ -3875,15 +3875,24 @@ static int __ufshcd_uic_hibern8_enter(struct ufs_hba *hba) + ktime_to_us(ktime_sub(ktime_get(), start)), ret); + + if (ret) { ++ int err; ++ + dev_err(hba->dev, "%s: hibern8 enter failed. ret = %d\n", + __func__, ret); + + /* +- * If link recovery fails then return error so that caller +- * don't retry the hibern8 enter again. ++ * If link recovery fails then return error code returned from ++ * ufshcd_link_recovery(). ++ * If link recovery succeeds then return -EAGAIN to attempt ++ * hibern8 enter retry again. + */ +- if (ufshcd_link_recovery(hba)) +- ret = -ENOLINK; ++ err = ufshcd_link_recovery(hba); ++ if (err) { ++ dev_err(hba->dev, "%s: link recovery failed", __func__); ++ ret = err; ++ } else { ++ ret = -EAGAIN; ++ } + } else + ufshcd_vops_hibern8_notify(hba, UIC_CMD_DME_HIBER_ENTER, + POST_CHANGE); +@@ -3897,7 +3906,7 @@ static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba) + + for (retries = UIC_HIBERN8_ENTER_RETRIES; retries > 0; retries--) { + ret = __ufshcd_uic_hibern8_enter(hba); +- if (!ret || ret == -ENOLINK) ++ if (!ret) + goto out; + } + out: +-- +2.20.1 + diff --git a/queue-4.19/scsi-ufs-fix-potential-bug-which-ends-in-system-hang.patch b/queue-4.19/scsi-ufs-fix-potential-bug-which-ends-in-system-hang.patch new file mode 100644 index 00000000000..892e79e1c1a --- /dev/null +++ b/queue-4.19/scsi-ufs-fix-potential-bug-which-ends-in-system-hang.patch @@ -0,0 +1,82 @@ +From cd0705ad5adc753e65bca94507fac98261ab63ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Nov 2019 23:34:36 +0100 +Subject: scsi: ufs: fix potential bug which ends in system hang + +From: Bean Huo + +[ Upstream commit cfcbae3895b86c390ede57b2a8f601dd5972b47b ] + +In function __ufshcd_query_descriptor(), in the event of an error +happening, we directly goto out_unlock and forget to invaliate +hba->dev_cmd.query.descriptor pointer. This results in this pointer still +valid in ufshcd_copy_query_response() for other query requests which go +through ufshcd_exec_raw_upiu_cmd(). This will cause __memcpy() crash and +system hangs. Log as shown below: + +Unable to handle kernel paging request at virtual address +ffff000012233c40 +Mem abort info: + ESR = 0x96000047 + Exception class = DABT (current EL), IL = 32 bits + SET = 0, FnV = 0 + EA = 0, S1PTW = 0 +Data abort info: + ISV = 0, ISS = 0x00000047 + CM = 0, WnR = 1 +swapper pgtable: 4k pages, 48-bit VAs, pgdp = 0000000028cc735c +[ffff000012233c40] pgd=00000000bffff003, pud=00000000bfffe003, +pmd=00000000ba8b8003, pte=0000000000000000 + Internal error: Oops: 96000047 [#2] PREEMPT SMP + ... + Call trace: + __memcpy+0x74/0x180 + ufshcd_issue_devman_upiu_cmd+0x250/0x3c0 + ufshcd_exec_raw_upiu_cmd+0xfc/0x1a8 + ufs_bsg_request+0x178/0x3b0 + bsg_queue_rq+0xc0/0x118 + blk_mq_dispatch_rq_list+0xb0/0x538 + blk_mq_sched_dispatch_requests+0x18c/0x1d8 + __blk_mq_run_hw_queue+0xb4/0x118 + blk_mq_run_work_fn+0x28/0x38 + process_one_work+0x1ec/0x470 + worker_thread+0x48/0x458 + kthread+0x130/0x138 + ret_from_fork+0x10/0x1c + Code: 540000ab a8c12027 a88120c7 a8c12027 (a88120c7) + ---[ end trace 793e1eb5dff69f2d ]--- + note: kworker/0:2H[2054] exited with preempt_count 1 + +This patch is to move "descriptor = NULL" down to below the label +"out_unlock". + +Fixes: d44a5f98bb49b2(ufs: query descriptor API) +Link: https://lore.kernel.org/r/20191112223436.27449-3-huobean@gmail.com +Reviewed-by: Alim Akhtar +Reviewed-by: Bart Van Assche +Signed-off-by: Bean Huo +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/ufs/ufshcd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c +index 8bce755e0f5b..7510d8328d4d 100644 +--- a/drivers/scsi/ufs/ufshcd.c ++++ b/drivers/scsi/ufs/ufshcd.c +@@ -3011,10 +3011,10 @@ static int __ufshcd_query_descriptor(struct ufs_hba *hba, + goto out_unlock; + } + +- hba->dev_cmd.query.descriptor = NULL; + *buf_len = be16_to_cpu(response->upiu_res.length); + + out_unlock: ++ hba->dev_cmd.query.descriptor = NULL; + mutex_unlock(&hba->dev_cmd.lock); + out: + ufshcd_release(hba); +-- +2.20.1 + diff --git a/queue-4.19/series b/queue-4.19/series new file mode 100644 index 00000000000..6789c30c7b8 --- /dev/null +++ b/queue-4.19/series @@ -0,0 +1,72 @@ +scsi-lpfc-fix-discovery-failures-when-target-device-.patch +scsi-mpt3sas-fix-clear-pending-bit-in-ioctl-status.patch +scsi-lpfc-fix-locking-on-mailbox-command-completion.patch +input-atmel_mxt_ts-disable-irq-across-suspend.patch +f2fs-fix-to-update-time-in-lazytime-mode.patch +iommu-rockchip-free-domain-on-.domain_free.patch +iommu-tegra-smmu-fix-page-tables-in-4-gib-memory.patch +dmaengine-xilinx_dma-clear-desc_pendingcount-in-xili.patch +scsi-target-compare-full-chap_a-algorithm-strings.patch +scsi-lpfc-fix-sli3-hba-in-loop-mode-not-discovering-.patch +scsi-csiostor-don-t-enable-irqs-too-early.patch +scsi-hisi_sas-replace-in_softirq-check-in-hisi_sas_t.patch +powerpc-pseries-mark-accumulate_stolen_time-as-notra.patch +powerpc-pseries-don-t-fail-hash-page-table-insert-fo.patch +powerpc-tools-don-t-quote-objdump-in-scripts.patch +dma-debug-add-a-schedule-point-in-debug_dma_dump_map.patch +leds-lm3692x-handle-failure-to-probe-the-regulator.patch +clocksource-drivers-asm9260-add-a-check-for-of_clk_g.patch +clocksource-drivers-timer-of-use-unique-device-name-.patch +powerpc-security-book3s64-report-l1tf-status-in-sysf.patch +powerpc-book3s64-hash-add-cond_resched-to-avoid-soft.patch +ext4-update-direct-i-o-read-lock-pattern-for-iocb_no.patch +ext4-iomap-that-extends-beyond-eof-should-be-marked-.patch +jbd2-fix-statistics-for-the-number-of-logged-blocks.patch +scsi-tracing-fix-handling-of-transfer-length-0-for-r.patch +scsi-lpfc-fix-duplicate-unreg_rpi-error-in-port-offl.patch +f2fs-fix-to-update-dir-s-i_pino-during-cross_rename.patch +clk-qcom-allow-constant-ratio-freq-tables-for-rcg.patch +clk-clk-gpio-propagate-rate-change-to-parent.patch +irqchip-irq-bcm7038-l1-enable-parent-irq-if-necessar.patch +irqchip-ingenic-error-out-if-irq-domain-creation-fai.patch +mfd-mfd-core-honour-device-tree-s-request-to-disable.patch +fs-quota-handle-overflows-of-sysctl-fs.quota.-and-re.patch +scsi-lpfc-fix-coverity-lpfc_cmpl_els_rsp-null-pointe.patch +pci-rpaphp-fix-up-pointer-to-first-drc-info-entry.patch +scsi-ufs-fix-potential-bug-which-ends-in-system-hang.patch +powerpc-pseries-cmm-implement-release-function-for-s.patch +pci-rpaphp-don-t-rely-on-firmware-feature-to-imply-d.patch +pci-rpaphp-annotate-and-correctly-byte-swap-drc-prop.patch +pci-rpaphp-correctly-match-ibm-my-drc-index-to-drc-n.patch +powerpc-security-fix-wrong-message-when-rfi-flush-is.patch +scsi-atari_scsi-sun3_scsi-set-sg_tablesize-to-1-inst.patch +clk-pxa-fix-one-of-the-pxa-rtc-clocks.patch +bcache-at-least-try-to-shrink-1-node-in-bch_mca_scan.patch +hid-quirks-add-quirk-for-hp-msu1465-pixart-oem-mouse.patch +hid-logitech-hidpp-silence-intermittent-get_battery_.patch +arm-8937-1-spectre-v2-remove-brahma-b53-from-hardeni.patch +libnvdimm-btt-fix-variable-rc-set-but-not-used.patch +hid-improve-windows-precision-touchpad-detection.patch +hid-rmi-check-that-the-rmi_started-bit-is-set-before.patch +watchdog-fix-the-race-between-the-release-of-watchdo.patch +scsi-pm80xx-fix-for-sata-device-discovery.patch +scsi-ufs-fix-error-handing-during-hibern8-enter.patch +scsi-scsi_debug-num_tgts-must-be-0.patch +scsi-ncr5380-add-disconnect_mask-module-parameter.patch +scsi-iscsi-don-t-send-data-to-unbound-connection.patch +scsi-target-iscsi-wait-for-all-commands-to-finish-be.patch +gpio-mpc8xxx-don-t-overwrite-default-irq_set_type-ca.patch +apparmor-fix-unsigned-len-comparison-with-less-than-.patch +scripts-kallsyms-fix-definitely-lost-memory-leak.patch +powerpc-don-t-add-mabi-flags-when-building-with-clan.patch +f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch +cdrom-respect-device-capabilities-during-opening-act.patch +perf-script-fix-brstackinsn-for-auxtrace.patch +perf-regs-make-perf_reg_name-return-unknown-instead-.patch +s390-zcrypt-handle-new-reply-code-filtered_by_hyperv.patch +libfdt-define-int32_max-and-uint32_max-in-libfdt_env.patch +s390-cpum_sf-check-for-sdbt-and-sdb-consistency.patch +ocfs2-fix-passing-zero-to-ptr_err-warning.patch +mailbox-imx-fix-tx-doorbell-shutdown-path.patch +kernel-sysctl-make-drop_caches-write-only.patch +userfaultfd-require-cap_sys_ptrace-for-uffd_feature_.patch diff --git a/queue-4.19/userfaultfd-require-cap_sys_ptrace-for-uffd_feature_.patch b/queue-4.19/userfaultfd-require-cap_sys_ptrace-for-uffd_feature_.patch new file mode 100644 index 00000000000..ab6ac16ff05 --- /dev/null +++ b/queue-4.19/userfaultfd-require-cap_sys_ptrace-for-uffd_feature_.patch @@ -0,0 +1,86 @@ +From 9e18c69239dcfdfe37ecb89c477edc3f6b74a7b1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 30 Nov 2019 17:58:01 -0800 +Subject: userfaultfd: require CAP_SYS_PTRACE for UFFD_FEATURE_EVENT_FORK + +From: Mike Rapoport + +[ Upstream commit 3c1c24d91ffd536de0a64688a9df7f49e58fadbc ] + +A while ago Andy noticed +(http://lkml.kernel.org/r/CALCETrWY+5ynDct7eU_nDUqx=okQvjm=Y5wJvA4ahBja=CQXGw@mail.gmail.com) +that UFFD_FEATURE_EVENT_FORK used by an unprivileged user may have +security implications. + +As the first step of the solution the following patch limits the availably +of UFFD_FEATURE_EVENT_FORK only for those having CAP_SYS_PTRACE. + +The usage of CAP_SYS_PTRACE ensures compatibility with CRIU. + +Yet, if there are other users of non-cooperative userfaultfd that run +without CAP_SYS_PTRACE, they would be broken :( + +Current implementation of UFFD_FEATURE_EVENT_FORK modifies the file +descriptor table from the read() implementation of uffd, which may have +security implications for unprivileged use of the userfaultfd. + +Limit availability of UFFD_FEATURE_EVENT_FORK only for callers that have +CAP_SYS_PTRACE. + +Link: http://lkml.kernel.org/r/1572967777-8812-2-git-send-email-rppt@linux.ibm.com +Signed-off-by: Mike Rapoport +Reviewed-by: Andrea Arcangeli +Cc: Daniel Colascione +Cc: Jann Horn +Cc: Lokesh Gidra +Cc: Nick Kralevich +Cc: Nosh Minwalla +Cc: Pavel Emelyanov +Cc: Tim Murray +Cc: Aleksa Sarai +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/userfaultfd.c | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c +index 9c2955f67f70..d269d1139f7f 100644 +--- a/fs/userfaultfd.c ++++ b/fs/userfaultfd.c +@@ -1833,13 +1833,12 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx, + if (copy_from_user(&uffdio_api, buf, sizeof(uffdio_api))) + goto out; + features = uffdio_api.features; +- if (uffdio_api.api != UFFD_API || (features & ~UFFD_API_FEATURES)) { +- memset(&uffdio_api, 0, sizeof(uffdio_api)); +- if (copy_to_user(buf, &uffdio_api, sizeof(uffdio_api))) +- goto out; +- ret = -EINVAL; +- goto out; +- } ++ ret = -EINVAL; ++ if (uffdio_api.api != UFFD_API || (features & ~UFFD_API_FEATURES)) ++ goto err_out; ++ ret = -EPERM; ++ if ((features & UFFD_FEATURE_EVENT_FORK) && !capable(CAP_SYS_PTRACE)) ++ goto err_out; + /* report all available features and ioctls to userland */ + uffdio_api.features = UFFD_API_FEATURES; + uffdio_api.ioctls = UFFD_API_IOCTLS; +@@ -1852,6 +1851,11 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx, + ret = 0; + out: + return ret; ++err_out: ++ memset(&uffdio_api, 0, sizeof(uffdio_api)); ++ if (copy_to_user(buf, &uffdio_api, sizeof(uffdio_api))) ++ ret = -EFAULT; ++ goto out; + } + + static long userfaultfd_ioctl(struct file *file, unsigned cmd, +-- +2.20.1 + diff --git a/queue-4.19/watchdog-fix-the-race-between-the-release-of-watchdo.patch b/queue-4.19/watchdog-fix-the-race-between-the-release-of-watchdo.patch new file mode 100644 index 00000000000..ffecabb7da6 --- /dev/null +++ b/queue-4.19/watchdog-fix-the-race-between-the-release-of-watchdo.patch @@ -0,0 +1,289 @@ +From 16e403765975cc7ffa6a4982ab3e9ba09c2d1381 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Oct 2019 19:29:34 +0800 +Subject: watchdog: Fix the race between the release of watchdog_core_data and + cdev + +From: Kevin Hao + +[ Upstream commit 72139dfa2464e43957d330266994740bb7be2535 ] + +The struct cdev is embedded in the struct watchdog_core_data. In the +current code, we manage the watchdog_core_data with a kref, but the +cdev is manged by a kobject. There is no any relationship between +this kref and kobject. So it is possible that the watchdog_core_data is +freed before the cdev is entirely released. We can easily get the +following call trace with CONFIG_DEBUG_KOBJECT_RELEASE and +CONFIG_DEBUG_OBJECTS_TIMERS enabled. + ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x38 + WARNING: CPU: 23 PID: 1028 at lib/debugobjects.c:481 debug_print_object+0xb0/0xf0 + Modules linked in: softdog(-) deflate ctr twofish_generic twofish_common camellia_generic serpent_generic blowfish_generic blowfish_common cast5_generic cast_common cmac xcbc af_key sch_fq_codel openvswitch nsh nf_conncount nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 + CPU: 23 PID: 1028 Comm: modprobe Not tainted 5.3.0-next-20190924-yoctodev-standard+ #180 + Hardware name: Marvell OcteonTX CN96XX board (DT) + pstate: 00400009 (nzcv daif +PAN -UAO) + pc : debug_print_object+0xb0/0xf0 + lr : debug_print_object+0xb0/0xf0 + sp : ffff80001cbcfc70 + x29: ffff80001cbcfc70 x28: ffff800010ea2128 + x27: ffff800010bad000 x26: 0000000000000000 + x25: ffff80001103c640 x24: ffff80001107b268 + x23: ffff800010bad9e8 x22: ffff800010ea2128 + x21: ffff000bc2c62af8 x20: ffff80001103c600 + x19: ffff800010e867d8 x18: 0000000000000060 + x17: 0000000000000000 x16: 0000000000000000 + x15: ffff000bd7240470 x14: 6e6968207473696c + x13: 5f72656d6974203a x12: 6570797420746365 + x11: 6a626f2029302065 x10: 7461747320657669 + x9 : 7463612820657669 x8 : 3378302f3078302b + x7 : 0000000000001d7a x6 : ffff800010fd5889 + x5 : 0000000000000000 x4 : 0000000000000000 + x3 : 0000000000000000 x2 : ffff000bff948548 + x1 : 276a1c9e1edc2300 x0 : 0000000000000000 + Call trace: + debug_print_object+0xb0/0xf0 + debug_check_no_obj_freed+0x1e8/0x210 + kfree+0x1b8/0x368 + watchdog_cdev_unregister+0x88/0xc8 + watchdog_dev_unregister+0x38/0x48 + watchdog_unregister_device+0xa8/0x100 + softdog_exit+0x18/0xfec4 [softdog] + __arm64_sys_delete_module+0x174/0x200 + el0_svc_handler+0xd0/0x1c8 + el0_svc+0x8/0xc + +This is a common issue when using cdev embedded in a struct. +Fortunately, we already have a mechanism to solve this kind of issue. +Please see commit 233ed09d7fda ("chardev: add helper function to +register char devs with a struct device") for more detail. + +In this patch, we choose to embed the struct device into the +watchdog_core_data, and use the API provided by the commit 233ed09d7fda +to make sure that the release of watchdog_core_data and cdev are +in sequence. + +Signed-off-by: Kevin Hao +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20191008112934.29669-1-haokexin@gmail.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/watchdog_dev.c | 70 +++++++++++++++------------------ + 1 file changed, 32 insertions(+), 38 deletions(-) + +diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c +index f6c24b22b37c..4b89333e8eb4 100644 +--- a/drivers/watchdog/watchdog_dev.c ++++ b/drivers/watchdog/watchdog_dev.c +@@ -38,7 +38,6 @@ + #include /* For __init/__exit/... */ + #include /* For hrtimers */ + #include /* For printk/panic/... */ +-#include /* For data references */ + #include /* For kthread_work */ + #include /* For handling misc devices */ + #include /* For module stuff/... */ +@@ -56,14 +55,14 @@ + + /* + * struct watchdog_core_data - watchdog core internal data +- * @kref: Reference count. ++ * @dev: The watchdog's internal device + * @cdev: The watchdog's Character device. + * @wdd: Pointer to watchdog device. + * @lock: Lock for watchdog core. + * @status: Watchdog core internal status bits. + */ + struct watchdog_core_data { +- struct kref kref; ++ struct device dev; + struct cdev cdev; + struct watchdog_device *wdd; + struct mutex lock; +@@ -822,7 +821,7 @@ static int watchdog_open(struct inode *inode, struct file *file) + file->private_data = wd_data; + + if (!hw_running) +- kref_get(&wd_data->kref); ++ get_device(&wd_data->dev); + + /* dev/watchdog is a virtual (and thus non-seekable) filesystem */ + return nonseekable_open(inode, file); +@@ -834,11 +833,11 @@ out_clear: + return err; + } + +-static void watchdog_core_data_release(struct kref *kref) ++static void watchdog_core_data_release(struct device *dev) + { + struct watchdog_core_data *wd_data; + +- wd_data = container_of(kref, struct watchdog_core_data, kref); ++ wd_data = container_of(dev, struct watchdog_core_data, dev); + + kfree(wd_data); + } +@@ -898,7 +897,7 @@ done: + */ + if (!running) { + module_put(wd_data->cdev.owner); +- kref_put(&wd_data->kref, watchdog_core_data_release); ++ put_device(&wd_data->dev); + } + return 0; + } +@@ -917,17 +916,22 @@ static struct miscdevice watchdog_miscdev = { + .fops = &watchdog_fops, + }; + ++static struct class watchdog_class = { ++ .name = "watchdog", ++ .owner = THIS_MODULE, ++ .dev_groups = wdt_groups, ++}; ++ + /* + * watchdog_cdev_register: register watchdog character device + * @wdd: watchdog device +- * @devno: character device number + * + * Register a watchdog character device including handling the legacy + * /dev/watchdog node. /dev/watchdog is actually a miscdevice and + * thus we set it up like that. + */ + +-static int watchdog_cdev_register(struct watchdog_device *wdd, dev_t devno) ++static int watchdog_cdev_register(struct watchdog_device *wdd) + { + struct watchdog_core_data *wd_data; + int err; +@@ -935,7 +939,6 @@ static int watchdog_cdev_register(struct watchdog_device *wdd, dev_t devno) + wd_data = kzalloc(sizeof(struct watchdog_core_data), GFP_KERNEL); + if (!wd_data) + return -ENOMEM; +- kref_init(&wd_data->kref); + mutex_init(&wd_data->lock); + + wd_data->wdd = wdd; +@@ -964,23 +967,33 @@ static int watchdog_cdev_register(struct watchdog_device *wdd, dev_t devno) + } + } + ++ device_initialize(&wd_data->dev); ++ wd_data->dev.devt = MKDEV(MAJOR(watchdog_devt), wdd->id); ++ wd_data->dev.class = &watchdog_class; ++ wd_data->dev.parent = wdd->parent; ++ wd_data->dev.groups = wdd->groups; ++ wd_data->dev.release = watchdog_core_data_release; ++ dev_set_drvdata(&wd_data->dev, wdd); ++ dev_set_name(&wd_data->dev, "watchdog%d", wdd->id); ++ + /* Fill in the data structures */ + cdev_init(&wd_data->cdev, &watchdog_fops); +- wd_data->cdev.owner = wdd->ops->owner; + + /* Add the device */ +- err = cdev_add(&wd_data->cdev, devno, 1); ++ err = cdev_device_add(&wd_data->cdev, &wd_data->dev); + if (err) { + pr_err("watchdog%d unable to add device %d:%d\n", + wdd->id, MAJOR(watchdog_devt), wdd->id); + if (wdd->id == 0) { + misc_deregister(&watchdog_miscdev); + old_wd_data = NULL; +- kref_put(&wd_data->kref, watchdog_core_data_release); ++ put_device(&wd_data->dev); + } + return err; + } + ++ wd_data->cdev.owner = wdd->ops->owner; ++ + /* Record time of most recent heartbeat as 'just before now'. */ + wd_data->last_hw_keepalive = ktime_sub(ktime_get(), 1); + +@@ -990,7 +1003,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd, dev_t devno) + */ + if (watchdog_hw_running(wdd)) { + __module_get(wdd->ops->owner); +- kref_get(&wd_data->kref); ++ get_device(&wd_data->dev); + if (handle_boot_enabled) + hrtimer_start(&wd_data->timer, 0, HRTIMER_MODE_REL); + else +@@ -1013,7 +1026,7 @@ static void watchdog_cdev_unregister(struct watchdog_device *wdd) + { + struct watchdog_core_data *wd_data = wdd->wd_data; + +- cdev_del(&wd_data->cdev); ++ cdev_device_del(&wd_data->cdev, &wd_data->dev); + if (wdd->id == 0) { + misc_deregister(&watchdog_miscdev); + old_wd_data = NULL; +@@ -1032,15 +1045,9 @@ static void watchdog_cdev_unregister(struct watchdog_device *wdd) + hrtimer_cancel(&wd_data->timer); + kthread_cancel_work_sync(&wd_data->work); + +- kref_put(&wd_data->kref, watchdog_core_data_release); ++ put_device(&wd_data->dev); + } + +-static struct class watchdog_class = { +- .name = "watchdog", +- .owner = THIS_MODULE, +- .dev_groups = wdt_groups, +-}; +- + static int watchdog_reboot_notifier(struct notifier_block *nb, + unsigned long code, void *data) + { +@@ -1071,27 +1078,14 @@ static int watchdog_reboot_notifier(struct notifier_block *nb, + + int watchdog_dev_register(struct watchdog_device *wdd) + { +- struct device *dev; +- dev_t devno; + int ret; + +- devno = MKDEV(MAJOR(watchdog_devt), wdd->id); +- +- ret = watchdog_cdev_register(wdd, devno); ++ ret = watchdog_cdev_register(wdd); + if (ret) + return ret; + +- dev = device_create_with_groups(&watchdog_class, wdd->parent, +- devno, wdd, wdd->groups, +- "watchdog%d", wdd->id); +- if (IS_ERR(dev)) { +- watchdog_cdev_unregister(wdd); +- return PTR_ERR(dev); +- } +- + ret = watchdog_register_pretimeout(wdd); + if (ret) { +- device_destroy(&watchdog_class, devno); + watchdog_cdev_unregister(wdd); + return ret; + } +@@ -1099,7 +1093,8 @@ int watchdog_dev_register(struct watchdog_device *wdd) + if (test_bit(WDOG_STOP_ON_REBOOT, &wdd->status)) { + wdd->reboot_nb.notifier_call = watchdog_reboot_notifier; + +- ret = devm_register_reboot_notifier(dev, &wdd->reboot_nb); ++ ret = devm_register_reboot_notifier(&wdd->wd_data->dev, ++ &wdd->reboot_nb); + if (ret) { + pr_err("watchdog%d: Cannot register reboot notifier (%d)\n", + wdd->id, ret); +@@ -1121,7 +1116,6 @@ int watchdog_dev_register(struct watchdog_device *wdd) + void watchdog_dev_unregister(struct watchdog_device *wdd) + { + watchdog_unregister_pretimeout(wdd); +- device_destroy(&watchdog_class, wdd->wd_data->cdev.dev); + watchdog_cdev_unregister(wdd); + } + +-- +2.20.1 +