From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 707E1A046B for ; Tue, 25 Jun 2019 17:33:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5DD941BAE4; Tue, 25 Jun 2019 17:32:20 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 3DE581BA5D for ; Tue, 25 Jun 2019 17:32:10 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jun 2019 08:32:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,416,1557212400"; d="scan'208";a="166711461" Received: from silpixa00381635.ir.intel.com (HELO silpixa00381635.ger.corp.intel.com) ([10.237.223.4]) by orsmga006.jf.intel.com with ESMTP; 25 Jun 2019 08:32:08 -0700 From: Jasvinder Singh To: dev@dpdk.org Cc: cristian.dumitrescu@intel.com, Abraham Tovar , Lukasz Krakowiak Date: Tue, 25 Jun 2019 16:31:56 +0100 Message-Id: <20190625153217.24301-8-jasvinder.singh@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190625153217.24301-1-jasvinder.singh@intel.com> References: <20190528120553.2992-2-lukaszx.krakowiak@intel.com> <20190625153217.24301-1-jasvinder.singh@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 07/28] sched: update pipe profile add API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Update the pipe profile add api implementation to allow configuration flexiblity for pipe traffic classes and queues, and subport level configuration of the pipe parameters. Signed-off-by: Jasvinder Singh Signed-off-by: Abraham Tovar Signed-off-by: Lukasz Krakowiak --- lib/librte_sched/rte_sched.c | 104 ++++++++++++++++++++++++++--------- 1 file changed, 78 insertions(+), 26 deletions(-) diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c index 46a98ad63..619b4763f 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -348,44 +348,69 @@ pipe_profile_check(struct rte_sched_pipe_params *params, uint32_t i; /* Pipe parameters */ - if (params == NULL) - return -11; + if (params == NULL) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for parameter params \n", __func__); + return -EINVAL; + } /* TB rate: non-zero, not greater than port rate */ if (params->tb_rate == 0 || - params->tb_rate > rate) - return -12; + params->tb_rate > rate) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for tb rate \n", __func__); + return -EINVAL; + } /* TB size: non-zero */ - if (params->tb_size == 0) - return -13; + if (params->tb_size == 0) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for tb size \n", __func__); + return -EINVAL; + } /* TC rate: non-zero, less than pipe rate */ for (i = 0; i < RTE_SCHED_TRAFFIC_CLASS_BE; i++) { if ((qsize[i] == 0 && params->tc_rate[i] != 0) || (qsize[i] != 0 && (params->tc_rate[i] == 0 || - params->tc_rate[i] > params->tb_rate))) - return -14; + params->tc_rate[i] > params->tb_rate))) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for qsize or tc_rate \n", __func__); + return -EINVAL; + } + } + + if (params->tc_rate[RTE_SCHED_TRAFFIC_CLASS_BE] == 0) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for be traffic class rate \n", __func__); + return -EINVAL; } - if (params->tc_rate[RTE_SCHED_TRAFFIC_CLASS_BE] == 0) - return -15; /* TC period: non-zero */ - if (params->tc_period == 0) - return -16; + if (params->tc_period == 0) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for tc period \n", __func__); + return -EINVAL; + } #ifdef RTE_SCHED_SUBPORT_TC_OV /* TC3 oversubscription weight: non-zero */ - if (params->tc_ov_weight == 0) - return -17; + if (params->tc_ov_weight == 0) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for tc ov weight \n", __func__); + return -EINVAL; + } #endif /* Queue WRR weights: non-zero */ for (i = 0; i < RTE_SCHED_BE_QUEUES_PER_PIPE; i++) { uint32_t qindex = RTE_SCHED_TRAFFIC_CLASS_BE + i; if ((qsize[qindex] != 0 && params->wrr_weights[i] == 0) || - (qsize[qindex] == 0 && params->wrr_weights[i] != 0)) - return -18; + (qsize[qindex] == 0 && params->wrr_weights[i] != 0)) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for qsize or wrr weight \n", __func__); + return -EINVAL; + } } return 0; @@ -861,6 +886,18 @@ rte_sched_subport_check_params(struct rte_sched_subport_params *params, return -EINVAL; } + for (i = 0; i < params->n_pipe_profiles; i++) { + struct rte_sched_pipe_params *p = params->pipe_profiles + i; + int status; + + status = pipe_profile_check(p, rate, ¶ms->qsize[0]); + if (status != 0) { + RTE_LOG(ERR, SCHED, + "%s: Pipe profile check failed(%d) \n", __func__, status); + return -EINVAL; + } + } + return 0; } @@ -1316,31 +1353,46 @@ rte_sched_port_pipe_profile_add(struct rte_sched_port *port, int status; /* Port */ - if (port == NULL) - return -1; + if (port == NULL) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for parameter port \n", __func__); + return -EINVAL; + } /* Subport id not exceeds the max limit */ - if (subport_id > port->n_subports_per_port) - return -2; + if (subport_id > port->n_subports_per_port) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for subport id \n", __func__); + return -EINVAL; + } s = port->subports[subport_id]; /* Pipe profiles not exceeds the max limit */ - if (s->n_pipe_profiles >= s->n_max_pipe_profiles) - return -3; + if (s->n_pipe_profiles >= s->n_max_pipe_profiles) { + RTE_LOG(ERR, SCHED, + "%s: Number of pipe profiles exceeds the max limit \n", __func__); + return -EINVAL; + } /* Pipe params */ status = pipe_profile_check(params, port->rate, &s->qsize[0]); - if (status != 0) - return status; + if (status != 0) { + RTE_LOG(ERR, SCHED, + "%s: Pipe profile check failed(%d) \n", __func__, status); + return -EINVAL; + } pp = &s->pipe_profiles[s->n_pipe_profiles]; rte_sched_pipe_profile_convert(s, params, pp, port->rate); /* Pipe profile not exists */ for (i = 0; i < s->n_pipe_profiles; i++) - if (memcmp(s->pipe_profiles + i, pp, sizeof(*pp)) == 0) - return -4; + if (memcmp(s->pipe_profiles + i, pp, sizeof(*pp)) == 0) { + RTE_LOG(ERR, SCHED, + "%s: Pipe profile doesn't exist \n", __func__); + return -EINVAL; + } /* Pipe profile commit */ *pipe_profile_id = s->n_pipe_profiles; -- 2.21.0