From patchwork Thu Dec 19 22:05:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mat Martineau X-Patchwork-Id: 1213757 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47f5Z33Dhhz9sR1 for ; Fri, 20 Dec 2019 09:06:34 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id AD08310113678; Thu, 19 Dec 2019 14:09:51 -0800 (PST) Received-SPF: Pass (helo) identity=helo; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=mathew.j.martineau@linux.intel.com; receiver= Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E798B10113668 for ; Thu, 19 Dec 2019 14:09:49 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Dec 2019 14:06:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,333,1571727600"; d="scan'208";a="298841743" Received: from mjmartin-nuc02.mjmartin-nuc02 (HELO mjmartin-nuc02.sea.intel.com) ([10.251.1.107]) by orsmga001.jf.intel.com with ESMTP; 19 Dec 2019 14:06:29 -0800 From: Mat Martineau To: netdev@vger.kernel.org, mptcp@lists.01.org Cc: Mat Martineau Date: Thu, 19 Dec 2019 14:05:46 -0800 Message-Id: <20191219220557.17823-1-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Message-ID-Hash: TTJC2HKHLBZUHMGXZ5GA4LIECHMSKNEC X-Message-ID-Hash: TTJC2HKHLBZUHMGXZ5GA4LIECHMSKNEC X-MailFrom: mathew.j.martineau@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH net-next v4 00/11] List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: v3 -> v4: Update coalesce/collapse of incoming MPTCP skbs (patch 7) v2 -> v3: Ensure sk_type alignment in struct sock (patch 2) v1 -> v2: sk_pacing_shift left as a regular struct member (patch 2), and modified SACK space check based on recent -net fix (patch 9). The MPTCP upstreaming community has been collaborating on an upstreamable MPTCP implementation that complies with RFC 8684. A minimal set of features to comply with the specification involves a sizeable set of code changes, so David requested that we split this work in to multiple, smaller patch sets to build up MPTCP infrastructure. The minimal MPTCP feature set we are proposing for review in the v5.6 timeframe begins with these three parts: Part 1 (this patch set): MPTCP prerequisites. Introduce some MPTCP definitions, additional ULP and skb extension features, TCP option space checking, and a few exported symbols. Part 2: Single subflow implementation and self tests. Part 3: Switch from MPTCP v0 (RFC 6824) to MPTCP v1 (new RFC 8684, publication expected in the next few days). We plan to send those over the next week. Additional patches for multiple subflow support, path management, active backup, and other features are in the pipeline for submission after making progress with the above reviews. Clone/fetch: https://github.com/multipath-tcp/mptcp_net-next.git (tag: netdev-v4-part1) Browse: https://github.com/multipath-tcp/mptcp_net-next/tree/netdev-v4-part1 Thank you for your review. You can find us at mptcp@lists.01.org and https://is.gd/mptcp_upstream Mat Martineau (9): net: Make sock protocol value checks more specific sock: Make sk_protocol a 16-bit value tcp: Define IPPROTO_MPTCP tcp: Add MPTCP option number tcp, ulp: Add clone operation to tcp_ulp_ops mptcp: Add MPTCP to skb extensions tcp: coalesce/collapse must respect MPTCP extensions tcp: Export TCP functions and ops struct tcp: Check for filled TCP option space before SACK Paolo Abeni (2): tcp: clean ext on tx recycle skb: add helpers to allocate ext independently from sk_buff MAINTAINERS | 10 ++++ include/linux/skbuff.h | 6 +++ include/net/mptcp.h | 81 +++++++++++++++++++++++++++++++++ include/net/sock.h | 12 ++--- include/net/tcp.h | 22 +++++++++ include/trace/events/sock.h | 5 +- include/uapi/linux/in.h | 2 + net/ax25/af_ax25.c | 2 +- net/core/skbuff.c | 42 ++++++++++++++++- net/decnet/af_decnet.c | 2 +- net/ipv4/inet_connection_sock.c | 2 + net/ipv4/tcp.c | 6 +-- net/ipv4/tcp_input.c | 11 +++-- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_output.c | 12 +++-- net/ipv4/tcp_ulp.c | 12 +++++ net/ipv6/tcp_ipv6.c | 6 +-- tools/include/uapi/linux/in.h | 2 + 18 files changed, 211 insertions(+), 26 deletions(-) create mode 100644 include/net/mptcp.h