From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C404AA0A0E for ; Mon, 10 May 2021 18:16:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B60E940140; Mon, 10 May 2021 18:16:20 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2061.outbound.protection.outlook.com [40.107.237.61]) by mails.dpdk.org (Postfix) with ESMTP id A818340140 for ; Mon, 10 May 2021 18:16:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cX0Uv4SbPv1i/tUEZysDbSscIU51z30xuVI8rAaAGHjsyUOiL6BiDtdzpNwyg+esUKw0O8Q7yPuODxJO79nS7LmHeAsCnF7I/H55AjzlEHbfE7+w8s7kLu2HC/sSimI6IZvEZwaI/WrCzxlShlRmDJfP4rHi4RhzB4XA2foJ4nEyILHmeYI9NPHrgcfc5NZD6j2I7le6XKKJN9dM5y6ByZTxnas2VI9F2kdSoY98gMa4kU4MiNgWEFkJ62dnbqdnR5BG5YCrDmA2IuZMZgl9XsjVH5yi5NpIMjyg2scevAOf5yVIkaD21AtZjf4ykiuAhiei3rig5KCYC/9wFSGs3Q== 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-SenderADCheck; bh=esCCOyai9CENU6su8/aLO0+iMJQxBn0p0O/lt580MxM=; b=c3g4kaOv89FMsQFP77ej7mmNMGIP8c75bBG0SqPF9N5UiiVmVyYNxUhF2AmfNCppe9duLFhymNWIOux0EERV/SLYRQ/nqxRFk0oJ7xlfhMHqMk6HXhsxrWOCktvL9te26FI/4K35/oPOvQmQeHGn4la5ZDj0fQLKweF3Qpz8Lp4HRqcMuVk+4LF+IzRAQELeOAjJLSLY9s1tQsKa6F1DOOIlPGn8QSvGQSwdvvQXWAE3WN02+KDGhDUpf2hLcSbgdcd4qVKkTHZZUY7fZagiLFz82gza7DBVC9bJC+6g8APlsXw7jZbQhIgqLtVpW7khw3Oo7n5x3tPczttAEeEM1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=semihalf.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=esCCOyai9CENU6su8/aLO0+iMJQxBn0p0O/lt580MxM=; b=XIorhThXFdzKE+q17JFt5vbPMwFsk0VYFZrKfGrzwavCidyzPCtRk6XFPdrrh92NrEPi9MZv1Ro6TvotZGrazOEwGHuNLervFOKLNQ9nQlNCHJqxU3eir7xpdLEGZDe11R3fd/xcrsRWJ/kbnT8Nk+EhWhQs074ppcpX73iVJneKRcUiJV9U1tbo+adllAnxEOCyJ7WDk7SQ/DcFUM7t2mvdBCvYblIl6Cx61Ce6oNUyUbsQD0O6/dd20lUz6D/faG37Zj87239NXH+mUk46wXuKsSknzkpuIHUfMECsGaJ2XXVw57d8nNIFFh9wHrYDZ5lPQ8WraDGDBo+qRjYV2g== Received: from DM5PR2001CA0014.namprd20.prod.outlook.com (2603:10b6:4:16::24) by DM6PR12MB3226.namprd12.prod.outlook.com (2603:10b6:5:186::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.29; Mon, 10 May 2021 16:16:18 +0000 Received: from DM6NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:4:16:cafe::73) by DM5PR2001CA0014.outlook.office365.com (2603:10b6:4:16::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:16:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; semihalf.com; dkim=none (message not signed) header.d=none;semihalf.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT059.mail.protection.outlook.com (10.13.172.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:16:18 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:16:16 +0000 From: Xueming Li To: Stanislaw Kardach CC: Luca Boccassi , Michal Krawczyk , dpdk stable Date: Tue, 11 May 2021 00:01:20 +0800 Message-ID: <20210510160258.30982-131-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 56e06bf2-fc68-45a7-8e87-08d913cef17f X-MS-TrafficTypeDiagnostic: DM6PR12MB3226: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h3E6Y9Wfj3r2M2ZZhbwHtonH/RXGYjwhRNRqlCdgGHGeCHpLrR7fZ3jU1V2LNrd0yS0WANbYkFh1+IwrTFXxFgPn8d28hn/j4YY0XCqgJuxMeXqEc+3XfDL+7rt7dqfG1/QjPjRIeH4C1fySsapZEi4mUtuhDCfag0BiCFaK4VUp4vsl7S1AdVZjpSVDSP9xxpBmGfQvbaDXSlWOzaTe6CceM+Wnknol7p7rgVEQAhDjeI5RoiwlGF6Ngj3xwtD/yA8663W/ujq+cKP/ROK0Y2cp59dM+oSUNojy/tMnOvmCXmbzX/09DA6b7CyzouC3sAtDfSjzJtsjt8ag6Hk4KiV3p4CVfcudQn7mBqXS3K6qKBdZmjKYZGUzD5EdeOf086Z0Ni1A/ulGmHtKbGyH7GYnOxeDvlubN3TaEIUvxyB7oDMYa75M3pR80ZNeFsbofUnwFeX6eESJUjhx2Qp0tJ2l7KYiOd3cGdOO0lnTIRDGH8NoA/Ry0vQP7VTd8BKA7STfE52V3oDYPkg8PDAfnAyDkn38rfkYN/cisQV4DvDZRCO2/lsZElifqNeR13wURABlc8Ga9jp8twx1aTN9JTRrNUX5v7DiI5IUFXXckXDwJQxtVsGT/dpTL3v89NQqL4cTcE9Fv4l4k4Nl2/6u19net9RUq7ONoMo4SmtW9OuBiEthHH/5T5t2GCaKxmLPx4ro3P4ouWaeHJYxL2g4iD80PP5/XO/JyyKR4aQsDifzu+SYlkbeCVSvG3nMWY3dyY+NreuXFJPMgYQPgFsTFg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(376002)(346002)(39860400002)(396003)(46966006)(36840700001)(83380400001)(7636003)(16526019)(6286002)(478600001)(186003)(36756003)(2906002)(53546011)(6916009)(70586007)(70206006)(2616005)(86362001)(336012)(47076005)(26005)(6666004)(54906003)(4326008)(5660300002)(966005)(316002)(82740400003)(356005)(8936002)(82310400003)(7696005)(8676002)(36860700001)(1076003)(55016002)(426003)(36906005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:16:18.4435 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56e06bf2-fc68-45a7-8e87-08d913cef17f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3226 Subject: [dpdk-stable] patch 'test: proceed if timer subsystem already initialized' has been queued to stable release 20.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/4fc1996894bf0d712abfe42550da8d191c91cc01 Thanks. Xueming Li --- >From 4fc1996894bf0d712abfe42550da8d191c91cc01 Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Fri, 26 Mar 2021 11:47:59 +0100 Subject: [PATCH] test: proceed if timer subsystem already initialized Cc: Luca Boccassi [ upstream commit 3dd7d693ff73dac58999ed7ea6b27d0adc8dc6bc ] rte_timer_subsystem_init() may return -EALREADY if the timer subsystem was already initialized. This can happen i.e. in PMD code (see eth_ena_dev_init). This is not an error, rather a notification as the initialization function simply returns without any action taken. Fixes: 50247fe03fe0 ("test/timer: exercise new APIs in secondary process") Signed-off-by: Stanislaw Kardach Reviewed-by: Michal Krawczyk --- app/test/test.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/test/test.c b/app/test/test.c index 624dd48042..864523ed61 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -134,8 +134,13 @@ main(int argc, char **argv) goto out; } + argv += ret; + + prgname = argv[0]; + #ifdef RTE_LIB_TIMER - if (rte_timer_subsystem_init() < 0) { + ret = rte_timer_subsystem_init(); + if (ret < 0 && ret != -EALREADY) { ret = -1; goto out; } @@ -146,10 +151,6 @@ main(int argc, char **argv) goto out; } - argv += ret; - - prgname = argv[0]; - recursive_call = getenv(RECURSIVE_ENV_VAR); if (recursive_call != NULL) { ret = do_recursive_call(); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:29.988227600 +0800 +++ 0132-test-proceed-if-timer-subsystem-already-initialized.patch 2021-05-10 23:59:26.530000000 +0800 @@ -1 +1 @@ -From 3dd7d693ff73dac58999ed7ea6b27d0adc8dc6bc Mon Sep 17 00:00:00 2001 +From 4fc1996894bf0d712abfe42550da8d191c91cc01 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 3dd7d693ff73dac58999ed7ea6b27d0adc8dc6bc ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org