From nobody Tue May 21 12:04:38 2024 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CAFC1DCB0 for ; Thu, 22 Jun 2023 15:43:18 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-3fa74d06d72so6930335e9.3 for ; Thu, 22 Jun 2023 08:43:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1687448597; x=1690040597; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RL2ww5BhWG5HnLODSjWyX0LPEFZNLOp9429c6VUhcsg=; b=zRbtUkr47Bors4qz9RCh81gmBky2QP9LRtmLksWsD1Uo4TgICVH+R8aqVsfEPp2V9a XIpfs0Zh8pP0HuP6miqH5gKXkx+ZUV1Ye5X010p22NR0br6qSJGXhe369sGD5+8hFS2j ialQDyovZorm39xrj29JAWhn3g6P2Msw9yGGuUbMhmcM59lWNOfAN0w/Of+AkAybiU7z XDBai01QM3HgPzJuGg5urh/WFCIJfDrcTOfOwQpPzml+SewGH2DLN7+pc0RD6sJwBfvY WWeQjNjJ4Xr34R4n6u0ukNMElQhvT33U17rxMkbYLQj9NyPRyegcLcSAZ93+Gu9c6OWT WlaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687448597; x=1690040597; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RL2ww5BhWG5HnLODSjWyX0LPEFZNLOp9429c6VUhcsg=; b=AWu5fLpv/DxJbckfcemK43c/iULDkBspjZGV7GAVREHxw+3Rr4JQSGZgzXgO5AAFke 4V2SKROR1oCkzG3AmfXrVFstfYe/Q//x3J4h5Ne0xu9Y8nUiBqIbfk9dlPnwd0qw98Lz z0f/MN+Aqj8BxZ9d+AE6MviN0lDTtk4q8vRF83BWBjXlgqdwca4VD4Sh7mEyV9XgNUna rU81A2qvdhEFQZb3H4HmDA2NUuQ3BQGyMJZxMq/y5n+OXUav5y9+fFbK03Psp4enKCHg oHpYrj/qUtaH8Ed9qyqhc5gXhPShoxJVwuqIGvv3tor35Fs805BFiyFFOOpeFg/t58ac 2gNg== X-Gm-Message-State: AC+VfDzn3bI5dl9CWFcotyvqYB9dvYTM+IPSdv/LNMCypWUunrJrnohr WsZfXNWGes5a5+oTPqG1uW9fcQ== X-Google-Smtp-Source: ACHHUZ6TdIaTIuV2ZZvYJyiNoQhA+63sLgCnnOkLIphaq8JI7v3c6LkN6eLRdEHiz8qBU8OmVQv+GQ== X-Received: by 2002:a05:600c:2288:b0:3fa:3188:5ee5 with SMTP id 8-20020a05600c228800b003fa31885ee5mr1885515wmf.38.1687448596197; Thu, 22 Jun 2023 08:43:16 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id w21-20020a1cf615000000b003f8126bcf34sm19043176wmc.48.2023.06.22.08.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 08:43:15 -0700 (PDT) From: Matthieu Baerts To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: Geliang Tang , mptcp@lists.linux.dev, Matthieu Baerts Subject: [PATCH 6.1.y] selftests: mptcp: join: fix "userspace pm add & remove address" Date: Thu, 22 Jun 2023 17:43:07 +0200 Message-Id: <20230622154307.3362179-1-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2047; i=matthieu.baerts@tessares.net; h=from:subject; bh=/COgABNFKEmpsVCn7H/JN7gcVURv0ckEQOgHuis7UI0=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBklGwLVua3X/RURsj8DnGYtHqlF+hZllNDkyTq7 16IaUAvspiJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZJRsCwAKCRD2t4JPQmmg c2mqEADgCKv85HPLCHKCDN1XTe2DNRDjh4eht/LiQIl/wMOVYTUlZP8MysTkTHQCiP/k2QUNEgK kReldYPu8AZUVamnEOyYSHDSafth95i5hQ6icIn9jFhRR+sNJE93dwAcI8t5gPwDCdAGOKrb0yb 43Dmt8zdcIGEstCToazlMV3/Ezojv9NYJ4G3aXkJl2NjMcMJZ5VvaMiV/2N4YZIwt9QGuDeTeiD XlzKtKPQm9FLvsWlG2ZOP2CzaS2HkxB9SJFr6Q4Z08JxdyxSlWh+N33JDMitFBrRKbnpideQNSQ 55iJDtMwzrsRO/0aUvh+tZzvOXlEkbm4WD0atR5OMaRQZMshZIT8HzoakcZqrpwENlP56kC29KY FAh8bg59qUALoNiKiqy0A40rTg0uzw6GUaEWH8veuVJqf4YgPcl5/9LnBC8ZRgjszwz3bWb1fXQ oecPLmb9VgA+qQHc1U0M8Tr4YUCfP+oxtumNsJU7/QyRhKXJE1eoq5qkz4syxFYk4kZw1E3n8yh QOoo5/qJZ7h5t7OdqobMojKq9Ak8KBX7fEFsLFwaBvGrMF/RFH9nNbJ7vTS+rn5uW2Dj0Bwx//f e16dY2LsP3nj1ozQGWRHXFJlKa52MIcVZdKxc+BgvIeXKnQUrHttA2AYWh156vi43wZpS4vA74q pxDScUtj+Qc0Rxg== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It looks like this test was broken in v6.1 after the backport of commit 48d73f609dcc ("selftests: mptcp: update userspace pm addr tests"). It was not working because the commit ad3493746ebe ("selftests: mptcp: add test-cases for mixed v4/v6 subflows") is not in v6.1. This commit changes how the connections are being created in mptcp_join.sh selftest: with IPv6 support always enabled. But then in v6.1, the server still create IPv4 only connections, so without the v4-mapped-v6 format with the "::ffff:" prefix like we have in v6.3. The modification here adds a support for connections created in v4 as well so it fixes the issue in v6.1. This patch is not needed for the selftests in v6.3 because only IPv6 listening sockets are being created. Fixes: 8f0ba8ec18f5 ("selftests: mptcp: update userspace pm addr tests") Cc: stable@vger.kernel.org Signed-off-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 2a238ae842d8..7b65003ee8cf 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -946,11 +946,12 @@ do_transfer() sp=3D$(grep "type:10" "$evts_ns1" | sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') da=3D$(grep "type:10" "$evts_ns1" | - sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + sed -n 's/.*\(daddr[46]:\)\([0-9a-f:.]*\).*$/\2/p;q') + echo "$da" | grep -q ":" && addr=3D"::ffff:$addr" dp=3D$(grep "type:10" "$evts_ns1" | sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q') ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id - ip netns exec ${listener_ns} ./pm_nl_ctl dsf lip "::ffff:$addr" \ + ip netns exec ${listener_ns} ./pm_nl_ctl dsf lip "$addr" \ lport $sp rip $da rport $dp token $tk fi =20 --=20 2.40.1