From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org, mptcp@lists.01.org
Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>,
Matthieu Baerts <matthieu.baerts@tessares.net>
Subject: [PATCH net-next 06/11] mptcp: Add MPTCP to skb extensions
Date: Fri, 13 Dec 2019 15:00:17 -0800 [thread overview]
Message-ID: <20191213230022.28144-7-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20191213230022.28144-1-mathew.j.martineau@linux.intel.com>
Add enum value for MPTCP and update config dependencies
Co-developed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
MAINTAINERS | 10 ++++++++++
include/linux/skbuff.h | 3 +++
include/net/mptcp.h | 27 +++++++++++++++++++++++++++
net/core/skbuff.c | 7 +++++++
4 files changed, 47 insertions(+)
create mode 100644 include/net/mptcp.h
diff --git a/MAINTAINERS b/MAINTAINERS
index a28c77ee6b0d..132eb3f9fbb7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11568,6 +11568,16 @@ F: net/ipv6/calipso.c
F: net/netfilter/xt_CONNSECMARK.c
F: net/netfilter/xt_SECMARK.c
+NETWORKING [MPTCP]
+M: Mat Martineau <mathew.j.martineau@linux.intel.com>
+M: Matthieu Baerts <matthieu.baerts@tessares.net>
+L: netdev@vger.kernel.org
+L: mptcp@lists.01.org
+W: https://github.com/multipath-tcp/mptcp_net-next/wiki
+B: https://github.com/multipath-tcp/mptcp_net-next/issues
+S: Maintained
+F: include/net/mptcp.h
+
NETWORKING [TCP]
M: Eric Dumazet <edumazet@google.com>
L: netdev@vger.kernel.org
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index e9133bcf0544..1a261c3ee074 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -4091,6 +4091,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 973a71f4bc89..fa67036dd928 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.24.1
next prev parent reply other threads:[~2019-12-13 23:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 23:00 [PATCH net-next 00/11] Multipath TCP: Prerequisites Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 01/11] net: Make sock protocol value checks more specific Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 02/11] sock: Make sk_protocol a 16-bit value Mat Martineau
2019-12-13 23:16 ` Eric Dumazet
2019-12-14 0:06 ` Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 03/11] tcp: Define IPPROTO_MPTCP Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 04/11] tcp: Add MPTCP option number Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Mat Martineau
2019-12-13 23:00 ` Mat Martineau [this message]
2019-12-13 23:00 ` [PATCH net-next 07/11] tcp: Prevent coalesce/collapse when skb has MPTCP extensions Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 08/11] tcp: Export TCP functions and ops struct Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 09/11] tcp: Check for filled TCP option space before SACK Mat Martineau
2019-12-13 23:22 ` Eric Dumazet
2019-12-14 0:28 ` Mat Martineau
2019-12-16 12:52 ` [MPTCP] " Paolo Abeni
2019-12-16 16:55 ` Eric Dumazet
2019-12-16 17:28 ` Paolo Abeni
2019-12-13 23:00 ` [PATCH net-next 10/11] tcp: clean ext on tx recycle Mat Martineau
2019-12-13 23:00 ` [PATCH net-next 11/11] skb: add helpers to allocate ext independently from sk_buff Mat Martineau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191213230022.28144-7-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).