[PATCH 5.15] selftests: mptcp: join: fix "invalid address, ADD_ADDR timeout"

[PATCH 5.15] selftests: mptcp: join: fix "invalid address, ADD_ADDR timeout"

[Matthieu Baerts]

The "Fixes" commit mentioned below adds new MIBs counters to track some
particular cases that have been fixed by its parent commit 150d1e06c4f1
("mptcp: fix race in incoming ADD_ADDR option processing").

Unfortunately, one of the new MIB counter (AddAddrDrop) shares the same
prefix as an older one (AddAddr). This breaks one selftest because it
was doing a grep on "AddAddr" and it now gets 2 counters instead of 1.

This issue has been fixed upstream in a commit that was part of the same
set but not backported to v5.15, see commit 6ef84b1517e0 ("selftests:
mptcp: more robust signal race test"). It has not been backported
because it was fixing multiple things, some where for >v5.15.

This patch then simply extracts the only bit needed for v5.15. Now the
test passes when validating the last stable v5.15 kernel.

Fixes: f25ae162f4b3 ("mptcp: add mibs counter for ignored incoming options")
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
Hi Greg, Sasha,
Here is a fix just for v5.15, where f73c11946345 ("mptcp: add mibs
counter for ignored incoming options") has been backported but not
6ef84b1517e0 ("selftests: mptcp: more robust signal race test").
Thanks!
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 3be615ab1588..96a090e7f47e 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -732,7 +732,7 @@ chk_add_nr()
 	local dump_stats
 
 	printf "%-39s %s" " " "add"
-	count=`ip netns exec $ns2 nstat -as | grep MPTcpExtAddAddr | awk '{print $2}'`
+	count=`ip netns exec $ns2 nstat -as MPTcpExtAddAddr | grep MPTcpExtAddAddr | awk '{print $2}'`
 	[ -z "$count" ] && count=0
 	if [ "$count" != "$add_nr" ]; then
 		echo "[fail] got $count ADD_ADDR[s] expected $add_nr"

---
base-commit: f48aeeaaa64c628519273f6007a745cf55b68d95
change-id: 20230428-upstream-stable-20230428-mptcp-addaddrdropmib-b078a0442078

Best regards,
-- 
Matthieu Baerts <matthieu.baerts@tessares.net>

Re: [PATCH 5.15] selftests: mptcp: join: fix "invalid address, ADD_ADDR timeout"

[kernel test robot]

Hi,

Thanks for your patch.

FYI: kernel test robot notices the stable kernel rule is not satisfied.

Rule: 'Cc: stable@vger.kernel.org' or 'commit <sha1> upstream.'
Subject: [PATCH 5.15] selftests: mptcp: join: fix "invalid address, ADD_ADDR timeout"
Link: https://lore.kernel.org/stable/20230428-upstream-stable-20230428-mptcp-addaddrdropmib-v1-1-51bca8b26c22%40tessares.net

The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html

Please ignore this mail if the patch is not relevant for upstream.

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests

Re: [PATCH 5.15] selftests: mptcp: join: fix "invalid address, ADD_ADDR timeout"

[Matthieu Baerts]

On 28/04/2023 11:46, kernel test robot wrote:
> FYI: kernel test robot notices the stable kernel rule is not satisfied.
> 
> Rule: 'Cc: stable@vger.kernel.org' or 'commit <sha1> upstream.'
> Subject: [PATCH 5.15] selftests: mptcp: join: fix "invalid address, ADD_ADDR timeout"
> Link: https://lore.kernel.org/stable/20230428-upstream-stable-20230428-mptcp-addaddrdropmib-v1-1-51bca8b26c22%40tessares.net
> 
> The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
> 
> Please ignore this mail if the patch is not relevant for upstream.

@Stable team: I confirm, this is not relevant for upstream, this is a
specific patch for v5.15 only.

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Re: [PATCH 5.15] selftests: mptcp: join: fix "invalid address, ADD_ADDR timeout"

[Greg KH]

On Fri, Apr 28, 2023 at 12:30:00PM +0200, Matthieu Baerts wrote:
> On 28/04/2023 11:46, kernel test robot wrote:
> > FYI: kernel test robot notices the stable kernel rule is not satisfied.
> > 
> > Rule: 'Cc: stable@vger.kernel.org' or 'commit <sha1> upstream.'
> > Subject: [PATCH 5.15] selftests: mptcp: join: fix "invalid address, ADD_ADDR timeout"
> > Link: https://lore.kernel.org/stable/20230428-upstream-stable-20230428-mptcp-addaddrdropmib-v1-1-51bca8b26c22%40tessares.net
> > 
> > The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
> > 
> > Please ignore this mail if the patch is not relevant for upstream.
> 
> @Stable team: I confirm, this is not relevant for upstream, this is a
> specific patch for v5.15 only.

Not a problem, now queued up, thanks!

greg k-h

Re: [PATCH 5.15] selftests: mptcp: join: fix "invalid address, ADD_ADDR timeout"

[Matthieu Baerts]

On 28/04/2023 13:12, Greg KH wrote:
> On Fri, Apr 28, 2023 at 12:30:00PM +0200, Matthieu Baerts wrote:
>> On 28/04/2023 11:46, kernel test robot wrote:
>>> FYI: kernel test robot notices the stable kernel rule is not satisfied.
>>>
>>> Rule: 'Cc: stable@vger.kernel.org' or 'commit <sha1> upstream.'
>>> Subject: [PATCH 5.15] selftests: mptcp: join: fix "invalid address, ADD_ADDR timeout"
>>> Link: https://lore.kernel.org/stable/20230428-upstream-stable-20230428-mptcp-addaddrdropmib-v1-1-51bca8b26c22%40tessares.net
>>>
>>> The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
>>>
>>> Please ignore this mail if the patch is not relevant for upstream.
>>
>> @Stable team: I confirm, this is not relevant for upstream, this is a
>> specific patch for v5.15 only.
> 
> Not a problem, now queued up, thanks!
Thank you!

Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net