Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8327/?format=api
http://patches.dpdk.org/api/patches/8327/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1446192187-1890-3-git-send-email-jing.d.chen@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": "<1446192187-1890-3-git-send-email-jing.d.chen@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1446192187-1890-3-git-send-email-jing.d.chen@intel.com", "date": "2015-10-30T08:02:55", "name": "[dpdk-dev,v5,02/14] fm10k: add vPMD pre-condition check for each RX queue", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "02d1880cf7b3f2c0945abb3a7cf386c114df2681", "submitter": { "id": 40, "url": "http://patches.dpdk.org/api/people/40/?format=api", "name": "Chen, Jing D", "email": "jing.d.chen@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1446192187-1890-3-git-send-email-jing.d.chen@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/8327/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/8327/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 2809E8E88;\n\tFri, 30 Oct 2015 09:03:41 +0100 (CET)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id 0B72C8E73\n\tfor <dev@dpdk.org>; Fri, 30 Oct 2015 09:03:32 +0100 (CET)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga101.fm.intel.com with ESMTP; 30 Oct 2015 01:03:22 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga001.fm.intel.com with ESMTP; 30 Oct 2015 01:03:19 -0700", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t9U83HPR027042;\n\tFri, 30 Oct 2015 16:03:17 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t9U83DDE001938; Fri, 30 Oct 2015 16:03:15 +0800", "(from jingche2@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t9U83Dnt001934; \n\tFri, 30 Oct 2015 16:03:13 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,217,1444719600\"; d=\"scan'208\";a=\"822963223\"", "From": "\"Chen Jing D(Mark)\" <jing.d.chen@intel.com>", "To": "dev@dpdk.org", "Date": "Fri, 30 Oct 2015 16:02:55 +0800", "Message-Id": "<1446192187-1890-3-git-send-email-jing.d.chen@intel.com>", "X-Mailer": "git-send-email 1.7.12.2", "In-Reply-To": "<1446192187-1890-1-git-send-email-jing.d.chen@intel.com>", "References": "<1446110173-13330-2-git-send-email-jing.d.chen@intel.com>\n\t<1446192187-1890-1-git-send-email-jing.d.chen@intel.com>", "Subject": "[dpdk-dev] [PATCH v5 02/14] fm10k: add vPMD pre-condition check for\n\teach RX queue", "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: \"Chen Jing D(Mark)\" <jing.d.chen@intel.com>\n\nAdd condition check in rx_queue_setup func. If number of RX desc\ncan't satisfy vPMD requirement, record it into a variable. Or\ncall fm10k_rxq_vec_setup to initialize Vector RX.\n\nSigned-off-by: Chen Jing D(Mark) <jing.d.chen@intel.com>\n---\n drivers/net/fm10k/fm10k.h | 11 ++++++++---\n drivers/net/fm10k/fm10k_ethdev.c | 11 +++++++++++\n drivers/net/fm10k/fm10k_rxtx_vec.c | 21 +++++++++++++++++++++\n 3 files changed, 40 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h\nindex c089882..362a2d0 100644\n--- a/drivers/net/fm10k/fm10k.h\n+++ b/drivers/net/fm10k/fm10k.h\n@@ -135,6 +135,8 @@ struct fm10k_dev_info {\n \t/* Protect the mailbox to avoid race condition */\n \trte_spinlock_t mbx_lock;\n \tstruct fm10k_macvlan_filter_info macvlan;\n+\t/* Flag to indicate if RX vector conditions satisfied */\n+\tbool rx_vec_allowed;\n };\n \n /*\n@@ -165,9 +167,10 @@ struct fm10k_rx_queue {\n \tstruct rte_mempool *mp;\n \tstruct rte_mbuf **sw_ring;\n \tvolatile union fm10k_rx_desc *hw_ring;\n-\tstruct rte_mbuf *pkt_first_seg; /**< First segment of current packet. */\n-\tstruct rte_mbuf *pkt_last_seg; /**< Last segment of current packet. */\n+\tstruct rte_mbuf *pkt_first_seg; /* First segment of current packet. */\n+\tstruct rte_mbuf *pkt_last_seg; /* Last segment of current packet. */\n \tuint64_t hw_ring_phys_addr;\n+\tuint64_t mbuf_initializer; /* value to init mbufs */\n \tuint16_t next_dd;\n \tuint16_t next_alloc;\n \tuint16_t next_trigger;\n@@ -177,7 +180,7 @@ struct fm10k_rx_queue {\n \tuint16_t queue_id;\n \tuint8_t port_id;\n \tuint8_t drop_en;\n-\tuint8_t rx_deferred_start; /**< don't start this queue in dev start. */\n+\tuint8_t rx_deferred_start; /* don't start this queue in dev start. */\n };\n \n /*\n@@ -313,4 +316,6 @@ uint16_t fm10k_recv_scattered_pkts(void *rx_queue,\n \n uint16_t fm10k_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \tuint16_t nb_pkts);\n+\n+int fm10k_rxq_vec_setup(struct fm10k_rx_queue *rxq);\n #endif\ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex b104fc2..680a7fe 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -1252,6 +1252,7 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_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_dev_info *dev_info = FM10K_DEV_PRIVATE_TO_INFO(dev);\n \tstruct fm10k_rx_queue *q;\n \tconst struct rte_memzone *mz;\n \n@@ -1334,6 +1335,16 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,\n \tq->hw_ring_phys_addr = mz->phys_addr;\n #endif\n \n+\t/* Check if number of descs satisfied Vector requirement */\n+\tif (!rte_is_power_of_2(nb_desc)) {\n+\t\tPMD_INIT_LOG(DEBUG, \"queue[%d] doesn't meet Vector Rx \"\n+\t\t\t\t \"preconditions - canceling the feature for \"\n+\t\t\t\t \"the whole port[%d]\",\n+\t\t\t q->queue_id, q->port_id);\n+\t\tdev_info->rx_vec_allowed = false;\n+\t} else\n+\t\tfm10k_rxq_vec_setup(q);\n+\n \tdev->data->rx_queues[queue_id] = q;\n \treturn 0;\n }\ndiff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c\nindex 69174d9..34b677b 100644\n--- a/drivers/net/fm10k/fm10k_rxtx_vec.c\n+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c\n@@ -43,3 +43,24 @@\n #ifndef __INTEL_COMPILER\n #pragma GCC diagnostic ignored \"-Wcast-qual\"\n #endif\n+\n+int __attribute__((cold))\n+fm10k_rxq_vec_setup(struct fm10k_rx_queue *rxq)\n+{\n+\tuintptr_t p;\n+\tstruct rte_mbuf mb_def = { .buf_addr = 0 }; /* zeroed mbuf */\n+\n+\tmb_def.nb_segs = 1;\n+\t/* data_off will be ajusted after new mbuf allocated for 512-byte\n+\t * alignment.\n+\t */\n+\tmb_def.data_off = RTE_PKTMBUF_HEADROOM;\n+\tmb_def.port = rxq->port_id;\n+\trte_mbuf_refcnt_set(&mb_def, 1);\n+\n+\t/* prevent compiler reordering: rearm_data covers previous fields */\n+\trte_compiler_barrier();\n+\tp = (uintptr_t)&mb_def.rearm_data;\n+\trxq->mbuf_initializer = *(uint64_t *)p;\n+\treturn 0;\n+}\n", "prefixes": [ "dpdk-dev", "v5", "02/14" ] }{ "id": 8327, "url": "