From patchwork Thu Apr 8 18:49:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 1463998 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=2604:1380:1:3600::1; helo=ewr.edge.kernel.org; envelope-from=mptcp+bounces-197-incoming=patchwork.ozlabs.org@lists.linux.dev; receiver=) Received: from ewr.edge.kernel.org (ewr.edge.kernel.org [IPv6:2604:1380:1:3600::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FGVgd1dVkz9sW1 for ; Fri, 9 Apr 2021 04:50:04 +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 ewr.edge.kernel.org (Postfix) with ESMTPS id 4F6D51C097C for ; Thu, 8 Apr 2021 18:49:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 99D376D13; Thu, 8 Apr 2021 18:49:57 +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 60AA66D00 for ; Thu, 8 Apr 2021 18:49:56 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1lUZiv-00015F-2s; Thu, 08 Apr 2021 20:49:49 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp 00/10] mptcp: add SOL_SOCKET support Date: Thu, 8 Apr 2021 20:49:26 +0200 Message-Id: <20210408184936.6245-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. 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 | 55 ++- 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, 765 insertions(+), 11 deletions(-) create mode 100755 tools/testing/selftests/net/mptcp/mptcp_sockopt.sh