History

Merge tag 'linux-kselftest-fixes-5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest fixes from Shuah Khan: "Compile time fixes and run-time resources leaks: - Fix clang cross compilation - Fix resource leak when return error - fix compile error for dma_map_benchmark - Fix regression - make use of GUP_TEST_FILE macro" * tag 'linux-kselftest-fixes-5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests: make use of GUP_TEST_FILE macro selftests: vm: Fix resource leak when return error selftests dma: fix compile error for dma_map_benchmark selftests: Fix clang cross compilation

Linus Torvalds committed 4 years ago

Commit de5c2082 parents 3abc3ae 9b4d5c05 files · +29 −5Browse files

Unified · Split

5 files
  1. tools/testing/selftests/dma/Makefile +1 −0
  2. tools/testing/selftests/dma/dma_map_benchmark.c +1 −1
  3. tools/testing/selftests/lib.mk +23 −2
  4. tools/testing/selftests/vm/gup_test.c +2 −2
  5. tools/testing/selftests/vm/ksm_tests.c +2 −0
tools/testing/selftests/dma/Makefile+1−0
@@ -1,5 +1,6 @@
1# SPDX-License-Identifier: GPL-2.01# SPDX-License-Identifier: GPL-2.0
2CFLAGS += -I../../../../usr/include/2CFLAGS += -I../../../../usr/include/
3CFLAGS += -I../../../../include/
3 4
4TEST_GEN_PROGS := dma_map_benchmark5TEST_GEN_PROGS := dma_map_benchmark
5 6
tools/testing/selftests/dma/dma_map_benchmark.c+1−1
@@ -10,8 +10,8 @@ · 9 unmodified lines
10#include <unistd.h>10#include <unistd.h>
11#include <sys/ioctl.h>11#include <sys/ioctl.h>
12#include <sys/mman.h>12#include <sys/mman.h>
13#include <linux/map_benchmark.h>
14#include <linux/types.h>13#include <linux/types.h>
14#include <linux/map_benchmark.h>
15 15
16#define NSEC_PER_MSEC 1000000L16#define NSEC_PER_MSEC 1000000L
17 17
tools/testing/selftests/lib.mk+23−2
@@ -7,10 +7,31 @@ else ifneq ($(filter -%,$(LLVM)),) · 6 unmodified lines
7LLVM_SUFFIX := $(LLVM)7LLVM_SUFFIX := $(LLVM)
8endif8endif
9 9
10CC := $(LLVM_PREFIX)clang$(LLVM_SUFFIX)10CLANG_TARGET_FLAGS_arm := arm-linux-gnueabi
11CLANG_TARGET_FLAGS_arm64 := aarch64-linux-gnu
12CLANG_TARGET_FLAGS_hexagon := hexagon-linux-musl
13CLANG_TARGET_FLAGS_m68k := m68k-linux-gnu
14CLANG_TARGET_FLAGS_mips := mipsel-linux-gnu
15CLANG_TARGET_FLAGS_powerpc := powerpc64le-linux-gnu
16CLANG_TARGET_FLAGS_riscv := riscv64-linux-gnu
17CLANG_TARGET_FLAGS_s390 := s390x-linux-gnu
18CLANG_TARGET_FLAGS_x86 := x86_64-linux-gnu
19CLANG_TARGET_FLAGS := $(CLANG_TARGET_FLAGS_$(ARCH))
20
21ifeq ($(CROSS_COMPILE),)
22ifeq ($(CLANG_TARGET_FLAGS),)
23$(error Specify CROSS_COMPILE or add '--target=' option to lib.mk
24else
25CLANG_FLAGS += --target=$(CLANG_TARGET_FLAGS)
26endif # CLANG_TARGET_FLAGS
27else
28CLANG_FLAGS += --target=$(notdir $(CROSS_COMPILE:%-=%))
29endif # CROSS_COMPILE
30
31CC := $(LLVM_PREFIX)clang$(LLVM_SUFFIX) $(CLANG_FLAGS) -fintegrated-as
11else32else
12CC := $(CROSS_COMPILE)gcc33CC := $(CROSS_COMPILE)gcc
13endif34endif # LLVM
14 35
15ifeq (0,$(MAKELEVEL))36ifeq (0,$(MAKELEVEL))
16 ifeq ($(OUTPUT),)37 ifeq ($(OUTPUT),)
tools/testing/selftests/vm/gup_test.c+2−2
@@ -209,7 +209,7 @@ int main(int argc, char **argv) · 208 unmodified lines
209 if (write)209 if (write)
210 gup.gup_flags |= FOLL_WRITE;210 gup.gup_flags |= FOLL_WRITE;
211 211
212 gup_fd = open("/sys/kernel/debug/gup_test", O_RDWR);212 gup_fd = open(GUP_TEST_FILE, O_RDWR);
213 if (gup_fd == -1) {213 if (gup_fd == -1) {
214 switch (errno) {214 switch (errno) {
215 case EACCES:215 case EACCES:
@@ -224,7 +224,7 @@ int main(int argc, char **argv) · 8 unmodified lines
224 printf("check if CONFIG_GUP_TEST is enabled in kernel config\n");224 printf("check if CONFIG_GUP_TEST is enabled in kernel config\n");
225 break;225 break;
226 default:226 default:
227 perror("failed to open /sys/kernel/debug/gup_test");227 perror("failed to open " GUP_TEST_FILE);
228 break;228 break;
229 }229 }
230 exit(KSFT_SKIP);230 exit(KSFT_SKIP);
tools/testing/selftests/vm/ksm_tests.c+2−0
@@ -54,6 +54,7 @@ static int ksm_write_sysfs(const char *file_path, unsigned long val) · 53 unmodified lines
54 }54 }
55 if (fprintf(f, "%lu", val) < 0) {55 if (fprintf(f, "%lu", val) < 0) {
56 perror("fprintf");56 perror("fprintf");
57 fclose(f);
57 return 1;58 return 1;
58 }59 }
59 fclose(f);60 fclose(f);
@@ -72,6 +73,7 @@ static int ksm_read_sysfs(const char *file_path, unsigned long *val) · 12 unmodified lines
72 }73 }
73 if (fscanf(f, "%lu", val) != 1) {74 if (fscanf(f, "%lu", val) != 1) {
74 perror("fscanf");75 perror("fscanf");
76 fclose(f);
75 return 1;77 return 1;
76 }78 }
77 fclose(f);79 fclose(f);