Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/3265/?format=api
{ "id": 3265, "url": "https://patches.dpdk.org/api/patches/3265/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1423815597-17819-7-git-send-email-jing.d.chen@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": "<1423815597-17819-7-git-send-email-jing.d.chen@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1423815597-17819-7-git-send-email-jing.d.chen@intel.com", "date": "2015-02-13T08:19:46", "name": "[dpdk-dev,v5,06/17] fm10k: add rx_queue_setup/release function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "79cb85ca85ffcdb06501ff588975c0b0067d6780", "submitter": { "id": 40, "url": "https://patches.dpdk.org/api/people/40/?format=api", "name": "Chen, Jing D", "email": "jing.d.chen@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1423815597-17819-7-git-send-email-jing.d.chen@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/3265/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/3265/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 E9AA8ADDA;\n\tFri, 13 Feb 2015 09:20:32 +0100 (CET)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id D8740ADD4\n\tfor <dev@dpdk.org>; Fri, 13 Feb 2015 09:20:22 +0100 (CET)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga103.fm.intel.com with ESMTP; 13 Feb 2015 00:13:09 -0800", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby FMSMGA003.fm.intel.com with ESMTP; 13 Feb 2015 00:05:36 -0800", "from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com\n\t[10.239.29.90])\n\tby shvmail01.sh.intel.com with ESMTP id t1D8KIrJ012027;\n\tFri, 13 Feb 2015 16:20:18 +0800", "from shecgisg003.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t1D8KFvp017897; Fri, 13 Feb 2015 16:20:17 +0800", "(from jingche2@localhost)\n\tby shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t1D8KFNO017893; \n\tFri, 13 Feb 2015 16:20:15 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.09,569,1418112000\"; d=\"scan'208\";a=\"454102459\"", "From": "\"Chen Jing D(Mark)\" <jing.d.chen@intel.com>", "To": "dev@dpdk.org", "Date": "Fri, 13 Feb 2015 16:19:46 +0800", "Message-Id": "<1423815597-17819-7-git-send-email-jing.d.chen@intel.com>", "X-Mailer": "git-send-email 1.7.12.2", "In-Reply-To": "<1423815597-17819-1-git-send-email-jing.d.chen@intel.com>", "References": "<1423618298-2933-2-git-send-email-jing.d.chen@intel.com>\n\t<1423815597-17819-1-git-send-email-jing.d.chen@intel.com>", "Subject": "[dpdk-dev] [PATCH v5 06/17] fm10k: add rx_queue_setup/release\n\tfunction", "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: Jeff Shaw <jeffrey.b.shaw@intel.com>\n\nAdd fm10k_rx_queue_setup and fm10k_rx_queue_release functions.\n\nSigned-off-by: Jeff Shaw <jeffrey.b.shaw@intel.com>\nSigned-off-by: Chen Jing D(Mark) <jing.d.chen@intel.com>\n---\n lib/librte_pmd_fm10k/fm10k_ethdev.c | 255 +++++++++++++++++++++++++++++++++++\n 1 files changed, 255 insertions(+), 0 deletions(-)", "diff": "diff --git a/lib/librte_pmd_fm10k/fm10k_ethdev.c b/lib/librte_pmd_fm10k/fm10k_ethdev.c\nindex b3d4d79..7280501 100644\n--- a/lib/librte_pmd_fm10k/fm10k_ethdev.c\n+++ b/lib/librte_pmd_fm10k/fm10k_ethdev.c\n@@ -41,6 +41,7 @@\n #include \"fm10k.h\"\n #include \"base/fm10k_api.h\"\n \n+#define FM10K_RX_BUFF_ALIGN 512\n /* Default delay to acquire mailbox lock */\n #define FM10K_MBXLOCK_DELAY_US 20\n \n@@ -67,6 +68,46 @@ fm10k_mbx_unlock(struct fm10k_hw *hw)\n \trte_spinlock_unlock(FM10K_DEV_PRIVATE_TO_MBXLOCK(hw->back));\n }\n \n+/*\n+ * clean queue, descriptor rings, free software buffers used when stopping\n+ * device.\n+ */\n+static inline void\n+rx_queue_clean(struct fm10k_rx_queue *q)\n+{\n+\tunion fm10k_rx_desc zero = {.q = {0, 0, 0, 0} };\n+\tuint32_t i;\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\t/* zero descriptor rings */\n+\tfor (i = 0; i < q->nb_desc; ++i)\n+\t\tq->hw_ring[i] = zero;\n+\n+\t/* free software buffers */\n+\tfor (i = 0; i < q->nb_desc; ++i) {\n+\t\tif (q->sw_ring[i]) {\n+\t\t\trte_pktmbuf_free_seg(q->sw_ring[i]);\n+\t\t\tq->sw_ring[i] = NULL;\n+\t\t}\n+\t}\n+}\n+\n+/*\n+ * free all queue memory used when releasing the queue (i.e. configure)\n+ */\n+static inline void\n+rx_queue_free(struct fm10k_rx_queue *q)\n+{\n+\tPMD_INIT_FUNC_TRACE();\n+\tif (q) {\n+\t\tPMD_INIT_LOG(DEBUG, \"Freeing rx queue %p\", q);\n+\t\trx_queue_clean(q);\n+\t\tif (q->sw_ring)\n+\t\t\trte_free(q->sw_ring);\n+\t\trte_free(q);\n+\t}\n+}\n+\n static int\n fm10k_dev_configure(struct rte_eth_dev *dev)\n {\n@@ -186,6 +227,218 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,\n \n }\n \n+static inline int\n+check_nb_desc(uint16_t min, uint16_t max, uint16_t mult, uint16_t request)\n+{\n+\tif ((request < min) || (request > max) || ((request % mult) != 0))\n+\t\treturn -1;\n+\telse\n+\t\treturn 0;\n+}\n+\n+/*\n+ * Create a memzone for hardware descriptor rings. Malloc cannot be used since\n+ * the physical address is required. If the memzone is already created, then\n+ * this function returns a pointer to the existing memzone.\n+ */\n+static inline const struct rte_memzone *\n+allocate_hw_ring(const char *driver_name, const char *ring_name,\n+\tuint8_t port_id, uint16_t queue_id, int socket_id,\n+\tuint32_t size, uint32_t align)\n+{\n+\tchar name[RTE_MEMZONE_NAMESIZE];\n+\tconst struct rte_memzone *mz;\n+\n+\tsnprintf(name, sizeof(name), \"%s_%s_%d_%d_%d\",\n+\t\t driver_name, ring_name, port_id, queue_id, socket_id);\n+\n+\t/* return the memzone if it already exists */\n+\tmz = rte_memzone_lookup(name);\n+\tif (mz)\n+\t\treturn mz;\n+\n+#ifdef RTE_LIBRTE_XEN_DOM0\n+\treturn rte_memzone_reserve_bounded(name, size, socket_id, 0, align,\n+\t\t\t\t\t RTE_PGSIZE_2M);\n+#else\n+\treturn rte_memzone_reserve_aligned(name, size, socket_id, 0, align);\n+#endif\n+}\n+\n+static inline int\n+check_thresh(uint16_t min, uint16_t max, uint16_t div, uint16_t request)\n+{\n+\tif ((request < min) || (request > max) || ((div % request) != 0))\n+\t\treturn -1;\n+\telse\n+\t\treturn 0;\n+}\n+\n+static inline int\n+handle_rxconf(struct fm10k_rx_queue *q, const struct rte_eth_rxconf *conf)\n+{\n+\tuint16_t rx_free_thresh;\n+\n+\tif (conf->rx_free_thresh == 0)\n+\t\trx_free_thresh = FM10K_RX_FREE_THRESH_DEFAULT(q);\n+\telse\n+\t\trx_free_thresh = conf->rx_free_thresh;\n+\n+\t/* make sure the requested threshold satisfies the constraints */\n+\tif (check_thresh(FM10K_RX_FREE_THRESH_MIN(q),\n+\t\t\tFM10K_RX_FREE_THRESH_MAX(q),\n+\t\t\tFM10K_RX_FREE_THRESH_DIV(q),\n+\t\t\trx_free_thresh)) {\n+\t\tPMD_INIT_LOG(ERR, \"rx_free_thresh (%u) must be \"\n+\t\t\t\"less than or equal to %u, \"\n+\t\t\t\"greater than or equal to %u, \"\n+\t\t\t\"and a divisor of %u\",\n+\t\t\trx_free_thresh, FM10K_RX_FREE_THRESH_MAX(q),\n+\t\t\tFM10K_RX_FREE_THRESH_MIN(q),\n+\t\t\tFM10K_RX_FREE_THRESH_DIV(q));\n+\t\treturn (-EINVAL);\n+\t}\n+\n+\tq->alloc_thresh = rx_free_thresh;\n+\tq->drop_en = conf->rx_drop_en;\n+\tq->rx_deferred_start = conf->rx_deferred_start;\n+\n+\treturn 0;\n+}\n+\n+/*\n+ * Hardware requires specific alignment for Rx packet buffers. At\n+ * least one of the following two conditions must be satisfied.\n+ * 1. Address is 512B aligned\n+ * 2. Address is 8B aligned and buffer does not cross 4K boundary.\n+ *\n+ * As such, the driver may need to adjust the DMA address within the\n+ * buffer by up to 512B. The mempool element size is checked here\n+ * to make sure a maximally sized Ethernet frame can still be wholly\n+ * contained within the buffer after 512B alignment.\n+ *\n+ * return 1 if the element size is valid, otherwise return 0.\n+ */\n+static int\n+mempool_element_size_valid(struct rte_mempool *mp)\n+{\n+\tuint32_t min_size;\n+\n+\t/* elt_size includes mbuf header and headroom */\n+\tmin_size = mp->elt_size - sizeof(struct rte_mbuf) -\n+\t\t\tRTE_PKTMBUF_HEADROOM;\n+\n+\t/* account for up to 512B of alignment */\n+\tmin_size -= FM10K_RX_BUFF_ALIGN;\n+\n+\t/* sanity check for overflow */\n+\tif (min_size > mp->elt_size)\n+\t\treturn 0;\n+\n+\tif (min_size < ETHER_MAX_VLAN_FRAME_LEN)\n+\t\treturn 0;\n+\n+\t/* size is valid */\n+\treturn 1;\n+}\n+\n+static int\n+fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,\n+\tuint16_t nb_desc, unsigned int socket_id,\n+\tconst struct rte_eth_rxconf *conf, struct rte_mempool *mp)\n+{\n+\tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tstruct fm10k_rx_queue *q;\n+\tconst struct rte_memzone *mz;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\t/* make sure the mempool element size can account for alignment. Use\n+\t * RTE_LOG directly to make sure this error is seen. */\n+\tif (!mempool_element_size_valid(mp)) {\n+\t\tPMD_INIT_LOG(ERR, \"Error : Mempool element size is too small\");\n+\t\treturn (-EINVAL);\n+\t}\n+\n+\t/* make sure a valid number of descriptors have been requested */\n+\tif (check_nb_desc(FM10K_MIN_RX_DESC, FM10K_MAX_RX_DESC,\n+\t\t\t\tFM10K_MULT_RX_DESC, nb_desc)) {\n+\t\tPMD_INIT_LOG(ERR, \"Number of Rx descriptors (%u) must be \"\n+\t\t\t\"less than or equal to %\"PRIu32\", \"\n+\t\t\t\"greater than or equal to %u, \"\n+\t\t\t\"and a multiple of %u\",\n+\t\t\tnb_desc, (uint32_t)FM10K_MAX_RX_DESC, FM10K_MIN_RX_DESC,\n+\t\t\tFM10K_MULT_RX_DESC);\n+\t\treturn (-EINVAL);\n+\t}\n+\n+\t/*\n+\t * if this queue existed already, free the associated memory. The\n+\t * queue cannot be reused in case we need to allocate memory on\n+\t * different socket than was previously used.\n+\t */\n+\tif (dev->data->rx_queues[queue_id] != NULL) {\n+\t\trx_queue_free(dev->data->rx_queues[queue_id]);\n+\t\tdev->data->rx_queues[queue_id] = NULL;\n+\t}\n+\n+\t/* allocate memory for the queue structure */\n+\tq = rte_zmalloc_socket(\"fm10k\", sizeof(*q), RTE_CACHE_LINE_SIZE,\n+\t\t\t\tsocket_id);\n+\tif (q == NULL) {\n+\t\tPMD_INIT_LOG(ERR, \"Cannot allocate queue structure\");\n+\t\treturn (-ENOMEM);\n+\t}\n+\n+\t/* setup queue */\n+\tq->mp = mp;\n+\tq->nb_desc = nb_desc;\n+\tq->port_id = dev->data->port_id;\n+\tq->queue_id = queue_id;\n+\tq->tail_ptr = (volatile uint32_t *)\n+\t\t&((uint32_t *)hw->hw_addr)[FM10K_RDT(queue_id)];\n+\tif (handle_rxconf(q, conf))\n+\t\treturn (-EINVAL);\n+\n+\t/* allocate memory for the software ring */\n+\tq->sw_ring = rte_zmalloc_socket(\"fm10k sw ring\",\n+\t\t\t\t\tnb_desc * sizeof(struct rte_mbuf *),\n+\t\t\t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n+\tif (q->sw_ring == NULL) {\n+\t\tPMD_INIT_LOG(ERR, \"Cannot allocate software ring\");\n+\t\trte_free(q);\n+\t\treturn (-ENOMEM);\n+\t}\n+\n+\t/*\n+\t * allocate memory for the hardware descriptor ring. A memzone large\n+\t * enough to hold the maximum ring size is requested to allow for\n+\t * resizing in later calls to the queue setup function.\n+\t */\n+\tmz = allocate_hw_ring(dev->driver->pci_drv.name, \"rx_ring\",\n+\t\t\t\tdev->data->port_id, queue_id, socket_id,\n+\t\t\t\tFM10K_MAX_RX_RING_SZ, FM10K_ALIGN_RX_DESC);\n+\tif (mz == NULL) {\n+\t\tPMD_INIT_LOG(ERR, \"Cannot allocate hardware ring\");\n+\t\trte_free(q->sw_ring);\n+\t\trte_free(q);\n+\t\treturn (-ENOMEM);\n+\t}\n+\tq->hw_ring = mz->addr;\n+\tq->hw_ring_phys_addr = mz->phys_addr;\n+\n+\tdev->data->rx_queues[queue_id] = q;\n+\treturn 0;\n+}\n+\n+static void\n+fm10k_rx_queue_release(void *queue)\n+{\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\trx_queue_free(queue);\n+}\n+\n static int\n fm10k_reta_update(struct rte_eth_dev *dev,\n \t\t\tstruct rte_eth_rss_reta_entry64 *reta_conf,\n@@ -325,6 +578,8 @@ static struct eth_dev_ops fm10k_eth_dev_ops = {\n \t.stats_reset\t\t= fm10k_stats_reset,\n \t.link_update\t\t= fm10k_link_update,\n \t.dev_infos_get\t\t= fm10k_dev_infos_get,\n+\t.rx_queue_setup\t\t= fm10k_rx_queue_setup,\n+\t.rx_queue_release\t= fm10k_rx_queue_release,\n \t.reta_update\t\t= fm10k_reta_update,\n \t.reta_query\t\t= fm10k_reta_query,\n };\n", "prefixes": [ "dpdk-dev", "v5", "06/17" ] }