Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        UNGLinuxDriver@microchip.com,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, linux-kernel@vger.kernel.org
Subject: [PATCH net-next 3/4] selftests: net: tsn_lib: allow multiple isochron receivers
Date:   Sat, 24 Sep 2022 00:00:14 +0300
Message-Id: <20220923210016.3406301-4-vladimir.oltean@nxp.com>
In-Reply-To: <20220923210016.3406301-1-vladimir.oltean@nxp.com>
References: <20220923210016.3406301-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kjtbgfB4LiYXfQrPR7ALrHBrl17aAFvl7T8p845VnXpgbe1UTTkyPK+KmhKY?=
 =?us-ascii?Q?FAQB9q1D1vPnFIkzRbHlvDfKVxXLx/z3/Us/JLyt4yT9jO5YWz1GTHQIoBtp?=
 =?us-ascii?Q?ARCT0a9dR6IcV+Tt0KSqFHdJmEuex41kx9TvXRA+1eJLQs31j44raIspo6/Q?=
 =?us-ascii?Q?uJW3F8aPriN6xYzcPJDtMmZnKUEhhYjaHAa19NQYbHd19/aK40m/Ju6J7b2R?=
 =?us-ascii?Q?gHAvVz0XFE8RlUIeSJKJsjf5yfSWCNH7yeR9dqoDNYEn0liWRNReVlX/AsaF?=
 =?us-ascii?Q?8bVJl74/KyjDKC0VcqQCIObW6k6hr1QEh68ZSKr5WZmBf7it4mlpkUGYK5qO?=
 =?us-ascii?Q?10Pby9XpB9rn5kS2GIZjeFsLrIQ6TdvCHWviprcB8XSKZBvMWLmdDiKruQK3?=
 =?us-ascii?Q?ul1TRYQE3+cQGwPCLH4Q6zKuV3hyDeSdphsbFoD4td9ULh1D2SdD4mTghNLf?=
 =?us-ascii?Q?zy7A/JeRLH4nT3SLZqNXmD5Ob7/rCAEPcVnkDwoxWX/lYYJYGWQzOP7lpBbq?=
 =?us-ascii?Q?sbgZp/pCWFkM41iCANVtbyafJFvuRxB+/5JNRNAeNo8dHEfuzydf0yTSuEg9?=
 =?us-ascii?Q?fr5CHqKn4cWq9RSS5CTqdyPJSWOOn1bI24rTqO5UIie5YGLABPBtcUDGm26S?=
 =?us-ascii?Q?NxmiIPBReZtc3GCqINuIg9oKFN1JM9NXgaAqq4TI96cvLPAjoCuR+VPB1Asu?=
 =?us-ascii?Q?xa1KxLKa5agUTyiqgJTfK7b5H8F4vRzzUi6j4/6xFzj+crasIFd7XYmg7hh8?=
 =?us-ascii?Q?vYnCshdkdRWq43T7EP+IaK9854mFR696Tbn79ykrOT7D0RsG+WVG4BaKbQHd?=
 =?us-ascii?Q?cgSL+SDixEPdKDRVBD7SYzXU9ihVX57QfwS8c/mf91FUWiYozI52bGBj0yUB?=
 =?us-ascii?Q?xHqyl/FWFcaHEnPwbtOAfTM+cTKkb2BUvVYbjCB0wf06JLJzYZKuETDwlBm0?=
 =?us-ascii?Q?FNSfrhof6ZKHGW+pgz8XX69fmBIp4e1Ni1+vehNYzz1zsDcxAq1PIVrrHdR1?=
 =?us-ascii?Q?JQdSZ4gxyHcSmJ4+cwZzcDZiNiq84oh25Ewu3SthjNSYSMO3nye2il0GnxOZ?=
 =?us-ascii?Q?OU8GgodpaOQVIN54k/6n4vsmy87FLNPirdrZWLHfck4phG9m2/0lEA7KQ2wn?=
 =?us-ascii?Q?FIdmjLgfM0sCuJICiLtCwmWnlTD6K09mRvGk1xbF7m6F7wicu4OHpdGxyyAh?=
 =?us-ascii?Q?GyU4mdk5pGMZyF+FLhgXqf0udjTr4ohI7gQtZogJM+7WQ7kviyQ2JXojrkv+?=
 =?us-ascii?Q?eX0MPX9aDSXjGOY6fHNGgTqxS2SwastcwvwvBAzYYJbCkHVSCN9uWExV8Eh7?=
 =?us-ascii?Q?e86+g1IZj/00IIjPFNmuApGrUEEZMPWTrT3/clDcN3wtdjWUoo5NHzXhbn0K?=
 =?us-ascii?Q?Uueif9hlPa9SlQi5zksOs1AU4CN2yPamRRIlXaQb/YsNH1xfmfnx/3xLDmTJ?=
 =?us-ascii?Q?NUf0i8XNzK1aRJQY3mlbPeny4k9Vrp0aOqwTu7Jh1Ssfuw9KCT9TL/xgbQuR?=
 =?us-ascii?Q?TPt93mbfmshm3dYEeoe+B9hldQtKMyKZUD5iAFSWpHagZKgDZExiwqBlN6rX?=
 =?us-ascii?Q?qzrC6zAOAKW+ZjGAO3wPsJmTvA40bVARllO8+rBfAyYFKBeuPDiJbDm0cqNc?=
 =?us-ascii?Q?qw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ea5b570-cfd9-4879-52c7-08da9da6ac66
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 21:00:41.0896
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Av4nb4pYO/VI1rn0RBufmHDjclP1mq1GwJNDbwndVdqFVbsP3ZZ1ovahVTCAv2mrcWyfDXk35VMZ92iiGADTdg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7863
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Move the PID variable for the isochron receiver into a separate
namespace per stats port, to allow multiple receivers (and/or
orchestration daemons) to be instantiated by the same script.

