|
 |
a22256 |
From e87c073ecc05fa903b0ce88b9237d45dea96ca22 Mon Sep 17 00:00:00 2001
|
|
|
a22256 |
From: Eugene Syromyatnikov <evgsyr@gmail.com>
|
|
|
a22256 |
Date: Thu, 8 Feb 2018 11:01:52 +0100
|
|
|
a22256 |
Subject: [PATCH 1/2] Update MEMBARRIER_CMD_* constants
|
|
|
a22256 |
|
|
|
a22256 |
* xlat/membarrier_cmds.in: Add new constants, rename
|
|
|
a22256 |
MEMBARRIER_CMD_SHARED to MEMBARRIER_CMD_GLOBAL.
|
|
|
a22256 |
* NEWS: Mention this.
|
|
|
a22256 |
* tests/membarrier.c (main): Update expected output.
|
|
|
a22256 |
|
|
|
a22256 |
Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>
|
|
|
a22256 |
|
|
|
a22256 |
[ ES: also patch files in tests-m32 and tests-mx32 directories, as well
|
|
|
a22256 |
as the generated xlat/membarriers_cmds.h ]
|
|
|
a22256 |
|
|
|
a22256 |
---
|
|
|
a22256 |
NEWS | 3 ++-
|
|
|
a22256 |
tests/membarrier.c | 25 ++++++++++++++++++++++---
|
|
|
a22256 |
xlat/membarrier_cmds.in | 12 ++++++++----
|
|
|
a22256 |
3 files changed, 32 insertions(+), 8 deletions(-)
|
|
|
a22256 |
|
|
|
a22256 |
Index: strace-4.12/tests/membarrier.c
|
|
|
a22256 |
===================================================================
|
|
|
a22256 |
--- strace-4.12.orig/tests/membarrier.c 2018-07-19 05:12:03.106834204 +0200
|
|
|
a22256 |
+++ strace-4.12/tests/membarrier.c 2018-07-19 05:47:43.260852729 +0200
|
|
|
a22256 |
@@ -47,17 +47,36 @@
|
|
|
a22256 |
|
|
|
a22256 |
switch (rc) {
|
|
|
a22256 |
case 1:
|
|
|
a22256 |
- text = "MEMBARRIER_CMD_SHARED";
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL";
|
|
|
a22256 |
break;
|
|
|
a22256 |
case 1|8:
|
|
|
a22256 |
- text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
"MEMBARRIER_CMD_PRIVATE_EXPEDITED";
|
|
|
a22256 |
break;
|
|
|
a22256 |
case 1|8|16:
|
|
|
a22256 |
- text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
"MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
"MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
|
|
|
a22256 |
break;
|
|
|
a22256 |
+
|
|
|
a22256 |
+ case 1|2|4|8|16:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
+
|
|
|
a22256 |
+ case 1|2|4|8|16|32|64:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
+
|
|
|
a22256 |
default:
|
|
|
a22256 |
error_msg_and_fail("membarrier returned %#x, does"
|
|
|
a22256 |
" the test have to be updated?", rc);
|
|
|
a22256 |
Index: strace-4.12/tests-m32/membarrier.c
|
|
|
a22256 |
===================================================================
|
|
|
a22256 |
--- strace-4.12.orig/tests-m32/membarrier.c 2018-07-19 05:12:03.106834204 +0200
|
|
|
a22256 |
+++ strace-4.12/tests-m32/membarrier.c 2018-07-19 05:47:43.260852729 +0200
|
|
|
a22256 |
@@ -47,17 +47,36 @@
|
|
|
a22256 |
|
|
|
a22256 |
switch (rc) {
|
|
|
a22256 |
case 1:
|
|
|
a22256 |
- text = "MEMBARRIER_CMD_SHARED";
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL";
|
|
|
a22256 |
break;
|
|
|
a22256 |
case 1|8:
|
|
|
a22256 |
- text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
"MEMBARRIER_CMD_PRIVATE_EXPEDITED";
|
|
|
a22256 |
break;
|
|
|
a22256 |
case 1|8|16:
|
|
|
a22256 |
- text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
"MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
"MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
|
|
|
a22256 |
break;
|
|
|
a22256 |
+
|
|
|
a22256 |
+ case 1|2|4|8|16:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
+
|
|
|
a22256 |
+ case 1|2|4|8|16|32|64:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
+
|
|
|
a22256 |
default:
|
|
|
a22256 |
error_msg_and_fail("membarrier returned %#x, does"
|
|
|
a22256 |
" the test have to be updated?", rc);
|
|
|
a22256 |
Index: strace-4.12/tests-mx32/membarrier.c
|
|
|
a22256 |
===================================================================
|
|
|
a22256 |
--- strace-4.12.orig/tests-mx32/membarrier.c 2018-07-19 05:12:03.106834204 +0200
|
|
|
a22256 |
+++ strace-4.12/tests-mx32/membarrier.c 2018-07-19 05:47:43.260852729 +0200
|
|
|
a22256 |
@@ -47,17 +47,36 @@
|
|
|
a22256 |
|
|
|
a22256 |
switch (rc) {
|
|
|
a22256 |
case 1:
|
|
|
a22256 |
- text = "MEMBARRIER_CMD_SHARED";
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL";
|
|
|
a22256 |
break;
|
|
|
a22256 |
case 1|8:
|
|
|
a22256 |
- text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
"MEMBARRIER_CMD_PRIVATE_EXPEDITED";
|
|
|
a22256 |
break;
|
|
|
a22256 |
case 1|8|16:
|
|
|
a22256 |
- text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
"MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
"MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
|
|
|
a22256 |
break;
|
|
|
a22256 |
+
|
|
|
a22256 |
+ case 1|2|4|8|16:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
+
|
|
|
a22256 |
+ case 1|2|4|8|16|32|64:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_GLOBAL|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
+
|
|
|
a22256 |
default:
|
|
|
a22256 |
error_msg_and_fail("membarrier returned %#x, does"
|
|
|
a22256 |
" the test have to be updated?", rc);
|
|
|
a22256 |
Index: strace-4.12/xlat/membarrier_cmds.in
|
|
|
a22256 |
===================================================================
|
|
|
a22256 |
--- strace-4.12.orig/xlat/membarrier_cmds.in 2018-07-19 05:12:03.106834204 +0200
|
|
|
a22256 |
+++ strace-4.12/xlat/membarrier_cmds.in 2018-07-19 05:36:28.224374142 +0200
|
|
|
a22256 |
@@ -1,4 +1,8 @@
|
|
|
a22256 |
-MEMBARRIER_CMD_QUERY 0
|
|
|
a22256 |
-MEMBARRIER_CMD_SHARED 1
|
|
|
a22256 |
-MEMBARRIER_CMD_PRIVATE_EXPEDITED 8
|
|
|
a22256 |
-MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED 16
|
|
|
a22256 |
+MEMBARRIER_CMD_QUERY 0
|
|
|
a22256 |
+MEMBARRIER_CMD_GLOBAL 1 << 0
|
|
|
a22256 |
+MEMBARRIER_CMD_GLOBAL_EXPEDITED 1 << 1
|
|
|
a22256 |
+MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED 1 << 2
|
|
|
a22256 |
+MEMBARRIER_CMD_PRIVATE_EXPEDITED 1 << 3
|
|
|
a22256 |
+MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED 1 << 4
|
|
|
a22256 |
+MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE 1 << 5
|
|
|
a22256 |
+MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE 1 << 6
|
|
|
a22256 |
Index: strace-4.12/xlat/membarrier_cmds.h
|
|
|
a22256 |
===================================================================
|
|
|
a22256 |
--- strace-4.12.orig/xlat/membarrier_cmds.h 2018-07-19 04:50:23.523169050 +0200
|
|
|
a22256 |
+++ strace-4.12/xlat/membarrier_cmds.h 2018-07-19 05:49:44.237325487 +0200
|
|
|
a22256 |
@@ -2,14 +2,26 @@
|
|
|
a22256 |
#if !(defined(MEMBARRIER_CMD_QUERY) || (defined(HAVE_DECL_MEMBARRIER_CMD_QUERY) && HAVE_DECL_MEMBARRIER_CMD_QUERY))
|
|
|
a22256 |
# define MEMBARRIER_CMD_QUERY 0
|
|
|
a22256 |
#endif
|
|
|
a22256 |
-#if !(defined(MEMBARRIER_CMD_SHARED) || (defined(HAVE_DECL_MEMBARRIER_CMD_SHARED) && HAVE_DECL_MEMBARRIER_CMD_SHARED))
|
|
|
a22256 |
-# define MEMBARRIER_CMD_SHARED 1
|
|
|
a22256 |
+#if !(defined(MEMBARRIER_CMD_GLOBAL) || (defined(HAVE_DECL_MEMBARRIER_CMD_GLOBAL) && HAVE_DECL_MEMBARRIER_CMD_GLOBAL))
|
|
|
a22256 |
+# define MEMBARRIER_CMD_GLOBAL 1 << 0
|
|
|
a22256 |
+#endif
|
|
|
a22256 |
+#if !(defined(MEMBARRIER_CMD_GLOBAL_EXPEDITED) || (defined(HAVE_DECL_MEMBARRIER_CMD_GLOBAL_EXPEDITED) && HAVE_DECL_MEMBARRIER_CMD_GLOBAL_EXPEDITED))
|
|
|
a22256 |
+# define MEMBARRIER_CMD_GLOBAL_EXPEDITED 1 << 1
|
|
|
a22256 |
+#endif
|
|
|
a22256 |
+#if !(defined(MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED) || (defined(HAVE_DECL_MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED) && HAVE_DECL_MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED))
|
|
|
a22256 |
+# define MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED 1 << 2
|
|
|
a22256 |
#endif
|
|
|
a22256 |
#if !(defined(MEMBARRIER_CMD_PRIVATE_EXPEDITED) || (defined(HAVE_DECL_MEMBARRIER_CMD_PRIVATE_EXPEDITED) && HAVE_DECL_MEMBARRIER_CMD_PRIVATE_EXPEDITED))
|
|
|
a22256 |
-# define MEMBARRIER_CMD_PRIVATE_EXPEDITED 8
|
|
|
a22256 |
+# define MEMBARRIER_CMD_PRIVATE_EXPEDITED 1 << 3
|
|
|
a22256 |
#endif
|
|
|
a22256 |
#if !(defined(MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED) || (defined(HAVE_DECL_MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED) && HAVE_DECL_MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED))
|
|
|
a22256 |
-# define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED 16
|
|
|
a22256 |
+# define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED 1 << 4
|
|
|
a22256 |
+#endif
|
|
|
a22256 |
+#if !(defined(MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE) || (defined(HAVE_DECL_MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE) && HAVE_DECL_MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE))
|
|
|
a22256 |
+# define MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE 1 << 5
|
|
|
a22256 |
+#endif
|
|
|
a22256 |
+#if !(defined(MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE) || (defined(HAVE_DECL_MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE) && HAVE_DECL_MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE))
|
|
|
a22256 |
+# define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE 1 << 6
|
|
|
a22256 |
#endif
|
|
|
a22256 |
|
|
|
a22256 |
#ifdef IN_MPERS
|
|
|
a22256 |
@@ -21,9 +33,13 @@
|
|
|
a22256 |
static
|
|
|
a22256 |
const struct xlat membarrier_cmds[] = {
|
|
|
a22256 |
XLAT(MEMBARRIER_CMD_QUERY),
|
|
|
a22256 |
- XLAT(MEMBARRIER_CMD_SHARED),
|
|
|
a22256 |
+ XLAT(MEMBARRIER_CMD_GLOBAL),
|
|
|
a22256 |
+ XLAT(MEMBARRIER_CMD_GLOBAL_EXPEDITED),
|
|
|
a22256 |
+ XLAT(MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED),
|
|
|
a22256 |
XLAT(MEMBARRIER_CMD_PRIVATE_EXPEDITED),
|
|
|
a22256 |
XLAT(MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED),
|
|
|
a22256 |
+ XLAT(MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE),
|
|
|
a22256 |
+ XLAT(MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE),
|
|
|
a22256 |
XLAT_END
|
|
|
a22256 |
};
|
|
|
a22256 |
|