From patchwork Fri Feb 24 13:01:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1747449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=sd9EDN1y; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PNVQW4w9bz1yYg for ; Sat, 25 Feb 2023 00:01:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A67BC40613; Fri, 24 Feb 2023 13:01:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A67BC40613 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=sd9EDN1y X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n-4AaE2zzHtg; Fri, 24 Feb 2023 13:01:36 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id B51664044F; Fri, 24 Feb 2023 13:01:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B51664044F Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 98BF2C0033; Fri, 24 Feb 2023 13:01:35 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 740A7C002B for ; Fri, 24 Feb 2023 13:01:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 5BD35404F7 for ; Fri, 24 Feb 2023 13:01:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5BD35404F7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q78NrY8JkZ-h for ; Fri, 24 Feb 2023 13:01:33 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 66B4E4044F Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20723.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::723]) by smtp2.osuosl.org (Postfix) with ESMTPS id 66B4E4044F for ; Fri, 24 Feb 2023 13:01:33 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N9MLPPGSMNeqLUQ68h643iCokgUrJd4BKMahra3FzItjcyxZDTSd5sUYZZwayDoB7SLyaO49TsIOTHEiRBL6ZKAD3bJMd1owlsySdIK4uq6T7ivMw5VsIqiar+db8CVhYu6Y1raBgKkSRd6RgRhrzXSSWJNGYzBXBdLL2rFG7etADv6AiXqLC34pKej5bVj1zYuLRK6kEm086dyxdSJGD9fP69t6YAj5s8nixy6X4kL5/lrs+IavkXrJMUB6JujoASJvxX5CHS03e5U2SmpsSyjrT5WamcGagEgjE1W6p63cqchyupHeFYSqGSuzG66eRAX6C8MDnun3aIV07AdNIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/6bGKe16uBMLkKMdFf9QeTyNSG0lR2Z1uyOQzhimXHo=; b=TvEIQu/S2drrmCGKT8QLtnc7DJBlXs7R5UvnHzpcBHCPz+CvC8+Vgr3bnydppSWiKhUlWXHpX+ZzI0MjgW944BriisvxvAx0ClIIe1G/ZwcGA+EPg7/6BIE9Zh97rOkNIEzKoPhCL36uTkC8tGvYkrJ/4StQIWzSenKYJjBIgzOd21eQZOTdVgGbVPjReMrWXe2Ci0YfFhW9EHu6iC7wsDyj2WaqL0ppzJznLjhYf0WN5S7NyTfOKGHR9hIsxOo4ZhTyaANsok/1u6xI0T/OhGd9dZf/OU0Luv4ZwQWIGabP4kJyfOW1ad/bgU/K4TnEELaIPFbhp9UTzc0NCVnWFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/6bGKe16uBMLkKMdFf9QeTyNSG0lR2Z1uyOQzhimXHo=; b=sd9EDN1yAXJO6tFkZKHkUe9spOdmBWCuH8wgUDKllYzoFiy++qoxgQUsAsctG+kmVqMTxdWwuFV16H3PJHCbU20enORN+cqxXddNoGR79C9AKLzHdXplW88P6qz2GyuWX6fE4NIaI0tAz3/ZVhwYQa1UdZzZCLNrrU2uWNumsws= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) by MN2PR13MB3887.namprd13.prod.outlook.com (2603:10b6:208:1e7::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.24; Fri, 24 Feb 2023 13:01:29 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::85f5:bdb:fb9e:294c]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::85f5:bdb:fb9e:294c%9]) with mapi id 15.20.6134.024; Fri, 24 Feb 2023 13:01:28 +0000 From: Simon Horman To: dev@openvswitch.org Date: Fri, 24 Feb 2023 14:01:10 +0100 Message-Id: <20230224130110.2055221-1-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: AM0PR02CA0022.eurprd02.prod.outlook.com (2603:10a6:208:3e::35) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB4842:EE_|MN2PR13MB3887:EE_ X-MS-Office365-Filtering-Correlation-Id: a8b1fc2a-9d06-4f60-9889-08db16673dfa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nKdGcBXzBSRe/66Zmc7RUnxOhhkgggrcPYjSGblLbohPdIn6HoxhBVN0HOnklpxhc9CL+HyFfxdYbwLeGkOeoyTC+6fQ0gJ1EhtLz9Qs8W+gW2B0ZdY1PXwcPPGmp3S2aKwLlK6351MbM/Bl/EGEdl5fWjixyr4nuLnUmnoHYqHR1p1+3bSEY3tj9vj/p3HVZNvoHiERD0BvB6+cw32J5uOJfAWqqDy9QkKDuoTgX63h7KJOaHITc6e478fUekhl+oVte2VNlhFsLHs86OR0TbLyHAtxzpqO32rdh5FZO3pvz0fASzqZ7LO63CCBFC5VfcPnBDQ1oxP0ZtrdzVAxtdJLGKuyCuGKD1gCUW1SwtZxBD43PkEG7mfT1pkv3vXVR43nTMTN9VmV/qgeVPg+zUh0/N4Mx68qo+uYNJOrmL2M1AOUPxUUqwubXNUu4/xpuRf0WN079FFCvLoN4ZsHMZVQIojhqiCI9SjHQ5ayurypQrGDAtLDRxzwc+iyOszjzIJxp+cbziC/Wrw1sg8iqyDwXta7Lg3xJtVnDvG97IjqOSy4OFC2XDBU8iq++NNTiAbVWWcjjOkKv8cltS4qhTA5DZiMB6TzLBNEn+Poa14DLC5rPdZkXruX8zkZ18WsEAiPeBMeNSBrAn8mh6RIqg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB4842.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(396003)(366004)(376002)(346002)(39840400004)(136003)(451199018)(1076003)(186003)(52116002)(6506007)(6512007)(6666004)(478600001)(2616005)(86362001)(107886003)(83380400001)(2906002)(5660300002)(44832011)(36756003)(6486002)(66556008)(66476007)(66946007)(54906003)(316002)(38100700002)(4326008)(6916009)(8676002)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x3J6v+qcmGirV9W3xbVfkGUByHqIoS3pAU68X9aJrcC+8UHS+16TDIGqV6x+MAzQKSVJZ27vzsTq4m54yWc1atqcSPcyFUwa29EvVULxDPs0fvSCdiOaqAJfefW6i1UBNitnYA9jrrQvfmeAO7fExRYlT93MsWac7QFgiPGyl/S2v0iUSCYwa9wkjHwBNJ/GGdOKN88LyiqENx0wZOaQvrHs2lfRTzuj9Zz21FGxzdQE1J4uPhM4YCscpVl4Z3G+TIMLchCU7blPIM5/wCMrdEZljLZ0XEf2LXCH5R3hscqk1TykZdk8gLyBjJAsq+2RIyMyHmAQOu+gvenvVv8kT/mxOAgUd+Vwy9N6CTIjo640bzxLwNw6OqpYelyQBY85mCVeNl0qbB3t0Ou3ZUT/a6Fd6a9IHMvb4gk/A2tR/SsHVH3eAiND7UBsArCzh5Vc3/mOYciqcbqSkIZKgFsHwWPpnBBj2rvoAQiBTe59nhZCxZT0aH6J5iVeqTv+8/hsDSaYR5FcaMtsxdipLKyYe7iKAk+rBIy9v8xeq6/goIFqszKMF2U5UHIpnHX4if1Sk0YbPxYnROnb21mzDHYWE95p0t2Hd3bmAuCYWlsl73QenfyXL0c/qyNyxy4zAE/mB1LsT7ozs1Irj513J6a9NrRx3RiW0mSlGWOc5cCIySMni2kFizoJbHsjv7uVunUxkxnGnRdLuImyjRfimAfowKvK4r8D+k2dVFYxaIKe1HIdiIcPfDG+qowdxWQMovCyLaZxD9flijU1rBsVZj/jxVJ99t6Fxc4PQFClyfi0JsNTce36SmY55M+7skaov9gvgq2zJ9G7IF7KgMSDL1sZMEbkrjgJtWP0wEkEc+4f54qtVcRhGrn0yysmpqZ7f6v/3m6n9kEFizXsdJCYsdXeBJ9JDbHFwWMLhHvOX5zP/FXwp9wdtHVY8Gq29UskKoQBCIfsKyDg06T5bOoqgJM8FrZOzArxHPGrz7+ZS2FWQ3d+rcUS4dOBnQssCy9+4Xiv0OB6cUkrnNdy6NEwNvIA+mLgFFzBWEMHFXQ+ZEzOyRm+twlxgmd55SHl87n/8Tk+ESpfNJxAFcjPJgwtjaimH/9WAF2BDM0LFR/qRhR4IhXWy03QHG7aRMQEeqGFJC7yhPLlloIaJlwDCUCdynBZKgxoFVkwoEd8RTP1xo1QO2TuIFwSpBGu2F4leYTbW19dijd9lACIyCO3ylOZi0gfg9Fg1hGXYadFG8M+60pxMbf1I5LF88d2FMTV14gGVObCXxwbx1MQj1onAv7mVdUHz7Kjnv2aAH53JTjAESIC9eWNBoF5UpjNama8Y94j/7TY1Cv1+JD2p5OAduZFMeP5k5zcOGuhSGiwnKqwu+lN1MuGvKyLbH3tUzijab8QqsR9HtrDklBLzu3UVQz4i30THIqkiwFY5Uy86Fg7udGJn2zb9GrmFEmqN8334K+YFhohSQWj9DJUpijO29Qc57QclCajLcBokWtTiqpyWAmFgt3SiLCWHnJHl39tDEqEVoNQFTnJ3UjZgvh5ZRZlKfkHp+Wr9WRcCPfQuCaG7ZdFHS1hVGM3x67sSNcxnhTzqdyHjIl2sJt8eHqH68Vnwslnp+ljLSytVJPl4RVALqNqc1u4n5bwZCN6ibPOc5QH9iBBxbA2mU/QyMNSfA6w06MwFA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8b1fc2a-9d06-4f60-9889-08db16673dfa X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2023 13:01:28.2363 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QpU9O4jTmaWtID9N14dmC1OIvzfsA8GxGc0Tro5EYg3OA4voFEcOIfJfE9yeJ9r0uz8d1Ql3u+wy3IoGGfP9IgeWosGXCPthp5K3BbWzCio= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB3887 Cc: Simon Horman , oss-drivers@corigine.com, Ilya Maximets Subject: [ovs-dev] [PATCH v2] test: move check for tc ingress pps support to test script X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Move check for tc ingress pps support to from aclocal to test script This has several problems: 1. Stderror from failing commands is output when executing various make targets. 2. There are various failure conditions that lead to veth0 and veth1 being created by not cleaned up. 3. The check seems to execute for many make targets. And it attempts to temporarily modify system state. This seems inappropriate. 4. veth0 and veth1 seem far too generic and could easily conflict with other parts of the system. All these problems are addressed by this patch. Signed-off-by: Simon Horman Reviewed-by: Louis Peens Acked-by: Ilya Maximets --- v2 * As suggested by Ilya, use: - ovs_tc_pps rather than veth as prefix for interface names - on_exit for cleanup, rather than handling each case - dnl rather than '/' for multi-line commands --- tests/atlocal.in | 11 ----------- tests/system-offloads-traffic.at | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tests/atlocal.in b/tests/atlocal.in index e02248f6f829..859668586299 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -172,17 +172,6 @@ fi # Set HAVE_TC find_command tc -# When HAVE_TC=yes, check if the current tc supports adding pps filter -SUPPORT_TC_INGRESS_PPS="no" -if test $HAVE_TC="yes"; then - ip link add veth0 type veth peer name veth1 - tc qdisc add dev veth0 handle ffff: ingress - if tc filter add dev veth0 parent ffff: u32 match u32 0 0 police pkts_rate 100 pkts_burst 10; then - SUPPORT_TC_INGRESS_PPS="yes" - fi - ip link del veth0 -fi - # Set HAVE_TCPDUMP find_command tcpdump diff --git a/tests/system-offloads-traffic.at b/tests/system-offloads-traffic.at index f2bf9c0639aa..1d21da5f196d 100644 --- a/tests/system-offloads-traffic.at +++ b/tests/system-offloads-traffic.at @@ -18,6 +18,16 @@ m4_define([OVS_CHECK_ACTIONS], [ [0], [$1]) ]) +m4_define([CHECK_TC_INGRESS_PPS], +[ + AT_SKIP_IF([test $HAVE_TC = "no"]) + AT_CHECK([ip link add ovs_tc_pps0 type veth peer name ovs_tc_pps1 || dnl + exit 77]) + on_exit 'ip link del ovs_tc_pps0' + AT_CHECK([tc qdisc add dev ovs_tc_pps0 handle ffff: ingress || exit 77]) + AT_CHECK([tc filter add dev ovs_tc_pps0 parent ffff: u32 match dnl + u32 0 0 police pkts_rate 100 pkts_burst 10 || exit 77]) +]) AT_SETUP([offloads - ping between two ports - offloads disabled]) OVS_TRAFFIC_VSWITCHD_START() @@ -132,7 +142,7 @@ AT_CLEANUP AT_SETUP([offloads - set ingress_policing_kpkts_rate and ingress_policing_kpkts_burst - offloads disabled]) AT_KEYWORDS([ingress_policing_kpkts]) -AT_SKIP_IF([test $SUPPORT_TC_INGRESS_PPS = "no"]) +CHECK_TC_INGRESS_PPS() OVS_TRAFFIC_VSWITCHD_START() AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:hw-offload=false]) AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) @@ -156,7 +166,7 @@ AT_CLEANUP AT_SETUP([offloads - set ingress_policing_kpkts_rate and ingress_policing_kpkts_burst - offloads enabled]) AT_KEYWORDS([ingress_policing_kpkts]) -AT_SKIP_IF([test $SUPPORT_TC_INGRESS_PPS = "no"]) +CHECK_TC_INGRESS_PPS() OVS_TRAFFIC_VSWITCHD_START([], [], [-- set Open_vSwitch . other_config:hw-offload=true]) AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) ADD_NAMESPACES(at_ns0)