Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8653/?format=api
{ "id": 8653, "url": "https://patches.dpdk.org/api/patches/8653/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1446626740-28824-9-git-send-email-cunming.liang@intel.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": "<1446626740-28824-9-git-send-email-cunming.liang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1446626740-28824-9-git-send-email-cunming.liang@intel.com", "date": "2015-11-04T08:45:35", "name": "[dpdk-dev,v4,08/13] ixgbe: fix rx intr compatible issue with PF mbox", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c46d11767d427beaa578e54f52b917483b112ce4", "submitter": { "id": 46, "url": "https://patches.dpdk.org/api/people/46/?format=api", "name": "Cunming Liang", "email": "cunming.liang@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1446626740-28824-9-git-send-email-cunming.liang@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/8653/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/8653/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 A1F9291FC;\n\tWed, 4 Nov 2015 09:46:10 +0100 (CET)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id C9E658F9C\n\tfor <dev@dpdk.org>; Wed, 4 Nov 2015 09:46:08 +0100 (CET)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga101.fm.intel.com with ESMTP; 04 Nov 2015 00:46:07 -0800", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby FMSMGA003.fm.intel.com with ESMTP; 04 Nov 2015 00:46:08 -0800", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id tA48k4dw005483;\n\tWed, 4 Nov 2015 16:46:04 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid tA48k0u5028931; Wed, 4 Nov 2015 16:46:02 +0800", "(from cliang18@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id tA48k0MO028927; \n\tWed, 4 Nov 2015 16:46:00 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,242,1444719600\"; d=\"scan'208\";a=\"593752436\"", "From": "Cunming Liang <cunming.liang@intel.com>", "To": "dev@dpdk.org", "Date": "Wed, 4 Nov 2015 16:45:35 +0800", "Message-Id": "<1446626740-28824-9-git-send-email-cunming.liang@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1446626740-28824-1-git-send-email-cunming.liang@intel.com>", "References": "<1446617263-7448-1-git-send-email-cunming.liang@intel.com>\n\t<1446626740-28824-1-git-send-email-cunming.liang@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 08/13] ixgbe: fix rx intr compatible issue\n\twith PF mbox", "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": "When ixgbe runs as a PF, mbox interrupt is prerequisite to make VF start normally.\nAnd PF sometimes won't 'dev_start', so the mbox interrupt register during 'dev_init' is required.\nThe patch rolls back the interrupt register for mbox,lsc to the 'dev_init'.\nAs UIO doesn't support multiple vector, mbox has to occupy the only one.\nIt adds condition check on 'dev_start', rxq interrupt is not allowed when PF running in IOV mode via UIO.\n\nv4 change:\n - remove redundancy condition check\n\nv3 change:\n - add doc update follow on the code change\n\nSigned-off-by: Cunming Liang <cunming.liang@intel.com>\n---\n doc/guides/rel_notes/release_2_2.rst | 2 ++\n drivers/net/ixgbe/ixgbe_ethdev.c | 38 +++++++++++++++++++++++++-----------\n 2 files changed, 29 insertions(+), 11 deletions(-)", "diff": "diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst\nindex ca8471b..b082fb6 100644\n--- a/doc/guides/rel_notes/release_2_2.rst\n+++ b/doc/guides/rel_notes/release_2_2.rst\n@@ -152,6 +152,8 @@ Drivers\n hardware transactional memory support, thread scaling did not work,\n due to the global ring that is shared by all cores.\n \n+* **ixgbe: Fixed PF rx interrupt compatible issue with mbox.**\n+\n Libraries\n ~~~~~~~~~\n \ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex f1a738c..c322168 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -1126,6 +1126,13 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev)\n \t\t\teth_dev->data->port_id, pci_dev->id.vendor_id,\n \t\t\tpci_dev->id.device_id);\n \n+\trte_intr_callback_register(&pci_dev->intr_handle,\n+\t\t\t\t ixgbe_dev_interrupt_handler,\n+\t\t\t\t (void *)eth_dev);\n+\n+\t/* enable uio/vfio intr/eventfd mapping */\n+\trte_intr_enable(&pci_dev->intr_handle);\n+\n \t/* enable support intr */\n \tixgbe_enable_intr(eth_dev);\n \n@@ -1975,7 +1982,9 @@ ixgbe_dev_start(struct rte_eth_dev *dev)\n \tixgbe_pf_host_configure(dev);\n \n \t/* check and configure queue intr-vector mapping */\n-\tif (dev->data->dev_conf.intr_conf.rxq != 0) {\n+\tif ((rte_intr_cap_multiple(intr_handle) ||\n+\t !RTE_ETH_DEV_SRIOV(dev).active) &&\n+\t dev->data->dev_conf.intr_conf.rxq != 0) {\n \t\tintr_vector = dev->data->nb_rx_queues;\n \t\tif (rte_intr_efd_enable(intr_handle, intr_vector))\n \t\t\treturn -1;\n@@ -1984,8 +1993,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)\n \tif (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) {\n \t\tintr_handle->intr_vec =\n \t\t\trte_zmalloc(\"intr_vec\",\n-\t\t\t\t dev->data->nb_rx_queues * sizeof(int),\n-\t\t\t\t 0);\n+\t\t\t\t dev->data->nb_rx_queues * sizeof(int), 0);\n \t\tif (intr_handle->intr_vec == NULL) {\n \t\t\tPMD_INIT_LOG(ERR, \"Failed to allocate %d rx_queues\"\n \t\t\t\t \" intr_vec\\n\", dev->data->nb_rx_queues);\n@@ -2072,20 +2080,22 @@ ixgbe_dev_start(struct rte_eth_dev *dev)\n \n skip_link_setup:\n \n-\t/* check if lsc interrupt is enabled */\n-\tif (dev->data->dev_conf.intr_conf.lsc != 0) {\n-\t\tif (rte_intr_allow_others(intr_handle)) {\n-\t\t\trte_intr_callback_register(intr_handle,\n-\t\t\t\t\t\t ixgbe_dev_interrupt_handler,\n-\t\t\t\t\t\t (void *)dev);\n+\tif (rte_intr_allow_others(intr_handle)) {\n+\t\t/* check if lsc interrupt is enabled */\n+\t\tif (dev->data->dev_conf.intr_conf.lsc != 0)\n \t\t\tixgbe_dev_lsc_interrupt_setup(dev);\n-\t\t} else\n+\t} else {\n+\t\trte_intr_callback_unregister(intr_handle,\n+\t\t\t\t\t ixgbe_dev_interrupt_handler,\n+\t\t\t\t\t (void *)dev);\n+\t\tif (dev->data->dev_conf.intr_conf.lsc != 0)\n \t\t\tPMD_INIT_LOG(INFO, \"lsc won't enable because of\"\n \t\t\t\t \" no intr multiplex\\n\");\n \t}\n \n \t/* check if rxq interrupt is enabled */\n-\tif (dev->data->dev_conf.intr_conf.rxq != 0)\n+\tif (dev->data->dev_conf.intr_conf.rxq != 0 &&\n+\t rte_intr_dp_is_en(intr_handle))\n \t\tixgbe_dev_rxq_interrupt_setup(dev);\n \n \t/* enable uio/vfio intr/eventfd mapping */\n@@ -2197,6 +2207,12 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)\n \tmemset(filter_info->fivetuple_mask, 0,\n \t\tsizeof(uint32_t) * IXGBE_5TUPLE_ARRAY_SIZE);\n \n+\tif (!rte_intr_allow_others(intr_handle))\n+\t\t/* resume to the default handler */\n+\t\trte_intr_callback_register(intr_handle,\n+\t\t\t\t\t ixgbe_dev_interrupt_handler,\n+\t\t\t\t\t (void *)dev);\n+\n \t/* Clean datapath event and queue/vec mapping */\n \trte_intr_efd_disable(intr_handle);\n \tif (intr_handle->intr_vec != NULL) {\n", "prefixes": [ "dpdk-dev", "v4", "08/13" ] }