tcx: Fix splat in ingress_destroy upon tcx_entry_free

jira LE-1907
Rebuild_History Non-Buildable kernel-5.14.0-427.18.1.el9_4
commit-author Daniel Borkmann <[email protected]>
commit dc644b5
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-5.14.0-427.18.1.el9_4/dc644b54.failed

On qdisc destruction, the ingress_destroy() needs to update the correct
entry, that is, tcx_entry_update must NULL the dev->tcx_ingress pointer.
Therefore, fix the typo.

Fixes: e420bed ("bpf: Add fd-based tcx multi-prog infra with link support")
	Reported-by: [email protected]
	Reported-by: [email protected]
	Reported-by: [email protected]
	Signed-off-by: Daniel Borkmann <[email protected]>
	Tested-by: [email protected]
	Tested-by: [email protected]
	Tested-by: [email protected]
	Tested-by: Petr Machata <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
	Signed-off-by: Jakub Kicinski <[email protected]>
(cherry picked from commit dc644b5)
	Signed-off-by: Jonathan Maple <[email protected]>

# Conflicts:
#	net/sched/sch_ingress.c

Author: PlaidCat

ciq/ciq_backports/kernel-5.14.0-427.18.1.el9_4/dc644b54.failed

@@ -0,0 +1,54 @@
+tcx: Fix splat in ingress_destroy upon tcx_entry_free
+
+jira LE-1907
+Rebuild_History Non-Buildable kernel-5.14.0-427.18.1.el9_4
+commit-author Daniel Borkmann <[email protected]>
+commit dc644b540a2d2874112706591234be3d3fbf9ef7
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-5.14.0-427.18.1.el9_4/dc644b54.failed
+
+On qdisc destruction, the ingress_destroy() needs to update the correct
+entry, that is, tcx_entry_update must NULL the dev->tcx_ingress pointer.
+Therefore, fix the typo.
+
+Fixes: e420bed02507 ("bpf: Add fd-based tcx multi-prog infra with link support")
+	Reported-by: [email protected]
+	Reported-by: [email protected]
+	Reported-by: [email protected]
+	Signed-off-by: Daniel Borkmann <[email protected]>
+	Tested-by: [email protected]
+	Tested-by: [email protected]
+	Tested-by: [email protected]
+	Tested-by: Petr Machata <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+	Signed-off-by: Jakub Kicinski <[email protected]>
+(cherry picked from commit dc644b540a2d2874112706591234be3d3fbf9ef7)
+	Signed-off-by: Jonathan Maple <[email protected]>
+
+# Conflicts:
+#	net/sched/sch_ingress.c
+diff --cc net/sched/sch_ingress.c
+index e43a45499372,a463a63192c3..000000000000
+--- a/net/sched/sch_ingress.c
++++ b/net/sched/sch_ingress.c
+@@@ -108,6 -119,15 +108,18 @@@ static void ingress_destroy(struct Qdis
+  		return;
+  
+  	tcf_block_put_ext(q->block, sch, &q->block_info);
+++<<<<<<< HEAD
+++=======
++ 
++ 	if (entry) {
++ 		tcx_miniq_set_active(entry, false);
++ 		if (!tcx_entry_is_active(entry)) {
++ 			tcx_entry_update(dev, NULL, true);
++ 			tcx_entry_free(entry);
++ 		}
++ 	}
++ 
+++>>>>>>> dc644b540a2d (tcx: Fix splat in ingress_destroy upon tcx_entry_free)
+  	net_dec_ingress_queue();
+  }
+  
+* Unmerged path net/sched/sch_ingress.c