[RFC PATCH v3 06/10] mptcp: Add MPTCP to skb extensions

[Mat Martineau]

Add enum value for MPTCP and update config dependencies

Signed-off-by: Mat Martineau <mathew.j.martin...@linux.intel.com>
Signed-off-by: Matthieu Baerts <matthieu.bae...@tessares.net>
---
 include/linux/skbuff.h |  3 +++
 include/net/mptcp.h    | 27 +++++++++++++++++++++++++++
 net/core/skbuff.c      |  7 +++++++
 3 files changed, 37 insertions(+)
 create mode 100644 include/net/mptcp.h

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 0a58402a166e..618ee4b3ab7f 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -4068,6 +4068,9 @@ enum skb_ext_id {
 #endif
 #if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)
        TC_SKB_EXT,
+#endif
+#if IS_ENABLED(CONFIG_MPTCP)
+       SKB_EXT_MPTCP,
 #endif
        SKB_EXT_NUM, /* must be last */
 };
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
new file mode 100644
index 000000000000..f9f668ac4339
--- /dev/null
+++ b/include/net/mptcp.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Multipath TCP
+ *
+ * Copyright (c) 2017 - 2019, Intel Corporation.
+ */
+
+#ifndef __NET_MPTCP_H
+#define __NET_MPTCP_H
+
+#include <linux/types.h>
+
+/* MPTCP sk_buff extension data */
+struct mptcp_ext {
+       u64             data_ack;
+       u64             data_seq;
+       u32             subflow_seq;
+       u16             data_len;
+       u8              use_map:1,
+                       dsn64:1,
+                       data_fin:1,
+                       use_ack:1,
+                       ack64:1,
+                       __unused:2;
+};
+
+#endif /* __NET_MPTCP_H */
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 529133611ea2..b2dc326f748b 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -68,6 +68,7 @@
 #include <net/ip6_checksum.h>
 #include <net/xfrm.h>
 #include <net/mpls.h>
+#include <net/mptcp.h>
 
 #include <linux/uaccess.h>
 #include <trace/events/skb.h>
@@ -4109,6 +4110,9 @@ static const u8 skb_ext_type_len[] = {
 #if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)
        [TC_SKB_EXT] = SKB_EXT_CHUNKSIZEOF(struct tc_skb_ext),
 #endif
+#if IS_ENABLED(CONFIG_MPTCP)
+       [SKB_EXT_MPTCP] = SKB_EXT_CHUNKSIZEOF(struct mptcp_ext),
+#endif
 };
 
 static __always_inline unsigned int skb_ext_total_length(void)
@@ -4122,6 +4126,9 @@ static __always_inline unsigned int 
skb_ext_total_length(void)
 #endif
 #if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)
                skb_ext_type_len[TC_SKB_EXT] +
+#endif
+#if IS_ENABLED(CONFIG_MPTCP)
+               skb_ext_type_len[SKB_EXT_MPTCP] +
 #endif
                0;
 }
-- 
2.23.0