Skip to contentSkip to conversation

acct: fix version check on big endian system

PATCH New Ping Fang 3 participants 5 messages Oct 10, 2019

lore
Share & tools
lore

Ping Fang

author
#0 lore raw

PATCH 1/1 acct: fix version check on big endian system

ac_version = ACCT_VERION | ACCT_BYTEORDER which is 0x83 (131) on big endian system.

failure output:
tst_kconfig.c:62: INFO: Parsing kernel config '/boot/config-4.18.0-147.el8.s390x' tst_test.c:1118: INFO: Timeout per run is 0h 05m 00s tst_kconfig.c:62: INFO: Parsing kernel config '/boot/config-4.18.0-147.el8.s390x' acct02.c:239: INFO: Verifying using 'struct acct_v3' acct02.c:192: INFO: == entry 1 ==
acct02.c:147: INFO: ac_version != 3 (131) acct02.c:192: INFO: == entry 2 ==
acct02.c:82: INFO: ac_comm != 'acct02_helper' ('acct02') acct02.c:133: INFO: ac_exitcode != 32768 (0) acct02.c:141: INFO: ac_ppid != 34501 (34500) acct02.c:147: INFO: ac_version != 3 (131) acct02.c:182: FAIL: end of file reached

---
 testcases/kernel/syscalls/acct/acct02.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
testcases/kernel/syscalls/acct/acct02.c +2 -1
index 7c2a27046..c513b2145 100644
@@ -142,7 +142,8 @@ static int verify_acct(void *acc, int elap_time)
 		ret = 1;
 	}
 
