* [LTP] [PATCH v2] acct: fix version check on big endian system
@ 2019-10-10 8:17 Ping Fang
2019-10-10 8:33 ` Li Wang
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Ping Fang @ 2019-10-10 8:17 UTC (permalink / raw)
To: ltp
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
Signed-off-by: Ping Fang <pifang@redhat.com>
---
include/lapi/acct.h | 5 +++++
testcases/kernel/syscalls/acct/acct02.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/lapi/acct.h b/include/lapi/acct.h
index ebd65bbf4..c81b78b44 100644
--- a/include/lapi/acct.h
+++ b/include/lapi/acct.h
@@ -64,6 +64,11 @@ enum {
ACORE = 0x08,
AXSIG = 0x10
};
+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+# define ACCT_BYTEORDER 0x80
+# elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+# define ACCT_BYTEORDER 0x00
+# endif
#endif /* HAVE_STRUCT_ACCT_V3 */
#endif /* LAPI_ACCT_H */
diff --git a/testcases/kernel/syscalls/acct/acct02.c b/testcases/kernel/syscalls/acct/acct02.c
index 7c2a27046..4d95aafec 100644
--- a/testcases/kernel/syscalls/acct/acct02.c
+++ b/testcases/kernel/syscalls/acct/acct02.c
@@ -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;
--
2.21.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [LTP] [PATCH v2] acct: fix version check on big endian system
2019-10-10 8:17 [LTP] [PATCH v2] acct: fix version check on big endian system Ping Fang
@ 2019-10-10 8:33 ` Li Wang
2019-10-10 9:13 ` Li Wang
2019-10-10 11:06 ` Cyril Hrubis
2019-10-10 11:26 ` Petr Vorel
2 siblings, 1 reply; 7+ messages in thread
From: Li Wang @ 2019-10-10 8:33 UTC (permalink / raw)
To: ltp
Ping Fang <pifang@redhat.com> wrote:
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
>
I'm wondering that is there any necessary to use do{}...while loop for
entry many times? Since the verify_acct() only check the dummy
program(acct02_helper) accounting struct. So in the error logs, we could
see some meaningless data(acct02) in entry 2.
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)
This needs to be fixed in a separate patch.
> Signed-off-by: Ping Fang <pifang@redhat.com>
>
The patch itself looks good. Ack.
--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20191010/8384c718/attachment.htm>
^ permalink raw reply [flat|nested] 7+ messages in thread* [LTP] [PATCH v2] acct: fix version check on big endian system
2019-10-10 8:33 ` Li Wang
@ 2019-10-10 9:13 ` Li Wang
2019-10-10 11:36 ` Petr Vorel
0 siblings, 1 reply; 7+ messages in thread
From: Li Wang @ 2019-10-10 9:13 UTC (permalink / raw)
To: ltp
On Thu, Oct 10, 2019 at 4:33 PM Li Wang <liwan@redhat.com> wrote:
>
> Ping Fang <pifang@redhat.com> wrote:
>
> 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
>>
>
> I'm wondering that is there any necessary to use do{}...while loop for
> entry many times? Since the verify_acct() only check the dummy
> program(acct02_helper) accounting struct. So in the error logs, we could
> see some meaningless data(acct02) in entry 2.
>
It turns out I was wrong, if accounting is turned on, system records for
each terminating process but not only for that process, so we need to pick
up the correct acct_struct in acct_file via the while loop.
Sorry for making noise, I pull back my comments here.
--
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20191010/43cf5f53/attachment-0001.htm>
^ permalink raw reply [flat|nested] 7+ messages in thread* [LTP] [PATCH v2] acct: fix version check on big endian system
2019-10-10 9:13 ` Li Wang
@ 2019-10-10 11:36 ` Petr Vorel
0 siblings, 0 replies; 7+ messages in thread
From: Petr Vorel @ 2019-10-10 11:36 UTC (permalink / raw)
To: ltp
Hi Li, Ping, Cyril,
> On Thu, Oct 10, 2019 at 4:33 PM Li Wang <liwan@redhat.com> wrote:
> > Ping Fang <pifang@redhat.com> wrote:
> > 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
> > I'm wondering that is there any necessary to use do{}...while loop for
> > entry many times? Since the verify_acct() only check the dummy
> > program(acct02_helper) accounting struct. So in the error logs, we could
> > see some meaningless data(acct02) in entry 2.
> It turns out I was wrong, if accounting is turned on, system records for
> each terminating process but not only for that process, so we need to pick
> up the correct acct_struct in acct_file via the while loop.
> Sorry for making noise, I pull back my comments here.
Thanks for a fix, merged.
Petr
^ permalink raw reply [flat|nested] 7+ messages in thread
* [LTP] [PATCH v2] acct: fix version check on big endian system
2019-10-10 8:17 [LTP] [PATCH v2] acct: fix version check on big endian system Ping Fang
2019-10-10 8:33 ` Li Wang
@ 2019-10-10 11:06 ` Cyril Hrubis
2019-10-10 11:39 ` Petr Vorel
2019-10-10 11:26 ` Petr Vorel
2 siblings, 1 reply; 7+ messages in thread
From: Cyril Hrubis @ 2019-10-10 11:06 UTC (permalink / raw)
To: ltp
Hi!
> 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
Looks good, acked.
Also please consider a patch to the man 5 acct, it says that the version
is always set to 3 for acct_v3 structure.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 7+ messages in thread* [LTP] [PATCH v2] acct: fix version check on big endian system
2019-10-10 11:06 ` Cyril Hrubis
@ 2019-10-10 11:39 ` Petr Vorel
0 siblings, 0 replies; 7+ messages in thread
From: Petr Vorel @ 2019-10-10 11:39 UTC (permalink / raw)
To: ltp
Hi,
> > 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
> Looks good, acked.
> Also please consider a patch to the man 5 acct, it says that the version
> is always set to 3 for acct_v3 structure.
+1.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 7+ messages in thread
* [LTP] [PATCH v2] acct: fix version check on big endian system
2019-10-10 8:17 [LTP] [PATCH v2] acct: fix version check on big endian system Ping Fang
2019-10-10 8:33 ` Li Wang
2019-10-10 11:06 ` Cyril Hrubis
@ 2019-10-10 11:26 ` Petr Vorel
2 siblings, 0 replies; 7+ messages in thread
From: Petr Vorel @ 2019-10-10 11:26 UTC (permalink / raw)
To: ltp
Hi Ping,
> 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
> Signed-off-by: Ping Fang <pifang@redhat.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Thanks for fixing the issue.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-10-10 11:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-10 8:17 [LTP] [PATCH v2] acct: fix version check on big endian system Ping Fang
2019-10-10 8:33 ` Li Wang
2019-10-10 9:13 ` Li Wang
2019-10-10 11:36 ` Petr Vorel
2019-10-10 11:06 ` Cyril Hrubis
2019-10-10 11:39 ` Petr Vorel
2019-10-10 11:26 ` Petr Vorel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox