|
 |
384337 |
commit 52231be034160c786735c6ae2f51ac7723c2e1fd
|
|
|
384337 |
Author: Dmitry V. Levin <ldv@altlinux.org>
|
|
|
384337 |
Date: Fri Sep 15 16:06:14 2017 +0000
|
|
|
384337 |
|
|
|
384337 |
Update MEMBARRIER_CMD_* constants
|
|
|
384337 |
|
|
|
384337 |
* xlat/membarrier_cmds.in: Add MEMBARRIER_CMD_PRIVATE_EXPEDITED
|
|
|
384337 |
introduced by kernel commit v4.14-rc1~174^2^2^4.
|
|
|
384337 |
* NEWS: Mention this.
|
|
|
384337 |
* tests/membarrier.c (main): Update expected output.
|
|
|
384337 |
|
|
|
a22256 |
[ ES: also patch files in tests-m32 and tests-mx32 directories ]
|
|
|
a22256 |
|
|
|
384337 |
diff -rup a/tests/membarrier.c b/tests/membarrier.c
|
|
|
384337 |
--- a/tests/membarrier.c 2016-04-21 14:16:50.000000000 -0400
|
|
|
384337 |
+++ b/tests/membarrier.c 2018-02-05 19:24:07.016341127 -0500
|
|
|
384337 |
@@ -42,10 +42,23 @@ main(void)
|
|
|
384337 |
printf("membarrier(0x3 /* MEMBARRIER_CMD_??? */, 255) = -1 %s (%m)\n",
|
|
|
384337 |
errno2name());
|
|
|
384337 |
if (errno != ENOSYS) {
|
|
|
384337 |
- /* the test needs to be updated? */
|
|
|
a22256 |
- assert(syscall(__NR_membarrier, 0, 0) == 1);
|
|
|
a22256 |
- puts("membarrier(MEMBARRIER_CMD_QUERY, 0)"
|
|
|
a22256 |
- " = 0x1 (MEMBARRIER_CMD_SHARED)");
|
|
|
a22256 |
+ const char *text;
|
|
|
a22256 |
+ int rc = syscall(__NR_membarrier, 0, 0);
|
|
|
a22256 |
+
|
|
|
a22256 |
+ switch (rc) {
|
|
|
a22256 |
+ case 1:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_SHARED";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
+ case 1|8:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
+ default:
|
|
|
a22256 |
+ error_msg_and_fail("membarrier returned %#x, does"
|
|
|
a22256 |
+ " the test have to be updated?", rc);
|
|
|
a22256 |
+ }
|
|
|
a22256 |
+ printf("membarrier(MEMBARRIER_CMD_QUERY, 0) = %#x (%s)\n",
|
|
|
a22256 |
+ rc, text);
|
|
|
a22256 |
}
|
|
|
a22256 |
puts("+++ exited with 0 +++");
|
|
|
a22256 |
return 0;
|
|
|
a22256 |
diff -rup a/tests-m32/membarrier.c b/tests-m32/membarrier.c
|
|
|
a22256 |
--- a/tests-m32/membarrier.c 2016-04-21 14:16:50.000000000 -0400
|
|
|
a22256 |
+++ b/tests-m32/membarrier.c 2018-02-05 19:24:07.016341127 -0500
|
|
|
a22256 |
@@ -42,10 +42,23 @@ main(void)
|
|
|
a22256 |
printf("membarrier(0x3 /* MEMBARRIER_CMD_??? */, 255) = -1 %s (%m)\n",
|
|
|
a22256 |
errno2name());
|
|
|
a22256 |
if (errno != ENOSYS) {
|
|
|
a22256 |
- /* the test needs to be updated? */
|
|
|
a22256 |
- assert(syscall(__NR_membarrier, 0, 0) == 1);
|
|
|
a22256 |
- puts("membarrier(MEMBARRIER_CMD_QUERY, 0)"
|
|
|
a22256 |
- " = 0x1 (MEMBARRIER_CMD_SHARED)");
|
|
|
a22256 |
+ const char *text;
|
|
|
a22256 |
+ int rc = syscall(__NR_membarrier, 0, 0);
|
|
|
a22256 |
+
|
|
|
a22256 |
+ switch (rc) {
|
|
|
a22256 |
+ case 1:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_SHARED";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
+ case 1|8:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
+ default:
|
|
|
a22256 |
+ error_msg_and_fail("membarrier returned %#x, does"
|
|
|
a22256 |
+ " the test have to be updated?", rc);
|
|
|
a22256 |
+ }
|
|
|
a22256 |
+ printf("membarrier(MEMBARRIER_CMD_QUERY, 0) = %#x (%s)\n",
|
|
|
a22256 |
+ rc, text);
|
|
|
a22256 |
}
|
|
|
a22256 |
puts("+++ exited with 0 +++");
|
|
|
a22256 |
return 0;
|
|
|
a22256 |
diff -rup a/tests-mx32/membarrier.c b/tests-mx32/membarrier.c
|
|
|
a22256 |
--- a/tests-mx32/membarrier.c 2016-04-21 14:16:50.000000000 -0400
|
|
|
a22256 |
+++ b/tests-mx32/membarrier.c 2018-02-05 19:24:07.016341127 -0500
|
|
|
a22256 |
@@ -42,10 +42,23 @@ main(void)
|
|
|
a22256 |
printf("membarrier(0x3 /* MEMBARRIER_CMD_??? */, 255) = -1 %s (%m)\n",
|
|
|
a22256 |
errno2name());
|
|
|
a22256 |
if (errno != ENOSYS) {
|
|
|
a22256 |
- /* the test needs to be updated? */
|
|
|
384337 |
- assert(syscall(__NR_membarrier, 0, 0) == 1);
|
|
|
384337 |
- puts("membarrier(MEMBARRIER_CMD_QUERY, 0)"
|
|
|
384337 |
- " = 0x1 (MEMBARRIER_CMD_SHARED)");
|
|
|
384337 |
+ const char *text;
|
|
|
384337 |
+ int rc = syscall(__NR_membarrier, 0, 0);
|
|
|
384337 |
+
|
|
|
384337 |
+ switch (rc) {
|
|
|
384337 |
+ case 1:
|
|
|
384337 |
+ text = "MEMBARRIER_CMD_SHARED";
|
|
|
384337 |
+ break;
|
|
|
384337 |
+ case 1|8:
|
|
|
384337 |
+ text = "MEMBARRIER_CMD_SHARED|"
|
|
|
384337 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED";
|
|
|
384337 |
+ break;
|
|
|
384337 |
+ default:
|
|
|
384337 |
+ error_msg_and_fail("membarrier returned %#x, does"
|
|
|
384337 |
+ " the test have to be updated?", rc);
|
|
|
384337 |
+ }
|
|
|
384337 |
+ printf("membarrier(MEMBARRIER_CMD_QUERY, 0) = %#x (%s)\n",
|
|
|
384337 |
+ rc, text);
|
|
|
384337 |
}
|
|
|
384337 |
puts("+++ exited with 0 +++");
|
|
|
384337 |
return 0;
|
|
|
384337 |
diff -rup a/xlat/membarrier_cmds.in b/xlat/membarrier_cmds.in
|
|
|
384337 |
--- a/xlat/membarrier_cmds.in 2015-11-16 19:40:22.000000000 -0500
|
|
|
384337 |
+++ b/xlat/membarrier_cmds.in 2018-02-05 19:23:39.097820501 -0500
|
|
|
384337 |
@@ -1,2 +1,3 @@
|
|
|
384337 |
-MEMBARRIER_CMD_QUERY 0
|
|
|
384337 |
-MEMBARRIER_CMD_SHARED 1
|
|
|
384337 |
+MEMBARRIER_CMD_QUERY 0
|
|
|
384337 |
+MEMBARRIER_CMD_SHARED 1
|
|
|
384337 |
+MEMBARRIER_CMD_PRIVATE_EXPEDITED 8
|