From nobody Sat Apr 27 20:52:44 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp516011pis; Fri, 13 May 2022 17:21:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwabbL+A7hx8nmqS55fR7ZPwyqSCf3kVjP+kpwTP5W/iJK+ARpmNcOQg2Qlcy0hoKR50flo X-Received: by 2002:a17:90b:3e86:b0:1dc:f8b8:2bfc with SMTP id rj6-20020a17090b3e8600b001dcf8b82bfcmr7440828pjb.192.1652487686892; Fri, 13 May 2022 17:21:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652487686; cv=none; d=google.com; s=arc-20160816; b=WGxKVBah+oeTs09NyrW+gaBOyOg7lKXG2/mmxQpT8sX4U4Fpy/eOH7KCD2CVhE8Dv9 654lfdBHFTC8lhUCH7amMGiN2WDdC+teO150gZIPahRyRVVgZw6juFHoxIXeqYj+d5Bv pcGr8zl0RE7QgRSYR3wCVFmVJTEybYUvq58j/oB1d0metALLa3vwBAdTTpuMDkvmkxk8 BkaHxlLUdwhs0WiiL7guxK94uzleKeFl81HCiy3aJkJiQIQ4/g8753EWLtQtS+yOQkoW gTS6V4dEvw/4I0HUT1OKoH83wEyOsf3UzWZyKCEVTA6G3LJfkmAqE9sNiAKIbIMy61Rp RWCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=8uc2UOiUmOp54vTd40fo9Zljs7gB9AJVqyfq5ME/dIk=; b=QsQwH9PRtjOumU4e40+lBhS9RyUiACG1TFY4Jao10RQPqH7Vjr8CSxjOOGmFGhXWHN wJJUFuvTwQBgeYoLv3smeV5zRghuufGan3j1l/2Cs6Mld7dHIPI/wAcnemdDd6P1JvjL 6x8f0plQwaQ7eBTSCOi1Mjat0sNhFDqlX+use9sSt4H8hOUf8Ibn5wH9OeHiQI03Yais URfkfFcWwqICS08DzEScVVLZu9Q/IDlN3Oe9LPjZ+mUREXoKEyqFwTmj2oc+rg2Cc/qL XnIUgYdEwWuyOiGO7vAGGAQr4XIfouvpNqz4tbGwW/EqnkClofNiWrocbEWYRYc9A/Ov 7ZjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gFTPDY9I; spf=pass (google.com: domain of mptcp+bounces-5296-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5296-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id z17-20020a170902ccd100b001540e087684si4697458ple.24.2022.05.13.17.21.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 May 2022 17:21:26 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5296-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gFTPDY9I; spf=pass (google.com: domain of mptcp+bounces-5296-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5296-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 40D61280BEC for ; Sat, 14 May 2022 00:21:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 41405369; Sat, 14 May 2022 00:21:24 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev 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 smtp.subspace.kernel.org (Postfix) with ESMTPS id 93C74366 for ; Sat, 14 May 2022 00:21:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652487682; x=1684023682; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1zXQQLIalYYZ2M8+aZMUpfjKxvlmKG2qfFu5cLhcq1M=; b=gFTPDY9IGVrNCz3rVJAnGH+JNyN2qjvr60CWEBPEvhi9f8Jjb/NgJRlh KmSFFSytN3PaeybbYsEw+w5grL7jamGrPgmZoalkdxiiOej38HYhzqmEx iicoK2Q+Mm8/JkhsRhkj339KNQT3cUC7nyo8QcOcsKI/jrr8AnabVHKYi N6EDwy9tRxOzvNQPWnlFUDhK858yo99Nc6HCBARW1gMu3n6X1WrP47klA mL99IJPYNFB6km0QkmSSn6xjb7XqDsounYzQpszsvHWirdoe/PuFbFrmQ zV7MuafKbU5VHlggmF132ucIwskVNy1yXwZzUGwbTccch/+IeNIAphaM9 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10346"; a="250349594" X-IronPort-AV: E=Sophos;i="5.91,223,1647327600"; d="scan'208";a="250349594" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2022 17:21:20 -0700 X-IronPort-AV: E=Sophos;i="5.91,223,1647327600"; d="scan'208";a="625102784" Received: from clakshma-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.160.121]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2022 17:21:20 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 1/3] selftests: mptcp: fix a mp_fail test warning Date: Fri, 13 May 2022 17:21:13 -0700 Message-Id: <20220514002115.725976-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220514002115.725976-1-mathew.j.martineau@linux.intel.com> References: <20220514002115.725976-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Old tc versions (iproute2 5.3) show actions in multiple lines, not a single line. Then the following unexpected MP_FAIL selftest output occurs: file received by server has inverted byte at 169 ./mptcp_join.sh: line 1277: [: [{"total acts":1},{"actions":[{"order":0 pe= dit ,"control_action":{"type":"pipe"}keys 1 index 1 ref 1 bind 1,"installed":0,"last_used":0 key #0 at 148: val ff000000 mask ffffffff 5: integer expression expected 001 Infinite map syn[ ok ] - synack[ ok ] - ack[ ok ] sum[ ok ] - csum [ ok ] ftx[ ok ] - failrx[ ok ] rtx[ ok ] - rstrx [ ok ] itx[ ok ] - infirx[ ok ] ftx[ ok ] - failrx[ ok ] invert This patch adds a 'grep' before 'sed' to fix this. Fixes: b6e074e171bc ("selftests: mptcp: add infinite map testcase") Reviewed-by: Matthieu Baerts Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index d1de1e7702fb..7381d1f85209 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2693,6 +2693,7 @@ fastclose_tests() pedit_action_pkts() { tc -n $ns2 -j -s action show action pedit index 100 | \ + grep "packets" | \ sed 's/.*"packets":\([0-9]\+\),.*/\1/' } =20 --=20 2.36.1 From nobody Sat Apr 27 20:52:44 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp515998pis; Fri, 13 May 2022 17:21:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVzp7HR1dxKf3HTUEJqdojv2hj4GyGxC0wehFGrnqwPy6tge36QFLCzLNwqad6q/YCDG2J X-Received: by 2002:a63:2c4a:0:b0:3c1:df82:cf0e with SMTP id s71-20020a632c4a000000b003c1df82cf0emr6042996pgs.474.1652487685425; Fri, 13 May 2022 17:21:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652487685; cv=none; d=google.com; s=arc-20160816; b=AHmOhKvLj9rH4CLjMsb2rDDkxHuceQcJtsOfiUpvqyhV4+PuADsLA4Y9t2ZB9bAmR4 /MMORGpeRSBAcrbogzhQxsAg1SmXsSzb+cE7APBPOWqdQcQ07qfCQL6O3/ERFc4yi01z cuQYN/KyQpNbkKCJNpZhdk8Ew4vz7UKRDCvIhzLW3ZKtdlVE56cAbvy9iboiBLve1wTb HfNvlYvG7foLeytb3s4GfMITbijzxx+rdhSr+qQeY9V+m9Y5P1vkgpbo79MVji2vP8xc xqk82zKWH2QCIHEgHn/qzU448+ngBSGdw/p8LSDzDsTVPSGJC7i/xTNbfNN9bY6engCA Qopg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ObsmxjO3OX7LpHwXWj91T+BknYtFq3wt7CmBfjFuG7k=; b=zL2dOLby4MyzFNO0V5I7xKkdtchyvvfk7XxjKXY/7o+GoUzRcXQ2LDVcXWoOQfeMoX A/EdATEgLP1W9sYBNKK6WyJvQpSoxrFibhGBqYd07CD0YHcv5KobLHT3q9IOLr1oEdul EbWJ/rNyjOJ9eDV2FfJG1JFmEe8D/BpjofBpTFeXv7Yq9UBYsb5b3zGCed+SnZ/1nFWJ CU/q5ucF8oL1l/0Pj03n51AgNaM4/bWJ8ps0PhIBl6AEllfprAG4D/KAuZ18VhGmKibn mCOaZdqvwAM5GittMsETdkn93V513b5mF6mgXXmMo1meympUzjNzgxv0msp3ElEFfNVl 4PNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VJjzS8Yv; spf=pass (google.com: domain of mptcp+bounces-5295-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5295-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id p20-20020a63fe14000000b00399460d4a76si4355705pgh.156.2022.05.13.17.21.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 May 2022 17:21:25 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5295-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VJjzS8Yv; spf=pass (google.com: domain of mptcp+bounces-5295-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5295-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 2AB2D280AB9 for ; Sat, 14 May 2022 00:21:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25488368; Sat, 14 May 2022 00:21:24 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev 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 smtp.subspace.kernel.org (Postfix) with ESMTPS id BAD65362 for ; Sat, 14 May 2022 00:21:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652487682; x=1684023682; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uGgFF3Eow8jiNYdNies67VwJuxXcoh+pEdlSM7stZoQ=; b=VJjzS8YvTHYkK3k1SXU/Ntrn7B5Cu64mjOqYRaPcEwO4Y7w1SVLdTdOT lYckSQf3sSDXxPnf959XoR7tg1kmIJhF8G6p9dmDo98Q9xfPNfFSvJnKk 9mGESgY5KOC4eBtb885sybVeGwkU8t6vXGVcyuGIE6XwkJgX7v88LpzbI U597i8JN/LqACl1Z4KHChCXD2L1m6oEZsjyCjI6GINTzZNzLULTdRgHyH ODJcXXk3YxZqeK3nJvzJg0p+6nhc71XRa5emte4Wcpfv8cROT1cT2geps 7Ub2wDzVcqvRFmLsFkKKh9V6sHVLyUuyd47uE+VNetClEDIX/fLwbpq8b g==; X-IronPort-AV: E=McAfee;i="6400,9594,10346"; a="250349596" X-IronPort-AV: E=Sophos;i="5.91,223,1647327600"; d="scan'208";a="250349596" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2022 17:21:21 -0700 X-IronPort-AV: E=Sophos;i="5.91,223,1647327600"; d="scan'208";a="625102786" Received: from clakshma-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.160.121]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2022 17:21:20 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Paolo Abeni , davem@davemloft.net, kuba@kernel.org, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 2/3] Revert "mptcp: add data lock for sk timers" Date: Fri, 13 May 2022 17:21:14 -0700 Message-Id: <20220514002115.725976-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220514002115.725976-1-mathew.j.martineau@linux.intel.com> References: <20220514002115.725976-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Paolo Abeni This reverts commit 4293248c6704b854bf816aa1967e433402bee11c. Additional locks are not needed, all the touched sections are already under mptcp socket lock protection. Fixes: 4293248c6704 ("mptcp: add data lock for sk timers") Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 9e46cc89a8f7..921d67174e49 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1613,10 +1613,8 @@ void __mptcp_push_pending(struct sock *sk, unsigned = int flags) =20 out: /* ensure the rtx timer is running */ - mptcp_data_lock(sk); if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); - mptcp_data_unlock(sk); if (copied) __mptcp_check_send_data_fin(sk); } @@ -2529,10 +2527,8 @@ static void __mptcp_retrans(struct sock *sk) reset_timer: mptcp_check_and_set_pending(sk); =20 - mptcp_data_lock(sk); if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); - mptcp_data_unlock(sk); } =20 static void mptcp_mp_fail_no_response(struct mptcp_sock *msk) @@ -2711,10 +2707,8 @@ void mptcp_subflow_shutdown(struct sock *sk, struct = sock *ssk, int how) } else { pr_debug("Sending DATA_FIN on subflow %p", ssk); tcp_send_ack(ssk); - mptcp_data_lock(sk); if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); - mptcp_data_unlock(sk); } break; } @@ -2815,10 +2809,8 @@ static void __mptcp_destroy_sock(struct sock *sk) /* join list will be eventually flushed (with rst) at sock lock release t= ime*/ list_splice_init(&msk->conn_list, &conn_list); =20 - mptcp_data_lock(sk); mptcp_stop_timer(sk); sk_stop_timer(sk, &sk->sk_timer); - mptcp_data_unlock(sk); msk->pm.status =3D 0; =20 /* clears msk->subflow, allowing the following loop to close @@ -2880,9 +2872,7 @@ static void mptcp_close(struct sock *sk, long timeout) __mptcp_destroy_sock(sk); do_cancel_work =3D true; } else { - mptcp_data_lock(sk); sk_reset_timer(sk, &sk->sk_timer, jiffies + TCP_TIMEWAIT_LEN); - mptcp_data_unlock(sk); } release_sock(sk); if (do_cancel_work) @@ -2927,10 +2917,8 @@ static int mptcp_disconnect(struct sock *sk, int fla= gs) __mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_FASTCLOSE); } =20 - mptcp_data_lock(sk); mptcp_stop_timer(sk); sk_stop_timer(sk, &sk->sk_timer); - mptcp_data_unlock(sk); =20 if (mptcp_sk(sk)->token) mptcp_event(MPTCP_EVENT_CLOSED, mptcp_sk(sk), NULL, GFP_KERNEL); --=20 2.36.1 From nobody Sat Apr 27 20:52:44 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp516026pis; Fri, 13 May 2022 17:21:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXNiXVZQrwezRtyaUF3nB86ZulIuhpHjXTcoGXrV1gWOGctrmOQz5u9Ey0Q0Mxf3IxyX+7 X-Received: by 2002:a05:6402:350f:b0:428:43a1:647d with SMTP id b15-20020a056402350f00b0042843a1647dmr1220346edd.62.1652487688453; Fri, 13 May 2022 17:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652487688; cv=none; d=google.com; s=arc-20160816; b=LlS61/lWHDyYjSfXKO4vnstpFTp7aa85QLBw26I4PyG8eznClhy5QEB/yTrWzhNRwi iecEGgEW/oAR9TQxBUDkx9mpdjAqdUEpq8+74sAYdg01ktr3YSUzXzi2hHX+M8IcRUhy seqmUIAcaVI/YWmKiPPC2TSoJ2oJ83q//nBedE9xe5GMHe7Zb2bJ5CPuVCTzlsNLRt9f beywwFAoJVKq2FT5SDORmyKq+wKakCVRD6AGvdAujET4dRD4dBAWzPOpLNg0QVVr1UpT Yfvf+CQNSHRxuTu3b3YRoQmaAj1Qz/HaUG1xy6ZPYFWE/GnA7fd39g5pKnwAX+ZqHsHF wtmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=+W6NEc99mx4FbEA/7PmtOcp9qIXpBhYWwPaFdy5nxCk=; b=KdUGxMtOg8xT7RAjxierWgLPtdUPqfnswBwo4SfhLwHEWfRGlw2/fF0rgcGQns6dbl +OybKGWLZ7XLCxRh+5NvIUU+8pwJVT5vHlyuPdgDyC/HUuSCc9bFSqaCNxjlb5YUHj2D wmeMePiWXNck47uAEdBthUTQXpeH7RLVn9F0gjCrfea8bXwxjULCcOQhMkX5cdLsV/ny PtNpEgPGboHN11c8go7ksUt88MOnu6SElTUWtqXpLODuD8vckOIInVtNAA7L3kq2YQUT 6Dzx5bBym83i6Qyg5Zjeq+0HyynxB6DhH3OxHOHkuE9eW4X1RF77ZHwpbdk1zwW75qr8 5CXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MPH2313M; spf=pass (google.com: domain of mptcp+bounces-5297-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5297-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id ga31-20020a1709070c1f00b006e7f5f78446si4253667ejc.241.2022.05.13.17.21.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 May 2022 17:21:28 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5297-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MPH2313M; spf=pass (google.com: domain of mptcp+bounces-5297-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5297-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com 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 da.mirrors.kernel.org (Postfix) with ESMTPS id C85BA2E09C5 for ; Sat, 14 May 2022 00:21:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AD052366; Sat, 14 May 2022 00:21:25 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev 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 smtp.subspace.kernel.org (Postfix) with ESMTPS id 373B4362 for ; Sat, 14 May 2022 00:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652487684; x=1684023684; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xTy6YizjRk/aiQtdxnOlDVnO3Ugko3s9yjx08r1djuo=; b=MPH2313MkXle5DSD83LA6Qa/FBnXUZCXZcgeS+sgQ0CWzDOQ2TnnU/ba /71lsCX8eOo6gVYb7QNxoC5fcIENz2ibQEY8kPYL2vokFc0uwwWp3xP0f VtKs3ZArm0drEC51huS0v0D4brJhF2thGPLnKXSSqRiRdGKT/v9XsrYm7 nenaUMDXBBsYtePAEijpF4HniJKS+NMTOCzDhgW1nbz8R4SLu5ZDeiO9g aTKY43N0KHmrLaMq94IAkUW+5C3AOAl6p0gbfB5RmnMl0baZjuWGEW2pJ mkyNmSwi3Mpdv3/1bbtDmTpM2TTq8zVzkaYtufc52yFZ/cevMuujBS9gs g==; X-IronPort-AV: E=McAfee;i="6400,9594,10346"; a="250349601" X-IronPort-AV: E=Sophos;i="5.91,223,1647327600"; d="scan'208";a="250349601" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2022 17:21:22 -0700 X-IronPort-AV: E=Sophos;i="5.91,223,1647327600"; d="scan'208";a="625102789" Received: from clakshma-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.160.121]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2022 17:21:21 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Florian Westphal , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 3/3] mptcp: sockopt: add TCP_DEFER_ACCEPT support Date: Fri, 13 May 2022 17:21:15 -0700 Message-Id: <20220514002115.725976-4-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220514002115.725976-1-mathew.j.martineau@linux.intel.com> References: <20220514002115.725976-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Florian Westphal Support this via passthrough to the underlying tcp listener socket. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/271 Signed-off-by: Florian Westphal Signed-off-by: Mat Martineau --- net/mptcp/sockopt.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 826b0c1dae98..423d3826ca1e 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -756,6 +756,18 @@ static int mptcp_setsockopt_v4(struct mptcp_sock *msk,= int optname, return -EOPNOTSUPP; } =20 +static int mptcp_setsockopt_sol_tcp_defer(struct mptcp_sock *msk, sockptr_= t optval, + unsigned int optlen) +{ + struct socket *listener; + + listener =3D __mptcp_nmpc_socket(msk); + if (!listener) + return 0; /* TCP_DEFER_ACCEPT does not fail */ + + return tcp_setsockopt(listener->sk, SOL_TCP, TCP_DEFER_ACCEPT, optval, op= tlen); +} + static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname, sockptr_t optval, unsigned int optlen) { @@ -782,6 +794,8 @@ static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *= msk, int optname, return mptcp_setsockopt_sol_tcp_cork(msk, optval, optlen); case TCP_NODELAY: return mptcp_setsockopt_sol_tcp_nodelay(msk, optval, optlen); + case TCP_DEFER_ACCEPT: + return mptcp_setsockopt_sol_tcp_defer(msk, optval, optlen); } =20 return -EOPNOTSUPP; @@ -1142,6 +1156,7 @@ static int mptcp_getsockopt_sol_tcp(struct mptcp_sock= *msk, int optname, case TCP_CONGESTION: case TCP_INFO: case TCP_CC_INFO: + case TCP_DEFER_ACCEPT: return mptcp_getsockopt_first_sf_only(msk, SOL_TCP, optname, optval, optlen); case TCP_INQ: --=20 2.36.1