Skip to contentSkip to conversation

selftests: vdso: Add a selftest for vDSO getcpu()

PATCH Superseded Mark Brown 2 participants 13 messages May 5, 2020 – May 22, 2020

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

cover selftests: vdso: Add a selftest for vDSO getcpu()

This series does a bit of a cleanup of the existing tests for the vDSO in kselftest and then adds a new test for getcpu().

Mark Brown (3):
selftests: vdso: Rename vdso_test to vdso_test_gettimeofday
selftests: vdso: Use a header file to prototype parse_vdso API
selftests: vdso: Add a selftest for vDSO getcpu()

 tools/testing/selftests/vDSO/.gitignore       |  2 +
 tools/testing/selftests/vDSO/Makefile         |  5 +-
 tools/testing/selftests/vDSO/parse_vdso.c     | 24 +--------
 tools/testing/selftests/vDSO/parse_vdso.h     | 31 ++++++++++++
 .../selftests/vDSO/vdso_standalone_test_x86.c |  4 +-
 .../testing/selftests/vDSO/vdso_test_getcpu.c | 50 +++++++++++++++++++
 .../{vdso_test.c => vdso_test_gettimeofday.c} | 10 ++--
 7 files changed, 92 insertions(+), 34 deletions(-)
 create mode 100644 tools/testing/selftests/vDSO/parse_vdso.h
 create mode 100644 tools/testing/selftests/vDSO/vdso_test_getcpu.c
 rename tools/testing/selftests/vDSO/{vdso_test.c => vdso_test_gettimeofday.c} (84%)
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH 1/3 selftests: vdso: Rename vdso_test to vdso_test_gettimeofday

Currently the vDSO kselftests have a test called vdso_test which tests the vDSO implementation of gettimeofday(). In preparation for adding tests for other vDSO functionality rename this test to reflect what's going on.

---
 tools/testing/selftests/vDSO/.gitignore                      | 1 +
 tools/testing/selftests/vDSO/Makefile                        | 4 ++--
 .../selftests/vDSO/{vdso_test.c => vdso_test_gettimeofday.c} | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename tools/testing/selftests/vDSO/{vdso_test.c => vdso_test_gettimeofday.c} (89%)
tools/testing/selftests/vDSO/.gitignore +1 -0
index 382cfb39a1a3..74f49bd5f6dd 100644
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
 vdso_test
+vdso_test_gettimeofday
 vdso_standalone_test_x86
tools/testing/selftests/vDSO/Makefile +2 -2
index 9e03d61f52fd..ae15d700b62e 100644
@@ -4,7 +4,7 @@ include ../lib.mk
 uname_M := $(shell uname -m 2>/dev/null || echo not)
 ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
 
-TEST_GEN_PROGS := $(OUTPUT)/vdso_test
+TEST_GEN_PROGS := $(OUTPUT)/vdso_test_gettimeofday
 ifeq ($(ARCH),x86)
 TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86
 endif
@@ -17,7 +17,7 @@ LDLIBS += -lgcc_s
 endif
 
 all: $(TEST_GEN_PROGS)
