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 5248BA034F for ; Wed, 10 Nov 2021 07:53:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 44BE940142; Wed, 10 Nov 2021 07:53:25 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2078.outbound.protection.outlook.com [40.107.100.78]) by mails.dpdk.org (Postfix) with ESMTP id F3FEF4068B for ; Wed, 10 Nov 2021 07:53:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V94hn6+Mvb8xHRKTKKTom33nj6d4hCBdDrNxMpdQO19qih/Dm22MUr9LqGAaLdbqd2DP3i763gFFtWw85XCZsFIUxbJzY5+JPEcIVK2PqejTOD/1UMkmD2jusIFxT6UnCYJa4vqvHxf02NZOxJkv/EVFzczqP4i4ZcSfzoQ6+rjZw5Uthdxly56iy5ZPqzX8MuotnaW9eaeaMJlN/DySmYBDxzp4ETdbxfy5CUUuwiplD8IzRioE/G7ZUYbvOCDdW48bHrO/2GidMW4H7j/cLM5WvJrWSNMUeqzrQb9dtLzZ0EiCIjYGwOrDRtPvrxOuzL1yRoavoZ9ZNcmm+lpi6g== 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=d8lASnK1FjMR9gD/FG/p9UQhairZnyCc0EBsUBRsc3E=; b=ESA4PiaLKQQaSmRxtj5tkWeJd8FdHlEmcfn1I7NEJqmhg1aaNXoFyuBALnpmfLzjXjqUv1DW2QnW+K6vX8lr4p0ryfxLa2kxFFwSqQPdTWuXZiVMsV6q+LpImwYvQO1L2vxO9f+4L4xI0YpbpTO1ASn5FciA59micSTtyuXuZnGs5Tf9BrrYR9D41HZwMubFltX2PtgVB9bDnWdVkQKyGViRNOWw6pRA0AxYcFz4DRmlS5sopwAD5w1J2Qvz5LiILtaGoXWMzF9/WTqnAA6XSEoefPC4uFshnQqShhc4rMi0NRKhnJwDTPqUJVKmIUSz+YcA3JMWbZq6+I3DaGrntg== 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=d8lASnK1FjMR9gD/FG/p9UQhairZnyCc0EBsUBRsc3E=; b=tXf/GZC+miwtYIYuPsoB95RCdon17yMm/ITJ1s8IOOFiDeGwwfDzyM73HjyORz5/N8SjYmTppHNPdqUPmeC0oNEgV/fGfwPpAbgdUiFmhVchUYeKh39pxcMYZLxLzxCSDPwn2yiHw8RNJpxcVJ+khluigTIghFd1U4XXJGvXzKOIp27SCz43R3UiLTsWoRWTkVelFhWPY+6xmpL0rOYGx/cLjadcN+JxEu5V+ccHE9gIpTG5SPBDOnPS2TDlUyQL03WI/Nn+ADNqYiTbhYnET1P3MBVIoRNZzUx64wsm2NzqHxlO65WYbGOUHEjL/rowYe7bE7el9NKI1zrdx10iuw== Received: from BN0PR04CA0042.namprd04.prod.outlook.com (2603:10b6:408:e8::17) by DM5PR1201MB0185.namprd12.prod.outlook.com (2603:10b6:4:55::10) 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:53:22 +0000 Received: from BN8NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e8:cafe::7a) by BN0PR04CA0042.outlook.office365.com (2603:10b6:408:e8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13 via Frontend Transport; Wed, 10 Nov 2021 06:53:22 +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 BN8NAM11FT068.mail.protection.outlook.com (10.13.177.69) 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:53:21 +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.18; Wed, 10 Nov 2021 06:53:16 +0000 From: Xueming Li To: Yogesh Jangra CC: Luca Boccassi , Cristian Dumitrescu , dpdk stable Date: Wed, 10 Nov 2021 14:31:10 +0800 Message-ID: <20211110063216.2744012-187-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [172.20.187.5] 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: 0ec34924-2e8e-4d56-dc06-08d9a416c90d X-MS-TrafficTypeDiagnostic: DM5PR1201MB0185: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lcH6P2Ckx90DH/l46McbO9K1tslc/0hpSsoNzxzLz7rq1Jma9KXP/3y6WE6v4AOMxFNagxsieZ7BZkIvTZVeE02NpBQx0k9Kw+6PzYhQ6Qh+EQRmK07CuOwO+jDT9IP69GITZjwaJ2Sy3Gqi9sfLuxBaooPgpAlf7B+XU4mG9fxcwkhI0m2CvH0dcjLY5kbsYNsXJ8HXYdNGg5jCllsfVhYGdsUZjwdiWrIm/47Nym7JC5w1D+EdWBImKZFApg2LvUh6AbaFNykYGxGYVkJnOCd7Yekt+men5ZhrK2flbHM03J6rgSIqBDfdCDS4wlt5Bx/f+fRaE75mbVHGVWNfgRzihQrFvXvLEnDXoM1yZnPnPi8kovrqRwnTOaYAgVogMtDsdZuPZhLHghdpdQtlVY2Ge/FYgl7PAvssaYQOp6u+237gdoWUdVPA5IohmFbuvAeamc2p+eJTd+BXiCJbZPw6zNhHT79/tjhe2n8TjpBzpBoeg+fsP0YB3hFGkk1qtxZkLwLapA8V8EvEh4eM12YgM4rWvwv7A3fTf6FM4hkSn57XELXqHoXFwJdPnbVDRby6fIqF4ZHRpMYdOXXs9gUI8nc3hvbQ13il1IU6rK1bCv3ZAjBceZIKF/kTSAlKuLlg1gWArgUjvfXA18I30jNQDcr17rr7AYyaBgSoP4GcKNjqidhaQ6CxtUpGx9nWiijKUdAuGrb48yjB0iDDqnbvJ8uKk3po1h9hBz8TgUG4jLAPyEcFdsAoPgPqJpTul7IR8bTLZTVlekFRxfoKkEmltPqtKL97BMH0xDnJY2zmLvFIk8McAlo5tfgyc345Hg16FWXp43UlzEIgxU2WWg== 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)(6286002)(16526019)(8936002)(508600001)(8676002)(82310400003)(4326008)(6916009)(54906003)(5660300002)(70586007)(36860700001)(26005)(55016002)(6666004)(1076003)(47076005)(7696005)(966005)(186003)(426003)(2616005)(83380400001)(4001150100001)(316002)(86362001)(53546011)(7636003)(336012)(70206006)(36756003)(356005)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:53:21.4432 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ec34924-2e8e-4d56-dc06-08d9a416c90d 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: BN8NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0185 Subject: [dpdk-stable] patch 'pipeline: fix instruction label check' 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/073e6a7c0094bc6d706fb1890343b4fb20f30cf9 Thanks. Xueming Li --- >From 073e6a7c0094bc6d706fb1890343b4fb20f30cf9 Mon Sep 17 00:00:00 2001 From: Yogesh Jangra Date: Wed, 20 Oct 2021 23:23:32 -0400 Subject: [PATCH] pipeline: fix instruction label check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 55095ccb7fdda113186e3191760a5cf0b0e8d28d ] The instruction_data array was incorrectly indexed, which resulted in the array index getting out of bounds and sometimes segfault. Fixes: a1711f (“pipeline: add SWX Rx and extract instructions“) Signed-off-by: Yogesh Jangra Acked-by: Cristian Dumitrescu --- lib/librte_pipeline/rte_swx_pipeline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_pipeline/rte_swx_pipeline.c b/lib/librte_pipeline/rte_swx_pipeline.c index e4fbf1b1be..4a96b77e28 100644 --- a/lib/librte_pipeline/rte_swx_pipeline.c +++ b/lib/librte_pipeline/rte_swx_pipeline.c @@ -5915,7 +5915,7 @@ instr_label_check(struct instruction_data *instruction_data, continue; for (j = i + 1; j < n_instructions; j++) - CHECK(strcmp(label, data[j].label), EINVAL); + CHECK(strcmp(label, instruction_data[j].label), EINVAL); } /* Get users for each instruction label. */ -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:10.177275009 +0800 +++ 0186-pipeline-fix-instruction-label-check.patch 2021-11-10 14:17:01.997411721 +0800 @@ -1 +1 @@ -From 55095ccb7fdda113186e3191760a5cf0b0e8d28d Mon Sep 17 00:00:00 2001 +From 073e6a7c0094bc6d706fb1890343b4fb20f30cf9 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 55095ccb7fdda113186e3191760a5cf0b0e8d28d ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ - lib/pipeline/rte_swx_pipeline.c | 2 +- + lib/librte_pipeline/rte_swx_pipeline.c | 2 +- @@ -21,5 +23,5 @@ -diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c -index 1cd09a4b44..055056098d 100644 ---- a/lib/pipeline/rte_swx_pipeline.c -+++ b/lib/pipeline/rte_swx_pipeline.c -@@ -5983,7 +5983,7 @@ instr_label_check(struct instruction_data *instruction_data, +diff --git a/lib/librte_pipeline/rte_swx_pipeline.c b/lib/librte_pipeline/rte_swx_pipeline.c +index e4fbf1b1be..4a96b77e28 100644 +--- a/lib/librte_pipeline/rte_swx_pipeline.c ++++ b/lib/librte_pipeline/rte_swx_pipeline.c +@@ -5915,7 +5915,7 @@ instr_label_check(struct instruction_data *instruction_data,