From patchwork Tue Oct 17 08:09:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132732 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7C25B4318A; Tue, 17 Oct 2023 10:11:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DB0D427DF; Tue, 17 Oct 2023 10:10:45 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2052.outbound.protection.outlook.com [40.107.223.52]) by mails.dpdk.org (Postfix) with ESMTP id E3B9040269 for ; Tue, 17 Oct 2023 10:10:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y4UYlnOCY31WIFkK23b7XPpzQa8EN9FEI0By4EX8h81FVC//+1e/J7kvi4kjCyBF+tq3xrzRnrXvya0fEGPSnQvczqe3/HXjFBQkuNZUsCAIZPi+5I/wn4InJgzkahJ9B0hPil8Xi3fG9x2fQc71wwL7FUSJHFZUWQVSXS0Qp5FIqvKChni51RN+5Bpc5lQudUt9TktWZwuTJbS63XHkjPbEnfUOwub+ffJYGb+dtGUOLVQBjGIQ3TenlmcXjhccl465BGfpkqX6ltzjSCHASmCPlkfk2VZxjUT5J9kQ7ZCuhI6aUrO5GjtyKu+5oUr6/N/T4wsSrCHRH1gwAhngig== 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=n3gGYplmMcb7f816hUomjsk8+nWmD8Sj6lk3E6XTVhA=; b=NLFUrhab0vlvvpb8kTt9YubXmsEpNIw8mXEITDCDVPKtluHt7Y/m0U0wZDWvzsT/w8y9RaN/zK51LxiBnp1slIs4Xot3iTt27xHWcCskTVol3qqEAVpEvyMtWtbItqplB5ZD+pkKcdmhYKZDmZ8oYtXhP+cIpyZNc1tg3xpCC+1U2dyriX//pmcHOpJCvB4J05pF0MxhJCGT4twyJ0uNzamxcwxk4LYS6EAyK16Z45EAk+YUJIEFSJ4Xf8cPJQGniTC1hVoOD2njAzQM+l0syUorG4rXvOEQqzgW6kpwe3pU8+B27EhHbsMsOPPwz4+ThWSeNdMhwQzNOa3+D0M5/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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=n3gGYplmMcb7f816hUomjsk8+nWmD8Sj6lk3E6XTVhA=; b=Osvybvb0UoCZUBKAEtlBZzy1kNNCGh1CeW11mR50n4Ua0s/ad4XYpEwjnqGnjzM/buqnUGfDMsBPBPScKXWI+eBvzcq5arDvvL2MHi6PqECUtt5Zn98APZNE3AS0R8ZX/GkLZSc3/ugEf5tl0PR51o6m0u5hFzddKKR99VQJh9sGSvcfWVE1fc0SoPdakt6q6lF2CWPejDxm3bDk4XahAjFinbOAmGpA4arcxeIEpkYTuGAuQDFP0YYYov+1lQa7fOWwDMHs84U7PcuGOqBTAUBgltsfOhtCdB7bfcHxXGQQrEiawomB34se2ee6PozpO1LlHFDUh93oO2vRO29ZAw== Received: from DS7PR03CA0180.namprd03.prod.outlook.com (2603:10b6:5:3b2::35) by SJ1PR12MB6169.namprd12.prod.outlook.com (2603:10b6:a03:45c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.35; Tue, 17 Oct 2023 08:10:38 +0000 Received: from CY4PEPF0000E9D8.namprd05.prod.outlook.com (2603:10b6:5:3b2:cafe::d4) by DS7PR03CA0180.outlook.office365.com (2603:10b6:5:3b2::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.35 via Frontend Transport; Tue, 17 Oct 2023 08:10:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000E9D8.mail.protection.outlook.com (10.167.241.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Tue, 17 Oct 2023 08:10:37 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 17 Oct 2023 01:10:22 -0700 Received: from nvidia.com (10.126.230.35) 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.41; Tue, 17 Oct 2023 01:10:19 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , , Suanming Mou , Matan Azrad , Viacheslav Ovsiienko , Ori Kam Subject: [PATCH v3 11/16] net/mlx5: fix modify field expansion for raw DECAP / ENCAP Date: Tue, 17 Oct 2023 11:09:23 +0300 Message-ID: <20231017080928.30454-12-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017080928.30454-1-getelson@nvidia.com> References: <20230927191046.405282-1-getelson@nvidia.com> <20231017080928.30454-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D8:EE_|SJ1PR12MB6169:EE_ X-MS-Office365-Filtering-Correlation-Id: 5aaf2d96-7c14-4b13-d53c-08dbcee88be6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8f2BTMdptSbbc+Zf1TxoZWuGVz/H8wwjPLlKSSx28Z6qWbrpc03TMAfwAmOdXLQp8sCzynx0fsbZBKb0xurmW4ZBhQAeX/wFF5jE5t42+pl0rI3mrkGnIZuAxeVaWBmXrWzw0m5ADWWj8iEbIxDfnQCphUh78OMXcfaNzssLo33kzSOVLcWCHCRLjRfZ9IAJ46Baco7BxmJpLVsKLLSxltHxsFTIkYWr13ebb/iyL/olRZQMX3qP6CI2GgyWan8zTMKjPRMh+xGVZNOCmJuE2Xzd+l23LBKIAaOkSy1wFYhoqmv4PUJBLf2bsTqTVbpJYzcsPX4S5KPu8FgTQm7MY1Y3p4JPljZCEX2mEsnYgpIuLpF8jkBrhIvHRVPx+0fqnOR6FCkix0ktL6DVVc0t+OvFbhZlnpwTOYEMR6SpMtHZR5Vnk5TgJ9Y1MUsWIWDLua4QkSJnWJmQYxL6hpSu4a5Q5v+TUS9Yf3yLU/Bq8vXpOr60XoueAF0EFx6Jqnu62aZyzO1zQtzS1j/FgFK2UwJjemL365PKzitsbVYzM18Ro5Z0T8Tlydd1ftG1fG82kRa4d4gplLS41sp5qWrXT654osJtF92wB7kzCG9OiUN7oPI7VBXqgAUwSfzdcbsj0lB7zFQy9UqsA7Ct+CqYXz3thrGxiIadPwLw31NAM4YtXXdABjjdfaZK6kt3B7+nI8+AgLpfBri7IPjknhn3nbDEvmT2fh7dg5Gz1EXlhfKvNalFnXJYNI5T8uVtYcs+ X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(346002)(396003)(376002)(39860400002)(230922051799003)(451199024)(186009)(82310400011)(1800799009)(64100799003)(36840700001)(40470700004)(46966006)(55016003)(40480700001)(40460700003)(7636003)(356005)(36756003)(6666004)(36860700001)(47076005)(83380400001)(82740400003)(26005)(16526019)(6286002)(2906002)(54906003)(7696005)(316002)(6916009)(70206006)(1076003)(70586007)(426003)(336012)(2616005)(107886003)(478600001)(86362001)(41300700001)(8936002)(8676002)(4326008)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 08:10:37.7015 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5aaf2d96-7c14-4b13-d53c-08dbcee88be6 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6169 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Flow actions in HWS actions template must be arranged according to pre-defined order. MLX5 PMD handles RAW_DECAP / RAW_ENCAP actions sequence as a single RAW ENCAP or DECAP flow action. When the PMD scanned flow actions to locate position where MODIFY_FIELD action could be inserted it processed the RAW_DECAP / RAW_ENCAP sequence as 2 separate actions. As the result location selection was wrong. The patch fixes RAW_DECAP / RAW_ENCAP sequence processing for MODIFY_FIELD expansion. Fixes: cf7f458 ("net/mlx5: add indirect QUOTA create/query/modify") Signed-off-by: Gregory Etelson Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_hw.c | 36 +++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index efb2d512b7..7b060442ac 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4283,6 +4283,28 @@ flow_hw_validate_action_raw_encap(struct rte_eth_dev *dev __rte_unused, return 0; } +/** + * Process `... / raw_decap / raw_encap / ...` actions sequence. + * The PMD handles the sequence as a single encap or decap reformat action, + * depending on the raw_encap configuration. + * + * The function assumes that the sequence location in actions template list + * complies with relative HWS actions order for the required reformat. + */ +static uint64_t +mlx5_decap_encap_reformat_type(const struct rte_flow_action *actions, + uint32_t encap_ind, uint64_t flags) +{ + const struct rte_flow_action_raw_encap *encap = actions[encap_ind].conf; + + if ((flags & MLX5_FLOW_ACTION_DECAP) == 0) + return MLX5_FLOW_ACTION_ENCAP; + if (actions[encap_ind - 1].type != RTE_FLOW_ACTION_TYPE_RAW_DECAP) + return MLX5_FLOW_ACTION_ENCAP; + return encap->size >= MLX5_ENCAPSULATION_DECISION_SIZE ? + MLX5_FLOW_ACTION_ENCAP : MLX5_FLOW_ACTION_DECAP; +} + static inline uint16_t flow_hw_template_expand_modify_field(struct rte_flow_action actions[], struct rte_flow_action masks[], @@ -4320,13 +4342,13 @@ flow_hw_template_expand_modify_field(struct rte_flow_action actions[], */ for (i = act_num - 2; (int)i >= 0; i--) { enum rte_flow_action_type type = actions[i].type; + uint64_t reformat_type; if (type == RTE_FLOW_ACTION_TYPE_INDIRECT) type = masks[i].type; switch (type) { case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: - case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: case RTE_FLOW_ACTION_TYPE_DROP: case RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL: case RTE_FLOW_ACTION_TYPE_JUMP: @@ -4337,10 +4359,20 @@ flow_hw_template_expand_modify_field(struct rte_flow_action actions[], case RTE_FLOW_ACTION_TYPE_VOID: case RTE_FLOW_ACTION_TYPE_END: break; + case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: + reformat_type = + mlx5_decap_encap_reformat_type(actions, i, + flags); + if (reformat_type == MLX5_FLOW_ACTION_DECAP) { + i++; + goto insert; + } + if (flags & MLX5_FLOW_ACTION_DECAP) + i--; + break; default: i++; /* new MF inserted AFTER actions[i] */ goto insert; - break; } } i = 0;