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 88713A0C3F for ; Sat, 12 Jun 2021 01:06:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 829954003F; Sat, 12 Jun 2021 01:06:02 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2048.outbound.protection.outlook.com [40.107.102.48]) by mails.dpdk.org (Postfix) with ESMTP id 61B724003F for ; Sat, 12 Jun 2021 01:06:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KPZ1L6/si2KKhJidsyc/I+AKgkWqdK3ftc5s8dL9alsdbVXk6wAsldmK2tLXqb1J0NXyO1j50R58Pf27N2o8UKbUEk2kaZ0QTU3SQb9SeDThhxYu+4Zsb+by8R0oKR/NXO2mNe4bz6l0jaOjnQ1e6GSpVbM423saYULNBmmBaweAmRHJvEqgvrNpQlMhE8FBu5DqThdLYxDQqGCBsP0AykgTDXOs/12vHVxvHvEh7bNO17nIBI9SzC3uubPjV43Kkv/zdRB7/IuMfre5dJmeo9LJHbIXUXKy5MmxWVbaieaxiAJyuzXLLnk1IGcUbzlYUZrpl28SfAcm1+6Qm1eJZA== 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=xja5FuuZBX+vYtx6P80X+fv4Tzw6ZMXS3tsaYrsTTGY=; b=gLbcd470T3SxnRldFtj2zd8SPUpq8vJGfEqY8QGOFVuNOgPr8smghplBQQq6OkSI1lHFb5SwnV9x2bLQTpA7Ng/jxQcuj9aNZRgnS2JXjD7TnTMurKb9LbpUMDfcmyY/OwUoF3bVepj5akv1rdnJz4PWR2Hnv/dg1SRPmCXkfm5oHx9fxEcE9Wq31Ii1mmTATRkpOGFX5he/nz1nULK+NaLyTMGJ9Fm7/H5hAuyRaVzVD0ytcncNMWf59ukoSSyHB/uW0x6NlXkgas5zqF9HnVXHSlPlQuM4XxNKwGleDZew3QrzHWvLI2RR6HlTUMe1h4IEnRDWCYvlPGimKFE2/w== 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=xja5FuuZBX+vYtx6P80X+fv4Tzw6ZMXS3tsaYrsTTGY=; b=OyvxqGMoauLnf+nQAhMwB1S9Q/shjirR/fFnhnnUFzHWYrii/FOD26Vr+kbOtFq5qua7YmsDmjNRkIvisABwi5b8gd2GKBh7+5iYLmhI0oCAM/979xziewSehukF2nmQ5SzPtBDr/PHM82vVRHDruYc5bpSHQxlP9qoF8YqONx++VT7Gc9FLCtP4MlQ9ho2q+ytMS9m1k8KIz6GQ9U8k99/pvQjEMooSmdOfw1+veeZVceN44BlZZB5lLmjBuzrZPb+KbuUv3VR5cY6vXNKjkHGGsj611EhA7kbWNTSdk1Krak08dXZXs015HFUz+IqH3U5UlFmDXmabZbL7Ai1xzw== Received: from MWHPR07CA0023.namprd07.prod.outlook.com (2603:10b6:300:116::33) by MN2PR12MB4189.namprd12.prod.outlook.com (2603:10b6:208:1d8::22) 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:05:59 +0000 Received: from CO1NAM11FT027.eop-nam11.prod.protection.outlook.com (2603:10b6:300:116:cafe::98) by MWHPR07CA0023.outlook.office365.com (2603:10b6:300:116::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:05:58 +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 CO1NAM11FT027.mail.protection.outlook.com (10.13.174.224) 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:05:58 +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:05:56 +0000 From: Xueming Li To: Hongbo Zheng CC: Luca Boccassi , Min Hu , Konstantin Ananyev , dpdk stable Date: Sat, 12 Jun 2021 07:01:45 +0800 Message-ID: <20210611230433.8208-11-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: d6cb8ef1-d770-4782-6865-08d92d2d79a9 X-MS-TrafficTypeDiagnostic: MN2PR12MB4189: 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: icxEBscBfMH41WnqM0J6Q1oNMCopJoyfGzEFGNLISfniyTN2gDEl3vvO3KPQFfvfcvOn0qjman3hWo8F18OnNdw4nkNthXlODZsfdBY78w3y10O787QSOyYrAMeE8OUQ4kug0LpVJGlj6Tv3Htw0xSNYa1skuQLLysTHNUBanhiHJMr/o1Hzhlki0TKVfkgzGcQ/wt6rGk2hLXaIQf/wK+pcvRTXgoXMWWvyCrzah0+FfSkIE0/sP23/2jCuycqUAlbBROzBQKMOuztBN/6cmmLLcI0+mTmOCPzaoMOvXE75iH43L4oQIbr9IY/Vj2xMaEy94H8XQWaytTW5k+Y85+VKotJQ7pON5Fl/JhsxW12p/UumK+ecoH4vOpfrOThRDEwaMABtsDAuegmrD9amzG533v/RKuSG/tw6XCy82QxED4ZvMXlAljKvCK/sBtB8zb8NpHBUGfiCt2sD3caXzSFR88TuJPX0OZZiEtgMdG3X2RMsVMIWB9isvDXoIAmxJ/0dNZZrLw4uF7aYLN+QwtGhwAHGIZlHDsAkbmvj6QTk3k7I2ZkaBJIUBkhS61suul3FxpjepGZv/Sz3RgqafQ8dxhd1btkJ793I9zA8k3IjDyhMhKM3OlTSnSdoxGVUU22RTxn5qNL0ys3mlgtEBlOjc5drh8ipcMXpGrTfdzKpyi/1I2KTOk6lR6jGJsDGTHQYIOHxvZAkF1Cqi4+O68o32/xubO+1DKUpRSv3lgxBOKQi76SDzqftok5jv2o3bmRq+C/H0jJmfVYZTsQ99KtfzjhslMzk1IpNkkHkQpfIRn/4ZmrbPuzKByMPtNXn 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)(39860400002)(396003)(376002)(346002)(136003)(46966006)(36840700001)(55016002)(426003)(26005)(966005)(36906005)(336012)(70586007)(2906002)(316002)(1076003)(4326008)(53546011)(70206006)(82310400003)(8676002)(83380400001)(5660300002)(16526019)(8936002)(82740400003)(6916009)(6666004)(7696005)(36756003)(86362001)(6286002)(2616005)(356005)(186003)(47076005)(478600001)(36860700001)(54906003)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:05:58.6590 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6cb8ef1-d770-4782-6865-08d92d2d79a9 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: CO1NAM11FT027.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4189 Subject: [dpdk-stable] patch 'bpf: fix JSLT validation' 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/2c6016c807a7f54fba1d76ad4789a6cf381d618b Thanks. Xueming Li --- >From 2c6016c807a7f54fba1d76ad4789a6cf381d618b Mon Sep 17 00:00:00 2001 From: Hongbo Zheng Date: Thu, 22 Apr 2021 15:30:01 +0800 Subject: [PATCH] bpf: fix JSLT validation Cc: Luca Boccassi [ upstream commit cdcee2ec9b81457f9059c3f3a007e69190672634 ] In function 'eval_jcc', judgment 'op == EBPF_JLT' occurs twice, as a result, the corresponding second statement cannot be accessed. This patch fix this problem. Fixes: 8021917293d0 ("bpf: add extra validation for input BPF program") Signed-off-by: Hongbo Zheng Signed-off-by: Min Hu (Connor) Acked-by: Konstantin Ananyev --- lib/librte_bpf/bpf_validate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c index 9214f15038..7b1291b382 100644 --- a/lib/librte_bpf/bpf_validate.c +++ b/lib/librte_bpf/bpf_validate.c @@ -1115,7 +1115,7 @@ eval_jcc(struct bpf_verifier *bvf, const struct ebpf_insn *ins) eval_jsgt_jsle(trd, trs, frd, frs); else if (op == EBPF_JSLE) eval_jsgt_jsle(frd, frs, trd, trs); - else if (op == EBPF_JLT) + else if (op == EBPF_JSLT) eval_jslt_jsge(trd, trs, frd, frs); else if (op == EBPF_JSGE) eval_jslt_jsge(frd, frs, trd, trs); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:56.975795600 +0800 +++ 0011-bpf-fix-JSLT-validation.patch 2021-06-12 06:53:56.020000000 +0800 @@ -1 +1 @@ -From cdcee2ec9b81457f9059c3f3a007e69190672634 Mon Sep 17 00:00:00 2001 +From 2c6016c807a7f54fba1d76ad4789a6cf381d618b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit cdcee2ec9b81457f9059c3f3a007e69190672634 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ - lib/bpf/bpf_validate.c | 2 +- + lib/librte_bpf/bpf_validate.c | 2 +- @@ -22 +24 @@ -diff --git a/lib/bpf/bpf_validate.c b/lib/bpf/bpf_validate.c +diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c @@ -24,2 +26,2 @@ ---- a/lib/bpf/bpf_validate.c -+++ b/lib/bpf/bpf_validate.c +--- a/lib/librte_bpf/bpf_validate.c ++++ b/lib/librte_bpf/bpf_validate.c