From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B9AEAA0547; Fri, 5 Mar 2021 14:45:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9FCD422A429; Fri, 5 Mar 2021 14:41:17 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 6B31222A413 for ; Fri, 5 Mar 2021 14:41:16 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 125DerQT001873 for ; Fri, 5 Mar 2021 05:41:15 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=Y3cMDOUlxGo4XSr3mMLRgBtSd896BQlltkd/hkswO7I=; b=P+DaJWv93xnI2FMJpARuAC24HBGZBzOAPPvfM+Xz7pBEPassBhd+eH38I5RoV91/XP1W PsORABchOP2z2I53q8P57qPTGPLPGAuqiNU+6jkjDXCmnPvWI9dUjop5sjUpaF9d7BkW hAJcnh8bMUu8B6F4zDDu3dfprToYdnM0DW1SwUZwsQi7gOjU9G4NtBcNcWll0nP528Gz sN6b3hIS8nJZZiGtEPwttISA8eSuLJwZUL0yKoISs/v7vduWPVihXugPQpHzmO26BqJi gksHUr4kJDR2RomvWf0chjAKnykO6LDkJ+hd1R3Mn8/LWF9Sl+WTvOfxoCbwj9oXVC3F BQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com with ESMTP id 372s2umrqk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 05 Mar 2021 05:41:15 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 5 Mar 2021 05:41:13 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 5 Mar 2021 05:41:13 -0800 Received: from hyd1588t430.marvell.com (unknown [10.29.52.204]) by maili.marvell.com (Postfix) with ESMTP id 2DE7D3F7041; Fri, 5 Mar 2021 05:41:10 -0800 (PST) From: Nithin Dabilpuram To: CC: , , , , , , , Nithin Dabilpuram Date: Fri, 5 Mar 2021 19:09:01 +0530 Message-ID: <20210305133918.8005-36-ndabilpuram@marvell.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20210305133918.8005-1-ndabilpuram@marvell.com> References: <20210305133918.8005-1-ndabilpuram@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.761 definitions=2021-03-05_08:2021-03-03, 2021-03-05 signatures=0 Subject: [dpdk-dev] [PATCH 35/52] common/cnxk: add nix tm helper to alloc and free resource X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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 TM helper API to estimate, alloc, assign, and free resources for a NIX LF / ethdev. Signed-off-by: Nithin Dabilpuram --- drivers/common/cnxk/roc_nix.h | 1 + drivers/common/cnxk/roc_nix_priv.h | 16 ++ drivers/common/cnxk/roc_nix_tm.c | 461 +++++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_nix_tm_ops.c | 11 + drivers/common/cnxk/roc_nix_tm_utils.c | 133 ++++++++++ drivers/common/cnxk/version.map | 1 + 6 files changed, 623 insertions(+) diff --git a/drivers/common/cnxk/roc_nix.h b/drivers/common/cnxk/roc_nix.h index cadf4ea..0f3b85c 100644 --- a/drivers/common/cnxk/roc_nix.h +++ b/drivers/common/cnxk/roc_nix.h @@ -359,6 +359,7 @@ int __roc_api roc_nix_tm_node_add(struct roc_nix *roc_nix, struct roc_nix_tm_node *roc_node); int __roc_api roc_nix_tm_node_delete(struct roc_nix *roc_nix, uint32_t node_id, bool free); +int __roc_api roc_nix_tm_free_resources(struct roc_nix *roc_nix, bool hw_only); int __roc_api roc_nix_tm_node_pkt_mode_update(struct roc_nix *roc_nix, uint32_t node_id, bool pkt_mode); int __roc_api roc_nix_tm_shaper_profile_add( diff --git a/drivers/common/cnxk/roc_nix_priv.h b/drivers/common/cnxk/roc_nix_priv.h index 278e7df..6e86681 100644 --- a/drivers/common/cnxk/roc_nix_priv.h +++ b/drivers/common/cnxk/roc_nix_priv.h @@ -329,8 +329,17 @@ int nix_tm_node_add(struct roc_nix *roc_nix, struct nix_tm_node *node); int nix_tm_node_delete(struct roc_nix *roc_nix, uint32_t node_id, enum roc_nix_tm_tree tree, bool free); int nix_tm_free_node_resource(struct nix *nix, struct nix_tm_node *node); +int nix_tm_free_resources(struct roc_nix *roc_nix, uint32_t tree_mask, + bool hw_only); int nix_tm_clear_path_xoff(struct nix *nix, struct nix_tm_node *node); void nix_tm_clear_shaper_profiles(struct nix *nix); +int nix_tm_alloc_txschq(struct nix *nix, enum roc_nix_tm_tree tree); +int nix_tm_assign_resources(struct nix *nix, enum roc_nix_tm_tree tree); +int nix_tm_release_resources(struct nix *nix, uint8_t hw_lvl, bool contig, + bool above_thresh); +void nix_tm_copy_rsp_to_nix(struct nix *nix, struct nix_txsch_alloc_rsp *rsp); + +int nix_tm_update_parent_info(struct nix *nix, enum roc_nix_tm_tree tree); /* * TM priv utils. @@ -347,11 +356,18 @@ struct nix_tm_shaper_profile *nix_tm_shaper_profile_search(struct nix *nix, uint32_t id); uint8_t nix_tm_sw_xoff_prep(struct nix_tm_node *node, bool enable, volatile uint64_t *reg, volatile uint64_t *regval); +uint32_t nix_tm_check_rr(struct nix *nix, uint32_t parent_id, + enum roc_nix_tm_tree tree, uint32_t *rr_prio, + uint32_t *max_prio); uint64_t nix_tm_shaper_profile_rate_min(struct nix *nix); uint64_t nix_tm_shaper_rate_conv(uint64_t value, uint64_t *exponent_p, uint64_t *mantissa_p, uint64_t *div_exp_p); uint64_t nix_tm_shaper_burst_conv(uint64_t value, uint64_t *exponent_p, uint64_t *mantissa_p); +bool nix_tm_child_res_valid(struct nix_tm_node_list *list, + struct nix_tm_node *parent); +uint16_t nix_tm_resource_estimate(struct nix *nix, uint16_t *schq_contig, + uint16_t *schq, enum roc_nix_tm_tree tree); struct nix_tm_node *nix_tm_node_alloc(void); void nix_tm_node_free(struct nix_tm_node *node); struct nix_tm_shaper_profile *nix_tm_shaper_profile_alloc(void); diff --git a/drivers/common/cnxk/roc_nix_tm.c b/drivers/common/cnxk/roc_nix_tm.c index 1bfdbf9..9adeab9 100644 --- a/drivers/common/cnxk/roc_nix_tm.c +++ b/drivers/common/cnxk/roc_nix_tm.c @@ -5,6 +5,15 @@ #include "roc_api.h" #include "roc_priv.h" +static inline int +bitmap_ctzll(uint64_t slab) +{ + if (slab == 0) + return 0; + + return __builtin_ctzll(slab); +} + void nix_tm_clear_shaper_profiles(struct nix *nix) { @@ -22,6 +31,44 @@ nix_tm_clear_shaper_profiles(struct nix *nix) } int +nix_tm_update_parent_info(struct nix *nix, enum roc_nix_tm_tree tree) +{ + struct nix_tm_node *child, *parent; + struct nix_tm_node_list *list; + uint32_t rr_prio, max_prio; + uint32_t rr_num = 0; + + list = nix_tm_node_list(nix, tree); + + /* Release all the node hw resources locally + * if parent marked as dirty and resource exists. + */ + TAILQ_FOREACH(child, list, node) { + /* Release resource only if parent direct hierarchy changed */ + if (child->flags & NIX_TM_NODE_HWRES && child->parent && + child->parent->child_realloc) { + nix_tm_free_node_resource(nix, child); + } + child->max_prio = UINT32_MAX; + } + + TAILQ_FOREACH(parent, list, node) { + /* Count group of children of same priority i.e are RR */ + rr_num = nix_tm_check_rr(nix, parent->id, tree, &rr_prio, + &max_prio); + + /* Assuming that multiple RR groups are + * not configured based on capability. + */ + parent->rr_prio = rr_prio; + parent->rr_num = rr_num; + parent->max_prio = max_prio; + } + + return 0; +} + +int nix_tm_node_add(struct roc_nix *roc_nix, struct nix_tm_node *node) { struct nix *nix = roc_nix_to_nix_priv(roc_nix); @@ -431,6 +478,71 @@ nix_tm_sq_flush_post(struct roc_nix_sq *sq) } int +nix_tm_release_resources(struct nix *nix, uint8_t hw_lvl, bool contig, + bool above_thresh) +{ + uint16_t avail, thresh, to_free = 0, schq; + struct mbox *mbox = (&nix->dev)->mbox; + struct nix_txsch_free_req *req; + struct plt_bitmap *bmp; + uint64_t slab = 0; + uint32_t pos = 0; + int rc = -ENOSPC; + + bmp = contig ? nix->schq_contig_bmp[hw_lvl] : nix->schq_bmp[hw_lvl]; + thresh = + contig ? nix->contig_rsvd[hw_lvl] : nix->discontig_rsvd[hw_lvl]; + plt_bitmap_scan_init(bmp); + + avail = nix_tm_resource_avail(nix, hw_lvl, contig); + + if (above_thresh) { + /* Release only above threshold */ + if (avail > thresh) + to_free = avail - thresh; + } else { + /* Release everything */ + to_free = avail; + } + + /* Now release resources to AF */ + while (to_free) { + if (!slab && !plt_bitmap_scan(bmp, &pos, &slab)) + break; + + schq = bitmap_ctzll(slab); + slab &= ~(1ULL << schq); + schq += pos; + + /* Free to AF */ + req = mbox_alloc_msg_nix_txsch_free(mbox); + if (req == NULL) + return rc; + req->flags = 0; + req->schq_lvl = hw_lvl; + req->schq = schq; + rc = mbox_process(mbox); + if (rc) { + plt_err("failed to release hwres %s(%u) rc %d", + nix_tm_hwlvl2str(hw_lvl), schq, rc); + return rc; + } + + plt_tm_dbg("Released hwres %s(%u)", nix_tm_hwlvl2str(hw_lvl), + schq); + plt_bitmap_clear(bmp, schq); + to_free--; + } + + if (to_free) { + plt_err("resource inconsistency for %s(%u)", + nix_tm_hwlvl2str(hw_lvl), contig); + return -EFAULT; + } + return 0; +} + +int nix_tm_free_node_resource(struct nix *nix, struct nix_tm_node *node) { struct mbox *mbox = (&nix->dev)->mbox; @@ -539,6 +651,355 @@ nix_tm_node_delete(struct roc_nix *roc_nix, uint32_t node_id, return 0; } +static int +nix_tm_assign_hw_id(struct nix *nix, struct nix_tm_node *parent, + uint16_t *contig_id, int *contig_cnt, + struct nix_tm_node_list *list) +{ + struct nix_tm_node *child; + struct plt_bitmap *bmp; + uint8_t child_hw_lvl; + int spare_schq = -1; + uint32_t pos = 0; + uint64_t slab; + uint16_t schq; + + child_hw_lvl = parent->hw_lvl - 1; + bmp = nix->schq_bmp[child_hw_lvl]; + plt_bitmap_scan_init(bmp); + slab = 0; + + /* Save spare schq if it is case of RR + SP */ + if (parent->rr_prio != 0xf && *contig_cnt > 1) + spare_schq = *contig_id + parent->rr_prio; + + TAILQ_FOREACH(child, list, node) { + if (!child->parent) + continue; + if (child->parent->id != parent->id) + continue; + + /* Resource never expected to be present */ + if (child->flags & NIX_TM_NODE_HWRES) { + plt_err("Resource exists for child (%s)%u, id %u (%p)", + nix_tm_hwlvl2str(child->hw_lvl), child->hw_id, + child->id, child); + return -EFAULT; + } + + if (!slab) + plt_bitmap_scan(bmp, &pos, &slab); + + if (child->priority == parent->rr_prio && spare_schq != -1) { + /* Use spare schq first if present */ + schq = spare_schq; + spare_schq = -1; + *contig_cnt = *contig_cnt - 1; + + } else if (child->priority == parent->rr_prio) { + /* Assign a discontiguous queue */ + if (!slab) { + plt_err("Schq not found for Child %u " + "lvl %u (%p)", + child->id, child->lvl, child); + return -ENOENT; + } + + schq = bitmap_ctzll(slab); + slab &= ~(1ULL << schq); + schq += pos; + plt_bitmap_clear(bmp, schq); + } else { + /* Assign a contiguous queue */ + schq = *contig_id + child->priority; + *contig_cnt = *contig_cnt - 1; + } + + plt_tm_dbg("Resource %s(%u), for lvl %u id %u(%p)", + nix_tm_hwlvl2str(child->hw_lvl), schq, child->lvl, + child->id, child); + + child->hw_id = schq; + child->parent_hw_id = parent->hw_id; + child->flags |= NIX_TM_NODE_HWRES; + } + + return 0; +} + +int +nix_tm_assign_resources(struct nix *nix, enum roc_nix_tm_tree tree) +{ + struct nix_tm_node *parent, *root = NULL; + struct plt_bitmap *bmp, *bmp_contig; + struct nix_tm_node_list *list; + uint8_t child_hw_lvl, hw_lvl; + uint16_t contig_id, j; + uint64_t slab = 0; + uint32_t pos = 0; + int cnt, rc; + + list = nix_tm_node_list(nix, tree); + /* Walk from TL1 to TL4 parents */ + for (hw_lvl = NIX_TXSCH_LVL_TL1; hw_lvl > 0; hw_lvl--) { + TAILQ_FOREACH(parent, list, node) { + child_hw_lvl = parent->hw_lvl - 1; + if (parent->hw_lvl != hw_lvl) + continue; + + /* Remember root for future */ + if (parent->hw_lvl == nix->tm_root_lvl) + root = parent; + + if (!parent->child_realloc) { + /* Skip when parent is not dirty */ + if (nix_tm_child_res_valid(list, parent)) + continue; + plt_err("Parent not dirty but invalid " + "child res parent id %u(lvl %u)", + parent->id, parent->lvl); + return -EFAULT; + } + + bmp_contig = nix->schq_contig_bmp[child_hw_lvl]; + + /* Prealloc contiguous indices for a parent */ + contig_id = NIX_TM_MAX_HW_TXSCHQ; + cnt = (int)parent->max_prio + 1; + if (cnt > 0) { + plt_bitmap_scan_init(bmp_contig); + if (!plt_bitmap_scan(bmp_contig, &pos, &slab)) { + plt_err("Contig schq not found"); + return -ENOENT; + } + contig_id = pos + bitmap_ctzll(slab); + + /* Check if we have enough */ + for (j = contig_id; j < contig_id + cnt; j++) { + if (!plt_bitmap_get(bmp_contig, j)) + break; + } + + if (j != contig_id + cnt) { + plt_err("Contig schq not sufficient"); + return -ENOENT; + } + + for (j = contig_id; j < contig_id + cnt; j++) + plt_bitmap_clear(bmp_contig, j); + } + + /* Assign hw id to all children */ + rc = nix_tm_assign_hw_id(nix, parent, &contig_id, &cnt, + list); + if (cnt || rc) { + plt_err("Unexpected err, contig res alloc, " + "parent %u, of %s, rc=%d, cnt=%d", + parent->id, nix_tm_hwlvl2str(hw_lvl), + rc, cnt); + return -EFAULT; + } + + /* Clear the dirty bit as children's + * resources are reallocated. + */ + parent->child_realloc = false; + } + } + + /* Root is always expected to be there */ + if (!root) + return -EFAULT; + + if (root->flags & NIX_TM_NODE_HWRES) + return 0; + + /* Process root node */ + bmp = nix->schq_bmp[nix->tm_root_lvl]; + plt_bitmap_scan_init(bmp); + if (!plt_bitmap_scan(bmp, &pos, &slab)) { + plt_err("Resource not allocated for root"); + return -EIO; + } + + root->hw_id = pos + bitmap_ctzll(slab); + root->flags |= NIX_TM_NODE_HWRES; + plt_bitmap_clear(bmp, root->hw_id); + + /* Get TL1 id as well when root is not TL1 */ + if (!nix_tm_have_tl1_access(nix)) { + bmp = nix->schq_bmp[NIX_TXSCH_LVL_TL1]; + + plt_bitmap_scan_init(bmp); + if (!plt_bitmap_scan(bmp, &pos, &slab)) { + plt_err("Resource not found for TL1"); + return -EIO; + } + root->parent_hw_id = pos + bitmap_ctzll(slab); + plt_bitmap_clear(bmp, root->parent_hw_id); + } + + plt_tm_dbg("Resource %s(%u) for root(id %u) (%p)", + nix_tm_hwlvl2str(root->hw_lvl), root->hw_id, root->id, root); + + return 0; +} + +void +nix_tm_copy_rsp_to_nix(struct nix *nix, struct nix_txsch_alloc_rsp *rsp) +{ + uint8_t lvl; + uint16_t i; + + for (lvl = 0; lvl < NIX_TXSCH_LVL_CNT; lvl++) { + for (i = 0; i < rsp->schq[lvl]; i++) + plt_bitmap_set(nix->schq_bmp[lvl], + rsp->schq_list[lvl][i]); + + for (i = 0; i < rsp->schq_contig[lvl]; i++) + plt_bitmap_set(nix->schq_contig_bmp[lvl], + rsp->schq_contig_list[lvl][i]); + } +} + +int +nix_tm_alloc_txschq(struct nix *nix, enum roc_nix_tm_tree tree) +{ + uint16_t schq_contig[NIX_TXSCH_LVL_CNT]; + struct mbox *mbox = (&nix->dev)->mbox; + uint16_t schq[NIX_TXSCH_LVL_CNT]; + struct nix_txsch_alloc_req *req; + struct nix_txsch_alloc_rsp *rsp; + uint8_t hw_lvl, i; + bool pend; + int rc; + + memset(schq, 0, sizeof(schq)); + memset(schq_contig, 0, sizeof(schq_contig)); + + /* Estimate requirement */ + rc = nix_tm_resource_estimate(nix, schq_contig, schq, tree); + if (!rc) + return 0; + + /* Release existing contiguous resources when realloc requested + * as there is no way to guarantee continuity of old with new. + */ + for (hw_lvl = 0; hw_lvl < NIX_TXSCH_LVL_CNT; hw_lvl++) { + if (schq_contig[hw_lvl]) + nix_tm_release_resources(nix, hw_lvl, true, false); + } + + /* Alloc as needed */ + do { + pend = false; + req = mbox_alloc_msg_nix_txsch_alloc(mbox); + if (!req) { + rc = -ENOMEM; + goto alloc_err; + } + mbox_memcpy(req->schq, schq, sizeof(req->schq)); + mbox_memcpy(req->schq_contig, schq_contig, + sizeof(req->schq_contig)); + + /* Each alloc can be at max of MAX_TXSCHQ_PER_FUNC per level. + * So split alloc to multiple requests. + */ + for (i = 0; i < NIX_TXSCH_LVL_CNT; i++) { + if (req->schq[i] > MAX_TXSCHQ_PER_FUNC) + req->schq[i] = MAX_TXSCHQ_PER_FUNC; + schq[i] -= req->schq[i]; + + if (req->schq_contig[i] > MAX_TXSCHQ_PER_FUNC) + req->schq_contig[i] = MAX_TXSCHQ_PER_FUNC; + schq_contig[i] -= req->schq_contig[i]; + + if (schq[i] || schq_contig[i]) + pend = true; + } + + rc = mbox_process_msg(mbox, (void *)&rsp); + if (rc) + goto alloc_err; + + nix_tm_copy_rsp_to_nix(nix, rsp); + } while (pend); + + nix->tm_link_cfg_lvl = rsp->link_cfg_lvl; + return 0; +alloc_err: + for (i = 0; i < NIX_TXSCH_LVL_CNT; i++) { + if (nix_tm_release_resources(nix, i, true, false)) + plt_err("Failed to release contig resources of " + "lvl %d on error", + i); + if (nix_tm_release_resources(nix, i, false, false)) + plt_err("Failed to release discontig resources of " + "lvl %d on error", + i); + } + return rc; +} + +int +nix_tm_free_resources(struct roc_nix *roc_nix, uint32_t tree_mask, bool hw_only) +{ + struct nix *nix = roc_nix_to_nix_priv(roc_nix); + struct nix_tm_shaper_profile *profile; + struct nix_tm_node *node, *next_node; + struct nix_tm_node_list *list; + enum roc_nix_tm_tree tree; + uint32_t profile_id; + int rc = 0; + + for (tree = 0; tree < ROC_NIX_TM_TREE_MAX; tree++) { + if (!(tree_mask & BIT(tree))) + continue; + + plt_tm_dbg("Freeing resources of tree %u", tree); + + list = nix_tm_node_list(nix, tree); + next_node = TAILQ_FIRST(list); + while (next_node) { + node = next_node; + next_node = TAILQ_NEXT(node, node); + + if (!nix_tm_is_leaf(nix, node->lvl) && + node->flags & NIX_TM_NODE_HWRES) { + /* Clear xoff in path for flush to succeed */ + rc = nix_tm_clear_path_xoff(nix, node); + if (rc) + return rc; + rc = nix_tm_free_node_resource(nix, node); + if (rc) + return rc; + } + } + + /* Leave software elements if needed */ + if (hw_only) + continue; + + next_node = TAILQ_FIRST(list); + while (next_node) { + node = next_node; + next_node = TAILQ_NEXT(node, node); + + plt_tm_dbg("Free node lvl %u id %u (%p)", node->lvl, + node->id, node); + + profile_id = node->shaper_profile_id; + profile = nix_tm_shaper_profile_search(nix, profile_id); + if (profile) + profile->ref_cnt--; + + TAILQ_REMOVE(list, node, node); + nix_tm_node_free(node); + } + } + return rc; +} + int nix_tm_conf_init(struct roc_nix *roc_nix) { diff --git a/drivers/common/cnxk/roc_nix_tm_ops.c b/drivers/common/cnxk/roc_nix_tm_ops.c index 015f20e..958cceb 100644 --- a/drivers/common/cnxk/roc_nix_tm_ops.c +++ b/drivers/common/cnxk/roc_nix_tm_ops.c @@ -66,6 +66,17 @@ roc_nix_tm_sq_aura_fc(struct roc_nix_sq *sq, bool enable) return 0; } +int +roc_nix_tm_free_resources(struct roc_nix *roc_nix, bool hw_only) +{ + struct nix *nix = roc_nix_to_nix_priv(roc_nix); + + if (nix->tm_flags & NIX_TM_HIERARCHY_ENA) + return -EBUSY; + + return nix_tm_free_resources(roc_nix, BIT(ROC_NIX_TM_USER), hw_only); +} + static int nix_tm_shaper_profile_add(struct roc_nix *roc_nix, struct nix_tm_shaper_profile *profile, int skip_ins) diff --git a/drivers/common/cnxk/roc_nix_tm_utils.c b/drivers/common/cnxk/roc_nix_tm_utils.c index 5eb93a7..e385787 100644 --- a/drivers/common/cnxk/roc_nix_tm_utils.c +++ b/drivers/common/cnxk/roc_nix_tm_utils.c @@ -177,6 +177,58 @@ nix_tm_shaper_burst_conv(uint64_t value, uint64_t *exponent_p, return NIX_TM_SHAPER_BURST(exponent, mantissa); } +uint32_t +nix_tm_check_rr(struct nix *nix, uint32_t parent_id, enum roc_nix_tm_tree tree, + uint32_t *rr_prio, uint32_t *max_prio) +{ + uint32_t node_cnt[NIX_TM_TLX_SP_PRIO_MAX]; + struct nix_tm_node_list *list; + struct nix_tm_node *node; + uint32_t rr_num = 0, i; + uint32_t children = 0; + uint32_t priority; + + memset(node_cnt, 0, sizeof(node_cnt)); + *rr_prio = 0xF; + *max_prio = UINT32_MAX; + + list = nix_tm_node_list(nix, tree); + TAILQ_FOREACH(node, list, node) { + if (!node->parent) + continue; + + if (!(node->parent->id == parent_id)) + continue; + + priority = node->priority; + node_cnt[priority]++; + children++; + } + + for (i = 0; i < NIX_TM_TLX_SP_PRIO_MAX; i++) { + if (!node_cnt[i]) + break; + + if (node_cnt[i] > rr_num) { + *rr_prio = i; + rr_num = node_cnt[i]; + } + } + + /* RR group of single RR child is considered as SP */ + if (rr_num == 1) { + *rr_prio = 0xF; + rr_num = 0; + } + + /* Max prio will be returned only when we have non zero prio + * or if a parent has single child. + */ + if (i > 1 || (children == 1)) + *max_prio = i - 1; + return rr_num; +} + static uint16_t nix_tm_max_prio(struct nix *nix, uint16_t hw_lvl) { @@ -241,6 +293,21 @@ nix_tm_validate_prio(struct nix *nix, uint32_t lvl, uint32_t parent_id, return 0; } +bool +nix_tm_child_res_valid(struct nix_tm_node_list *list, + struct nix_tm_node *parent) +{ + struct nix_tm_node *child; + + TAILQ_FOREACH(child, list, node) { + if (child->parent != parent) + continue; + if (!(child->flags & NIX_TM_NODE_HWRES)) + return false; + } + return true; +} + uint8_t nix_tm_sw_xoff_prep(struct nix_tm_node *node, bool enable, volatile uint64_t *reg, volatile uint64_t *regval) @@ -325,6 +392,72 @@ nix_tm_resource_avail(struct nix *nix, uint8_t hw_lvl, bool contig) return count; } +uint16_t +nix_tm_resource_estimate(struct nix *nix, uint16_t *schq_contig, uint16_t *schq, + enum roc_nix_tm_tree tree) +{ + struct nix_tm_node_list *list; + uint8_t contig_cnt, hw_lvl; + struct nix_tm_node *parent; + uint16_t cnt = 0, avail; + + list = nix_tm_node_list(nix, tree); + /* Walk through parents from TL1..TL4 */ + for (hw_lvl = NIX_TXSCH_LVL_TL1; hw_lvl > 0; hw_lvl--) { + TAILQ_FOREACH(parent, list, node) { + if (hw_lvl != parent->hw_lvl) + continue; + + /* Skip accounting for children whose + * parent does not indicate so. + */ + if (!parent->child_realloc) + continue; + + /* Count children needed */ + schq[hw_lvl - 1] += parent->rr_num; + if (parent->max_prio != UINT32_MAX) { + contig_cnt = parent->max_prio + 1; + schq_contig[hw_lvl - 1] += contig_cnt; + /* When we have SP + DWRR at a parent, + * we will always have a spare schq at rr prio + * location in contiguous queues. Hence reduce + * discontiguous count by 1. + */ + if (parent->max_prio > 0 && parent->rr_num) + schq[hw_lvl - 1] -= 1; + } + } + } + + schq[nix->tm_root_lvl] = 1; + if (!nix_tm_have_tl1_access(nix)) + schq[NIX_TXSCH_LVL_TL1] = 1; + + /* Now check for existing resources */ + for (hw_lvl = 0; hw_lvl < NIX_TXSCH_LVL_CNT; hw_lvl++) { + avail = nix_tm_resource_avail(nix, hw_lvl, false); + if (schq[hw_lvl] <= avail) + schq[hw_lvl] = 0; + else + schq[hw_lvl] -= avail; + + /* For contiguous queues, realloc everything */ + avail = nix_tm_resource_avail(nix, hw_lvl, true); + if (schq_contig[hw_lvl] <= avail) + schq_contig[hw_lvl] = 0; + + cnt += schq[hw_lvl]; + cnt += schq_contig[hw_lvl]; + + plt_tm_dbg("Estimate resources needed for %s: dis %u cont %u", + nix_tm_hwlvl2str(hw_lvl), schq[hw_lvl], + schq_contig[hw_lvl]); + } + + return cnt; +} + int roc_nix_tm_node_lvl(struct roc_nix *roc_nix, uint32_t node_id) { diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map index 5acbf4c..7b940c1 100644 --- a/drivers/common/cnxk/version.map +++ b/drivers/common/cnxk/version.map @@ -103,6 +103,7 @@ INTERNAL { roc_nix_xstats_names_get; roc_nix_switch_hdr_set; roc_nix_eeprom_info_get; + roc_nix_tm_free_resources; roc_nix_tm_node_add; roc_nix_tm_node_delete; roc_nix_tm_node_get; -- 2.8.4