Date:   Mon, 13 Feb 2023 13:39:07 +0200
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     Petr Machata <petrm@nvidia.com>
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Michal Kubecek <mkubecek@suse.cz>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Rui Sousa <rui.sousa@nxp.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Pranavi Somisetty <pranavi.somisetty@amd.com>,
        Harini Katakam <harini.katakam@amd.com>,
        UNGLinuxDriver@microchip.com, Ido Schimmel <idosch@nvidia.com>,
        Aaron Conole <aconole@redhat.com>
Subject: Re: [RFC PATCH net-next] selftests: forwarding: add a test for MAC
 Merge layer
Message-ID: <20230213113907.j5t5zldlwea3mh7d@skbuf>
References: <20230210221243.228932-1-vladimir.oltean@nxp.com>
 <873579ddv0.fsf@nvidia.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <873579ddv0.fsf@nvidia.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sh7kc755+LEzcthu27JbJsdiYzYTLFskPHXzzhDCFbuFwqro9zTC/J7rmWDb?=
 =?us-ascii?Q?DjFU/S2Q7hRCJvUtd+Yc8vMU20smaraEH7Cp+X/lPsCiM4cH9+E/2R9mI7yx?=
 =?us-ascii?Q?9c/o0E9jYQkYHq5b/SZi7FJ9yaGy7d8O3UaWgGy90mm10jIVReEe0gVuj2bZ?=
 =?us-ascii?Q?rKFtH4xXSEJE4hcjm5QixSzavDg2t8yUA20HsVS4gLgqAi4/lHL/7UuZ86I7?=
 =?us-ascii?Q?HvAA0RDZ7IcqbhMZ0grwTsyiLwGipxiqTJZjFBK6PpQ69aQ13AH6SxWXbQWE?=
 =?us-ascii?Q?MwnLtDYQl+9RCfd642EDQekNFn4ofJAsofZqyuJ9hWrGVci7yw6QYQVzwnOT?=
 =?us-ascii?Q?F+0N86mz6rWd9i9Xoc4H09WmqMB12sWG0/8UK6V9pYmGbOnwMOo7EGH08xie?=
 =?us-ascii?Q?9oVKh/8W/2OalWEWK9SkmRO922+4cLqbDzQPuMyXl8Zw4T0pePL4wsy4mdP1?=
 =?us-ascii?Q?H/8SHOWBFLyBKYw6v1U0PWYh/oT1VOp/kX4/fBj+SqIIKUWE76u1BNeVY6CA?=
 =?us-ascii?Q?8YnlL0mE6mt3gmfF5stklWwTS8yv4HhM3YAatBiHsT2OIV5SUOGGPeyWUio6?=
 =?us-ascii?Q?wg+tP6CtKs+99mZawkepJym+Nq8KaSC++PlT0LMDhrtdZyStpmLNaVw7XhSA?=
 =?us-ascii?Q?5Oco+2vDISKJduUER34WpEr0b3iEaqKHN3H+OZyGgGnNu2Mwpw00DX+evXc0?=
 =?us-ascii?Q?8gJhima7o24JAamFcBwqo6vk7/5G8PlJIPMAMIjrDfqlHWrVDN2bD3q4wC1v?=
 =?us-ascii?Q?AAlSdDdwk1lUJNGRnJFtuLfQ6iY0wtqsOnE4LPL6Krfy3D5C9TZOviAf42oL?=
 =?us-ascii?Q?uAAk8zSak+owGtuwYMnXYay37omINqjWSRk2eXaA42AJwJUR5SvxrDaqYz5U?=
 =?us-ascii?Q?J+1lhTRAjiEPYffIesXHLYsNxt0Tu4yQkhTLhD9K4+H2tUQhbQZ2KvEGU9qu?=
 =?us-ascii?Q?17JO9oBKPSyjRCdVmLYZHlmSJx2oJfkOSOXR998I/GrIaoE5sa3el741toX+?=
 =?us-ascii?Q?uSBfjHPT3OHKVvsNAn9RI4UpWGT50sVQxFsV19gSnnpKc9E2mkH9k9MxoxaN?=
 =?us-ascii?Q?qF2YIved7oH07GblJ6UVWYetMQi4bvjKNR5UnzCCxZNalKNNP/A5IWulOEHI?=
 =?us-ascii?Q?mhShwLwKFu2d9Q4FRmzk43BgZ5Xymp1y0OQ8ra84RbwOvL+fdw8Q/sQVOBrs?=
 =?us-ascii?Q?VyF5QtwRifrkw/3P0EqXPDBIIoLHbGXS3PUCHwh65M+QXcF+xYjylFLMMydU?=
 =?us-ascii?Q?2giyaSx00BI+91XVFy/CHx5yNEeNs/scP1iuhvevNNvSKR1+5JCwtsDuLPLB?=
 =?us-ascii?Q?FlbhEOO+Ttt7iMTdUnZk0uaEVUgyOLB8UfwagGnnjGsbHYK+AHzErHd6WGRv?=
 =?us-ascii?Q?XDuYTHsF0mS4tHlWy+emKet/i+d7EgNhlcnWahJRkTmMtB3jVUWHo8qqmgOO?=
 =?us-ascii?Q?dgBIZEPvps5De2X+i+AO1KEs5Arbgk9g5jdcidW1h2xZfPi4HzMN2z6iUgOP?=
 =?us-ascii?Q?N92lP5Eqvkb5UeYoMkuSLWxEqRtFPqmc3idPRCRrYXoa2o3KAPEFscdh9gFx?=
 =?us-ascii?Q?Mp5rY61J/q3K/NNPJTbMxfDwSBwUtp/ZtiU875IQQWHWW702J2aXWc0zpjn7?=
 =?us-ascii?Q?tQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: de571b2d-2633-475a-5ebb-08db0db6ecdd
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2023 11:39:11.4227
 (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: TEhtKxnMKH2Hj+An3xU/KMUnyOlUoQuKIXFfzIGGlLlPBRsQJQVM4U4ca7Ile1O1DFGVVigfz8F9Ab99CRiyLQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8647
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Petr,

On Mon, Feb 13, 2023 at 11:51:37AM +0100, Petr Machata wrote:
> Vladimir Oltean <vladimir.oltean@nxp.com> writes:
> 
> > +# Borrowed from mlxsw/qos_lib.sh, message adapted.
> > +bail_on_lldpad()
> > +{
> > +	if systemctl is-active --quiet lldpad; then
> > +		cat >/dev/stderr <<-EOF
> > +		WARNING: lldpad is running
> > +
> > +			lldpad will likely autoconfigure the MAC Merge layer,
> > +			while this test will configure it manually. One of them
> > +			is arbitrarily going to overwrite the other. That will
> > +			cause spurious failures (or, unlikely, passes) of this
> > +			test.
> > +		EOF
> > +		exit 1
> > +	fi
> > +}
> 
> This would be good to have unified. Can you make the function reusable,
> with a generic or parametrized message? I should be able to carve a bit
> of time later to move it to lib.sh, migrate the mlxsw selftests, and
> drop the qos_lib.sh copy.

Maybe like this?

diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_headroom.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_headroom.sh
index 3569ff45f7d5..258b4c994bc3 100755
--- a/tools/testing/selftests/drivers/net/mlxsw/qos_headroom.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_headroom.sh
@@ -371,7 +371,7 @@ test_tc_int_buf()
 	tc qdisc delete dev $swp root
 }
 
