Skip to contentSkip to conversation

net: drop_monitor: use IS_REACHABLE() to guard net_dm_hw_report()

PATCH In review Masahiro Yamada 3 participants 6 messages Mar 11, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: drop_monitor: use IS_REACHABLE() to guard net_dm_hw_report()

In net/Kconfig, NET_DEVLINK implies NET_DROP_MONITOR.

The original behavior of the 'imply' keyword prevents NET_DROP_MONITOR from being 'm' when NET_DEVLINK=y.

With the planned Kconfig change that relaxes the 'imply', the combination of NET_DEVLINK=y and NET_DROP_MONITOR=m would be allowed.

Use IS_REACHABLE() to avoid the vmlinux link error for this case.

---

This build error was reported in linux-next.
https://lkml.org/lkml/2020/3/10/1936

If this patch is acceptable,
I'd like to get Ack from the maintainers,
and insert this patch before my Kconfig change.

 include/net/drop_monitor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/drop_monitor.h +1 -1
index 2ab668461463..f68bc373544a 100644
@@ -19,7 +19,7 @@ struct net_dm_hw_metadata {
 	struct net_device *input_dev;
 };
 
-#if IS_ENABLED(CONFIG_NET_DROP_MONITOR)
+#if IS_REACHABLE(CONFIG_NET_DROP_MONITOR)
 void net_dm_hw_report(struct sk_buff *skb,
 		      const struct net_dm_hw_metadata *hw_metadata);
 #else
Signature · 1 line
2.17.1
#1 lore raw
Quoted 5 lines · Masahiro Yamada

In net/Kconfig, NET_DEVLINK implies NET_DROP_MONITOR.

The original behavior of the 'imply' keyword prevents NET_DROP_MONITOR from being 'm' when NET_DEVLINK=y.

Quoted 7 lines

With the planned Kconfig change that relaxes the 'imply', the combination of NET_DEVLINK=y and NET_DROP_MONITOR=m would be allowed.

Use IS_REACHABLE() to avoid the vmlinux link error for this case.

Thanks, Masahiro.

Neil, Jiri, another option (long term) is to add a raw tracepoint (not part of ABI) in devlink and have drop monitor register its probe on it when monitoring.

Two advantages:
1. Consistent with what drop monitor is already doing with kfree_skb() tracepoint
2. We can remove 'imply NET_DROP_MONITOR' altogether

What do you think?

#2 lore raw
Quoted 20 lines · Ido Schimmel
Quoted 5 lines · Masahiro Yamada

In net/Kconfig, NET_DEVLINK implies NET_DROP_MONITOR.

The original behavior of the 'imply' keyword prevents NET_DROP_MONITOR from being 'm' when NET_DEVLINK=y.

Quoted 7 lines

With the planned Kconfig change that relaxes the 'imply', the combination of NET_DEVLINK=y and NET_DROP_MONITOR=m would be allowed.

Use IS_REACHABLE() to avoid the vmlinux link error for this case.

Thanks, Masahiro.

Neil, Jiri, another option (long term) is to add a raw tracepoint (not part of ABI) in devlink and have drop monitor register its probe on it when monitoring.

Quoted 7 lines

Two advantages:
1. Consistent with what drop monitor is already doing with kfree_skb() tracepoint
2. We can remove 'imply NET_DROP_MONITOR' altogether

What do you think?

Agreed, I think I like this implementation better. Neil

#3 lore raw
Quoted 21 lines · Neil Horman
Quoted 20 lines · Ido Schimmel
Quoted 5 lines · Masahiro Yamada

In net/Kconfig, NET_DEVLINK implies NET_DROP_MONITOR.

The original behavior of the 'imply' keyword prevents NET_DROP_MONITOR from being 'm' when NET_DEVLINK=y.

Quoted 7 lines

With the planned Kconfig change that relaxes the 'imply', the combination of NET_DEVLINK=y and NET_DROP_MONITOR=m would be allowed.

Use IS_REACHABLE() to avoid the vmlinux link error for this case.

Thanks, Masahiro.

Neil, Jiri, another option (long term) is to add a raw tracepoint (not part of ABI) in devlink and have drop monitor register its probe on it when monitoring.

Quoted 8 lines
Quoted 7 lines

Two advantages:
1. Consistent with what drop monitor is already doing with kfree_skb() tracepoint
2. We can remove 'imply NET_DROP_MONITOR' altogether

What do you think?

Agreed, I think I like this implementation better.

OK, but I don't want to block Masahiro. I think we can go with his patch and then I'll add the raw tracepoint in the next release.

Acked-by
#4 lore raw
Quoted 27 lines · Ido Schimmel
Quoted 26 lines · Neil Horman
Quoted 25 lines · Ido Schimmel
Quoted 5 lines · Masahiro Yamada

In net/Kconfig, NET_DEVLINK implies NET_DROP_MONITOR.

The original behavior of the 'imply' keyword prevents NET_DROP_MONITOR from being 'm' when NET_DEVLINK=y.

Quoted 7 lines

With the planned Kconfig change that relaxes the 'imply', the combination of NET_DEVLINK=y and NET_DROP_MONITOR=m would be allowed.

Use IS_REACHABLE() to avoid the vmlinux link error for this case.

Thanks, Masahiro.

Neil, Jiri, another option (long term) is to add a raw tracepoint (not part of ABI) in devlink and have drop monitor register its probe on it when monitoring.

Two advantages:
1. Consistent with what drop monitor is already doing with kfree_skb() tracepoint
2. We can remove 'imply NET_DROP_MONITOR' altogether

Quoted 7 lines
Quoted 3 lines
Quoted 2 lines

What do you think?

Agreed, I think I like this implementation better.

OK, but I don't want to block Masahiro. I think we can go with his patch and then I'll add the raw tracepoint in the next release.

Yeah, ok, I can agree with that

#5 lore raw
Quoted 31 lines · Neil Horman
Quoted 29 lines · Ido Schimmel
Quoted 28 lines · Neil Horman
Quoted 27 lines · Ido Schimmel
Quoted 5 lines · Masahiro Yamada

In net/Kconfig, NET_DEVLINK implies NET_DROP_MONITOR.

The original behavior of the 'imply' keyword prevents NET_DROP_MONITOR from being 'm' when NET_DEVLINK=y.

Quoted 7 lines

With the planned Kconfig change that relaxes the 'imply', the combination of NET_DEVLINK=y and NET_DROP_MONITOR=m would be allowed.

Use IS_REACHABLE() to avoid the vmlinux link error for this case.

Thanks, Masahiro.

Neil, Jiri, another option (long term) is to add a raw tracepoint (not part of ABI) in devlink and have drop monitor register its probe on it when monitoring.

Two advantages:
1. Consistent with what drop monitor is already doing with kfree_skb() tracepoint
2. We can remove 'imply NET_DROP_MONITOR' altogether

What do you think?

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Agreed, I think I like this implementation better.

OK, but I don't want to block Masahiro. I think we can go with his patch and then I'll add the raw tracepoint in the next release.

Yeah, ok, I can agree with that

Thanks, I will insert this patch before the kconfig change with your Ack.

Signature · 2 lines
Best Regards
Masahiro Yamada