-	if (ACCT_MEMBER_V3(ac_version) != 3) {
+	/* In big endian system accout version have a ACCT_BYTEORDER 0x80 flag*/
+	if (ACCT_MEMBER_V3(ac_version) != 3 || ACC_MEMBER_V3(ac_version) != 131) {
 		tst_res(TINFO, "ac_version != 3 (%d)",
 			ACCT_MEMBER_V3(ac_version));
 		ret = 1;
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH 1/1 acct: fix version check on big endian system

Quoted 29 lines · Ping Fang

ac_version = ACCT_VERION | ACCT_BYTEORDER which is 0x83 (131) on big endian system.

failure output:
tst_kconfig.c:62: INFO: Parsing kernel config '/boot/config-4.18.0-147.el8.s390x' tst_test.c:1118: INFO: Timeout per run is 0h 05m 00s tst_kconfig.c:62: INFO: Parsing kernel config '/boot/config-4.18.0-147.el8.s390x' acct02.c:239: INFO: Verifying using 'struct acct_v3' acct02.c:192: INFO: == entry 1 ==
acct02.c:147: INFO: ac_version != 3 (131) acct02.c:192: INFO: == entry 2 ==
acct02.c:82: INFO: ac_comm != 'acct02_helper' ('acct02') acct02.c:133: INFO: ac_exitcode != 32768 (0) acct02.c:141: INFO: ac_ppid != 34501 (34500) acct02.c:147: INFO: ac_version != 3 (131) acct02.c:182: FAIL: end of file reached

---
 testcases/kernel/syscalls/acct/acct02.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
testcases/kernel/syscalls/acct/acct02.c +0 -0
index 7c2a27046..c513b2145 100644

testcases/kernel/syscalls/acct/acct02.c static int verify_acct(void *acc, int elap_time) · line 146

Quoted 6 lines
testcases/kernel/syscalls/acct/acct02.c +2 -1
@@ -142,7 +142,8 @@ static int verify_acct(void *acc, int elap_time)
 		ret = 1;
 	}
 
-	if (ACCT_MEMBER_V3(ac_version) != 3) {
+	/* In big endian system accout version have a ACCT_BYTEORDER 0x80 flag*/
+	if (ACCT_MEMBER_V3(ac_version) != 3 || ACC_MEMBER_V3(ac_version) != 131) {
					    ^^ should be &&.
Quoted 9 lines
testcases/kernel/syscalls/acct/acct02.c +0 -0
 		tst_res(TINFO, "ac_version != 3 (%d)",
 			ACCT_MEMBER_V3(ac_version));
 		ret = 1;
Signature · 5 lines
2.21.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw

PATCH 1/1 acct: fix version check on big endian system

----- Original Message -----

Quoted 34 lines · Ping Fang
Quoted 33 lines

ac_version = ACCT_VERION | ACCT_BYTEORDER which is 0x83 (131) on big endian system.

failure output:
tst_kconfig.c:62: INFO: Parsing kernel config '/boot/config-4.18.0-147.el8.s390x' tst_test.c:1118: INFO: Timeout per run is 0h 05m 00s tst_kconfig.c:62: INFO: Parsing kernel config '/boot/config-4.18.0-147.el8.s390x' acct02.c:239: INFO: Verifying using 'struct acct_v3' acct02.c:192: INFO: == entry 1 ==
acct02.c:147: INFO: ac_version != 3 (131) acct02.c:192: INFO: == entry 2 ==
acct02.c:82: INFO: ac_comm != 'acct02_helper' ('acct02') acct02.c:133: INFO: ac_exitcode != 32768 (0) acct02.c:141: INFO: ac_ppid != 34501 (34500) acct02.c:147: INFO: ac_version != 3 (131) acct02.c:182: FAIL: end of file reached

---
 testcases/kernel/syscalls/acct/acct02.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
testcases/kernel/syscalls/acct/acct02.c +0 -0
index 7c2a27046..c513b2145 100644
@@ -142,7 +142,8 @@ static int verify_acct(void *acc, int elap_time)
 		ret = 1;
 	}
 
Quoted 10 lines

testcases/kernel/syscalls/acct/acct02.c static int verify_acct(void *acc, int elap_time) · line 147

Quoted 4 lines
testcases/kernel/syscalls/acct/acct02.c +2 -1
-	if (ACCT_MEMBER_V3(ac_version) != 3) {
+	/* In big endian system accout version have a ACCT_BYTEORDER 0x80 flag*/
+	if (ACCT_MEMBER_V3(ac_version) != 3 || ACC_MEMBER_V3(ac_version) != 131)
 {
					    ^^ should be &&.
Quoted 5 lines
testcases/kernel/syscalls/acct/acct02.c +0 -0
 		tst_res(TINFO, "ac_version != 3 (%d)",
 			ACCT_MEMBER_V3(ac_version));

ret = 1;
--
2.21.0

Can we incorporate ACCT_BYTEORDER into that check?

Kernel appears to use it at least since 2.6.12-rc2. We would just need define it for !HAVE_STRUCT_ACCT_V3 case.

include/lapi/acct.h +7 -0
index ebd65bbf4df7..112ee48d8aee 100644
@@ -64,6 +64,13 @@ enum {
        ACORE = 0x08,
        AXSIG = 0x10
 };
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define ACCT_BYTEORDER  0x80
+# elif __BYTE_ORDER == __LITTLE_ENDIAN
+# define ACCT_BYTEORDER  0x00
+# endif
+
 #endif /* HAVE_STRUCT_ACCT_V3 */
 
 #endif /* LAPI_ACCT_H */
testcases/kernel/syscalls/acct/acct02.c +1 -1
index 7c2a270465c5..4d95aafec3e1 100644
@@ -142,7 +142,7 @@ static int verify_acct(void *acc, int elap_time)
                ret = 1;
        }
 
-       if (ACCT_MEMBER_V3(ac_version) != 3) {
+       if (ACCT_MEMBER_V3(ac_version) != (3 | ACCT_BYTEORDER)) {
                tst_res(TINFO, "ac_version != 3 (%d)",
                        ACCT_MEMBER_V3(ac_version));
                ret = 1;
author
#3 lore raw

PATCH 1/1 acct: fix version check on big endian system

Quoted 41 lines · Jan Stancek

----- Original Message -----

Quoted 39 lines · Ping Fang
Quoted 30 lines

ac_version = ACCT_VERION | ACCT_BYTEORDER which is 0x83 (131) on big endian system.

failure output:
tst_kconfig.c:62: INFO: Parsing kernel config '/boot/config-4.18.0-147.el8.s390x' tst_test.c:1118: INFO: Timeout per run is 0h 05m 00s tst_kconfig.c:62: INFO: Parsing kernel config '/boot/config-4.18.0-147.el8.s390x' acct02.c:239: INFO: Verifying using 'struct acct_v3' acct02.c:192: INFO: == entry 1 ==
acct02.c:147: INFO: ac_version != 3 (131) acct02.c:192: INFO: == entry 2 ==
acct02.c:82: INFO: ac_comm != 'acct02_helper' ('acct02') acct02.c:133: INFO: ac_exitcode != 32768 (0) acct02.c:141: INFO: ac_ppid != 34501 (34500) acct02.c:147: INFO: ac_version != 3 (131) acct02.c:182: FAIL: end of file reached

---
 testcases/kernel/syscalls/acct/acct02.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
testcases/kernel/syscalls/acct/acct02.c +0 -0
index 7c2a27046..c513b2145 100644

testcases/kernel/syscalls/acct/acct02.c static int verify_acct(void *acc, int elap_time) · line 147

Quoted 7 lines
testcases/kernel/syscalls/acct/acct02.c +2 -1
@@ -142,7 +142,8 @@ static int verify_acct(void *acc, int elap_time)
 		ret = 1;
 	}
 
-	if (ACCT_MEMBER_V3(ac_version) != 3) {
+	/* In big endian system accout version have a ACCT_BYTEORDER 0x80 flag*/
+	if (ACCT_MEMBER_V3(ac_version) != 3 || ACC_MEMBER_V3(ac_version) != 131)
 {
					    ^^ should be &&.
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
testcases/kernel/syscalls/acct/acct02.c +0 -0
 		tst_res(TINFO, "ac_version != 3 (%d)",
 			ACCT_MEMBER_V3(ac_version));

ret = 1;
--
2.21.0

Can we incorporate ACCT_BYTEORDER into that check?

Thanks for your advice, I will post v2.

Quoted 35 lines

Kernel appears to use it at least since 2.6.12-rc2. We would just need define it for !HAVE_STRUCT_ACCT_V3 case.

include/lapi/acct.h +7 -0
index ebd65bbf4df7..112ee48d8aee 100644
@@ -64,6 +64,13 @@ enum {
        ACORE = 0x08,
        AXSIG = 0x10
 };
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define ACCT_BYTEORDER  0x80
+# elif __BYTE_ORDER == __LITTLE_ENDIAN
+# define ACCT_BYTEORDER  0x00
+# endif
+
 #endif /* HAVE_STRUCT_ACCT_V3 */
 
 #endif /* LAPI_ACCT_H */
testcases/kernel/syscalls/acct/acct02.c +1 -1
index 7c2a270465c5..4d95aafec3e1 100644
@@ -142,7 +142,7 @@ static int verify_acct(void *acc, int elap_time)
                ret = 1;
        }
 
-       if (ACCT_MEMBER_V3(ac_version) != 3) {
+       if (ACCT_MEMBER_V3(ac_version) != (3 | ACCT_BYTEORDER)) {
                tst_res(TINFO, "ac_version != 3 (%d)",
                        ACCT_MEMBER_V3(ac_version));
                ret = 1;
#4 lore raw

PATCH 1/1 acct: fix version check on big endian system

In reply to Jan Stancek

Hi Jan,

Quoted 28 lines

Can we incorporate ACCT_BYTEORDER into that check?

Kernel appears to use it at least since 2.6.12-rc2. We would just need define it for !HAVE_STRUCT_ACCT_V3 case.

include/lapi/acct.h +7 -0
index ebd65bbf4df7..112ee48d8aee 100644
@@ -64,6 +64,13 @@ enum {
        ACORE = 0x08,
        AXSIG = 0x10
 };
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define ACCT_BYTEORDER  0x80
+# elif __BYTE_ORDER == __LITTLE_ENDIAN
+# define ACCT_BYTEORDER  0x00
+# endif
+
 #endif /* HAVE_STRUCT_ACCT_V3 */
 
 #endif /* LAPI_ACCT_H */
testcases/kernel/syscalls/acct/acct02.c +0 -0
index 7c2a270465c5..4d95aafec3e1 100644

testcases/kernel/syscalls/acct/acct02.c static int verify_acct(void *acc, int elap_time) · line 148

Quoted 8 lines
testcases/kernel/syscalls/acct/acct02.c +1 -1
@@ -142,7 +142,7 @@ static int verify_acct(void *acc, int elap_time)
                ret = 1;
        }
 
-       if (ACCT_MEMBER_V3(ac_version) != 3) {
+       if (ACCT_MEMBER_V3(ac_version) != (3 | ACCT_BYTEORDER)) {
                tst_res(TINFO, "ac_version != 3 (%d)",
                        ACCT_MEMBER_V3(ac_version));
                ret = 1;

FYI v2 merged. Sorry not adding your Suggested-by: and Acked-by: tags (you weren't in Cc: for v2).

Kind regards,
Petr