Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/122151/?format=api
{ "id": 122151, "url": "http://patches.dpdk.org/api/patches/122151/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230117072626.93796-12-beilei.xing@intel.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": "<20230117072626.93796-12-beilei.xing@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230117072626.93796-12-beilei.xing@intel.com", "date": "2023-01-17T07:26:18", "name": "[v3,09/15] common/idpf: add vport info initialization", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b43dd2e962b6d8dd4c126fd9bfcfc9ac656d99d2", "submitter": { "id": 410, "url": "http://patches.dpdk.org/api/people/410/?format=api", "name": "Xing, Beilei", "email": "beilei.xing@intel.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230117072626.93796-12-beilei.xing@intel.com/mbox/", "series": [ { "id": 26568, "url": "http://patches.dpdk.org/api/series/26568/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=26568", "date": "2023-01-17T07:26:07", "name": "net/idpf: introduce idpf common modle", "version": 3, "mbox": "http://patches.dpdk.org/series/26568/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/122151/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/122151/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 99C87423FA;\n\tTue, 17 Jan 2023 08:52:22 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2912142D57;\n\tTue, 17 Jan 2023 08:51:14 +0100 (CET)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by mails.dpdk.org (Postfix) with ESMTP id 81F4442D2C\n for <dev@dpdk.org>; Tue, 17 Jan 2023 08:51:11 +0100 (CET)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 16 Jan 2023 23:51:11 -0800", "from dpdk-beileix-3.sh.intel.com ([10.67.110.253])\n by fmsmga002.fm.intel.com with ESMTP; 16 Jan 2023 23:51:08 -0800" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1673941871; x=1705477871;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=S2ceBQVkAsmTKYRo3s5qee6R4u3mqFumtGx7Im8Ge1I=;\n b=K65yzdNLngDArJ2DUrdtmLJl0QHsey0msSwJh4VTrz44WSsSQ4aj6AJ/\n iASTZSeS08YOUTXWzVlWCfyEdTQK5s+/2Zk2MrM8++z64GIN2FQGX21n4\n IhCD3gWdeYQVu013CV/FksTJ2y6GTbghjATRgj/JzGFZ4KHkgb2HFKKwJ\n 0PCrFXYCl0yx7chxjhhjwWsc+fS0yTb13hsJZe1x8WkblM4QFvZMUCgjx\n tX/WH6PEG1RPO0YQd9QzW7JCt26S2qiIcgkbTdFjtHPGljMBHispegpLJ\n wzblBrVLItIHnBhZGThBVqt4wpJjOSWS0yM4jQb7oYs/G+RWt/UedhLa/ w==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10592\"; a=\"312497057\"", "E=Sophos;i=\"5.97,222,1669104000\"; d=\"scan'208\";a=\"312497057\"", "E=McAfee;i=\"6500,9779,10592\"; a=\"767174533\"", "E=Sophos;i=\"5.97,222,1669104000\"; d=\"scan'208\";a=\"767174533\"" ], "X-ExtLoop1": "1", "From": "beilei.xing@intel.com", "To": "jingjing.wu@intel.com", "Cc": "dev@dpdk.org,\n\tqi.z.zhang@intel.com,\n\tBeilei Xing <beilei.xing@intel.com>", "Subject": "[PATCH v3 09/15] common/idpf: add vport info initialization", "Date": "Tue, 17 Jan 2023 07:26:18 +0000", "Message-Id": "<20230117072626.93796-12-beilei.xing@intel.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20230117072626.93796-1-beilei.xing@intel.com>", "References": "\n <https://patches.dpdk.org/project/dpdk/cover/20230106091627.13530-1-beilei.xing@intel.com/>\n <20230117072626.93796-1-beilei.xing@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Beilei Xing <beilei.xing@intel.com>\n\nMove queue module fields from idpf_adapter_ext structure to\nidpf_adapter structure.\nRefine some parameter and function name, and move function\nidpf_create_vport_info_init to common module.\n\nSigned-off-by: Beilei Xing <beilei.xing@intel.com>\n---\n drivers/common/idpf/idpf_common_device.c | 35 +++++++++++++++++\n drivers/common/idpf/idpf_common_device.h | 11 ++++++\n drivers/common/idpf/version.map | 1 +\n drivers/net/idpf/idpf_ethdev.c | 48 +++---------------------\n drivers/net/idpf/idpf_ethdev.h | 8 ----\n 5 files changed, 53 insertions(+), 50 deletions(-)", "diff": "diff --git a/drivers/common/idpf/idpf_common_device.c b/drivers/common/idpf/idpf_common_device.c\nindex 9647d4a62a..411873c902 100644\n--- a/drivers/common/idpf/idpf_common_device.c\n+++ b/drivers/common/idpf/idpf_common_device.c\n@@ -613,4 +613,39 @@ idpf_config_irq_unmap(struct idpf_vport *vport, uint16_t nb_rx_queues)\n \treturn 0;\n }\n \n+int\n+idpf_create_vport_info_init(struct idpf_vport *vport,\n+\t\t\t struct virtchnl2_create_vport *vport_info)\n+{\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\n+\tvport_info->vport_type = rte_cpu_to_le_16(VIRTCHNL2_VPORT_TYPE_DEFAULT);\n+\tif (adapter->txq_model == 0) {\n+\t\tvport_info->txq_model =\n+\t\t\trte_cpu_to_le_16(VIRTCHNL2_QUEUE_MODEL_SPLIT);\n+\t\tvport_info->num_tx_q = IDPF_DEFAULT_TXQ_NUM;\n+\t\tvport_info->num_tx_complq =\n+\t\t\tIDPF_DEFAULT_TXQ_NUM * IDPF_TX_COMPLQ_PER_GRP;\n+\t} else {\n+\t\tvport_info->txq_model =\n+\t\t\trte_cpu_to_le_16(VIRTCHNL2_QUEUE_MODEL_SINGLE);\n+\t\tvport_info->num_tx_q = IDPF_DEFAULT_TXQ_NUM;\n+\t\tvport_info->num_tx_complq = 0;\n+\t}\n+\tif (adapter->rxq_model == 0) {\n+\t\tvport_info->rxq_model =\n+\t\t\trte_cpu_to_le_16(VIRTCHNL2_QUEUE_MODEL_SPLIT);\n+\t\tvport_info->num_rx_q = IDPF_DEFAULT_RXQ_NUM;\n+\t\tvport_info->num_rx_bufq =\n+\t\t\tIDPF_DEFAULT_RXQ_NUM * IDPF_RX_BUFQ_PER_GRP;\n+\t} else {\n+\t\tvport_info->rxq_model =\n+\t\t\trte_cpu_to_le_16(VIRTCHNL2_QUEUE_MODEL_SINGLE);\n+\t\tvport_info->num_rx_q = IDPF_DEFAULT_RXQ_NUM;\n+\t\tvport_info->num_rx_bufq = 0;\n+\t}\n+\n+\treturn 0;\n+}\n+\n RTE_LOG_REGISTER_SUFFIX(idpf_common_logtype, common, NOTICE);\ndiff --git a/drivers/common/idpf/idpf_common_device.h b/drivers/common/idpf/idpf_common_device.h\nindex 997f01f3aa..0c73d40e53 100644\n--- a/drivers/common/idpf/idpf_common_device.h\n+++ b/drivers/common/idpf/idpf_common_device.h\n@@ -16,6 +16,11 @@\n #define IDPF_CTLQ_LEN\t\t64\n #define IDPF_DFLT_MBX_BUF_SIZE\t4096\n \n+#define IDPF_DEFAULT_RXQ_NUM\t16\n+#define IDPF_RX_BUFQ_PER_GRP\t2\n+#define IDPF_DEFAULT_TXQ_NUM\t16\n+#define IDPF_TX_COMPLQ_PER_GRP\t1\n+\n #define IDPF_MAX_PKT_TYPE\t1024\n \n #define IDPF_DFLT_INTERVAL\t16\n@@ -33,6 +38,9 @@ struct idpf_adapter {\n \tuint8_t *mbx_resp; /* buffer to store the mailbox response from cp */\n \n \tuint32_t ptype_tbl[IDPF_MAX_PKT_TYPE] __rte_cache_min_aligned;\n+\n+\tuint32_t txq_model; /* 0 - split queue model, non-0 - single queue model */\n+\tuint32_t rxq_model; /* 0 - split queue model, non-0 - single queue model */\n };\n \n struct idpf_chunks_info {\n@@ -168,5 +176,8 @@ __rte_internal\n int idpf_config_irq_map(struct idpf_vport *vport, uint16_t nb_rx_queues);\n __rte_internal\n int idpf_config_irq_unmap(struct idpf_vport *vport, uint16_t nb_rx_queues);\n+__rte_internal\n+int idpf_create_vport_info_init(struct idpf_vport *vport,\n+\t\t\t\tstruct virtchnl2_create_vport *vport_info);\n \n #endif /* _IDPF_COMMON_DEVICE_H_ */\ndiff --git a/drivers/common/idpf/version.map b/drivers/common/idpf/version.map\nindex da3b0feefc..b153647ee1 100644\n--- a/drivers/common/idpf/version.map\n+++ b/drivers/common/idpf/version.map\n@@ -6,6 +6,7 @@ INTERNAL {\n \tidpf_config_irq_map;\n \tidpf_config_irq_unmap;\n \tidpf_config_rss;\n+\tidpf_create_vport_info_init;\n \tidpf_ctlq_clean_sq;\n \tidpf_ctlq_deinit;\n \tidpf_ctlq_init;\ndiff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c\nindex 84046f955a..734e97ffc2 100644\n--- a/drivers/net/idpf/idpf_ethdev.c\n+++ b/drivers/net/idpf/idpf_ethdev.c\n@@ -142,42 +142,6 @@ idpf_dev_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused)\n \treturn ptypes;\n }\n \n-static int\n-idpf_init_vport_req_info(struct rte_eth_dev *dev,\n-\t\t\t struct virtchnl2_create_vport *vport_info)\n-{\n-\tstruct idpf_vport *vport = dev->data->dev_private;\n-\tstruct idpf_adapter_ext *adapter = IDPF_ADAPTER_TO_EXT(vport->adapter);\n-\n-\tvport_info->vport_type = rte_cpu_to_le_16(VIRTCHNL2_VPORT_TYPE_DEFAULT);\n-\tif (adapter->txq_model == 0) {\n-\t\tvport_info->txq_model =\n-\t\t\trte_cpu_to_le_16(VIRTCHNL2_QUEUE_MODEL_SPLIT);\n-\t\tvport_info->num_tx_q = IDPF_DEFAULT_TXQ_NUM;\n-\t\tvport_info->num_tx_complq =\n-\t\t\tIDPF_DEFAULT_TXQ_NUM * IDPF_TX_COMPLQ_PER_GRP;\n-\t} else {\n-\t\tvport_info->txq_model =\n-\t\t\trte_cpu_to_le_16(VIRTCHNL2_QUEUE_MODEL_SINGLE);\n-\t\tvport_info->num_tx_q = IDPF_DEFAULT_TXQ_NUM;\n-\t\tvport_info->num_tx_complq = 0;\n-\t}\n-\tif (adapter->rxq_model == 0) {\n-\t\tvport_info->rxq_model =\n-\t\t\trte_cpu_to_le_16(VIRTCHNL2_QUEUE_MODEL_SPLIT);\n-\t\tvport_info->num_rx_q = IDPF_DEFAULT_RXQ_NUM;\n-\t\tvport_info->num_rx_bufq =\n-\t\t\tIDPF_DEFAULT_RXQ_NUM * IDPF_RX_BUFQ_PER_GRP;\n-\t} else {\n-\t\tvport_info->rxq_model =\n-\t\t\trte_cpu_to_le_16(VIRTCHNL2_QUEUE_MODEL_SINGLE);\n-\t\tvport_info->num_rx_q = IDPF_DEFAULT_RXQ_NUM;\n-\t\tvport_info->num_rx_bufq = 0;\n-\t}\n-\n-\treturn 0;\n-}\n-\n static int\n idpf_init_rss(struct idpf_vport *vport)\n {\n@@ -566,12 +530,12 @@ idpf_parse_devargs(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *adap\n \t\tgoto bail;\n \n \tret = rte_kvargs_process(kvlist, IDPF_TX_SINGLE_Q, &parse_bool,\n-\t\t\t\t &adapter->txq_model);\n+\t\t\t\t &adapter->base.txq_model);\n \tif (ret != 0)\n \t\tgoto bail;\n \n \tret = rte_kvargs_process(kvlist, IDPF_RX_SINGLE_Q, &parse_bool,\n-\t\t\t\t &adapter->rxq_model);\n+\t\t\t\t &adapter->base.rxq_model);\n \tif (ret != 0)\n \t\tgoto bail;\n \n@@ -672,7 +636,7 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params)\n \tstruct idpf_vport_param *param = init_params;\n \tstruct idpf_adapter_ext *adapter = param->adapter;\n \t/* for sending create vport virtchnl msg prepare */\n-\tstruct virtchnl2_create_vport vport_req_info;\n+\tstruct virtchnl2_create_vport create_vport_info;\n \tint ret = 0;\n \n \tdev->dev_ops = &idpf_eth_dev_ops;\n@@ -680,14 +644,14 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params)\n \tvport->sw_idx = param->idx;\n \tvport->devarg_id = param->devarg_id;\n \n-\tmemset(&vport_req_info, 0, sizeof(vport_req_info));\n-\tret = idpf_init_vport_req_info(dev, &vport_req_info);\n+\tmemset(&create_vport_info, 0, sizeof(create_vport_info));\n+\tret = idpf_create_vport_info_init(vport, &create_vport_info);\n \tif (ret != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to init vport req_info.\");\n \t\tgoto err;\n \t}\n \n-\tret = idpf_vport_init(vport, &vport_req_info, dev->data);\n+\tret = idpf_vport_init(vport, &create_vport_info, dev->data);\n \tif (ret != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to init vports.\");\n \t\tgoto err;\ndiff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h\nindex d30807ca41..c2a7abb05c 100644\n--- a/drivers/net/idpf/idpf_ethdev.h\n+++ b/drivers/net/idpf/idpf_ethdev.h\n@@ -22,14 +22,9 @@\n \n #define IDPF_MAX_VPORT_NUM\t8\n \n-#define IDPF_DEFAULT_RXQ_NUM\t16\n-#define IDPF_DEFAULT_TXQ_NUM\t16\n-\n #define IDPF_INVALID_VPORT_IDX\t0xffff\n #define IDPF_TXQ_PER_GRP\t1\n-#define IDPF_TX_COMPLQ_PER_GRP\t1\n #define IDPF_RXQ_PER_GRP\t1\n-#define IDPF_RX_BUFQ_PER_GRP\t2\n \n #define IDPF_DFLT_Q_VEC_NUM\t1\n \n@@ -78,9 +73,6 @@ struct idpf_adapter_ext {\n \n \tchar name[IDPF_ADAPTER_NAME_LEN];\n \n-\tuint32_t txq_model; /* 0 - split queue model, non-0 - single queue model */\n-\tuint32_t rxq_model; /* 0 - split queue model, non-0 - single queue model */\n-\n \tstruct idpf_vport **vports;\n \tuint16_t max_vport_nb;\n \n", "prefixes": [ "v3", "09/15" ] }