From: Greg Kroah-Hartman Date: Mon, 20 Dec 2021 12:45:08 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v4.4.296~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ab9d6c5dd1628b831393b849253e36b6482f080;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: bus-ti-sysc-fix-variable-set-but-not-used-warning-for-reinit_modules.patch selftests-damon-test-debugfs-file-reads-writes-with-huge-count.patch --- diff --git a/queue-5.15/bus-ti-sysc-fix-variable-set-but-not-used-warning-for-reinit_modules.patch b/queue-5.15/bus-ti-sysc-fix-variable-set-but-not-used-warning-for-reinit_modules.patch new file mode 100644 index 00000000000..179859ebac6 --- /dev/null +++ b/queue-5.15/bus-ti-sysc-fix-variable-set-but-not-used-warning-for-reinit_modules.patch @@ -0,0 +1,36 @@ +From 1b1da99b845337362a3dafe0f7b49927ab4ae041 Mon Sep 17 00:00:00 2001 +From: Tony Lindgren +Date: Wed, 6 Oct 2021 08:38:09 +0300 +Subject: bus: ti-sysc: Fix variable set but not used warning for reinit_modules + +From: Tony Lindgren + +commit 1b1da99b845337362a3dafe0f7b49927ab4ae041 upstream. + +Fix drivers/bus/ti-sysc.c:2494:13: error: variable 'error' set but not +used introduced by commit 9d881361206e ("bus: ti-sysc: Add quirk handling +for reinit on context lost"). + +Reported-by: kernel test robot +Signed-off-by: Tony Lindgren +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bus/ti-sysc.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/bus/ti-sysc.c ++++ b/drivers/bus/ti-sysc.c +@@ -2456,12 +2456,11 @@ static void sysc_reinit_modules(struct s + struct sysc_module *module; + struct list_head *pos; + struct sysc *ddata; +- int error = 0; + + list_for_each(pos, &sysc_soc->restored_modules) { + module = list_entry(pos, struct sysc_module, node); + ddata = module->ddata; +- error = sysc_reinit_module(ddata, ddata->enabled); ++ sysc_reinit_module(ddata, ddata->enabled); + } + } + diff --git a/queue-5.15/selftests-damon-test-debugfs-file-reads-writes-with-huge-count.patch b/queue-5.15/selftests-damon-test-debugfs-file-reads-writes-with-huge-count.patch new file mode 100644 index 00000000000..c46a74c5788 --- /dev/null +++ b/queue-5.15/selftests-damon-test-debugfs-file-reads-writes-with-huge-count.patch @@ -0,0 +1,114 @@ +From b4a002889d24979295ed3c2bf1d5fcfb3901026a Mon Sep 17 00:00:00 2001 +From: SeongJae Park +Date: Fri, 10 Dec 2021 14:46:55 -0800 +Subject: selftests/damon: test debugfs file reads/writes with huge count + +From: SeongJae Park + +commit b4a002889d24979295ed3c2bf1d5fcfb3901026a upstream. + +DAMON debugfs interface users were able to trigger warning by writing +some files with arbitrarily large 'count' parameter. The issue is fixed +with commit db7a347b26fe ("mm/damon/dbgfs: use '__GFP_NOWARN' for +user-specified size buffer allocation"). This commit adds a test case +for the issue in DAMON selftests to avoid future regressions. + +Link: https://lkml.kernel.org/r/20211201150440.1088-11-sj@kernel.org +Signed-off-by: SeongJae Park +Cc: Brendan Higgins +Cc: Shuah Khan +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/damon/.gitignore | 2 + tools/testing/selftests/damon/Makefile | 2 + tools/testing/selftests/damon/debugfs_attrs.sh | 18 ++++++++ + tools/testing/selftests/damon/huge_count_read_write.c | 39 ++++++++++++++++++ + 4 files changed, 61 insertions(+) + create mode 100644 tools/testing/selftests/damon/.gitignore + create mode 100644 tools/testing/selftests/damon/huge_count_read_write.c + +--- /dev/null ++++ b/tools/testing/selftests/damon/.gitignore +@@ -0,0 +1,2 @@ ++# SPDX-License-Identifier: GPL-2.0-only ++huge_count_read_write +--- a/tools/testing/selftests/damon/Makefile ++++ b/tools/testing/selftests/damon/Makefile +@@ -1,6 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 + # Makefile for damon selftests + ++TEST_GEN_FILES += huge_count_read_write ++ + TEST_FILES = _chk_dependency.sh + TEST_PROGS = debugfs_attrs.sh + +--- a/tools/testing/selftests/damon/debugfs_attrs.sh ++++ b/tools/testing/selftests/damon/debugfs_attrs.sh +@@ -72,4 +72,22 @@ test_write_succ "$file" "" "$orig_conten + test_content "$file" "$orig_content" "" "empty input written" + echo "$orig_content" > "$file" + ++# Test huge count read write ++# ========================== ++ ++dmesg -C ++ ++for file in "$DBGFS/"* ++do ++ ./huge_count_read_write "$file" ++done ++ ++if dmesg | grep -q WARNING ++then ++ dmesg ++ exit 1 ++else ++ exit 0 ++fi ++ + echo "PASS" +--- /dev/null ++++ b/tools/testing/selftests/damon/huge_count_read_write.c +@@ -0,0 +1,39 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Author: SeongJae Park ++ */ ++ ++#include ++#include ++#include ++#include ++ ++void write_read_with_huge_count(char *file) ++{ ++ int filedesc = open(file, O_RDWR); ++ char buf[25]; ++ int ret; ++ ++ printf("%s %s\n", __func__, file); ++ if (filedesc < 0) { ++ fprintf(stderr, "failed opening %s\n", file); ++ exit(1); ++ } ++ ++ write(filedesc, "", 0xfffffffful); ++ perror("after write: "); ++ ret = read(filedesc, buf, 0xfffffffful); ++ perror("after read: "); ++ close(filedesc); ++} ++ ++int main(int argc, char *argv[]) ++{ ++ if (argc != 2) { ++ fprintf(stderr, "Usage: %s \n", argv[0]); ++ exit(1); ++ } ++ write_read_with_huge_count(argv[1]); ++ ++ return 0; ++} diff --git a/queue-5.15/series b/queue-5.15/series index 0fc1458d88b..33b6806c177 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -167,3 +167,5 @@ io-wq-remove-spurious-bit-clear-on-task_work-addition.patch io-wq-check-for-wq-exit-after-adding-new-worker-task_work.patch rcu-mark-accesses-to-rcu_state.n_force_qs.patch io-wq-drop-wqe-lock-before-creating-new-worker.patch +bus-ti-sysc-fix-variable-set-but-not-used-warning-for-reinit_modules.patch +selftests-damon-test-debugfs-file-reads-writes-with-huge-count.patch