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 386E6A0C3F for ; Sat, 12 Jun 2021 01:11:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 329B24003F; Sat, 12 Jun 2021 01:11:27 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2043.outbound.protection.outlook.com [40.107.212.43]) by mails.dpdk.org (Postfix) with ESMTP id B8D574003F for ; Sat, 12 Jun 2021 01:11:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nr3McwO4TLUW9xQO46xrq0otzwPRf1f/rSL0dXJmWFKv5IcM0X8WufAVZc33rAlA70ybBkiYaiyRnIv5W2mHsQj8uuA2ITN++y3wEUses6CsoHUXBMxlg2RGOpq2oBbpalEt+e5tPR0xiIi6FsvJ8q6wd5GC2lEgcNuiCro+KkEPOCPZDdb+M1MIMRR1N5/LHncKiI1zhdpaSGXfqDlPtruKaVGa//PBUv4aUYjPeVPy8miioqSmhOnk2CboUBSqB8HApbKfl3cyh2l7+1uxSuMo7MQal7TeQW96GP0y+zzhWoAcQd3QgOBPYJK3UbQiyFTUPFJ6e6G6l/621XViBA== 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=AjV8JrX4WPjQ6SZ5gOxuUSYi+Y+ch9sN6re94eRPaGE=; b=dSN0nHQ53l242M+wOpI3Csqkh8cvD7qK2WiqKsTV0zBqo55EZT57fX5ar4+q2h9av+tfShjpULTSICoFCpaF9jX4gQbKjnGXidTMJRkRuxsHfMAc3ieJzrYQ1qf4b7OEy1rDgLBo8bIieEDa8oD31ToazCFZ48JAnI4XL16yh5fYzuSbgKxNQXHjoYWOV4BkPUHxI86aIe17vPKvGP9kxTXk3mYrF4CnBIpexE6rAryI8IYZjVyF5ef6mtDRyi7+sNRfyqAYqBRpfx4WU/VgNFJu+c7DiPuYHR80iQUIMdx3wREhIvZHt+Kz9ULC9CuCWSQjTQrLS7rHzNJ4qq9NAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.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=AjV8JrX4WPjQ6SZ5gOxuUSYi+Y+ch9sN6re94eRPaGE=; b=apCRcR+EW5Jcu3O3cgm/keC2zD3HUSD8MfIE1dn45PxkBuuJjKSqBb4p0S4GTt/Am3gE9y8cPdFi1qdTXp1qGlBtjslb3VUZRBXO36eUtFuBIYa/DgZkEXh9vyDHDuAYLYzRBWby5pLoEKXxVY+DqpSaZbAyVhFUR53TpRb1pmeXqSJtW4MikkbFlodOYdDZg7GXWRbey0it3BZPuIjcsczPvE2Bk+tJ9ZD3NCxe17nP+Sh9I76OX3Cj7RsiaaJH703qvS3pjijXZgZmGX+0JWwboMIyRpZbCvvidsiMAVUxLGtbZiUnSrPqqT+zrFcgQoozxJNpDrll0ubumZ5jbQ== Received: from MW4PR04CA0268.namprd04.prod.outlook.com (2603:10b6:303:88::33) by CY4PR12MB1909.namprd12.prod.outlook.com (2603:10b6:903:124::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Fri, 11 Jun 2021 23:11:24 +0000 Received: from CO1NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:303:88:cafe::b2) by MW4PR04CA0268.outlook.office365.com (2603:10b6:303:88::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:11:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.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 CO1NAM11FT040.mail.protection.outlook.com (10.13.174.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:11:22 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:11:18 +0000 From: Xueming Li To: Ciara Power CC: Luca Boccassi , David Marchand , Bruce Richardson , dpdk stable Date: Sat, 12 Jun 2021 07:02:44 +0800 Message-ID: <20210611230433.8208-70-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 009fe2c0-5dca-462f-f62f-08d92d2e3a6c X-MS-TrafficTypeDiagnostic: CY4PR12MB1909: 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: 4Kx4WwmkNgHCmPejFB+YJIU8AoQ/N1SH1T++RBdnGseXRjRw2OlNpuD27bGhdm4y69vyFHXaAccgcCaBrvWO9w1Z63lkwvuTT6DA6G4ymlSU9Lo4EoDsS9PbudAh62ZKsctjwrCApjsqr6z1dNiqjjR+3emAIHmOjrwW6bsQ48qsPbi2pwD1+4oaZTW3gEJULON/MYbYzwvxP6PErmaysrVJVl2YMYeZJQxMhEArLI7pDOb4JQjUJuKzeNuqOgE+P/4KJIOKUyhEV/PrStJE+aYelnp4mFY7Zp6DRFeyUx7aLAdYVngaoXn0l6U0Kvy2ZFd1QoRU08h3MFTt05ZDxq7Z+JoN95P9yrmeBZL2fBYGiooKs70MtXtM+r4fkO+ffCRtctPAjseGD1z51WMI2c3cz54zUs8Uxa7Dh5bNgSkhOkwITeSPjyvdW+tiJEH86FduVDbW+SmDcCb4rqPvCa/k/aNtg65DJ7yDsEcMUCvxOlXRnkd8tXlwLOl1rXFiJxLPO9ubRKUw1Ub9n86O4+Oge7EnFfjxe4jHgfOW0L8yraCkRnDcy/FlUaXdpd2/MNZIDc74R/IL5y/dS38vEE+k+ED/diYGBG3pug/ty5YfI1MJC1TR7LU1hPZkvP/syFRsmbSVC1teKjK8pZz+aUb7v+tMJ13r4UOG+MVJn8MUQ4+Bfmen0/fwQ1FEYmmq2xCZJkhEk/uSB+MQMgL78GoCkvqm3TOXs7QGDpk9jt+kh1obDzuJpx8b+h3+KMns4GxlHbgLKKfG8wQMgIoubg/fnD1GxMTJMEB/rzKgL/vspMB1NlI2FgO4TizV7WX1 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)(376002)(136003)(396003)(346002)(39860400002)(46966006)(36840700001)(36860700001)(426003)(336012)(5660300002)(966005)(478600001)(316002)(53546011)(55016002)(36906005)(2616005)(82310400003)(1076003)(83380400001)(16526019)(70206006)(70586007)(7636003)(8676002)(6666004)(2906002)(36756003)(6286002)(356005)(54906003)(8936002)(86362001)(47076005)(82740400003)(4326008)(7696005)(186003)(6916009)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:11:22.0551 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 009fe2c0-5dca-462f-f62f-08d92d2e3a6c 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: CO1NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1909 Subject: [dpdk-stable] patch 'telemetry: fix race on callbacks list' 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 06/14/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/b6659faacc13e952be50a2d15ef7c8ef4a435845 Thanks. Xueming Li --- >From b6659faacc13e952be50a2d15ef7c8ef4a435845 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Wed, 5 May 2021 15:22:48 +0000 Subject: [PATCH] telemetry: fix race on callbacks list Cc: Luca Boccassi [ upstream commit 048960272e809ea728110748d317ddce1d731a27 ] The list_commands() function accessed the callbacks list, but did not take the lock. This may have caused inconsistencies if callbacks were being registered at the same time. This is now fixed to lock before iterating the list, and unlock afterwards. Fixes: f38748736eb2 ("telemetry: add default callback commands") Reported-by: David Marchand Signed-off-by: Ciara Power Acked-by: Bruce Richardson --- lib/librte_telemetry/telemetry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c index b142729da4..9d970d167e 100644 --- a/lib/librte_telemetry/telemetry.c +++ b/lib/librte_telemetry/telemetry.c @@ -95,8 +95,10 @@ list_commands(const char *cmd __rte_unused, const char *params __rte_unused, int i; rte_tel_data_start_array(d, RTE_TEL_STRING_VAL); + rte_spinlock_lock(&callback_sl); for (i = 0; i < num_callbacks; i++) rte_tel_data_add_array_string(d, callbacks[i].cmd); + rte_spinlock_unlock(&callback_sl); return 0; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.425667100 +0800 +++ 0070-telemetry-fix-race-on-callbacks-list.patch 2021-06-12 06:53:56.330000000 +0800 @@ -1 +1 @@ -From 048960272e809ea728110748d317ddce1d731a27 Mon Sep 17 00:00:00 2001 +From b6659faacc13e952be50a2d15ef7c8ef4a435845 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 048960272e809ea728110748d317ddce1d731a27 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ - lib/telemetry/telemetry.c | 2 ++ + lib/librte_telemetry/telemetry.c | 2 ++ @@ -22,5 +24,5 @@ -diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c -index c06de45531..f8b0d1157b 100644 ---- a/lib/telemetry/telemetry.c -+++ b/lib/telemetry/telemetry.c -@@ -107,8 +107,10 @@ list_commands(const char *cmd __rte_unused, const char *params __rte_unused, +diff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c +index b142729da4..9d970d167e 100644 +--- a/lib/librte_telemetry/telemetry.c ++++ b/lib/librte_telemetry/telemetry.c +@@ -95,8 +95,10 @@ list_commands(const char *cmd __rte_unused, const char *params __rte_unused,