From: Mat Martineau <mathew.j.martineau at linux.intel.com> To: mptcp at lists.01.org Subject: [MPTCP] [PATCH net-next v4 06/11] mptcp: Add MPTCP to skb extensions Date: Thu, 19 Dec 2019 14:05:52 -0800 [thread overview] Message-ID: <20191219220557.17823-7-mathew.j.martineau@linux.intel.com> (raw) In-Reply-To: 20191219220557.17823-1-mathew.j.martineau@linux.intel.com [-- Attachment #1: Type: text/plain, Size: 3173 bytes --] Add enum value for MPTCP and update config dependencies Co-developed-by: Matthieu Baerts <matthieu.baerts(a)tessares.net> Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net> Signed-off-by: Mat Martineau <mathew.j.martineau(a)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(a)linux.intel.com> +M: Matthieu Baerts <matthieu.baerts(a)tessares.net> +L: netdev(a)vger.kernel.org +L: mptcp(a)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(a)google.com> L: netdev(a)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
WARNING: multiple messages have this Message-ID (diff)
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 v4 06/11] mptcp: Add MPTCP to skb extensions Date: Thu, 19 Dec 2019 14:05:52 -0800 [thread overview] Message-ID: <20191219220557.17823-7-mathew.j.martineau@linux.intel.com> (raw) In-Reply-To: <20191219220557.17823-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 reply other threads:[~2019-12-19 22:05 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-19 22:05 Mat Martineau [this message] 2019-12-19 22:05 ` [PATCH net-next v4 06/11] mptcp: Add MPTCP to skb extensions Mat Martineau -- strict thread matches above, loose matches on Subject: below -- 2019-12-19 22:19 [MPTCP] Re: [PATCH net-next v4 00/11] David Miller 2019-12-19 22:19 ` David Miller 2019-12-19 22:14 [MPTCP] [PATCH net-next v4 00/11] Multipath TCP: Prerequisites Mat Martineau 2019-12-19 22:14 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 11/11] skb: add helpers to allocate ext independently from sk_buff Mat Martineau 2019-12-19 22:05 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 10/11] tcp: clean ext on tx recycle Mat Martineau 2019-12-19 22:05 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 09/11] tcp: Check for filled TCP option space before SACK Mat Martineau 2019-12-19 22:05 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 08/11] tcp: Export TCP functions and ops struct Mat Martineau 2019-12-19 22:05 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 07/11] tcp: coalesce/collapse must respect MPTCP extensions Mat Martineau 2019-12-19 22:05 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Mat Martineau 2019-12-19 22:05 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 04/11] tcp: Add MPTCP option number Mat Martineau 2019-12-19 22:05 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 03/11] tcp: Define IPPROTO_MPTCP Mat Martineau 2019-12-19 22:05 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 02/11] sock: Make sk_protocol a 16-bit value Mat Martineau 2019-12-19 22:05 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 01/11] net: Make sock protocol value checks more specific Mat Martineau 2019-12-19 22:05 ` Mat Martineau 2019-12-19 22:05 [MPTCP] [PATCH net-next v4 00/11] Mat Martineau 2019-12-19 22:05 ` 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=20191219220557.17823-7-mathew.j.martineau@linux.intel.com \ --to=unknown@example.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.