Message ID | 805ae87cc6964662d33d4573bac5bbfaf8632ec8.1528993447.git.petrm@mellanox.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <linux-mlxsw-bounces+patchwork-linux-mlxsw=patchwork.kernel.org@lists.ozlabs.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0184760532 for <patchwork-linux-mlxsw@patchwork.kernel.org>; Thu, 14 Jun 2018 16:41:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E495428C29 for <patchwork-linux-mlxsw@patchwork.kernel.org>; Thu, 14 Jun 2018 16:41:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E369628C47; Thu, 14 Jun 2018 16:41:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, MAILING_LIST_MULTI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0CB1F28C45 for <patchwork-linux-mlxsw@patchwork.kernel.org>; Thu, 14 Jun 2018 16:40:24 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4168HG0XLmzF09h for <patchwork-linux-mlxsw@patchwork.kernel.org>; Fri, 15 Jun 2018 02:30:18 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="cITCeo6N"; dkim-atps=neutral X-Original-To: linux-mlxsw@lists.ozlabs.org Delivered-To: linux-mlxsw@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=mellanox.com (client-ip=104.47.2.71; helo=eur01-db5-obe.outbound.protection.outlook.com; envelope-from=petrm@mellanox.com; receiver=<UNKNOWN>) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="cITCeo6N"; dkim-atps=neutral Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0071.outbound.protection.outlook.com [104.47.2.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4168H373P2zDrpm for <linux-mlxsw@lists.ozlabs.org>; Fri, 15 Jun 2018 02:30:07 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ltZfUAMT6qJAyZRtcAGxFz1UcUkifDtTFeCcSRp8k8Q=; b=cITCeo6NvYH5cNHTW1MJmXxseykHABUDVpm5XtSmCRtxNkKtCJucs356DE7N0CO/OxnXZhS17KjQtr6uBiqbVLTzX2mOoy6aSBROmiEQhvOxAgNSv6ynV3Y54lvSEmPPPClEkTt237NytxK0NGovSv+kGhaL5O/1hKjc0VBovFE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by VI1PR05MB4192.eurprd05.prod.outlook.com (2603:10a6:803:4e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.17; Thu, 14 Jun 2018 16:30:01 +0000 From: Petr Machata <petrm@mellanox.com> To: <linux-internal@mellanox.com> Subject: [PATCH net-next mlxsw v2 2/5] selftests: forwarding: lib: Split out setup_wait_dev() In-Reply-To: <cover.1528993447.git.petrm@mellanox.com> References: <cover.1528993447.git.petrm@mellanox.com> Message-Id: <805ae87cc6964662d33d4573bac5bbfaf8632ec8.1528993447.git.petrm@mellanox.com> Date: Thu, 14 Jun 2018 18:29:57 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0017.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:62::29) To VI1PR05MB4192.eurprd05.prod.outlook.com (2603:10a6:803:4e::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 897c1cb2-5b66-42c9-af18-08d5d21413e2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:VI1PR05MB4192; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4192; 3:jcDodcDwNmYJ6kAVHMF/A4o/pseWOihrBX1/37JBZ6NUnAwogPQ7QOwr/qArNTk+/PFlOwqvxHB0fLqfTEjCQWBcepdv8xSCSLwEl+5WdfUBZnwHRK/2tGm7zQSNvsZvYzjcX2gyWvJnb3d4RF2ppe+B8lF6Hs1vwPVcH1IqInfDz3ZUZ9JBCS2kBKIA/TvD2e2WPKsxscM/conGCeum99B3D2gvs+Gj1annp1CeJWP8BpeEoGX53/5djBVc5t2u; 25:Je2wIfWurNmjKtjunJVtGSOns/xvUPBxgIRTPMnKbPoFcWR67WbU1ACVI4oOv0ysg8dF93X2vbrTahQIJCvqfH0bFOM6jW3ygupmUbHBArYCBp9J+5ASZcpRfoPFAq/1NLs8WeyigarhXcS4Y5MQbO8iHzkgGdRZnApt+1EDlY9k0MAhpfd7ortQCj+dYv0T0Yc93DpHycaN7z+VKpwaNJTQ1+v/lyacUoZte3QRm8K4lx/DRfwkNgXGLKueTIPudRleStneuAqtia2WfyNzg2yxwz0LOluu477z5+QrhFi5wN5Ieyrzr+FIy+0WXAQ13T4oeUn/y0PUlJ2e648N7Q==; 31:YGcUKcyR470YSXS/k/yKUdm7RcG+F7S1dMOBHseKPlqi/2UzdOjD6PwgurZDddj3mfxc1ASUc0qnZWmAafAKsuGqvfJyz7A61/nsFgO6kj05VrOp0Zkoi+5x+dxaOMCHbHKhVOCx4t5cMPSzl27M/5kQClCoVFnIA6BURfaJ1JqX+5dSxWKf0K8+FVu12XUg2Dzy4iKn7f9ILL3t8rKErdNdptRMUA9j0VOyUk2k/Wk= X-MS-TrafficTypeDiagnostic: VI1PR05MB4192: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4192; 20:ADxm2KiDiRzr1WNEranUc++16hpe/4leiy0LhpipSic1+pXx9NxlhK0DYd35qh7pB+8WiYtVWa7oaiF9cSmMZTpaNPCvCfFqmy51mRKULemppq3Y0d3Cjcjo94QMtf5Gg3D2RBBtozy0pCDv1Bq9QhDGaE/jouOIchKotFrKwPWgYvNznAviWluLPKLJwyhstYxTy8SvG55vagc+thSYoLSLMj49sErq+cffkfE3p821ARidjH4HvhGvbJ1mS1rAOUCE70GmZIRX96SGR8KLmlefZP7lANcHgRHswegsyv2TmpYFFJis3Oj4pZn28sXhPP86t+LRj9jnsVt0D1MdCOYiWSCtkjtpSbzCfE0YHhPkV5KXxSfw3jWCHUnClYL96Y6dT1id0TKHvMnZ2c+KLUG7qkqk+zLy4C2gBWsW/dEZvp+i+DDv9GSfDjyaIKfrIQOPok6zimKhdZ7JRpUs2sPPiUFsknmz8O/39PebTXq5W3RWU5trSg2gzPKLUfb+; 4:RlUqIC4Lu4R2FS3b6s5Y9RhyFZ55LxwmOyv2s+IzPZi6gnw6EqWj+3GevGaIHWjXJqzVPoM6BYXabT34ojfrDiTBXvq1Awc3hTpwSktaPbLqtA68mwI+5f60cCBitC/DFhUA8www9xakPLPyQvwC/9jY7B5nOo1RL77hc67gIvovhel2a1dZQN+2zfdE0kOTcB6dGT5URgtNZYGlu0gojQOZW9z9AciOnGLxGvvDW8AOvDXlAXsNLhhmVsL1iBV+ZCwkns74re54QH47BdJH/A== X-Microsoft-Antispam-PRVS: <VI1PR05MB4192E92B12F14BB1C565434CDB7D0@VI1PR05MB4192.eurprd05.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3231254)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4192; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4192; X-Forefront-PRVS: 0703B549E4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(376002)(396003)(366004)(346002)(199004)(189003)(52116002)(81156014)(81166006)(58126008)(2906002)(47776003)(16586007)(26005)(316002)(8936002)(118296001)(50466002)(11346002)(76176011)(446003)(36756003)(37006003)(6496006)(2616005)(3846002)(186003)(97736004)(105586002)(476003)(386003)(5660300001)(48376002)(51416003)(956004)(6116002)(16526019)(106356001)(25786009)(486006)(478600001)(86362001)(6666003)(7736002)(2351001)(6636002)(305945005)(53936002)(66066001)(6862004)(8676002)(6486002)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4192; H:t540p; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR05MB4192; 23:wFdyFlesQ++9g/EcQjYHAsTtM9N+uyr+AibtjoqMn?= =?us-ascii?Q?QXHLMfTYj9Q+V7srx/5goe0B83vXb2lnAbWOd90p2gmprdJipJUhQac4Usep?= =?us-ascii?Q?HNapbVNHv/ngRv8pckOQm80dz8njuKWQQdg1xhlVmdJqJ4qkUmp1SSZZoJ5Q?= =?us-ascii?Q?turDJWMXlIAZGxn4zhO8PPeMjhhSVpwaQFpoDtwEz5D0NLiL6RNoLkLZ6+Wf?= =?us-ascii?Q?8vGOD1eiyHpS31tGjsph26RCczNR3b4nwLSuB7bXFs5jZ0XsRHRhlwteeZTn?= =?us-ascii?Q?P158feAeJP6VIzLHizxZ0NdmZW/1gfhcSQrdsrAUJunlf46LffHHh0A+jp9M?= =?us-ascii?Q?49b68XrPMIt/CoSNGug8P06u50qW+wL3x1iRBVMCdUdxP8nia9+gWRPLyDGG?= =?us-ascii?Q?nvxCzCx6JpNRzRUOTeHz7VWclq5A2r4GcZMegYz7i4m8MMEAD3Rf/6Jg9Rdh?= =?us-ascii?Q?Dg/gt1URkdxDy5wW3UWF8b+P/zttox42J9xlbZIuh2SJLr4jw/D7mCyvJ84J?= =?us-ascii?Q?Zsb3F8Ghdziw+8PDXG6xlK5O/qDbU1G8x7l+NCjiBDqjeN86ZK6Pq4pKGrv3?= =?us-ascii?Q?L+AIf7djCMRM55DfC2jPz5pFaYl8FY62bcrtVV6sxwVZFvDqNo4qUzPtX9O1?= =?us-ascii?Q?Jj/O9JFmGGGpHukDqzdugCQI2d8oqHWWOML9X/xIaELDr5cQhh2T2Dixi+UP?= =?us-ascii?Q?MS0qPvaotBzI0VlKTYMyFL6VpUb+s//3iE6WkZa9Dk1e85TRkYZEqkA5M/t6?= =?us-ascii?Q?yhDj7F66tFzm136yD+9BX1w2Ie8C8RFWBbQLxKb6kCskfm9xrj5rXb70fXr2?= =?us-ascii?Q?3CkEJ4dGH87bSERfAMkC7nNqPPtndgbCXLMbvKSV8jDWbmubwfnL906yx9Lf?= =?us-ascii?Q?YRP19Aw7gI688ui0yjojjCI5oG3wHmiNq1vcp2VNFzNYxtlN0DwP91WEqU9T?= =?us-ascii?Q?B07bPEBd28lqFpkj0JW9+q4FPUEY7oYlXQVP+EeknpBGcdEafe18WzcWcnKm?= =?us-ascii?Q?mmhmY10elfkDRyzJL0/jRIx0F6oD4pf3/6iFvSEKCNbaxF8PG6paBHDt+E+y?= =?us-ascii?Q?RGl4m5R2ObLnmZPfjOiH3GUHyl4KGqKKLBgFjP93CRuO/ynHMRhgxzph8c83?= =?us-ascii?Q?zMnxRp0/cbTqvie1GtHJ6fLvAL4Et+d6iTrH9KmnLcwwhwM5N3RboiWGdUR9?= =?us-ascii?Q?E9osFIUbu5uknPOV2nTsRpNoYMNyGTfso6Y95cjFjpmVbdN3aaruWwz5w=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: f41/jQNzwbTTwqVWwGbH/TO2swaUyADDQTHvIDMA2VRyPwd0Zwq+a8z4G1ou6kXyXP2g/s5zCLVOfPvmtK80JUrCcYWeUmgXQN4XD2zEnxgrSu2RmG2FqAwZKXzDT3Hl7GgvbJBtB2M7fVKdgAunp0mjM+YD2947/z7zdasstM8wu9T/F+E2cFkWXnrZVDy9 X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4192; 6:j4M/vL1iXYroJuhp29Q85EmSCY29lGefn9iguGdrw89E5CiS5YaLC2D77vc7ZPnW9eyfuCGrtBSloGxgnu1y245cUdAdIW8Gnp3C9cuKT1jrFyUfpLYHpa2TTUpqsHhdRZplhXCrID1FPpDcfvO3UIK9RRzr2QPfO3Cf0hNf/wP+nXx/ug+fXf6HMKjPtN2eiPzDe6hh3FWgHaM+THoUrIkhPfA7z97OS5qN9H8J4sjifq3rq2QMLUHlhWDvoyikV55ZtiYZfOLP/QzMRSzN6fzZibs+d61t4FlesZ+HSyQ9PUeWdjv3PYYBEOXoz8Oydg4yIDFMsdLFOHW4seLe0IXEmFaZBzqVGne5zYitaYlZSrB+zAyLDlfw52PDkddh4c+Ut7m1lLAP4WKtZw7mlnAUrZf5CdZy+/3KISlSf/Yao3CZkGfP6hyggrpOUShvGghMYL0lOe6V1etrm+xKWg==; 5:s9Moi0tW6enxpQCu1egwcdtXPSsSufa0DPBd8zAjk/vSX1gp2cxo9SD0GIqnWJ/XV8cGPbZdSBKEimTfk3weRxqC6bVLETC7ZuAdJsChVM4/jOQO/ZSxJdgBygcfDmbb1BBndFdeaCzgp0qXnGWZAlOjiooGk15kJUPT5YaQcmE=; 24:o94AVSerQyVvLaj/N6dbE2587KPt6iZv5fxX+AoxhIIwrIKkS/8jukaY3s11zcX1hCv1r2dgZwqlZ7y8FtB2zxEsO7TohcZQbfKe+jBC+F0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4192; 7:lYS1YUlEcBGoUZgslNNUwMC0pzGMeVWbCEyKrFcWDiRwzzOJZwVUHJRooDb3HDLiIhnVKvVnACoB/IZvf55uHyPzeQTZfTJbirMRP0PAj2fmewFCryid9RvVB2N9kXZGi/H7A10PINzQccaEcW3q30M8EvhxX3oL81hZ1gmaRf2yxRObhg6zUqIfMMfCffJtNuzDsyAU/xR/oCPd04gL01CMdn7iYDXdyL3rpXoKv4iYeDolwcX2es5GZhaBpd/t X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2018 16:30:01.4793 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 897c1cb2-5b66-42c9-af18-08d5d21413e2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4192 X-BeenThere: linux-mlxsw@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: mlxsw driver development <linux-mlxsw.lists.ozlabs.org> List-Unsubscribe: <https://lists.ozlabs.org/options/linux-mlxsw>, <mailto:linux-mlxsw-request@lists.ozlabs.org?subject=unsubscribe> List-Archive: <http://lists.ozlabs.org/pipermail/linux-mlxsw/> List-Post: <mailto:linux-mlxsw@lists.ozlabs.org> List-Help: <mailto:linux-mlxsw-request@lists.ozlabs.org?subject=help> List-Subscribe: <https://lists.ozlabs.org/listinfo/linux-mlxsw>, <mailto:linux-mlxsw-request@lists.ozlabs.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: linux-mlxsw-bounces+patchwork-linux-mlxsw=patchwork.kernel.org@lists.ozlabs.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 3b1464217e7b..0ae21eca2668 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -208,20 +208,27 @@ log_info() echo "INFO: $msg" } +setup_wait_dev() +{ + local dev=$1; shift + + while true; do + ip link show dev $dev up \ + | grep 'state UP' &> /dev/null + if [[ $? -ne 0 ]]; then + sleep 1 + else + break + fi + done +} + setup_wait() { local num_netifs=${1:-$NUM_NETIFS} for ((i = 1; i <= num_netifs; ++i)); do - while true; do - ip link show dev ${NETIFS[p$i]} up \ - | grep 'state UP' &> /dev/null - if [[ $? -ne 0 ]]; then - sleep 1 - else - break - fi - done + setup_wait_dev ${NETIFS[p$i]} done # Make sure links are ready.
Split out of setup_wait() a function setup_wait_dev() that waits for a single device. This gives tests the opportunity to wait for a selected device after they tinkered with its upness. Signed-off-by: Petr Machata <petrm@mellanox.com> --- tools/testing/selftests/net/forwarding/lib.sh | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)