2024-05-23 07:36:57

by Hariprasad Kelam

[permalink] [raw]
Subject: [net] Octeontx2-pf: Free send queue buffers incase of leaf to inner

There are two type of classes. "Leaf classes" that are the
bottom of the class hierarchy. "Inner classes" that are neither
the root class nor leaf classes. QoS rules can only specify leaf
classes as targets for traffic.

Root
/ \
/ \
1 2
/\
/ \
4 5
classes 1,4 and 5 are leaf classes.
class 2 is a inner class.

When a leaf class made as inner, or vice versa, resources associated
with send queue (send queue buffers and transmit schedulers) are not
getting freed.

Fixes: 5e6808b4c68d ("octeontx2-pf: Add support for HTB offload")
Signed-off-by: Hariprasad Kelam <[email protected]>
---
drivers/net/ethernet/marvell/octeontx2/nic/qos.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/qos.c b/drivers/net/ethernet/marvell/octeontx2/nic/qos.c
index 070711df612e..edac008099c0 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/qos.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/qos.c
@@ -1422,7 +1422,10 @@ static int otx2_qos_leaf_to_inner(struct otx2_nic *pfvf, u16 classid,
otx2_qos_read_txschq_cfg(pfvf, node, old_cfg);

/* delete the txschq nodes allocated for this node */
+ otx2_qos_disable_sq(pfvf, qid);
+ otx2_qos_free_hw_node_schq(pfvf, node);
otx2_qos_free_sw_node_schq(pfvf, node);
+ pfvf->qos.qid_to_sqmap[qid] = OTX2_QOS_INVALID_SQ;

/* mark this node as htb inner node */
WRITE_ONCE(node->qid, OTX2_QOS_QID_INNER);
@@ -1632,6 +1635,7 @@ static int otx2_qos_leaf_del_last(struct otx2_nic *pfvf, u16 classid, bool force
dwrr_del_node = true;

/* destroy the leaf node */
+ otx2_qos_disable_sq(pfvf, qid);
otx2_qos_destroy_node(pfvf, node);
pfvf->qos.qid_to_sqmap[qid] = OTX2_QOS_INVALID_SQ;

--
2.17.1



2024-05-27 10:09:22

by patchwork-bot+netdevbpf

[permalink] [raw]
Subject: Re: [net] Octeontx2-pf: Free send queue buffers incase of leaf to inner

Hello:

This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:

On Thu, 23 May 2024 13:06:26 +0530 you wrote:
> There are two type of classes. "Leaf classes" that are the
> bottom of the class hierarchy. "Inner classes" that are neither
> the root class nor leaf classes. QoS rules can only specify leaf
> classes as targets for traffic.
>
> Root
> / \
> / \
> 1 2
> /\
> / \
> 4 5
> classes 1,4 and 5 are leaf classes.
> class 2 is a inner class.
>
> [...]

Here is the summary with links:
- [net] Octeontx2-pf: Free send queue buffers incase of leaf to inner
https://git.kernel.org/netdev/net/c/168484214767

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html