From patchwork Tue Apr 13 15:54:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 1465830 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.dev (client-ip=147.75.69.165; helo=sjc.edge.kernel.org; envelope-from=mptcp+bounces-217-incoming=patchwork.ozlabs.org@lists.linux.dev; receiver=) Received: from sjc.edge.kernel.org (sjc.edge.kernel.org [147.75.69.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FKVYJ2vTJz9s1l for ; Wed, 14 Apr 2021 01:54:58 +1000 (AEST) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 3DCCA3E0EFF for ; Tue, 13 Apr 2021 15:54:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AD1DE6D0D; Tue, 13 Apr 2021 15:54:55 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [193.142.43.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53DAB70 for ; Tue, 13 Apr 2021 15:54:54 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1lWLNM-0006qw-Sn; Tue, 13 Apr 2021 17:54:52 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp-next v2 00/10] mptcp: add SOL_SOCKET support Date: Tue, 13 Apr 2021 17:54:37 +0200 Message-Id: <20210413155447.14043-1-fw@strlen.de> X-Mailer: git-send-email 2.26.3 X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This patch set improves support for several SOL_SOCKET tuneables, addressing comments received for v1 patch set. Changes since v1: - In patch 1, move addition of a variable to patch 2 (Paolo) - In patch 2, restrict overflow of sequence count to lower 24 bits (Mat) - In patch 2, remove a obsolete check on msk->setsockopt_check (Paolo) First patch adds skeleton synchronization functions to copy mptcp socket settings to a subflow socket. Second patch adds sequence counting scheme to avoid re-sync when subflow and mptcp-level socket are known to have the same setting applied. Notable changes: I removed the sequence number from patch 1 and split it into second patch to make those bits clearer. TCP_CONGESTION is now applied to all subflows. TCP_INFO retrieves info from the first subflow. It seems better to add MPTCP_INFO from out-of-tree patch set in a future change for userspace that wants mptcp-level flow statistics. I've not changed SO_LINGER either, this should be updated in a future change to send a FASTCLOSE when mptcp socket gets closed while the linger time is 0. The last patch adds a simple test to check SO_MARK replication. 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 net/mptcp/protocol.c | 53 ++- net/mptcp/protocol.h | 11 + net/mptcp/sockopt.c | 404 ++++++++++++++++++ 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 ++++++++++++ 7 files changed, 763 insertions(+), 11 deletions(-) create mode 100755 tools/testing/selftests/net/mptcp/mptcp_sockopt.sh