Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/96314/?format=api
{ "id": 96314, "url": "http://patchwork.dpdk.org/api/patches/96314/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20210727073121.895620-3-dkozlyuk@nvidia.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20210727073121.895620-3-dkozlyuk@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210727073121.895620-3-dkozlyuk@nvidia.com", "date": "2021-07-27T07:31:18", "name": "[2/4] net/mlx5: create drop queue using DevX", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0940259caf32af9d88b8e960710de8e8214162ab", "submitter": { "id": 2248, "url": "http://patchwork.dpdk.org/api/people/2248/?format=api", "name": "Dmitry Kozlyuk", "email": "dkozlyuk@nvidia.com" }, "delegate": { "id": 3961, "url": "http://patchwork.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20210727073121.895620-3-dkozlyuk@nvidia.com/mbox/", "series": [ { "id": 18009, "url": "http://patchwork.dpdk.org/api/series/18009/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=18009", "date": "2021-07-27T07:31:16", "name": "net/mlx5: keep indirect actions across port restart", "version": 1, "mbox": "http://patchwork.dpdk.org/series/18009/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/96314/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/96314/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 009F7A0C4D;\n\tTue, 27 Jul 2021 09:31:58 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E76BF41125;\n\tTue, 27 Jul 2021 09:31:45 +0200 (CEST)", "from NAM10-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam10on2069.outbound.protection.outlook.com [40.107.93.69])\n by mails.dpdk.org (Postfix) with ESMTP id 1E9DF410FD;\n Tue, 27 Jul 2021 09:31:44 +0200 (CEST)", "from BN9PR03CA0123.namprd03.prod.outlook.com (2603:10b6:408:fe::8)\n by CY4PR1201MB0053.namprd12.prod.outlook.com (2603:10b6:910:23::22) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.29; Tue, 27 Jul\n 2021 07:31:41 +0000", "from BN8NAM11FT041.eop-nam11.prod.protection.outlook.com\n (2603:10b6:408:fe:cafe::95) by BN9PR03CA0123.outlook.office365.com\n (2603:10b6:408:fe::8) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.29 via Frontend\n Transport; Tue, 27 Jul 2021 07:31:41 +0000", "from mail.nvidia.com (216.228.112.34) by\n BN8NAM11FT041.mail.protection.outlook.com (10.13.177.18) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4352.24 via Frontend Transport; Tue, 27 Jul 2021 07:31:41 +0000", "from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com\n (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 27 Jul\n 2021 07:31:38 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=hagF3Flka1dmixXAYz/TcrcSm2QUo4Wtx5DlCgbF5uK6sZfq4jqbEinif5YFXTKReM1scu08PRu4Ha2/AGvxhEToaT3DKtFwo56jybbN07awqlXHEh0pXH9tgBMK/v9pAOcBrZSbxecrOJSgeXHKu3Q9zDPYUs/KF+43fKgxsfqfs9HGSui6gp4GvJO+HnbyHTSTYlUXHDLkiA68AraThiUTNXlBPM3D+M66hGwXAmNgPOUg8wFwPPZ/rGRle8RKRzIuE9JS7BVfAEGmUwuhwRJIAfdh1KrOwfxXmkxHxvY4YYyw0dFo9iZY2NprnUTSIhzOro2i4ID9v29F9NEK7w==", "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-SenderADCheck;\n bh=Ms13mwJ2tKihTH+QzvZaiZd5EGVR3oWCCMKk3b+XMW0=;\n b=dQSWsj+MDm/1bGqoGEVFyCjh2wbD5Y8sSgY3KDZV6rk538K7ACyzZVo7yGpI6++r7kEX8ql0kj/wkYW1S1zOCE5+Ve6ygBH0XMoQ9Gr8sCUCEf76DbeLLYtQwjnzYm/PVVgbO7dr/DxEGEP3QK9VWt/65DZMRqTwcTMHfIdZtJrMqcc7cyqCKSW8ZDCMp+E6GxWPAbfx2j/bD3do0kZBSVZiWTzRNMENLVAqqEO8j54l9tcojgTmFYLB7v7SOvSDObe2hDixlWOyfMlFSVz+7RA+fd/Evgh0Q0hz51snDhFic0Df/NzEUTpIeIi9/ddBXRscDYWtnOXptl84KHYanQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=quarantine sp=none 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=Ms13mwJ2tKihTH+QzvZaiZd5EGVR3oWCCMKk3b+XMW0=;\n b=hOPRq7bTVcH4IT+12IM6d9J9iE3A74f2JX38nCMuZYf6KFwotkMKBBed37p2G8+adXGzUfT/2vSq9xtGFFVV824CySfBSjfGVXpznz0T7y1CSEPhQO5+EC+cRN/IjMo8YYe0qrVZmNrcnO5gPnLzt04RqLtLFteVk3iMVzNxJbNQ8mGTkoc3Lc355kRlGajlP6rJlm/eV+AIPEcAeUKQG9mKwS6Ne+zyS78xwDG7WrhuAgJgp41V/ARCgeGTd3GttK+6nssq+YSvZnwwT2I2pbTNzqSrRmwKOPvwuyp7KDEzi5yOKmOm2W5O0hKzGIN+/QsUltshUCyC/nwq3Y9mmA==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.112.34)\n smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed)\n header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.112.34 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.112.34; helo=mail.nvidia.com;", "From": "Dmitry Kozlyuk <dkozlyuk@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "David Marchand <david.marchand@redhat.com>, <stable@dpdk.org>, Matan Azrad\n <matan@nvidia.com>, Shahaf Shuler <shahafs@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "Date": "Tue, 27 Jul 2021 10:31:18 +0300", "Message-ID": "<20210727073121.895620-3-dkozlyuk@nvidia.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210727073121.895620-1-dkozlyuk@nvidia.com>", "References": "<20210727073121.895620-1-dkozlyuk@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.5]", "X-ClientProxiedBy": "HQMAIL105.nvidia.com (172.20.187.12) To\n HQMAIL107.nvidia.com (172.20.187.13)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "1ee164da-63d2-4d5d-659e-08d950d093ef", "X-MS-TrafficTypeDiagnostic": "CY4PR1201MB0053:", "X-Microsoft-Antispam-PRVS": "\n <CY4PR1201MB00531775F1A47D36FA5261F4B9E99@CY4PR1201MB0053.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:3276;", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n FCaNdyjdjuebQaj/6mP892u/JSe5XxFnOfL3Uku6+KP6jCevZu64GI0vvLoFf2wWi8tyAJpEuZ4aN05GDD5BJF2Hu4BUVkhLuJIONdoV3KvrUVT3IxOb6CJUv3IcvOjrfxGjTY/UqO0tPcveH8AC2I7a4Dh4ElYJ6KKSKmU7QgVuR1t/EOmvohfcNym4zVbvEcxEXxxXXHGSr5Sl8k6cPRKb3t3wkhPD1cuuCt4hdk3GLMiMN77687kqZ/3zDtiEDoQiX42LstSBkPGMzMi+6JaTo8AjNnfYcwyIC4E07AQMpgqcBWVUVAnuKnOfiP3gCDLIt4/NIc4qBZRX1kkFY93pkvl3Qhtg+Go+h7c8fr2/H9OR6Xm0+APYvbzxsAO6HbgSsFTqB6TWHoQgfLAT5iM/lkxlH2/w/RPP9EftXDCdBlgeIhEsF85qWQ53QDuSzBIVI9UJFKI6kTixQ6Fxe5T7wuiSzhnBRgNN2nCAMgvM/SVWtYAopUTtvsbPTLXcCPYWpIBTI3Ho5CWm0gsgpfltA9nsUVNreKsGP4Y5kqKaQL7aA6nvldg/BEXUIYlNdsdnbOLCsRBRIB1fbdd6zZcO2k9/jLvYwlGEgAf0NlAL9RUFR+GXcZPzNnBgwjrsQN7eyvK3AbRC+92cqpclR93jcNRrSSzbBQWCJvCgodGLPiL1kwjWxhoYqPnEVZxdUAnFTv1Yn3Qyz2c4C4Z7MQ==", "X-Forefront-Antispam-Report": "CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;\n SFS:(4636009)(396003)(39860400002)(376002)(136003)(346002)(46966006)(36840700001)(16526019)(336012)(186003)(36860700001)(26005)(356005)(83380400001)(1076003)(8676002)(6666004)(86362001)(426003)(6916009)(107886003)(2616005)(4326008)(478600001)(2906002)(82740400003)(30864003)(55016002)(54906003)(7636003)(7696005)(70586007)(82310400003)(36756003)(6286002)(5660300002)(70206006)(8936002)(316002)(36906005)(47076005);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "27 Jul 2021 07:31:41.2826 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 1ee164da-63d2-4d5d-659e-08d950d093ef", "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.112.34];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n BN8NAM11FT041.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CY4PR1201MB0053", "Subject": "[dpdk-dev] [PATCH 2/4] net/mlx5: create drop queue using DevX", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Drop queue creation and destruction were not implemented for DevX\nflow engine and Verbs engine methods were used as a workaround.\nImplement these methods for DevX so that there is a valid queue ID\nthat can be used regardless of queue configuration via API.\n\nCc: stable@dpdk.org\n\nSigned-off-by: Dmitry Kozlyuk <dkozlyuk@nvidia.com>\nAcked-by: Matan Azrad <matan@nvidia.com>\n---\n drivers/net/mlx5/linux/mlx5_os.c | 4 -\n drivers/net/mlx5/mlx5_devx.c | 204 ++++++++++++++++++++++++++-----\n 2 files changed, 176 insertions(+), 32 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex 671dfface9..791024c2c6 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -1756,10 +1756,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,\n \t}\n \tif (config->devx && config->dv_flow_en && config->dest_tir) {\n \t\tpriv->obj_ops = devx_obj_ops;\n-\t\tpriv->obj_ops.drop_action_create =\n-\t\t\t\t\t\tibv_obj_ops.drop_action_create;\n-\t\tpriv->obj_ops.drop_action_destroy =\n-\t\t\t\t\t\tibv_obj_ops.drop_action_destroy;\n #ifndef HAVE_MLX5DV_DEVX_UAR_OFFSET\n \t\tpriv->obj_ops.txq_obj_modify = ibv_obj_ops.txq_obj_modify;\n #else\ndiff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c\nindex a1db53577a..447d6bafb9 100644\n--- a/drivers/net/mlx5/mlx5_devx.c\n+++ b/drivers/net/mlx5/mlx5_devx.c\n@@ -226,17 +226,17 @@ mlx5_rx_devx_get_event(struct mlx5_rxq_obj *rxq_obj)\n *\n * @param dev\n * Pointer to Ethernet device.\n- * @param idx\n- * Queue index in DPDK Rx queue array.\n+ * @param rxq_data\n+ * RX queue data.\n *\n * @return\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n static int\n-mlx5_rxq_create_devx_rq_resources(struct rte_eth_dev *dev, uint16_t idx)\n+mlx5_rxq_create_devx_rq_resources(struct rte_eth_dev *dev,\n+\t\t\t\t struct mlx5_rxq_data *rxq_data)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n-\tstruct mlx5_rxq_data *rxq_data = (*priv->rxqs)[idx];\n \tstruct mlx5_rxq_ctrl *rxq_ctrl =\n \t\tcontainer_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n \tstruct mlx5_devx_create_rq_attr rq_attr = { 0 };\n@@ -289,20 +289,20 @@ mlx5_rxq_create_devx_rq_resources(struct rte_eth_dev *dev, uint16_t idx)\n *\n * @param dev\n * Pointer to Ethernet device.\n- * @param idx\n- * Queue index in DPDK Rx queue array.\n+ * @param rxq_data\n+ * RX queue data.\n *\n * @return\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n static int\n-mlx5_rxq_create_devx_cq_resources(struct rte_eth_dev *dev, uint16_t idx)\n+mlx5_rxq_create_devx_cq_resources(struct rte_eth_dev *dev,\n+\t\t\t\t struct mlx5_rxq_data *rxq_data)\n {\n \tstruct mlx5_devx_cq *cq_obj = 0;\n \tstruct mlx5_devx_cq_attr cq_attr = { 0 };\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_dev_ctx_shared *sh = priv->sh;\n-\tstruct mlx5_rxq_data *rxq_data = (*priv->rxqs)[idx];\n \tstruct mlx5_rxq_ctrl *rxq_ctrl =\n \t\tcontainer_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n \tunsigned int cqe_n = mlx5_rxq_cqe_num(rxq_data);\n@@ -497,13 +497,13 @@ mlx5_rxq_devx_obj_new(struct rte_eth_dev *dev, uint16_t idx)\n \t\ttmpl->fd = mlx5_os_get_devx_channel_fd(tmpl->devx_channel);\n \t}\n \t/* Create CQ using DevX API. */\n-\tret = mlx5_rxq_create_devx_cq_resources(dev, idx);\n+\tret = mlx5_rxq_create_devx_cq_resources(dev, rxq_data);\n \tif (ret) {\n \t\tDRV_LOG(ERR, \"Failed to create CQ.\");\n \t\tgoto error;\n \t}\n \t/* Create RQ using DevX API. */\n-\tret = mlx5_rxq_create_devx_rq_resources(dev, idx);\n+\tret = mlx5_rxq_create_devx_rq_resources(dev, rxq_data);\n \tif (ret) {\n \t\tDRV_LOG(ERR, \"Port %u Rx queue %u RQ creation failure.\",\n \t\t\tdev->data->port_id, idx);\n@@ -536,6 +536,11 @@ mlx5_rxq_devx_obj_new(struct rte_eth_dev *dev, uint16_t idx)\n * Pointer to Ethernet device.\n * @param log_n\n * Log of number of queues in the array.\n+ * @param queues\n+ * List of RX queue indices or NULL, in which case\n+ * the attribute will be filled by drop queue ID.\n+ * @param queues_n\n+ * Size of @p queues array or 0 if it is NULL.\n * @param ind_tbl\n * DevX indirection table object.\n *\n@@ -563,6 +568,11 @@ mlx5_devx_ind_table_create_rqt_attr(struct rte_eth_dev *dev,\n \t}\n \trqt_attr->rqt_max_size = priv->config.ind_table_max_size;\n \trqt_attr->rqt_actual_size = rqt_n;\n+\tif (queues == NULL) {\n+\t\tfor (i = 0; i < rqt_n; i++)\n+\t\t\trqt_attr->rq_list[i] = priv->drop_queue.rxq->rq->id;\n+\t\treturn rqt_attr;\n+\t}\n \tfor (i = 0; i != queues_n; ++i) {\n \t\tstruct mlx5_rxq_data *rxq = (*priv->rxqs)[queues[i]];\n \t\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n@@ -670,7 +680,8 @@ mlx5_devx_ind_table_destroy(struct mlx5_ind_table_obj *ind_tbl)\n * @param[in] hash_fields\n * Verbs protocol hash field to make the RSS on.\n * @param[in] ind_tbl\n- * Indirection table for TIR.\n+ * Indirection table for TIR. If table queues array is NULL,\n+ * a TIR for drop queue is assumed.\n * @param[in] tunnel\n * Tunnel type.\n * @param[out] tir_attr\n@@ -686,19 +697,27 @@ mlx5_devx_tir_attr_set(struct rte_eth_dev *dev, const uint8_t *rss_key,\n \t\t int tunnel, struct mlx5_devx_tir_attr *tir_attr)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n-\tstruct mlx5_rxq_data *rxq_data = (*priv->rxqs)[ind_tbl->queues[0]];\n-\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n-\t\tcontainer_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n-\tenum mlx5_rxq_type rxq_obj_type = rxq_ctrl->type;\n+\tenum mlx5_rxq_type rxq_obj_type;\n \tbool lro = true;\n \tuint32_t i;\n \n-\t/* Enable TIR LRO only if all the queues were configured for. */\n-\tfor (i = 0; i < ind_tbl->queues_n; ++i) {\n-\t\tif (!(*priv->rxqs)[ind_tbl->queues[i]]->lro) {\n-\t\t\tlro = false;\n-\t\t\tbreak;\n+\t/* NULL queues designate drop queue. */\n+\tif (ind_tbl->queues != NULL) {\n+\t\tstruct mlx5_rxq_data *rxq_data =\n+\t\t\t\t\t(*priv->rxqs)[ind_tbl->queues[0]];\n+\t\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n+\t\t\tcontainer_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n+\t\trxq_obj_type = rxq_ctrl->type;\n+\n+\t\t/* Enable TIR LRO only if all the queues were configured for. */\n+\t\tfor (i = 0; i < ind_tbl->queues_n; ++i) {\n+\t\t\tif (!(*priv->rxqs)[ind_tbl->queues[i]]->lro) {\n+\t\t\t\tlro = false;\n+\t\t\t\tbreak;\n+\t\t\t}\n \t\t}\n+\t} else {\n+\t\trxq_obj_type = priv->drop_queue.rxq->rxq_ctrl->type;\n \t}\n \tmemset(tir_attr, 0, sizeof(*tir_attr));\n \ttir_attr->disp_type = MLX5_TIRC_DISP_TYPE_INDIRECT;\n@@ -857,7 +876,7 @@ mlx5_devx_hrxq_modify(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq,\n }\n \n /**\n- * Create a DevX drop action for Rx Hash queue.\n+ * Create a DevX drop Rx queue.\n *\n * @param dev\n * Pointer to Ethernet device.\n@@ -866,14 +885,99 @@ mlx5_devx_hrxq_modify(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq,\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n static int\n-mlx5_devx_drop_action_create(struct rte_eth_dev *dev)\n+mlx5_rxq_devx_obj_drop_create(struct rte_eth_dev *dev)\n {\n-\t(void)dev;\n-\tDRV_LOG(ERR, \"DevX drop action is not supported yet.\");\n-\trte_errno = ENOTSUP;\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tint socket_id = dev->device->numa_node;\n+\tstruct mlx5_rxq_ctrl *rxq_ctrl;\n+\tstruct mlx5_rxq_data *rxq_data;\n+\tstruct mlx5_rxq_obj *rxq = NULL;\n+\tint ret;\n+\n+\t/*\n+\t * Initialize dummy control structures.\n+\t * They are required to hold pointers for cleanup\n+\t * and are only accessible via drop queue DevX objects.\n+\t */\n+\trxq_ctrl = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rxq_ctrl),\n+\t\t\t 0, socket_id);\n+\tif (rxq_ctrl == NULL) {\n+\t\tDRV_LOG(ERR, \"Port %u could not allocate drop queue control\",\n+\t\t\tdev->data->port_id);\n+\t\trte_errno = ENOMEM;\n+\t\tgoto error;\n+\t}\n+\trxq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rxq), 0, socket_id);\n+\tif (rxq == NULL) {\n+\t\tDRV_LOG(ERR, \"Port %u could not allocate drop queue object\",\n+\t\t\tdev->data->port_id);\n+\t\trte_errno = ENOMEM;\n+\t\tgoto error;\n+\t}\n+\trxq->rxq_ctrl = rxq_ctrl;\n+\trxq_ctrl->type = MLX5_RXQ_TYPE_STANDARD;\n+\trxq_ctrl->priv = priv;\n+\trxq_ctrl->obj = rxq;\n+\trxq_data = &rxq_ctrl->rxq;\n+\t/* Create CQ using DevX API. */\n+\tret = mlx5_rxq_create_devx_cq_resources(dev, rxq_data);\n+\tif (ret != 0) {\n+\t\tDRV_LOG(ERR, \"Port %u drop queue CQ creation failed.\",\n+\t\t\tdev->data->port_id);\n+\t\tgoto error;\n+\t}\n+\t/* Create RQ using DevX API. */\n+\tret = mlx5_rxq_create_devx_rq_resources(dev, rxq_data);\n+\tif (ret != 0) {\n+\t\tDRV_LOG(ERR, \"Port %u drop queue RQ creation failed.\",\n+\t\t\tdev->data->port_id);\n+\t\trte_errno = ENOMEM;\n+\t\tgoto error;\n+\t}\n+\t/* Change queue state to ready. */\n+\tret = mlx5_devx_modify_rq(rxq, MLX5_RXQ_MOD_RST2RDY);\n+\tif (ret != 0)\n+\t\tgoto error;\n+\t/* Initialize drop queue. */\n+\tpriv->drop_queue.rxq = rxq;\n+\treturn 0;\n+error:\n+\tret = rte_errno; /* Save rte_errno before cleanup. */\n+\tif (rxq != NULL) {\n+\t\tif (rxq->rq_obj.rq != NULL)\n+\t\t\tmlx5_devx_rq_destroy(&rxq->rq_obj);\n+\t\tif (rxq->cq_obj.cq != NULL)\n+\t\t\tmlx5_devx_cq_destroy(&rxq->cq_obj);\n+\t\tif (rxq->devx_channel)\n+\t\t\tmlx5_os_devx_destroy_event_channel\n+\t\t\t\t\t\t\t(rxq->devx_channel);\n+\t\tmlx5_free(rxq);\n+\t}\n+\tif (rxq_ctrl != NULL)\n+\t\tmlx5_free(rxq_ctrl);\n+\trte_errno = ret; /* Restore rte_errno. */\n \treturn -rte_errno;\n }\n \n+/**\n+ * Release drop Rx queue resources.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device.\n+ */\n+static void\n+mlx5_rxq_devx_obj_drop_release(struct rte_eth_dev *dev)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_rxq_obj *rxq = priv->drop_queue.rxq;\n+\tstruct mlx5_rxq_ctrl *rxq_ctrl = rxq->rxq_ctrl;\n+\n+\tmlx5_rxq_devx_obj_release(rxq);\n+\tmlx5_free(rxq);\n+\tmlx5_free(rxq_ctrl);\n+\tpriv->drop_queue.rxq = NULL;\n+}\n+\n /**\n * Release a drop hash Rx queue.\n *\n@@ -883,9 +987,53 @@ mlx5_devx_drop_action_create(struct rte_eth_dev *dev)\n static void\n mlx5_devx_drop_action_destroy(struct rte_eth_dev *dev)\n {\n-\t(void)dev;\n-\tDRV_LOG(ERR, \"DevX drop action is not supported yet.\");\n-\trte_errno = ENOTSUP;\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_hrxq *hrxq = priv->drop_queue.hrxq;\n+\n+\tif (hrxq->tir != NULL)\n+\t\tmlx5_devx_tir_destroy(hrxq);\n+\tif (hrxq->ind_table->ind_table != NULL)\n+\t\tmlx5_devx_ind_table_destroy(hrxq->ind_table);\n+\tif (priv->drop_queue.rxq->rq != NULL)\n+\t\tmlx5_rxq_devx_obj_drop_release(dev);\n+}\n+\n+/**\n+ * Create a DevX drop action for Rx Hash queue.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_devx_drop_action_create(struct rte_eth_dev *dev)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_hrxq *hrxq = priv->drop_queue.hrxq;\n+\tint ret;\n+\n+\tret = mlx5_rxq_devx_obj_drop_create(dev);\n+\tif (ret != 0) {\n+\t\tDRV_LOG(ERR, \"Cannot create drop RX queue\");\n+\t\treturn ret;\n+\t}\n+\t/* hrxq->ind_table queues are NULL, drop RX queue ID will be used */\n+\tret = mlx5_devx_ind_table_new(dev, 0, hrxq->ind_table);\n+\tif (ret != 0) {\n+\t\tDRV_LOG(ERR, \"Cannot create drop hash RX queue indirection table\");\n+\t\tgoto error;\n+\t}\n+\tret = mlx5_devx_hrxq_new(dev, hrxq, /* tunnel */ false);\n+\tif (ret != 0) {\n+\t\tDRV_LOG(ERR, \"Cannot create drop hash RX queue\");\n+\t\tgoto error;\n+\t}\n+\treturn 0;\n+error:\n+\tmlx5_devx_drop_action_destroy(dev);\n+\treturn ret;\n }\n \n /**\n", "prefixes": [ "2/4" ] }