Preserve the existing behavior by making isochron_do() use the default
stats TCP port of 5000.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 .../testing/selftests/net/forwarding/tsn_lib.sh  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/net/forwarding/tsn_lib.sh b/tools/testing/selftests/net/forwarding/tsn_lib.sh
index ace9c4f06805..20c2b411ba36 100644
--- a/tools/testing/selftests/net/forwarding/tsn_lib.sh
+++ b/tools/testing/selftests/net/forwarding/tsn_lib.sh
@@ -147,7 +147,9 @@ isochron_recv_start()
 {
 	local if_name=$1
 	local uds=$2
-	local extra_args=$3
+	local stats_port=$3
+	local extra_args=$4
+	local pid="isochron_pid_${stats_port}"
 
 	if ! [ -z "${uds}" ]; then
 		extra_args="${extra_args} --unix-domain-socket ${uds}"
@@ -158,16 +160,20 @@ isochron_recv_start()
 		--sched-priority 98 \
 		--sched-fifo \
 		--utc-tai-offset ${UTC_TAI_OFFSET} \
+		--stats-port ${stats_port} \
 		--quiet \
 		${extra_args} & \
-	isochron_pid=$!
+	declare -g "${pid}=$!"
 
 	sleep 1
 }
 
 isochron_recv_stop()
 {
-	{ kill ${isochron_pid} && wait ${isochron_pid}; } 2> /dev/null
+	local stats_port=$1
+	local pid="isochron_pid_${stats_port}"
+
+	{ kill ${!pid} && wait ${!pid}; } 2> /dev/null
 }
 
 isochron_do()
@@ -219,7 +225,7 @@ isochron_do()
 
 	cpufreq_max ${ISOCHRON_CPU}
 
-	isochron_recv_start "${h2}" "${receiver_uds}" "${receiver_extra_args}"
+	isochron_recv_start "${h2}" "${receiver_uds}" 5000 "${receiver_extra_args}"
 
 	isochron send \
 		--interface ${sender_if_name} \
@@ -240,7 +246,7 @@ isochron_do()
 		${extra_args} \
 		--quiet
 
-	isochron_recv_stop
+	isochron_recv_stop 5000
 
 	cpufreq_restore ${ISOCHRON_CPU}
 }
-- 
2.34.1