Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/7929/?format=api
{ "id": 7929, "url": "https://patches.dpdk.org/api/patches/7929/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1445582090-5927-4-git-send-email-stephen@networkplumber.org/", "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": "<1445582090-5927-4-git-send-email-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/1445582090-5927-4-git-send-email-stephen@networkplumber.org", "date": "2015-10-23T06:34:47", "name": "[dpdk-dev,3/6] e1000: use rte_eth_dma_zone_reserve", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "ac2a8339a5c8d3dd6b477f8658c51ab302d2f95a", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1445582090-5927-4-git-send-email-stephen@networkplumber.org/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/7929/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/7929/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 3A914C4B0;\n\tFri, 23 Oct 2015 08:34:50 +0200 (CEST)", "from mail-pa0-f53.google.com (mail-pa0-f53.google.com\n\t[209.85.220.53]) by dpdk.org (Postfix) with ESMTP id EE570C47C\n\tfor <dev@dpdk.org>; Fri, 23 Oct 2015 08:34:46 +0200 (CEST)", "by pacfv9 with SMTP id fv9so114571072pac.3\n\tfor <dev@dpdk.org>; Thu, 22 Oct 2015 23:34:46 -0700 (PDT)", "from xeon-e3.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net.\n\t[50.53.82.155]) by smtp.gmail.com with ESMTPSA id\n\tot8sm17078910pbb.26.2015.10.22.23.34.45\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 22 Oct 2015 23:34:45 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=2W/ohHBFqDbRZrpG6u3MARjZn5dXoSO2Y0lH/dmy4Uo=;\n\tb=jdKfBMjsk2JHvYNRqxwC2DkKFrRkbgU2WmTm8YAO31+2/Yu1Y863ff7TmlZyZbXlX8\n\tAZ+mGddnAPdweE6kqIv8V/Yxu3tpYxWNsNHSUPOoWYCpDjIIN21i9TBA3XoV89io0SOD\n\tB7dANANm42gGbD3sdCuEmKS3ZIqN9R2esUzx6ycCUMSIvPQTb38giyQ+/VtQl7N46cw7\n\toAQYzzjEHz/WnVOkVWRpNX19jbBfdSyFqquLqUB4kBa9PVcofzJD49kJyxVlrU6pE7zF\n\tcv8gOV/qJZAjI+2VZf+R5UdAuxM4LB6qOwd84eiBhFHnlkjD2DAWvNGcIH8j8uRrHRLn\n\tDwaA==", "X-Gm-Message-State": "ALoCoQlf7HnFmHC2nShLS/7DVtdTT9ZwHJqBKolJmVrXP7jej2KqTr9SanHBSDhrA5N0p2GYFY/P", "X-Received": "by 10.67.2.72 with SMTP id bm8mr2809274pad.63.1445582086299;\n\tThu, 22 Oct 2015 23:34:46 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Date": "Thu, 22 Oct 2015 23:34:47 -0700", "Message-Id": "<1445582090-5927-4-git-send-email-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1445582090-5927-1-git-send-email-stephen@networkplumber.org>", "References": "<1445582090-5927-1-git-send-email-stephen@networkplumber.org>", "Subject": "[dpdk-dev] [PATCH 3/6] e1000: use rte_eth_dma_zone_reserve", "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": "Use common code to handle Xen support at runtime.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/e1000/em_rxtx.c | 38 ++++----------------------------------\n drivers/net/e1000/igb_rxtx.c | 41 ++++++-----------------------------------\n 2 files changed, 10 insertions(+), 69 deletions(-)", "diff": "diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c\nindex 3b8776d..32e0953 100644\n--- a/drivers/net/e1000/em_rxtx.c\n+++ b/drivers/net/e1000/em_rxtx.c\n@@ -1104,28 +1104,6 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n #define\tEM_MAX_BUF_SIZE 16384\n #define EM_RCTL_FLXBUF_STEP 1024\n \n-static const struct rte_memzone *\n-ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,\n-\t\tuint16_t queue_id, uint32_t ring_size, int socket_id)\n-{\n-\tconst struct rte_memzone *mz;\n-\tchar z_name[RTE_MEMZONE_NAMESIZE];\n-\n-\tsnprintf(z_name, sizeof(z_name), \"%s_%s_%d_%d\",\n-\t\tdev->driver->pci_drv.name, ring_name, dev->data->port_id,\n-\t\tqueue_id);\n-\n-\tif ((mz = rte_memzone_lookup(z_name)) != 0)\n-\t\treturn (mz);\n-\n-#ifdef RTE_LIBRTE_XEN_DOM0\n-\treturn rte_memzone_reserve_bounded(z_name, ring_size,\n-\t\t\tsocket_id, 0, RTE_CACHE_LINE_SIZE, RTE_PGSIZE_2M);\n-#else\n-\treturn rte_memzone_reserve(z_name, ring_size, socket_id, 0);\n-#endif\n-}\n-\n static void\n em_tx_queue_release_mbufs(struct em_tx_queue *txq)\n {\n@@ -1273,8 +1251,8 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n \t * resizing in later calls to the queue setup function.\n \t */\n \ttsize = sizeof (txq->tx_ring[0]) * EM_MAX_RING_DESC;\n-\tif ((tz = ring_dma_zone_reserve(dev, \"tx_ring\", queue_idx, tsize,\n-\t\t\tsocket_id)) == NULL)\n+\tif ((tz = rte_eth_dma_zone_reserve(dev, \"tx_ring\", queue_idx, tsize,\n+\t\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id)) == NULL)\n \t\treturn (-ENOMEM);\n \n \t/* Allocate the tx queue data structure. */\n@@ -1300,11 +1278,7 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,\n \ttxq->port_id = dev->data->port_id;\n \n \ttxq->tdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_TDT(queue_idx));\n-#ifndef RTE_LIBRTE_XEN_DOM0\n-\ttxq->tx_ring_phys_addr = (uint64_t) tz->phys_addr;\n-#else\n \ttxq->tx_ring_phys_addr = rte_mem_phy2mch(tz->memseg_id, tz->phys_addr);\n-#endif\n \ttxq->tx_ring = (struct e1000_data_desc *) tz->addr;\n \n \tPMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64,\n@@ -1400,8 +1374,8 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,\n \n \t/* Allocate RX ring for max possible mumber of hardware descriptors. */\n \trsize = sizeof (rxq->rx_ring[0]) * EM_MAX_RING_DESC;\n-\tif ((rz = ring_dma_zone_reserve(dev, \"rx_ring\", queue_idx, rsize,\n-\t\t\tsocket_id)) == NULL)\n+\tif ((rz = rte_eth_dma_zone_reserve(dev, \"rx_ring\", queue_idx, rsize,\n+\t\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id)) == NULL)\n \t\treturn (-ENOMEM);\n \n \t/* Allocate the RX queue data structure. */\n@@ -1430,11 +1404,7 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,\n \n \trxq->rdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_RDT(queue_idx));\n \trxq->rdh_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_RDH(queue_idx));\n-#ifndef RTE_LIBRTE_XEN_DOM0\n-\trxq->rx_ring_phys_addr = (uint64_t) rz->phys_addr;\n-#else\n \trxq->rx_ring_phys_addr = rte_mem_phy2mch(rz->memseg_id, rz->phys_addr);\n-#endif\n \trxq->rx_ring = (struct e1000_rx_desc *) rz->addr;\n \n \tPMD_INIT_LOG(DEBUG, \"sw_ring=%p hw_ring=%p dma_addr=0x%\"PRIx64,\ndiff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c\nindex 19905fd..7a4bd5b 100644\n--- a/drivers/net/e1000/igb_rxtx.c\n+++ b/drivers/net/e1000/igb_rxtx.c\n@@ -1167,29 +1167,6 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n #define IGB_MIN_RING_DESC 32\n #define IGB_MAX_RING_DESC 4096\n \n-static const struct rte_memzone *\n-ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,\n-\t\t uint16_t queue_id, uint32_t ring_size, int socket_id)\n-{\n-\tchar z_name[RTE_MEMZONE_NAMESIZE];\n-\tconst struct rte_memzone *mz;\n-\n-\tsnprintf(z_name, sizeof(z_name), \"%s_%s_%d_%d\",\n-\t\t\tdev->driver->pci_drv.name, ring_name,\n-\t\t\t\tdev->data->port_id, queue_id);\n-\tmz = rte_memzone_lookup(z_name);\n-\tif (mz)\n-\t\treturn mz;\n-\n-#ifdef RTE_LIBRTE_XEN_DOM0\n-\treturn rte_memzone_reserve_bounded(z_name, ring_size,\n-\t\t\tsocket_id, 0, IGB_ALIGN, RTE_PGSIZE_2M);\n-#else\n-\treturn rte_memzone_reserve_aligned(z_name, ring_size,\n-\t\t\tsocket_id, 0, IGB_ALIGN);\n-#endif\n-}\n-\n static void\n igb_tx_queue_release_mbufs(struct igb_tx_queue *txq)\n {\n@@ -1322,8 +1299,8 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,\n \t * resizing in later calls to the queue setup function.\n \t */\n \tsize = sizeof(union e1000_adv_tx_desc) * IGB_MAX_RING_DESC;\n-\ttz = ring_dma_zone_reserve(dev, \"tx_ring\", queue_idx,\n-\t\t\t\t\tsize, socket_id);\n+\ttz = rte_eth_dma_zone_reserve(dev, \"tx_ring\", queue_idx, size,\n+\t\t\t\t IGB_ALIGN, socket_id);\n \tif (tz == NULL) {\n \t\tigb_tx_queue_release(txq);\n \t\treturn (-ENOMEM);\n@@ -1341,12 +1318,9 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,\n \ttxq->port_id = dev->data->port_id;\n \n \ttxq->tdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_TDT(txq->reg_idx));\n-#ifndef RTE_LIBRTE_XEN_DOM0\n-\ttxq->tx_ring_phys_addr = (uint64_t) tz->phys_addr;\n-#else\n \ttxq->tx_ring_phys_addr = rte_mem_phy2mch(tz->memseg_id, tz->phys_addr);\n-#endif\n-\t txq->tx_ring = (union e1000_adv_tx_desc *) tz->addr;\n+\n+\ttxq->tx_ring = (union e1000_adv_tx_desc *) tz->addr;\n \t/* Allocate software ring */\n \ttxq->sw_ring = rte_zmalloc(\"txq->sw_ring\",\n \t\t\t\t sizeof(struct igb_tx_entry) * nb_desc,\n@@ -1470,18 +1444,15 @@ eth_igb_rx_queue_setup(struct rte_eth_dev *dev,\n \t * resizing in later calls to the queue setup function.\n \t */\n \tsize = sizeof(union e1000_adv_rx_desc) * IGB_MAX_RING_DESC;\n-\trz = ring_dma_zone_reserve(dev, \"rx_ring\", queue_idx, size, socket_id);\n+\trz = rte_eth_dma_zone_reserve(dev, \"rx_ring\", queue_idx, size,\n+\t\t\t\t IGB_ALIGN, socket_id);\n \tif (rz == NULL) {\n \t\tigb_rx_queue_release(rxq);\n \t\treturn (-ENOMEM);\n \t}\n \trxq->rdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_RDT(rxq->reg_idx));\n \trxq->rdh_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_RDH(rxq->reg_idx));\n-#ifndef RTE_LIBRTE_XEN_DOM0\n-\trxq->rx_ring_phys_addr = (uint64_t) rz->phys_addr;\n-#else\n \trxq->rx_ring_phys_addr = rte_mem_phy2mch(rz->memseg_id, rz->phys_addr);\n-#endif\n \trxq->rx_ring = (union e1000_adv_rx_desc *) rz->addr;\n \n \t/* Allocate software ring. */\n", "prefixes": [ "dpdk-dev", "3/6" ] }