Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/117225/?format=api
{ "id": 117225, "url": "http://patches.dpdk.org/api/patches/117225/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220930125315.5079-16-suanmingm@nvidia.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220930125315.5079-16-suanmingm@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220930125315.5079-16-suanmingm@nvidia.com", "date": "2022-09-30T12:53:13", "name": "[v3,15/17] net/mlx5: support flow integrity in HWS group 0", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0ab997f11a5fb892897a861a7117c96cf60eedd0", "submitter": { "id": 1887, "url": "http://patches.dpdk.org/api/people/1887/?format=api", "name": "Suanming Mou", "email": "suanmingm@nvidia.com" }, "delegate": { "id": 3268, "url": "http://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220930125315.5079-16-suanmingm@nvidia.com/mbox/", "series": [ { "id": 24935, "url": "http://patches.dpdk.org/api/series/24935/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24935", "date": "2022-09-30T12:52:58", "name": "net/mlx5: HW steering PMD update", "version": 3, "mbox": "http://patches.dpdk.org/series/24935/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/117225/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/117225/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 67248A00C4;\n\tFri, 30 Sep 2022 14:55:54 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E864342BC4;\n\tFri, 30 Sep 2022 14:54:24 +0200 (CEST)", "from NAM02-SN1-obe.outbound.protection.outlook.com\n (mail-sn1anam02on2056.outbound.protection.outlook.com [40.107.96.56])\n by mails.dpdk.org (Postfix) with ESMTP id 85A8F42B9D\n for <dev@dpdk.org>; Fri, 30 Sep 2022 14:54:18 +0200 (CEST)", "from DS7PR05CA0063.namprd05.prod.outlook.com (2603:10b6:8:57::19) by\n MN0PR12MB6056.namprd12.prod.outlook.com (2603:10b6:208:3cc::12) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.20; Fri, 30 Sep\n 2022 12:54:16 +0000", "from DM6NAM11FT018.eop-nam11.prod.protection.outlook.com\n (2603:10b6:8:57:cafe::4f) by DS7PR05CA0063.outlook.office365.com\n (2603:10b6:8:57::19) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.14 via Frontend\n Transport; Fri, 30 Sep 2022 12:54:16 +0000", "from mail.nvidia.com (216.228.117.161) by\n DM6NAM11FT018.mail.protection.outlook.com (10.13.172.110) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.5676.17 via Frontend Transport; Fri, 30 Sep 2022 12:54:16 +0000", "from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com\n (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Fri, 30 Sep\n 2022 05:54:08 -0700", "from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com\n (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Fri, 30 Sep\n 2022 05:54:06 -0700" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=nRiJyPqLPmO78/ECHIwuxVqapfkgdOOWzPG9grroXnPH9xjYi6RDFdpS5blIgGYacs63+JxfcvXJTBoyBFXgqbL4qEW5FMLiKASbZUlQw+CFuyOZ8bw+uPqOS7Lqk0+wLIXSRmmRZUCUJPyjsRjvERuI9LR58Akq0V+RIgWTprxhWdsfAXk9Qhc3T0MwDIud5u0F8BSsAWdxxCHJcijv0eehZB8bIkuEIZPI9MD0lnLbNguSCEWvGxUxGNxqQFuoMWwTpyE0X5SIDWDJ8YKDbV2qpOPFRbOyyMD5YegzClyg8ksjRcriaqQwfAomZkvckTlVn2XHvuCZoHgNWuLQJg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=Z+TJnbLt0KaxppOmng/uo9+kRaEVyuT+rSlm6d1Xkz0=;\n b=h2BiHj9b//52nW5KitaSdtDdZ1ndEa99ELH8ijz5fUing6FuRpSj/yktiliffALwzJlNT/S5tVUyseA6NmDJu6J5rvmrbAVZp0xEPQKjb0TEYdShg7bn+OB5rmaFHWOxaWAs0ARyIuhgtX/bU0XmL0yCBAAMcShPviOZqp4OSDAb1UCxZGbgYiOXU6sOkVaGl2tyxVi0ITM/sxcu3J8Fm+WeXEVYBuxIemmsHgWAdBFRis05kGSE3s1b1IDnvPqCIjmSETncq8X6Bkk3QF1DjPOZubNIpDqg3485E/IejOGFZwLCCbVJrdERa74tlnMMkqqlTqvYSAq6pNp4uExTuQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=Z+TJnbLt0KaxppOmng/uo9+kRaEVyuT+rSlm6d1Xkz0=;\n b=LlotXvNf151C/ml/EFuGYAJiv4ITlJl586N/qLQ7hWKOS+wE85GoW6bPvvs0xGJjvITyaBloQkOo0iy/4aynl5fUyjD4pkZI4QaarMrkKD7hetylzvPKjK2+l/ryFglYUh0zlKy9DoTRx5Y2niwyJCsOYC/OdVEWkr3qp4CrdSAT/a1h02n4Z20BC0Wm1O/GjijeFQ9TcdO4VSkJ+rVXNDq2dGUhipY3Az+Herwb8cftC8FizHOmHQ0p+esN9OGrYjb6ns+6Wm/Yjki8Rg46TI43QcLy83MSaQBSX6uLoXXapqRg/SHGka4xJnG9DMa/jndQD42IZotrilB9iYcb3w==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.117.161)\n smtp.mailfrom=nvidia.com;\n dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.117.161 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C", "From": "Suanming Mou <suanmingm@nvidia.com>", "To": "Matan Azrad <matan@nvidia.com>, Viacheslav Ovsiienko\n <viacheslavo@nvidia.com>", "CC": "<dev@dpdk.org>, <rasland@nvidia.com>, <orika@nvidia.com>, Gregory Etelson\n <getelson@nvidia.com>", "Subject": "[PATCH v3 15/17] net/mlx5: support flow integrity in HWS group 0", "Date": "Fri, 30 Sep 2022 15:53:13 +0300", "Message-ID": "<20220930125315.5079-16-suanmingm@nvidia.com>", "X-Mailer": "git-send-email 2.18.1", "In-Reply-To": "<20220930125315.5079-1-suanmingm@nvidia.com>", "References": "<20220923144334.27736-1-suanmingm@nvidia.com>\n <20220930125315.5079-1-suanmingm@nvidia.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.126.230.35]", "X-ClientProxiedBy": "rnnvmail201.nvidia.com (10.129.68.8) To\n rnnvmail201.nvidia.com (10.129.68.8)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "DM6NAM11FT018:EE_|MN0PR12MB6056:EE_", "X-MS-Office365-Filtering-Correlation-Id": "ee85d648-e39e-4b7e-77a9-08daa2e2e201", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n TwFO6ITCBKGJE/xDfPnZJsMmrvblcmOMYSGKtxfg6OPJ2DYDzrojfqA6Q8ScW5k0QnLFvBj06+l/zpGPVZ7XWNKvrV5Oqfh+NM0fHfEoLxBHqCPqWKTdkXSuIMB0gamkk3YRuBK5D7eRNTeHUYBsJHIIuR9OPZxUTVuSmmwirJmY4JZ2A4RhJZdcDtw8zt/C0FJJY1zQm5vGnuwkcvXX+fnTey14koW0nhEQDb2VI9Ebb0lL4ml99VSKO30/2/UWbvQ+tsDObxsg9rSUyiiN/y2kCm8iB8a3FVkKqrTrikfpZPrtS0N3nclU+x31cxBq4WJI5e/9sPyitI4AjdafzlM41opNHxbxyJAfFykLKtnE1Os2V7XB+TFMcVNWUwxdNKMV1gFSqmlcDu2+Dff+zVOSUEPYZ1L2Qv6jbpPrY3b2K9MZtu9u43ATAU/YnDwvZzadFZjlR7qHxyL+9gnfCX/1XyjDZGATWHDx/j8K98IH0qQPvnELo/Ia6lqJmvUuqSelN4iGfsQ15unce03YtOUCa1NCI+E1rCLwZygGbZBhpwcIcolzcClXtFtH/7+LzF3Z43jyt3Rd8jA4+XjNefKgbIQffgmT0LSKmQKBy5yH3bqnkKb+CwG1fs8eLo5fAwtJ6T4tvize95MpuNnpShQSCTMYQ+1XMppilVvG2FW4PswpM794YJp28GN5DsVSaa64ZxusXuGArl6B13PaxlxezjdBvEOznDOwstzIfdciasTRjYlLyNe2fobVA7mGXSt0Qegpy19UDHZI8mg8z9JJ6fsIRUpTBLb8KR5uP8s=", "X-Forefront-Antispam-Report": "CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE;\n SFS:(13230022)(4636009)(39860400002)(346002)(376002)(396003)(136003)(451199015)(46966006)(36840700001)(40470700004)(2616005)(30864003)(26005)(6286002)(40460700003)(82740400003)(4326008)(356005)(8676002)(110136005)(316002)(36756003)(7636003)(55016003)(36860700001)(54906003)(86362001)(40480700001)(47076005)(1076003)(186003)(336012)(82310400005)(8936002)(83380400001)(478600001)(6666004)(107886003)(426003)(16526019)(7696005)(6636002)(5660300002)(70586007)(2906002)(41300700001)(70206006)(309714004);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "30 Sep 2022 12:54:16.2839 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n ee85d648-e39e-4b7e-77a9-08daa2e2e201", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n DM6NAM11FT018.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MN0PR12MB6056", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Gregory Etelson <getelson@nvidia.com>\n\n- Reformat flow integrity item translation for HWS code.\n- Support flow integrity bits in HWS group 0.\n- Update integrity item translation to match positive semantics only.\nPositive flow semantics was described in patch [ae37c0f60c].\n\nSigned-off-by: Gregory Etelson <getelson@nvidia.com>\n---\n drivers/net/mlx5/mlx5_flow.h | 1 +\n drivers/net/mlx5/mlx5_flow_dv.c | 163 ++++++++++++++++----------------\n drivers/net/mlx5/mlx5_flow_hw.c | 8 ++\n 3 files changed, 90 insertions(+), 82 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex e45869a890..3f4aa080bb 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -1462,6 +1462,7 @@ struct mlx5_dv_matcher_workspace {\n \tstruct mlx5_flow_rss_desc *rss_desc; /* RSS descriptor. */\n \tconst struct rte_flow_item *tunnel_item; /* Flow tunnel item. */\n \tconst struct rte_flow_item *gre_item; /* Flow GRE item. */\n+\tconst struct rte_flow_item *integrity_items[2];\n };\n \n struct mlx5_flow_split_info {\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex d31838e26e..e86a06eae6 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -12648,132 +12648,121 @@ flow_dv_aso_age_params_init(struct rte_eth_dev *dev,\n \n static void\n flow_dv_translate_integrity_l4(const struct rte_flow_item_integrity *mask,\n-\t\t\t const struct rte_flow_item_integrity *value,\n-\t\t\t void *headers_m, void *headers_v)\n+\t\t\t void *headers)\n {\n+\t/*\n+\t * In HWS mode MLX5_ITEM_UPDATE() macro assigns the same pointer to\n+\t * both mask and value, therefore ether can be used.\n+\t * In SWS SW_V mode mask points to item mask and value points to item\n+\t * spec. Integrity item value is used only if matching mask is set.\n+\t * Use mask reference here to keep SWS functionality.\n+\t */\n \tif (mask->l4_ok) {\n \t\t/* RTE l4_ok filter aggregates hardware l4_ok and\n \t\t * l4_checksum_ok filters.\n \t\t * Positive RTE l4_ok match requires hardware match on both L4\n \t\t * hardware integrity bits.\n-\t\t * For negative match, check hardware l4_checksum_ok bit only,\n-\t\t * because hardware sets that bit to 0 for all packets\n-\t\t * with bad L4.\n+\t\t * PMD supports positive integrity item semantics only.\n \t\t */\n-\t\tif (value->l4_ok) {\n-\t\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_m, l4_ok, 1);\n-\t\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_v, l4_ok, 1);\n-\t\t}\n-\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_m, l4_checksum_ok, 1);\n-\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_v, l4_checksum_ok,\n-\t\t\t !!value->l4_ok);\n-\t}\n-\tif (mask->l4_csum_ok) {\n-\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_m, l4_checksum_ok, 1);\n-\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_v, l4_checksum_ok,\n-\t\t\t value->l4_csum_ok);\n+\t\tMLX5_SET(fte_match_set_lyr_2_4, headers, l4_ok, 1);\n+\t\tMLX5_SET(fte_match_set_lyr_2_4, headers, l4_checksum_ok, 1);\n+\t} else if (mask->l4_csum_ok) {\n+\t\tMLX5_SET(fte_match_set_lyr_2_4, headers, l4_checksum_ok, 1);\n \t}\n }\n \n static void\n flow_dv_translate_integrity_l3(const struct rte_flow_item_integrity *mask,\n-\t\t\t const struct rte_flow_item_integrity *value,\n-\t\t\t void *headers_m, void *headers_v, bool is_ipv4)\n+\t\t\t void *headers, bool is_ipv4)\n {\n+\t/*\n+\t * In HWS mode MLX5_ITEM_UPDATE() macro assigns the same pointer to\n+\t * both mask and value, therefore ether can be used.\n+\t * In SWS SW_V mode mask points to item mask and value points to item\n+\t * spec. Integrity item value used only if matching mask is set.\n+\t * Use mask reference here to keep SWS functionality.\n+\t */\n \tif (mask->l3_ok) {\n \t\t/* RTE l3_ok filter aggregates for IPv4 hardware l3_ok and\n \t\t * ipv4_csum_ok filters.\n \t\t * Positive RTE l3_ok match requires hardware match on both L3\n \t\t * hardware integrity bits.\n-\t\t * For negative match, check hardware l3_csum_ok bit only,\n-\t\t * because hardware sets that bit to 0 for all packets\n-\t\t * with bad L3.\n+\t\t * PMD supports positive integrity item semantics only.\n \t\t */\n+\t\tMLX5_SET(fte_match_set_lyr_2_4, headers, l3_ok, 1);\n \t\tif (is_ipv4) {\n-\t\t\tif (value->l3_ok) {\n-\t\t\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_m,\n-\t\t\t\t\t l3_ok, 1);\n-\t\t\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_v,\n-\t\t\t\t\t l3_ok, 1);\n-\t\t\t}\n-\t\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_m,\n+\t\t\tMLX5_SET(fte_match_set_lyr_2_4, headers,\n \t\t\t\t ipv4_checksum_ok, 1);\n-\t\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_v,\n-\t\t\t\t ipv4_checksum_ok, !!value->l3_ok);\n-\t\t} else {\n-\t\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_m, l3_ok, 1);\n-\t\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_v, l3_ok,\n-\t\t\t\t value->l3_ok);\n \t\t}\n-\t}\n-\tif (mask->ipv4_csum_ok) {\n-\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_m, ipv4_checksum_ok, 1);\n-\t\tMLX5_SET(fte_match_set_lyr_2_4, headers_v, ipv4_checksum_ok,\n-\t\t\t value->ipv4_csum_ok);\n+\t} else if (is_ipv4 && mask->ipv4_csum_ok) {\n+\t\tMLX5_SET(fte_match_set_lyr_2_4, headers, ipv4_checksum_ok, 1);\n \t}\n }\n \n static void\n-set_integrity_bits(void *headers_m, void *headers_v,\n-\t\t const struct rte_flow_item *integrity_item, bool is_l3_ip4)\n+set_integrity_bits(void *headers, const struct rte_flow_item *integrity_item,\n+\t\t bool is_l3_ip4, uint32_t key_type)\n {\n-\tconst struct rte_flow_item_integrity *spec = integrity_item->spec;\n-\tconst struct rte_flow_item_integrity *mask = integrity_item->mask;\n+\tconst struct rte_flow_item_integrity *spec;\n+\tconst struct rte_flow_item_integrity *mask;\n \n \t/* Integrity bits validation cleared spec pointer */\n-\tMLX5_ASSERT(spec != NULL);\n-\tif (!mask)\n-\t\tmask = &rte_flow_item_integrity_mask;\n-\tflow_dv_translate_integrity_l3(mask, spec, headers_m, headers_v,\n-\t\t\t\t is_l3_ip4);\n-\tflow_dv_translate_integrity_l4(mask, spec, headers_m, headers_v);\n+\tif (MLX5_ITEM_VALID(integrity_item, key_type))\n+\t\treturn;\n+\tMLX5_ITEM_UPDATE(integrity_item, key_type, spec, mask,\n+\t\t\t &rte_flow_item_integrity_mask);\n+\tflow_dv_translate_integrity_l3(mask, headers, is_l3_ip4);\n+\tflow_dv_translate_integrity_l4(mask, headers);\n }\n \n static void\n-flow_dv_translate_item_integrity_post(void *matcher, void *key,\n+flow_dv_translate_item_integrity_post(void *key,\n \t\t\t\t const\n \t\t\t\t struct rte_flow_item *integrity_items[2],\n-\t\t\t\t uint64_t pattern_flags)\n+\t\t\t\t uint64_t pattern_flags, uint32_t key_type)\n {\n-\tvoid *headers_m, *headers_v;\n+\tvoid *headers;\n \tbool is_l3_ip4;\n \n \tif (pattern_flags & MLX5_FLOW_ITEM_INNER_INTEGRITY) {\n-\t\theaders_m = MLX5_ADDR_OF(fte_match_param, matcher,\n-\t\t\t\t\t inner_headers);\n-\t\theaders_v = MLX5_ADDR_OF(fte_match_param, key, inner_headers);\n+\t\theaders = MLX5_ADDR_OF(fte_match_param, key, inner_headers);\n \t\tis_l3_ip4 = (pattern_flags & MLX5_FLOW_LAYER_INNER_L3_IPV4) !=\n \t\t\t 0;\n-\t\tset_integrity_bits(headers_m, headers_v,\n-\t\t\t\t integrity_items[1], is_l3_ip4);\n+\t\tset_integrity_bits(headers, integrity_items[1], is_l3_ip4,\n+\t\t\t\t key_type);\n \t}\n \tif (pattern_flags & MLX5_FLOW_ITEM_OUTER_INTEGRITY) {\n-\t\theaders_m = MLX5_ADDR_OF(fte_match_param, matcher,\n-\t\t\t\t\t outer_headers);\n-\t\theaders_v = MLX5_ADDR_OF(fte_match_param, key, outer_headers);\n+\t\theaders = MLX5_ADDR_OF(fte_match_param, key, outer_headers);\n \t\tis_l3_ip4 = (pattern_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV4) !=\n \t\t\t 0;\n-\t\tset_integrity_bits(headers_m, headers_v,\n-\t\t\t\t integrity_items[0], is_l3_ip4);\n+\t\tset_integrity_bits(headers, integrity_items[0], is_l3_ip4,\n+\t\t\t\t key_type);\n \t}\n }\n \n-static void\n+static uint64_t\n flow_dv_translate_item_integrity(const struct rte_flow_item *item,\n-\t\t\t\t const struct rte_flow_item *integrity_items[2],\n-\t\t\t\t uint64_t *last_item)\n+\t\t\t\t struct mlx5_dv_matcher_workspace *wks,\n+\t\t\t\t uint64_t key_type)\n {\n-\tconst struct rte_flow_item_integrity *spec = (typeof(spec))item->spec;\n+\tif ((key_type & MLX5_SET_MATCHER_SW) != 0) {\n+\t\tconst struct rte_flow_item_integrity\n+\t\t\t*spec = (typeof(spec))item->spec;\n \n-\t/* integrity bits validation cleared spec pointer */\n-\tMLX5_ASSERT(spec != NULL);\n-\tif (spec->level > 1) {\n-\t\tintegrity_items[1] = item;\n-\t\t*last_item |= MLX5_FLOW_ITEM_INNER_INTEGRITY;\n+\t\t/* SWS integrity bits validation cleared spec pointer */\n+\t\tif (spec->level > 1) {\n+\t\t\twks->integrity_items[1] = item;\n+\t\t\twks->last_item |= MLX5_FLOW_ITEM_INNER_INTEGRITY;\n+\t\t} else {\n+\t\t\twks->integrity_items[0] = item;\n+\t\t\twks->last_item |= MLX5_FLOW_ITEM_OUTER_INTEGRITY;\n+\t\t}\n \t} else {\n-\t\tintegrity_items[0] = item;\n-\t\t*last_item |= MLX5_FLOW_ITEM_OUTER_INTEGRITY;\n+\t\t/* HWS supports outer integrity only */\n+\t\twks->integrity_items[0] = item;\n+\t\twks->last_item |= MLX5_FLOW_ITEM_OUTER_INTEGRITY;\n \t}\n+\treturn wks->last_item;\n }\n \n /**\n@@ -13401,6 +13390,10 @@ flow_dv_translate_items(struct rte_eth_dev *dev,\n \t\tflow_dv_translate_item_meter_color(dev, key, items, key_type);\n \t\tlast_item = MLX5_FLOW_ITEM_METER_COLOR;\n \t\tbreak;\n+\tcase RTE_FLOW_ITEM_TYPE_INTEGRITY:\n+\t\tlast_item = flow_dv_translate_item_integrity(items,\n+\t\t\t\t\t\t\t wks, key_type);\n+\t\tbreak;\n \tdefault:\n \t\tbreak;\n \t}\n@@ -13464,6 +13457,12 @@ flow_dv_translate_items_hws(const struct rte_flow_item *items,\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\n+\tif (wks.item_flags & MLX5_FLOW_ITEM_INTEGRITY) {\n+\t\tflow_dv_translate_item_integrity_post(key,\n+\t\t\t\t\t\t wks.integrity_items,\n+\t\t\t\t\t\t wks.item_flags,\n+\t\t\t\t\t\t key_type);\n+\t}\n \tif (wks.item_flags & MLX5_FLOW_LAYER_VXLAN_GPE) {\n \t\tflow_dv_translate_item_vxlan_gpe(key,\n \t\t\t\t\t\t wks.tunnel_item,\n@@ -13544,7 +13543,6 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev,\n \t\t\t mlx5_flow_get_thread_workspace())->rss_desc,\n \t};\n \tstruct mlx5_dv_matcher_workspace wks_m = wks;\n-\tconst struct rte_flow_item *integrity_items[2] = {NULL, NULL};\n \tint ret = 0;\n \tint tunnel;\n \n@@ -13555,10 +13553,6 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev,\n \t\t\t\t\t\t NULL, \"item not supported\");\n \t\ttunnel = !!(wks.item_flags & MLX5_FLOW_LAYER_TUNNEL);\n \t\tswitch (items->type) {\n-\t\tcase RTE_FLOW_ITEM_TYPE_INTEGRITY:\n-\t\t\tflow_dv_translate_item_integrity(items, integrity_items,\n-\t\t\t\t\t\t\t &wks.last_item);\n-\t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_CONNTRACK:\n \t\t\tflow_dv_translate_item_aso_ct(dev, match_mask,\n \t\t\t\t\t\t match_value, items);\n@@ -13601,9 +13595,14 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev,\n \t\t\treturn -rte_errno;\n \t}\n \tif (wks.item_flags & MLX5_FLOW_ITEM_INTEGRITY) {\n-\t\tflow_dv_translate_item_integrity_post(match_mask, match_value,\n-\t\t\t\t\t\t integrity_items,\n-\t\t\t\t\t\t wks.item_flags);\n+\t\tflow_dv_translate_item_integrity_post(match_mask,\n+\t\t\t\t\t\t wks_m.integrity_items,\n+\t\t\t\t\t\t wks_m.item_flags,\n+\t\t\t\t\t\t MLX5_SET_MATCHER_SW_M);\n+\t\tflow_dv_translate_item_integrity_post(match_value,\n+\t\t\t\t\t\t wks.integrity_items,\n+\t\t\t\t\t\t wks.item_flags,\n+\t\t\t\t\t\t MLX5_SET_MATCHER_SW_V);\n \t}\n \tif (wks.item_flags & MLX5_FLOW_LAYER_VXLAN_GPE) {\n \t\tflow_dv_translate_item_vxlan_gpe(match_mask,\ndiff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c\nindex 9f70637fcf..2b5eab6659 100644\n--- a/drivers/net/mlx5/mlx5_flow_hw.c\n+++ b/drivers/net/mlx5/mlx5_flow_hw.c\n@@ -4656,6 +4656,14 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev,\n \t\tcase RTE_FLOW_ITEM_TYPE_ICMP6:\n \t\tcase RTE_FLOW_ITEM_TYPE_CONNTRACK:\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_INTEGRITY:\n+\t\t\t/*\n+\t\t\t * Integrity flow item validation require access to\n+\t\t\t * both item mask and spec.\n+\t\t\t * Current HWS model allows item mask in pattern\n+\t\t\t * template and item spec in flow rule.\n+\t\t\t */\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_END:\n \t\t\titems_end = true;\n \t\t\tbreak;\n", "prefixes": [ "v3", "15/17" ] }