From: Greg Kroah-Hartman Date: Sun, 20 Feb 2022 15:00:53 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.9.303~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2eba24a74a4166ab8323a1f649f8b79cf9a02d78;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: block-wbt-fix-negative-inflight-counter-when-remove-scsi-device.patch mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-status.patch mtd-rawnand-qcom-fix-clock-sequencing-in-qcom_nandc_probe.patch nfs-do-not-report-writeback-errors-in-nfs_getattr.patch nfs-lookup_directory-is-also-ok-with-symlinks.patch --- diff --git a/queue-5.4/block-wbt-fix-negative-inflight-counter-when-remove-scsi-device.patch b/queue-5.4/block-wbt-fix-negative-inflight-counter-when-remove-scsi-device.patch new file mode 100644 index 00000000000..f57849d2eb6 --- /dev/null +++ b/queue-5.4/block-wbt-fix-negative-inflight-counter-when-remove-scsi-device.patch @@ -0,0 +1,78 @@ +From e92bc4cd34de2ce454bdea8cd198b8067ee4e123 Mon Sep 17 00:00:00 2001 +From: Laibin Qiu +Date: Sat, 22 Jan 2022 19:10:45 +0800 +Subject: block/wbt: fix negative inflight counter when remove scsi device + +From: Laibin Qiu + +commit e92bc4cd34de2ce454bdea8cd198b8067ee4e123 upstream. + +Now that we disable wbt by set WBT_STATE_OFF_DEFAULT in +wbt_disable_default() when switch elevator to bfq. And when +we remove scsi device, wbt will be enabled by wbt_enable_default. +If it become false positive between wbt_wait() and wbt_track() +when submit write request. + +The following is the scenario that triggered the problem. + +T1 T2 T3 + elevator_switch_mq + bfq_init_queue + wbt_disable_default <= Set + rwb->enable_state (OFF) +Submit_bio +blk_mq_make_request +rq_qos_throttle +<= rwb->enable_state (OFF) + scsi_remove_device + sd_remove + del_gendisk + blk_unregister_queue + elv_unregister_queue + wbt_enable_default + <= Set rwb->enable_state (ON) +q_qos_track +<= rwb->enable_state (ON) +^^^^^^ this request will mark WBT_TRACKED without inflight add and will +lead to drop rqw->inflight to -1 in wbt_done() which will trigger IO hung. + +Fix this by move wbt_enable_default() from elv_unregister to +bfq_exit_queue(). Only re-enable wbt when bfq exit. + +Fixes: 76a8040817b4b ("blk-wbt: make sure throttle is enabled properly") + +Remove oneline stale comment, and kill one oneshot local variable. + +Signed-off-by: Ming Lei +Reviewed-by: Christoph Hellwig +Link: https://lore.kernel.org/linux-block/20211214133103.551813-1-qiulaibin@huawei.com/ +Signed-off-by: Laibin Qiu +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + block/bfq-iosched.c | 2 ++ + block/elevator.c | 2 -- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/block/bfq-iosched.c ++++ b/block/bfq-iosched.c +@@ -6389,6 +6389,8 @@ static void bfq_exit_queue(struct elevat + spin_unlock_irq(&bfqd->lock); + #endif + ++ wbt_enable_default(bfqd->queue); ++ + kfree(bfqd); + } + +--- a/block/elevator.c ++++ b/block/elevator.c +@@ -522,8 +522,6 @@ void elv_unregister_queue(struct request + kobject_del(&e->kobj); + + e->registered = 0; +- /* Re-enable throttling in case elevator disabled it */ +- wbt_enable_default(q); + } + } + diff --git a/queue-5.4/mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-status.patch b/queue-5.4/mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-status.patch new file mode 100644 index 00000000000..63872fe8791 --- /dev/null +++ b/queue-5.4/mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-status.patch @@ -0,0 +1,43 @@ +From 36415a7964711822e63695ea67fede63979054d9 Mon Sep 17 00:00:00 2001 +From: david regan +Date: Wed, 26 Jan 2022 23:43:44 +0100 +Subject: mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status + +From: david regan + +commit 36415a7964711822e63695ea67fede63979054d9 upstream. + +The brcmnand driver contains a bug in which if a page (example 2k byte) +is read from the parallel/ONFI NAND and within that page a subpage (512 +byte) has correctable errors which is followed by a subpage with +uncorrectable errors, the page read will return the wrong status of +correctable (as opposed to the actual status of uncorrectable.) + +The bug is in function brcmnand_read_by_pio where there is a check for +uncorrectable bits which will be preempted if a previous status for +correctable bits is detected. + +The fix is to stop checking for bad bits only if we already have a bad +bits status. + +Fixes: 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller") +Signed-off-by: david regan +Reviewed-by: Florian Fainelli +Signed-off-by: Miquel Raynal +Link: https://lore.kernel.org/linux-mtd/trinity-478e0c09-9134-40e8-8f8c-31c371225eda-1643237024774@3c-app-mailcom-lxa02 +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c ++++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c +@@ -1756,7 +1756,7 @@ static int brcmnand_read_by_pio(struct m + mtd->oobsize / trans, + host->hwcfg.sector_size_1k); + +- if (!ret) { ++ if (ret != -EBADMSG) { + *err_addr = brcmnand_get_uncorrecc_addr(ctrl); + + if (*err_addr) diff --git a/queue-5.4/mtd-rawnand-qcom-fix-clock-sequencing-in-qcom_nandc_probe.patch b/queue-5.4/mtd-rawnand-qcom-fix-clock-sequencing-in-qcom_nandc_probe.patch new file mode 100644 index 00000000000..1fa8d748df3 --- /dev/null +++ b/queue-5.4/mtd-rawnand-qcom-fix-clock-sequencing-in-qcom_nandc_probe.patch @@ -0,0 +1,91 @@ +From 5c23b3f965bc9ee696bf2ed4bdc54d339dd9a455 Mon Sep 17 00:00:00 2001 +From: Bryan O'Donoghue +Date: Mon, 3 Jan 2022 03:03:15 +0000 +Subject: mtd: rawnand: qcom: Fix clock sequencing in qcom_nandc_probe() + +From: Bryan O'Donoghue + +commit 5c23b3f965bc9ee696bf2ed4bdc54d339dd9a455 upstream. + +Interacting with a NAND chip on an IPQ6018 I found that the qcomsmem NAND +partition parser was returning -EPROBE_DEFER waiting for the main smem +driver to load. + +This caused the board to reset. Playing about with the probe() function +shows that the problem lies in the core clock being switched off before the +nandc_unalloc() routine has completed. + +If we look at how qcom_nandc_remove() tears down allocated resources we see +the expected order is + +qcom_nandc_unalloc(nandc); + +clk_disable_unprepare(nandc->aon_clk); +clk_disable_unprepare(nandc->core_clk); + +dma_unmap_resource(&pdev->dev, nandc->base_dma, resource_size(res), + DMA_BIDIRECTIONAL, 0); + +Tweaking probe() to both bring up and tear-down in that order removes the +reset if we end up deferring elsewhere. + +Fixes: c76b78d8ec05 ("mtd: nand: Qualcomm NAND controller driver") +Signed-off-by: Bryan O'Donoghue +Reviewed-by: Manivannan Sadhasivam +Signed-off-by: Miquel Raynal +Link: https://lore.kernel.org/linux-mtd/20220103030316.58301-2-bryan.odonoghue@linaro.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/nand/raw/qcom_nandc.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +--- a/drivers/mtd/nand/raw/qcom_nandc.c ++++ b/drivers/mtd/nand/raw/qcom_nandc.c +@@ -2,7 +2,6 @@ + /* + * Copyright (c) 2016, The Linux Foundation. All rights reserved. + */ +- + #include + #include + #include +@@ -2944,10 +2943,6 @@ static int qcom_nandc_probe(struct platf + if (!nandc->base_dma) + return -ENXIO; + +- ret = qcom_nandc_alloc(nandc); +- if (ret) +- goto err_nandc_alloc; +- + ret = clk_prepare_enable(nandc->core_clk); + if (ret) + goto err_core_clk; +@@ -2956,6 +2951,10 @@ static int qcom_nandc_probe(struct platf + if (ret) + goto err_aon_clk; + ++ ret = qcom_nandc_alloc(nandc); ++ if (ret) ++ goto err_nandc_alloc; ++ + ret = qcom_nandc_setup(nandc); + if (ret) + goto err_setup; +@@ -2967,15 +2966,14 @@ static int qcom_nandc_probe(struct platf + return 0; + + err_setup: ++ qcom_nandc_unalloc(nandc); ++err_nandc_alloc: + clk_disable_unprepare(nandc->aon_clk); + err_aon_clk: + clk_disable_unprepare(nandc->core_clk); + err_core_clk: +- qcom_nandc_unalloc(nandc); +-err_nandc_alloc: + dma_unmap_resource(dev, res->start, resource_size(res), + DMA_BIDIRECTIONAL, 0); +- + return ret; + } + diff --git a/queue-5.4/nfs-do-not-report-writeback-errors-in-nfs_getattr.patch b/queue-5.4/nfs-do-not-report-writeback-errors-in-nfs_getattr.patch new file mode 100644 index 00000000000..739366f35b5 --- /dev/null +++ b/queue-5.4/nfs-do-not-report-writeback-errors-in-nfs_getattr.patch @@ -0,0 +1,39 @@ +From d19e0183a88306acda07f4a01fedeeffe2a2a06b Mon Sep 17 00:00:00 2001 +From: Trond Myklebust +Date: Tue, 15 Feb 2022 18:05:18 -0500 +Subject: NFS: Do not report writeback errors in nfs_getattr() + +From: Trond Myklebust + +commit d19e0183a88306acda07f4a01fedeeffe2a2a06b upstream. + +The result of the writeback, whether it is an ENOSPC or an EIO, or +anything else, does not inhibit the NFS client from reporting the +correct file timestamps. + +Fixes: 79566ef018f5 ("NFS: Getattr doesn't require data sync semantics") +Signed-off-by: Trond Myklebust +Signed-off-by: Anna Schumaker +Signed-off-by: Greg Kroah-Hartman +--- + fs/nfs/inode.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +--- a/fs/nfs/inode.c ++++ b/fs/nfs/inode.c +@@ -791,12 +791,9 @@ int nfs_getattr(const struct path *path, + goto out_no_update; + + /* Flush out writes to the server in order to update c/mtime. */ +- if ((request_mask & (STATX_CTIME|STATX_MTIME)) && +- S_ISREG(inode->i_mode)) { +- err = filemap_write_and_wait(inode->i_mapping); +- if (err) +- goto out; +- } ++ if ((request_mask & (STATX_CTIME | STATX_MTIME)) && ++ S_ISREG(inode->i_mode)) ++ filemap_write_and_wait(inode->i_mapping); + + /* + * We may force a getattr if the user cares about atime. diff --git a/queue-5.4/nfs-lookup_directory-is-also-ok-with-symlinks.patch b/queue-5.4/nfs-lookup_directory-is-also-ok-with-symlinks.patch new file mode 100644 index 00000000000..d4b8c6b0d29 --- /dev/null +++ b/queue-5.4/nfs-lookup_directory-is-also-ok-with-symlinks.patch @@ -0,0 +1,43 @@ +From e0caaf75d443e02e55e146fd75fe2efc8aed5540 Mon Sep 17 00:00:00 2001 +From: Trond Myklebust +Date: Tue, 8 Feb 2022 13:38:23 -0500 +Subject: NFS: LOOKUP_DIRECTORY is also ok with symlinks + +From: Trond Myklebust + +commit e0caaf75d443e02e55e146fd75fe2efc8aed5540 upstream. + +Commit ac795161c936 (NFSv4: Handle case where the lookup of a directory +fails) [1], part of Linux since 5.17-rc2, introduced a regression, where +a symbolic link on an NFS mount to a directory on another NFS does not +resolve(?) the first time it is accessed: + +Reported-by: Paul Menzel +Fixes: ac795161c936 ("NFSv4: Handle case where the lookup of a directory fails") +Signed-off-by: Trond Myklebust +Tested-by: Donald Buczek +Signed-off-by: Anna Schumaker +Signed-off-by: Greg Kroah-Hartman +--- + fs/nfs/dir.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/fs/nfs/dir.c ++++ b/fs/nfs/dir.c +@@ -1641,14 +1641,14 @@ no_open: + if (!res) { + inode = d_inode(dentry); + if ((lookup_flags & LOOKUP_DIRECTORY) && inode && +- !S_ISDIR(inode->i_mode)) ++ !(S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))) + res = ERR_PTR(-ENOTDIR); + else if (inode && S_ISREG(inode->i_mode)) + res = ERR_PTR(-EOPENSTALE); + } else if (!IS_ERR(res)) { + inode = d_inode(res); + if ((lookup_flags & LOOKUP_DIRECTORY) && inode && +- !S_ISDIR(inode->i_mode)) { ++ !(S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))) { + dput(res); + res = ERR_PTR(-ENOTDIR); + } else if (inode && S_ISREG(inode->i_mode)) { diff --git a/queue-5.4/series b/queue-5.4/series index 72825d387c8..f2c91021d59 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -51,3 +51,8 @@ powerpc-lib-sstep-fix-ptesync-build-error.patch mtd-rawnand-gpmi-don-t-leak-pm-reference-in-error-path.patch tee-export-teedev_open-and-teedev_close_context.patch optee-use-driver-internal-tee_context-for-some-rpc.patch +block-wbt-fix-negative-inflight-counter-when-remove-scsi-device.patch +nfs-lookup_directory-is-also-ok-with-symlinks.patch +nfs-do-not-report-writeback-errors-in-nfs_getattr.patch +mtd-rawnand-qcom-fix-clock-sequencing-in-qcom_nandc_probe.patch +mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-status.patch