[dpdk-dev] [PATCH v2] examples/qos_sched: fix copy-paste error

[dpdk-dev] [PATCH v2] examples/qos_sched: fix copy-paste error

[Michal Jastrzebski]

Fix issue reported by Coverity.
Date: Thu, 21 Apr 2016 13:47:34 +0200
Message-Id: <1461239256-8104-3-git-send-email-michalx.k.jastrzebski@intel.com>
X-Mailer: git-send-email 2.7.0
In-Reply-To: <1461239256-8104-1-git-send-email-michalx.k.jastrzebski@intel.com>
References: <1461239256-8104-1-git-send-email-michalx.k.jastrzebski@intel.com>

From: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>

Coverity ID 30699: Copy-paste error;
rx_port in pconf->rx_port looks like a copy-paste error.

Fixes: de3cfa2c9823 ("sched: initial import")

Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
---
 examples/qos_sched/args.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
index 3e7fd08..1916790 100644
--- a/examples/qos_sched/args.c
+++ b/examples/qos_sched/args.c
@@ -270,7 +270,7 @@ app_parse_flow_conf(const char *conf_str)
 	}
 	if (pconf->tx_port >= RTE_MAX_ETHPORTS) {
 		RTE_LOG(ERR, APP, "pfc %u: invalid tx port %"PRIu8" index\n",
-				nb_pfc, pconf->rx_port);
+				nb_pfc, pconf->tx_port);
 		return -1;
 	}
 
-- 
1.9.1

[dpdk-dev] [PATCH v2] examples/qos_meter: fix unchecked return value

[Michal Jastrzebski]

From: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>

Fix issue reported by Coverity.

Coverity ID 30693: Unchecked return value
check_return: Calling rte_meter_srtcm_config without checking return value.

Fixes: e6541fdec8b2 ("meter: initial import")

Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
---
 examples/qos_meter/main.c | 15 ++++++++++-----
 examples/qos_meter/main.h |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c
index b968b00..16b0b87 100644
--- a/examples/qos_meter/main.c
+++ b/examples/qos_meter/main.c
@@ -133,14 +133,17 @@ struct rte_meter_trtcm_params app_trtcm_params[] = {
 
 FLOW_METER app_flows[APP_FLOWS_MAX];
 
-static void
+static int
 app_configure_flow_table(void)
 {
 	uint32_t i, j;
+	int ret = 0;
 
-	for (i = 0, j = 0; i < APP_FLOWS_MAX; i ++, j = (j + 1) % RTE_DIM(PARAMS)){
-		FUNC_CONFIG(&app_flows[i], &PARAMS[j]);
-	}
+	for (i = 0, j = 0; i < APP_FLOWS_MAX;
+			i ++, j = (j + 1) % RTE_DIM(PARAMS))
+		ret |= FUNC_CONFIG(&app_flows[i], &PARAMS[j]);
+
+	return ret;
 }
 
 static inline void
@@ -381,7 +384,9 @@ main(int argc, char **argv)
 	rte_eth_promiscuous_enable(port_tx);
 
 	/* App configuration */
-	app_configure_flow_table();
+	ret = app_configure_flow_table();
+	if (ret < 0)
+		rte_exit(EXIT_FAILURE, "Invalid configure flow table\n");
 
 	/* Launch per-lcore init on every lcore */
 	rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
diff --git a/examples/qos_meter/main.h b/examples/qos_meter/main.h
index 530bf69..54867dc 100644
--- a/examples/qos_meter/main.h
+++ b/examples/qos_meter/main.h
@@ -51,7 +51,7 @@ enum policer_action policer_table[e_RTE_METER_COLORS][e_RTE_METER_COLORS] =
 #if APP_MODE == APP_MODE_FWD
 
 #define FUNC_METER(a,b,c,d) color, flow_id=flow_id, pkt_len=pkt_len, time=time
-#define FUNC_CONFIG(a,b)
+#define FUNC_CONFIG(a, b) 0
 #define PARAMS	app_srtcm_params
 #define FLOW_METER int
 
-- 
1.9.1

Re: [dpdk-dev] [PATCH v2] examples/qos_sched: fix copy-paste error

[Dumitrescu, Cristian]

> -----Original Message-----
> From: Jastrzebski, MichalX K
> Sent: Thursday, April 21, 2016 12:48 PM
> To: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Zhang, Roy Fan
> <roy.fan.zhang@intel.com>; Singh, Jasvinder <jasvinder.singh@intel.com>
> Cc: dev@dpdk.org; Mrozowicz, SlawomirX
> <slawomirx.mrozowicz@intel.com>
> Subject: [PATCH v2] examples/qos_sched: fix copy-paste error
> 
> From: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
> 
> Coverity ID 30699: Copy-paste error;
> rx_port in pconf->rx_port looks like a copy-paste error.
> 
> Fixes: de3cfa2c9823 ("sched: initial import")
> 
> Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
> ---
>  examples/qos_sched/args.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
> index 3e7fd08..1916790 100644
> --- a/examples/qos_sched/args.c
> +++ b/examples/qos_sched/args.c
> @@ -270,7 +270,7 @@ app_parse_flow_conf(const char *conf_str)
>  	}
>  	if (pconf->tx_port >= RTE_MAX_ETHPORTS) {
>  		RTE_LOG(ERR, APP, "pfc %u: invalid tx port %"PRIu8"
> index\n",
> -				nb_pfc, pconf->rx_port);
> +				nb_pfc, pconf->tx_port);
>  		return -1;
>  	}
> 
> --
> 1.9.1

Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>