From patchwork Mon Oct 16 18:42:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132647 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 D605C43181; Mon, 16 Oct 2023 20:44:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFFBE40E72; Mon, 16 Oct 2023 20:43:44 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2084.outbound.protection.outlook.com [40.107.220.84]) by mails.dpdk.org (Postfix) with ESMTP id E5CCD402F0 for ; Mon, 16 Oct 2023 20:43:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cmj2KKCDlVMTGmmnWd5Dk/KOobd05jvl++KyUFIQi6zCTHplEX/QU0L5ClrgWgWJWu2OGD1ftZwkyn13s0PHRmh7n5tbsLUJDfIwtG7rTQ7U4IwHdtY6nsJMbH/XSBAtGdeIa3obgCerT71/6/kHxpRXijTZC1E+c3jbd9bCf1554qAAUliCRe3tdzGHNMeK4cT4adfyE/mDR5hU3ZCnq7VvCQZWN160CSTGP9NNuVUCz4A1tqHJeUjQP0cHhKuxLhsCyuyX7Kvccl01qeloNYVpFDVgx/gHANdgGRIYB9WluLXF4epkbqdjWTq8Op5Qg0sP1gEF16vibbaya8yxig== 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=X3pJmIui42Q8DLuF9Iwwyl50UO4+qvg4aBhuWG2awSs=; b=RN2tXBY1hGnaUp68IgOGOEgtihRYhQPS7TxuStIUklGzPMsE9Jpi4LkloZjhpyHmAPaXbhsLpiIfRiR0Ot5IyzSWy/RO3wzgngDJNu9OaE28OnH23pfHp5Qg4vT6toPkvbMcMsm84WGmwgY31Ci17NY/iu/mQ5wbz/xf560WiDotvg/PM5RI4KlKj60CDzn/mfa/tCUqOe2dwCGCaLnSWA+bj2fCQphJrr4Gbn2/iVWsIp0FKkQ/SfZ/wMhhHvdZ8OWLplKoZUSHmH6HbE2FjFt2H3QKc09sy4FiIwDJKjX6FRS7yfSLTiQw56GpQiAitQCyHqBeGh/SE3RHG5g2Qg== 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=X3pJmIui42Q8DLuF9Iwwyl50UO4+qvg4aBhuWG2awSs=; b=bDXuPQ8sBiURmcnjJnKoDpLp8ryzMaB9n4/u6m2IAMLu0wuLzTixiseHi1jKvDFjc8k/Pmyg6jSkRpfs6L3tAgZKRCfEOvsXLGUwdV69usWwB/GWIP/fR/B3iEQEQRLQyqKWRXk6PHffqoErI7UIM0eomHfHMXW+i7jG/D4ZS6EtGbRjImOJqRoI/O9AvxyTj74ZpoX+Z9434jPqdQLooHmV+Y1SnovuzHwGv4istCRn8yEDurktxmqj70TMAmkj9kDRYc1gjpPvpkK5G2kNAtUeCpbCikF/6mKZ3Hy1YzGohy6c29JyJ/4oSJ0rv3HWPLFVg+cb/T8bFUDh3o+w7g== Received: from MW2PR16CA0021.namprd16.prod.outlook.com (2603:10b6:907::34) by SN7PR12MB6715.namprd12.prod.outlook.com (2603:10b6:806:271::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.35; Mon, 16 Oct 2023 18:43:41 +0000 Received: from MWH0EPF000989E6.namprd02.prod.outlook.com (2603:10b6:907:0:cafe::31) by MW2PR16CA0021.outlook.office365.com (2603:10b6:907::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.35 via Frontend Transport; Mon, 16 Oct 2023 18:43:41 +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 MWH0EPF000989E6.mail.protection.outlook.com (10.167.241.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Mon, 16 Oct 2023 18:43:41 +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; Mon, 16 Oct 2023 11:43:25 -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; Mon, 16 Oct 2023 11:43:22 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , =?utf-8?q?=C2=A0_=2E_=2E_/patches/upstream-pmd-indirect-actions-list/v2/v2-?= =?utf-8?q?0000-cover-letter_=2E_patch?= , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v2 11/16] net/mlx5: fix modify field expansion for raw DECAP / ENCAP Date: Mon, 16 Oct 2023 21:42:30 +0300 Message-ID: <20231016184235.200427-11-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231016184235.200427-1-getelson@nvidia.com> References: <20230927191046.405282-1-getelson@nvidia.com> <20231016184235.200427-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] 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: MWH0EPF000989E6:EE_|SN7PR12MB6715:EE_ X-MS-Office365-Filtering-Correlation-Id: ca0cd6fa-7a3b-45bb-b5cb-08dbce77d19d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HHXxlRm/+nQX9SLx4WGV/FfqIc7i0b6tI86YW8EAv42jJdng8B6HVNH7EytNJa775UWBAgLAeEQRrP6ZvD4P14+XOdO9jrLFoeR1thc0jqrTUt1Sh68oeJq5B/wwLls9SDjlLqT6eBdvfrUeuA/w3wc2ri5TNPxx6XA2iEyGVB2oYQlEA5ZXYV7jnNn9WbL+XJUGe8yN0dCyXflmLKECC2vpXA7swkL7AuC4iOfFPxmslTUzu0AgK1ciFUKXCfVKbWwKOZJPyTuikEnURbjVmsjdIeAurUSPkXvVFPE7PBwSq4ykd+N3eWDPb4o1Va2KQuXn44dFY0y5DAambN8cKK3ii18hYNYddDJs55/Nn9MBkV6kmhgFJ+4sRxrZCEenCWwh+LXEzN+7F8Gb3tBVcQvMzNOPbSgRfF6hndACMifiSAJ2HNhRtLMTFT8rQblMSb03PRaie5QByNJdoI6++GxSEr6x+bzhFQCa4V5NrgINgs+8N69NDxdyp0s6tvMbwl+Lm8i9xS/ZTiep+JG2olmGGGb7Eg82PGBhxXbw3Paoru+Cn0y4w8V2w8kgDo9VynNere1Y3vVjqSPct5FjSDv5sDuVSoDnJbDBORcnBYDGeV8YjBsC4tkIZtFpdL4xZITvhaiAGM5MNKlmHWrUyxir93FJbS63esUAnPp/PjVbyXRkTStzJd8wXHknF+n1o4Xh+iinRTeWYT43eHLI2UtsnmS8riiodUiTvUeeEjaReo9+044nXcVgwiufUYeZ 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)(396003)(376002)(346002)(39860400002)(230922051799003)(1800799009)(186009)(82310400011)(64100799003)(451199024)(40470700004)(46966006)(36840700001)(70586007)(70206006)(2616005)(6916009)(54906003)(316002)(478600001)(107886003)(426003)(1076003)(336012)(26005)(7696005)(2906002)(6286002)(16526019)(5660300002)(4326008)(8936002)(8676002)(41300700001)(86362001)(7636003)(36756003)(82740400003)(356005)(47076005)(83380400001)(6666004)(36860700001)(40480700001)(40460700003)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 18:43:41.4542 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca0cd6fa-7a3b-45bb-b5cb-08dbce77d19d 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: MWH0EPF000989E6.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6715 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 --- 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;