If we're processing an IOAM Pre-allocated Trace Option-Type (the only
one supported currently), and if we're the destination, then send the
trace as an ioam6 event to the multicast group. This way, user space
apps will be able to collect IOAM data (for a trace, it only makes sense
to send events if we're the destination).
Signed-off-by: Justin Iurman <[email protected]>
---
net/ipv6/exthdrs.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 02e9ffb63af1..003f35d9b42b 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -50,6 +50,7 @@
#endif
#include <net/rpl.h>
#include <linux/ioam6.h>
+#include <linux/ioam6_genl.h>
#include <net/ioam6.h>
#include <net/dst_metadata.h>
@@ -954,6 +955,11 @@ static bool ipv6_hop_ioam(struct sk_buff *skb, int optoff)
+ optoff + sizeof(*hdr));
ioam6_fill_trace_data(skb, ns, trace, true);
+
+ if (skb_dst(skb)->dev->flags & IFF_LOOPBACK)
+ ioam6_event(IOAM6_EVENT_TRACE, dev_net(skb->dev),
+ GFP_ATOMIC, (void *)trace,
+ hdr->opt_len - 2);
break;
default:
break;
--
2.34.1
On 2/23/24 15:41, Justin Iurman wrote:
> If we're processing an IOAM Pre-allocated Trace Option-Type (the only
> one supported currently), and if we're the destination, then send the
> trace as an ioam6 event to the multicast group. This way, user space
> apps will be able to collect IOAM data (for a trace, it only makes sense
> to send events if we're the destination).
>
> Signed-off-by: Justin Iurman <[email protected]>
> ---
> net/ipv6/exthdrs.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
> index 02e9ffb63af1..003f35d9b42b 100644
> --- a/net/ipv6/exthdrs.c
> +++ b/net/ipv6/exthdrs.c
> @@ -50,6 +50,7 @@
> #endif
> #include <net/rpl.h>
> #include <linux/ioam6.h>
> +#include <linux/ioam6_genl.h>
> #include <net/ioam6.h>
> #include <net/dst_metadata.h>
>
> @@ -954,6 +955,11 @@ static bool ipv6_hop_ioam(struct sk_buff *skb, int optoff)
> + optoff + sizeof(*hdr));
>
> ioam6_fill_trace_data(skb, ns, trace, true);
> +
> + if (skb_dst(skb)->dev->flags & IFF_LOOPBACK)
Hmm, now that I think about this a bit more, I'm not sure we should
force a node to be the destination in order to send the event. Instead,
we could just remove the "am I the destination" check and directly call
ioam6_event(), which does check if there is at least one listener before
sending the event. I see two reasons for the change: (a) one may want
(for whatever reason) to capture IOAM traces on transit nodes, or (b)
one may use inline (instead of encap) IOAM injection where the
destination may be outside the IOAM domain (i.e., destination !=
decap/egress IOAM node), which is not RFC8200-compliant and requires
removing the IOAM Option-Type in-flight from the HbH, but that's another
story.
Any opinion?
> + ioam6_event(IOAM6_EVENT_TRACE, dev_net(skb->dev),
> + GFP_ATOMIC, (void *)trace,
> + hdr->opt_len - 2);
> break;
> default:
> break;