From patchwork Thu Apr 15 23:44:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mat Martineau X-Patchwork-Id: 422186 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5F58C433B4 for ; Thu, 15 Apr 2021 23:45:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 727BD6109D for ; Thu, 15 Apr 2021 23:45:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236591AbhDOXpc (ORCPT ); Thu, 15 Apr 2021 19:45:32 -0400 Received: from mga01.intel.com ([192.55.52.88]:63174 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234874AbhDOXpb (ORCPT ); Thu, 15 Apr 2021 19:45:31 -0400 IronPort-SDR: BJecxPDQYg8IVz3F55NKVMHDtDz7bh+eDUdY61TxKn5s/0DMpxfyqr+rLcPs2abuXfH9niklvT 1Bu3v+BJCc4Q== X-IronPort-AV: E=McAfee;i="6200,9189,9955"; a="215480147" X-IronPort-AV: E=Sophos;i="5.82,226,1613462400"; d="scan'208";a="215480147" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2021 16:45:07 -0700 IronPort-SDR: /x+FmtNv0HHgxaYPbXp/rtB6Qkeahz6UXTytJrXL8G2F0fJQV8zDz82qyr51t+4bnKamjAdfRb GDLxoRkAxz3Q== X-IronPort-AV: E=Sophos;i="5.82,226,1613462400"; d="scan'208";a="461793351" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.243.150]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2021 16:45:07 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Mat Martineau , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev Subject: [PATCH net-next 00/13] mptcp: Improve socket option handling Date: Thu, 15 Apr 2021 16:44:49 -0700 Message-Id: <20210415234502.224225-1-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org MPTCP sockets have previously had limited socket option support. The architecture of MPTCP sockets (one userspace-facing MPTCP socket that manages one or more in-kernel TCP subflow sockets) adds complexity for passing options through to lower levels. This patch set adds MPTCP support for socket options commonly used with TCP. Patch 1 reverts an interim socket option fix (a socket option blocklist) that was merged in the net tree for v5.12. Patch 2 moves the socket option code to a separate file, with no functional changes. Patch 3 adds an allowlist for socket options that are known to function with MPTCP. Later patches in this set add more allowed options. Patches 4 and 5 add infrastructure for syncing MPTCP-level options with the TCP subflows. Patches 6-12 add support for specific socket options. Patch 13 adds a socket option self test. Florian Westphal (10): mptcp: add skeleton to sync msk socket options to subflows mptcp: tag sequence_seq with socket state mptcp: setsockopt: handle SO_KEEPALIVE and SO_PRIORITY mptcp: setsockopt: handle receive/send buffer and device bind mptcp: setsockopt: support SO_LINGER mptcp: setsockopt: add SO_MARK support mptcp: setsockopt: add SO_INCOMING_CPU mptcp: setsockopt: SO_DEBUG and no-op options mptcp: sockopt: add TCP_CONGESTION and TCP_INFO selftests: mptcp: add packet mark test case Matthieu Baerts (1): mptcp: revert "mptcp: forbit mcast-related sockopt on MPTCP sockets" Paolo Abeni (2): mptcp: move sockopt function into a new file mptcp: only admit explicitly supported sockopt net/mptcp/Makefile | 2 +- net/mptcp/protocol.c | 219 ++--- net/mptcp/protocol.h | 16 + net/mptcp/sockopt.c | 756 ++++++++++++++++++ net/mptcp/subflow.c | 5 + tools/testing/selftests/net/mptcp/Makefile | 2 +- .../selftests/net/mptcp/mptcp_connect.c | 23 +- .../selftests/net/mptcp/mptcp_sockopt.sh | 276 +++++++ 8 files changed, 1122 insertions(+), 177 deletions(-) create mode 100644 net/mptcp/sockopt.c create mode 100755 tools/testing/selftests/net/mptcp/mptcp_sockopt.sh base-commit: 3a1aa533f7f676aad68f8dbbbba10b9502903770