Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8483/?format=api
{ "id": 8483, "url": "http://patches.dpdk.org/api/patches/8483/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1446231443-8285-4-git-send-email-adrien.mazarguil@6wind.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": "<1446231443-8285-4-git-send-email-adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1446231443-8285-4-git-send-email-adrien.mazarguil@6wind.com", "date": "2015-10-30T18:57:23", "name": "[dpdk-dev,v2,3/3] mlx5: handle interrupts", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "5f441894be418aa48b00b975a676b7f1b62a3dbd", "submitter": { "id": 165, "url": "http://patches.dpdk.org/api/people/165/?format=api", "name": "Adrien Mazarguil", "email": "adrien.mazarguil@6wind.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1446231443-8285-4-git-send-email-adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/8483/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/8483/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 18C359418;\n\tFri, 30 Oct 2015 19:58:04 +0100 (CET)", "from mail-wi0-f169.google.com (mail-wi0-f169.google.com\n\t[209.85.212.169]) by dpdk.org (Postfix) with ESMTP id 4D990935A\n\tfor <dev@dpdk.org>; Fri, 30 Oct 2015 19:57:52 +0100 (CET)", "by wijp11 with SMTP id p11so17182657wij.0\n\tfor <dev@dpdk.org>; Fri, 30 Oct 2015 11:57:52 -0700 (PDT)", "from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.\n\t[82.239.227.177]) by smtp.gmail.com with ESMTPSA id\n\tjt9sm8398310wjc.24.2015.10.30.11.57.50\n\t(version=TLSv1.2 cipher=RC4-SHA bits=128/128);\n\tFri, 30 Oct 2015 11:57:51 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind_com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=AxNEIlonvPiq4R4Yv42n48K7eiEIkKwfn2UgtoHOX20=;\n\tb=tTDwuRICS+QTOp85vdlKuDyFuqVKGAcscdhtku2CACW6ZeOUysMrO1FrtK0mP5FGCm\n\t4g7WaCNRZAN4Se2oDDYto4P8Y9SXX+C/YpZQQ2x5g0Jk/K8WPGTQWwHb4pNUJMNJt9+G\n\tZIDLUY3jvQgcVt0qX+02Fz5LCairtV6+TQl3FXt+1jXut0FHtQrtCMh6XDyqu8+Vna4z\n\tTS9n442t26EcRXcTmLDz8e125nsnJz9TS9E3QTFh7Fjfl6/jj+keVZ44KBrtgjRW0qqI\n\t6ZKhaWe1maeOBfDUn5EpBg54HlE2SzEY2q00KrbjjxmCfCULlqopm598pFk01kCJuvvE\n\to+7A==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=AxNEIlonvPiq4R4Yv42n48K7eiEIkKwfn2UgtoHOX20=;\n\tb=IRAuVm5nMsfmoWHdg2mmd6elt/iFzl0WybQtvuVKtQH/JwHRx+vkdyZnjUw5/ghAIh\n\tOq+c9oztbCiJuZFWqIfD0d1eMbBy/KGYDrur6H55I+zH0uUnFnn9JFl0TXXug9ojsJXh\n\tOUCRAmrrMfryz0xJ16mY3u0ZwWiKuyT/vvYuCGkOP4FWfEIn22Pb/tkZ5oOXQxAGHY7i\n\tVyhqfoweT/zSx2/SynQ1EPqVSJFVE/kKdtPuoQHp3e+EaMcCAJK0lJU/lbtGWP+Uq2cj\n\tXsvjQ6lSOcO/Mm+6pngyjZKRQ+X1uOeKNGbfhenEEt967VymfVPergpv+VMf8gOdghi4\n\tuW3A==", "X-Gm-Message-State": "ALoCoQktELBs9cFW1U/TIDLUSXYlsHJ5PotDiCd7WRIBkPu+HM4eb9TlPRHLVyuB+lTw4gL42Eha", "X-Received": "by 10.194.186.196 with SMTP id\n\tfm4mr12064995wjc.152.1446231472184; \n\tFri, 30 Oct 2015 11:57:52 -0700 (PDT)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Date": "Fri, 30 Oct 2015 19:57:23 +0100", "Message-Id": "<1446231443-8285-4-git-send-email-adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1446231443-8285-1-git-send-email-adrien.mazarguil@6wind.com>", "References": "<1444067795-29748-1-git-send-email-adrien.mazarguil@6wind.com>\n\t<1446231443-8285-1-git-send-email-adrien.mazarguil@6wind.com>", "Subject": "[dpdk-dev] [PATCH v2 3/3] mlx5: handle interrupts", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\n\nAdd interrupts handler for port status notification.\n\nSigned-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\n---\n drivers/net/mlx5/mlx5.c | 3 +\n drivers/net/mlx5/mlx5.h | 7 ++\n drivers/net/mlx5/mlx5_defs.h | 3 +\n drivers/net/mlx5/mlx5_ethdev.c | 150 ++++++++++++++++++++++++++++++++++++++++\n drivers/net/mlx5/mlx5_trigger.c | 4 ++\n 5 files changed, 167 insertions(+)", "diff": "diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 97ce902..9636588 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -86,6 +86,7 @@ mlx5_dev_close(struct rte_eth_dev *dev)\n \t (void *)dev,\n \t ((priv->ctx != NULL) ? priv->ctx->device->name : \"\"));\n \t/* In case mlx5_dev_stop() has not been called. */\n+\tpriv_dev_interrupt_handler_uninstall(priv, dev);\n \tpriv_allmulticast_disable(priv);\n \tpriv_promiscuous_disable(priv);\n \tpriv_mac_addrs_disable(priv);\n@@ -450,6 +451,7 @@ mlx5_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)\n \t\tpriv->dev = eth_dev;\n \t\teth_dev->dev_ops = &mlx5_dev_ops;\n \t\teth_dev->data->mac_addrs = priv->mac;\n+\t\tTAILQ_INIT(ð_dev->link_intr_cbs);\n \n \t\t/* Bring Ethernet device up. */\n \t\tDEBUG(\"forcing Ethernet interface up\");\n@@ -523,6 +525,7 @@ static struct eth_driver mlx5_driver = {\n \t\t.name = MLX5_DRIVER_NAME,\n \t\t.id_table = mlx5_pci_id_map,\n \t\t.devinit = mlx5_pci_devinit,\n+\t\t.drv_flags = RTE_PCI_DRV_INTR_LSC,\n \t},\n \t.dev_private_size = sizeof(struct priv)\n };\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 03e33d6..0daacc8 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -58,6 +58,7 @@\n #include <rte_ether.h>\n #include <rte_ethdev.h>\n #include <rte_spinlock.h>\n+#include <rte_interrupts.h>\n #ifdef PEDANTIC\n #pragma GCC diagnostic error \"-pedantic\"\n #endif\n@@ -101,6 +102,7 @@ struct priv {\n \tunsigned int hw_csum:1; /* Checksum offload is supported. */\n \tunsigned int hw_csum_l2tun:1; /* Same for L2 tunnels. */\n \tunsigned int vf:1; /* This is a VF device. */\n+\tunsigned int pending_alarm:1; /* An alarm is pending. */\n \t/* RX/TX queues. */\n \tunsigned int rxqs_n; /* RX queues array size. */\n \tunsigned int txqs_n; /* TX queues array size. */\n@@ -115,6 +117,7 @@ struct priv {\n \tunsigned int hash_rxqs_n; /* Hash RX QPs array size. */\n \t/* RSS configuration array indexed by hash RX queue type. */\n \tstruct rte_eth_rss_conf *(*rss_conf)[];\n+\tstruct rte_intr_handle intr_handle; /* Interrupt handler. */\n \trte_spinlock_t lock; /* Lock for control functions. */\n };\n \n@@ -157,6 +160,10 @@ int mlx5_dev_get_flow_ctrl(struct rte_eth_dev *, struct rte_eth_fc_conf *);\n int mlx5_dev_set_flow_ctrl(struct rte_eth_dev *, struct rte_eth_fc_conf *);\n int mlx5_ibv_device_to_pci_addr(const struct ibv_device *,\n \t\t\t\tstruct rte_pci_addr *);\n+void mlx5_dev_link_status_handler(void *);\n+void mlx5_dev_interrupt_handler(struct rte_intr_handle *, void *);\n+void priv_dev_interrupt_handler_uninstall(struct priv *, struct rte_eth_dev *);\n+void priv_dev_interrupt_handler_install(struct priv *, struct rte_eth_dev *);\n \n /* mlx5_mac.c */\n \ndiff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h\nindex 3952c71..bb82c9a 100644\n--- a/drivers/net/mlx5/mlx5_defs.h\n+++ b/drivers/net/mlx5/mlx5_defs.h\n@@ -78,4 +78,7 @@\n #define MLX5_PMD_SOFT_COUNTERS 1\n #endif\n \n+/* Alarm timeout. */\n+#define MLX5_ALARM_TIMEOUT_US 100000\n+\n #endif /* RTE_PMD_MLX5_DEFS_H_ */\ndiff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c\nindex fac685e..84e877c 100644\n--- a/drivers/net/mlx5/mlx5_ethdev.c\n+++ b/drivers/net/mlx5/mlx5_ethdev.c\n@@ -47,6 +47,7 @@\n #include <linux/if.h>\n #include <linux/ethtool.h>\n #include <linux/sockios.h>\n+#include <fcntl.h>\n \n /* DPDK headers don't like -pedantic. */\n #ifdef PEDANTIC\n@@ -56,6 +57,8 @@\n #include <rte_ethdev.h>\n #include <rte_mbuf.h>\n #include <rte_common.h>\n+#include <rte_interrupts.h>\n+#include <rte_alarm.h>\n #ifdef PEDANTIC\n #pragma GCC diagnostic error \"-pedantic\"\n #endif\n@@ -790,3 +793,150 @@ mlx5_ibv_device_to_pci_addr(const struct ibv_device *device,\n \tfclose(file);\n \treturn 0;\n }\n+\n+/**\n+ * Link status handler.\n+ *\n+ * @param priv\n+ * Pointer to private structure.\n+ * @param dev\n+ * Pointer to the rte_eth_dev structure.\n+ *\n+ * @return\n+ * Nonzero if the callback process can be called immediately.\n+ */\n+static int\n+priv_dev_link_status_handler(struct priv *priv, struct rte_eth_dev *dev)\n+{\n+\tstruct ibv_async_event event;\n+\tint port_change = 0;\n+\tint ret = 0;\n+\n+\t/* Read all message and acknowledge them. */\n+\tfor (;;) {\n+\t\tif (ibv_get_async_event(priv->ctx, &event))\n+\t\t\tbreak;\n+\n+\t\tif (event.event_type == IBV_EVENT_PORT_ACTIVE ||\n+\t\t event.event_type == IBV_EVENT_PORT_ERR)\n+\t\t\tport_change = 1;\n+\t\telse\n+\t\t\tDEBUG(\"event type %d on port %d not handled\",\n+\t\t\t event.event_type, event.element.port_num);\n+\t\tibv_ack_async_event(&event);\n+\t}\n+\n+\tif (port_change ^ priv->pending_alarm) {\n+\t\tstruct rte_eth_link *link = &dev->data->dev_link;\n+\n+\t\tpriv->pending_alarm = 0;\n+\t\tmlx5_link_update_unlocked(dev, 0);\n+\t\tif (((link->link_speed == 0) && link->link_status) ||\n+\t\t ((link->link_speed != 0) && !link->link_status)) {\n+\t\t\t/* Inconsistent status, check again later. */\n+\t\t\tpriv->pending_alarm = 1;\n+\t\t\trte_eal_alarm_set(MLX5_ALARM_TIMEOUT_US,\n+\t\t\t\t\t mlx5_dev_link_status_handler,\n+\t\t\t\t\t dev);\n+\t\t} else\n+\t\t\tret = 1;\n+\t}\n+\treturn ret;\n+}\n+\n+/**\n+ * Handle delayed link status event.\n+ *\n+ * @param arg\n+ * Registered argument.\n+ */\n+void\n+mlx5_dev_link_status_handler(void *arg)\n+{\n+\tstruct rte_eth_dev *dev = arg;\n+\tstruct priv *priv = dev->data->dev_private;\n+\tint ret;\n+\n+\tpriv_lock(priv);\n+\tassert(priv->pending_alarm == 1);\n+\tret = priv_dev_link_status_handler(priv, dev);\n+\tpriv_unlock(priv);\n+\tif (ret)\n+\t\t_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC);\n+}\n+\n+/**\n+ * Handle interrupts from the NIC.\n+ *\n+ * @param[in] intr_handle\n+ * Interrupt handler.\n+ * @param cb_arg\n+ * Callback argument.\n+ */\n+void\n+mlx5_dev_interrupt_handler(struct rte_intr_handle *intr_handle, void *cb_arg)\n+{\n+\tstruct rte_eth_dev *dev = cb_arg;\n+\tstruct priv *priv = dev->data->dev_private;\n+\tint ret;\n+\n+\t(void)intr_handle;\n+\tpriv_lock(priv);\n+\tret = priv_dev_link_status_handler(priv, dev);\n+\tpriv_unlock(priv);\n+\tif (ret)\n+\t\t_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC);\n+}\n+\n+/**\n+ * Uninstall interrupt handler.\n+ *\n+ * @param priv\n+ * Pointer to private structure.\n+ * @param dev\n+ * Pointer to the rte_eth_dev structure.\n+ */\n+void\n+priv_dev_interrupt_handler_uninstall(struct priv *priv, struct rte_eth_dev *dev)\n+{\n+\tif (!dev->data->dev_conf.intr_conf.lsc)\n+\t\treturn;\n+\trte_intr_callback_unregister(&priv->intr_handle,\n+\t\t\t\t mlx5_dev_interrupt_handler,\n+\t\t\t\t dev);\n+\tif (priv->pending_alarm)\n+\t\trte_eal_alarm_cancel(mlx5_dev_link_status_handler, dev);\n+\tpriv->pending_alarm = 0;\n+\tpriv->intr_handle.fd = 0;\n+\tpriv->intr_handle.type = 0;\n+}\n+\n+/**\n+ * Install interrupt handler.\n+ *\n+ * @param priv\n+ * Pointer to private structure.\n+ * @param dev\n+ * Pointer to the rte_eth_dev structure.\n+ */\n+void\n+priv_dev_interrupt_handler_install(struct priv *priv, struct rte_eth_dev *dev)\n+{\n+\tint rc, flags;\n+\n+\tif (!dev->data->dev_conf.intr_conf.lsc)\n+\t\treturn;\n+\tassert(priv->ctx->async_fd > 0);\n+\tflags = fcntl(priv->ctx->async_fd, F_GETFL);\n+\trc = fcntl(priv->ctx->async_fd, F_SETFL, flags | O_NONBLOCK);\n+\tif (rc < 0) {\n+\t\tINFO(\"failed to change file descriptor async event queue\");\n+\t\tdev->data->dev_conf.intr_conf.lsc = 0;\n+\t} else {\n+\t\tpriv->intr_handle.fd = priv->ctx->async_fd;\n+\t\tpriv->intr_handle.type = RTE_INTR_HANDLE_EXT;\n+\t\trte_intr_callback_register(&priv->intr_handle,\n+\t\t\t\t\t mlx5_dev_interrupt_handler,\n+\t\t\t\t\t dev);\n+\t}\n+}\ndiff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c\nindex 68e00a0..ff1203d 100644\n--- a/drivers/net/mlx5/mlx5_trigger.c\n+++ b/drivers/net/mlx5/mlx5_trigger.c\n@@ -37,6 +37,8 @@\n #endif\n #include <rte_ether.h>\n #include <rte_ethdev.h>\n+#include <rte_interrupts.h>\n+#include <rte_alarm.h>\n #ifdef PEDANTIC\n #pragma GCC diagnostic error \"-pedantic\"\n #endif\n@@ -87,6 +89,7 @@ mlx5_dev_start(struct rte_eth_dev *dev)\n \t\tpriv_mac_addrs_disable(priv);\n \t\tpriv_destroy_hash_rxqs(priv);\n \t}\n+\tpriv_dev_interrupt_handler_install(priv, dev);\n \tpriv_unlock(priv);\n \treturn -err;\n }\n@@ -114,6 +117,7 @@ mlx5_dev_stop(struct rte_eth_dev *dev)\n \tpriv_promiscuous_disable(priv);\n \tpriv_mac_addrs_disable(priv);\n \tpriv_destroy_hash_rxqs(priv);\n+\tpriv_dev_interrupt_handler_uninstall(priv, dev);\n \tpriv->started = 0;\n \tpriv_unlock(priv);\n }\n", "prefixes": [ "dpdk-dev", "v2", "3/3" ] }