Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99688/?format=api
{ "id": 99688, "url": "http://patches.dpdk.org/api/patches/99688/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210926111904.237736-6-xuemingl@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": "<20210926111904.237736-6-xuemingl@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210926111904.237736-6-xuemingl@nvidia.com", "date": "2021-09-26T11:18:58", "name": "[05/11] net/mlx5: split Rx queue", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "624b10e7c019f52db55a2fa210de423854a372bc", "submitter": { "id": 1904, "url": "http://patches.dpdk.org/api/people/1904/?format=api", "name": "Xueming Li", "email": "xuemingl@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/20210926111904.237736-6-xuemingl@nvidia.com/mbox/", "series": [ { "id": 19166, "url": "http://patches.dpdk.org/api/series/19166/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19166", "date": "2021-09-26T11:18:53", "name": "net/mlx5: support shared Rx queue", "version": 1, "mbox": "http://patches.dpdk.org/series/19166/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/99688/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/99688/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 84FD2A0547;\n\tSun, 26 Sep 2021 13:20:03 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 75085410E4;\n\tSun, 26 Sep 2021 13:20:03 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2050.outbound.protection.outlook.com [40.107.244.50])\n by mails.dpdk.org (Postfix) with ESMTP id 69E1340F35\n for <dev@dpdk.org>; Sun, 26 Sep 2021 13:20:02 +0200 (CEST)", "from BN9PR03CA0095.namprd03.prod.outlook.com (2603:10b6:408:fd::10)\n by DM5PR1201MB2504.namprd12.prod.outlook.com (2603:10b6:3:e3::22)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.19; Sun, 26 Sep\n 2021 11:20:00 +0000", "from BN8NAM11FT009.eop-nam11.prod.protection.outlook.com\n (2603:10b6:408:fd:cafe::a2) by BN9PR03CA0095.outlook.office365.com\n (2603:10b6:408:fd::10) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend\n Transport; Sun, 26 Sep 2021 11:20:00 +0000", "from mail.nvidia.com (216.228.112.34) by\n BN8NAM11FT009.mail.protection.outlook.com (10.13.176.65) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4544.13 via Frontend Transport; Sun, 26 Sep 2021 11:20:00 +0000", "from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL107.nvidia.com\n (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 26 Sep\n 2021 11:19:58 +0000", "from nvidia.com (172.20.187.5) by DRHQMAIL107.nvidia.com\n (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 26 Sep\n 2021 11:19:56 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=QADRp0OwvM3k4X0sdBrxc0BUKliXL/ear7w6PWNlOkErGLWtGk9r8bytWfbSjQUClulN8XYJ0uhrvdXW7/yC/1FENvRPa+S40alA0mN3XMTzRKuLN4delzb6TajYWqGnB13VmB8O0xLJ+w9ICHtCnL3qbTHwPZqIohRVNrUcGygE5nXxD6reEjDmq6zkSbWKvS9+PKCr56spfX3/ihIecn/qZ/a2p8moCCaZuzFCFhVTPmqRGD9+B4rKw/gbOn4I0u+QBDJtmeLHUfmEb92FKYM2PDMfYdGxt1zSZ+GrDIL1xSeHwgikBE9bXyQcLc9HN8NbwBmTE5x54tSGb4aAXQ==", "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;\n bh=nkMenBUxzD0NxwYx1j0dI+EQtE1rfnAnAgg92RWHaNc=;\n b=jwl7SpzUWA6yjt4T0OfczlejRmTJIgDzHt7qggW7ohXjjc30TI5Q7UcTfYAQU6ssawVG8cJeUz4zW6kyuNkR5Ok5/1QTzAlHV97yPV981ji4RLlo+Nf81z6yTWwsxoP8WMtc3NeJmLUA8ZgyUv6vw70YWagn7Of1wCaYLDB8VdXi5wIbd8MG4MlgT6L7eZvJ7OUkyXSHW+hV+Li4mFWi8LoWPJWk74UtOVGC6uJpptVmdf7PASO3yzX2uE50N9zESRs2yJ1oUO3odzw/VgpZci8SC0zQwEFDuX8J7VEgwzWtspOYtVI2JIEuBMKrd2r0kJP9lJvrQGCy3vCjGU62oQ==", "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=nkMenBUxzD0NxwYx1j0dI+EQtE1rfnAnAgg92RWHaNc=;\n b=rMAVFL65eAUCF73Zv9ZwTEzILAfuxEaYwFyb1OT6j50O36paEze9ciuYqFNhsKhd40iJfet2O/ngh/wmJjqVx1sUqhnG1gn7Z2R4Xak8US6XODdQcrQgT/y5tVSzgyjeOxChY+ecFjnvJcnOGr3IjH0HAbUUYWYchqyXyz5f4Nknm0k/lg21UdWC4xltH9iMSIsM/2ZHGlgpPaGvcpChlMfUMQfP00ImpXldhutILo1VnPilrzN//Q+NMI9Ucl2iSjEnddOBP3nWVxFsxzbw8CAwGVvv5AK5YzhN0TXcgfxeLJi6q26rUmE4T9KAsd4WgZoQxCyKXx4J3nri7Uxxrw==", "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": "Xueming Li <xuemingl@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "<xuemingl@nvidia.com>, Lior Margalit <lmargalit@nvidia.com>, Matan Azrad\n <matan@nvidia.com>, Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "Date": "Sun, 26 Sep 2021 19:18:58 +0800", "Message-ID": "<20210926111904.237736-6-xuemingl@nvidia.com>", "X-Mailer": "git-send-email 2.33.0", "In-Reply-To": "<20210926111904.237736-1-xuemingl@nvidia.com>", "References": "<20210926111904.237736-1-xuemingl@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.5]", "X-ClientProxiedBy": "HQMAIL107.nvidia.com (172.20.187.13) To\n DRHQMAIL107.nvidia.com (10.27.9.16)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "f2732c10-72fb-4c65-e949-08d980df9440", "X-MS-TrafficTypeDiagnostic": "DM5PR1201MB2504:", "X-Microsoft-Antispam-PRVS": "\n <DM5PR1201MB2504D3B040EDF6DCED814686A1A69@DM5PR1201MB2504.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:4502;", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n WwxQYFmOA1YcRpBShspxLR2HeOLmJEyl+WnCb8Gvxi7fYPu2DaS3uUo/7VomFks8Nd21K2ShepAFOcxEH+uimS+FkPkG9zes851F8H3HNgrKIT1YDCtO5D61S0LkpmPP48gzrjI9/aO1ZYIvXE7G9Uc8R+Eyiciw8bWTUP7bOBEf8pMrhF2sSA+ECDMbQIif8JzxjU6Ev9pqzRiYG0aD9N7+x4u9PBrU+DUHxV9m8EV6kdbrG/DoVTu6fcQXPcJB/h0Nt8S0pmBVQQKrjPIwUnpCUDN4Wsmx3g/vXewm+7k//DaM/q75Whg37clwUpTMjrkentrxEnkX7lypEN3CUUx1gFrb7EOra1i8EymTEdu3BlcQE7p6N1IfCW8tGVOn+16jzXNQQpdMtCk31KlGUA7DkzsBMNVmYCBMLTViaPt4v7HeA5Huiwx2ucbq3Lp9cBx6/NDLNkUMRvVHpn3Vw9GYevXBirwkF3uFQ1dCEDCfOTF8Zw7oaaV5stjG0mIwDeQvIkwLF+vH64Ne7cpX5JdyOX6eiE3bp9vZVIq06aF+IqZFLp4kSQ60hE9OyrTlX6Q/4FAJPNHfsCwg72T09JWeFZ28aHPgvG4BgM1Zaj5plAFFnO1iCwPopVfhLq4n3DKTtDGojlaiW1Rw1cOc9zWfICT0oPGOww4VIJW1WfzSe52c8KNqHc0K0ORT0eDGvU4fKbP2WzdzfI92yN7wlsxVItJX5bsQS6thZJtkDPXNyleChDjIbNmXWdwE/CfK", "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)(46966006)(36840700001)(336012)(2616005)(426003)(6916009)(8676002)(47076005)(6286002)(2906002)(5660300002)(16526019)(8936002)(186003)(26005)(30864003)(82310400003)(107886003)(83380400001)(508600001)(36860700001)(55016002)(70586007)(36906005)(4326008)(316002)(36756003)(70206006)(7696005)(356005)(7636003)(54906003)(1076003)(86362001)(21314003)(309714004);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "26 Sep 2021 11:20:00.1251 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n f2732c10-72fb-4c65-e949-08d980df9440", "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 BN8NAM11FT009.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM5PR1201MB2504", "Subject": "[dpdk-dev] [PATCH 05/11] net/mlx5: split Rx queue", "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": "To prepare shared RX queue, splits rxq data into shareable and private.\nStruct mlx5_rxq_priv is per queue data.\nStruct mlx5_rxq_ctrl is shared queue resources and data.\n\nSigned-off-by: Xueming Li <xuemingl@nvidia.com>\n---\n drivers/net/mlx5/mlx5.c | 4 +++\n drivers/net/mlx5/mlx5.h | 5 ++-\n drivers/net/mlx5/mlx5_ethdev.c | 10 ++++++\n drivers/net/mlx5/mlx5_rx.h | 15 ++++++--\n drivers/net/mlx5/mlx5_rxq.c | 66 ++++++++++++++++++++++++++++------\n 5 files changed, 86 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 3abb8c97e76..749729d6fbe 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -1585,6 +1585,10 @@ mlx5_dev_close(struct rte_eth_dev *dev)\n \t\tmlx5_free(dev->intr_handle);\n \t\tdev->intr_handle = NULL;\n \t}\n+\tif (priv->rxq_privs != NULL) {\n+\t\tmlx5_free(priv->rxq_privs);\n+\t\tpriv->rxq_privs = NULL;\n+\t}\n \tif (priv->txqs != NULL) {\n \t\t/* XXX race condition if mlx5_tx_burst() is still running. */\n \t\trte_delay_us_sleep(1000);\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex e02714e2319..d06f828ed33 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -1335,6 +1335,8 @@ enum mlx5_txq_modify_type {\n \tMLX5_TXQ_MOD_ERR2RDY, /* modify state from error to ready. */\n };\n \n+struct mlx5_rxq_priv;\n+\n /* HW objects operations structure. */\n struct mlx5_obj_ops {\n \tint (*rxq_obj_modify_vlan_strip)(struct mlx5_rxq_obj *rxq_obj, int on);\n@@ -1404,7 +1406,8 @@ struct mlx5_priv {\n \t/* RX/TX queues. */\n \tunsigned int rxqs_n; /* RX queues array size. */\n \tunsigned int txqs_n; /* TX queues array size. */\n-\tstruct mlx5_rxq_data *(*rxqs)[]; /* RX queues. */\n+\tstruct mlx5_rxq_priv *(*rxq_privs)[]; /* RX queue non-shared data. */\n+\tstruct mlx5_rxq_data *(*rxqs)[]; /* (Shared) RX queues. */\n \tstruct mlx5_txq_data *(*txqs)[]; /* TX queues. */\n \tstruct rte_mempool *mprq_mp; /* Mempool for Multi-Packet RQ. */\n \tstruct rte_eth_rss_conf rss_conf; /* RSS configuration. */\ndiff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c\nindex 82e2284d986..7071a5f7039 100644\n--- a/drivers/net/mlx5/mlx5_ethdev.c\n+++ b/drivers/net/mlx5/mlx5_ethdev.c\n@@ -104,6 +104,16 @@ mlx5_dev_configure(struct rte_eth_dev *dev)\n \t MLX5_RSS_HASH_KEY_LEN);\n \tpriv->rss_conf.rss_key_len = MLX5_RSS_HASH_KEY_LEN;\n \tpriv->rss_conf.rss_hf = dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf;\n+\tpriv->rxq_privs = mlx5_realloc(priv->rxq_privs,\n+\t\t\t\t MLX5_MEM_ANY | MLX5_MEM_ZERO,\n+\t\t\t\t sizeof(void *) * rxqs_n, 0,\n+\t\t\t\t SOCKET_ID_ANY);\n+\tif (priv->rxq_privs == NULL) {\n+\t\tDRV_LOG(ERR, \"port %u cannot allocate rxq private data\",\n+\t\t\tdev->data->port_id);\n+\t\trte_errno = ENOMEM;\n+\t\treturn -rte_errno;\n+\t}\n \tpriv->rxqs = (void *)dev->data->rx_queues;\n \tpriv->txqs = (void *)dev->data->tx_queues;\n \tif (txqs_n != priv->txqs_n) {\ndiff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h\nindex a8e0c3162b0..db6252e8e86 100644\n--- a/drivers/net/mlx5/mlx5_rx.h\n+++ b/drivers/net/mlx5/mlx5_rx.h\n@@ -161,7 +161,9 @@ struct mlx5_rxq_ctrl {\n \tstruct mlx5_rxq_data rxq; /* Data path structure. */\n \tLIST_ENTRY(mlx5_rxq_ctrl) next; /* Pointer to the next element. */\n \tuint32_t refcnt; /* Reference counter. */\n+\tLIST_HEAD(priv, mlx5_rxq_priv) owners; /* Owner rxq list. */\n \tstruct mlx5_rxq_obj *obj; /* Verbs/DevX elements. */\n+\tstruct mlx5_dev_ctx_shared *sh; /* Shared context. */\n \tstruct mlx5_priv *priv; /* Back pointer to private data. */\n \tenum mlx5_rxq_type type; /* Rxq type. */\n \tunsigned int socket; /* CPU socket ID for allocations. */\n@@ -174,6 +176,14 @@ struct mlx5_rxq_ctrl {\n \tuint32_t hairpin_status; /* Hairpin binding status. */\n };\n \n+/* RX queue private data. */\n+struct mlx5_rxq_priv {\n+\tuint16_t idx; /* Queue index. */\n+\tstruct mlx5_rxq_ctrl *ctrl; /* Shared Rx Queue. */\n+\tLIST_ENTRY(mlx5_rxq_priv) owner_entry; /* Entry in shared rxq_ctrl. */\n+\tstruct mlx5_priv *priv; /* Back pointer to private data. */\n+};\n+\n /* mlx5_rxq.c */\n \n extern uint8_t rss_hash_default_key[];\n@@ -197,13 +207,14 @@ void mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev);\n int mlx5_rx_intr_enable(struct rte_eth_dev *dev, uint16_t rx_queue_id);\n int mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id);\n int mlx5_rxq_obj_verify(struct rte_eth_dev *dev);\n-struct mlx5_rxq_ctrl *mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx,\n+struct mlx5_rxq_ctrl *mlx5_rxq_new(struct rte_eth_dev *dev,\n+\t\t\t\t struct mlx5_rxq_priv *rxq,\n \t\t\t\t uint16_t desc, unsigned int socket,\n \t\t\t\t const struct rte_eth_rxconf *conf,\n \t\t\t\t const struct rte_eth_rxseg_split *rx_seg,\n \t\t\t\t uint16_t n_seg);\n struct mlx5_rxq_ctrl *mlx5_rxq_hairpin_new\n-\t(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n+\t(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq, uint16_t desc,\n \t const struct rte_eth_hairpin_conf *hairpin_conf);\n struct mlx5_rxq_ctrl *mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx);\n int mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx);\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 14de8d0e6a4..70e73690aa7 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -674,6 +674,7 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n \t\t struct rte_mempool *mp)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_rxq_priv *rxq;\n \tstruct mlx5_rxq_ctrl *rxq_ctrl;\n \tstruct rte_eth_rxseg_split *rx_seg =\n \t\t\t\t(struct rte_eth_rxseg_split *)conf->rx_seg;\n@@ -708,10 +709,23 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n \tres = mlx5_rx_queue_pre_setup(dev, idx, &desc);\n \tif (res)\n \t\treturn res;\n-\trxq_ctrl = mlx5_rxq_new(dev, idx, desc, socket, conf, rx_seg, n_seg);\n+\trxq = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO, sizeof(*rxq), 0,\n+\t\t\t SOCKET_ID_ANY);\n+\tif (!rxq) {\n+\t\tDRV_LOG(ERR, \"port %u unable to allocate rx queue index %u private data\",\n+\t\t\tdev->data->port_id, idx);\n+\t\trte_errno = ENOMEM;\n+\t\treturn -rte_errno;\n+\t}\n+\trxq->priv = priv;\n+\trxq->idx = idx;\n+\t(*priv->rxq_privs)[idx] = rxq;\n+\trxq_ctrl = mlx5_rxq_new(dev, rxq, desc, socket, conf, rx_seg, n_seg);\n \tif (!rxq_ctrl) {\n-\t\tDRV_LOG(ERR, \"port %u unable to allocate queue index %u\",\n+\t\tDRV_LOG(ERR, \"port %u unable to allocate rx queue index %u\",\n \t\t\tdev->data->port_id, idx);\n+\t\tmlx5_free(rxq);\n+\t\t(*priv->rxq_privs)[idx] = NULL;\n \t\trte_errno = ENOMEM;\n \t\treturn -rte_errno;\n \t}\n@@ -741,6 +755,7 @@ mlx5_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t idx,\n \t\t\t const struct rte_eth_hairpin_conf *hairpin_conf)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_rxq_priv *rxq;\n \tstruct mlx5_rxq_ctrl *rxq_ctrl;\n \tint res;\n \n@@ -776,14 +791,27 @@ mlx5_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t idx,\n \t\t\treturn -rte_errno;\n \t\t}\n \t}\n-\trxq_ctrl = mlx5_rxq_hairpin_new(dev, idx, desc, hairpin_conf);\n+\trxq = mlx5_malloc(MLX5_MEM_ANY | MLX5_MEM_ZERO, sizeof(*rxq), 0,\n+\t\t\t SOCKET_ID_ANY);\n+\tif (!rxq) {\n+\t\tDRV_LOG(ERR, \"port %u unable to allocate hairpin rx queue index %u private data\",\n+\t\t\tdev->data->port_id, idx);\n+\t\trte_errno = ENOMEM;\n+\t\treturn -rte_errno;\n+\t}\n+\trxq->priv = priv;\n+\trxq->idx = idx;\n+\t(*priv->rxq_privs)[idx] = rxq;\n+\trxq_ctrl = mlx5_rxq_hairpin_new(dev, rxq, desc, hairpin_conf);\n \tif (!rxq_ctrl) {\n-\t\tDRV_LOG(ERR, \"port %u unable to allocate queue index %u\",\n+\t\tDRV_LOG(ERR, \"port %u unable to allocate hairpin queue index %u\",\n \t\t\tdev->data->port_id, idx);\n+\t\tmlx5_free(rxq);\n+\t\t(*priv->rxq_privs)[idx] = NULL;\n \t\trte_errno = ENOMEM;\n \t\treturn -rte_errno;\n \t}\n-\tDRV_LOG(DEBUG, \"port %u adding Rx queue %u to list\",\n+\tDRV_LOG(DEBUG, \"port %u adding hairpin Rx queue %u to list\",\n \t\tdev->data->port_id, idx);\n \t(*priv->rxqs)[idx] = &rxq_ctrl->rxq;\n \treturn 0;\n@@ -1274,8 +1302,8 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,\n *\n * @param dev\n * Pointer to Ethernet device.\n- * @param idx\n- * RX queue index.\n+ * @param rxq\n+ * RX queue private data.\n * @param desc\n * Number of descriptors to configure in queue.\n * @param socket\n@@ -1285,10 +1313,12 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,\n * A DPDK queue object on success, NULL otherwise and rte_errno is set.\n */\n struct mlx5_rxq_ctrl *\n-mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n+mlx5_rxq_new(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq,\n+\t uint16_t desc,\n \t unsigned int socket, const struct rte_eth_rxconf *conf,\n \t const struct rte_eth_rxseg_split *rx_seg, uint16_t n_seg)\n {\n+\tuint16_t idx = rxq->idx;\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_rxq_ctrl *tmpl;\n \tunsigned int mb_len = rte_pktmbuf_data_room_size(rx_seg[0].mp);\n@@ -1331,6 +1361,9 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n \t\trte_errno = ENOMEM;\n \t\treturn NULL;\n \t}\n+\tLIST_INIT(&tmpl->owners);\n+\trxq->ctrl = tmpl;\n+\tLIST_INSERT_HEAD(&tmpl->owners, rxq, owner_entry);\n \tMLX5_ASSERT(n_seg && n_seg <= MLX5_MAX_RXQ_NSEG);\n \t/*\n \t * Build the array of actual buffer offsets and lengths.\n@@ -1564,6 +1597,7 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n \ttmpl->rxq.rss_hash = !!priv->rss_conf.rss_hf &&\n \t\t(!!(dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS));\n \ttmpl->rxq.port_id = dev->data->port_id;\n+\ttmpl->sh = priv->sh;\n \ttmpl->priv = priv;\n \ttmpl->rxq.mp = rx_seg[0].mp;\n \ttmpl->rxq.elts_n = log2above(desc);\n@@ -1591,8 +1625,8 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n *\n * @param dev\n * Pointer to Ethernet device.\n- * @param idx\n- * RX queue index.\n+ * @param rxq\n+ * RX queue.\n * @param desc\n * Number of descriptors to configure in queue.\n * @param hairpin_conf\n@@ -1602,9 +1636,11 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n * A DPDK queue object on success, NULL otherwise and rte_errno is set.\n */\n struct mlx5_rxq_ctrl *\n-mlx5_rxq_hairpin_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n+mlx5_rxq_hairpin_new(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq,\n+\t\t uint16_t desc,\n \t\t const struct rte_eth_hairpin_conf *hairpin_conf)\n {\n+\tuint16_t idx = rxq->idx;\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_rxq_ctrl *tmpl;\n \n@@ -1614,10 +1650,14 @@ mlx5_rxq_hairpin_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n \t\trte_errno = ENOMEM;\n \t\treturn NULL;\n \t}\n+\tLIST_INIT(&tmpl->owners);\n+\trxq->ctrl = tmpl;\n+\tLIST_INSERT_HEAD(&tmpl->owners, rxq, owner_entry);\n \ttmpl->type = MLX5_RXQ_TYPE_HAIRPIN;\n \ttmpl->socket = SOCKET_ID_ANY;\n \ttmpl->rxq.rss_hash = 0;\n \ttmpl->rxq.port_id = dev->data->port_id;\n+\ttmpl->sh = priv->sh;\n \ttmpl->priv = priv;\n \ttmpl->rxq.mp = NULL;\n \ttmpl->rxq.elts_n = log2above(desc);\n@@ -1671,6 +1711,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_rxq_ctrl *rxq_ctrl;\n+\tstruct mlx5_rxq_priv *rxq = (*priv->rxq_privs)[idx];\n \n \tif (priv->rxqs == NULL || (*priv->rxqs)[idx] == NULL)\n \t\treturn 0;\n@@ -1692,9 +1733,12 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx)\n \t\t\tmlx5_mr_btree_free(&rxq_ctrl->rxq.mr_ctrl.cache_bh);\n \t\t\tmlx5_mprq_free_mp(dev, rxq_ctrl);\n \t\t}\n+\t\tLIST_REMOVE(rxq, owner_entry);\n \t\tLIST_REMOVE(rxq_ctrl, next);\n \t\tmlx5_free(rxq_ctrl);\n \t\t(*priv->rxqs)[idx] = NULL;\n+\t\tmlx5_free(rxq);\n+\t\t(*priv->rxq_privs)[idx] = NULL;\n \t}\n \treturn 0;\n }\n", "prefixes": [ "05/11" ] }