Merge tag 'linux-kselftest-4.18-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

torvalds · torvalds · commit 4c5e8fc62d6a · 2018-06-15T17:26:29.000+09:00
Pull more Kselftest updates from Shuah Khan:

 - fix a signedness bug in cgroups test

 - add ppc support for kprobe args tests

* tag 'linux-kselftest-4.18-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  kselftest/cgroup: fix a signedness bug
  selftests/ftrace: Add ppc support for kprobe args tests
diff --git a/tools/testing/selftests/cgroup/cgroup_util.c b/tools/testing/selftests/cgroup/cgroup_util.c
@@ -35,7 +35,7 @@ static ssize_t read_text(const char *path, char *buf, size_t max_len)
 	return len;
 }
 
-static ssize_t write_text(const char *path, char *buf, size_t len)
+static ssize_t write_text(const char *path, char *buf, ssize_t len)
 {
 	int fd;
 
@@ -140,7 +140,7 @@ long cg_read_key_long(const char *cgroup, const char *control, const char *key)
 int cg_write(const char *cgroup, const char *control, char *buf)
 {
 	char path[PATH_MAX];
-	size_t len = strlen(buf);
+	ssize_t len = strlen(buf);
 
 	snprintf(path, sizeof(path), "%s/%s", cgroup, control);
 
diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc
@@ -24,6 +24,14 @@ arm*)
   ARG2=%r1
   OFFS=4
 ;;
+ppc64*)
+  ARG2=%r4
+  OFFS=8
+;;
+ppc*)
+  ARG2=%r4
+  OFFS=4
+;;
 *)
   echo "Please implement other architecture here"
   exit_untested
diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc
@@ -34,6 +34,13 @@ arm*)
   GOODREG=%r0
   BADREG=%ax
 ;;
+ppc*)
+  GOODREG=%r3
+  BADREG=%msr
+;;
+*)
+  echo "Please implement other architecture here"
+  exit_untested
 esac
 
 test_goodarg() # Good-args

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ static ssize_t read_text(const char path, char buf, size_t max_len)`
`35`	`35`	`return len;`
`36`	`36`	`}`
`37`	`37`
`38`		`-static ssize_t write_text(const char path, char buf, size_t len)`
	`38`	`+static ssize_t write_text(const char path, char buf, ssize_t len)`
`39`	`39`	`{`
`40`	`40`	`int fd;`
`41`	`41`
`@@ -140,7 +140,7 @@ long cg_read_key_long(const char cgroup, const char control, const char *key)`
`140`	`140`	`int cg_write(const char cgroup, const char control, char *buf)`
`141`	`141`	`{`
`142`	`142`	`char path[PATH_MAX];`
`143`		`- size_t len = strlen(buf);`
	`143`	`+ ssize_t len = strlen(buf);`
`144`	`144`
`145`	`145`	`snprintf(path, sizeof(path), "%s/%s", cgroup, control);`
`146`	`146`