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 8A81AA034F for ; Wed, 10 Nov 2021 07:54:55 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80CFA40142; Wed, 10 Nov 2021 07:54:55 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2050.outbound.protection.outlook.com [40.107.220.50]) by mails.dpdk.org (Postfix) with ESMTP id 968EA40E28 for ; Wed, 10 Nov 2021 07:54:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JvM/dMOyPNDquAGe1NsYv+Uf0Q9l+tgNt0Ves3zjjupCXFNPQ3tLXcWvGqm3Ltax0VPQZE2zr9IFp5QvnPIvcyWhxVFF9QldN9ERrBMoWLKceo8CVg4jG2/PUJbn+V9pkeS6v9LKXv68z+EXyRXp8yVCDQclz/MrKJPHShOKSuCmmEI5HF8QX4JVxvn4xntUqU7btN3QaO5/wCrdqDHwQQjc2LEGZrkIV86R2KDtdbkMQJZVt/LbsMcaztaeTc/EfPgDssddRfbJUPAxeM7qwreFmwOwxqJVLkdhgIMT1/CibqaWrALTzvqlq9MeUUJX4ob9jd/GYvAjUgTnWIqRfA== 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=Kvdv6fvoiJA8oKRGOD8Pyb9hSrjWT+VvwhHNL3XZwzA=; b=PXK/zSBDEBermfOYyORbfRRyK0JMOAFBN2+jo+kw04/ul5HicZQ6xjLCrRp7eql/tj3QjXf/E+ofhEk/ftsFixcbs5fMGlB/devL2fZ8B+p+NFjI/YyjHC3G9ABSqll3yby9fvNnud3pt0gkkxUQFvGq/k16FeV1Hupwwguqn2KV+LAXo6tBuWEucMgBft/ur6gEo6lqubCpsnmJGIlGQxAfqrX2xqe2Gs1utAE0IT4JHqFHTbD2Rbkw1u700M7PZww/K9CRZFjBsS/gFRi/CvTAo0IDe3WC/cXeA9d+3rIRK1orqnfxtsUijzJBJBIgyNjiov3YEt8un4vIzXyF8A== 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=quarantine sp=quarantine 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=Kvdv6fvoiJA8oKRGOD8Pyb9hSrjWT+VvwhHNL3XZwzA=; b=a+s6OvgcONvyGls1TyQs8XfnzufPAx9GBW8GNkuygOVSJJh/1dr5B0AKf230X7QgiUBMftCyCBaah9Lh4Xfaa4UN/7M3Q2EDWBCER/NvCUgGo+D54+C3jR9qi+19rRvDy/MTd21LrTawjGBO2eArsvOmenCPjJFVVeOR+O2ghHj4wSBPIC3pMOo3Mn7YIb0VpICnMMbwkuC0dXBgGnyVDAjVTMiFVLYAIywzOOWinrmTHYJnOG4U3NUZjt1SPdeKkwYMUivAUCTsfhuF/rI++h8NixCIBRKhCO/kYhUZg0hCPVULBjIESm2Pj3CdVQMfxN1Co37SOSfYDwVfTCGIOQ== Received: from DM6PR07CA0130.namprd07.prod.outlook.com (2603:10b6:5:330::22) by CH2PR12MB4857.namprd12.prod.outlook.com (2603:10b6:610:64::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:54:52 +0000 Received: from DM6NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:5:330:cafe::5f) by DM6PR07CA0130.outlook.office365.com (2603:10b6:5:330::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:54:52 +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 DM6NAM11FT047.mail.protection.outlook.com (10.13.172.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:54:51 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:54:49 +0000 From: Xueming Li To: Zhihong Peng CC: Luca Boccassi , Xueqin Lin , Cristian Dumitrescu , dpdk stable Date: Wed, 10 Nov 2021 14:31:25 +0800 Message-ID: <20211110063216.2744012-202-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cbbd7b96-c845-4309-7153-08d9a416fea4 X-MS-TrafficTypeDiagnostic: CH2PR12MB4857: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G0yjVSuE4wl3DaYPvjrpcy7CUGilb7IimbhW8t/YVzY9IMMNbGeKTTE5Y2QUiLCEscFmVALAox/3Tb+K0QMThEgIcpNIJxTdruC2BESq4DIoTwb3LECGttINGc6cKOD+QUYJDZgS1Pi//m/WzGKAL86GbMe3S+/lZBrGsYGzjVk1txs+qTdgihQz9ZZxhqaIh0R0CrmIprAvwko8IfSJPb1X5J+OHJheNwLPaRR7T8icMbd6Q0jALmcYcXSlwv87s1CNmtNRcD7hor01C1FWLIIHlO+aK8Vt0Ca44jyeCGVKs33hxtg3yqKsxGF3deVLdrzLmhtfTlwUXqtvNB4RrPhWtWuCwF0rewwUVvdMd4ap5fWmw7MjDpNCtW8BlqQeK+YvOj2+bzWieXnhoUKOSIGD5oQAP2j3m6+/mGduw40fEBP0aeH2tCoB554cZ5wA0DapXhfXDi2AqTR9hwBXrHmFZ6KAQSk+xUG6GHPnALVFYLDRUE2UpAuMZETthLAE5QL4HK7yLHjf2oTGhgqmnu7+wBbQPJEI7vdZ0Q+eeh2xsJYIXToB8P5SLh0ngQ8iZZ1kX1TrJd3wqyHivtgIZdXB5fWll73gPSNS1GORZVgo0w0YFB8O0K2TcsdeW3X4nueUILOl5RP6jmRKAoBPAMowgwVgsr4XB9OABtBJd6p8ZyiHjBKKTq3X7QWtkNcmzuxcEK2wEfF7C73PEecKYX+SC3t9vtaUxtSRDtAuA/mX7iQk0Yb0zLg/VEsyO90JVLFiJiNTZGR09qAMp53nDTfOnsD8nWQt9QYgBWnGgkT5iXdN3tteGS1ovQ8nxawEd9vHACHxwM+dMbXo4jYbAw== 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)(36840700001)(46966006)(186003)(6916009)(70206006)(70586007)(82310400003)(16526019)(7636003)(53546011)(316002)(4326008)(2906002)(83380400001)(86362001)(4001150100001)(36906005)(426003)(336012)(2616005)(356005)(966005)(8936002)(508600001)(6286002)(8676002)(47076005)(6666004)(1076003)(5660300002)(54906003)(55016002)(26005)(36860700001)(7696005)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:54:51.6852 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cbbd7b96-c845-4309-7153-08d9a416fea4 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: DM6NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4857 Subject: [dpdk-stable] patch 'pipeline: fix build with ASan' has been queued to stable release 20.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/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/e7dd7a6c07e28be8f4319a6b3623d9810e4c4ced Thanks. Xueming Li --- >From e7dd7a6c07e28be8f4319a6b3623d9810e4c4ced Mon Sep 17 00:00:00 2001 From: Zhihong Peng Date: Wed, 20 Oct 2021 15:46:42 +0800 Subject: [PATCH] pipeline: fix build with ASan Cc: Xueming Li [ upstream commit 84f5ac9418ea9995975b30fa4ea57018f9618fc1 ] Code changes to avoid the following build error: "Control reaches end of non-void function". Signed-off-by: Xueqin Lin Signed-off-by: Zhihong Peng Acked-by: Cristian Dumitrescu --- lib/librte_pipeline/rte_swx_pipeline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_pipeline/rte_swx_pipeline.c b/lib/librte_pipeline/rte_swx_pipeline.c index 4a96b77e28..923fa8b769 100644 --- a/lib/librte_pipeline/rte_swx_pipeline.c +++ b/lib/librte_pipeline/rte_swx_pipeline.c @@ -3240,7 +3240,7 @@ instr_extern_translate(struct rte_swx_pipeline *p, return 0; } - CHECK(0, EINVAL); + return -EINVAL; } static inline void @@ -5869,7 +5869,7 @@ instr_translate(struct rte_swx_pipeline *p, instr, data); - CHECK(0, EINVAL); + return -EINVAL; } static struct instruction_data * -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:10.811450551 +0800 +++ 0201-pipeline-fix-build-with-ASan.patch 2021-11-10 14:17:02.014078251 +0800 @@ -1 +1 @@ -From 84f5ac9418ea9995975b30fa4ea57018f9618fc1 Mon Sep 17 00:00:00 2001 +From e7dd7a6c07e28be8f4319a6b3623d9810e4c4ced Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 84f5ac9418ea9995975b30fa4ea57018f9618fc1 ] @@ -13 +16 @@ - lib/pipeline/rte_swx_pipeline.c | 4 ++-- + lib/librte_pipeline/rte_swx_pipeline.c | 4 ++-- @@ -16,5 +19,5 @@ -diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c -index 5e089fb72b..1afaffefd4 100644 ---- a/lib/pipeline/rte_swx_pipeline.c -+++ b/lib/pipeline/rte_swx_pipeline.c -@@ -4642,7 +4642,7 @@ instr_meter_translate(struct rte_swx_pipeline *p, +diff --git a/lib/librte_pipeline/rte_swx_pipeline.c b/lib/librte_pipeline/rte_swx_pipeline.c +index 4a96b77e28..923fa8b769 100644 +--- a/lib/librte_pipeline/rte_swx_pipeline.c ++++ b/lib/librte_pipeline/rte_swx_pipeline.c +@@ -3240,7 +3240,7 @@ instr_extern_translate(struct rte_swx_pipeline *p, @@ -29 +32 @@ -@@ -5937,7 +5937,7 @@ instr_translate(struct rte_swx_pipeline *p, +@@ -5869,7 +5869,7 @@ instr_translate(struct rte_swx_pipeline *p,