Skip to contentSkip to conversation

pec: Convert to the new API

PATCH Superseded Joerg Vehlow 2 participants 11 messages Mar 15, 2021 – Apr 15, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 pec: Convert to the new API

From: Joerg Vehlow <[email protected]>

---
 runtest/connectors                            |   2 +-
 testcases/kernel/connectors/Makefile          |   2 -
 testcases/kernel/connectors/connector_test.sh |   9 --
 testcases/kernel/connectors/pec/Makefile      |   2 +-
 testcases/kernel/connectors/pec/README        |  48 --------
 testcases/kernel/connectors/pec/cn_pec.sh     |  67 +++++++++++
 .../kernel/connectors/pec/event_generator.c   |  72 ++++++------
 .../kernel/connectors/pec/pec_listener.c      |  54 ++++-----
 testcases/kernel/connectors/pec/run_pec_test  | 107 ------------------
 9 files changed, 124 insertions(+), 239 deletions(-)
 delete mode 100644 testcases/kernel/connectors/connector_test.sh
 delete mode 100644 testcases/kernel/connectors/pec/README
 create mode 100755 testcases/kernel/connectors/pec/cn_pec.sh
 delete mode 100755 testcases/kernel/connectors/pec/run_pec_test
runtest/connectors +1 -1
index 6153a98e6..2c7aed474 100644
@@ -1,2 +1,2 @@
 #DESCRIPTION:Netlink Connector tests
-Connectors connector_test.sh
+cn_pec_sh cn_pec.sh
testcases/kernel/connectors/Makefile +0 -2
index 04d8a4b91..5f668f419 100644
@@ -24,6 +24,4 @@ top_srcdir		?= ../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
 
-INSTALL_TARGETS		:= connector_test.sh
-
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
testcases/kernel/connectors/connector_test.sh deleted +0 -9
deleted file mode 100644
index f92e10b85..000000000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ ! -f /proc/net/connector ];then
-	echo "Connectors 0 CONF : system doesn't support execution of the test"
-	exit 32
-fi
-
-$LTPROOT/testcases/bin/run_pec_test
-
testcases/kernel/connectors/pec/Makefile +1 -1
index fa0aa6828..d9a7f104e 100644
@@ -24,6 +24,6 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
 
-INSTALL_TARGETS		:= run_pec_test
+INSTALL_TARGETS		:= cn_pec.sh
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/connectors/pec/README deleted +0 -48

48 lines not on this page · raw message

testcases/kernel/connectors/pec/cn_pec.sh new file +67 -0

67 lines not on this page · raw message

testcases/kernel/connectors/pec/event_generator.c +34 -38

146 lines not on this page · raw message

testcases/kernel/connectors/pec/pec_listener.c +21 -33

99 lines not on this page · raw message

testcases/kernel/connectors/pec/run_pec_test deleted +0 -107

107 lines not on this page · raw message

Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 pec: Fix multiple event test

From: Joerg Vehlow <[email protected]>

The test case for NUM_EVENTS != 1 was not correct at all. Now the test looks for each event recorded by the generator in the correct order in the listener's log.

Additionally the test is parameterized, to the the number of generated events and the default is now set to 10.

---
 testcases/kernel/connectors/pec/cn_pec.sh     | 98 ++++++++++++++++---
 .../kernel/connectors/pec/event_generator.c   | 54 +++++-----
 2 files changed, 113 insertions(+), 39 deletions(-)
testcases/kernel/connectors/pec/cn_pec.sh +85 -13
index 98abd50fc..b46ce533f 100755
@@ -9,16 +9,48 @@
 # Process event connector is a netlink connector that reports process events
 # to userspace. It sends events such as fork, exec, id change and exit.
 
+TST_OPTS="n:"
 TST_SETUP=setup
 TST_TESTFUNC=test
+TST_PARSE_ARGS=parse_args
+TST_USAGE=usage
 TST_NEEDS_ROOT=1
 TST_NEEDS_TMPDIR=1
 TST_TEST_DATA="fork exec exit uid gid"
 
-NUM_EVENTS=1
-
 . tst_test.sh
 