-bail_on_lldpad
+bail_on_lldpad "configure DCB" "configure Qdiscs"
 
 trap cleanup EXIT
 setup_wait
diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
index faa51012cdac..5ad092b9bf10 100644
--- a/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
@@ -54,31 +54,3 @@ measure_rate()
 	echo $ir $er
 	return $ret
 }
-
-bail_on_lldpad()
-{
-	if systemctl is-active --quiet lldpad; then
-
-		cat >/dev/stderr <<-EOF
-		WARNING: lldpad is running
-
-			lldpad will likely configure DCB, and this test will
-			configure Qdiscs. mlxsw does not support both at the
-			same time, one of them is arbitrarily going to overwrite
-			the other. That will cause spurious failures (or,
-			unlikely, passes) of this test.
-		EOF
-
-		if [[ -z $ALLOW_LLDPAD ]]; then
-			cat >/dev/stderr <<-EOF
-
-				If you want to run the test anyway, please set
-				an environment variable ALLOW_LLDPAD to a
-				non-empty string.
-			EOF
-			exit 1
-		else
-			return
-		fi
-	fi
-}
diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_pfc.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_pfc.sh
index f9858e221996..2676fca18e06 100755
--- a/tools/testing/selftests/drivers/net/mlxsw/qos_pfc.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_pfc.sh
@@ -393,7 +393,7 @@ test_qos_pfc()
 	log_test "PFC"
 }
 
