ipv6: ioam: Distinguish input and output for hop-limit

This patch anticipates the support for the IOAM insertion inside in-transit
packets, by making a difference between input and output in order to determine
the right value for its hop-limit (inherited from the IPv6 hop-limit).

Input case: happens before ip6_forward, the IPv6 hop-limit is not decremented
yet -> decrement the IOAM hop-limit to reflect the new hop inside the trace.

Output case: happens after ip6_forward, the IPv6 hop-limit has already been
decremented -> keep the same value for the IOAM hop-limit.

Signed-off-by: Justin Iurman <justin.iurman@uliege.be>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ioam6.h b/include/net/ioam6.h
index 3c2993bc48c81e5e7625fcc07befcea70f6e6173..3f45ba37a2c69e266edc02f1e2b7c02fe6edf97f 100644 (file)
--- a/include/net/ioam6.h
+++ b/include/net/ioam6.h
@@ -56,7 +56,8 @@ static inline struct ioam6_pernet_data *ioam6_pernet(struct net *net)
 struct ioam6_namespace *ioam6_namespace(struct net *net, __be16 id);
 void ioam6_fill_trace_data(struct sk_buff *skb,
                           struct ioam6_namespace *ns,
-                          struct ioam6_trace_hdr *trace);
+                          struct ioam6_trace_hdr *trace,
+                          bool is_input);
 
 int ioam6_init(void);
 void ioam6_exit(void);

diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 3a871a09f9625443d34435dde9911f3e8fea7d53..38ece3b7b8395d4d9ca31a6fb2a2b7dea4a361cd 100644 (file)
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -979,7 +979,7 @@ static bool ipv6_hop_ioam(struct sk_buff *skb, int optoff)
                if (!skb_valid_dst(skb))
                        ip6_route_input(skb);
 
-               ioam6_fill_trace_data(skb, ns, trace);
+               ioam6_fill_trace_data(skb, ns, trace, true);
                break;
        default:
                break;

diff --git a/net/ipv6/ioam6.c b/net/ipv6/ioam6.c
index 5e8961004832e3e9be341c5c5d203d29ae05be3c..4e5583dbadacfa7f90753dfaa659e46cc72b1fda 100644 (file)
--- a/net/ipv6/ioam6.c
+++ b/net/ipv6/ioam6.c
@@ -631,7 +631,7 @@ static void __ioam6_fill_trace_data(struct sk_buff *skb,
                                    struct ioam6_namespace *ns,
                                    struct ioam6_trace_hdr *trace,
                                    struct ioam6_schema *sc,
-                                   u8 sclen)
+                                   u8 sclen, bool is_input)
 {
        struct __kernel_sock_timeval ts;
        u64 raw64;
@@ -645,7 +645,7 @@ static void __ioam6_fill_trace_data(struct sk_buff *skb,
        /* hop_lim and node_id */
        if (trace->type.bit0) {
                byte = ipv6_hdr(skb)->hop_limit;
-               if (skb->dev)
+               if (is_input)
                        byte--;
 
                raw32 = dev_net(skb_dst(skb)->dev)->ipv6.sysctl.ioam6_id;
@@ -730,7 +730,7 @@ static void __ioam6_fill_trace_data(struct sk_buff *skb,
        /* hop_lim and node_id (wide) */
        if (trace->type.bit8) {
                byte = ipv6_hdr(skb)->hop_limit;
-               if (skb->dev)
+               if (is_input)
                        byte--;
 
                raw64 = dev_net(skb_dst(skb)->dev)->ipv6.sysctl.ioam6_id_wide;
@@ -786,7 +786,8 @@ static void __ioam6_fill_trace_data(struct sk_buff *skb,
 /* called with rcu_read_lock() */
 void ioam6_fill_trace_data(struct sk_buff *skb,
                           struct ioam6_namespace *ns,
-                          struct ioam6_trace_hdr *trace)
+                          struct ioam6_trace_hdr *trace,
+                          bool is_input)
 {
        struct ioam6_schema *sc;
        u8 sclen = 0;
@@ -822,7 +823,7 @@ void ioam6_fill_trace_data(struct sk_buff *skb,
                return;
        }
 
-       __ioam6_fill_trace_data(skb, ns, trace, sc, sclen);
+       __ioam6_fill_trace_data(skb, ns, trace, sc, sclen, is_input);
        trace->remlen -= trace->nodelen + sclen;
 }