diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-31 11:04:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-31 11:04:39 +0100 |
| commit | 4ca24c3b9f9a828d7c951844ceec88e8699550ad (patch) | |
| tree | 8e5e934452d19558913c147166d0379ee718d61f /0003-selftests-add-readfile-2-selftests.patch | |
| parent | 5a4549f7ebf22787b2a76908ba90598e453d4a15 (diff) | |
| download | patches-4ca24c3b9f9a828d7c951844ceec88e8699550ad.tar.gz | |
update patches based on 5.11-rc1
Diffstat (limited to '0003-selftests-add-readfile-2-selftests.patch')
| -rw-r--r-- | 0003-selftests-add-readfile-2-selftests.patch | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/0003-selftests-add-readfile-2-selftests.patch b/0003-selftests-add-readfile-2-selftests.patch index ae8e89b2a020a3..0c6d99157d82c6 100644 --- a/0003-selftests-add-readfile-2-selftests.patch +++ b/0003-selftests-add-readfile-2-selftests.patch @@ -1,4 +1,4 @@ -From 3e95be22367650a45fcbfd8c8da95e8a6db7a8f7 Mon Sep 17 00:00:00 2001 +From 0a72e28bbec2bca34b98823313a03145c4ed507c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Sun, 8 Mar 2020 09:54:45 +0100 Subject: [PATCH 3/4] selftests: add readfile(2) selftests @@ -10,41 +10,33 @@ instead of using open()/read()/close(). Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- - tools/testing/selftests/Makefile | 1 + - tools/testing/selftests/readfile/.gitignore | 3 + - tools/testing/selftests/readfile/Makefile | 7 + - tools/testing/selftests/readfile/readfile.c | 285 +++++++++++++++++ - .../selftests/readfile/readfile_speed.c | 301 ++++++++++++++++++ + tools/testing/selftests/Makefile | 1 + tools/testing/selftests/readfile/.gitignore | 3 + tools/testing/selftests/readfile/Makefile | 7 + tools/testing/selftests/readfile/readfile.c | 285 ++++++++++++++++++++ + tools/testing/selftests/readfile/readfile_speed.c | 301 ++++++++++++++++++++++ 5 files changed, 597 insertions(+) create mode 100644 tools/testing/selftests/readfile/.gitignore create mode 100644 tools/testing/selftests/readfile/Makefile create mode 100644 tools/testing/selftests/readfile/readfile.c create mode 100644 tools/testing/selftests/readfile/readfile_speed.c -diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile -index d9c283503159..0788bf87408f 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile -@@ -49,6 +49,7 @@ TARGETS += ptrace +@@ -48,6 +48,7 @@ TARGETS += ptrace TARGETS += openat2 TARGETS += rseq TARGETS += rtc +TARGETS += readfile TARGETS += seccomp + TARGETS += sgx TARGETS += sigaltstack - TARGETS += size -diff --git a/tools/testing/selftests/readfile/.gitignore b/tools/testing/selftests/readfile/.gitignore -new file mode 100644 -index 000000000000..f0e758d437e4 --- /dev/null +++ b/tools/testing/selftests/readfile/.gitignore @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +readfile +readfile_speed -diff --git a/tools/testing/selftests/readfile/Makefile b/tools/testing/selftests/readfile/Makefile -new file mode 100644 -index 000000000000..1bf1bdec40f8 --- /dev/null +++ b/tools/testing/selftests/readfile/Makefile @@ -0,0 +1,7 @@ @@ -55,9 +47,6 @@ index 000000000000..1bf1bdec40f8 +TEST_GEN_PROGS := readfile readfile_speed + +include ../lib.mk -diff --git a/tools/testing/selftests/readfile/readfile.c b/tools/testing/selftests/readfile/readfile.c -new file mode 100644 -index 000000000000..ddaf57896b2f --- /dev/null +++ b/tools/testing/selftests/readfile/readfile.c @@ -0,0 +1,285 @@ @@ -85,7 +74,7 @@ index 000000000000..ddaf57896b2f +//#define __NR_readfile -1 +//#endif + -+#define __NR_readfile 441 ++#define __NR_readfile 442 + +#define TEST_FILE1 "/sys/devices/system/cpu/vulnerabilities/meltdown" +#define TEST_FILE2 "/sys/devices/system/cpu/vulnerabilities/spectre_v1" @@ -346,9 +335,6 @@ index 000000000000..ddaf57896b2f + return ksft_exit_pass(); +} + -diff --git a/tools/testing/selftests/readfile/readfile_speed.c b/tools/testing/selftests/readfile/readfile_speed.c -new file mode 100644 -index 000000000000..a9c6badf67a2 --- /dev/null +++ b/tools/testing/selftests/readfile/readfile_speed.c @@ -0,0 +1,301 @@ @@ -397,7 +383,7 @@ index 000000000000..a9c6badf67a2 +//#ifndef __NR_readfile +//#define __NR_readfile -1 +//#endif -+#define __NR_readfile 441 ++#define __NR_readfile 440 + +static int sys_readfile(int fd, const char *filename, unsigned char *buffer, + size_t bufsize, int flags) @@ -653,6 +639,3 @@ index 000000000000..a9c6badf67a2 + + return do_read_file_test(loops, test_type, filename); +} --- -2.29.2 - |