From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 988F96FC7 for ; Fri, 7 Apr 2023 17:06:54 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id i9so42806251wrp.3 for ; Fri, 07 Apr 2023 10:06:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887212; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WHvjOt6wwW2RhWrZuiqV/kcUTgNsy/iCkcV9199QHxU=; b=AXTHKZGSmgRLCYiNUf+mXkwvGXYqFZFELpHMt5g6GUwcUD8dkP0/VX4NOBs8r6Mvi3 OG7m09D50CYbZmtMNdbSay4hr0ESH5RW8IkLPiXoxrkUNJjuGaMKp9+3iUuf6qc3nOe4 09IFSr/wTRdEz1o0w2YYdM0LNNHuIxLYeUhiMjyufMbIrWpIPQKGXOqQZSygo7Gkh/1A ZIsS/83mIvjUCKjQ5EZ4REiq+l4Lt56yWrtjNdSzKcPzXoid1CKA4mOgpZ5Ex8Mdlvai M3tD8OdMcrUVLuHd0fCyRIttXZehno3G44PhqOM0kVRyGK90eKxydGr/ccnpuWPCySts k4qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887212; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WHvjOt6wwW2RhWrZuiqV/kcUTgNsy/iCkcV9199QHxU=; b=RzFNMRzHzlaSFHBLY3+dscBl/f3IdHeEUauck4qbLrhenw4gpaeWkfdfZ2eOtj9Ttg SU1wFB/UA7VkDxf4nRAGXf3351FMbsJFOc8FoLCQUUqYioG6+K8YNve4srmkha48BVJl NLdBQT3k8BJEdBS+0YdcMXSQDQvBrUnhIkxzRJwC2Dly0KKMyLyJIu/RdyQs55lhrqQl dar4w8hGZKs17zfVJyIb9OfZGnLiZSJMjkYpYXF1I1g0610t7DGaBzsnyxNdfkYZLH6t 1/75kz9BFIFyfNy6EQHOhlu13tvSUfMtoJN3OYZrLk3D8izC6d85j/Zy1Rj+6disZl/h gMIg== X-Gm-Message-State: AAQBX9fo+fE8N61TID1ARRf5wfdttK2P/IYhRPfQ9tAXUWTCTaSMOpP0 i1gHCcVFSxxqQAbjznY6sA3Iz8KRd3VYPLOGLQ5vAA== X-Google-Smtp-Source: AKy350Y6FTO1rly03tITLfbvlZajkp1N0/TiPAkQ6crZGJY9gav7LHDxCmF2EmYXKVBAx4Wt+AaIzw== X-Received: by 2002:adf:f591:0:b0:2ef:ac43:5135 with SMTP id f17-20020adff591000000b002efac435135mr1723753wro.25.1680887212686; Fri, 07 Apr 2023 10:06:52 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.06.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:06:52 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:35 +0200 Subject: [PATCH mptcp-net 01/13] selftests: mptcp: connect: skip if MPTCP is not supported Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-1-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2392; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=2At//acZBU4t1hPu2dkJ4AOoFnmVZ7wgTUg3SwSVPOk=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2qodCjSrl93g5MZ6A9kfJ16MaNLraflD9UE +TWMv5Tg+SJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqgAKCRD2t4JPQmmg c4YuEADb7gBRKhWqc/VdaYO+KAWtEa49erjD6x7dy8eqrCwQkcKyRMDeSh+/3MOpXnitJgoykPV 6YXw9YtVgfwwE/JjKyvyLUkuFCVUWeY6m0WMB7VXN9UOGywzL2dgB9tUrv6RCTJFn9KZac0RXOg ysrCmppDHmPyiGCFMVoGCcSn58Fufl4WeD/ozTq3l0W+rtdsaRxO2bb9JYdjQ1STaZw3huOrKlU 1ONIXlGTFjGjxUrrIW4+D6mjS33km/WSvQQF/EMLYOjBBjYOpWh1ssJrWf5vb9RGz/cmGqT0KvY SMqct7ab7nbydKbOscFBt5IFhOnv5FmCxxizELXEQnr6egsa8tP4AhZkQDGspwYnbKevSu4OKdH gXX3jmlvfuaRqPwIHzQSL7KfPJRZTaYhDmfMGSREARKx6aygZGRYO2nD8UMbNYgoSqBXDax95nz a3m/zFd+SaWbtLyoJRIecKRyYw4oy/nN4evsHxFHF5Lt4vVpYpHe7NRVmZzQiYxMsALQlVgoUkH 0IwzW018zvWuObedrzJmBb1Whkq2ThZVddZUj2lYu9iOFR4vlb14JxXm/evKjfqnZBOU68lz43C U1rDutYUKGlSHBrgBZ3dmnCOWNedQDqz60cJ6qeGOh99knsf9REf6VehZ7uaEL8+1X3iYVx+8IN HMU+j5VkEkCrYCg== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting MPTCP. A new check is then added to make sure MPTCP is supported. If not, the test stops and is marked as "skipped". A new shared file is added here to be able to re-used the same check in the different selftests we have. Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/Makefile | 2 +- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 4 ++++ tools/testing/selftests/net/mptcp/mptcp_lib.sh | 11 +++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/sel= ftests/net/mptcp/Makefile index 43a723626126..7b936a926859 100644 --- a/tools/testing/selftests/net/mptcp/Makefile +++ b/tools/testing/selftests/net/mptcp/Makefile @@ -9,7 +9,7 @@ TEST_PROGS :=3D mptcp_connect.sh pm_netlink.sh mptcp_join.s= h diag.sh \ =20 TEST_GEN_FILES =3D mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq =20 -TEST_FILES :=3D settings +TEST_FILES :=3D mptcp_lib.sh settings =20 EXTRA_CLEAN :=3D *.pcap =20 diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index a43d3e2f59bb..c1f7bac19942 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -1,6 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 =20 +. "$(dirname "${0}")/mptcp_lib.sh" + time_start=3D$(date +%s) =20 optstring=3D"S:R:d:e:l:r:h4cm:f:tC" @@ -141,6 +143,8 @@ cleanup() done } =20 +mptcp_lib_check_mptcp + ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh new file mode 100644 index 000000000000..eb0feb76e2ab --- /dev/null +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -0,0 +1,11 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 + +readonly KSFT_SKIP=3D4 + +mptcp_lib_check_mptcp() { + if [ ! -f "/proc/sys/net/mptcp/enabled" ]; then + echo "SKIP: MPTCP support is not available" + exit ${KSFT_SKIP} + fi +} --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 835726FC8 for ; Fri, 7 Apr 2023 17:06:55 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id m2so42792407wrh.6 for ; Fri, 07 Apr 2023 10:06:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887213; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=1LbVrMlXn6OtSKSuj2cDj/vMRLBYoDLsgtRwlMCY8Nk=; b=D+Cp2WHWJ4BVylVLO6QCv2ZDTM4jCN0+bsWJup4Mwzqqd3NKJlXH8euReeLelsEtg/ IqjO2dqTohBMHjWKdymqc+0yl5LvXAQw0Qja+l0EPObqds3yZUCALm24mjucDq5fUc4m UIm7WuvOhhE782L+/aLC/yeOH55gffJfF4pOWmkrAxqAnWnPPRd9OFnwFvcRkPG28s8r dslwdx2RM29iLqKsN3ExY7+/LsoQ1I8O/KMo/1Zt0Ff4VDiTRzMZzAeeqGpb9GtIZTQ2 plYsmy8vVTgo97vhmdPMFAgqPjqARHrdX4QgECUg0ZemRFXChThU3dPj2Bn2mr62TyJy XBzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887213; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1LbVrMlXn6OtSKSuj2cDj/vMRLBYoDLsgtRwlMCY8Nk=; b=b0i5hLOCCV+zhogAdC4X10fT++Y5BrwY5cQC1aUzi2VXRJy2WVHkf2t1GlVasZrtq4 OGjTfoEcXq1rouA44qiaEhOYdBa+nmUXoJSO/k1nY7wdKMV0s59BZCSKMoq5QLkdN9Y+ whm9TBhsUPWueMASIr37v6xY0ZtLvH4ljqSFIf6JGgJsqKCm62FzQZIsrKXs5lrafDi/ 3pemN/Pa1+nNxLkKriVoMzXsmkUV8PAs6M/3wRfDxq+uR+LjP9hQHgQZYIISft768bmN 1WaqT5lRPrhwlnsMgt8nwWh76KvUFBeXydZaSGVU9M6pNF3+0qyTT9/5A3x32VnXKyBt Nvvg== X-Gm-Message-State: AAQBX9dmVCiKNIfodZs/6ad/SZdLKiDqqhw+Mv243X1SIXlZ443XSSZE C7W6kmKx6T0fOTGL0iFN8Tsa08Yri1mv+8/1bIxcgQ== X-Google-Smtp-Source: AKy350bAtcAj+D3vpF2wBzxLr88ciRHkUyl4mzROsSes08GiO9bAz0NAoQ6iRAiXN/HrofOlBsDMyA== X-Received: by 2002:a5d:6b03:0:b0:2ef:b257:b46c with SMTP id v3-20020a5d6b03000000b002efb257b46cmr1672808wrw.29.1680887213415; Fri, 07 Apr 2023 10:06:53 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.06.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:06:53 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:36 +0200 Subject: [PATCH mptcp-net 02/13] selftests: mptcp: pm nl: skip if MPTCP is not supported Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-2-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1109; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=/idUvO+rOqbR7dE1Rxuj8uTcrOAR0nnW57Dj67WcElI=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2qQz2GWO6oAa9a++2zrNYAtLX9WDgPsCw+W wprYp0o/SyJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqgAKCRD2t4JPQmmg c2yUD/4y1ngBlkbHkChGyo/YeYjA21C5abuufljYpKRUVadGomdhmychpRgisTI35q6AhN4HfPG Xl9diyHblH2Px4A42/yaKN3oa2Qf+tz/vwudmxxr2KPeHBk04Q20CaYUdhtSlGQ/wEESfvnB6y2 z0zAk4dwJLu5CH0YWur40z9SiemgUnNtnF1mY8Pe0JRvaNw5/7317JD0UQG2AXPZ037RjORz9v4 xCZnihZToIKrvnWpp//ftsW08YIAInXsH2ahHT0ntTLgfiP8vHtvytEoZe3SO9d2Nj5iJ71bDQS TsvYKi2pg8do7wubN0OyEET3x/W6Nov/gPx9xzmiC4aszBb+P8ypfRZnYBSVR5+7vvPMIe8q7hA M+iXX2OdpvZ+C01k+vaIL4Y2oXxpKeMVEEjoH0B/rIOlzwIzDsa6Vkt0IHVwaVA2WKhEZuKddYK nXMA1IiRDT21ysbOmJEcs10H2PcVYUgax3AH/rrndvN5a4tCGZC/cwyY6jc3JaeNJEfryQe1f5w R6omXEHZeyGxaFwiNRFGV7Im4nY+P3J6MZfi2jAaG1bF+BKBglpd2Qn6CN6sLLciHHlLBvapzBz bsDNUVp4K7fa7kgqSTqR7zii8M+Fm2a9F18O+GIqD43q0ayDv/mhgXmM3fPiubnnbXg1X/F6mTr D3oS/0bHf3BX/QA== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting MPTCP. A new check is then added to make sure MPTCP is supported. If not, the test stops and is marked as "skipped". Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: eedbc685321b ("selftests: add PM netlink functional tests") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/pm_netlink.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 89839d1ff9d8..32f7533e0919 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -1,6 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 =20 +. "$(dirname "${0}")/mptcp_lib.sh" + ksft_skip=3D4 ret=3D0 =20 @@ -34,6 +36,8 @@ cleanup() ip netns del $ns1 } =20 +mptcp_lib_check_mptcp + ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 EC3136FC9 for ; Fri, 7 Apr 2023 17:06:55 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id t4so37552551wra.7 for ; Fri, 07 Apr 2023 10:06:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887214; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=jsDba0/wax9/tdHmT0GOCCzvKBI2gaWOdnHmndnX19U=; b=TdnbwOydckr7q0OIBhgU7f7yVZn60/ETf3fljVhS8pmvp87WJHkMMop9nXsCTzyCFq ISmwVd7oGiS22vA1brmJycu2nv/e+GDb1hBjVHo2crzDH+B4um0KNXrvM85DWkMQwuRu wOiJ/DRK5Nyb7SZWWsr9ILSBThSFOo9lD42cNG/sIfIfluEkSlRW7mvnTI6DFa1N6y2D VAU86o5zkTaXMRdyWF5yAYd17iE0iDLUtbXf9enGOn7AqI6+5r/T67ejCA26RodEDpMS vzU2P0sTqYR0XxUtAnrgYqABteYST2YqxhQcOiJE/VDvE0rY+6lt/Cd1C4dKLO9+nBNU RYPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887214; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jsDba0/wax9/tdHmT0GOCCzvKBI2gaWOdnHmndnX19U=; b=oELWL4g4lHeCLpxQ+uBc0GsdcBTWte/HlSdii1ygNQoa5WpfIT+HnHbDOFbVOoOzkG f/agynpdsJG+GAoSFC9J8FVe+qTtz+fT85HUBVZxsr2y1AqrNgrF8d/pkzJqsFTZfnoM mQz981PEDAXKOD6Z3nVUfmwWmH4rRbb7ul4WBPnISJB6C/vLpjwLWwC6F7sTtkXLVpid IigQUHP3JVSNGDNzdZ9/Sv0iPSbIXoACqgR2NGJmq3liVD3xeK1u+FcQaL6Sch1sjyQV J8JLmd78Ln7wEyOLjUvUjeorf7d52rmRxnzQze9qPJ5xONhiXb91RTUMzp9TPaMymKWh IksQ== X-Gm-Message-State: AAQBX9c6BzAE0ubi5wvIhfPMPsWRiDMAWnGLVCup9pTvWuJbPfUNuXa5 rFcrrf6jYae44GtAflQ+1jpXlgQL8oNB4+M95ysAFA== X-Google-Smtp-Source: AKy350azaBqPDctcJn9ZJN55AOpbVUE71JIpQ/KJZ+x3A+mqFzuhSYQb7NNxH27j8UvNZaMFinSbHg== X-Received: by 2002:adf:d84c:0:b0:2ee:e456:5347 with SMTP id k12-20020adfd84c000000b002eee4565347mr1407636wrl.13.1680887214199; Fri, 07 Apr 2023 10:06:54 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:06:53 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:37 +0200 Subject: [PATCH mptcp-net 03/13] selftests: mptcp: join: skip if MPTCP is not supported Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-3-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1158; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=Spoha4/RwCU8H2BJUejEnCzfTeW9L0Y6rFCYaApbkag=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2qfQ6gNoE4FI/qgC2ZskjzyOWuVK+pheCOL hzKwrxvhkqJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqgAKCRD2t4JPQmmg cwlhD/9rKINcls+cr+BzJbUwPsbwUPtJVrzs9mxEq43XVT3150POCdNMnPNkwBnkaqEp16+sBYn jc01EsxOzg03jNRbnzCU83CnpVlmkEPZJ8Hskuw60UWWcZjsd6aGivNaddfO8dnh122K4ilV8Oo 9W5GJceE1So3Ax6bXkoexguVRpZWmt7zP/VWpbMvstzsCHft8bbCiGVKD8eaxaE6zo2+9wEJ5hh 8CBkO2VBkWiqolRu0TpwdiPiRq6GVeM7IPDVyABHzagDVvGIh+887QYeUMjP9SRLKC/8Z2mRiuY AfvruUkho824bf/KAwfkgp5/lo2074TJ1kHDgLERvOaio2mHyqX83OMN76P5VxnYn7MCSRpPbbG YiiZWjgHvx/O5AoIGD+J4Z2Dnw5Ee6fceSqABep1RUMIZtKZ/jETMt0v6R8iNkkVoen/oaNGOI5 OhKyfxSvXf7vtC0xd0u6ywXWvQKHCIlVmZVR9QFV2DkDuFP4gUBc58GZZnRzq9FQyJNq+dRz/yN 80XQvAGQPuPH2yfQbdvjXjXCsD6qKCegU0V+qdHtaB8q1/k6AgP0hbV6SpWt6afkp0LlU73+9K7 +O9xvehXlceWVVk1tt/+tX5MXROb9N0JVzDJJB16smWcg8+c5Gshrb+Py6D49kxzqh+O/6/KsHc 2aeDzAa2Q2piy/A== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting MPTCP. A new check is then added to make sure MPTCP is supported. If not, the test stops and is marked as "skipped". Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: b08fbf241064 ("selftests: add test-cases for MPTCP MP_JOIN") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index fafd19ec7e1f..315ea136fe2c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -6,6 +6,8 @@ # address all other issues detected by shellcheck. #shellcheck disable=3DSC2086 =20 +. "$(dirname "${0}")/mptcp_lib.sh" + ret=3D0 sin=3D"" sinfail=3D"" @@ -132,6 +134,8 @@ cleanup_partial() =20 check_tools() { + mptcp_lib_check_mptcp + if ! ip -Version &> /dev/null; then echo "SKIP: Could not run test without ip tool" exit $ksft_skip --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 0A8C46FC7 for ; Fri, 7 Apr 2023 17:06:56 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id g5so2845253wrb.5 for ; Fri, 07 Apr 2023 10:06:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887215; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tk0yVDpEs88McJbg0HZXb6YKKY66/dBMHpeduD3eqHE=; b=cNGM3F+Nq6Pju9U3WEprAqZ4Xt031U/RGKkzBopfWD2h3G38ErAxolEUd7rOAOXjIP Hl5LaGVTdqPEjfkJ62uQslTxDaoCBaVvW3fUgxYPTZWGgpE3IWYMvjHT6VOfDOYlBWIu G/HNaqfb1U00Tp1v4HDltuV8Zdu2BU+8odQFjm8W+SiVfJ08mluMhBpmgjNdAhBf5Hm7 vutlpRpjJsUQuotuyv9wlhZ4xaORRrk4k/2eyqdjEADYGanHAYO/9tHdGp2NJpsGZSDB 6wPKe2+p0i7ztSHI6OoUK2DivQVouFKqj0Hj6pMZ4iCKL3zpyMlmwjlRv7Sn9TtSeCau pGRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887215; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tk0yVDpEs88McJbg0HZXb6YKKY66/dBMHpeduD3eqHE=; b=Sp0AelmTng6Y4o1eYZPjeymA2j1Bz2ZyzE8aHwMdT+eZgASIGjoACC90ERTyQuGzv4 GZiyAmzNLDf8m5w8UkoL8bheTolTCXbxAUD2lU0dpc2bcB1QklVcpKjjSQXpCUVTj4tE pO7oWDKWmuRIFe2KjdjIZ3TAU6vTl3XYyMGppL46P6sZE2Ey0o8Vxqiv4QSEajWcsq9W lMIfxRH1bnOrmr5E6WDMGipFqAo5Mdu/e5Q7bcWKFiQ3k1+ezjAC68bXOCsrdiD/aQf1 6XD8li2MCx6AAaz+4Cx/H1XH5zbXoeM697e/TKGUAShwMElEVb073oj+GOYmyqjCg4ZS Gflw== X-Gm-Message-State: AAQBX9cFUPV6l6Tza2fB8HbR8NYQxhKixXcHdYkxuT5Pe244G/BSKO0R ZwTJpttf7YU6sB/hq32+tCvEJONqbOwcqzA1rtUvHg== X-Google-Smtp-Source: AKy350YojGNvnygUV0vRf6AxLquOZOgIUae72DtAtHAxtHFu3+2gEF4tt+6dJFtDQWVrqzoCxqPcSg== X-Received: by 2002:a5d:564c:0:b0:2e4:c9ac:c48e with SMTP id j12-20020a5d564c000000b002e4c9acc48emr1739523wrw.1.1680887215061; Fri, 07 Apr 2023 10:06:55 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:06:54 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:38 +0200 Subject: [PATCH mptcp-net 04/13] selftests: mptcp: diag: skip if MPTCP is not supported Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-4-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1132; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=eSP1RheZ+spFnZ1l17hgUmXgc90z52t8DvEZ1M4S+6s=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2q/LKFMXV4JhWIy6ax75Ix4g9yb+rH0ik2C X9lzpFFfUqJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqgAKCRD2t4JPQmmg c5OTD/9WNUNgst8aZS+/iRmTZtEUQ06wMH28AkeghAJt5NTbaSHcPaspqdA2z+R62noyYJ88nrY MHOyyt6tVYXhZ7SMs50DvWwclFyxi3HPkRUpLHRprw9JtINpTf8NCY9u5x64/p4daOhi3HXYdSV tiA7uWOriXeF97sX+GhMUn5bIwt2GlQziV6nZmsyAHRkB8rG7TmrGQCJlpKaHZmy6ocHCpBxwAh 06bOLpUNed+NmgjMqZsk0Ho4GG8xyDDBZq3E7VguyAxiTkD4VajH2rOm5CQefI2BXxkNfReBVIr EVVyEc26iRV+/2GadQZjNeqrLvhm4ot3MSnxoafhyQhKXQFUJwPgLB2J32gblI+aqCpNyjGHT3+ xpXRILEHQ3yaxItkpblnPPaKybAhkKtKo3J1JlSIJpdSTZG7OO/fPkDuwYAkdDiNW3Rh9tm21QX 6AqcVWlvteBFn5ShGaW3BEKtVxvmoPl6iu/tAQvvB2oQhRmDDuRTvfE30pbWNPQRTALDLTe5Q1H CcVT7pi5Vtbe0pbZ+6NcJCo8mB+dqptbCseCT4XTAAlUDzGphehs3zlr7vhT7HNJvz73BLzMude 7H/osYOB7QO6xOz9l4VkzI6CSbKHgXKKsvW0fQhbCOxd/pfLjiSlKFUEgTdgO17YiCNHdBM2WPx kYZ39N0qIQMlz6A== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting MPTCP. A new check is then added to make sure MPTCP is supported. If not, the test stops and is marked as "skipped". Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: df62f2ec3df6 ("selftests/mptcp: add diag interface tests") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/diag.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index ef628b16fe9b..4eacdb1ab962 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -1,6 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 =20 +. "$(dirname "${0}")/mptcp_lib.sh" + sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns=3D"ns1-$rndh" @@ -31,6 +33,8 @@ cleanup() ip netns del $ns } =20 +mptcp_lib_check_mptcp + ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 D37226FCB for ; Fri, 7 Apr 2023 17:06:57 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id m2so42792504wrh.6 for ; Fri, 07 Apr 2023 10:06:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887216; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=2moyIEpgMC4mAHvK5C3jCKDi9tp9AsGCBR572h6d2LM=; b=Ceqy/pePmqCT0yPTuXX4OvV2eUKRsA96GrwZIbHYCYqog8yxxqdbZglb46k9fc/6dd 1mICXI5KjEvTuXovp/5gW8fsAT21Htv7uU8Q+ivOSqgfotmv/E90mL4/FUifsEW4UyjD Mv+y7Gwk6wguYJ3AoKVL8sm4m7zH6s8h3xD7w8ZjOLdYklQ/3JWAZPx2+q8OMsAsI1df nvmp/9IEa/AAKyjHbzqMMQnYhqEldNjbufR06/RLMJSCcLb2RFEuQr6XE2I3ciil1Zkz /HlX6EJG/RwWgA5lqJExYB1UfdXTmY5oGH2BH75ugvM+Li7hv4LobtUlu3W+UZxWr12C vkdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887216; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2moyIEpgMC4mAHvK5C3jCKDi9tp9AsGCBR572h6d2LM=; b=1d5XtALSclKNTvIfHKkPeruvic4XZ6PqVkln8ucprH8lbAojzOVvon8cwO4ZhjRTJT 7cnXcHhmSE3WiLWxMvNq85pZwFFvMf5Ytn+PjXcCBS5tfRGI3yISDvOa1vin0wxLi3KN S537Fh1IfUNmSNyGnRjwyFjupR/4pOJB5gfXdGr9k6Ft6lk7ltUrkaoKkEsP/e7oxWHL yU/wZgAPy/Bz+3phobnyOZdIOROKscAsck1D2bT6j3zUpIdhAEuP8W/IWn9VGm96zFRW pSDQpyY7DHWfG1BwC2Xsu7GTFbruZFV2nB8x4hCpP50UlcA/PMlVaZ11hxhKE0W+mT6b wIaw== X-Gm-Message-State: AAQBX9eB+mAGCaNQVbejYDP9Z/geYZVDs5FBpLXTxgdteCeNMOjUppzq i5NmdXb7MYJ/L0roPY/FRq8B+RdJOh1Aa3iQGEh1JA== X-Google-Smtp-Source: AKy350Yx/PxjgPOwROY/fJNTmZMfwGkCNEfxIeawb/6R7vdAlnXTCxn+id94cEsCT59VJDD+Y+a/UA== X-Received: by 2002:a5d:6988:0:b0:2cf:9889:8428 with SMTP id g8-20020a5d6988000000b002cf98898428mr1824845wru.35.1680887216033; Fri, 07 Apr 2023 10:06:56 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:06:55 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:39 +0200 Subject: [PATCH mptcp-net 05/13] selftests: mptcp: simult flows: skip if MPTCP is not supported Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-5-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1149; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=uQrhrN3VLtLshSxxi4lbPMHbgQWWhmUdbF/7BUpdA1k=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2qiaU6M83MQhlCsURJPoh1eaYjUvYjHaQ9i MkNKgTDi6uJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqgAKCRD2t4JPQmmg c1noEAC7G4dzk7fVUgrOV59QcWxP9w43imP5JGo7/UCwkuhWmtAUsoEFthuu5j1RdzvQupiZMtF U29YGW9B6JGQdyo85an2oZ4TYC4Y9XpR+vj08rccx1AisUkvA5oLyhxAqas/RJ6g195NAMf+eSQ G3aEDD3tvm2CbR6YdW5rIex0PJ8x3+ePcn9Z51DL6c+azMQOzJF/VxJG9Y/SDOZUpZxv/M2LIk8 HGDrRWMfMVSbjst6mLTwiSw4b7S/owCKjjcGejIVj5xF2yEY74SMQfreuQB3GPatPcXK1ZpKmWE YGnU4WmFdJx2cpVSXg1SBnQY5AD+Hn8283ORCttej1dk7x1nq+XT9Nu9NcL5YLxdLjFbBozinVk enhoe/z41Xk+jIEBqcS2m8ZXtfYOrZq2p0sk7XNzcWxJGIb5ER1WwowoU1GRzQggyJT/3vVrsQH 78oEzvAISad11DW5Ui2qwQSsf1Ta4gWF6qql79QiUiR7WBmo/pTMWuPnAVYxOeAaCHpxLAzcYnh 6BL2OpsTAS5sbP9PNv2BJpDCZUGw4PW6aMnin64CDr897ANGK7Bq0G/251LY2a0q+YZicnO0KG8 VSKymjA88ZVtqh9xHTRYNrJoS6eTDg7sSI/GOJg0XOKBLcgkwIHwpj/dolGG6+LVNeoTownpj+2 5EwHPVjWrP4WWOg== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting MPTCP. A new check is then added to make sure MPTCP is supported. If not, the test stops and is marked as "skipped". Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: 1a418cb8e888 ("mptcp: simult flow self-tests") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 9f22f7e5027d..36a3c9d92e20 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -1,6 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 =20 +. "$(dirname "${0}")/mptcp_lib.sh" + sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns1=3D"ns1-$rndh" @@ -34,6 +36,8 @@ cleanup() done } =20 +mptcp_lib_check_mptcp + ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 88997748E for ; Fri, 7 Apr 2023 17:06:58 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id y14so42822660wrq.4 for ; Fri, 07 Apr 2023 10:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887217; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=EbeUnaxCToMYLf90EZg17RWGgr6qa3CnSSvyzF0rqyI=; b=RpjVJIEFkZ7U6+ZCvDzT8mvR8VdhSzB5QCAUQI1JOHI1rLDM+YQFuJfHjpFeaz27cL c4OgaCqpdKru9o7qUMLmOjgyOztVlj4cYv3JjB4atmH12usOsY00QWJWDgnlEbqdDBUN XQPDtSGcYmUJKU4Z4w09HUWGIN9CcG5HGPQPvo/ZYyV3Pr1gn2fkCfyIaThQEk6ejYx8 78QnG5f1rkRnbQCsPMViyTCRMrR/+WXjcy7C9RITM6+RQvMkrJB2m3q/Vp/5SIKnhxvk Nmfpzlai89kXPuo2Ch51SmIH683rpvlKQWeKps9A7sNDqnO3Rv8E3t11AUBUGyhRtqmL cx1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887217; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EbeUnaxCToMYLf90EZg17RWGgr6qa3CnSSvyzF0rqyI=; b=PqSe+3rk7EUK042exybota1VJrl2jOyZJo0hSTExIFKk+ebpSqw4IW/zJZQ7C8Gisd /T8kGWPSBQ01LRi/czULz5EnM2TlEl63+tvXpv4QcbWtxJpNM1fFr0b6MatuZpGzjlvk 4YRbPRK3nBkgbehJhxx3Ud8lpNR13RBEikVQ4n/rQcSKCymlCi7u10LeT//0f6ga9jpT OftQX9YENxuwZNV7UNIBY6CoUeVz2yTUCce73+opbDwMyrJAvRrUIaPrg48gu10OLVv0 vLoKh8Aa4kQMyk3HtuEIZC6zAmIKCr46RGOjXr6+1D95FJFldGJnGf/nlHVH2ufHSbyp VVIQ== X-Gm-Message-State: AAQBX9fxd5rqt2S0DKThPkGNFNmTjLrHXFcd8OvqGm7CztNvcJisGvRk W3lnk1rsbt9Swe/QR0zYJZMnzdpjK3lHEar0zvn0FQ== X-Google-Smtp-Source: AKy350Z6hXLPWs9obxjomBEx5L2o9idCpFI2XldWcEz6T0llVZuL8HYjEOleaXLWC/owFQ6CBCoPgA== X-Received: by 2002:adf:e94a:0:b0:2e3:a038:7870 with SMTP id m10-20020adfe94a000000b002e3a0387870mr2029254wrn.40.1680887216786; Fri, 07 Apr 2023 10:06:56 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:06:56 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:40 +0200 Subject: [PATCH mptcp-net 06/13] selftests: mptcp: sockopt: skip if MPTCP is not supported Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-6-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1130; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=f6gNm3LpzKNwEQa/BeQWxsJzjsjQQQdbyMTTSBpnCog=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2qiW4/hcXwzoaeG5LvapxrRKrlPuFN4T04e REOplcKZSGJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqgAKCRD2t4JPQmmg c0ZkEADLkIUfmWqkZYfPpr/CZIPd24hYVdBU9DA9I1einS7PNPmXHqpPDNHdTBoPwj/nKPYjR7R qO2LOxdFq9THUK4rlYuWPYb31zj65t6ag/RorNr65/teVHlWV7muA8m4b90P//XeXwihKJYuPyz OSJuUVeIiMh4N6Vl3Hb4VOTCV4cqIf8wlF9b+e65mNTD/DO6t9MQ05JlBE1DhK//3LbxYUBVRMC juoKx17pS8xZAsViqobhyCHWDL5UFGpS4YlTnOHeD68CzICIltB82v+5ix3cY0zJBDGstRo4E1F 8l/AKoBlL1qCDIHgV0yZZKDsbCUYKsDW9WGlkKMrhlFdDFIyjdYQVYVs/VAnKOgTXFlLdQLd3YL Qf5Yvo219XxuB6wKPyBmhSAvfXHAk3jnRul/0ufj9QpziZg5H4GhCn772Hpa2s2jpX5b/AlJV/L WCSGingC6vlRBkFifru33aMpzpD32cYBUj6bxc8ybH/wUrKVrmLGV4bsOkji0VjJSMmOPEqSQur Ewnipbe/9pa5WF7GwBun2ftMJ4hn+ZeMYX4ao9ThWXZlYZ//tJbPWsrUxpOjzdsydEEF2fwS2c7 9CC2VRzrC45hKpE8mo4eCfrIGo6oKGJAp/P+uJgPEloCHEpTGJaJN+wClzkb66Tu6TsLiar0QlW G5BozssOsY0Cn+g== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting MPTCP. A new check is then added to make sure MPTCP is supported. If not, the test stops and is marked as "skipped". Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: dc65fe82fb07 ("selftests: mptcp: add packet mark test case") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 1b70c0a304ce..ff5adbb9c7f2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -1,6 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 =20 +. "$(dirname "${0}")/mptcp_lib.sh" + ret=3D0 sin=3D"" sout=3D"" @@ -84,6 +86,8 @@ cleanup() rm -f "$sin" "$sout" } =20 +mptcp_lib_check_mptcp + ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 93EDC6FCA for ; Fri, 7 Apr 2023 17:06:59 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id l12so42766059wrm.10 for ; Fri, 07 Apr 2023 10:06:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887217; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=UPzeNz4zKaIRLJUttjurYcvxC7ulBEdHQ6/xxbF5bsM=; b=WyMxU7OcIm/U+KXvj9hxor0DGEguo0+mw5rR/8rTV3fusdDycqfNVlrJqSFFOP6uah 0UTWjmFD1rZnTyRmv6pNiwZi5aoV9Kij8luHE8+gFz1Hh/Uqf7fpdJi+kDaojcFrRwga O5TYLbnfXTf/IkEla1pe/b4/TOVG/PNAXW1l8W09V/bW/+iPXm9P6L/vteiiB/XR5oLO wT4JMCZA0dx8et9J5LtSqLQ6wmG0Tdx+BtcjxgpwqPtcPLvgBbcECETWHHnRJ5I2JlcL hOQeYJmqT3PuL68It9PPPc4u1SpPh3+rI83uULQrmNeGBh9rRDoNGy1jgg1XdR4aHT7K m5TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887217; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UPzeNz4zKaIRLJUttjurYcvxC7ulBEdHQ6/xxbF5bsM=; b=0z9VKAkCnlpre8upz3nAEfF3mMETe5TCKM9iWqG6V/ODpY8amN9ka/pB5ThIjmV4s1 tb/UDKpmqc+6pEoEZTmkoOyylXfD6+0v6lhA1y0w60BbCvFQ0O25rJH85jOSxDaqG+O3 qjmXX+yi9gm3WNwy5WbLL2uhHurSr+2NyY2BgzmYKcJYYJ0kgcfSN1VE2Mw++5wFbRV4 GGTEZoHslaqf+/GSARJXGffbWfpbzGcji7IYBfJeE8olBQHBn8e+PsxYOUNBQMTXL5Yb 04kjZqcAG63wts0HhUQvGajHgCP5gGxZU6a82TBtPUNHXm1MlF6FC0ym9fMzjkG8Kkbb Y9mA== X-Gm-Message-State: AAQBX9chCwTFNSykI3AGSpInokuVKCqg2bn4kuaqHwgjwSal4s5eZGdO Gs+wdMO5RRKGlGsF68mwT31O8nl+p6ml5SDKGsUITg== X-Google-Smtp-Source: AKy350b9weCQ7lx6iS9V1gekM6hrr7FUB500s0pAjnwxOTG7ivu27aGKlYlLjh0caoP9i/w9446sCQ== X-Received: by 2002:adf:f2cf:0:b0:2ef:b596:3f71 with SMTP id d15-20020adff2cf000000b002efb5963f71mr725964wrp.51.1680887217581; Fri, 07 Apr 2023 10:06:57 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:06:57 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:41 +0200 Subject: [PATCH mptcp-net 07/13] selftests: mptcp: userspace pm: skip if MPTCP is not supported Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-7-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1057; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=zg/b+j2ljOqZD0PGnYAJtZaieQpiMecPLbX5LAyS7oI=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2qp8BhpHWizctQUq7m/xtFcetcxStiTVIxb AP+mGzDUG6JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqgAKCRD2t4JPQmmg c2DfEACJfQHSQZwol/a2BXiUcxZx31t+KK7kVdxAb70+rLs/+UUo83a7BMto8k38IKnuYohlueX rJxeHv2qoWddf3h0e/4/vvvKdb1Esz7eMHD8bpxzaymm/A/oa5MQph47d4AFS5dgZQ5I/xYZCW2 n5A15/IAeFmEvKjcCVuDSG745bqNM24lirQl1Ngeglf5JdaYfX+69bdpvzML2v9gigB6THHxb+o lUGKZdBI84L6XuuLtH+lCg534SeKSp5sn2Etn7SmNF6TxoG6ARbUlN1uDf2osXQrcvyjwmEoP17 pFtzdT9gVxl6wVCx8PgfMhnspnFMXEJ81WlIV1vIMKnxY3k9Q8LTdky7msJR/TUNSlaqPFkFTyP 29F7UHqLlYpcG9YGQqVhtta9brZXujJG70+3qUB/v4KEaaYdwqNQDa5fGPYz2i9lRjwfJ3CH2O9 RvBM3bTa2Q0gH6BmyTQqt8v/jJUTF5/vje71wDZ16L+KBWSmurUs3hxff98I3sE4joEghQThUHG weTTtzwTUjCmpTWvMfnYzjVBTECgN0auGkL+s17cJiW1HP0T1/bSDM1JZCjV8OZMXs/C9dafTG8 c/t4am24zKkD7EOnmuoLec2dWhwWezWvgfaOlbbtwIms51Vl6lR2foWzmHEkX+rF4J2ddV/hgcS OiZl2dXX5TGIg6A== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting MPTCP. A new check is then added to make sure MPTCP is supported. If not, the test stops and is marked as "skipped". Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: 259a834fadda ("selftests: mptcp: functional tests for the userspace = PM type") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/userspace_pm.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index b1eb7bce599d..8092399d911f 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -1,6 +1,10 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 =20 +. "$(dirname "${0}")/mptcp_lib.sh" + +mptcp_lib_check_mptcp + ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Cannot not run test without ip tool" --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 37B666FCB for ; Fri, 7 Apr 2023 17:07:00 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id l12so42766081wrm.10 for ; Fri, 07 Apr 2023 10:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887218; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=p9DcJ49MlKj9JbprI1uzw60BSGsuRrqduARrxsQ6a7w=; b=o9aiv+87YYWn4TmAgyTObloz11V6M7BL9FHsBf9puALAGmTUv6+UUlvVAwaYr29zzo el8Du+qTUwWZnt/sJIo1vR6Haz+8wNzlVVLjXo+L15l+O3umXq1XhTeLTyofttqLQNVJ 99kelCrjHAj+6PJOMdioGAHYTI0J7VhHGbJ5iUlyIHB4rCCcQEEF/W/L0O2UuPjB60BR 3kDdFjGTenMT7pwgx+4bxNNf9ybZeGEE3VLBqRKSi4y09JvYUiwfe52k16xMoj/g8zZT 9NI5fLtUa3T0NdJJ+xzrgBPKwVC0KO2l0fDdDMqfJjstLjQa8Zv2x/Uib40QwzRezAgh iYfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887218; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p9DcJ49MlKj9JbprI1uzw60BSGsuRrqduARrxsQ6a7w=; b=WcyZyNPQYnJ8KX/udcO55Gi1NaNQGf6DQUoHCyTFuBlJ7VLKDaXpxTzvzyAisQe6FV 2euXaCvt9nuQrw7d/bNd6FsXaRoZQGG9Bg6rCcgh1yS61WYIReq3ZE9G3kzGW1bXJAWl bCwSrnzdj3SPd3LoGNONFC+ER3WykBOo3pMKcSIn6628kLqchJhMRDKgaRD7ISvMREks FM7/sM44zDNRsUmJcWbY7n9RUwMNV8RxmTSBm5k36qdknIgi8jAsC/0ldq8sZBLR9ZqH 3QmNCd3aB8dr7l7H0lQzUgX41RTcK2jS97ouNhLCEAtc4m5s56Db1A5bbPdyRgDE740u DFNA== X-Gm-Message-State: AAQBX9eq0GfISnW9d8NsHy6sA8PsX/Tgf43y3/DOSQZHylOzlxtgirnk 50TUJyWl7UliGb5yFOY/xIRlDWvBPR7DoRYQRnjauQ== X-Google-Smtp-Source: AKy350ZB4zd+O+E22NljVp/nFBVuzjqz/lKJ2hDHmGmJahrfYsM5fPA4CfOMRyb6vUxUaQM1gJ0unw== X-Received: by 2002:a5d:6948:0:b0:2e3:a506:e348 with SMTP id r8-20020a5d6948000000b002e3a506e348mr1995546wrw.62.1680887218339; Fri, 07 Apr 2023 10:06:58 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:06:57 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:42 +0200 Subject: [PATCH mptcp-net 08/13] selftests: mptcp: lib: skip if missing symbol Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-8-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2222; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=X3Qtn5Mvdi8jBddUbxBOXMpzGF5snM/Xi7gN1HYSbgw=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2rJhwemuC49BHvAikqmf1pfmICGme1/Ucfi zBNsEZ9FM2JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqwAKCRD2t4JPQmmg c9noEAC1dya85xiaOHAtrrMUExPILCEj//6F6TtbT36FMhoq5NAW1F5BqMRM8MlwNzxs+My5CUp 7Oh+yFNKkpQyaLm6Yr+Icdx2g9fLwc38GjJY5+LaZdhk5tIGqJB/uUKNOWAPqUU2Gp1iV2rF8Fb 0Qjo7mXj4HlZuTo8NgNG4tqrmdo6iozWkX2UJqVl3ZAs9YZNfBQUmcFIriKItmmLZzfVEe1lznk G4ulvM3MzwBg39Ea1RXQ3R3aLU6WqFLt3viIMc/g1K0pxOMcegEsdVFpEdbdkHriTLRX9KsA41l sJeRijySWEK2DMrnnuD6T+G2vSYSBiBQcQvUK4iLvJQKEw2w7pXpjCSCWBs+G13OHKYUIMX/VCG aoekuiCGqg4TazgizSM6wwKcJvz/FAWSfD5Kwb/1SyEHwjq45VzoGFapSyquaZwfT+AqiM+5Ta5 6zz3LfnkkN9Qa5mvMJ7NvrIH0ysX/vZ4hHylfmNeCiEUbXla/Mr4LFg/suERb0epukUxcllD05M AOaS+vbzS5qP8ebkEttYSG9DhT+L8DfrraEFqxBQc7DXbCxDCObU+f4vCq+C9cHeyHFdqBeZGWv 5kCWLdR+KDcsz+cW31Lj5ZxidyoG4xFswQzAPybTEXxQavR9/GRd5ebpalBHt1Pgc3VRe2d5wcH 3D554l1WPDqRoPQ== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting all MPTCP features. New functions are now available to easily detect if a feature is missing. It is going to be used in the following commits. In order to ease the backport of such future patches, it would be good if this present commit is backported up to the introduction of MPTCP selftests, hence the Fixes tag below: this type of check was supposed to be done from the beginning. Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/config | 1 + tools/testing/selftests/net/mptcp/mptcp_lib.sh | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index 38021a0dd527..6032f9b23c4c 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -1,3 +1,4 @@ +CONFIG_KALLSYMS=3Dy CONFIG_MPTCP=3Dy CONFIG_IPV6=3Dy CONFIG_MPTCP_IPV6=3Dy diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index eb0feb76e2ab..c84eb40abd1f 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -1,6 +1,7 @@ #! /bin/bash # SPDX-License-Identifier: GPL-2.0 =20 +readonly KSFT_FAIL=3D1 readonly KSFT_SKIP=3D4 =20 mptcp_lib_check_mptcp() { @@ -9,3 +10,25 @@ mptcp_lib_check_mptcp() { exit ${KSFT_SKIP} fi } + +mptcp_lib_check_kallsyms() { + if [ ! -f /proc/kallsyms ]; then + echo "SKIP: CONFIG_KALLSYMS is missing" + exit ${KSFT_SKIP} + fi +} + +# $1: part of a symbol to look at, add '$' at the end for full name +mptcp_lib_kallsyms_has() { + local sym=3D"${1}" + + if ! grep -q " ${sym}" /proc/kallsyms; then + # We want our CI to complain if a symbol is not found + if [ "${SELFTESTS_MPTCP_LIB_EXTRA_CHECKS:-}" =3D "1" ]; then + echo "ERROR: ${sym} symbol has not been found" + exit ${KSFT_FAIL} + fi + + return 1 + fi +} --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 099CF7481 for ; Fri, 7 Apr 2023 17:07:00 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id hg25-20020a05600c539900b003f05a99a841so7565180wmb.3 for ; Fri, 07 Apr 2023 10:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887219; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6T4ITQ6VrqMaf4A8qiEEE1po9Iz8GqgNhD0fmXqjIp8=; b=63cq6Fna0h/v6aVVMCqKNBfc/BArHfp/1C2EVuGoRFzTKFM+1fbfJ5S6VhTcoPRxFY 96d75APOgL6hhE1l2B0rqv21WftNfAvaOcs+cRDUvwKgLfYuQnCOc2X6uEJhVeZ8+1JS voPd6s84+ZwLMRXMuDx/T7qvNhCR8RAjsQOKFIzrKvdA/Dr9hhaWhG73x0M5uunHYF0d o57oLtDwbzrVGfjLUoZRif0DYV43H/JrrKv1pBHY7DO8i/fytwJ+MgkpTD98vmfIhGjV aRpHfYF3db3R6NDoNJ6HJXKvvXH30u1w8zYq2R3jGLur2xSnRN+NvPOLTxUsF6LCxGJT G9eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887219; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6T4ITQ6VrqMaf4A8qiEEE1po9Iz8GqgNhD0fmXqjIp8=; b=4Banpm58ofwPZm+WAjOZAgeU6pUuVo6MGK+/yG5wda9t9lb6qSx0UImo0K/xj3ulDD t76kwB3ENWjGYygYsIMht/V41H1AORXFnBYk1ERxG6OsBsHIYN83FEQMriux/xd0/Uo+ tl1ZE/90XATo4od+DSMXVZn1MXktXkHG63csslcwKL8A7C/5GhJoJe7EPVVjTBy21fKo Kghzh23rve/U9io5rcSVyfJ8CO/s7zNygsBpa3j7RZ/obAyi7m8zag4wU9y8B6sAVdoB y70Z1g5f9qytHhXRx6jV8+3FLXzwU4ooynbUVU8QrUZifWdwsceOspk2eNjYz9gXPLpp HWkw== X-Gm-Message-State: AAQBX9cifIP2geMuCqDQKdkzE7PYp3pYSHAXlQRdDGfKUoXntKaS7jhA b84o+IOFik+uuyh6uWXgga2W6Usb8ULoWQVaG6k1Ew== X-Google-Smtp-Source: AKy350Ywjz8KMIUiC2wCIDn0GJKmm1FOSOMtpD5a+fs9JdPw/HZEs6fyeooGLpsJVj4zUFokDB4P5g== X-Received: by 2002:a1c:790c:0:b0:3ed:2352:eebd with SMTP id l12-20020a1c790c000000b003ed2352eebdmr1894479wme.11.1680887219221; Fri, 07 Apr 2023 10:06:59 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:06:58 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:43 +0200 Subject: [PATCH mptcp-net 09/13] selftests: mptcp: connect: skip TFO tests if not supported Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-9-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1287; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=6Da5V3QdQOYkkuNlrTEVIEYHtpe8EqDFNSykl1afZ0M=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2ruxOxu2LMthzKRl72HKWzBIqClVjG2U+bA WCbPRl8yWWJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqwAKCRD2t4JPQmmg c9IgEACARpD7rWaNtBjsvpdk4cc8lKBeI+ykMQ/PeQj9dErnw72Kns0RCAFd1+vgmbx8ZGlWnQg menyWh+uj3koB9vedI0be7Y8ftgYMgIxeSTOilKGSgd1cy6QWWUavjfbtA3KJ/rCTVS/EeoCurR Wp1aerH3jUhktHrE6FAIdOHSPvLURSnQ/2WYkAKKvMLM/9cJjNHcWdkv7oy4qYfTsv380+3iasx jAUnNsLIiDfR2SqTRR+8mApdroW0t0rP68VZVgPdH0PIobv7AKNoDyfzg9BsscGEhpbkBk2DNOP 82mW7IvSQJiIKMb1qI6WPd4z2bD+sTIrmi8whWrbW1dNLAUC7iP9F/sKzM6dDTNJfsA1Y5veCIv Sy2qKavjBYEdFop4DVQaTilj5GX3YMIUEhM2xHskxGem4pbvMtanwO7aNtwQ4qKJa+r2Oa866MJ VUjj6zQecECSZgOpe2a+Oee92mi+cPyl/m/AMvdecreWK5DEQoZ23AgdxEWUVENT1qdrQnYP61K D1HOVjgck3MX8CR4B+4ZsvJxFpdgaE+TSRQYwUbIpByF2XycLDizXG/e2sWgx1schgWCuumSKPQ 4aiNDtQUJB2zNwhsj/GB4xPh5sbTWrTuN1MKaa9ZtggCj7gwaWm/jT1i4k/f9ylJpTN4g6/987z JiCClwmfUD17Z8g== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting all MPTCP features. One of them is MPTCP FastOpen. We can skip these tests if the feature is not supported. Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: ca7ae8916043 ("selftests: mptcp: mptfo Initiator/Listener") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index c1f7bac19942..03a9a3519014 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -144,6 +144,7 @@ cleanup() } =20 mptcp_lib_check_mptcp +mptcp_lib_check_kallsyms =20 ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then @@ -767,6 +768,11 @@ run_tests_peekmode() =20 run_tests_mptfo() { + if ! mptcp_lib_kallsyms_has "mptcp_fastopen_"; then + echo "INFO: TFO not supported by the kernel: SKIP" + return + fi + echo "INFO: with MPTFO start" ip netns exec "$ns1" sysctl -q net.ipv4.tcp_fastopen=3D2 ip netns exec "$ns2" sysctl -q net.ipv4.tcp_fastopen=3D1 --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 D48986FCA for ; Fri, 7 Apr 2023 17:07:01 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id v1so42791213wrv.1 for ; Fri, 07 Apr 2023 10:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887220; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=BzVj2jS46RKCHXMMWdHdwHynePTxdjZ49eFuggVzylM=; b=fX0tR/YNFttMVshaQNd+WaVNPgpnFlu5pCDd3FCNyTrQ44+CEgBN3flMLePvuIjPUU rTLqWizEeIoZQJ4KEqswcCQTaZw0K/xFWXgiz4Cp3dBsTIcI3hLRcdgpOtY0czqUzxlP hLOD9RT9gMgR3umEsccbRycvAPzRybvJU8yEimVe7wtIW52Ik4qB29QjZcmfZjPE1w0W FgJki4pQHB6Kq1zIUvfGblOC2jdCSQd0sQCJXN96wSbqKKyxoH1H1en7ge3GSYfGoYHi SwQuqWzaI9AMokSXvbK1y2JPNVvPjElcP/ZUlXIyV/IT7zesLoaEG62U4w7YlAFdVOqC ZcSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887220; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BzVj2jS46RKCHXMMWdHdwHynePTxdjZ49eFuggVzylM=; b=ZzPunoWv4o8fin4aT8e4INsiFVIH9ybYm1tMeJqPpo1uwlxCSZkRHZR1RbXBEMTEYi k43KsD6nRto6uuUPQoIvivW8Dm+srAukD4HAhmMUTvXMS0GjY5hJxubnocXF4vO8fjQ4 hdpF+r7s87yV7pTO8qMOEmoQPYjWXiQk2IOwQpML63bXG9QG3xXZY0WCx0nLhVoS62u7 HtMhwAACyGe4iNBgOjJS6LA7ZEytN7XbwqMZNOapWDgpJhb2UEEFgkEH20sR4z8oeRD4 8jGdEMR17P3XZ5myCHLrDajfCn83y8r+OMqR86q3rrdn72oJVo9rP+P7DmQMplvvzjTO kI3w== X-Gm-Message-State: AAQBX9exbPU880KhYj+O/kbXAYNrhoaRKdqDUdlZZtAuWCDSMgxH6fMc QU7YddE7JlsonciKL9lT2s9PtToYX8xjLvFQOkfZCQ== X-Google-Smtp-Source: AKy350ZSE3S6dLkOxy3f4HnQZpijZTx9ezYHg0lw8t+l6aK51CKd7jESe08u+jMLYXsvc9WXWE287w== X-Received: by 2002:adf:e4c8:0:b0:2d2:1195:bf9d with SMTP id v8-20020adfe4c8000000b002d21195bf9dmr1784758wrm.22.1680887220176; Fri, 07 Apr 2023 10:07:00 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:06:59 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:44 +0200 Subject: [PATCH mptcp-net 10/13] selftests: mptcp: userspace pm: skip if 'ip' tool is unavailable Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-10-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=924; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=rmiyUXE8j9q5wswhMTcVhVwN37ud7yZhRKSf2SLIXtg=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2rb55mudjhr8JiGJi66kkFYzNYkKjgTm2Oq L/sKTVc9OOJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqwAKCRD2t4JPQmmg cx1CD/9JzE8TmGJfdFrMuJMAB/XPrwfV5cDiN6IFeG/e/hYhN2259bE4zOEPqqbFRHiAsc7A7IW CtGam0B+q0BmlpsIObp47k3NiSgXSHFZCuXG8yOxWN63i4/gDRb9rE0bRnuNhfPB8TUE2Zg0ro7 IQblVMx9U/cHlqFUi7UqtH2TF8dOpiRLiq2M0k5Rn+VVIbz89VuEF4IWplMEOI50Rn1kNnRrKp8 joEYjPb8jCwblAMA05DHdi0QWuyjfku/PW9cC+RGIVVjHZLFkyMbWgRsRcMPcb2V3SiDoj0LcVe KF2wuAMYXkMhJFfn0r80jv7ecR2yCI+2KR5wKxH27pCO4rRouV/L7cGvYAKj875QCjWgHSCpLx9 EOLSmFWBCn5Rdj9e4Srba63RztiQox1W3Bv1T/QIXIRP5eZjCTsLe5urULYFRFqKn1l76wuvfJd IuRDhMuwWIbhyI9ozIeIbqIwLRnkQsA2HNMBlOjYOGyC0e/gYsb2fAefOK3Pd9SJhptypTP+NXs WlKTsrbW91q0vIqgXBZiV9u0ePJF3IACw5crvbqwZmbQOQE7mRZnOO6ZvIe4bZDwiwuW2TPoQpC s5E0oxQ4t/Da3PAX+f9/vWf1gC3+p3wr6hM/PZCUdRgUCMyA5RjjhAFZl9Z+r+p7qo0cRfQ6IHz AyYdJF1/FxlPrSQ== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 In case of skip, the return code 4 (SKIP) should be returned, not 1 (FAIL). Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: 259a834fadda ("selftests: mptcp: functional tests for the userspace = PM type") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/userspace_pm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 8092399d911f..192ab818f292 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -8,7 +8,7 @@ mptcp_lib_check_mptcp ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Cannot not run test without ip tool" - exit 1 + exit ${KSFT_SKIP} fi =20 ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 835C66FCB for ; Fri, 7 Apr 2023 17:07:02 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id h17so42773368wrt.8 for ; Fri, 07 Apr 2023 10:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887221; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=AenH2FmFraT4c/STyVW2Wsb0ZFxXwwkey2dSRxiXdek=; b=ymRuJVq+CqGVU7wxwJTU4bOed8dPisVFYCISh97KK2+YYUs9OCWXNOHQCKTIfWf0dZ 1valdGnHlUzXDYNJxS6hvagsu24vT3wOTM2qENOyJaGxi9YvEm3kqSFhWwEjvUlJlZ3h 0ZjGVCbLqMQ6mFJpOt0UQLmt2Kabgvtab1bXeKOxVojmV/7TNT3/68BzmxRI4ACH0lWX Lr3OuZCKGYr8qdVKBoyaWmAfxSZr1+0j68hukKUWuP/oSCrMuueixMM6qE0Y5kBT9LQa TynQlXIFSoOUbvAx+QxKN0W/yX2fduErFr/4Poyy/b7iuuOhDIXajRXGGCkRJ0UnzxFD Xr7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887221; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AenH2FmFraT4c/STyVW2Wsb0ZFxXwwkey2dSRxiXdek=; b=33RQJk/CH4OAzmw/znRpCk+GryIwpaRY0mCywwjYoR1wJWxT+6YJPzWyFxPWB2Cwg/ gbOBcTEBtkvJWJPSmF2uVW+wzJ3u4uEilCp+jYtatPCMsRuaS0Y4yxpWKDYwasBautop pK3kAMhBvs0uhUa27rMOsZmot0cCv6h8NsJQELZUo2m8J7Mh81AUmc2YYM412zizBT39 6j5VEnj6Eqa++IK8api2oPY7W9yDPmNok4lLOVfhayyduoRQkKsUNc6rpEw6JFApwQVu JNlATZ8irSb+Yys+m1L74d75ZPO0Ru8UAJx1MpLy6IcQFwkI01dX80pHh1A/09Ft739D QJ7w== X-Gm-Message-State: AAQBX9fuWObu3Jq5RQjU1VJVClbNZyekv3lMOtOimprVjzsjVoOtdmoa 4o9+06+ujQg8uFjX1P7llng6DWYB9edLNZwwZlec4Q== X-Google-Smtp-Source: AKy350ZX53M8TYGK9vepIDMXbuDT4ejfclJovVJRN8NgQWheS/P0APUPiNVuDl5cGRhw2da2NUVJ9A== X-Received: by 2002:a5d:534a:0:b0:2d2:d324:e44f with SMTP id t10-20020a5d534a000000b002d2d324e44fmr1619167wrv.16.1680887220823; Fri, 07 Apr 2023 10:07:00 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:07:00 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:45 +0200 Subject: [PATCH mptcp-net 11/13] selftests: mptcp: userspace pm: skip if not supported Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-11-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2005; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=27o6Zik/TIbcH0Nu9FuQeDoODeT3HvzzkeUlyOdIA4k=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2rsMBPHaxAhpfS3XhBFqdD2rgK6+6Y21bzZ cfwqC6IQlOJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqwAKCRD2t4JPQmmg c+N6D/98dsE7PCFaJjtW4qyRjw4DKgNKD7HwDYXGorkCjBUHNuheuE2YZf1eZZzWRR9GnGtYtEd OI7CuXTI4yGx9NJwPUSs82fjPmRfET51rPhqjaXrqyv2HUhOXr+PYKRngmr1ErhY+gNaDvMg1dv yNc4r1IwEj9epQMVXMMBakTLHUkr29DABRPWuIOawQSEG3svlc5LMrTtAAc0cz6ipGpTFEuTPm2 7RE0Q6WU856w66yrCJTiPoNl4+JgZsfMO1kX2KfS+7/GL7e55zx79JG+yutGatcP5ubc/A3o9iI 646jNuQy30XKFRqRwUCyuLGKJ4HFLIHKu3agYu2ouv/I/23Jx29xKaMnFQlmvvb0EiaV6nEJfu2 eq55/rw4SnslzmJy3sO7PoSBpttYNPwKXhXOA10GIw5KSVbrCzXj1k8+AwDwwHCyUUeQppXIGSm KJDnD1T8nC8rkjTZ2QS84h74KMkMyceOXGA5S0QbzZ2eIyaogKJXmX2Qn2TcnXBD0CNopL3hhT+ N8IlK5iBZQtriPYul6k7A7hR0579kIRM7pq65rdkcWxFrTOmLGK4Fhx9NTBCjNosBlUCx9dFR6k ygKsn68kdMQol1yaQQ1Vau/UcX9hBr6SBBNQxzDjwc5zmAEvfusfeKeZHM6kmetwsQZXYWvW6Y/ ZUsJDTUJnYwLxLg== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting all MPTCP features. One of them is the new MPTCP Userspace PM. We can skip these tests if the feature is not supported. Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: 259a834fadda ("selftests: mptcp: functional tests for the userspace = PM type") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 ++++++ tools/testing/selftests/net/mptcp/userspace_pm.sh | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 315ea136fe2c..4bc181485fef 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -135,6 +135,7 @@ cleanup_partial() check_tools() { mptcp_lib_check_mptcp + mptcp_lib_check_kallsyms =20 if ! ip -Version &> /dev/null; then echo "SKIP: Could not run test without ip tool" @@ -3045,6 +3046,11 @@ fail_tests() =20 userspace_tests() { + if ! mptcp_lib_kallsyms_has 'mptcp_userspace_pm_'; then + echo "userspace pm tests are not supported by the kernel: SKIP" + return + fi + # userspace pm type prevents add_addr if reset "userspace pm type prevents add_addr"; then set_userspace_pm $ns1 diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 192ab818f292..12556051a72a 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -4,6 +4,12 @@ . "$(dirname "${0}")/mptcp_lib.sh" =20 mptcp_lib_check_mptcp +mptcp_lib_check_kallsyms + +if ! mptcp_lib_kallsyms_has 'mptcp_userspace_pm_'; then + echo "userspace pm tests are not supported by the kernel: SKIP" + exit ${KSFT_SKIP} +fi =20 ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 1E3E97481 for ; Fri, 7 Apr 2023 17:07:03 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id r29so42764967wra.13 for ; Fri, 07 Apr 2023 10:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887221; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=RWiCxDHHz6LUYCJ4tdY+XiUquNVgoQTsyvjrOYA+HmA=; b=Igle3DLqG/eP27NcZPNMBCR1tWThn1ZzUzDWK1PwKH2xrrEaIjHBl+LX1GWU3yfS3I JAW8uRwIbUwFqgnbQTcl1hCUqF08OA+1/+M25TR4h/O40CF4tQanROQHGWkZa1MpPTO5 1Q5PzX6vjefxplwONi8TiA3yhbeoZizlpr8m3VyCtRw4zf6IbigYHz1+wS913Tnfnvza pbwaIqZEWpJ70EzcpRj6b7ozm1m2grnKPag27GGOCRiv7mfykGs3mcLtO9mYTtzzYVep Gtgd4zg6YzSWeMuAPzxAcse0b33DPDVMXnEMEeEZLIkFN5tHjvVlqfGpeXxx70j3ioo/ vF8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887221; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RWiCxDHHz6LUYCJ4tdY+XiUquNVgoQTsyvjrOYA+HmA=; b=nFYthuQbWl8EIxxwaECrS1h/EMjYe1TjDZu0fgYcPGUPJ/jD7g9p+9wzlJVq9F7v6S v449ZOBabdbFALppkSHuc8gYlr0khmgn45EGWk03zrxyTZWVFXgNOyGfD6ZUTkC9JDqy vJUpjFVV0tDG2tqQeq3UV2xflJFroI7zTHUaeTk1tNjuiGUSWms/dBWMt7O8HqaaP0bZ NMUA+58QONXJWMPU0v+zGHJzwoI7vLLGAgYBZdtTa+JT7sDZp9tcQoYEQnhWbowvaPUF Rbo53Ff8fKVy/M7c2oo1o36iPHgjE7HaHnn4wMCDCCBc3+BU5S7/0Wl3KRfDQyWUb9HX wzhw== X-Gm-Message-State: AAQBX9fexhWQVQQthlvXrh20R1Zgj8pQTvv0AC7D1uehDTLvFIUi+maG 7PXQB6T+gCfPmKueV0CGgQqQ9+kQlO11ulxf5DNxxQ== X-Google-Smtp-Source: AKy350b9k8EAtSXzvcxX0Gsl8Mg+SgR01gjXo3su/gemxyA7kvhdsu7IaZqt2qbyClJRvIaq3fShtw== X-Received: by 2002:adf:dd07:0:b0:2e9:d9a8:1a19 with SMTP id a7-20020adfdd07000000b002e9d9a81a19mr1758965wrm.5.1680887221407; Fri, 07 Apr 2023 10:07:01 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:07:01 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:46 +0200 Subject: [PATCH mptcp-net 12/13] selftests: mptcp: userspace pm: skip PM listener events tests if unavailable Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-12-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1108; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=TEFu/15eR5xA13pwqlWNOYVg4ZYhyZXdeDA5Jy5/ZDE=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2rwlx65Sl8jCYu2ZQPn1xl9IvjU+XZBED1K ToPjZxinEGJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqwAKCRD2t4JPQmmg cyczD/9d2Tv8VhKU9SrLx6mZ9Tu7Ob+XW1EUI4A0hwFKVMB7Ghl6i5Yn/5a6xqylSxCIMt4lVaS 2puIcqcwcaKYnTKFvEOCf1DSU4+IW3R7dP9m5Lo3+hutuYFScM/4BNfLBhK6lyBKoUOoRACwXoz qlDKbkiGm4aabcP0j8TvZZqkGfGFJSPJ8ebrFYnbyfKSpa5S7KlFjMQIQcQ+MBtHpE4ITa+7KsM KYO6Y+8B68VfrCtOWMPYTdZH0FRTRMGwZ9nfr8UZI+TM7vUlkMgVWLwQbvSM6emYnN7EITrFv2I ywp6BA2rlQsNkV00C4X/GNfKgx3KzczQ6xkJ+Qh8BwPVoj1rf67JB5mceL4rWMe9ChxuANZU4QT 2EDmusVKTz5d8BJf76zIuh4xfydl+99RnLlIpIJx7OqA4kk3tcT4ECrDfakltSXzqvpS06QW3Qj 4hThJ21E3jc565YQ16YZP82BHyblD5Ds32ukDVdYxA8tyJAz6WzJctupauRKWRd/QvfJEpzEIf+ 8T8PaWwdd6yvshVyinBr8/LVWb7rETR8inrSF74HJnmilPRmxaPshtHHkIJ8YQL4bIIQW8eUKms fzn///9GUHFz5cB8E3Xy7YE5PHYLvRsUkT6YLsvGIidjSexMoUPhf+lyCGtiLfmJ6AQL7QYZib2 8urboga9UjtwKaQ== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting all MPTCP features. One of them is the new listener events for the PM. We can skip these tests if the feature is not supported. Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: 6c73008aa301 ("selftests: mptcp: listener test for userspace PM") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/userspace_pm.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 12556051a72a..015319b705a0 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -915,6 +915,11 @@ test_listener() { print_title "Listener tests" =20 + if ! mptcp_lib_kallsyms_has "mptcp_event_pm_listener$"; then + echo "SKIP: PM LISTENER events not supported" + return + fi + # Capture events on the network namespace running the client :>$client_evts =20 --=20 2.39.2 From nobody Mon Feb 9 20:47:47 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 85457749C for ; Fri, 7 Apr 2023 17:07:02 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id m2so42792678wrh.6 for ; Fri, 07 Apr 2023 10:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680887222; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6ixDrMDwhoIft4NjW3uD/H+PZHgkF6xXWxJXb4s+4VA=; b=pClnqyuZkVVl47KNjlS1MUck9Ko0nqFhQ+LqaOrkPY6GwlyyhEzOCX/RvgiRD+bcqa MPvzqiJvH9pd2rsQ9Mnw/SxQNvQTDahbpuvYFbKgyfkuD6HzlsZ+leNjIjE2hHUEfS8w ynZljV44sCcEHhHf+PF53f0B9Tu6qopcIvl+tDURxmBcmQGDrTR5wLYdwTZzIRLIYd67 P9OgfeFqZHGrcxqwqpV2BBMTBQv42r3A8ipn6vGuPdxfcKrcdTNimqfj+eOmouatqdFQ 6zgd5tiX+1VpUH4rNK9StIwa4EoF58pEFEfKve5oDg5O/b3CaknExPgBhCoKnCKz4J0c JnDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680887222; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6ixDrMDwhoIft4NjW3uD/H+PZHgkF6xXWxJXb4s+4VA=; b=jZKRudC/iKB8OuRu5S3ZwohHrhiKnT5EkvtNvPaQrKrM3Qi7Ybw3NdHaF+tYt1CDxu pnlOQKemzauy3psYTRK621WMeKVERAGoNaUG4/nCgVzgB8GCeeyNAsYSLQinLloZY8Xt Yb9wQdgJ2WAuLT64aGHNWYQRh7hnNg5eNocez9RdJ+vFH6dSzlbyp1oHKOn0MPgmHbr4 4CWbi0Wz8DntyS0kNoKzcic7O1OKX93vWseecKpONAeCycCvbf61gsgB80qwaQ5cOc7j JDSnMuro6lHoMTkX3+o730s5a2ytTskDyhQUNDmV48qxxgPy0uurooM3y3jxBjJT+xMa LTcg== X-Gm-Message-State: AAQBX9dWo89gtBqZ+tB7FV+bk0raw5TD32BuSn2ON/w/aMbnvyJzWc1p VpKP1Bnlychw7tYjdQEapkExa4WSToL9i9dbV7eACA== X-Google-Smtp-Source: AKy350bXkq3wiknPqxMdV1cgVI+GF+nINNwIQYecj82iLSQQeIAiXqeIwZsI0YRbmmA1jAiI/uUeKA== X-Received: by 2002:a5d:5907:0:b0:2d2:ac99:a72 with SMTP id v7-20020a5d5907000000b002d2ac990a72mr1786489wrd.46.1680887222035; Fri, 07 Apr 2023 10:07:02 -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 t5-20020a5d6905000000b002efb4f2d240sm908360wru.87.2023.04.07.10.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 10:07:01 -0700 (PDT) From: Matthieu Baerts Date: Fri, 07 Apr 2023 19:06:47 +0200 Subject: [PATCH mptcp-net 13/13] selftests: mptcp: join: skip PM listener events tests if unavailable Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230406-mptcp-issue-368-selftests-old-kernels-v1-13-246ac567724d@tessares.net> References: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> In-Reply-To: <20230406-mptcp-issue-368-selftests-old-kernels-v1-0-246ac567724d@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1407; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=vUZBWnkYOXG80tzk9dxX0Faz8JbMnWd7bShiTws58ZE=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkME2rRXMdmJ48OVI9SWOTLYvOkBwlnl18bdg0l TaHs4lhHiSJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDBNqwAKCRD2t4JPQmmg cwZwD/9vxIk4w5l6asaHOt3Kjh1QgJv3JaG+PojpIjgs3mvBonmqGNR9OOyAQIuiGLckfvzifmB bSxSbvkV8bbbrUojs5xmTpP7f/2LvDzhSR3iTUDGhPbDCgMOYelNzCz3BlKrMXFDP73bmPDtBct AN/+XxFZhV5iFonRQoqCT04iHRi0JuHqLgrartmPheRJFd8a0L5Zq4VPoWkCkH36BIXAe0L+y0M pk0n4mK57GkWiNXoopGSm4ZHWN0dBP2jzmrfCiRMEEGv/7y8qSzvOjr2vVpdf2RUjBoDg133i1L QgtzKbHScHTp1KqHQqdKTj6dC88c0MSq+XHaWBNDCCZyaQJHf6lF9sckVS+a/oZsChRz8LV0B1t qRqATqs5dsYOmmN7zopsO1emFRpEzSWSrl3a4HJfVxBvpeh28nYdozL3dIoiPCMh7u7PpZkF4/W fL5cHnshQrGOPjpXvUJD9YRXTPdLCeZ9CQbRMp44DDn3hgujNbbXEvLBcrqcsuDNRQ4n79xiIsY EFnZPv3Sthl3/GJZ1dlw0f8gw6iIRGFpqg1crPFQY+X1TwvWUaTHpRFk4mQYMxNyBWi8OzRmm2I TMlTqimvckcv10D2MPCz9jclxiqX8L1ALeK2v7LDh7f9cJle5GqtU+uxi2eKCampzL/037xdAR2 P0ybdkJljGAvnBw== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Selftests are supposed to run on any kernels, including the old ones not supporting all MPTCP features. One of them is the new listener events for the PM. We can skip these tests = if the feature is not supported. Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes: 178d023208eb ("selftests: mptcp: listener test for in-kernel PM") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++++-- 1 file changed, 6 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 4bc181485fef..91a1e8802fbd 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2689,8 +2689,12 @@ add_addr_ports_tests() chk_add_nr 1 1 1 chk_rm_nr 1 1 invert =20 - verify_listener_events $evts_ns1 $LISTENER_CREATED $AF_INET 10.0.2.1 101= 00 - verify_listener_events $evts_ns1 $LISTENER_CLOSED $AF_INET 10.0.2.1 10100 + if ! mptcp_lib_kallsyms_has "mptcp_event_pm_listener$"; then + printf "\t\t\t\t\t SKIP: PM LISTENER events not supported" + else + verify_listener_events $evts_ns1 $LISTENER_CREATED $AF_INET 10.0.2.1 10= 100 + verify_listener_events $evts_ns1 $LISTENER_CLOSED $AF_INET 10.0.2.1 101= 00 + fi kill_events_pids fi =20 --=20 2.39.2