3 files changed, 29 insertions, 0 deletions

diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index dfaa7b3e9ae9..82c159e0532a 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -237,6 +237,10 @@
 #define KASAN_ABI_VERSION 3
 #endif
 
+#if GCC_VERSION >= 50000
+#define CC_HAVE_BUILTIN_OVERFLOW
+#endif
+
 #endif  /* gcc version >= 40000 specific checks */
 
 #if !defined(__noclone)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 773383859bd9..4ac653b7b8ac 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1055,6 +1055,10 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
  *      This function is used to pass protocol port error state information
  *      to the switch driver. The switch driver can react to the proto_down
  *      by doing a phys down on the associated switch port.
+ * int (*ndo_fill_metadata_dst)(struct net_device *dev, struct sk_buff *skb);
+ *      This function is used to get egress tunnel information for given skb.
+ *      This is useful for retrieving outer tunnel header parameters while
+ *      sampling packet.
  *
  */
 struct net_device_ops {
@@ -1230,6 +1234,8 @@ struct net_device_ops {
         int                     (*ndo_get_iflink)(const struct net_device *dev);
         int                     (*ndo_change_proto_down)(struct net_device *dev,
                                                          bool proto_down);
+        int                     (*ndo_fill_metadata_dst)(struct net_device *dev,
+                                                       struct sk_buff *skb);
 };
 
 /**
@@ -2210,6 +2216,7 @@ void dev_add_offload(struct packet_offload *po);
 void dev_remove_offload(struct packet_offload *po);
 
 int dev_get_iflink(const struct net_device *dev);
+int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb);
 struct net_device *__dev_get_by_flags(struct net *net, unsigned short flags,
                                       unsigned short mask);
 struct net_device *dev_get_by_name(struct net *net, const char *name);
diff --git a/include/linux/overflow-arith.h b/include/linux/overflow-arith.h
new file mode 100644
index 000000000000..e12ccf854a70
--- /dev/null
+++ b/include/linux/overflow-arith.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <linux/kernel.h>
+
+#ifdef CC_HAVE_BUILTIN_OVERFLOW
+
+#define overflow_usub __builtin_usub_overflow
+
+#else
+
+static inline bool overflow_usub(unsigned int a, unsigned int b,
+                                 unsigned int *res)
+{
+        *res = a - b;
+        return *res > a ? true : false;
+}
+
+#endif