From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A3728A04B5; Wed, 16 Sep 2020 18:46:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C78421D406; Wed, 16 Sep 2020 18:45:05 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 92B921D15F for ; Wed, 16 Sep 2020 18:44:53 +0200 (CEST) IronPort-SDR: 7UMvTY+5yvZ2kXZ7QYBt1FxBFSlLP5XDlfOkpNw0ABQeI+TaWodakK+EFg3kNWFLpHK0X1fbp5 gY6qKXf6D2Pg== X-IronPort-AV: E=McAfee;i="6000,8403,9746"; a="221069947" X-IronPort-AV: E=Sophos;i="5.76,433,1592895600"; d="scan'208";a="221069947" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2020 09:44:42 -0700 IronPort-SDR: hyxi9EHYA+L8sQ/PWwj5wAk9qOOiOsvxIMaYmqd5flHQIuIOALWrHfNxyEVkPMmmueD02uWGZH 0YvJAUCPMgUA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,433,1592895600"; d="scan'208";a="451925132" Received: from silpixa00400629.ir.intel.com ([10.237.214.135]) by orsmga004.jf.intel.com with ESMTP; 16 Sep 2020 09:44:41 -0700 From: Savinay Dharmappa To: jasvinder.singh@intel.com, cristian.dumitrescu@intel.com, dev@dpdk.org Cc: savinay.dharmappa@intel.com Date: Wed, 16 Sep 2020 17:43:47 +0100 Message-Id: <1600274633-371993-4-git-send-email-savinay.dharmappa@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1600274633-371993-1-git-send-email-savinay.dharmappa@intel.com> References: <1599763717-135002-1-git-send-email-savinay.dharmappa@intel.com> <1600274633-371993-1-git-send-email-savinay.dharmappa@intel.com> Subject: [dpdk-dev] [PATCH v3 3/9] sched: add subport profile add and config 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" Add apis to add new subport profile and configure it. Signed-off-by: Savinay Dharmappa Signed-off-by: Jasvinder Singh --- lib/librte_sched/rte_sched.c | 118 +++++++++++++++++++++++++++++++++ lib/librte_sched/rte_sched.h | 45 +++++++++++++ lib/librte_sched/rte_sched_version.map | 2 + 3 files changed, 165 insertions(+) diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c index 5fa7865..23aaec4 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -174,6 +174,8 @@ struct rte_sched_subport { /* Statistics */ struct rte_sched_subport_stats stats __rte_cache_aligned; + /* subport profile */ + uint32_t profile; /* Subport pipes */ uint32_t n_pipes_per_subport_enabled; uint32_t n_pipe_profiles; @@ -1343,6 +1345,56 @@ rte_sched_subport_config(struct rte_sched_port *port, } int +rte_sched_subport_profile_config(struct rte_sched_port *port, + uint32_t subport_id, + uint32_t profile_id) +{ + int i; + struct rte_sched_subport_profile *params; + uint32_t n_subports = subport_id + 1; + struct rte_sched_subport *s; + + if (port == NULL) { + RTE_LOG(ERR, SCHED, + "%s: Incorrect value for parameter port\n", __func__); + return -EINVAL; + } + + if (subport_id >= port->n_subports_per_port) { + RTE_LOG(ERR, SCHED, "%s: " + "Incorrect value for parameter subport id\n", __func__); + + rte_sched_free_memory(port, n_subports); + return -EINVAL; + } + + params = port->subport_profiles + profile_id; + + s = port->subports[subport_id]; + + s->tb_credits = params->tb_size / 2; + + s->tc_time = port->time + params->tc_period; + + for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) + if (s->qsize[i]) + s->tc_credits[i] = + params->tc_credits_per_period[i]; + else + params->tc_credits_per_period[i] = 0; + +#ifdef RTE_SCHED_SUBPORT_TC_OV + s->tc_ov_wm_max = rte_sched_time_ms_to_bytes(params->tc_period, + s->pipe_tc_be_rate_max); +#endif + s->profile = profile_id; + + rte_sched_port_log_subport_profile(port, profile_id); + + return 0; +} + +int rte_sched_pipe_config(struct rte_sched_port *port, uint32_t subport_id, uint32_t pipe_id, @@ -1526,6 +1578,72 @@ rte_sched_subport_pipe_profile_add(struct rte_sched_port *port, return 0; } +int +rte_sched_port_subport_profile_add(struct rte_sched_port *port, + struct rte_sched_subport_profile_params *params, + uint32_t *subport_profile_id) +{ + int status; + uint32_t i; + struct rte_sched_subport_profile *dst; + + /* Port */ + if (port == NULL) { + RTE_LOG(ERR, SCHED, "%s: " + "Incorrect value for parameter port\n", __func__); + return -EINVAL; + } + + if (params == NULL) { + RTE_LOG(ERR, SCHED, "%s: " + "Incorrect value for parameter profile\n", __func__); + return -EINVAL; + } + + if (subport_profile_id == NULL) { + RTE_LOG(ERR, SCHED, "%s: " + "Incorrect value for parameter subport_profile_id\n", + __func__); + return -EINVAL; + } + + dst = port->subport_profiles + port->n_subport_profiles; + + /* Subport profiles exceeds the max limit */ + if (port->n_subport_profiles >= port->n_max_subport_profiles) { + RTE_LOG(ERR, SCHED, "%s: " + "Number of subport profiles exceeds the max limit\n", + __func__); + return -EINVAL; + } + + status = subport_profile_check(params, port->rate); + if (status != 0) { + RTE_LOG(ERR, SCHED, + "%s: subport profile check failed(%d)\n", __func__, status); + return -EINVAL; + } + + rte_sched_subport_profile_convert(params, dst, port->rate); + + /* Subport profile should not exists */ + for (i = 0; i < port->n_subport_profiles; i++) + if (memcmp(port->subport_profiles + i, + dst, sizeof(*dst)) == 0) { + RTE_LOG(ERR, SCHED, + "%s: subport profile exists\n", __func__); + return -EINVAL; + } + + /* Subport profile commit */ + *subport_profile_id = port->n_subport_profiles; + port->n_subport_profiles++; + + rte_sched_port_log_subport_profile(port, *subport_profile_id); + + return 0; +} + static inline uint32_t rte_sched_port_qindex(struct rte_sched_port *port, uint32_t subport, diff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h index 39339b7..a7c2638 100644 --- a/lib/librte_sched/rte_sched.h +++ b/lib/librte_sched/rte_sched.h @@ -337,6 +337,29 @@ rte_sched_subport_pipe_profile_add(struct rte_sched_port *port, uint32_t *pipe_profile_id); /** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Hierarchical scheduler subport bandwidth profile add + * Note that this function is safe to use in runtime for adding new + * subport bandwidth profile as it doesn't have any impact on hiearchical + * structure of the scheduler. + * @param port + * Handle to port scheduler instance + * @param struct rte_sched_subport_profile + * Subport bandwidth profile + * @param subport_profile_d + * Subport profile id + * @return + * 0 upon success, error code otherwise + */ +__rte_experimental +int +rte_sched_port_subport_profile_add(struct rte_sched_port *port, + struct rte_sched_subport_profile_params *profile, + uint32_t *subport_profile_id); + +/** * Hierarchical scheduler subport configuration * * @param port @@ -354,6 +377,28 @@ rte_sched_subport_config(struct rte_sched_port *port, struct rte_sched_subport_params *params); /** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Hierarchical scheduler subport profile configuration + * Note that this function is safe to use in runtime for applying any specific + * subport bandwidth profile as it doesn't have any impact on hiearchical + * structure of the scheduler. + * @param port + * Handle to port scheduler instance + * @param subport_id + * Subport ID + * @param profile_d + * Subport profile id + * @return + * 0 upon success, error code otherwise + */ +__rte_experimental +int +rte_sched_subport_profile_config(struct rte_sched_port *port, + uint32_t subport_id, + uint32_t profile_id); +/** * Hierarchical scheduler pipe configuration * * @param port diff --git a/lib/librte_sched/rte_sched_version.map b/lib/librte_sched/rte_sched_version.map index 3faef6f..e64335f 100644 --- a/lib/librte_sched/rte_sched_version.map +++ b/lib/librte_sched/rte_sched_version.map @@ -28,4 +28,6 @@ EXPERIMENTAL { global: rte_sched_subport_pipe_profile_add; + rte_sched_port_subport_profile_add; + rte_sched_subport_profile_config; }; -- 2.7.4