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 4885941D8D for ; Mon, 27 Feb 2023 08:14:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 449CD40ED6; Mon, 27 Feb 2023 08:14:02 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2040.outbound.protection.outlook.com [40.107.96.40]) by mails.dpdk.org (Postfix) with ESMTP id 9755340A84 for ; Mon, 27 Feb 2023 08:14:00 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=diT7UB17sLo6BLAvUBuX1mqPuJKRqwRg6md0VAzaagHD6kWVG2W1wIi/RC3Jymk1k/jT9ZsaV5PCRkEdCZsNB47CjqxZfHuz9mAdogmlTT6Ijq6UQo0j2AGD7CrvmS6sCYI7MSEdwIjsvDCk4XKkZzpQqDP0Z0TZz/nJrvMjr3mwkgr8ChkJeoyqe7cHY67OMc8TJc/pj1id6pEokTBVUCIIJvCllePgjAzICUQ+d0yw034ZIGsf/TvJ4o9OmT6Pt2WPBjEst+rCiyRBi8eBHen3DgXOKuZNA7hLyjSt2aCi8phJULx5WhGmfwwIkPUaN/cK8yOTpJk2UAMVoAG68A== 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=6z1D8hKjHjcfLMlwOb1yriMudnojWc/tkAfZCoeIieM=; b=Cnkum/40kCfehDY5QSnkpUJPpMCkxepxo8j/Ed9fZU36rssUDlr239jZrumEBVVZt2YFk3rERBrEKSwAVSlopHlIdWZIDeGu2UqtcR4laV7WsrqWKPfBjqcL0CgDIKfXlPiG6H9OK0a20SEM4kztujnQjn88EiEmLLe46A9pEz3x2IdQTL5SrZF+i3cq8LU8SOwmpz8IUHMn8Wt8IgmkUQisRLyVNgpa8rdxahGfGIC5canU88lk/jQMGjgHbVaNQVDtuvfYD/eZd7/wc0AQ+8OGnID13sW4CfTKc7PVUdiZol2yHPKjx82hQHrFTVfU3ZyBLy2XvE54Qgkrdgxyrw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=arknetworks.am smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=6z1D8hKjHjcfLMlwOb1yriMudnojWc/tkAfZCoeIieM=; b=P5JQd2d6uUgVkuhhtC5g5Rpod0xkqe8JO1e+oSW+NMHpYEhz+9lUg/6OiFEW0neU2mbsXv3A5DUTUE9q0H0S6BJHD/Nid6GTklDrmvNKwNjyz75UEUtF4kr0MtYbYlQ3gdG7bYEX8ZTQuojOSPQce9dHbbxh1cEnliEkSo8KSMB8I3wD3kUKcifeH+7XqCWpuEBHVe3nIF/Y6KtXpaIidViACo7KwMp+geLRxo8X7KSmeGnWxt4rwlhYLpe5w6ASPo9qYrGIQ1iyUAxdIQvdKslyWHATyZwmA1VpTBb2P4jcQPU+VNRtzNL3Pn7mKnGbVkxs4OGrK/qNp0BGpzcAZg== Received: from DM6PR02CA0139.namprd02.prod.outlook.com (2603:10b6:5:332::6) by DM4PR12MB6589.namprd12.prod.outlook.com (2603:10b6:8:b4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.25; Mon, 27 Feb 2023 07:13:58 +0000 Received: from DM6NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:5:332:cafe::19) by DM6PR02CA0139.outlook.office365.com (2603:10b6:5:332::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:13:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT008.mail.protection.outlook.com (10.13.172.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:13:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:13:48 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:13:45 -0800 From: Xueming Li To: Ivan Malov CC: Viacheslav Galaktionov , "Andy Moreton" , Andrew Rybchenko , dpdk stable Subject: patch 'net/sfc: enforce fate action in transfer flow rules' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:24 +0800 Message-ID: <20230227070107.15664-116-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT008:EE_|DM4PR12MB6589:EE_ X-MS-Office365-Filtering-Correlation-Id: eb5ed35f-6ed7-4b8a-0c77-08db189231d2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bf/vWTweWwUIhGuOj3BE1n+1HK3WqPs6ZJ12AygZK+YGVHKwY8+MtO0GtI2UM/Vry3Y/YWHfZ9UzFRiZkZNo9wgZLUMACbZMQGPoXYSLFhKpz5ub+ENiOZ5Ebd3C/9eIGSV5LJpkPKMN+uXzwfgmD7GjtHlvUhSlMjMKS29DyCgTvhvAo2bQnrOnCX4k4IPJx8qPpKuJwvWAcmN/ZH1vtqik/jexUXJDmg84Wx+wwWmirE/6y0LyCr1YJHe2gU13tyZ+HgW7W17QMBnYB2/PY/1IjlScK2SoaPG1S45IotWD7Lt4KOI/MryHe3CGpWnaECvpvaKEZWQ3O9rdqxKDsiCDpkPS/SZEKQLHDFzeq6lFcW9HvyvmS7UZ1h/ApfjbUSfnNU4Idp67Hjc8JNIgjFsJLjTmtYwebnNsHEey9S5UFUPS132TyYAU+eFzHDKY/yI5JdXtcI9WYVLcQT0BWJ08Fr4E3f9TiRfd2mdAJ47KcSWrU7WBZFXuwu0d67AQya7rdskg2ii56d3tZ/MpiSUg/M2r7Sa2bdnOjdhQoVAh9ax5JsYtJxpR2nEn92Yc8KvlihSx5Bx8b3qJp4r0mTS3Bl+/K2QfrwuhjGyQhusuxDLmPhhIsTAxohp61KYnGlXi4FT1yeuKVspgnvm7ngOZJpTS3Vi7HkACmUttcFnsikb3fxHovsX+5A/0QWQEnoHx3d1Z1Pu5dALHDfBYAO416/byA8Moi6KiGgCeV0921X689eugpOue9qG0a5NdM4i1z5q5/ssKDscU9dls2McUT8Wlx7gi3CI0kBdZwRMLhqM7oy22TJN1fyl9GFpQ X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(346002)(396003)(136003)(376002)(39860400002)(451199018)(40470700004)(36840700001)(46966006)(36756003)(40460700003)(86362001)(47076005)(966005)(7696005)(2906002)(6286002)(6916009)(53546011)(26005)(186003)(4326008)(70586007)(6666004)(70206006)(54906003)(41300700001)(8936002)(5660300002)(16526019)(8676002)(478600001)(316002)(55016003)(7636003)(82740400003)(356005)(82310400005)(426003)(2616005)(34020700004)(336012)(40480700001)(36860700001)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:13:58.1635 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb5ed35f-6ed7-4b8a-0c77-08db189231d2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6589 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 Hi, FYI, your patch has been queued to stable release 22.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 03/01/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=3a842fbbb73ba55c64da1e01ca030907f7a760fd Thanks. Xueming Li --- >From 3a842fbbb73ba55c64da1e01ca030907f7a760fd Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Tue, 14 Feb 2023 17:12:47 +0400 Subject: [PATCH] net/sfc: enforce fate action in transfer flow rules Cc: Xueming Li [ upstream commit 3b8e8f046b6754dfa7157675699ea0f5c65bba36 ] According to DPDK documentation, not specifying a fate action in a flow rule results in undefined behaviour. Define right behaviour in the driver. Fixes: 0839236d0391 ("net/sfc: support flow action drop in transfer rules") Signed-off-by: Ivan Malov Reviewed-by: Viacheslav Galaktionov Reviewed-by: Andy Moreton Acked-by: Andrew Rybchenko --- drivers/net/sfc/sfc_mae.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index 5611a0174f..82d5a95ec4 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -3910,6 +3910,21 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, SFC_ASSERT(B_FALSE); } + /* + * A DPDK flow entry must specify a fate action, which the parser + * converts into a DELIVER action in a libefx action set. An + * attempt to replace the action in the action set should + * fail. If it succeeds then report an error, as the + * parsed flow entry did not contain a fate action. + */ + rc = efx_mae_action_set_populate_drop(ctx.spec); + if (rc == 0) { + rc = rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "no fate action found"); + goto fail_check_fate_action; + } + spec_mae->action_set = sfc_mae_action_set_attach(sa, &ctx); if (spec_mae->action_set != NULL) { sfc_mae_mac_addr_del(sa, ctx.src_mac); @@ -3926,6 +3941,7 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, return 0; fail_action_set_add: +fail_check_fate_action: fail_workaround_tunnel_delivery: fail_nb_count: sfc_mae_encap_header_del(sa, ctx.encap_header); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:44.625341800 +0800 +++ 0117-net-sfc-enforce-fate-action-in-transfer-flow-rules.patch 2023-02-27 14:08:40.869237000 +0800 @@ -1 +1 @@ -From 3b8e8f046b6754dfa7157675699ea0f5c65bba36 Mon Sep 17 00:00:00 2001 +From 3a842fbbb73ba55c64da1e01ca030907f7a760fd Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3b8e8f046b6754dfa7157675699ea0f5c65bba36 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index c254562696..3daeed81b9 100644 +index 5611a0174f..82d5a95ec4 100644