From: Greg Kroah-Hartman Date: Mon, 16 Jan 2023 10:04:48 +0000 (+0100) Subject: drop queue-5.15/octeontx2-pf-fix-resource-leakage-in-vf-driver-unbin.patch X-Git-Tag: v4.14.303~34 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b75e0e48d8f028e81a76ac6d7a743564b8363b44;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.15/octeontx2-pf-fix-resource-leakage-in-vf-driver-unbin.patch It broke the build. --- diff --git a/queue-5.15/octeontx2-pf-fix-resource-leakage-in-vf-driver-unbin.patch b/queue-5.15/octeontx2-pf-fix-resource-leakage-in-vf-driver-unbin.patch deleted file mode 100644 index 06098e1828e..00000000000 --- a/queue-5.15/octeontx2-pf-fix-resource-leakage-in-vf-driver-unbin.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e422a25ea9385a41d9691223032679574f6664ce Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 9 Jan 2023 11:43:25 +0530 -Subject: octeontx2-pf: Fix resource leakage in VF driver unbind - -From: Hariprasad Kelam - -[ Upstream commit 53da7aec32982f5ee775b69dce06d63992ce4af3 ] - -resources allocated like mcam entries to support the Ntuple feature -and hash tables for the tc feature are not getting freed in driver -unbind. This patch fixes the issue. - -Fixes: 2da489432747 ("octeontx2-pf: devlink params support to set mcam entry count") -Signed-off-by: Hariprasad Kelam -Signed-off-by: Sunil Kovvuri Goutham -Link: https://lore.kernel.org/r/20230109061325.21395-1-hkelam@marvell.com -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c -index 03b4ec630432..1613638c69a1 100644 ---- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c -+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c -@@ -736,6 +736,8 @@ static void otx2vf_remove(struct pci_dev *pdev) - unregister_netdev(netdev); - if (vf->otx2_wq) - destroy_workqueue(vf->otx2_wq); -+ otx2_mcam_flow_del(vf); -+ otx2_shutdown_tc(vf); - otx2vf_disable_mbox_intr(vf); - otx2_detach_resources(&vf->mbox); - if (test_bit(CN10K_LMTST, &vf->hw.cap_flag)) --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 0588cd7618e..079723e6105 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -67,7 +67,6 @@ tools-nolibc-fix-the-o_-fcntl-open-macro-definitions.patch net-sched-act_mpls-fix-warning-during-failed-attribu.patch net-mlx5-fix-ptp-max-frequency-adjustment-range.patch net-mlx5e-don-t-support-encap-rules-with-gbp-option.patch -octeontx2-pf-fix-resource-leakage-in-vf-driver-unbin.patch perf-build-properly-guard-libbpf-includes.patch igc-fix-pps-delta-between-two-synchronized-end-point.patch platform-surface-aggregator-add-missing-call-to-ssam.patch