+num_events=10
+
+usage()
+{
+	cat << EOF
+usage: $0 [-n <nevents>]
+
+OPTIONS
+-n      The number of evetns to generate per test (default 10)
+EOF
+}
+
+parse_args()
+{
+	case $1 in
+	n) num_events=$2;;
+	esac
+}
+
+free_fd()
+{
+	# Find a free file handle
+	local found
+	for fd in $(seq 200); do
+    	rco="$(true 2>/dev/null >&${fd}; echo $?)"
+    	rci="$(true 2>/dev/null <&${fd}; echo $?)"
+    	[[ "${rco}${rci}" = "11" ]] && found=${fd} && break
+	done
+	echo $found
+}
+
 setup()
 {	
 	if ! grep -q cn_proc /proc/net/connector; then
@@ -32,35 +64,75 @@ setup()
 test()
 {
 	local event=$2
+
+	tst_res TINFO "Testing $2 event (nevents=$num_events)"
+
 	pec_listener >lis_$event.log 2>lis_$event.err &
-	pid=$!
+	lis_pid=$!
 	# Wait for pec_listener to start listening
 	tst_sleep 100ms
 
 	# Run with absolute path, so the generator can exec itself
 	generator="$(command -v event_generator)"
-	"$generator" -n $NUM_EVENTS -e $event >gen_$event.log 2>gen_$event.err
+	"$generator" -n $num_events -e $event >gen_$event.log 2>gen_$event.err
 	gen_rc=$?
 
-	# Sleep until pec_listener has seen and handled all of the generated events
-	tst_sleep 100ms
-	kill -s SIGINT $pid 2> /dev/null
-	wait $pid
+	kill -s SIGINT $lis_pid 2> /dev/null
+	wait $lis_pid
 	lis_rc=$?
 
 	if [ $gen_rc -ne 0 -o ! -s gen_$event.log ]; then
-		tst_brk TBROK "failed to generate process events"
+		tst_brk TBROK "failed to generate process events: $(cat gen_$event.err)"
 	fi
 
 	if [ $lis_rc -ne 0 ]; then
 		tst_brk TBROK "failed to execute the listener: $(cat lis_$event.err)"
 	fi
 
-	expected_events="$(cat gen_$event.log)"
-	if grep -q "$expected_events" lis_$event.log; then
-		tst_res TPASS "$event detected by listener"
+	# The listener writes the same messages as the generator, but it can
+	# also see more events (e.g. for testing exit, a fork is generated).
+	# So: The events generated by the generator have to be in the same order
+	# as the events printed by the listener, but my interleaved with other
+	# messages. To correctly compare them, we have to open both logs
+	# and iterate over both of them at the same time, skipping messages
+	# in the listener log, that are not of interest.
+	# Because some messages may be multiple times in the listener log,
+	# we have to open it only once!
+	# This however does not check, if the listener sees more messages,
+	# than expected.
+
+	fd_act=$(free_fd)
+	[ -z "$fd_act" ] && tst_brk TBROK "No free filehandle found"
+	eval "exec ${fd_act}<lis_$event.log"
+
+	failed=0
+	act_nevents=0
+	while read -r exp; do
+		local found=0
+		act_nevents=$((act_nevents + 1))
+		while read -r <&${fd_act} act; do
+			if [ "$exp" = "$act" ]; then
+				found=1
+				break
+			fi
+		done
+		if [ $found -ne 1 ]; then
+			failed=1
+			tst_res TFAIL "Event was not detected by the event listener: $exp"
+			break
+		fi
+	done <gen_$event.log
+
+	eval "exec ${fd_act}<&-"
+
+	if [ $failed -eq 0 ]; then
+		if [ $act_nevents -ne $num_events ]; then
+			tst_res TBROK "Expected $num_events, but $act_nevents generated"
+		else
+			tst_res TPASS "All events detected"
+		fi
 	else
-		tst_res TFAIL "$event not detected by listener"
+		cat lis_$event.log
 	fi
 }
 
testcases/kernel/connectors/pec/event_generator.c +28 -26

90 lines not on this page · raw message

Signature · 1 line
2.25.1
#3 lore raw

PATCH 2/2 pec: Fix multiple event test

In reply to Joerg Vehlow

Hi Joerg,

Review

Quoted 8 lines
(quoted diff) +8 -0
+free_fd()
+{
+	# Find a free file handle
+	local found
+	for fd in $(seq 200); do
+    	rco="$(true 2>/dev/null >&${fd}; echo $?)"
+    	rci="$(true 2>/dev/null <&${fd}; echo $?)"
+    	[[ "${rco}${rci}" = "11" ]] && found=${fd} && break

[[ .. ]] is a bashism, single brackets are enough.

Review

Quoted 3 lines
(quoted diff) +3 -0
+	done
+	echo $found
+}

NIT: adding a comment to before function and space separating section with local helps readability.

# Find a free file handle
free_fd()

{
	local found

	for fd in $(seq 200); do
	...
Quoted 5 lines
(quoted diff) +1 -0
+
 setup()
 {	
 	if ! grep -q cn_proc /proc/net/connector; then

Review setup() · line 71

Quoted 9 lines
(quoted diff) +4 -1
@@ -32,35 +64,75 @@ setup()
 test()
 {
 	local event=$2
+
+	tst_res TINFO "Testing $2 event (nevents=$num_events)"
+
 	pec_listener >lis_$event.log 2>lis_$event.err &
-	pid=$!
+	lis_pid=$!

This change is unnecessary, if you prefer $lis_pid, it should have been in previous patch where you added $pid (no need to repost, I can fix it before merge).

Quoted 37 lines
(quoted diff) +12 -9
 	# Wait for pec_listener to start listening
 	tst_sleep 100ms
 
 	# Run with absolute path, so the generator can exec itself
 	generator="$(command -v event_generator)"
-	"$generator" -n $NUM_EVENTS -e $event >gen_$event.log 2>gen_$event.err
+	"$generator" -n $num_events -e $event >gen_$event.log 2>gen_$event.err
 	gen_rc=$?
 
-	# Sleep until pec_listener has seen and handled all of the generated events
-	tst_sleep 100ms
-	kill -s SIGINT $pid 2> /dev/null
-	wait $pid
+	kill -s SIGINT $lis_pid 2> /dev/null
+	wait $lis_pid
 	lis_rc=$?
 
 	if [ $gen_rc -ne 0 -o ! -s gen_$event.log ]; then
-		tst_brk TBROK "failed to generate process events"
+		tst_brk TBROK "failed to generate process events: $(cat gen_$event.err)"
 	fi
 
 	if [ $lis_rc -ne 0 ]; then
 		tst_brk TBROK "failed to execute the listener: $(cat lis_$event.err)"
 	fi
 
-	expected_events="$(cat gen_$event.log)"
-	if grep -q "$expected_events" lis_$event.log; then
-		tst_res TPASS "$event detected by listener"
+	# The listener writes the same messages as the generator, but it can
+	# also see more events (e.g. for testing exit, a fork is generated).
+	# So: The events generated by the generator have to be in the same order
+	# as the events printed by the listener, but my interleaved with other
+	# messages. To correctly compare them, we have to open both logs
+	# and iterate over both of them at the same time, skipping messages
+	# in the listener log, that are not of interest.
+	# Because some messages may be multiple times in the listener log,

Review setup() · line 109

Quoted 10 lines
(quoted diff) +10 -0
+	# we have to open it only once!
+	# This however does not check, if the listener sees more messages,
+	# than expected.
+
+	fd_act=$(free_fd)
+	[ -z "$fd_act" ] && tst_brk TBROK "No free filehandle found"
+	eval "exec ${fd_act}<lis_$event.log"
+
+	failed=0
+	act_nevents=0

Again two missing local.

Review setup() · line 113

Quoted 4 lines
(quoted diff) +4 -0
+	while read -r exp; do
+		local found=0
+		act_nevents=$((act_nevents + 1))
+		while read -r <&${fd_act} act; do

<& is a bashism. Isn't it using just stdin enough?
while read -r < $fd_act act; do

Quoted 13 lines
(quoted diff) +13 -0
+			if [ "$exp" = "$act" ]; then
+				found=1
+				break
+			fi
+		done
+		if [ $found -ne 1 ]; then
+			failed=1
+			tst_res TFAIL "Event was not detected by the event listener: $exp"
+			break
+		fi
+	done <gen_$event.log
+
+	eval "exec ${fd_act}<&-"

Review setup() · line 135

Quoted 10 lines
(quoted diff) +8 -1
+
+	if [ $failed -eq 0 ]; then
+		if [ $act_nevents -ne $num_events ]; then
+			tst_res TBROK "Expected $num_events, but $act_nevents generated"
+		else
+			tst_res TPASS "All events detected"
+		fi
 	else
-		tst_res TFAIL "$event not detected by listener"
+		cat lis_$event.log

Why removing tst_res TFAIL?
If "cat lis_$event.log" needed, why not having it in previous commit?

Review setup() · line 136

Quoted 1 line
(quoted diff) +0 -0
 	fi

Also whole section would be probably more readable written as:

if [ $failed -eq 0 ]; then
tst_res TFAIL "$event not detected by listener" cat lis_$event.log
return
fi

if [ $act_nevents -ne $num_events ]; then
tst_brk TBROK "Expected $num_events, but $act_nevents generated"
fi

tst_res TPASS "All events detected"

Review setup() · line 137

Quoted 1 line
(quoted diff) +0 -0
 }

All changes suggested for shell:
(FYI in: https://github.com/pevik/ltp/commits/joerg/connectors.v1.fixes)

Kind regards,
Petr

kernel/connectors/pec/cn_pec.sh +30 -25
index 8bbfe3a19..e0821a8ef 100755
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (c) 2008 FUJITSU LIMITED
@@ -39,14 +39,18 @@ parse_args()
 	esac
 }
 
+# Find a free file handle
 free_fd()
 {
-	# Find a free file handle
-	local found
+	local fd found rci rco
+
 	for fd in $(seq 200); do
-	rco="$(true 2>/dev/null >&${fd}; echo $?)"
-	rci="$(true 2>/dev/null <&${fd}; echo $?)"
-	[[ "${rco}${rci}" = "11" ]] && found=${fd} && break
+		rco="$(true 2>/dev/null >&$fd; echo $?)"
+		rci="$(true 2>/dev/null <&$fd; echo $?)"
+		if [ "${rco}${rci}" = "11" ]; then
+			found="$fd"
+			break
+		fi
 	done
 	echo $found
 }
@@ -55,7 +59,6 @@ setup()
 {
 	if ! grep -q cn_proc /proc/net/connector; then
 		tst_brk TCONF "Process Event Connector is not supported or kernel is below 2.6.26"
-		exit 0;
 	fi
 
 	tst_res TINFO "Test process events connector"
@@ -64,24 +67,24 @@ setup()
 test()
 {
 	local event=$2
+	local expected_events lis_rc pid
 
 	tst_res TINFO "Testing $2 event (nevents=$num_events)"
 
-	pec_listener >lis_$event.log 2>lis_$event.err &
-	lis_pid=$!
+	ROD pec_listener \>lis_$event.log 2\>lis_$event.err &
+	pid=$!
 	# Wait for pec_listener to start listening
 	tst_sleep 100ms
 
-	# Run with absolute path, so the generator can exec itself
-	generator="$(command -v event_generator)"
-	"$generator" -n $num_events -e $event >gen_$event.log 2>gen_$event.err
+	# generator must be in PATH
+	ROD event_generator -n $num_events -e $event \>gen_$event.log 2\>gen_$event.err
 	gen_rc=$?
 
 	kill -s SIGINT $lis_pid 2> /dev/null
 	wait $lis_pid
 	lis_rc=$?
 
-	if [ $gen_rc -ne 0 -o ! -s gen_$event.log ]; then
+	if [ ! -s gen_$event.log ]; then
 		tst_brk TBROK "failed to generate process events: $(cat gen_$event.err)"
 	fi
 
@@ -103,14 +106,14 @@ test()
 
 	fd_act=$(free_fd)
 	[ -z "$fd_act" ] && tst_brk TBROK "No free filehandle found"
-	eval "exec ${fd_act}<lis_$event.log"
+	eval "exec ${fd_act} < lis_$event.log"
 
-	failed=0
-	act_nevents=0
+	local failed=0
+	local act_nevents=0
 	while read -r exp; do
 		local found=0
 		act_nevents=$((act_nevents + 1))
-		while read -r <&${fd_act} act; do
+		while read -r < $fd_act act; do
 			if [ "$exp" = "$act" ]; then
 				found=1
 				break
@@ -121,19 +124,21 @@ test()
 			tst_res TFAIL "Event was not detected by the event listener: $exp"
 			break
 		fi
-	done <gen_$event.log
+	done < gen_$event.log
 
-	eval "exec ${fd_act}<&-"
+	eval "exec $fd_act <&-"
 
 	if [ $failed -eq 0 ]; then
-		if [ $act_nevents -ne $num_events ]; then
-			tst_res TBROK "Expected $num_events, but $act_nevents generated"
-		else
-			tst_res TPASS "All events detected"
-		fi
-	else
+		tst_res TFAIL "$event not detected by listener"
 		cat lis_$event.log
+		return
 	fi
+
+	if [ $act_nevents -ne $num_events ]; then
+		tst_brk TBROK "Expected $num_events, but $act_nevents generated"
+	fi
+
+	tst_res TPASS "All events detected"
 }
 
 tst_run
#4 lore raw

PATCH 2/2 pec: Fix multiple event test

Hi Petr,

I will send a v2, but want to comment on some of your remarks first:

Quoted 5 lines · Petr Vorel

Review

Quoted 4 lines
(quoted diff) +4 -0
+	while read -r exp; do
+		local found=0
+		act_nevents=$((act_nevents + 1))
+		while read -r <&${fd_act} act; do

<& is a bashism. Isn't it using just stdin enough?

Actually no, and I don't even think this is a bashism. I guess it is a bug in the checkbashisms script.
[n]<&m means copy file descriptor m to n when executing the command. See [1].
My theory of a bug is even more supported by the fact, that checkbashisms suggests to replace
"<&$var" with ">word 2>&1". so "<&$var" obviously triggered the "&>word"-rule.

This is required here, because $fd_act is a file handle to the actual received events, that is supposed
to be iterated only once, while the expected events are iterated over in the outer loop.
This construct allows "actual" to contain more events, than expected. But all expected events must be
in the correct order in actual.

In v2 I reordered the code a bit (while read....; do ....; done <&$fd). This still triggers checkbashims, but
it this works@least in bash, ash, dash, and busybox sh.

Quoted 18 lines

while read -r < $fd_act act; do

Quoted 17 lines
(quoted diff) +17 -0
+			if [ "$exp" = "$act" ]; then
+				found=1
+				break
+			fi
+		done
+		if [ $found -ne 1 ]; then
+			failed=1
+			tst_res TFAIL "Event was not detected by the event listener: $exp"
+			break
+		fi
+	done <gen_$event.log
+
+	eval "exec ${fd_act}<&-"
+
+	if [ $failed -eq 0 ]; then
+		if [ $act_nevents -ne $num_events ]; then
+			tst_res TBROK "Expected $num_events, but $act_nevents generated"
Quoted 8 lines

Review

Quoted 6 lines
(quoted diff) +4 -1
+		else
+			tst_res TPASS "All events detected"
+		fi
  	else
-		tst_res TFAIL "$event not detected by listener"
+		cat lis_$event.log

Why removing tst_res TFAIL?
If "cat lis_$event.log" needed, why not having it in previous commit?

I moved this up into the loop, to be able to output the expected event, that was not detected.
The output of the actual events is for debugging. It is not strictly required,
but could simplify identifying why an event is missing. Feel free to remove this in v2 ;)

I hope I fixed everything else.

J?rg

[1]
https://pubs.opengroup.org/onlinepubs/009604499/utilities/xcu_chap02.html#tag_02_07_05

#5 lore raw

PATCH 2/2 pec: Fix multiple event test

In reply to Joerg Vehlow

Hi Joerg,

I was not able to run this test without failures (using your original test, just adding missing SAFE_EXECV(), see logs below.

Can you please review my fixes to first commit [1] and after I merge it send v2 of this patch?

Thanks for working on this!

Kind regards,
Petr

[1] http://lists.linux.it/pipermail/ltp/2021-March/021771.html

cn_pec 1 TINFO: timeout per run is 0h 5m 0s
cn_pec 1 TINFO: Test process events connector
cn_pec 1 TINFO: Testing fork event (nevents=10)
cn_pec 1 TPASS: All events detected
cn_pec 2 TINFO: Testing exec event (nevents=10)
cn_pec 2 TPASS: All events detected
cn_pec 3 TINFO: Testing exit event (nevents=10)
cn_pec 3 TFAIL: Event was not detected by the event listener: exit pid: 20816 exit_code: 0 none err: 0
exit pid: 20813 exit_code: 0 exit_signal: 17
fork parent: 20737, child: 20814
exit pid: 20814 exit_code: 0 exit_signal: 17
fork parent: 20737, child: 20815
exec pid: 20815
fork parent: 20815, child: 20816
exit pid: 20816 exit_code: 0 exit_signal: 17
fork parent: 20815, child: 20817
exit pid: 20817 exit_code: 0 exit_signal: 17
fork parent: 20815, child: 20818
exit pid: 20818 exit_code: 0 exit_signal: 17
fork parent: 20815, child: 20819
exit pid: 20819 exit_code: 0 exit_signal: 17
fork parent: 20815, child: 20820
exit pid: 20820 exit_code: 0 exit_signal: 17
fork parent: 20815, child: 20821
exit pid: 20821 exit_code: 0 exit_signal: 17
fork parent: 20815, child: 20822
exit pid: 20822 exit_code: 0 exit_signal: 17
fork parent: 20815, child: 20823
exit pid: 20823 exit_code: 0 exit_signal: 17
fork parent: 20815, child: 20824
exit pid: 20824 exit_code: 0 exit_signal: 17
fork parent: 20815, child: 20825
exit pid: 20825 exit_code: 0 exit_signal: 17
exit pid: 20815 exit_code: 0 exit_signal: 17
cn_pec 4 TINFO: Testing uid event (nevents=10)
cn_pec 4 TFAIL: Event was not detected by the event listener: uid pid: 20844 euid: 65534 none err: 0
exit pid: 17409 exit_code: 0 exit_signal: 17
exit pid: 20842 exit_code: 0 exit_signal: 17
fork parent: 20737, child: 20843
exit pid: 20843 exit_code: 0 exit_signal: 17
fork parent: 20737, child: 20844
exec pid: 20844
uid pid: 20844 euid: 65534 ruid: 65534
exit pid: 20844 exit_code: 0 exit_signal: 17
cn_pec 5 TINFO: Testing gid event (nevents=10)
cn_pec 5 TFAIL: Event was not detected by the event listener: gid pid: 20863 egid: 65533 none err: 0
exit pid: 20861 exit_code: 0 exit_signal: 17
fork parent: 20737, child: 20862
exit pid: 20862 exit_code: 0 exit_signal: 17
fork parent: 20737, child: 20863
exec pid: 20863
gid pid: 20863 egid: 65533 rgid: 65533
exit pid: 20863 exit_code: 0 exit_signal: 17
cn_pec 6 TINFO: AppArmor enabled, this may affect test results
cn_pec 6 TINFO: it can be disabled with TST_DISABLE_APPARMOR=1 (requires super/root) cn_pec 6 TINFO: loaded AppArmor profiles: none

Summary:

passed   2
failed   3
skipped  0

warnings 0

Kind regards,
Petr

#6 lore raw

PATCH 2/2 pec: Fix multiple event test

Hi Joerg,

Quoted 2 lines

I was not able to run this test without failures (using your original test, just adding missing SAFE_EXECV(), see logs below.

Merged this one. Thanks for your work.

Could you please send v2 for the second patch?

Kind regards,
Petr

#7 lore raw

PATCH 1/2 pec: Convert to the new API

In reply to Joerg Vehlow

Hi Joerg,

thanks for rewriting this, I'll try to have look soon.

BTW: would it make sense to rename runtest/connectors to runtest/netlink and move code from testcases/kernel/connectors/ to testcases/kernel/netlink/?

Kind regards,
Petr

#8 lore raw

PATCH 1/2 pec: Convert to the new API

Hi Petr,

Quoted 2 lines · Petr Vorel

BTW: would it make sense to rename runtest/connectors to runtest/netlink and move code from testcases/kernel/connectors/ to testcases/kernel/netlink/?

Maybe kernel/netlink/connector/. Connector is an abstraction on top of netlink with a slightly
different interface than pure netlink (eg. cn_msg instead of nlmsghdr). There are only very few other modules, that use this interface at the moment (MS HyperV, MD,? uvesafb? and dallas' 1-wire).

The question is: Is the interface the correct think to categorize by? If the interface (i.e. netlink) is used for categorization, then some of the crypto tests should also be in this netlink category.

J?rg

#9 lore raw

PATCH 1/2 pec: Convert to the new API

Hi J?rg,

Quoted 6 lines

Hi Petr,

Quoted 2 lines · Petr Vorel

BTW: would it make sense to rename runtest/connectors to runtest/netlink and move code from testcases/kernel/connectors/ to testcases/kernel/netlink/?

Maybe kernel/netlink/connector/. Connector is an abstraction on top of

+1

Quoted 4 lines

netlink with a slightly
different interface than pure netlink (eg. cn_msg instead of nlmsghdr). There are only very few other modules, that use this interface at the moment (MS HyperV, MD,? uvesafb? and dallas' 1-wire).

I'd still put it into netlink and try to put there more general netlink subsystem tests. My objection is that runtest/connectors has only single test and connectors is very generic name.

Quoted 3 lines

The question is: Is the interface the correct think to categorize by? If the interface (i.e. netlink) is used for categorization, then some of the crypto tests should also be in this netlink category.

Thus maybe add some of relevant tests also into runtest/netlink? We shave some kind of duplicity (see runtest/cve, it contains some tests which are also in runtest/syscalls). That would also justify creating runtest/netlink (because having just single test for legacy connector interface in runtest/netlink does not sound good to me).

Kind regards,
Petr

Quoted 1 line

J?rg

#10 lore raw

PATCH 1/2 pec: Convert to the new API

In reply to Joerg Vehlow

Hi Joerg,

Quoted 1 line

+++ b/testcases/kernel/connectors/pec/cn_pec.sh

...

Review

Quoted 4 lines
(quoted diff) +4 -0
+	# Run with absolute path, so the generator can exec itself
+	generator="$(command -v event_generator)"
+	"$generator" -n $NUM_EVENTS -e $event >gen_$event.log 2>gen_$event.err
+	gen_rc=$?

...
I suggest to use "p" exec family - event_generator will be always installed into $LTPROOT/testcases/bin => drop command. And for development (running without make install), there should be always also test directory in PATH.

Quoted 1 line

+++ b/testcases/kernel/connectors/pec/event_generator.c

...

Review

Quoted 7 lines
(quoted diff) +4 -2
-#include "test.h"
+#define TST_NO_DEFAULT_MAIN
+#include "tst_test.h"
 
-	execv(exec_argv[0], exec_argv);
+	/* Note: This expects the full path to self in exec_argv[0]! */
+	SAFE_EXECV(exec_argv[0], exec_argv);

We don't have this yet. But I've sent patch [1] which adds SAFE_EXECVP() because of expecting command to be in PATH.

There are more changes suggested:
* use ROD where possible (cannot be used for wait, because it's not a binary but a shell command)
* remove useless exit 0
* add missing local

The rest LGTM.

Kind regards,
Petr

[1] https://patchwork.ozlabs.org/project/ltp/patch/[email protected]/

kernel/connectors/pec/cn_pec.sh +6 -7
@@ -23,7 +23,6 @@ setup()
 {
 	if ! grep -q cn_proc /proc/net/connector; then
 		tst_brk TCONF "Process Event Connector is not supported or kernel is below 2.6.26"
-		exit 0;
 	fi
 
 	tst_res TINFO "Test process events connector"
@@ -32,15 +31,15 @@ setup()
 test()
 {
 	local event=$2
-	pec_listener >lis_$event.log 2>lis_$event.err &
+	local expected_events pid
+
+	ROD pec_listener \>lis_$event.log 2\>lis_$event.err &
 	pid=$!
 	# Wait for pec_listener to start listening
 	tst_sleep 100ms
 
-	# Run with absolute path, so the generator can exec itself
-	generator="$(command -v event_generator)"
-	"$generator" -n $NUM_EVENTS -e $event >gen_$event.log 2>gen_$event.err
-	gen_rc=$?
+	# generator must be in PATH
+	ROD event_generator -n $NUM_EVENTS -e $event \>gen_$event.log 2\>gen_$event.err
 
 	# Sleep until pec_listener has seen and handled all of the generated events
 	tst_sleep 100ms
@@ -48,7 +47,7 @@ test()
 	wait $pid
 	lis_rc=$?
 
-	if [ $gen_rc -ne 0 -o ! -s gen_$event.log ]; then
+	if [ ! -s gen_$event.log ]; then
 		tst_brk TBROK "failed to generate process events"
 	fi
 
kernel/connectors/pec/event_generator.c +1 -1
index f041341f9..f374688ba 100644
@@ -86,7 +86,7 @@ static void gen_exec(void)
 	fflush(stdout);
 
 	/* Note: This expects the full path to self in exec_argv[0]! */
-	SAFE_EXECV(exec_argv[0], exec_argv);
+	SAFE_EXECVP(exec_argv[0], exec_argv);
 }
 
 /*