Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 7458,
    "url": "https://patches.dpdk.org/api/patches/7458/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1444067795-29748-3-git-send-email-adrien.mazarguil@6wind.com/",
    "project": {
        "id": 1,
        "url": "https://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": "<1444067795-29748-3-git-send-email-adrien.mazarguil@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1444067795-29748-3-git-send-email-adrien.mazarguil@6wind.com",
    "date": "2015-10-05T17:56:34",
    "name": "[dpdk-dev,2/3] mlx4: handle interrupts",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "72d21839a758dcb2c54fadefe594bddf5cef9172",
    "submitter": {
        "id": 165,
        "url": "https://patches.dpdk.org/api/people/165/?format=api",
        "name": "Adrien Mazarguil",
        "email": "adrien.mazarguil@6wind.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1444067795-29748-3-git-send-email-adrien.mazarguil@6wind.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/7458/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/7458/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 F140A9378;\n\tMon,  5 Oct 2015 19:56:58 +0200 (CEST)",
            "from mail-wi0-f175.google.com (mail-wi0-f175.google.com\n\t[209.85.212.175]) by dpdk.org (Postfix) with ESMTP id 692E991E7\n\tfor <dev@dpdk.org>; Mon,  5 Oct 2015 19:56:57 +0200 (CEST)",
            "by wicfx3 with SMTP id fx3so131890917wic.1\n\tfor <dev@dpdk.org>; Mon, 05 Oct 2015 10:56:57 -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\th7sm28096994wjz.7.2015.10.05.10.56.56\n\t(version=TLSv1.2 cipher=RC4-SHA bits=128/128);\n\tMon, 05 Oct 2015 10:56:56 -0700 (PDT)"
        ],
        "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=8nFlgAOHDRm99yRm+uodw3oU6aGhT2tKOeDUsaN77jE=;\n\tb=Ci6IPjgrKK/GzEidhiv5XFPX5IAKScujhPP7cH+suLweFWolRZaBK/rvZOJhI6+Hl7\n\tdVcHTxpgpGt2cl6A49Wo/lMGNQWLgkgYBTqMrggFrxyfdlTp8zak/b7PUTvRYyhoerV0\n\t6lyHnzoZiIuG+hJDAtSnBoVlz70xYFFkOwGqY19sFiXF7GFvLSpjC8W401FkSHqYN9yz\n\tIr0d1LRkL2xRlIbqRYxRySlCnTj4tJnMa7cJESm66oGSB/rtD8fPsqiizSiHvPjI8UIB\n\tCEJRQnZD/k5D89+uYj5TYsPixIQktjGgMHIJv6jOhka6eVJFdcIlPbvkZOMYQaDScPN+\n\t3Yyw==",
        "X-Gm-Message-State": "ALoCoQkxCyOq+1J8DmlTkdH1McTGqj42MM+p90+tJ5tW/W5WpI9aBDSbN974xIDGYcUs9SjO90Ji",
        "X-Received": "by 10.180.101.138 with SMTP id fg10mr13655600wib.1.1444067817198;\n\tMon, 05 Oct 2015 10:56:57 -0700 (PDT)",
        "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>",
        "To": "dev@dpdk.org",
        "Date": "Mon,  5 Oct 2015 19:56:34 +0200",
        "Message-Id": "<1444067795-29748-3-git-send-email-adrien.mazarguil@6wind.com>",
        "X-Mailer": "git-send-email 2.1.0",
        "In-Reply-To": "<1444067795-29748-1-git-send-email-adrien.mazarguil@6wind.com>",
        "References": "<1444067795-29748-1-git-send-email-adrien.mazarguil@6wind.com>",
        "Subject": "[dpdk-dev] [PATCH 2/3] mlx4: 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>\n---\n drivers/net/mlx4/mlx4.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++\n drivers/net/mlx4/mlx4.h |   3 +\n 2 files changed, 169 insertions(+)",
    "diff": "diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c\nindex af31573..cb08ee8 100644\n--- a/drivers/net/mlx4/mlx4.c\n+++ b/drivers/net/mlx4/mlx4.c\n@@ -57,6 +57,7 @@\n #include <linux/if.h>\n #include <linux/ethtool.h>\n #include <linux/sockios.h>\n+#include <fcntl.h>\n \n /* Verbs header. */\n /* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n@@ -85,6 +86,7 @@\n #include <rte_atomic.h>\n #include <rte_version.h>\n #include <rte_log.h>\n+#include <rte_alarm.h>\n #ifdef PEDANTIC\n #pragma GCC diagnostic error \"-pedantic\"\n #endif\n@@ -282,6 +284,7 @@ struct priv {\n \tunsigned int hw_csum_l2tun:1; /* Same for L2 tunnels. */\n \tunsigned int rss:1; /* RSS is enabled. */\n \tunsigned int vf:1; /* This is a VF device. */\n+\tunsigned int pending_alarm:1; /* An alarm is pending. */\n #ifdef INLINE_RECV\n \tunsigned int inl_recv_size; /* Inline recv size */\n #endif\n@@ -292,6 +295,7 @@ struct priv {\n \tunsigned int txqs_n; /* TX queues array size. */\n \tstruct rxq *(*rxqs)[]; /* RX queues. */\n \tstruct txq *(*txqs)[]; /* TX queues. */\n+\tstruct rte_intr_handle intr_handle; /* Interrupt handler. */\n \trte_spinlock_t lock; /* Lock for control functions. */\n };\n \n@@ -3585,6 +3589,9 @@ mlx4_rx_queue_release(void *dpdk_rxq)\n \tpriv_unlock(priv);\n }\n \n+static void\n+priv_dev_interrupt_handler_install(struct priv *, struct rte_eth_dev *);\n+\n /**\n  * DPDK callback to start the device.\n  *\n@@ -3646,6 +3653,7 @@ mlx4_dev_start(struct rte_eth_dev *dev)\n \t\tpriv->started = 0;\n \t\treturn -ret;\n \t} while ((--r) && ((rxq = (*priv->rxqs)[++i]), i));\n+\tpriv_dev_interrupt_handler_install(priv, dev);\n \tpriv_unlock(priv);\n \treturn 0;\n }\n@@ -3742,6 +3750,9 @@ removed_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \treturn 0;\n }\n \n+static void\n+priv_dev_interrupt_handler_uninstall(struct priv *, struct rte_eth_dev *);\n+\n /**\n  * DPDK callback to close the device.\n  *\n@@ -3802,6 +3813,7 @@ mlx4_dev_close(struct rte_eth_dev *dev)\n \t\tclaim_zero(ibv_close_device(priv->ctx));\n \t} else\n \t\tassert(priv->ctx == NULL);\n+\tpriv_dev_interrupt_handler_uninstall(priv, dev);\n \tpriv_unlock(priv);\n \tmemset(priv, 0, sizeof(*priv));\n }\n@@ -4693,6 +4705,158 @@ mlx4_getenv_int(const char *name)\n \treturn atoi(val);\n }\n \n+static void\n+mlx4_dev_link_status_handler(void *);\n+static void\n+mlx4_dev_interrupt_handler(struct rte_intr_handle *, void *);\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\tmlx4_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(MLX4_ALARM_TIMEOUT_US,\n+\t\t\t\t\t  mlx4_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+static void\n+mlx4_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+static void\n+mlx4_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+static 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     mlx4_dev_interrupt_handler,\n+\t\t\t\t     dev);\n+\tif (priv->pending_alarm)\n+\t\trte_eal_alarm_cancel(mlx4_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+static 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   mlx4_dev_interrupt_handler,\n+\t\t\t\t\t   dev);\n+\t}\n+}\n+\n static struct eth_driver mlx4_driver;\n \n /**\n@@ -4979,6 +5143,7 @@ mlx4_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 = &mlx4_dev_ops;\n \t\teth_dev->data->mac_addrs = priv->mac;\n+\t\tTAILQ_INIT(&eth_dev->link_intr_cbs);\n \n \t\t/* Bring Ethernet device up. */\n \t\tDEBUG(\"forcing Ethernet interface up\");\n@@ -5045,6 +5210,7 @@ static struct eth_driver mlx4_driver = {\n \t\t.name = MLX4_DRIVER_NAME,\n \t\t.id_table = mlx4_pci_id_map,\n \t\t.devinit = mlx4_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/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h\nindex 151c34b..d0c7bc2 100644\n--- a/drivers/net/mlx4/mlx4.h\n+++ b/drivers/net/mlx4/mlx4.h\n@@ -83,6 +83,9 @@\n #define MLX4_PMD_SOFT_COUNTERS 1\n #endif\n \n+/* Alarm timeout. */\n+#define MLX4_ALARM_TIMEOUT_US 100000\n+\n enum {\n \tPCI_VENDOR_ID_MELLANOX = 0x15b3,\n };\n",
    "prefixes": [
        "dpdk-dev",
        "2/3"
    ]
}