mptcp: Add MPTCP to skb extensions (3ee17bc7) · Commits · 戴 / test

MAINTAINERS

+10 −0

Original line number	Diff line number	Diff line
		@@ -11573,6 +11573,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

+3 −0

Original line number	Diff line number	Diff line
		@@ -4096,6 +4096,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 */
		};

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/* 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:3;
		/* one byte hole */
		};

		#endif /* __NET_MPTCP_H */

+7 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}