* [dpdk-stable] [PATCH 19.11] net/cxgbe: fix L2T leak in filter error and free path
@ 2020-08-15 14:37 Rahul Lakkireddy
2020-08-17 9:42 ` Luca Boccassi
0 siblings, 1 reply; 2+ messages in thread
From: Rahul Lakkireddy @ 2020-08-15 14:37 UTC (permalink / raw)
To: stable
[ upstream commit e0e1496be5fcabd31807ef9981c421963a9f8578 ]
Free up Layer 2 Table (L2T) entry properly during filter create
failure and filter delete.
Fixes: 1decc62b1cbe ("net/cxgbe: add flow operations to offload VLAN actions")
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
---
drivers/net/cxgbe/cxgbe_filter.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/drivers/net/cxgbe/cxgbe_filter.c b/drivers/net/cxgbe/cxgbe_filter.c
index 07337bb4b..7affa0785 100644
--- a/drivers/net/cxgbe/cxgbe_filter.c
+++ b/drivers/net/cxgbe/cxgbe_filter.c
@@ -281,6 +281,9 @@ static void clear_filter(struct filter_entry *f)
if (f->clipt)
cxgbe_clip_release(f->dev, f->clipt);
+ if (f->l2t)
+ cxgbe_l2t_release(f->l2t);
+
if (f->fs.mask.macidx)
cxgbe_mpstcam_remove(pi, f->fs.val.macidx);
@@ -735,19 +738,6 @@ static int set_filter_wr(struct rte_eth_dev *dev, unsigned int fidx)
unsigned int port_id = ethdev2pinfo(dev)->port_id;
int ret;
- /*
- * If the new filter requires loopback Destination MAC and/or VLAN
- * rewriting then we need to allocate a Layer 2 Table (L2T) entry for
- * the filter.
- */
- if (f->fs.newvlan) {
- /* allocate L2T entry for new filter */
- f->l2t = cxgbe_l2t_alloc_switching(f->dev, f->fs.vlan,
- f->fs.eport, f->fs.dmac);
- if (!f->l2t)
- return -ENOMEM;
- }
-
ctrlq = &adapter->sge.ctrlq[port_id];
mbuf = rte_pktmbuf_alloc(ctrlq->mb_pool);
if (!mbuf) {
@@ -1057,6 +1047,19 @@ int cxgbe_set_filter(struct rte_eth_dev *dev, unsigned int filter_id,
}
}
+ /* If the new filter requires loopback Destination MAC and/or VLAN
+ * rewriting then we need to allocate a Layer 2 Table (L2T) entry for
+ * the filter.
+ */
+ if (f->fs.newvlan) {
+ f->l2t = cxgbe_l2t_alloc_switching(f->dev, f->fs.vlan,
+ f->fs.eport, f->fs.dmac);
+ if (!f->l2t) {
+ ret = -ENOMEM;
+ goto free_tid;
+ }
+ }
+
/*
* Attempt to set the filter. If we don't succeed, we clear
* it and return the failure.
--
2.24.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-stable] [PATCH 19.11] net/cxgbe: fix L2T leak in filter error and free path
2020-08-15 14:37 [dpdk-stable] [PATCH 19.11] net/cxgbe: fix L2T leak in filter error and free path Rahul Lakkireddy
@ 2020-08-17 9:42 ` Luca Boccassi
0 siblings, 0 replies; 2+ messages in thread
From: Luca Boccassi @ 2020-08-17 9:42 UTC (permalink / raw)
To: Rahul Lakkireddy, stable
On Sat, 2020-08-15 at 20:07 +0530, Rahul Lakkireddy wrote:
> [ upstream commit e0e1496be5fcabd31807ef9981c421963a9f8578 ]
>
> Free up Layer 2 Table (L2T) entry properly during filter create
> failure and filter delete.
>
> Fixes: 1decc62b1cbe ("net/cxgbe: add flow operations to offload VLAN actions")
>
> Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
> ---
> drivers/net/cxgbe/cxgbe_filter.c | 29 ++++++++++++++++-------------
> 1 file changed, 16 insertions(+), 13 deletions(-)
Thanks, acked, applied and pushed.
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-17 9:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-15 14:37 [dpdk-stable] [PATCH 19.11] net/cxgbe: fix L2T leak in filter error and free path Rahul Lakkireddy
2020-08-17 9:42 ` Luca Boccassi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).