Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2386/?format=api
{ "id": 2386, "url": "https://patches.dpdk.org/api/patches/2386/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1421672551-11652-4-git-send-email-pawelx.wodkowski@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": "<1421672551-11652-4-git-send-email-pawelx.wodkowski@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1421672551-11652-4-git-send-email-pawelx.wodkowski@intel.com", "date": "2015-01-19T13:02:30", "name": "[dpdk-dev,v2,3/4] pmd: add support for DCB in SRIOV mode for ixgbe driver.", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1e744af0e1d1bea84525b8346e0b936fef4d90e7", "submitter": { "id": 58, "url": "https://patches.dpdk.org/api/people/58/?format=api", "name": "Wodkowski, PawelX", "email": "pawelx.wodkowski@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1421672551-11652-4-git-send-email-pawelx.wodkowski@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/2386/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/2386/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 4C0D85A82;\n\tMon, 19 Jan 2015 14:24:59 +0100 (CET)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby dpdk.org (Postfix) with ESMTP id 21EC05A80\n\tfor <dev@dpdk.org>; Mon, 19 Jan 2015 14:24:55 +0100 (CET)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga102.fm.intel.com with ESMTP; 19 Jan 2015 05:24:54 -0800", "from unknown (HELO Sent) ([10.217.248.233])\n\tby orsmga001.jf.intel.com with SMTP; 19 Jan 2015 05:24:53 -0800", "by Sent (sSMTP sendmail emulation); Mon, 19 Jan 2015 14:21:06 +0100" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.09,427,1418112000\"; d=\"scan'208\";a=\"639317045\"", "From": "Pawel Wodkowski <pawelx.wodkowski@intel.com>", "To": "dev@dpdk.org", "Date": "Mon, 19 Jan 2015 14:02:30 +0100", "Message-Id": "<1421672551-11652-4-git-send-email-pawelx.wodkowski@intel.com>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<1421672551-11652-1-git-send-email-pawelx.wodkowski@intel.com>", "References": "<1421077843-8492-1-git-send-email-michalx.k.jastrzebski@intel.com>\n\t<1421672551-11652-1-git-send-email-pawelx.wodkowski@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 3/4] pmd: add support for DCB in SRIOV mode\n\tfor ixgbe driver.", "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": "Add support for DCB in SRIOV mode. When no PFC is enabled this feature\nmight be used as multiple queues for VF (up to 8 queues if VFs num is\nless or equal 16 or 4 if FVs num is less or equal 32).\n\nThe PF must initializes RX in ETH_MQ_RX_VMDQ_DCB and TX in\nETH_MQ_TX_VMDQ_DCB.\nVF should initialize Rx in ETH_MQ_RX_DCB and Tx in ETH_MQ_TX_DCB to use\nmultiple queues and/or DCB.\n\nSigned-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>\n---\n lib/librte_ether/rte_ethdev.c | 32 ++++++++++++++++------------\n lib/librte_ether/rte_ethdev.h | 2 +-\n lib/librte_pmd_ixgbe/ixgbe_pf.c | 42 +++++++++++++++++++++++++++----------\n lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 7 +++----\n 4 files changed, 54 insertions(+), 29 deletions(-)", "diff": "diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex 85385f8..115465e 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -532,6 +532,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \t\t const struct rte_eth_conf *dev_conf)\n {\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n+\tstruct rte_eth_dev_info dev_info;\n \n \tif (RTE_ETH_DEV_SRIOV(dev).active != 0) {\n \t\t/* check multi-queue mode */\n@@ -553,8 +554,9 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \n \t\tswitch (dev_conf->rxmode.mq_mode) {\n \t\tcase ETH_MQ_RX_VMDQ_DCB:\n+\t\t\tbreak;\n \t\tcase ETH_MQ_RX_VMDQ_DCB_RSS:\n-\t\t\t/* DCB/RSS VMDQ in SRIOV mode, not implement yet */\n+\t\t\t/* DCB+RSS VMDQ in SRIOV mode, not implement yet */\n \t\t\tPMD_DEBUG_TRACE(\"ethdev port_id=%\" PRIu8\n \t\t\t\t\t\" SRIOV active, \"\n \t\t\t\t\t\"unsupported VMDQ mq_mode rx %u\\n\",\n@@ -589,13 +591,8 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \t\t}\n \n \t\tswitch (dev_conf->txmode.mq_mode) {\n-\t\tcase ETH_MQ_TX_VMDQ_DCB:\n-\t\t\t/* DCB VMDQ in SRIOV mode, not implement yet */\n-\t\t\tPMD_DEBUG_TRACE(\"ethdev port_id=%\" PRIu8\n-\t\t\t\t\t\" SRIOV active, \"\n-\t\t\t\t\t\"unsupported VMDQ mq_mode tx %u\\n\",\n-\t\t\t\t\tport_id, dev_conf->txmode.mq_mode);\n-\t\t\treturn (-EINVAL);\n+\t\tcase ETH_MQ_TX_VMDQ_DCB: /* DCB VMDQ in SRIOV mode*/\n+\t\t\tbreak;\n \t\tdefault: /* ETH_MQ_TX_VMDQ_ONLY or ETH_MQ_TX_NONE */\n \t\t\t/* if nothing mq mode configure, use default scheme */\n \t\t\tdev->data->dev_conf.txmode.mq_mode = ETH_MQ_TX_VMDQ_ONLY;\n@@ -612,7 +609,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \t\t\treturn (-EINVAL);\n \t\t}\n \t} else {\n-\t\t/* For vmdb+dcb mode check our configuration before we go further */\n+\t\t/* For vmdq+dcb mode check our configuration before we go further */\n \t\tif (dev_conf->rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) {\n \t\t\tconst struct rte_eth_vmdq_dcb_conf *conf;\n \n@@ -651,11 +648,20 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \t\t\t}\n \t\t}\n \n-\t\t/* For DCB mode check our configuration before we go further */\n+\t\t/* For DCB we need to obtain maximum number of queues dinamically,\n+\t\t * as this depends on max VF exported in PF */\n+\t\tif ((dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) ||\n+\t\t\t(dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB)) {\n+\n+\t\t\t\tFUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);\n+\t\t\t\t(*dev->dev_ops->dev_infos_get)(dev, &dev_info);\n+\t\t}\n+\n+\t\t/* For DCB mode check out configuration before we go further */\n \t\tif (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) {\n \t\t\tconst struct rte_eth_dcb_rx_conf *conf;\n \n-\t\t\tif (nb_rx_q != ETH_DCB_NUM_QUEUES) {\n+\t\t\tif (nb_rx_q != dev_info.max_rx_queues) {\n \t\t\t\tPMD_DEBUG_TRACE(\"ethdev port_id=%d DCB, nb_rx_q \"\n \t\t\t\t\t\t\"!= %d\\n\",\n \t\t\t\t\t\tport_id, ETH_DCB_NUM_QUEUES);\n@@ -675,7 +681,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \t\tif (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB) {\n \t\t\tconst struct rte_eth_dcb_tx_conf *conf;\n \n-\t\t\tif (nb_tx_q != ETH_DCB_NUM_QUEUES) {\n+\t\t\tif (nb_tx_q != dev_info.max_tx_queues) {\n \t\t\t\tPMD_DEBUG_TRACE(\"ethdev port_id=%d DCB, nb_tx_q \"\n \t\t\t\t\t\t\"!= %d\\n\",\n \t\t\t\t\t\tport_id, ETH_DCB_NUM_QUEUES);\n@@ -802,7 +808,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \t\t\t\t\t\t\tETHER_MAX_LEN;\n \t}\n \n-\t/* multipe queue mode checking */\n+\t/* multiple queue mode checking */\n \tdiag = rte_eth_dev_check_mq_mode(port_id, nb_rx_q, nb_tx_q, dev_conf);\n \tif (diag != 0) {\n \t\tPMD_DEBUG_TRACE(\"port%d rte_eth_dev_check_mq_mode = %d\\n\",\ndiff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h\nindex ce0528f..6df3f29 100644\n--- a/lib/librte_ether/rte_ethdev.h\n+++ b/lib/librte_ether/rte_ethdev.h\n@@ -299,7 +299,7 @@ enum rte_eth_rx_mq_mode {\n enum rte_eth_tx_mq_mode {\n \tETH_MQ_TX_NONE = 0, /**< It is in neither DCB nor VT mode. */\n \tETH_MQ_TX_DCB, /**< For TX side,only DCB is on. */\n-\tETH_MQ_TX_VMDQ_DCB,\t/**< For TX side,both DCB and VT is on. */\n+\tETH_MQ_TX_VMDQ_DCB, /**< For TX side,both DCB and VT is on. */\n \tETH_MQ_TX_VMDQ_ONLY, /**< Only VT on, no DCB */\n };\n \ndiff --git a/lib/librte_pmd_ixgbe/ixgbe_pf.c b/lib/librte_pmd_ixgbe/ixgbe_pf.c\nindex 93f6e43..b5f570d 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_pf.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe_pf.c\n@@ -231,19 +231,19 @@ int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)\n \t}\n \n \tIXGBE_WRITE_REG(hw, IXGBE_GCR_EXT, gcr_ext);\n- IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);\n+\tIXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);\n \n- /*\n+\t/*\n \t * enable vlan filtering and allow all vlan tags through\n \t */\n- vlanctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);\n- vlanctrl |= IXGBE_VLNCTRL_VFE ; /* enable vlan filters */\n- IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlanctrl);\n+\tvlanctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);\n+\tvlanctrl |= IXGBE_VLNCTRL_VFE ; /* enable vlan filters */\n+\tIXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlanctrl);\n \n- /* VFTA - enable all vlan filters */\n- for (i = 0; i < IXGBE_MAX_VFTA; i++) {\n- IXGBE_WRITE_REG(hw, IXGBE_VFTA(i), 0xFFFFFFFF);\n- }\n+\t/* VFTA - enable all vlan filters */\n+\tfor (i = 0; i < IXGBE_MAX_VFTA; i++) {\n+\t\tIXGBE_WRITE_REG(hw, IXGBE_VFTA(i), 0xFFFFFFFF);\n+\t}\n \n \t/* Enable MAC Anti-Spoofing */\n \thw->mac.ops.set_mac_anti_spoofing(hw, FALSE, vf_num);\n@@ -513,6 +513,7 @@ ixgbe_get_vf_queues(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)\n \tstruct ixgbe_vf_info *vfinfo =\n \t\t*IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);\n \tuint32_t default_q = vf * RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool;\n+\tuint8_t pools;\n \n \t/* Verify if the PF supports the mbox APIs version or not */\n \tswitch (vfinfo[vf].api_version) {\n@@ -524,8 +525,27 @@ ixgbe_get_vf_queues(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)\n \t}\n \n \t/* Notify VF of Rx and Tx queue number */\n-\tmsgbuf[IXGBE_VF_RX_QUEUES] = RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool;\n-\tmsgbuf[IXGBE_VF_TX_QUEUES] = RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool;\n+\tif (dev->data->dev_conf.rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) {\n+\t\tpools = dev->data->dev_conf.rx_adv_conf.vmdq_dcb_conf.nb_queue_pools;\n+\t\tif (pools <= 16)\n+\t\t\tmsgbuf[IXGBE_VF_RX_QUEUES] = 8;\n+\t\telse if (pools <= 32)\n+\t\t\tmsgbuf[IXGBE_VF_RX_QUEUES] = 4;\n+\t\telse\n+\t\t\tmsgbuf[IXGBE_VF_RX_QUEUES] = 1;\n+\t} else\n+\t\tmsgbuf[IXGBE_VF_RX_QUEUES] = RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool;\n+\n+\tif (dev->data->dev_conf.txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB) {\n+\t\tpools = dev->data->dev_conf.tx_adv_conf.vmdq_dcb_tx_conf.nb_queue_pools;\n+\t\tif (pools <= 16)\n+\t\t\tmsgbuf[IXGBE_VF_TX_QUEUES] = 8;\n+\t\telse if (pools <= 32)\n+\t\t\tmsgbuf[IXGBE_VF_TX_QUEUES] = 4;\n+\t\telse\n+\t\t\tmsgbuf[IXGBE_VF_TX_QUEUES] = 1;\n+\t} else\n+\t\tmsgbuf[IXGBE_VF_TX_QUEUES] = RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool;\n \n \t/* Notify VF of default queue */\n \tmsgbuf[IXGBE_VF_DEF_QUEUE] = default_q;\ndiff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\nindex 840bc07..eaed280 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n@@ -3166,10 +3166,9 @@ void ixgbe_configure_dcb(struct rte_eth_dev *dev)\n \n \t/* check support mq_mode for DCB */\n \tif ((dev_conf->rxmode.mq_mode != ETH_MQ_RX_VMDQ_DCB) &&\n-\t (dev_conf->rxmode.mq_mode != ETH_MQ_RX_DCB))\n-\t\treturn;\n-\n-\tif (dev->data->nb_rx_queues != ETH_DCB_NUM_QUEUES)\n+\t (dev_conf->rxmode.mq_mode != ETH_MQ_RX_DCB) &&\n+\t (dev_conf->txmode.mq_mode != ETH_MQ_TX_VMDQ_DCB) &&\n+\t (dev_conf->txmode.mq_mode != ETH_MQ_TX_DCB))\n \t\treturn;\n \n \t/** Configure DCB hardware **/\n", "prefixes": [ "dpdk-dev", "v2", "3/4" ] }