Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2236/?format=api
{ "id": 2236, "url": "https://patches.dpdk.org/api/patches/2236/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1421077843-8492-3-git-send-email-michalx.k.jastrzebski@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": "<1421077843-8492-3-git-send-email-michalx.k.jastrzebski@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1421077843-8492-3-git-send-email-michalx.k.jastrzebski@intel.com", "date": "2015-01-12T15:50:43", "name": "[dpdk-dev,2/2] testpmd: fix dcb in vt mode", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "be5bbbd69b6d385d2eccf475206a3041a2d1830e", "submitter": { "id": 74, "url": "https://patches.dpdk.org/api/people/74/?format=api", "name": "Michal Jastrzebski", "email": "michalx.k.jastrzebski@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1421077843-8492-3-git-send-email-michalx.k.jastrzebski@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/2236/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/2236/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 24F955AC3;\n\tMon, 12 Jan 2015 16:53:37 +0100 (CET)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 471F65AC0\n\tfor <dev@dpdk.org>; Mon, 12 Jan 2015 16:53:32 +0100 (CET)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga101.jf.intel.com with ESMTP; 12 Jan 2015 07:53:18 -0800", "from unknown (HELO Sent) ([10.217.248.81])\n\tby orsmga002.jf.intel.com with SMTP; 12 Jan 2015 07:53:16 -0800", "by Sent (sSMTP sendmail emulation); Mon, 12 Jan 2015 16:52:34 +0200" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.07,744,1413270000\"; d=\"scan'208\";a=\"668498600\"", "From": "Michal Jastrzebski <michalx.k.jastrzebski@intel.com>", "To": "dev@dpdk.org", "Date": "Mon, 12 Jan 2015 16:50:43 +0100", "Message-Id": "<1421077843-8492-3-git-send-email-michalx.k.jastrzebski@intel.com>", "X-Mailer": "git-send-email 2.1.1", "In-Reply-To": "<1421077843-8492-1-git-send-email-michalx.k.jastrzebski@intel.com>", "References": "<1421077843-8492-1-git-send-email-michalx.k.jastrzebski@intel.com>", "Subject": "[dpdk-dev] [PATCH 2/2] testpmd: fix dcb in vt mode", "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: Pawel Wodkowski <pawelx.wodkowski@intel.com>\n\nThis patch incorporate fixes to support DCB in SRIOV mode for testpmd.\nIt also clean up some old code that is not needed or wrong.\n\nSigned-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>\n---\n app/test-pmd/cmdline.c | 4 ++--\n app/test-pmd/testpmd.c | 39 +++++++++++++++++++++++++++++----------\n app/test-pmd/testpmd.h | 10 ----------\n 3 files changed, 31 insertions(+), 22 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 882a5a2..3c60087 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -1947,9 +1947,9 @@ cmd_config_dcb_parsed(void *parsed_result,\n \n \t/* DCB in VT mode */\n \tif (!strncmp(res->vt_en, \"on\",2))\n-\t\tdcb_conf.dcb_mode = DCB_VT_ENABLED;\n+\t\tdcb_conf.vt_en = 1;\n \telse\n-\t\tdcb_conf.dcb_mode = DCB_ENABLED;\n+\t\tdcb_conf.vt_en = 0;\n \n \tif (!strncmp(res->pfc_en, \"on\",2)) {\n \t\tdcb_conf.pfc_en = 1;\ndiff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c\nindex 8c69756..6677a5e 100644\n--- a/app/test-pmd/testpmd.c\n+++ b/app/test-pmd/testpmd.c\n@@ -1733,7 +1733,8 @@ const uint16_t vlan_tags[] = {\n };\n \n static int\n-get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)\n+get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf,\n+\tuint16_t sriov)\n {\n uint8_t i;\n \n@@ -1741,7 +1742,7 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)\n \t * Builds up the correct configuration for dcb+vt based on the vlan tags array\n \t * given above, and the number of traffic classes available for use.\n \t */\n-\tif (dcb_conf->dcb_mode == DCB_VT_ENABLED) {\n+\tif (dcb_conf->vt_en == 1) {\n \t\tstruct rte_eth_vmdq_dcb_conf vmdq_rx_conf;\n \t\tstruct rte_eth_vmdq_dcb_tx_conf vmdq_tx_conf;\n \n@@ -1758,9 +1759,17 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf, struct dcb_config *dcb_conf)\n \t\t\tvmdq_rx_conf.pool_map[i].vlan_id = vlan_tags[ i ];\n \t\t\tvmdq_rx_conf.pool_map[i].pools = 1 << (i % vmdq_rx_conf.nb_queue_pools);\n \t\t}\n-\t\tfor (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {\n-\t\t\tvmdq_rx_conf.dcb_queue[i] = i;\n-\t\t\tvmdq_tx_conf.dcb_queue[i] = i;\n+\n+\t\tif (sriov == 0) {\n+\t\t\tfor (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {\n+\t\t\t\tvmdq_rx_conf.dcb_queue[i] = i;\n+\t\t\t\tvmdq_tx_conf.dcb_queue[i] = i;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tfor (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {\n+\t\t\t\tvmdq_rx_conf.dcb_queue[i] = i % dcb_conf->num_tcs;\n+\t\t\t\tvmdq_tx_conf.dcb_queue[i] = i % dcb_conf->num_tcs;\n+\t\t\t}\n \t\t}\n \n \t\t/*set DCB mode of RX and TX of multiple queues*/\n@@ -1818,22 +1827,32 @@ init_port_dcb_config(portid_t pid,struct dcb_config *dcb_conf)\n \tuint16_t nb_vlan;\n \tuint16_t i;\n \n-\t/* rxq and txq configuration in dcb mode */\n-\tnb_rxq = 128;\n-\tnb_txq = 128;\n \trx_free_thresh = 64;\n \n+\trte_port = &ports[pid];\n \tmemset(&port_conf,0,sizeof(struct rte_eth_conf));\n \t/* Enter DCB configuration status */\n \tdcb_config = 1;\n \n \tnb_vlan = sizeof( vlan_tags )/sizeof( vlan_tags[ 0 ]);\n \t/*set configuration of DCB in vt mode and DCB in non-vt mode*/\n-\tretval = get_eth_dcb_conf(&port_conf, dcb_conf);\n+\tretval = get_eth_dcb_conf(&port_conf, dcb_conf, rte_port->dev_info.max_vfs);\n+\n+\t/* rxq and txq configuration in dcb mode */\n+\tnb_rxq = rte_port->dev_info.max_rx_queues;\n+\tnb_txq = rte_port->dev_info.max_tx_queues;\n+\n+\tif (rte_port->dev_info.max_vfs) {\n+\t\tif (port_conf.rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB)\n+\t\t\tnb_rxq /= port_conf.rx_adv_conf.vmdq_dcb_conf.nb_queue_pools;\n+\n+\t\tif (port_conf.txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB)\n+\t\t\tnb_txq /= port_conf.tx_adv_conf.vmdq_dcb_tx_conf.nb_queue_pools;\n+\t}\n+\n \tif (retval < 0)\n \t\treturn retval;\n \n-\trte_port = &ports[pid];\n \tmemcpy(&rte_port->dev_conf, &port_conf,sizeof(struct rte_eth_conf));\n \n \trte_port->rx_conf.rx_thresh = rx_thresh;\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex f8b0740..8976acc 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -227,20 +227,10 @@ struct fwd_config {\n \tportid_t nb_fwd_ports; /**< Nb. of ports involved. */\n };\n \n-/**\n- * DCB mode enable\n- */\n-enum dcb_mode_enable\n-{\n-\tDCB_VT_ENABLED,\n-\tDCB_ENABLED\n-};\n-\n /*\n * DCB general config info\n */\n struct dcb_config {\n-\tenum dcb_mode_enable dcb_mode;\n \tuint8_t vt_en;\n \tenum rte_eth_nb_tcs num_tcs;\n \tuint8_t pfc_en;\n", "prefixes": [ "dpdk-dev", "2/2" ] }