Cong Wang a7df4870d7 net_sched: fix tcm_parent in tc filter dump ... When we tell kernel to dump filters from root (ffff:ffff), those filters on ingress (ffff:0000) are matched, but their true parents must be dumped as they are. However, kernel dumps just whatever we tell it, that is either ffff:ffff or ffff:0000: $ nl-cls-list --dev=dummy0 --parent=root cls basic dev dummy0 id none parent root prio 49152 protocol ip match-all cls basic dev dummy0 id :1 parent root prio 49152 protocol ip match-all $ nl-cls-list --dev=dummy0 --parent=ffff: cls basic dev dummy0 id none parent ffff: prio 49152 protocol ip match-all cls basic dev dummy0 id :1 parent ffff: prio 49152 protocol ip match-all This is confusing and misleading, more importantly this is a regression since 4.15, so the old behavior must be restored. And, when tc filters are installed on a tc class, the parent should be the classid, rather than the qdisc handle. Commit edf6711c98 ("net: sched: remove classid and q fields from tcf_proto") removed the classid we save for filters, we can just restore this classid in tcf_block. Steps to reproduce this: ip li set dev dummy0 up tc qd add dev dummy0 ingress tc filter add dev dummy0 parent ffff: protocol arp basic action pass tc filter show dev dummy0 root Before this patch: filter protocol arp pref 49152 basic filter protocol arp pref 49152 basic handle 0x1 action order 1: gact action pass random type none pass val 0 index 1 ref 1 bind 1 After this patch: filter parent ffff: protocol arp pref 49152 basic filter parent ffff: protocol arp pref 49152 basic handle 0x1 action order 1: gact action pass random type none pass val 0 index 1 ref 1 bind 1 Fixes: a10fa20101 ("net: sched: propagate q and parent from caller down to tcf_fill_node") Fixes: edf6711c98 ("net: sched: remove classid and q fields from tcf_proto") Cc: Jamal Hadi Salim <jhs@mojatatu.com> Cc: Jiri Pirko <jiri@resnulli.us> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-04 11:53:33 -07:00
..
acpi	Additional ACPI updates for 5.7-rc1	2020-04-06 10:35:06 -07:00
asm-generic	arch: split MODULE_ARCH_VERMAGIC definitions out to <asm/vermagic.h>	2020-04-23 10:50:26 +09:00
clocksource	pwm: omap-dmtimer: Drop unused header file	2020-03-30 18:03:06 +02:00
crypto	crypto: curve25519 - do not pollute dispatcher based on assembler	2020-04-09 00:01:59 +09:00
drm	drm/bridge: analogix_dp: Split bind() into probe() and real bind()	2020-04-09 10:29:35 +02:00
dt-bindings	RISC-V Patches for the 5.7 Merge Window, Part 1	2020-04-09 10:51:30 -07:00
keys	KEYS: Don't write out to userspace while holding key semaphore	2020-03-29 12:40:41 +01:00
kunit	kunit: subtests should be indented 4 spaces according to TAP	2020-03-26 14:08:41 -06:00
kvm
linux	mptcp: move option parsing into mptcp_incoming_options()	2020-04-30 12:23:22 -07:00
math-emu
media
misc
net	net_sched: fix tcm_parent in tc filter dump	2020-05-04 11:53:33 -07:00
pcmcia
ras
rdma	IB/mlx5: Expose UAR object and its alloc/destroy commands	2020-03-27 12:59:04 -03:00
scsi	SCSI misc on 20200402	2020-04-02 17:03:53 -07:00
soc	ARM: SoC fixes	2020-04-23 09:36:40 -07:00
sound	ASoC: Fixes for v5.7	2020-04-21 21:41:36 +02:00
target	scsi: target: fix hang when multiple threads try to destroy the same iscsi session	2020-03-26 21:47:47 -04:00
trace	block-5.7-2020-04-24	2020-04-24 12:44:19 -07:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-04-24 19:17:30 -07:00
vdso	vdso/datapage: Use correct clock mode name in comment	2020-04-20 19:19:52 +02:00
video
xen	xen: Use evtchn_type_t as a type for event channels	2020-04-07 12:12:54 +02:00