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 3CE11A0A0E for ; Mon, 10 May 2021 18:14:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3802E410FE; Mon, 10 May 2021 18:14:03 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2053.outbound.protection.outlook.com [40.107.93.53]) by mails.dpdk.org (Postfix) with ESMTP id A418140140 for ; Mon, 10 May 2021 18:14:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FB3rfVUSkrXCQpNPaH9/Vig7lkV/LtDKyWf5r9d19IRFKx2vz/CfxFoRgS3GwuXZElfPgLonNsRqPBReCV2gFiiihvG/6N+Oq+hROEJsE7/eMqcKcAjxDHsg25pyXkdTgjSyxBmnIJ+I6qAt5mudGh3d5L/ds0UPer0bDA1lpfVhvEYAycZT7GXb25SdL3xTWWN49ILHPPTNWMFWzXdtWSL/SIc7Gw3lqXciGiBGCE5oDAJOCp4ytHBlk3olRFmlrwWDMt4MZSpCqbQ8EUWDefW+mj8jWhstfzn1+HF+bF5csvWz5PGd+RK2jdGGalyXf38NzS1ejfTaviUt3/ev1A== 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=toF+mOe3dUZYtZY/urd2wmKZ+sQcRNFTFTwAlvKJZMY=; b=DPiGyvfiAM4D/BLuZXFqp4WjPrm/vGhrTGlAJzfl4Ns1BiUrF6mFkrnVweKycxt1kEwI4immZWScizyaNCo+pN6Is/G0dw1i2wkJdppK61Cj0Y3xJLxQsWDVODsvq2pDqZmGsVU+BMnbrGt4FpQ3y009SH3fSs+YLYbJKZpz9ECruQRBu4Wg1JnmlDp+n0girdp82ZPesEZrvdNo2Fn1SUwIMY4m9mKlTnGYTCPm+cbpB/GccjljmP8PAPSQzo1urFmnQ70cXta9WsMu4K5U8iU2ArtoAewLv0MOZWXIIix2i7BhEg5yPD1O0TwnTZwiZJmxJS2Q4Tf1KuthJTbCUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=xilinx.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=toF+mOe3dUZYtZY/urd2wmKZ+sQcRNFTFTwAlvKJZMY=; b=p+KnFA4+vOS/7ZtW6qJ/Dc7tbXnWkccNeRMMLKWXrUWiHpcqxt2eqJVLjENe+rUabzExAevCDfvbQkD9a72VGCdV4TEFF+TIDij0SZYBYdUS6lI/ezI23ZULAfOyjZpysuXkRK60i2ogTbVz7jIvr+liBxMitvUW5at57wuAqrsdARPGqQU051uy7mHNtwJNFUE9q5O1cpAPyh1bxclA8iC+eufR4Ct8sqPu27srabEKdbU8FR9D8gNViYwDax17cJU3xwPgc5DjrMorUcSoODMRgyhxa6IhZbWsF6SrIGFjS2qZLLFy643OscVxgeJl6sbJjMGG7wCcjjKSgHwm4g== Received: from MWHPR01CA0041.prod.exchangelabs.com (2603:10b6:300:101::27) by CH2PR12MB3814.namprd12.prod.outlook.com (2603:10b6:610:28::20) 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:14:00 +0000 Received: from CO1NAM11FT051.eop-nam11.prod.protection.outlook.com (2603:10b6:300:101:cafe::83) by MWHPR01CA0041.outlook.office365.com (2603:10b6:300:101::27) 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:14:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; xilinx.com; dkim=none (message not signed) header.d=none;xilinx.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 CO1NAM11FT051.mail.protection.outlook.com (10.13.174.114) 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:14:00 +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:13:56 +0000 From: Xueming Li To: Ivan Malov CC: Luca Boccassi , Andrew Rybchenko , Andy Moreton , dpdk stable Date: Tue, 11 May 2021 00:00:59 +0800 Message-ID: <20210510160258.30982-110-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: 6b691f50-aeec-4d34-5fbb-08d913ce9f01 X-MS-TrafficTypeDiagnostic: CH2PR12MB3814: 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: GxjkGjT7S5UGAxbrWxIuiKeL8EsAC28BeVKejz/I3Auxl85O4ZOB3syD6xVgDJQP395Zz2nWHULpbkoJwm0ICDL2NWtPkMvBxmkBs1UYFssMeQ38Ds4Bwl9IgtVBlIFV33PZuxrqxNiB+0eNwZzkg8chIRc07Egyu/0hUGbAfAt3EA6xI1Kp9nkvVY7awLtdy3DbCwxs5DWliYQrKQrH0SMBZKlOrd/yWY2WRlVlPPJU2o3fYSjlERyG/wA6pYpgCb9uZse+prHGv0FBwfJOsfwLUYOISfLm0+IsPh1daUnU/u2NXvqWamrdYEZhAzVtxkr0pBDFPM3YK6hNXa3c3UcCfBK7IvVjSt87pnYAizPtqLLv8QwomddYKG9NUR6NevlkHUdBuBtu5XTA3fhw6MNKHsaPBGNHL+TE+7jPk6HrbsmV75AGZC+BO/OAC3XyQsbffmoiBFSFZXOoEdWtDS/Lx1Lt5C7RMo4caOSpiuZC8arHZeeIKpK6EU/8nS1SO1XsErp0LncT4IrVAbMQwHWjcLDaZYcRMsM+1SqLSVHCZm+5YZh6N7AkpgaxwxHpF2x8L3THI3IjgNVX6ceRERYED3FE0p/XJHERzSt28URi80coOM0xOV55+agnRWXZNEJz7cLb9ynmK/7YjinFOI7fmmtn2HA/LCkTGThyaPPc0Qm+qpj8FxSGyQVu9jsBeC+jNEnidyJi5nEAMi35aDsjpWhNfnEhqqdqDdyfpvS/oe0kNtFHiKSqxmtsRglI1O/mgZK+vZjNw77agqlxvQ== 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)(396003)(39860400002)(376002)(346002)(136003)(36840700001)(46966006)(53546011)(47076005)(16526019)(336012)(7636003)(83380400001)(6916009)(426003)(70206006)(186003)(55016002)(8936002)(7696005)(54906003)(2616005)(8676002)(1076003)(82310400003)(26005)(2906002)(36906005)(5660300002)(70586007)(4326008)(356005)(6286002)(478600001)(86362001)(316002)(82740400003)(36756003)(36860700001)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:14:00.0434 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6b691f50-aeec-4d34-5fbb-08d913ce9f01 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: CO1NAM11FT051.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3814 Subject: [dpdk-stable] patch 'net/sfc: fix error path inconsistency' 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/cd33dd08a7ac1e8b910786dbef0275e306a5d03c Thanks. Xueming Li --- >From cd33dd08a7ac1e8b910786dbef0275e306a5d03c Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Fri, 26 Mar 2021 12:39:27 +0300 Subject: [PATCH] net/sfc: fix error path inconsistency Cc: Luca Boccassi [ upstream commit 85a9c42499fa97b9bee12a95a8477d34cec277ec ] At the fail label, there's a statement to set general errno and error message. However, before the label is reached, a custom error message can be set by the code which parses actions. This custom (action-specific) message, when present, must not be replaced by the general one. Fixes: 662286ae61d2 ("net/sfc: add actions parsing stub to MAE backend") Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/net/sfc/sfc_mae.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index 15c5c39758..42d1612302 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -2101,6 +2101,8 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, efx_mae_actions_t *spec; int rc; + rte_errno = 0; + if (actions == NULL) { return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION_NUM, NULL, @@ -2144,7 +2146,7 @@ fail_rule_parse_action: efx_mae_action_set_spec_fini(sa->nic, spec); fail_action_set_spec_init: - if (rc > 0) { + if (rc > 0 && rte_errno == 0) { rc = rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "Failed to process the action"); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:29.473198200 +0800 +++ 0111-net-sfc-fix-error-path-inconsistency.patch 2021-05-10 23:59:26.500000000 +0800 @@ -1 +1 @@ -From 85a9c42499fa97b9bee12a95a8477d34cec277ec Mon Sep 17 00:00:00 2001 +From cd33dd08a7ac1e8b910786dbef0275e306a5d03c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 85a9c42499fa97b9bee12a95a8477d34cec277ec ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 8afa093414..4dafe3dcd9 100644 +index 15c5c39758..42d1612302 100644 @@ -26 +28 @@ -@@ -2634,6 +2634,8 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, +@@ -2101,6 +2101,8 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, @@ -35 +37 @@ -@@ -2690,7 +2692,7 @@ fail_rule_parse_action: +@@ -2144,7 +2146,7 @@ fail_rule_parse_action: