From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 15 Sep 2017 16:06:14 +0000 (+0000)
Subject: Update MEMBARRIER_CMD_* constants
X-Git-Tag: v4.20~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52231be034160c786735c6ae2f51ac7723c2e1fd;p=strace

Update MEMBARRIER_CMD_* constants

* xlat/membarrier_cmds.in: Add MEMBARRIER_CMD_PRIVATE_EXPEDITED
introduced by kernel commit v4.14-rc1~174^2^2^4.
* NEWS: Mention this.
* tests/membarrier.c (main): Update expected output.
---

diff --git a/NEWS b/NEWS
index 61704945..7aee72c8 100644
--- a/NEWS
+++ b/NEWS
@@ -2,8 +2,8 @@ Noteworthy changes in release ?.?? (????-??-??)
 ===============================================
 
 * Improvements
-  * Updated lists of ARPHRD_*, BPF_*, ETH_P_*, MADV_*, MFD_*, SO_*, SOL_*,
-    TCP_*, and UFFD_FEATURE_* constants.
+  * Updated lists of ARPHRD_*, BPF_*, ETH_P_*, MADV_*, MEMBARRIER_CMD_*, MFD_*,
+    SO_*, SOL_*, TCP_*, and UFFD_FEATURE_* constants.
 
 Noteworthy changes in release 4.19 (2017-09-05)
 ===============================================
diff --git a/tests/membarrier.c b/tests/membarrier.c
index 330893b6..7d79724f 100644
--- a/tests/membarrier.c
+++ b/tests/membarrier.c
@@ -44,10 +44,23 @@ main(void)
 	printf("membarrier(0x3 /* MEMBARRIER_CMD_??? */, 255) = %s\n",
 	       sprintrc(-1));
 	if (saved_errno != ENOSYS) {
-		/* the test needs to be updated? */
-		assert(syscall(__NR_membarrier, 0, 0) == 1);
-		puts("membarrier(MEMBARRIER_CMD_QUERY, 0)"
-		     " = 0x1 (MEMBARRIER_CMD_SHARED)");
+		const char *text;
+		int rc = syscall(__NR_membarrier, 0, 0);
+
+		switch (rc) {
+		case 1:
+			text = "MEMBARRIER_CMD_SHARED";
+			break;
+		case 1|8:
+			text = "MEMBARRIER_CMD_SHARED|"
+			       "MEMBARRIER_CMD_PRIVATE_EXPEDITED";
+			break;
+		default:
+			error_msg_and_fail("membarrier returned %#x, does"
+					   " the test have to be updated?", rc);
+		}
+		printf("membarrier(MEMBARRIER_CMD_QUERY, 0) = %#x (%s)\n",
+		       rc, text);
 	}
 	puts("+++ exited with 0 +++");
 	return 0;
diff --git a/xlat/membarrier_cmds.in b/xlat/membarrier_cmds.in
index e087e8e3..3baef173 100644
--- a/xlat/membarrier_cmds.in
+++ b/xlat/membarrier_cmds.in
@@ -1,2 +1,3 @@
-MEMBARRIER_CMD_QUERY	0
-MEMBARRIER_CMD_SHARED	1
+MEMBARRIER_CMD_QUERY			0
+MEMBARRIER_CMD_SHARED			1
+MEMBARRIER_CMD_PRIVATE_EXPEDITED	8