-$(OUTPUT)/vdso_test: parse_vdso.c vdso_test.c
+$(OUTPUT)/vdso_test_gettimeofday: parse_vdso.c vdso_test_gettimeofday.c
 $(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c
 	$(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \
 		vdso_standalone_test_x86.c parse_vdso.c \
tools/testing/selftests/vDSO/vdso_test_gettimeofday.c renamed from tools/testing/selftests/vDSO/vdso_test.c +3 -2
similarity index 89%
rename from tools/testing/selftests/vDSO/vdso_test.c
rename to tools/testing/selftests/vDSO/vdso_test_gettimeofday.c
index 719d5a6bd664..511c0dc5e47e 100644
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * vdso_test.c: Sample code to test parse_vdso.c
+ * vdso_test_gettimeofday.c: Sample code to test parse_vdso.c and
+ *                           vDSO gettimeofday()
  * Copyright (c) 2014 Andy Lutomirski
  *
  * Compile with:
- * gcc -std=gnu99 vdso_test.c parse_vdso.c
+ * gcc -std=gnu99 vdso_test_gettimeofday.c parse_vdso_gettimeofday.c
  *
  * Tested on x86, 32-bit and 64-bit.  It may work on other architectures, too.
  */
Signature · 1 line
2.20.1
author
#2 lore raw

PATCH 2/3 selftests: vdso: Use a header file to prototype parse_vdso API

In reply to Mark Brown

Both vdso_test_gettimeofday and vdso_standalone_test_x86 use the library in parse_vdso.c but each separately declares the API it offers which is not ideal. Create a header file with prototypes of the functions and use it in both the library and the tests to ensure that the same prototypes are used throughout.

---
 tools/testing/selftests/vDSO/parse_vdso.c     | 24 +-------------
 tools/testing/selftests/vDSO/parse_vdso.h     | 31 +++++++++++++++++++
 .../selftests/vDSO/vdso_standalone_test_x86.c |  4 +--
 .../selftests/vDSO/vdso_test_gettimeofday.c   |  5 +--
 4 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 tools/testing/selftests/vDSO/parse_vdso.h
tools/testing/selftests/vDSO/parse_vdso.c +1 -23
index 1dbb4b87268f..413f75620a35 100644
@@ -21,29 +21,7 @@
 #include <limits.h>
 #include <elf.h>
 
-/*
- * To use this vDSO parser, first call one of the vdso_init_* functions.
- * If you've already parsed auxv, then pass the value of AT_SYSINFO_EHDR
- * to vdso_init_from_sysinfo_ehdr.  Otherwise pass auxv to vdso_init_from_auxv.
- * Then call vdso_sym for each symbol you want.  For example, to look up
- * gettimeofday on x86_64, use:
- *
- *     <some pointer> = vdso_sym("LINUX_2.6", "gettimeofday");
- * or
- *     <some pointer> = vdso_sym("LINUX_2.6", "__vdso_gettimeofday");
- *
- * vdso_sym will return 0 if the symbol doesn't exist or if the init function
- * failed or was not called.  vdso_sym is a little slow, so its return value
- * should be cached.
- *
- * vdso_sym is threadsafe; the init functions are not.
- *
- * These are the prototypes:
- */
-extern void vdso_init_from_auxv(void *auxv);
-extern void vdso_init_from_sysinfo_ehdr(uintptr_t base);
-extern void *vdso_sym(const char *version, const char *name);
-
+#include "parse_vdso.h"
 
 /* And here's the code. */
 #ifndef ELF_BITS
tools/testing/selftests/vDSO/parse_vdso.h new file +31 -0
new file mode 100644
index 000000000000..ea4b8635bb0b
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef PARSE_VDSO_H
+#define PARSE_VDSO_H
+
+#include <stdint.h>
+
+/*
+ * To use this vDSO parser, first call one of the vdso_init_* functions.
+ * If you've already parsed auxv, then pass the value of AT_SYSINFO_EHDR
+ * to vdso_init_from_sysinfo_ehdr.  Otherwise pass auxv to vdso_init_from_auxv.
+ * Then call vdso_sym for each symbol you want.  For example, to look up
+ * gettimeofday on x86_64, use:
+ *
+ *     <some pointer> = vdso_sym("LINUX_2.6", "gettimeofday");
+ * or
+ *     <some pointer> = vdso_sym("LINUX_2.6", "__vdso_gettimeofday");
+ *
+ * vdso_sym will return 0 if the symbol doesn't exist or if the init function
+ * failed or was not called.  vdso_sym is a little slow, so its return value
+ * should be cached.
+ *
+ * vdso_sym is threadsafe; the init functions are not.
+ *
+ * These are the prototypes:
+ */
+extern void *vdso_sym(const char *version, const char *name);
+extern void vdso_init_from_sysinfo_ehdr(uintptr_t base);
+extern void vdso_init_from_auxv(void *auxv);
+
+#endif
tools/testing/selftests/vDSO/vdso_standalone_test_x86.c +1 -3
index 5ac4b00acfbc..8a44ff973ee1 100644
@@ -16,9 +16,7 @@
 #include <unistd.h>
 #include <stdint.h>
 
-extern void *vdso_sym(const char *version, const char *name);
-extern void vdso_init_from_sysinfo_ehdr(uintptr_t base);
-extern void vdso_init_from_auxv(void *auxv);
+#include "parse_vdso.h"
 
 /* We need a libc functions... */
 int strcmp(const char *a, const char *b)
tools/testing/selftests/vDSO/vdso_test_gettimeofday.c +1 -4
index 511c0dc5e47e..8ccc73ed8240 100644
@@ -17,10 +17,7 @@
 #include <sys/time.h>
 
 #include "../kselftest.h"
-
-extern void *vdso_sym(const char *version, const char *name);
-extern void vdso_init_from_sysinfo_ehdr(uintptr_t base);
-extern void vdso_init_from_auxv(void *auxv);
+#include "parse_vdso.h"
 
 /*
  * ARM64's vDSO exports its gettimeofday() implementation with a different
Signature · 1 line
2.20.1
maintainer
#3 lore raw

Re: [PATCH 2/3] selftests: vdso: Use a header file to prototype parse_vdso API

Quoted 76 lines · Mark Brown

Both vdso_test_gettimeofday and vdso_standalone_test_x86 use the library in parse_vdso.c but each separately declares the API it offers which is not ideal. Create a header file with prototypes of the functions and use it in both the library and the tests to ensure that the same prototypes are used throughout.

---
  tools/testing/selftests/vDSO/parse_vdso.c     | 24 +-------------
  tools/testing/selftests/vDSO/parse_vdso.h     | 31 +++++++++++++++++++
  .../selftests/vDSO/vdso_standalone_test_x86.c |  4 +--
  .../selftests/vDSO/vdso_test_gettimeofday.c   |  5 +--
  4 files changed, 34 insertions(+), 30 deletions(-)

create mode 100644 tools/testing/selftests/vDSO/parse_vdso.h

tools/testing/selftests/vDSO/parse_vdso.c +1 -23
index 1dbb4b87268f..413f75620a35 100644
@@ -21,29 +21,7 @@
  #include <limits.h>
  #include <elf.h>
 
-/*
- * To use this vDSO parser, first call one of the vdso_init_* functions.
- * If you've already parsed auxv, then pass the value of AT_SYSINFO_EHDR
- * to vdso_init_from_sysinfo_ehdr.  Otherwise pass auxv to vdso_init_from_auxv.
- * Then call vdso_sym for each symbol you want.  For example, to look up
- * gettimeofday on x86_64, use:
- *
- *     <some pointer> = vdso_sym("LINUX_2.6", "gettimeofday");
- * or
- *     <some pointer> = vdso_sym("LINUX_2.6", "__vdso_gettimeofday");
- *
- * vdso_sym will return 0 if the symbol doesn't exist or if the init function
- * failed or was not called.  vdso_sym is a little slow, so its return value
- * should be cached.
- *
- * vdso_sym is threadsafe; the init functions are not.
- *
- * These are the prototypes:
- */
-extern void vdso_init_from_auxv(void *auxv);
-extern void vdso_init_from_sysinfo_ehdr(uintptr_t base);
-extern void *vdso_sym(const char *version, const char *name);
-
+#include "parse_vdso.h"
 
  /* And here's the code. */
  #ifndef ELF_BITS
tools/testing/selftests/vDSO/parse_vdso.h new file +20 -0
new file mode 100644
index 000000000000..ea4b8635bb0b
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef PARSE_VDSO_H
+#define PARSE_VDSO_H
+
+#include <stdint.h>
+
+/*
+ * To use this vDSO parser, first call one of the vdso_init_* functions.
+ * If you've already parsed auxv, then pass the value of AT_SYSINFO_EHDR
+ * to vdso_init_from_sysinfo_ehdr.  Otherwise pass auxv to vdso_init_from_auxv.
+ * Then call vdso_sym for each symbol you want.  For example, to look up
+ * gettimeofday on x86_64, use:
+ *
+ *     <some pointer> = vdso_sym("LINUX_2.6", "gettimeofday");
+ * or
+ *     <some pointer> = vdso_sym("LINUX_2.6", "__vdso_gettimeofday");
+ *
+ * vdso_sym will return 0 if the symbol doesn't exist or if the init function
+ * failed or was not called.  vdso_sym is a little slow, so its return value

tools/testing/selftests/vDSO/parse_vdso.h line 30

Quoted 10 lines
tools/testing/selftests/vDSO/parse_vdso.h new file +10 -0
+ * should be cached.
+ *
+ * vdso_sym is threadsafe; the init functions are not.
+ *
+ * These are the prototypes:
+ */
+extern void *vdso_sym(const char *version, const char *name);
+extern void vdso_init_from_sysinfo_ehdr(uintptr_t base);
+extern void vdso_init_from_auxv(void *auxv);
+

You don't need extern here - this should be in scope?

tools/testing/selftests/vDSO/vdso_standalone_test_x86.c line 21

Quoted 12 lines
tools/testing/selftests/vDSO/parse_vdso.h new file +1 -0
+#endif
tools/testing/selftests/vDSO/vdso_standalone_test_x86.c +0 -3
index 5ac4b00acfbc..8a44ff973ee1 100644
@@ -16,9 +16,7 @@
  #include <unistd.h>
  #include <stdint.h>
 
-extern void *vdso_sym(const char *version, const char *name);
-extern void vdso_init_from_sysinfo_ehdr(uintptr_t base);
-extern void vdso_init_from_auxv(void *auxv);

thanks,
-- Shuah

author
#4 lore raw

Re: [PATCH 2/3] selftests: vdso: Use a header file to prototype parse_vdso API

Quoted 8 lines · shuah
Quoted 5 lines · Mark Brown

- * These are the prototypes:
- */

tools/testing/selftests/vDSO/parse_vdso.c +0 -3
-extern void vdso_init_from_auxv(void *auxv);
-extern void vdso_init_from_sysinfo_ehdr(uintptr_t base);
-extern void *vdso_sym(const char *version, const char *name);
Quoted 7 lines

tools/testing/selftests/vDSO/parse_vdso.h line 29

Quoted 5 lines

+ * These are the prototypes:
+ */

tools/testing/selftests/vDSO/parse_vdso.h new file +3 -0
+extern void *vdso_sym(const char *version, const char *name);
+extern void vdso_init_from_sysinfo_ehdr(uintptr_t base);
+extern void vdso_init_from_auxv(void *auxv);

You don't need extern here - this should be in scope?

This is just code motion of existing code which has the externs. There's no cases where you *need* the extern, it's just syntactic sugar.

author
#5 lore raw

PATCH 3/3 selftests: vdso: Add a selftest for vDSO getcpu()

In reply to Mark Brown

Provide a very basic selftest for getcpu() which similarly to our existing test for gettimeofday() looks up the function in the vDSO and prints the results it gets if the function exists and succeeds.

---
 tools/testing/selftests/vDSO/.gitignore       |  1 +
 tools/testing/selftests/vDSO/Makefile         |  3 +-
 .../testing/selftests/vDSO/vdso_test_getcpu.c | 50 +++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 tools/testing/selftests/vDSO/vdso_test_getcpu.c
tools/testing/selftests/vDSO/.gitignore +1 -0
index 74f49bd5f6dd..5eb64d41e541 100644
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 vdso_test
 vdso_test_gettimeofday
+vdso_test_getcpu
 vdso_standalone_test_x86
tools/testing/selftests/vDSO/Makefile +2 -1
index ae15d700b62e..0069f2f83f86 100644
@@ -4,7 +4,7 @@ include ../lib.mk
 uname_M := $(shell uname -m 2>/dev/null || echo not)
 ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
 
-TEST_GEN_PROGS := $(OUTPUT)/vdso_test_gettimeofday
+TEST_GEN_PROGS := $(OUTPUT)/vdso_test_gettimeofday $(OUTPUT)/vdso_test_getcpu
 ifeq ($(ARCH),x86)
 TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86
 endif
@@ -18,6 +18,7 @@ endif
 
 all: $(TEST_GEN_PROGS)
 $(OUTPUT)/vdso_test_gettimeofday: parse_vdso.c vdso_test_gettimeofday.c
+$(OUTPUT)/vdso_test_getcpu: parse_vdso.c vdso_test_getcpu.c
 $(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c
 	$(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \
 		vdso_standalone_test_x86.c parse_vdso.c \
tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +50 -0

50 lines not on this page · raw message

Signature · 1 line
2.20.1
maintainer
#6 lore raw

Hi Mark,

Quoted 65 lines · Mark Brown

Provide a very basic selftest for getcpu() which similarly to our existing test for gettimeofday() looks up the function in the vDSO and prints the results it gets if the function exists and succeeds.

---
  tools/testing/selftests/vDSO/.gitignore       |  1 +
  tools/testing/selftests/vDSO/Makefile         |  3 +-
  .../testing/selftests/vDSO/vdso_test_getcpu.c | 50 +++++++++++++++++++
  3 files changed, 53 insertions(+), 1 deletion(-)

create mode 100644 tools/testing/selftests/vDSO/vdso_test_getcpu.c

tools/testing/selftests/vDSO/.gitignore +1 -0
index 74f49bd5f6dd..5eb64d41e541 100644
@@ -1,4 +1,5 @@
  # SPDX-License-Identifier: GPL-2.0-only
  vdso_test
  vdso_test_gettimeofday
+vdso_test_getcpu
  vdso_standalone_test_x86
tools/testing/selftests/vDSO/Makefile +2 -1
index ae15d700b62e..0069f2f83f86 100644
@@ -4,7 +4,7 @@ include ../lib.mk
  uname_M := $(shell uname -m 2>/dev/null || echo not)
  ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
 
-TEST_GEN_PROGS := $(OUTPUT)/vdso_test_gettimeofday
+TEST_GEN_PROGS := $(OUTPUT)/vdso_test_gettimeofday $(OUTPUT)/vdso_test_getcpu
  ifeq ($(ARCH),x86)
  TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86
  endif
@@ -18,6 +18,7 @@ endif
 
  all: $(TEST_GEN_PROGS)
  $(OUTPUT)/vdso_test_gettimeofday: parse_vdso.c vdso_test_gettimeofday.c
+$(OUTPUT)/vdso_test_getcpu: parse_vdso.c vdso_test_getcpu.c
  $(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c
  	$(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \
  		vdso_standalone_test_x86.c parse_vdso.c \
tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +16 -0
new file mode 100644
index 000000000000..a9dd3db145f3
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * vdso_test_getcpu.c: Sample code to test parse_vdso.c and vDSO getcpu()
+ *
+ * Copyright (c) 2020 Arm Ltd
+ */
+
+#include <stdint.h>
+#include <elf.h>
+#include <stdio.h>
+#include <sys/auxv.h>
+#include <sys/time.h>
+
+#include "../kselftest.h"
+#include "parse_vdso.h"
+

tools/testing/selftests/vDSO/vdso_test_getcpu.c line 26

Quoted 10 lines
tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +10 -0
+const char *version = "LINUX_2.6";
+const char *name = "__vdso_getcpu";
+
+struct getcpu_cache;
+typedef long (*getcpu_t)(unsigned int *, unsigned int *,
+			 struct getcpu_cache *);
+
+int main(int argc, char **argv)
+{
+	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);

WARNING: Missing a blank line after declarations
WARNING: Missing a blank line after declarations #135: FILE: tools/testing/selftests/vDSO/vdso_test_getcpu.c:27:
+ unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);
+ if (!sysinfo_ehdr) {

WARNING: Missing a blank line after declarations #143: FILE: tools/testing/selftests/vDSO/vdso_test_getcpu.c:35:
+ getcpu_t get_cpu = (getcpu_t)vdso_sym(version, name);
+ if (!get_cpu) {

WARNING: Missing a blank line after declarations #150: FILE: tools/testing/selftests/vDSO/vdso_test_getcpu.c:42:
+ long ret = get_cpu(&cpu, &node, 0);
+ if (ret == 0) {

Please send v2 for this one.

thanks,
-- Shuah

author
#7 lore raw

tools/testing/selftests/vDSO/vdso_test_getcpu.c line 27

Quoted 11 lines · shuah

tools/testing/selftests/vDSO/vdso_test_getcpu.c line 26

Quoted 3 lines · Mark Brown
tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +3 -0
+int main(int argc, char **argv)
+{
+	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);

WARNING: Missing a blank line after declarations
WARNING: Missing a blank line after declarations #135: FILE: tools/testing/selftests/vDSO/vdso_test_getcpu.c:27:

tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +2 -0
+	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);
+	if (!sysinfo_ehdr) {

This is the idiom in use by the existing gettimeofday test:

WARNING: Missing a blank line after declarations
#38: FILE: tools/testing/selftests/vDSO/vdso_test_gettimeofday.c:38:
+ unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);
+ if (!sysinfo_ehdr) {

so I don't know how you want the code to look here?

maintainer
#8 lore raw
Quoted 11 lines · Mark Brown

tools/testing/selftests/vDSO/vdso_test_getcpu.c line 26

Quoted 10 lines · shuah

tools/testing/selftests/vDSO/vdso_test_getcpu.c line 26

Quoted 3 lines · Mark Brown
tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +3 -0
+int main(int argc, char **argv)
+{
+	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);

WARNING: Missing a blank line after declarations
WARNING: Missing a blank line after declarations #135: FILE: tools/testing/selftests/vDSO/vdso_test_getcpu.c:27:

tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +1 -0
+	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);

A blank line after declarations here just like what checkpatch suggests. It makes it readable.

Quoted 11 lines

tools/testing/selftests/vDSO/vdso_test_getcpu.c line 27

Quoted 1 line
tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +1 -0
+	if (!sysinfo_ehdr) {

This is the idiom in use by the existing gettimeofday test:

WARNING: Missing a blank line after declarations
#38: FILE: tools/testing/selftests/vDSO/vdso_test_gettimeofday.c:38:

tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +2 -0
+	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);
+	if (!sysinfo_ehdr) {

so I don't know how you want the code to look here?

See above.

thanks,
-- Shuah

author
#9 lore raw
Quoted 9 lines · shuah
Quoted 4 lines · Mark Brown

tools/testing/selftests/vDSO/vdso_test_getcpu.c line 26

Quoted 4 lines

WARNING: Missing a blank line after declarations
WARNING: Missing a blank line after declarations #135: FILE: tools/testing/selftests/vDSO/vdso_test_getcpu.c:27:

tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +1 -0
+	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);

A blank line after declarations here just like what checkpatch suggests. It makes it readable.

That doesn't match the idiom used by any of the surrounding code :(

maintainer
#10 lore raw
Quoted 11 lines · Mark Brown
Quoted 9 lines · shuah
Quoted 4 lines · Mark Brown

tools/testing/selftests/vDSO/vdso_test_getcpu.c line 26

Quoted 4 lines

WARNING: Missing a blank line after declarations
WARNING: Missing a blank line after declarations #135: FILE: tools/testing/selftests/vDSO/vdso_test_getcpu.c:27:

tools/testing/selftests/vDSO/vdso_test_getcpu.c new file +1 -0
+	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);

A blank line after declarations here just like what checkpatch suggests. It makes it readable.

Quoted 2 lines

That doesn't match the idiom used by any of the surrounding code :(

I can't parse the idiom statement? Can you clarify it please.

thanks,
-- Shuah

author
#11 lore raw
Quoted 5 lines · shuah
Quoted 1 line · Mark Brown

That doesn't match the idiom used by any of the surrounding code :(

I can't parse the idiom statement? Can you clarify it please.

The other code in the vDSO selftests does this (the quoted line was a cut'n'paste from the gettimeofday() test and most of the functions in parse_vdso.c are similar).

maintainer
#12 lore raw
In reply to Mark Brown
Quoted 16 lines · Mark Brown

This series does a bit of a cleanup of the existing tests for the vDSO in kselftest and then adds a new test for getcpu().

Mark Brown (3):
selftests: vdso: Rename vdso_test to vdso_test_gettimeofday
selftests: vdso: Use a header file to prototype parse_vdso API
selftests: vdso: Add a selftest for vDSO getcpu()

  tools/testing/selftests/vDSO/.gitignore       |  2 +
  tools/testing/selftests/vDSO/Makefile         |  5 +-
  tools/testing/selftests/vDSO/parse_vdso.c     | 24 +--------
  tools/testing/selftests/vDSO/parse_vdso.h     | 31 ++++++++++++
  .../selftests/vDSO/vdso_standalone_test_x86.c |  4 +-
  .../testing/selftests/vDSO/vdso_test_getcpu.c | 50 +++++++++++++++++++
  .../{vdso_test.c => vdso_test_gettimeofday.c} | 10 ++--
  7 files changed, 92 insertions(+), 34 deletions(-)
Quoted 4 lines

create mode 100644 tools/testing/selftests/vDSO/parse_vdso.h
create mode 100644 tools/testing/selftests/vDSO/vdso_test_getcpu.c rename tools/testing/selftests/vDSO/{vdso_test.c => vdso_test_gettimeofday.c} (84%)

Thanks Mark. These look good to me. I will apply them for Linux 5.8-rc1.

thanks,
-- Shuah