-bail_on_lldpad
+bail_on_lldpad "configure DCB" "configure Qdiscs"
 
 trap cleanup EXIT
 setup_prepare
diff --git a/tools/testing/selftests/drivers/net/mlxsw/sch_ets.sh b/tools/testing/selftests/drivers/net/mlxsw/sch_ets.sh
index ceaa76b17a43..99495f5fa63d 100755
--- a/tools/testing/selftests/drivers/net/mlxsw/sch_ets.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/sch_ets.sh
@@ -78,5 +78,5 @@ collect_stats()
 	done
 }
 
-bail_on_lldpad
+bail_on_lldpad "configure DCB" "configure Qdiscs"
 ets_run
diff --git a/tools/testing/selftests/drivers/net/mlxsw/sch_red_ets.sh b/tools/testing/selftests/drivers/net/mlxsw/sch_red_ets.sh
index 0d01c7cd82a1..8ecddafa79b3 100755
--- a/tools/testing/selftests/drivers/net/mlxsw/sch_red_ets.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/sch_red_ets.sh
@@ -166,7 +166,7 @@ ecn_mirror_test()
 	uninstall_qdisc
 }
 
-bail_on_lldpad
+bail_on_lldpad "configure DCB" "configure Qdiscs"
 
 trap cleanup EXIT
 setup_prepare
diff --git a/tools/testing/selftests/drivers/net/mlxsw/sch_red_root.sh b/tools/testing/selftests/drivers/net/mlxsw/sch_red_root.sh
index 860205338e6f..159108d02895 100755
--- a/tools/testing/selftests/drivers/net/mlxsw/sch_red_root.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/sch_red_root.sh
@@ -73,7 +73,7 @@ red_mirror_test()
 	uninstall_qdisc
 }
 
-bail_on_lldpad
+bail_on_lldpad "configure DCB" "configure Qdiscs"
 
 trap cleanup EXIT
 setup_prepare
diff --git a/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_ets.sh b/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_ets.sh
index c6ce0b448bf3..bf57400e14ee 100755
--- a/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_ets.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_ets.sh
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
 source qos_lib.sh
-bail_on_lldpad
+bail_on_lldpad "configure DCB" "configure Qdiscs"
 
 lib_dir=$(dirname $0)/../../../net/forwarding
 TCFLAGS=skip_sw
diff --git a/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_prio.sh b/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_prio.sh
index 8d245f331619..b95e95e3b041 100755
--- a/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_prio.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_prio.sh
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
 source qos_lib.sh
-bail_on_lldpad
+bail_on_lldpad "configure DCB" "configure Qdiscs"
 
 lib_dir=$(dirname $0)/../../../net/forwarding
 TCFLAGS=skip_sw
diff --git a/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_root.sh b/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_root.sh
index 013886061f15..c495cb8d38f7 100755
--- a/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_root.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/sch_tbf_root.sh
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
 source qos_lib.sh
-bail_on_lldpad
+bail_on_lldpad "configure DCB" "configure Qdiscs"
 
 lib_dir=$(dirname $0)/../../../net/forwarding
 TCFLAGS=skip_sw
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 30311214f39f..ab1c2f839167 100755
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -1896,3 +1896,34 @@ mldv1_done_get()
 
 	payload_template_expand_checksum "$hbh$icmpv6" $checksum
 }
+
+bail_on_lldpad()
+{
+	local reason1="$1"; shift
+	local reason2="$1"; shift
+
+	if systemctl is-active --quiet lldpad; then
+
+		cat >/dev/stderr <<-EOF
+		WARNING: lldpad is running
+
+			lldpad will likely $reason1, and this test will
+			$reason2. Both are not supported at the same time,
+			one of them is arbitrarily going to overwrite the
+			other. That will cause spurious failures (or, unlikely,
+			passes) of this test.
+		EOF
+
+		if [[ -z $ALLOW_LLDPAD ]]; then
+			cat >/dev/stderr <<-EOF
+
+				If you want to run the test anyway, please set
+				an environment variable ALLOW_LLDPAD to a
+				non-empty string.
+			EOF
+			exit 1
+		else
+			return
+		fi
+	fi
+}