Re: [PATCH] tst_test.sh: TCONF on xfrm algorithms rejected via netlink extack
Avinesh Kumar via ltp <[email protected]>
| Newsgroups | gmane.linux.ltp |
|---|---|
| Message-ID | <[email protected]> |
Hi Petr, Thank for the review. >> diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh >> index 2a83c17a5efb..8701bb390388 100644 >> --- a/testcases/lib/tst_test.sh >> +++ b/testcases/lib/tst_test.sh >> @@ -266,13 +266,18 @@ TST_RTNL_CHK() >> local msg1="RTNETLINK answers: Function not implemented" >> local msg2="RTNETLINK answers: Operation not supported" >> local msg3="RTNETLINK answers: Protocol not supported" >> + # Since v6.1 the kernel reports an unknown/removed xfrm algorithm via >> + # netlink extack (-ENOSYS + NL_SET_ERR_MSG), which iproute2 prints as >> + # "Error: Requested AUTH algorithm not found." >> + local msg4="Requested .* algorithm not found" >> local output="$($@ 2>&1 || echo 'LTP_ERR')" > nit: we have in $output also "LTP_ERR" in the end (on error)... > >> - local msg >> + local msg match > >> echo "$output" | grep -q "LTP_ERR" || return 0 > >> - for msg in "$msg1" "$msg2" "$msg3"; do >> - echo "$output" | grep -q "$msg" && tst_brk TCONF "'$@': $msg" >> + for msg in "$msg1" "$msg2" "$msg3" "$msg4"; do >> + match=$(echo "$output" | grep "$msg") && \ >> + tst_brk TCONF "'$@': $match" > ... now we print error message also with "LTP_ERR" in the end. > I wonder if we should bother with removing it, e.g. with sed: > > - match=$(echo "$output" | grep "$msg") && \ > + match=$(echo "$output" | grep "$msg" | sed 's/LTP_ERR$//') && \ I tested my patch, and I see atleast the TCONF path is fine, it does not print 'LTP_ERR' - tcp_ipsec 1 TCONF: 'ip xfrm state add src 10.0.0.2 dst 10.0.0.1 spi 0x1000 proto esp enc serpent 0x5a78724d91fbdab8873e6bc7933816f9bb58b3da90ec2a6e0346ba41c6c18c63 auth hmac(rmd160) 0x4b53e65cb2e928d34c0db747782dda0457a3e4ed mode transport sel src 10.0.0.2 dst 10.0.0.1': Error: Requested AUTH algorithm not found. but we will have it printed in TRBOK cases, as it was before this patch also: tcp_ipsec 1 TBROK: ip xfrm state add src 10.0.0.2 dst 10.0.0.1 spi 0x1000 proto esp enc serpent 0x40e68502109572c1014d131358bcc38b45ae02e5bbdae35752de32c2b6c68a6e auth hmac(rmd160) 0x87658785bf2ffc586ce49e4d31318246429063ef mode tunnel sel src 10.0.0.2 dst 10.0.0.1 failed: Error: Requested AUTH algorithm not found. LTP_ERR > > (untested) > > Both w/a this change (can be done before merge). > Reviewed-by: Petr Vorel <[email protected]> > > Kind regards, > Petr Regards, Avinesh -- Mailing list info: https://lists.linux.it/listinfo/ltp