Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/74011/?format=api
{ "id": 74011, "url": "http://patchwork.dpdk.org/api/patches/74011/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20200714142102.30606-8-ophirmu@mellanox.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": "<20200714142102.30606-8-ophirmu@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200714142102.30606-8-ophirmu@mellanox.com", "date": "2020-07-14T14:21:01", "name": "[v1,7/8] net/mlx5: refactor multi process communication", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "39334ea1e689e269350c793f58ab1a97bee71749", "submitter": { "id": 793, "url": "http://patchwork.dpdk.org/api/people/793/?format=api", "name": "Ophir Munk", "email": "ophirmu@mellanox.com" }, "delegate": { "id": 3268, "url": "http://patchwork.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20200714142102.30606-8-ophirmu@mellanox.com/mbox/", "series": [ { "id": 11020, "url": "http://patchwork.dpdk.org/api/series/11020/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=11020", "date": "2020-07-14T14:20:54", "name": "mlx5 PMD multi OS support - part #3", "version": 1, "mbox": "http://patchwork.dpdk.org/series/11020/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/74011/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/74011/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 3C3A1A0540;\n\tTue, 14 Jul 2020 16:22:31 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 93E9E1D5DD;\n\tTue, 14 Jul 2020 16:21:22 +0200 (CEST)", "from EUR04-DB3-obe.outbound.protection.outlook.com\n (mail-eopbgr60063.outbound.protection.outlook.com [40.107.6.63])\n by dpdk.org (Postfix) with ESMTP id 86C6D1D54C\n for <dev@dpdk.org>; Tue, 14 Jul 2020 16:21:17 +0200 (CEST)", "from AM0PR05MB4209.eurprd05.prod.outlook.com (2603:10a6:208:61::22)\n by AM0PR05MB4625.eurprd05.prod.outlook.com (2603:10a6:208:b6::17)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.24; Tue, 14 Jul\n 2020 14:21:16 +0000", "from AM0PR05MB4209.eurprd05.prod.outlook.com\n ([fe80::3949:70c3:126:3972]) by AM0PR05MB4209.eurprd05.prod.outlook.com\n ([fe80::3949:70c3:126:3972%7]) with mapi id 15.20.3174.026; Tue, 14 Jul 2020\n 14:21:16 +0000", "from mellanox.com (37.142.13.130) by\n AM3PR05CA0100.eurprd05.prod.outlook.com (2603:10a6:207:1::26) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.3174.21 via Frontend Transport; Tue, 14 Jul 2020 14:21:15 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=ahzCEMUpehXqEnGWQSSn+F4GTBUqOglYtQmNv9xEa5MMqPdHhrec7wD5XayMoZr2DpHDxWQHGEVX69qsY6lHWTkfitsPBUkg4yIitO2PO0n0UMmlKm4rPlHoppA+vaItRGH1TbJA4xgJNnY5r6l9/ionfTi77HumAKWn/FfHU5BQUCELLrPagaPKwXH9HsVXiC0dyBKOSfFw/am/dutOCVHmzyK5tFZrraYXa3/AeVQR+tvS8wQjt6FH/mz9zd08Lo3AFtVOsJRiOc6iRmWGh11eLpesB/9uFKSnhPC/2TdEduXJzlZJZtuyrdy8sv+DHdc2bGE23PR8I+cCm5Caog==", "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=DUU+wfc2iNyGVsZPMU8Anat+qwxBUiZC1ECTLQqRTpg=;\n b=MxhXlOHusQaCsx150xu0aek0N6fluk0QCMDJY55KDtU0BB+2rJtESYGa2C4+SxhJ2Q15aYeNL7ldmAXCW/GCl0+A3mZMZllWDJIMSp9GHJwXCioLEx+QXwAJDif2UQ57xYPMbggQ4NrCOKyGFnmxZSyOFHEBCY/Kcl3DaOJFZyqJ9Qbu2tRK4nJxV7i8LJeTcVbfESmGybw2UcjS8N8aHhRUwetyMf7h9hfRF/1ABV58BR3VSUGHVlyPN9qnSks2LepqeFlBmrWM6IjUzsrczfioUpkUQ8FLY7MoLX9INKxFbdbBpFnlHa1jx7e8CMTZgrvwaI5gdsktUSszSQDbig==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com;\n dkim=pass header.d=mellanox.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;\n s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=DUU+wfc2iNyGVsZPMU8Anat+qwxBUiZC1ECTLQqRTpg=;\n b=QNIK/2uf5eZWDZ6Xu9m4kwI4xW5TxL3G5pp0mJl2fd2e6idKGPeSG54zi2glSo9Kt7Rn0tz10dwgpZ25VIz6JNPr1NwABvmlKAOwyMvc4LDeYSes8JSB3PUe/w+gixIXSxLfs/cbI+wpPX+jM7G7vostmGyqRk2scdhZgqhccYk=", "Authentication-Results": "dpdk.org; dkim=none (message not signed)\n header.d=none;dpdk.org; dmarc=none action=none header.from=mellanox.com;", "From": "Ophir Munk <ophirmu@mellanox.com>", "To": "dev@dpdk.org", "Cc": "Raslan Darawsheh <rasland@mellanox.com>,\n Ophir Munk <ophirmu@mellanox.com>,\n Matan Azrad <matan@mellanox.com>", "Date": "Tue, 14 Jul 2020 14:21:01 +0000", "Message-Id": "<20200714142102.30606-8-ophirmu@mellanox.com>", "X-Mailer": [ "git-send-email 2.8.4", "git-send-email 2.8.4" ], "In-Reply-To": "<20200714142102.30606-1-ophirmu@mellanox.com>", "References": "<20200714142102.30606-1-ophirmu@mellanox.com>", "Content-Type": "text/plain", "X-ClientProxiedBy": "AM3PR05CA0100.eurprd05.prod.outlook.com\n (2603:10a6:207:1::26) To AM0PR05MB4209.eurprd05.prod.outlook.com\n (2603:10a6:208:61::22)", "MIME-Version": "1.0", "X-MS-Exchange-MessageSentRepresentingType": "1", "X-Originating-IP": "[37.142.13.130]", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-HT": "Tenant", "X-MS-Office365-Filtering-Correlation-Id": "b9b20f73-7c6f-4592-d867-08d828012b52", "X-MS-TrafficTypeDiagnostic": "AM0PR05MB4625:", "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd", "X-MS-Exchange-Transport-Forked": "True", "X-Microsoft-Antispam-PRVS": "\n <AM0PR05MB462555A5B8FEE9F14312AF4BD1610@AM0PR05MB4625.eurprd05.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:216;", "X-MS-Exchange-SenderADCheck": "1", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n j0s37D24mjUxhaQ8dH6Ltxdbxs1xnOHyNkj04xy3OEljri7SqV96FBhf7ga8yL+JcmDfiW/h0W7Xaqtrmrm0+mQnur61RiV4wefKIn5rgxW7O9FPZfhHpTmnlvld3E1B29iTfhsU14NJtGgS718m7Dc/QWfZoPNSRINBXVKPfXekbyjEmwnNWzl1gkJaMdbWP2urfOJP4S34r7J7TeAbGlV06nDhsAnVOMLVDqFgdhMGzqVYb+N+YIEpGDDDedIfZBRcP9pAbVBSwn/mLxlxo50yKU1SD5pwtjR8lDcIO8JZttSev19FpY1fEnPYORVHE2/LQqp4xzjrMCh0eV5lzwhppM3BX3CLWXzb5ZRthz2Eis2h/TvCNi/ujOTqWvLW", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:AM0PR05MB4209.eurprd05.prod.outlook.com; PTR:; CAT:NONE;\n SFTY:;\n SFS:(4636009)(136003)(366004)(376002)(39850400004)(346002)(396003)(36756003)(86362001)(1076003)(30864003)(8886007)(6666004)(66946007)(316002)(66476007)(52116002)(7696005)(5660300002)(26005)(66556008)(54906003)(478600001)(6916009)(83380400001)(16526019)(8676002)(8936002)(4326008)(956004)(2616005)(107886003)(2906002)(55016002)(186003)(21314003);\n DIR:OUT; SFP:1101;", "X-MS-Exchange-AntiSpam-MessageData": "\n 4eZQpJuWYIjKJF+Ug0DmL5ELUd90s0XtFC23Orw32jjC/440dXFBPdCwtjk9QaWJ4CaSV4U/qeswlbvdHCJSA9pzk6h6m/W6jC9qedZ3y+j6WlB7lZHad66H8OwX3afU8kLEOhNY80Zb5/rsDIb+/j7fwYfXUTxa+jI5wqKEz6t5imKFhQ/m6ZPtwqikA/rWhqoHzkdLpAEw35NRjIiudQ9xoz3N8BYVZXVB72aPnJ9QOU/cbzVkA59YMEIR4zwnGj/qEpk4a2PrwusAtxXQyDBhxa8qmElHTYsxZUH5PF13tNRLFDO6KuAjpdBom8o9Bp09fD5Y+JRNeAyMu6JEAYdcD6mtz9YhcXWhwOfSyk2UnH9PzmRMShYFnCk0slPHELLtv65qQsp2Gry2sZOsMpmUxra+igRkeIWJXU2kTf5ep1QE0vG8aaU35I3XVhYhA5sDLgv9Y3b3DU6MSa1sahKaW2i5jlRalIZOHguGD9ZtIAGxfgfx+Xk/EbmISkkD", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n b9b20f73-7c6f-4592-d867-08d828012b52", "X-MS-Exchange-CrossTenant-AuthSource": "AM0PR05MB4209.eurprd05.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "14 Jul 2020 14:21:16.4120 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "a652971c-7d2e-4d9b-a6a4-d149256f461b", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n +dflmJFuMO6nPD6h8JeATTvmJ1O3DY1MXLr/f2qLCS2upN7TylBpkDCX8Wpwl3RDVT3o3IJdC59nOGHAazEcxg==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "AM0PR05MB4625", "Subject": "[dpdk-dev] [PATCH v1 7/8] net/mlx5: refactor multi process\n\tcommunication", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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": "1. The shared data communication between the primary and the secondary\nprocesses is implemented using Linux API. Move the Linux API code under\nlinux directory (file linux/mlx5_os.c).\n\n2. File net/mlx5/mlx5_mp.c handles requests to the primary and secondary\nprocesses (e.g. start_rxtx, stop_rxtx). It is Linux based so it is moved\nunder linux (new file linux/mlx5_mp_os.c).\n\nSigned-off-by: Ophir Munk <ophirmu@mellanox.com>\nAcked-by: Matan Azrad <matan@mellanox.com>\n---\n drivers/net/mlx5/Makefile | 2 +-\n drivers/net/mlx5/linux/meson.build | 1 +\n drivers/net/mlx5/linux/mlx5_mp_os.c | 211 ++++++++++++++++++++++++++++++++++++\n drivers/net/mlx5/linux/mlx5_os.c | 111 +++++++++++++++++++\n drivers/net/mlx5/meson.build | 1 -\n drivers/net/mlx5/mlx5.c | 114 +------------------\n drivers/net/mlx5/mlx5.h | 13 ++-\n drivers/net/mlx5/mlx5_mp.c | 211 ------------------------------------\n drivers/net/mlx5/mlx5_trigger.c | 4 +-\n 9 files changed, 336 insertions(+), 332 deletions(-)\n create mode 100644 drivers/net/mlx5/linux/mlx5_mp_os.c\n delete mode 100644 drivers/net/mlx5/mlx5_mp.c", "diff": "diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile\nindex a458402..bb45294 100644\n--- a/drivers/net/mlx5/Makefile\n+++ b/drivers/net/mlx5/Makefile\n@@ -29,12 +29,12 @@ SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_meter.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_dv.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_verbs.c\n-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mp.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_utils.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_socket.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_os.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_ethdev_os.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_verbs.c\n+SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_mp_os.c\n \n # Basic CFLAGS.\n CFLAGS += -O3\ndiff --git a/drivers/net/mlx5/linux/meson.build b/drivers/net/mlx5/linux/meson.build\nindex 14eed03..2def8e3 100644\n--- a/drivers/net/mlx5/linux/meson.build\n+++ b/drivers/net/mlx5/linux/meson.build\n@@ -7,5 +7,6 @@ sources += files(\n \t'mlx5_os.c',\n \t'mlx5_ethdev_os.c',\n \t'mlx5_verbs.c',\n+\t'mlx5_mp_os.c',\n )\n \ndiff --git a/drivers/net/mlx5/linux/mlx5_mp_os.c b/drivers/net/mlx5/linux/mlx5_mp_os.c\nnew file mode 100644\nindex 0000000..65b0025\n--- /dev/null\n+++ b/drivers/net/mlx5/linux/mlx5_mp_os.c\n@@ -0,0 +1,211 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright 2019 6WIND S.A.\n+ * Copyright 2019 Mellanox Technologies, Ltd\n+ */\n+\n+#include <stdio.h>\n+#include <time.h>\n+\n+#include <rte_eal.h>\n+#include <rte_ethdev_driver.h>\n+#include <rte_string_fns.h>\n+\n+#include <mlx5_common_mp.h>\n+#include <mlx5_common_mr.h>\n+\n+#include \"mlx5.h\"\n+#include \"mlx5_rxtx.h\"\n+#include \"mlx5_utils.h\"\n+\n+int\n+mlx5_mp_os_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer)\n+{\n+\tstruct rte_mp_msg mp_res;\n+\tstruct mlx5_mp_param *res = (struct mlx5_mp_param *)mp_res.param;\n+\tconst struct mlx5_mp_param *param =\n+\t\t(const struct mlx5_mp_param *)mp_msg->param;\n+\tstruct rte_eth_dev *dev;\n+\tstruct mlx5_priv *priv;\n+\tstruct mr_cache_entry entry;\n+\tuint32_t lkey;\n+\tint ret;\n+\n+\tMLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);\n+\tif (!rte_eth_dev_is_valid_port(param->port_id)) {\n+\t\trte_errno = ENODEV;\n+\t\tDRV_LOG(ERR, \"port %u invalid port ID\", param->port_id);\n+\t\treturn -rte_errno;\n+\t}\n+\tdev = &rte_eth_devices[param->port_id];\n+\tpriv = dev->data->dev_private;\n+\tswitch (param->type) {\n+\tcase MLX5_MP_REQ_CREATE_MR:\n+\t\tmp_init_msg(&priv->mp_id, &mp_res, param->type);\n+\t\tlkey = mlx5_mr_create_primary(priv->sh->pd,\n+\t\t\t\t\t &priv->sh->share_cache,\n+\t\t\t\t\t &entry, param->args.addr,\n+\t\t\t\t\t priv->config.mr_ext_memseg_en);\n+\t\tif (lkey == UINT32_MAX)\n+\t\t\tres->result = -rte_errno;\n+\t\tret = rte_mp_reply(&mp_res, peer);\n+\t\tbreak;\n+\tcase MLX5_MP_REQ_VERBS_CMD_FD:\n+\t\tmp_init_msg(&priv->mp_id, &mp_res, param->type);\n+\t\tmp_res.num_fds = 1;\n+\t\tmp_res.fds[0] = ((struct ibv_context *)priv->sh->ctx)->cmd_fd;\n+\t\tres->result = 0;\n+\t\tret = rte_mp_reply(&mp_res, peer);\n+\t\tbreak;\n+\tcase MLX5_MP_REQ_QUEUE_STATE_MODIFY:\n+\t\tmp_init_msg(&priv->mp_id, &mp_res, param->type);\n+\t\tres->result = mlx5_queue_state_modify_primary\n+\t\t\t\t\t(dev, ¶m->args.state_modify);\n+\t\tret = rte_mp_reply(&mp_res, peer);\n+\t\tbreak;\n+\tdefault:\n+\t\trte_errno = EINVAL;\n+\t\tDRV_LOG(ERR, \"port %u invalid mp request type\",\n+\t\t\tdev->data->port_id);\n+\t\treturn -rte_errno;\n+\t}\n+\treturn ret;\n+}\n+\n+/**\n+ * IPC message handler of a secondary process.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet structure.\n+ * @param[in] peer\n+ * Pointer to the peer socket path.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+int\n+mlx5_mp_os_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer)\n+{\n+\tstruct rte_mp_msg mp_res;\n+\tstruct mlx5_mp_param *res = (struct mlx5_mp_param *)mp_res.param;\n+\tconst struct mlx5_mp_param *param =\n+\t\t(const struct mlx5_mp_param *)mp_msg->param;\n+\tstruct rte_eth_dev *dev;\n+\tstruct mlx5_priv *priv;\n+\tint ret;\n+\n+\tMLX5_ASSERT(rte_eal_process_type() == RTE_PROC_SECONDARY);\n+\tif (!rte_eth_dev_is_valid_port(param->port_id)) {\n+\t\trte_errno = ENODEV;\n+\t\tDRV_LOG(ERR, \"port %u invalid port ID\", param->port_id);\n+\t\treturn -rte_errno;\n+\t}\n+\tdev = &rte_eth_devices[param->port_id];\n+\tpriv = dev->data->dev_private;\n+\tswitch (param->type) {\n+\tcase MLX5_MP_REQ_START_RXTX:\n+\t\tDRV_LOG(INFO, \"port %u starting datapath\", dev->data->port_id);\n+\t\trte_mb();\n+\t\tdev->rx_pkt_burst = mlx5_select_rx_function(dev);\n+\t\tdev->tx_pkt_burst = mlx5_select_tx_function(dev);\n+\t\tmp_init_msg(&priv->mp_id, &mp_res, param->type);\n+\t\tres->result = 0;\n+\t\tret = rte_mp_reply(&mp_res, peer);\n+\t\tbreak;\n+\tcase MLX5_MP_REQ_STOP_RXTX:\n+\t\tDRV_LOG(INFO, \"port %u stopping datapath\", dev->data->port_id);\n+\t\tdev->rx_pkt_burst = removed_rx_burst;\n+\t\tdev->tx_pkt_burst = removed_tx_burst;\n+\t\trte_mb();\n+\t\tmp_init_msg(&priv->mp_id, &mp_res, param->type);\n+\t\tres->result = 0;\n+\t\tret = rte_mp_reply(&mp_res, peer);\n+\t\tbreak;\n+\tdefault:\n+\t\trte_errno = EINVAL;\n+\t\tDRV_LOG(ERR, \"port %u invalid mp request type\",\n+\t\t\tdev->data->port_id);\n+\t\treturn -rte_errno;\n+\t}\n+\treturn ret;\n+}\n+\n+/**\n+ * Broadcast request of stopping/starting data-path to secondary processes.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet structure.\n+ * @param[in] type\n+ * Request type.\n+ */\n+static void\n+mp_req_on_rxtx(struct rte_eth_dev *dev, enum mlx5_mp_req_type type)\n+{\n+\tstruct rte_mp_msg mp_req;\n+\tstruct rte_mp_msg *mp_res;\n+\tstruct rte_mp_reply mp_rep;\n+\tstruct mlx5_mp_param *res;\n+\tstruct timespec ts = {.tv_sec = MLX5_MP_REQ_TIMEOUT_SEC, .tv_nsec = 0};\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tint ret;\n+\tint i;\n+\n+\tMLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);\n+\tif (!mlx5_shared_data->secondary_cnt)\n+\t\treturn;\n+\tif (type != MLX5_MP_REQ_START_RXTX && type != MLX5_MP_REQ_STOP_RXTX) {\n+\t\tDRV_LOG(ERR, \"port %u unknown request (req_type %d)\",\n+\t\t\tdev->data->port_id, type);\n+\t\treturn;\n+\t}\n+\tmp_init_msg(&priv->mp_id, &mp_req, type);\n+\tret = rte_mp_request_sync(&mp_req, &mp_rep, &ts);\n+\tif (ret) {\n+\t\tif (rte_errno != ENOTSUP)\n+\t\t\tDRV_LOG(ERR, \"port %u failed to request stop/start Rx/Tx (%d)\",\n+\t\t\t\tdev->data->port_id, type);\n+\t\tgoto exit;\n+\t}\n+\tif (mp_rep.nb_sent != mp_rep.nb_received) {\n+\t\tDRV_LOG(ERR,\n+\t\t\t\"port %u not all secondaries responded (req_type %d)\",\n+\t\t\tdev->data->port_id, type);\n+\t\tgoto exit;\n+\t}\n+\tfor (i = 0; i < mp_rep.nb_received; i++) {\n+\t\tmp_res = &mp_rep.msgs[i];\n+\t\tres = (struct mlx5_mp_param *)mp_res->param;\n+\t\tif (res->result) {\n+\t\t\tDRV_LOG(ERR, \"port %u request failed on secondary #%d\",\n+\t\t\t\tdev->data->port_id, i);\n+\t\t\tgoto exit;\n+\t\t}\n+\t}\n+exit:\n+\tfree(mp_rep.msgs);\n+}\n+\n+/**\n+ * Broadcast request of starting data-path to secondary processes. The request\n+ * is synchronous.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet structure.\n+ */\n+void\n+mlx5_mp_os_req_start_rxtx(struct rte_eth_dev *dev)\n+{\n+\tmp_req_on_rxtx(dev, MLX5_MP_REQ_START_RXTX);\n+}\n+\n+/**\n+ * Broadcast request of stopping data-path to secondary processes. The request\n+ * is synchronous.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet structure.\n+ */\n+void\n+mlx5_mp_os_req_stop_rxtx(struct rte_eth_dev *dev)\n+{\n+\tmp_req_on_rxtx(dev, MLX5_MP_REQ_STOP_RXTX);\n+}\ndiff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex a853219..2385d69 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -66,6 +66,14 @@\n #define MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP (1 << 4)\n #endif\n \n+static const char *MZ_MLX5_PMD_SHARED_DATA = \"mlx5_pmd_shared_data\";\n+\n+/* Spinlock for mlx5_shared_data allocation. */\n+static rte_spinlock_t mlx5_shared_data_lock = RTE_SPINLOCK_INITIALIZER;\n+\n+/* Process local data for secondary processes. */\n+static struct mlx5_local_data mlx5_local_data;\n+\n /**\n * Get mlx5 device attributes. The glue function query_device_ex() is called\n * with out parameter of type 'struct ibv_device_attr_ex *'. Then fill in mlx5\n@@ -356,6 +364,109 @@ mlx5_os_free_shared_dr(struct mlx5_priv *priv)\n }\n \n /**\n+ * Initialize shared data between primary and secondary process.\n+ *\n+ * A memzone is reserved by primary process and secondary processes attach to\n+ * the memzone.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_init_shared_data(void)\n+{\n+\tconst struct rte_memzone *mz;\n+\tint ret = 0;\n+\n+\trte_spinlock_lock(&mlx5_shared_data_lock);\n+\tif (mlx5_shared_data == NULL) {\n+\t\tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n+\t\t\t/* Allocate shared memory. */\n+\t\t\tmz = rte_memzone_reserve(MZ_MLX5_PMD_SHARED_DATA,\n+\t\t\t\t\t\t sizeof(*mlx5_shared_data),\n+\t\t\t\t\t\t SOCKET_ID_ANY, 0);\n+\t\t\tif (mz == NULL) {\n+\t\t\t\tDRV_LOG(ERR,\n+\t\t\t\t\t\"Cannot allocate mlx5 shared data\");\n+\t\t\t\tret = -rte_errno;\n+\t\t\t\tgoto error;\n+\t\t\t}\n+\t\t\tmlx5_shared_data = mz->addr;\n+\t\t\tmemset(mlx5_shared_data, 0, sizeof(*mlx5_shared_data));\n+\t\t\trte_spinlock_init(&mlx5_shared_data->lock);\n+\t\t} else {\n+\t\t\t/* Lookup allocated shared memory. */\n+\t\t\tmz = rte_memzone_lookup(MZ_MLX5_PMD_SHARED_DATA);\n+\t\t\tif (mz == NULL) {\n+\t\t\t\tDRV_LOG(ERR,\n+\t\t\t\t\t\"Cannot attach mlx5 shared data\");\n+\t\t\t\tret = -rte_errno;\n+\t\t\t\tgoto error;\n+\t\t\t}\n+\t\t\tmlx5_shared_data = mz->addr;\n+\t\t\tmemset(&mlx5_local_data, 0, sizeof(mlx5_local_data));\n+\t\t}\n+\t}\n+error:\n+\trte_spinlock_unlock(&mlx5_shared_data_lock);\n+\treturn ret;\n+}\n+\n+/**\n+ * PMD global initialization.\n+ *\n+ * Independent from individual device, this function initializes global\n+ * per-PMD data structures distinguishing primary and secondary processes.\n+ * Hence, each initialization is called once per a process.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_init_once(void)\n+{\n+\tstruct mlx5_shared_data *sd;\n+\tstruct mlx5_local_data *ld = &mlx5_local_data;\n+\tint ret = 0;\n+\n+\tif (mlx5_init_shared_data())\n+\t\treturn -rte_errno;\n+\tsd = mlx5_shared_data;\n+\tMLX5_ASSERT(sd);\n+\trte_spinlock_lock(&sd->lock);\n+\tswitch (rte_eal_process_type()) {\n+\tcase RTE_PROC_PRIMARY:\n+\t\tif (sd->init_done)\n+\t\t\tbreak;\n+\t\tLIST_INIT(&sd->mem_event_cb_list);\n+\t\trte_rwlock_init(&sd->mem_event_rwlock);\n+\t\trte_mem_event_callback_register(\"MLX5_MEM_EVENT_CB\",\n+\t\t\t\t\t\tmlx5_mr_mem_event_cb, NULL);\n+\t\tret = mlx5_mp_init_primary(MLX5_MP_NAME,\n+\t\t\t\t\t mlx5_mp_os_primary_handle);\n+\t\tif (ret)\n+\t\t\tgoto out;\n+\t\tsd->init_done = true;\n+\t\tbreak;\n+\tcase RTE_PROC_SECONDARY:\n+\t\tif (ld->init_done)\n+\t\t\tbreak;\n+\t\tret = mlx5_mp_init_secondary(MLX5_MP_NAME,\n+\t\t\t\t\t mlx5_mp_os_secondary_handle);\n+\t\tif (ret)\n+\t\t\tgoto out;\n+\t\t++sd->secondary_cnt;\n+\t\tld->init_done = true;\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n+\t}\n+out:\n+\trte_spinlock_unlock(&sd->lock);\n+\treturn ret;\n+}\n+\n+/**\n * Spawn an Ethernet device from Verbs information.\n *\n * @param dpdk_dev\ndiff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build\nindex e95ce02..c8dcb76 100644\n--- a/drivers/net/mlx5/meson.build\n+++ b/drivers/net/mlx5/meson.build\n@@ -22,7 +22,6 @@ sources = files(\n \t'mlx5_rxmode.c',\n \t'mlx5_rxq.c',\n \t'mlx5_rxtx.c',\n-\t'mlx5_mp.c',\n \t'mlx5_stats.c',\n \t'mlx5_trigger.c',\n \t'mlx5_txq.c',\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 0c654ed..10a0306 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -167,16 +167,11 @@\n /* Flow memory reclaim mode. */\n #define MLX5_RECLAIM_MEM \"reclaim_mem_mode\"\n \n-static const char *MZ_MLX5_PMD_SHARED_DATA = \"mlx5_pmd_shared_data\";\n-\n /* Shared memory between primary and secondary processes. */\n struct mlx5_shared_data *mlx5_shared_data;\n \n-/* Spinlock for mlx5_shared_data allocation. */\n-static rte_spinlock_t mlx5_shared_data_lock = RTE_SPINLOCK_INITIALIZER;\n-\n-/* Process local data for secondary processes. */\n-static struct mlx5_local_data mlx5_local_data;\n+/** Driver-specific log messages type. */\n+int mlx5_logtype;\n \n static LIST_HEAD(, mlx5_dev_ctx_shared) mlx5_dev_ctx_list =\n \t\t\t\t\t\tLIST_HEAD_INITIALIZER();\n@@ -966,55 +961,6 @@ mlx5_alloc_table_hash_list(struct mlx5_priv *priv)\n }\n \n /**\n- * Initialize shared data between primary and secondary process.\n- *\n- * A memzone is reserved by primary process and secondary processes attach to\n- * the memzone.\n- *\n- * @return\n- * 0 on success, a negative errno value otherwise and rte_errno is set.\n- */\n-static int\n-mlx5_init_shared_data(void)\n-{\n-\tconst struct rte_memzone *mz;\n-\tint ret = 0;\n-\n-\trte_spinlock_lock(&mlx5_shared_data_lock);\n-\tif (mlx5_shared_data == NULL) {\n-\t\tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n-\t\t\t/* Allocate shared memory. */\n-\t\t\tmz = rte_memzone_reserve(MZ_MLX5_PMD_SHARED_DATA,\n-\t\t\t\t\t\t sizeof(*mlx5_shared_data),\n-\t\t\t\t\t\t SOCKET_ID_ANY, 0);\n-\t\t\tif (mz == NULL) {\n-\t\t\t\tDRV_LOG(ERR,\n-\t\t\t\t\t\"Cannot allocate mlx5 shared data\");\n-\t\t\t\tret = -rte_errno;\n-\t\t\t\tgoto error;\n-\t\t\t}\n-\t\t\tmlx5_shared_data = mz->addr;\n-\t\t\tmemset(mlx5_shared_data, 0, sizeof(*mlx5_shared_data));\n-\t\t\trte_spinlock_init(&mlx5_shared_data->lock);\n-\t\t} else {\n-\t\t\t/* Lookup allocated shared memory. */\n-\t\t\tmz = rte_memzone_lookup(MZ_MLX5_PMD_SHARED_DATA);\n-\t\t\tif (mz == NULL) {\n-\t\t\t\tDRV_LOG(ERR,\n-\t\t\t\t\t\"Cannot attach mlx5 shared data\");\n-\t\t\t\tret = -rte_errno;\n-\t\t\t\tgoto error;\n-\t\t\t}\n-\t\t\tmlx5_shared_data = mz->addr;\n-\t\t\tmemset(&mlx5_local_data, 0, sizeof(mlx5_local_data));\n-\t\t}\n-\t}\n-error:\n-\trte_spinlock_unlock(&mlx5_shared_data_lock);\n-\treturn ret;\n-}\n-\n-/**\n * Retrieve integer value from environment variable.\n *\n * @param[in] name\n@@ -1155,7 +1101,7 @@ mlx5_dev_close(struct rte_eth_dev *dev)\n \tdev->tx_pkt_burst = removed_tx_burst;\n \trte_wmb();\n \t/* Disable datapath on secondary process. */\n-\tmlx5_mp_req_stop_rxtx(dev);\n+\tmlx5_mp_os_req_stop_rxtx(dev);\n \tif (priv->rxqs != NULL) {\n \t\t/* XXX race condition if mlx5_rx_burst() is still running. */\n \t\tusleep(1000);\n@@ -1461,60 +1407,6 @@ mlx5_args(struct mlx5_dev_config *config, struct rte_devargs *devargs)\n }\n \n /**\n- * PMD global initialization.\n- *\n- * Independent from individual device, this function initializes global\n- * per-PMD data structures distinguishing primary and secondary processes.\n- * Hence, each initialization is called once per a process.\n- *\n- * @return\n- * 0 on success, a negative errno value otherwise and rte_errno is set.\n- */\n-int\n-mlx5_init_once(void)\n-{\n-\tstruct mlx5_shared_data *sd;\n-\tstruct mlx5_local_data *ld = &mlx5_local_data;\n-\tint ret = 0;\n-\n-\tif (mlx5_init_shared_data())\n-\t\treturn -rte_errno;\n-\tsd = mlx5_shared_data;\n-\tMLX5_ASSERT(sd);\n-\trte_spinlock_lock(&sd->lock);\n-\tswitch (rte_eal_process_type()) {\n-\tcase RTE_PROC_PRIMARY:\n-\t\tif (sd->init_done)\n-\t\t\tbreak;\n-\t\tLIST_INIT(&sd->mem_event_cb_list);\n-\t\trte_rwlock_init(&sd->mem_event_rwlock);\n-\t\trte_mem_event_callback_register(\"MLX5_MEM_EVENT_CB\",\n-\t\t\t\t\t\tmlx5_mr_mem_event_cb, NULL);\n-\t\tret = mlx5_mp_init_primary(MLX5_MP_NAME,\n-\t\t\t\t\t mlx5_mp_primary_handle);\n-\t\tif (ret)\n-\t\t\tgoto out;\n-\t\tsd->init_done = true;\n-\t\tbreak;\n-\tcase RTE_PROC_SECONDARY:\n-\t\tif (ld->init_done)\n-\t\t\tbreak;\n-\t\tret = mlx5_mp_init_secondary(MLX5_MP_NAME,\n-\t\t\t\t\t mlx5_mp_secondary_handle);\n-\t\tif (ret)\n-\t\t\tgoto out;\n-\t\t++sd->secondary_cnt;\n-\t\tld->init_done = true;\n-\t\tbreak;\n-\tdefault:\n-\t\tbreak;\n-\t}\n-out:\n-\trte_spinlock_unlock(&sd->lock);\n-\treturn ret;\n-}\n-\n-/**\n * Configures the minimal amount of data to inline into WQE\n * while sending packets.\n *\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 87cfbfe..fa223a1 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -710,7 +710,6 @@ void mlx5_set_min_inline(struct mlx5_dev_spawn_data *spawn,\n void mlx5_set_metadata_mask(struct rte_eth_dev *dev);\n int mlx5_dev_check_sibling_config(struct mlx5_priv *priv,\n \t\t\t\t struct mlx5_dev_config *config);\n-int mlx5_init_once(void);\n int mlx5_dev_configure(struct rte_eth_dev *dev);\n int mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info);\n int mlx5_fw_version_get(struct rte_eth_dev *dev, char *fw_ver, size_t fw_size);\n@@ -893,11 +892,13 @@ void mlx5_flow_rxq_dynf_metadata_set(struct rte_eth_dev *dev);\n int mlx5_flow_get_aged_flows(struct rte_eth_dev *dev, void **contexts,\n \t\t\tuint32_t nb_contexts, struct rte_flow_error *error);\n \n-/* mlx5_mp.c */\n-int mlx5_mp_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer);\n-int mlx5_mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer);\n-void mlx5_mp_req_start_rxtx(struct rte_eth_dev *dev);\n-void mlx5_mp_req_stop_rxtx(struct rte_eth_dev *dev);\n+/* mlx5_mp_os.c */\n+int mlx5_mp_os_primary_handle(const struct rte_mp_msg *mp_msg,\n+\t\t\t const void *peer);\n+int mlx5_mp_os_secondary_handle(const struct rte_mp_msg *mp_msg,\n+\t\t\t\tconst void *peer);\n+void mlx5_mp_os_req_start_rxtx(struct rte_eth_dev *dev);\n+void mlx5_mp_os_req_stop_rxtx(struct rte_eth_dev *dev);\n \n /* mlx5_socket.c */\n \ndiff --git a/drivers/net/mlx5/mlx5_mp.c b/drivers/net/mlx5/mlx5_mp.c\ndeleted file mode 100644\nindex a2b5c40..0000000\n--- a/drivers/net/mlx5/mlx5_mp.c\n+++ /dev/null\n@@ -1,211 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright 2019 6WIND S.A.\n- * Copyright 2019 Mellanox Technologies, Ltd\n- */\n-\n-#include <stdio.h>\n-#include <time.h>\n-\n-#include <rte_eal.h>\n-#include <rte_ethdev_driver.h>\n-#include <rte_string_fns.h>\n-\n-#include <mlx5_common_mp.h>\n-#include <mlx5_common_mr.h>\n-\n-#include \"mlx5.h\"\n-#include \"mlx5_rxtx.h\"\n-#include \"mlx5_utils.h\"\n-\n-int\n-mlx5_mp_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer)\n-{\n-\tstruct rte_mp_msg mp_res;\n-\tstruct mlx5_mp_param *res = (struct mlx5_mp_param *)mp_res.param;\n-\tconst struct mlx5_mp_param *param =\n-\t\t(const struct mlx5_mp_param *)mp_msg->param;\n-\tstruct rte_eth_dev *dev;\n-\tstruct mlx5_priv *priv;\n-\tstruct mr_cache_entry entry;\n-\tuint32_t lkey;\n-\tint ret;\n-\n-\tMLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);\n-\tif (!rte_eth_dev_is_valid_port(param->port_id)) {\n-\t\trte_errno = ENODEV;\n-\t\tDRV_LOG(ERR, \"port %u invalid port ID\", param->port_id);\n-\t\treturn -rte_errno;\n-\t}\n-\tdev = &rte_eth_devices[param->port_id];\n-\tpriv = dev->data->dev_private;\n-\tswitch (param->type) {\n-\tcase MLX5_MP_REQ_CREATE_MR:\n-\t\tmp_init_msg(&priv->mp_id, &mp_res, param->type);\n-\t\tlkey = mlx5_mr_create_primary(priv->sh->pd,\n-\t\t\t\t\t &priv->sh->share_cache,\n-\t\t\t\t\t &entry, param->args.addr,\n-\t\t\t\t\t priv->config.mr_ext_memseg_en);\n-\t\tif (lkey == UINT32_MAX)\n-\t\t\tres->result = -rte_errno;\n-\t\tret = rte_mp_reply(&mp_res, peer);\n-\t\tbreak;\n-\tcase MLX5_MP_REQ_VERBS_CMD_FD:\n-\t\tmp_init_msg(&priv->mp_id, &mp_res, param->type);\n-\t\tmp_res.num_fds = 1;\n-\t\tmp_res.fds[0] = ((struct ibv_context *)priv->sh->ctx)->cmd_fd;\n-\t\tres->result = 0;\n-\t\tret = rte_mp_reply(&mp_res, peer);\n-\t\tbreak;\n-\tcase MLX5_MP_REQ_QUEUE_STATE_MODIFY:\n-\t\tmp_init_msg(&priv->mp_id, &mp_res, param->type);\n-\t\tres->result = mlx5_queue_state_modify_primary\n-\t\t\t\t\t(dev, ¶m->args.state_modify);\n-\t\tret = rte_mp_reply(&mp_res, peer);\n-\t\tbreak;\n-\tdefault:\n-\t\trte_errno = EINVAL;\n-\t\tDRV_LOG(ERR, \"port %u invalid mp request type\",\n-\t\t\tdev->data->port_id);\n-\t\treturn -rte_errno;\n-\t}\n-\treturn ret;\n-}\n-\n-/**\n- * IPC message handler of a secondary process.\n- *\n- * @param[in] dev\n- * Pointer to Ethernet structure.\n- * @param[in] peer\n- * Pointer to the peer socket path.\n- *\n- * @return\n- * 0 on success, a negative errno value otherwise and rte_errno is set.\n- */\n-int\n-mlx5_mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer)\n-{\n-\tstruct rte_mp_msg mp_res;\n-\tstruct mlx5_mp_param *res = (struct mlx5_mp_param *)mp_res.param;\n-\tconst struct mlx5_mp_param *param =\n-\t\t(const struct mlx5_mp_param *)mp_msg->param;\n-\tstruct rte_eth_dev *dev;\n-\tstruct mlx5_priv *priv;\n-\tint ret;\n-\n-\tMLX5_ASSERT(rte_eal_process_type() == RTE_PROC_SECONDARY);\n-\tif (!rte_eth_dev_is_valid_port(param->port_id)) {\n-\t\trte_errno = ENODEV;\n-\t\tDRV_LOG(ERR, \"port %u invalid port ID\", param->port_id);\n-\t\treturn -rte_errno;\n-\t}\n-\tdev = &rte_eth_devices[param->port_id];\n-\tpriv = dev->data->dev_private;\n-\tswitch (param->type) {\n-\tcase MLX5_MP_REQ_START_RXTX:\n-\t\tDRV_LOG(INFO, \"port %u starting datapath\", dev->data->port_id);\n-\t\trte_mb();\n-\t\tdev->rx_pkt_burst = mlx5_select_rx_function(dev);\n-\t\tdev->tx_pkt_burst = mlx5_select_tx_function(dev);\n-\t\tmp_init_msg(&priv->mp_id, &mp_res, param->type);\n-\t\tres->result = 0;\n-\t\tret = rte_mp_reply(&mp_res, peer);\n-\t\tbreak;\n-\tcase MLX5_MP_REQ_STOP_RXTX:\n-\t\tDRV_LOG(INFO, \"port %u stopping datapath\", dev->data->port_id);\n-\t\tdev->rx_pkt_burst = removed_rx_burst;\n-\t\tdev->tx_pkt_burst = removed_tx_burst;\n-\t\trte_mb();\n-\t\tmp_init_msg(&priv->mp_id, &mp_res, param->type);\n-\t\tres->result = 0;\n-\t\tret = rte_mp_reply(&mp_res, peer);\n-\t\tbreak;\n-\tdefault:\n-\t\trte_errno = EINVAL;\n-\t\tDRV_LOG(ERR, \"port %u invalid mp request type\",\n-\t\t\tdev->data->port_id);\n-\t\treturn -rte_errno;\n-\t}\n-\treturn ret;\n-}\n-\n-/**\n- * Broadcast request of stopping/starting data-path to secondary processes.\n- *\n- * @param[in] dev\n- * Pointer to Ethernet structure.\n- * @param[in] type\n- * Request type.\n- */\n-static void\n-mp_req_on_rxtx(struct rte_eth_dev *dev, enum mlx5_mp_req_type type)\n-{\n-\tstruct rte_mp_msg mp_req;\n-\tstruct rte_mp_msg *mp_res;\n-\tstruct rte_mp_reply mp_rep;\n-\tstruct mlx5_mp_param *res;\n-\tstruct timespec ts = {.tv_sec = MLX5_MP_REQ_TIMEOUT_SEC, .tv_nsec = 0};\n-\tstruct mlx5_priv *priv = dev->data->dev_private;\n-\tint ret;\n-\tint i;\n-\n-\tMLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);\n-\tif (!mlx5_shared_data->secondary_cnt)\n-\t\treturn;\n-\tif (type != MLX5_MP_REQ_START_RXTX && type != MLX5_MP_REQ_STOP_RXTX) {\n-\t\tDRV_LOG(ERR, \"port %u unknown request (req_type %d)\",\n-\t\t\tdev->data->port_id, type);\n-\t\treturn;\n-\t}\n-\tmp_init_msg(&priv->mp_id, &mp_req, type);\n-\tret = rte_mp_request_sync(&mp_req, &mp_rep, &ts);\n-\tif (ret) {\n-\t\tif (rte_errno != ENOTSUP)\n-\t\t\tDRV_LOG(ERR, \"port %u failed to request stop/start Rx/Tx (%d)\",\n-\t\t\t\tdev->data->port_id, type);\n-\t\tgoto exit;\n-\t}\n-\tif (mp_rep.nb_sent != mp_rep.nb_received) {\n-\t\tDRV_LOG(ERR,\n-\t\t\t\"port %u not all secondaries responded (req_type %d)\",\n-\t\t\tdev->data->port_id, type);\n-\t\tgoto exit;\n-\t}\n-\tfor (i = 0; i < mp_rep.nb_received; i++) {\n-\t\tmp_res = &mp_rep.msgs[i];\n-\t\tres = (struct mlx5_mp_param *)mp_res->param;\n-\t\tif (res->result) {\n-\t\t\tDRV_LOG(ERR, \"port %u request failed on secondary #%d\",\n-\t\t\t\tdev->data->port_id, i);\n-\t\t\tgoto exit;\n-\t\t}\n-\t}\n-exit:\n-\tfree(mp_rep.msgs);\n-}\n-\n-/**\n- * Broadcast request of starting data-path to secondary processes. The request\n- * is synchronous.\n- *\n- * @param[in] dev\n- * Pointer to Ethernet structure.\n- */\n-void\n-mlx5_mp_req_start_rxtx(struct rte_eth_dev *dev)\n-{\n-\tmp_req_on_rxtx(dev, MLX5_MP_REQ_START_RXTX);\n-}\n-\n-/**\n- * Broadcast request of stopping data-path to secondary processes. The request\n- * is synchronous.\n- *\n- * @param[in] dev\n- * Pointer to Ethernet structure.\n- */\n-void\n-mlx5_mp_req_stop_rxtx(struct rte_eth_dev *dev)\n-{\n-\tmp_req_on_rxtx(dev, MLX5_MP_REQ_STOP_RXTX);\n-}\ndiff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c\nindex ef74609..360fd6f 100644\n--- a/drivers/net/mlx5/mlx5_trigger.c\n+++ b/drivers/net/mlx5/mlx5_trigger.c\n@@ -340,7 +340,7 @@ mlx5_dev_start(struct rte_eth_dev *dev)\n \tdev->tx_pkt_burst = mlx5_select_tx_function(dev);\n \tdev->rx_pkt_burst = mlx5_select_rx_function(dev);\n \t/* Enable datapath on secondary process. */\n-\tmlx5_mp_req_start_rxtx(dev);\n+\tmlx5_mp_os_req_start_rxtx(dev);\n \tif (priv->sh->intr_handle.fd >= 0) {\n \t\tpriv->sh->port[priv->dev_port - 1].ih_port_id =\n \t\t\t\t\t(uint32_t)dev->data->port_id;\n@@ -385,7 +385,7 @@ mlx5_dev_stop(struct rte_eth_dev *dev)\n \tdev->tx_pkt_burst = removed_tx_burst;\n \trte_wmb();\n \t/* Disable datapath on secondary process. */\n-\tmlx5_mp_req_stop_rxtx(dev);\n+\tmlx5_mp_os_req_stop_rxtx(dev);\n \tusleep(1000 * priv->rxqs_n);\n \tDRV_LOG(DEBUG, \"port %u stopping device\", dev->data->port_id);\n \tmlx5_flow_stop_default(dev);\n", "prefixes": [ "v1", "7/8" ] }