From: Ferruh Yigit <ferruh.yigit@intel.com>
To: dev@dpdk.org
Cc: Nicolas Pernas Maradei <nicolas.pernas.maradei@emutex.com>
Subject: [dpdk-dev] [RFC 04/21] net/pcap: add checks for max queue number
Date: Thu, 21 Jul 2016 18:22:43 +0100 [thread overview]
Message-ID: <1469121780-26099-5-git-send-email-ferruh.yigit@intel.com> (raw)
In-Reply-To: <1469121780-26099-1-git-send-email-ferruh.yigit@intel.com>
Number of queues defined by devargs, a check added to be sure this
number is not bigger than configured queue length.
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/pcap/rte_eth_pcap.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 34c779a..308b8bc 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -1010,12 +1010,21 @@ rte_pmd_pcap_devinit(const char *name, const char *params)
* We check whether we want to open a RX stream from a real NIC or a
* pcap file
*/
- if ((pcaps.num_of_queue = rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG))) {
+ pcaps.num_of_queue = rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG);
+
+ if (pcaps.num_of_queue) {
+ if (pcaps.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES)
+ pcaps.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES;
+
ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_PCAP_ARG,
&open_rx_pcap, &pcaps);
} else {
pcaps.num_of_queue = rte_kvargs_count(kvlist,
ETH_PCAP_RX_IFACE_ARG);
+
+ if (pcaps.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES)
+ pcaps.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES;
+
ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_IFACE_ARG,
&open_rx_iface, &pcaps);
}
@@ -1027,14 +1036,22 @@ rte_pmd_pcap_devinit(const char *name, const char *params)
* We check whether we want to open a TX stream to a real NIC or a
* pcap file
*/
- if ((dumpers.num_of_queue = rte_kvargs_count(kvlist,
- ETH_PCAP_TX_PCAP_ARG))) {
+ dumpers.num_of_queue = rte_kvargs_count(kvlist, ETH_PCAP_TX_PCAP_ARG);
+
+ if (dumpers.num_of_queue) {
+ if (dumpers.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES)
+ dumpers.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES;
+
ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_PCAP_ARG,
&open_tx_pcap, &dumpers);
using_dumpers = 1;
} else {
dumpers.num_of_queue = rte_kvargs_count(kvlist,
ETH_PCAP_TX_IFACE_ARG);
+
+ if (dumpers.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES)
+ dumpers.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES;
+
ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_IFACE_ARG,
&open_tx_iface, &dumpers);
}
--
2.7.4
next prev parent reply other threads:[~2016-07-21 17:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-21 17:22 [dpdk-dev] [RFC 00/21] pcap pmd improvements Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 01/21] net/pcap: create own configuration parameter Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 02/21] net/pcap: use macros for param string Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 03/21] net/pcap: reorganize private structs Ferruh Yigit
2016-07-21 17:22 ` Ferruh Yigit [this message]
2016-07-21 17:22 ` [dpdk-dev] [RFC 05/21] net/pcap: update function to reuse it Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 06/21] net/pcap: don't carry numa_node argument Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 07/21] net/pcap: don't carry kvlist argument Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 08/21] net/pcap: move comment to correct place Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 09/21] net/pcap: remove duplicated max queue number check Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 10/21] net/pcap: use single_iface variable instead of hardcoded Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 11/21] net/pcap: group stats related fields into a struct Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 12/21] net/pcap: make const array static Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 13/21] net/pcap: reorder header files Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 14/21] net/pcap: reorder functions Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 15/21] net/pcap: update how single iface handled Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 16/21] net/pcap: remove unnecessary check Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 17/21] net/pcap: remove redundant assignment Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 18/21] net/pcap: simplify function Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 19/21] net/pcap: fix missing tx iface assignment Ferruh Yigit
2016-07-21 17:22 ` [dpdk-dev] [RFC 20/21] net/pcap: coding convention updates Ferruh Yigit
2016-07-21 17:23 ` [dpdk-dev] [RFC 21/21] net/pcap: remove rte prefix from static functions Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469121780-26099-5-git-send-email-ferruh.yigit@intel.com \
--to=ferruh.yigit@intel.com \
--cc=dev@dpdk.org \
--cc=nicolas.pernas.maradei@emutex.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).