From patchwork Thu Feb 23 13:02:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1746936 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::136; helo=smtp3.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=AytyV0Hx; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4PMtVz4zHdz23yr for ; Fri, 24 Feb 2023 00:03:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id B6C2461ABA; Thu, 23 Feb 2023 13:03:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B6C2461ABA Authentication-Results: smtp3.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=AytyV0Hx X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7FbIyBGyf3PQ; Thu, 23 Feb 2023 13:03:20 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id B5AF26179E; Thu, 23 Feb 2023 13:03:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B5AF26179E Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A20ABC0032; Thu, 23 Feb 2023 13:03:18 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id A7C8AC002B for ; Thu, 23 Feb 2023 13:03:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7462D81BCB for ; Thu, 23 Feb 2023 13:03:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7462D81BCB Authentication-Results: smtp1.osuosl.org; dkim=pass (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=AytyV0Hx X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U168_5T78bK3 for ; Thu, 23 Feb 2023 13:03:14 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5253881394 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on20722.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e8a::722]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5253881394 for ; Thu, 23 Feb 2023 13:03:14 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P2XYcuOu+ju+Pk+JtAUX8gyNzZqfgdGmQ8SqZYW2CYoH1X6XArJLF9ObvxI4lvdj9X/gG2YK7XFa2ZKtiQvumZAD5kA9pYo95Mg1k9oMAAym59XLTSMsgFBJ+2hP0Is2pynzNvuwroFgPnkG2fQdQrYX/G68gnlWKgOfE7meIiLMaBo5/g2NlwKB25Q46qyaiFinGFXH3Ckd904zaSpfpFiYLbHKH51KJO87yVL8/wW9pjzJRIxiUcAzB+VKYG8ghXkqF7kTZeLuCkaeCXDtHu/NJpuwSGbn5rc0WniEfB0CjZbwcyDqYrWoJkZUIy+Le3n/8UgF2Lh+/ZEGke3gHA== 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=davzVjQ8nSauMjGrd+DmTSiNLbJYlW3wPGp4CiBBYSI=; b=anyGM52FEVnZGlZgFUXe5d7I348UihXu0zGhE3kqY7i5lVeEhTLiYxduNn17XigbAt4aTzfPR4rSF4gAt7s+j4oPICW31uZGyG7kOVZqvKP2/XwHrkhQpZ30X+KptA0jG8SCWItpUzNMoo8aZs1ci57ZAk3Xqj0aDc5ReGpbkYI3kJa+qdatT4ZR8BoJB9rQnFC7QBIv2LIq6LrmpZ3hklyUWrAgN7PeU3dWWVWGR4NQ8Ri4OPXpCG8dMqtIecDzgAVeyxcfdWA6NyYvGQqrnCz3gtfTg1fo7nKyWN7cowga2Newc44TVYcsM21Kq8mbgrf6hTLbnCaoEUCWzlNwZw== 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=davzVjQ8nSauMjGrd+DmTSiNLbJYlW3wPGp4CiBBYSI=; b=AytyV0HxwFyC/c8vwge9skoMYL/SKsjW8+8co/4QEIdH/IGWfivWaUamTwSnRBjSgVRBzIheuV4CTBfNpBDApA8Fp2ZS36oby7vwTHKjifmaXtUQDQ0ch0NHV1nhfN3s3rwzWC8ROM+e+YoWXkl3nH258DY+fiqruZbIGzOoIIY= 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 BY3PR13MB4930.namprd13.prod.outlook.com (2603:10b6:a03:36b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21; Thu, 23 Feb 2023 13:03:08 +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.019; Thu, 23 Feb 2023 13:03:07 +0000 From: Simon Horman To: dev@openvswitch.org Date: Thu, 23 Feb 2023 14:02:51 +0100 Message-Id: <20230223130251.1953138-1-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: AM0PR03CA0035.eurprd03.prod.outlook.com (2603:10a6:208:14::48) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB4842:EE_|BY3PR13MB4930:EE_ X-MS-Office365-Filtering-Correlation-Id: c96d51f0-80a9-491b-b748-08db159e4ee6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 09/LPRiBnxfogv6dWnruqWXToe1hKim5YyPuxvfg2QNLzhCFe5jv8avm+8iq7KbPEiEs/5d59e3s9lzPZZJlgeFdowzDK96lG+uI8SjhmTpZv3iRkOSzZpbX8pTv5iFa3PY4tE28WxkQeKi9baxTzvmTPANUeOyVyxMp6dURN8KMRr6ZfiTVdlLuX6NBlwDGvWs53EqfPdhADNvNQRUX+ZV+mnagOBGyM+dkxePJiXxIK/ACrowbThuowDKPFVWXkg41TGSMRWKWtUrCgX3TvOYnBMmySTUpI9MT5v152eJQIEjkzFH/kerpkn8tAlyUAmT277i+eUkGnSRpnxVk8mEJB05aT88h4A7AU8l8hT+Voi9WdB88jKDclJEkTiW2oo65Tm+h2ptXxX8BxpapJlw0ktNSx37bPdyNLk02z4aw7WarniT6YdmNRnmDX+DyK3lfmd5xJmwSMLT5x0dHV9qnfx+xDYjSWQWrHgmculYTQ/3WMEv3Hcq3beiuVZOJVuocxJP5yM2zwN5VXkiT5Yebon2yyh9+EnfCp2VH9sBaedxVdM0rm8j1xpmV4LMYuaVqtJcUJP6HLjvibnqyZsdXI8BeSzin2jos+r36WFnBOzEDKg0hfxY6o6D5pCrK3NYyL7A0JQWeNhODSIKbNQ== 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)(366004)(136003)(396003)(346002)(376002)(39840400004)(451199018)(52116002)(66556008)(66476007)(54906003)(66946007)(83380400001)(8676002)(316002)(8936002)(5660300002)(6916009)(4326008)(6666004)(41300700001)(1076003)(107886003)(6506007)(478600001)(2616005)(6512007)(186003)(6486002)(36756003)(86362001)(2906002)(44832011)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SWb2VsGa2t/kHNqbZycKZFa84Az1Mye8eObE7R5ZsrYjxY43sPfrtS6D76/hlA//jeMQWYOpgiZzp82ZJB1I5XzeAxQGsopxp2NIig9qFBxLObdfcC1b1TCb269I77V4VhO4lOEjw092LA03quaPRq8KWJCMM8Ntk9zWS2sJS+xo5tSNbHgQfqjqqPyUyuHYPz5YP6KD1KMlfInj+tbo7dh+Tp9WKx1tjkv3qXhD3uDJG3jaWyyRa2y+dcJQehxxB9AKdMn54UmgBQ3zVzR/KUZqBnvvodu8VPSs4hMYfZ8vz8Sl2EjzsA/1uiW52LLlj/FGL1H5B0+rkDMqZ3y7FgB7cTZkMPtm1xWiNWVRo8V/pTz/T+VfGEfIe0tYHvduPywuR7FqGZhNkr/aZDqmTyRgkZ+lPXGm8iPFiwKtDPm7WayOB7Zh2z+sV5ZoTuwth6GoYg8L1PYnrR2/qu1pRppHk9WfLqh5MyET14OVV0Uu2f0ofbyi0F/yfwE7rZl5Ui+TUV2o6a5pkFmkiISvlRP2ci5iVjHg35y0eZJgZRJ43NefKHqVMZD+fkTWnsVbc42kw5HdAJ7qFRivhEVJ0S6NkRMOpd1jG28CcvNDyVRv5t3HCvObor/YKvOARmi1ng1w5oEADe/IWINXBq7nPLB6BahC99De7f46JzahONuGzpdBae9JBuF/gx7OmTOBUwxBMD9pPO7ThPN46I3IOvZnlXFdt1jZ0YnLq0tZth9K5ehiJhCwiXRcrDRzV6DB2lZOgfKlYFQOhUXFDLCeZ4mubBZA56rIU+bXEUGHRv7mGNG2c+XUu/ITqLbD+RWea8yH6E9hrV3U6M5poIsJBy3AKjG9Z2ykaAK5LTRxCCpb4/5CDBzXOvR3pM2Xug8D2UXLlH+UluWo7lqzi2Xc5cK60mc+imzMKYgmv1FsvcmwNGWm5eph7Y64uXo5pRbnElK07w7YmW2nIEhXCGUVfUgdGKxAp98qKWzV2Uk2dVpEgMhzlSgF9EPnyZozhnfbtZTWSJb+V2SrnBL8ZNPHDhs9GILRK1en39BconD+9gV0rGSY91AD4aUUM+aUoBSX/jlqX+p1ffpdU3AXEo2lzDviKzvvfFpcbDOB5bL4HNWyZYziM2ieAA0Eor4df9tY+zce+UoDmzTdvoYiLzTfCFYgdKiH2YiB7YzaBklGleHVEQ2BxrtTwZLKHYEUsk/6OsRxLMq2wkf6mDUWqqj+gB3RMl5NEsmBFwrRKOIaZ4nPDudtuCEr3l64paWGcbSINvIPZiZeSMYOZhDgALPG/cRV6MhGywUVlIcsyZKVjt8ToqnpGgt9feGI39W+rQLs9QGJZnl3dcgT61WHppAzgdnAA9PoDFch0vUGvApJV4B39/+KiDetEvmPzMi+ISu8yrVRU8w05wvELHlac15QgMbwprP0QT2IS+6gCPSOdcpCSq1u3JoEagaeAbVklEgYpesovtwT9IUn0pc3lp4WXiA0EKmKU/Kwo8zHbgZRgkIqodQ5ct+RUTnyzyK94dCrOzca0qVqnFy+2lnC/XOpXcUTmL2kQolTQK5HtTBLcKVoYQs5mr6ThFF4x8kpgSYcGjDe/Z9P2kINz2de2kCQeC2Sw9eI6POwtemV4+oJcwNd91yt6zKLZ5sGL5HKY/bTt2keFFKu38QUuyoxBq6ZJA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: c96d51f0-80a9-491b-b748-08db159e4ee6 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2023 13:03:07.8159 (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: 6FKYe08KjNJr9jtxedVfve7901Fk3wHfoGjH1b3+wxL09iPna6HFPZlXuTC/F/Eal7AS0I9K5DBuBfJ5Kh7FY1IXStJ/dRb4SplpCW3XKjs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY3PR13MB4930 Cc: Simon Horman , oss-drivers@corigine.com, Ilya Maximets Subject: [ovs-dev] [PATCH] 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 inappopriate. All these problems are addressed by this patch. Signed-off-by: Simon Horman Reviewed-by: Louis Peens --- tests/atlocal.in | 11 ----------- tests/system-offloads-traffic.at | 23 +++++++++++++++++++++-- 2 files changed, 21 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..ff3e4c63d127 100644 --- a/tests/system-offloads-traffic.at +++ b/tests/system-offloads-traffic.at @@ -18,6 +18,25 @@ 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 veth0 type veth peer name veth1 || exit 77]) + AT_CHECK([ + if ! tc qdisc add dev veth0 handle ffff: ingress; then + ip link del veth0 + exit 77 + fi + ]) + AT_CHECK([ + if ! tc filter add dev veth0 parent ffff: \ + u32 match u32 0 0 police pkts_rate 100 pkts_burst 10; then + ip link del veth0 + exit 77 + fi + ]) + ip link del veth0 +]) AT_SETUP([offloads - ping between two ports - offloads disabled]) OVS_TRAFFIC_VSWITCHD_START() @@ -132,7 +151,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 +175,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)