From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 24B9BA0542;
Fri, 28 Oct 2022 11:58:59 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 1668440A89;
Fri, 28 Oct 2022 11:58:59 +0200 (CEST)
Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31])
by mails.dpdk.org (Postfix) with ESMTP id EDB3B40A89;
Fri, 28 Oct 2022 11:58:50 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1666951131; x=1698487131;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=TDoYMdoqVvpnV/LqqoX6XJuqDOeid03mtgRQatu8xQc=;
b=A7d57fL2gz6S5hNFPmOAl3W7OgwIecSmP82KwbbtOOY0InsJSQTS9NB/
HSawUcbIx4ipRt4JNysyNrYIKb6r6JHTDLEP3zv2FJhcbK1+klOHkU/gz
/8qAphZHeCqep1Og1+NXfyEHiCSszvqSSpCSgxIETkdCBlKoA0PYiFi4G
kkV9gaiSDs85m5H2MV7mrlJxt7uB8AQAjtYTgfwXjtHchC8JcYy6jWzwg
dt7xeVkZLsM4P15wTJu4H+N+yg7duG8ani8s7IbRHTqyEi9KkgF67FX5y
Hi09OoOC4XV74Gpp/SmTDjmlmcE7NSvqox8n/Xpl3Sii0T/ungrdaPneZ Q==;
X-IronPort-AV: E=McAfee;i="6500,9779,10513"; a="370523293"
X-IronPort-AV: E=Sophos;i="5.95,220,1661842800"; d="scan'208";a="370523293"
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
28 Oct 2022 02:58:49 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=McAfee;i="6500,9779,10513"; a="738051318"
X-IronPort-AV: E=Sophos;i="5.95,220,1661842800"; d="scan'208";a="738051318"
Received: from unknown (HELO localhost.localdomain) ([10.190.213.60])
by fmsmga002.fm.intel.com with ESMTP; 28 Oct 2022 02:58:47 -0700
From: Megha Ajmera <megha.ajmera@intel.com>
To: dev@dpdk.org, jasvinder.singh@intel.com, cristian.dumitrescu@intel.com,
stephen@networkplumber.org
Cc: stable@dpdk.org
Subject: [PATCH v6 3/3] sched: support for 100G+ rates in subport/pipe config
Date: Fri, 28 Oct 2022 09:55:31 +0000
Message-Id: <20221028095531.678682-3-megha.ajmera@intel.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20221028095531.678682-1-megha.ajmera@intel.com>
References: <20221006190038.431828-1-megha.ajmera@intel.com>
<20221028095531.678682-1-megha.ajmera@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
- Config load functions updated to support 100G rates
for subport and pipes.
- Added new parse function to convert string to unsigned
long long.
- Added error checks.
- Fixed format warnings.
Signed-off-by: Megha Ajmera <megha.ajmera@intel.com>
---
examples/qos_sched/cfg_file.c | 179 +++++++++++++++++++++-------------
examples/qos_sched/cfg_file.h | 2 +
examples/qos_sched/init.c | 23 ++++-
3 files changed, 133 insertions(+), 71 deletions(-)
diff --git a/examples/qos_sched/cfg_file.c b/examples/qos_sched/cfg_file.c
index ca871d3287..c75cf9db2e 100644
--- a/examples/qos_sched/cfg_file.c
+++ b/examples/qos_sched/cfg_file.c
@@ -25,6 +25,21 @@ uint32_t n_active_queues;
struct rte_sched_cman_params cman_params;
+int parse_u64(const char *entry, uint64_t *val)
+{
+ char *endptr;
+ if (!entry || !val)
+ return -EINVAL;
+
+ errno = 0;
+
+ *val = strtoull(entry, &endptr, 0);
+ if (errno == EINVAL || errno == ERANGE || *endptr != '\0')
+ return -EINVAL;
+
+ return 0;
+}
+
int
cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port_params)
{
@@ -47,7 +62,7 @@ cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port_params
int
cfg_load_pipe(struct rte_cfgfile *cfg, struct rte_sched_pipe_params *pipe_params)
{
- int i, j;
+ int i, j, ret = 0;
char *next;
const char *entry;
int profiles;
@@ -63,68 +78,84 @@ cfg_load_pipe(struct rte_cfgfile *cfg, struct rte_sched_pipe_params *pipe_params
snprintf(pipe_name, sizeof(pipe_name), "pipe profile %d", j);
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tb rate");
- if (entry)
- pipe_params[j].tb_rate = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tb_rate);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tb size");
- if (entry)
- pipe_params[j].tb_size = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tb_size);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc period");
- if (entry)
- pipe_params[j].tc_period = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_period);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 0 rate");
- if (entry)
- pipe_params[j].tc_rate[0] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[0]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 1 rate");
- if (entry)
- pipe_params[j].tc_rate[1] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[1]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 2 rate");
- if (entry)
- pipe_params[j].tc_rate[2] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[2]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 3 rate");
- if (entry)
- pipe_params[j].tc_rate[3] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[3]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 4 rate");
- if (entry)
- pipe_params[j].tc_rate[4] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[4]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 5 rate");
- if (entry)
- pipe_params[j].tc_rate[5] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[5]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 6 rate");
- if (entry)
- pipe_params[j].tc_rate[6] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[6]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 7 rate");
- if (entry)
- pipe_params[j].tc_rate[7] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[7]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 8 rate");
- if (entry)
- pipe_params[j].tc_rate[8] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[8]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 9 rate");
- if (entry)
- pipe_params[j].tc_rate[9] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[9]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 10 rate");
- if (entry)
- pipe_params[j].tc_rate[10] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[10]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 11 rate");
- if (entry)
- pipe_params[j].tc_rate[11] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[11]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 12 rate");
- if (entry)
- pipe_params[j].tc_rate[12] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &pipe_params[j].tc_rate[12]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 12 oversubscription weight");
if (entry)
@@ -148,7 +179,7 @@ int
cfg_load_subport_profile(struct rte_cfgfile *cfg,
struct rte_sched_subport_profile_params *subport_profile)
{
- int i;
+ int i, ret = 0;
const char *entry;
int profiles;
@@ -164,68 +195,84 @@ cfg_load_subport_profile(struct rte_cfgfile *cfg,
snprintf(sec_name, sizeof(sec_name), "subport profile %d", i);
entry = rte_cfgfile_get_entry(cfg, sec_name, "tb rate");
- if (entry)
- subport_profile[i].tb_rate = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tb_rate);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tb size");
- if (entry)
- subport_profile[i].tb_size = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tb_size);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc period");
- if (entry)
- subport_profile[i].tc_period = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_period);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 0 rate");
- if (entry)
- subport_profile[i].tc_rate[0] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[0]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 1 rate");
- if (entry)
- subport_profile[i].tc_rate[1] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[1]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 2 rate");
- if (entry)
- subport_profile[i].tc_rate[2] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[2]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 3 rate");
- if (entry)
- subport_profile[i].tc_rate[3] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[3]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 4 rate");
- if (entry)
- subport_profile[i].tc_rate[4] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[4]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 5 rate");
- if (entry)
- subport_profile[i].tc_rate[5] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[5]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 6 rate");
- if (entry)
- subport_profile[i].tc_rate[6] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[6]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 7 rate");
- if (entry)
- subport_profile[i].tc_rate[7] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[7]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 8 rate");
- if (entry)
- subport_profile[i].tc_rate[8] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[8]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 9 rate");
- if (entry)
- subport_profile[i].tc_rate[9] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[9]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 10 rate");
- if (entry)
- subport_profile[i].tc_rate[10] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[10]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 11 rate");
- if (entry)
- subport_profile[i].tc_rate[11] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[11]);
+ if (ret)
+ return ret;
entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 12 rate");
- if (entry)
- subport_profile[i].tc_rate[12] = (uint64_t)atoi(entry);
+ ret = parse_u64(entry, &subport_profile[i].tc_rate[12]);
+ if (ret)
+ return ret;
}
return 0;
diff --git a/examples/qos_sched/cfg_file.h b/examples/qos_sched/cfg_file.h
index 0dc458aa71..71d280718f 100644
--- a/examples/qos_sched/cfg_file.h
+++ b/examples/qos_sched/cfg_file.h
@@ -8,6 +8,8 @@
#include <rte_sched.h>
#include <rte_cfgfile.h>
+int parse_u64(const char *entry, uint64_t *val);
+
int cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port);
int cfg_load_pipe(struct rte_cfgfile *cfg, struct rte_sched_pipe_params *pipe);
diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index d897fd378b..0709aec10c 100644
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -280,20 +280,33 @@ app_init_sched_port(uint32_t portid, uint32_t socketid)
static int
app_load_cfg_profile(const char *profile)
{
+ int ret = 0;
if (profile == NULL)
return 0;
struct rte_cfgfile *file = rte_cfgfile_load(profile, 0);
if (file == NULL)
rte_exit(EXIT_FAILURE, "Cannot load configuration profile %s\n", profile);
- cfg_load_port(file, &port_params);
- cfg_load_subport(file, subport_params);
- cfg_load_subport_profile(file, subport_profile);
- cfg_load_pipe(file, pipe_profiles);
+ ret = cfg_load_port(file, &port_params);
+ if (ret)
+ goto _app_load_cfg_profile_error_return;
+ ret = cfg_load_subport(file, subport_params);
+ if (ret)
+ goto _app_load_cfg_profile_error_return;
+
+ ret = cfg_load_subport_profile(file, subport_profile);
+ if (ret)
+ goto _app_load_cfg_profile_error_return;
+
+ ret = cfg_load_pipe(file, pipe_profiles);
+ if (ret)
+ goto _app_load_cfg_profile_error_return;
+
+_app_load_cfg_profile_error_return:
rte_cfgfile_close(file);
- return 0;
+ return ret;
}
int app_init(void)
--
2.25.1