From nobody Fri Apr 26 05:37:11 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:956b:0:0:0:0:0 with SMTP id y98csp4485059jah; Tue, 2 Nov 2021 13:49:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhK9hsnJHXSWWtEcs+qJLfdPwbD8hcb4YKIFG/mnfpvfsi0xtT7X+cfWY8U6bPPxGYh2wS X-Received: by 2002:a17:90a:1a4c:: with SMTP id 12mr9595237pjl.175.1635886151908; Tue, 02 Nov 2021 13:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635886151; cv=none; d=google.com; s=arc-20160816; b=JiQOAHeOz//Zp5BNpKtZ8MUhmfMm08xix5+rSYNa0C+m7gWQm5VvlR3Wd9If5Ot83K TAWRL6QYjH9GEyT+MmfyoSHW+LGxUXd+9yPd6P43uskGVRsXPiHHA0lH11jOPL5D8Mt/ SHnm8l8msObBfYCFzTdQS9c56+OUclSFsfq6fIB8SQq40BkBPXe1zKLJbczK5EdV6M9J 7Wy7HuCKOn3AH5hzK4tlDbfnLpfB8N9hO3bVdeT58IcLf9T9/qk+ypn/1bvHoeCE71pR dBj3EuMiwpUc5AyP145tOOW/ikYG6CMZ72wxUDtoZr0zE/nUPZWfJkcdnCjy25ckfEXr 12Fw== 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:to:from:dkim-signature; bh=rr3Q/ANp+LjbMnLpx/zhMI1DcfYVKztRSE3NmIZ31Qo=; b=UI8KyvmkCMBUY+2BRtubbjjD6Deh5XL8tIddKAOvxRPXFC973OoFqEwzOmwEE2t4i3 Sy4gKUIu/qXtDoxLBuxISso/cOjS/uL4hoWnA0lufZVo54pVZZzgn3yX7biWbSkeM0s6 smkUGYm8RYohNF3Ch3O3+hjQIOiF09h/28YpXdWAFN8aFS6/3erpsTKisDr3W+2lO0b8 WpPBtYfElrBRQGqJnqkg/iPzKbRuv6YNnvuJuJzbDD0ZW2d70GTWCM1vkDKwRH1ZSYTr ctNEWr65enLqhxlKI84fhrmov1A1AaeeOXtUL9boX3WYA3mqvv/hPIcE2ydg+/qxZ43E vvEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g9NWUff8; spf=pass (google.com: domain of mptcp+bounces-2348-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2348-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id q78si84565pfc.57.2021.11.02.13.49.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Nov 2021 13:49:11 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2348-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g9NWUff8; spf=pass (google.com: domain of mptcp+bounces-2348-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2348-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.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 sjc.edge.kernel.org (Postfix) with ESMTPS id 210D03E0F44 for ; Tue, 2 Nov 2021 20:49:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1EE442CA2; Tue, 2 Nov 2021 20:49:10 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 50B1C2C99 for ; Tue, 2 Nov 2021 20:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635886147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rr3Q/ANp+LjbMnLpx/zhMI1DcfYVKztRSE3NmIZ31Qo=; b=g9NWUff8EwPzIziUuQt2hYQtAnGBoo4kqiv52tNgs1sYnnU6lAKkV51V4O+yqf0OOLizct 15KFvzFBCIoQFz8ZMyqPozD7r0zzuXZ9WMne7IYmQDzHJ67fudAq7FGSbqbO/Nqprd0p7x bgln6Td8d1/8Ahf/m51l7qtyQuSGXKw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562-43dQ-FSJPxCSFFpDAiYp5A-1; Tue, 02 Nov 2021 16:49:06 -0400 X-MC-Unique: 43dQ-FSJPxCSFFpDAiYp5A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 88F8187D541 for ; Tue, 2 Nov 2021 20:49:05 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id F22F960CC4 for ; Tue, 2 Nov 2021 20:49:04 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-net 1/2] mptcp: fix delack timer Date: Tue, 2 Nov 2021 21:48:58 +0100 Message-Id: <1429df0f9272607ebd8658d9f73e9fbad9165907.1635885975.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Dumazet To compute the rtx timeout schedule_3rdack_retransmission() does multiple things in the wrong way: srtt_us is measures in usec/8 and the timeout itself is an absolute vale. Fixes: ec3edaa7ca6ce02f ("mptcp: Add handling of outgoing MP_JOIN requests") Signed-off-by: Eric Dumazet Reviewed-by: Mat Martineau @linux.intel.com> --- commit message typos added by me --- net/mptcp/options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 7c3420afb1a0..2ca077fdf10a 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -434,9 +434,10 @@ static void schedule_3rdack_retransmission(struct sock= *sk) =20 /* reschedule with a timeout above RTT, as we must look only for drop */ if (tp->srtt_us) - timeout =3D tp->srtt_us << 1; + timeout =3D usecs_to_jiffies(tp->srtt_us >> (3-1)); else timeout =3D TCP_TIMEOUT_INIT; + timeout +=3D jiffies; =20 WARN_ON_ONCE(icsk->icsk_ack.pending & ICSK_ACK_TIMER); icsk->icsk_ack.pending |=3D ICSK_ACK_SCHED | ICSK_ACK_TIMER; --=20 2.26.3 From nobody Fri Apr 26 05:37:11 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:956b:0:0:0:0:0 with SMTP id y98csp4485138jah; Tue, 2 Nov 2021 13:49:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywdrva4cP8gPgtIA6yLGlNZMNuZ95UCxh3FPk9jLLx3bA6oeozJxK/AhHiiHUse1snf/HQ X-Received: by 2002:a17:90b:4ac1:: with SMTP id mh1mr9636134pjb.144.1635886157329; Tue, 02 Nov 2021 13:49:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635886157; cv=none; d=google.com; s=arc-20160816; b=GfAMTkV9UOvCfjPgXBFOUck8lxxhRxASBztd/1mSwn0LMrByRw5Fiu/gOj67xsgOFS 9+864pmD7FTnfKn98XnB5MP9okfLr0kJej1Ldg/5exbQxBuSZe5Lp0k4BWgC23hoFfcc mrOaUoGHxw89wu6tgKlyJkancaMTHperL0FKYKr8WFfZm2BkPtItNWbrYXhj6/oN15gQ rGLNYVpEIZ+gr98qyqdT/UBClUL/EWDfPtW1XRfLA8MK/BCtrh98XjZGy3Z6nhSUqyxS oGVsnW+tFzUxRiaX37lkcAxjoVQcsV3qC5CePA40zInYBls2VBne4hbp2my0lCcWdYfp pCKw== 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:to:from:dkim-signature; bh=+JHPVm5wZ7wGH+K5/qQcd2F9D+r7HEUoydqmDVBXi/Q=; b=NGd4thnrNtuYFqJuo7d5zRw1sYajs3mjyR6pn4exw8sdgW/lxInAVo5gEzjHU6fgQv oqWcqX3uLQu5zYEEcbrcZhX3IA7zbbypVNEt8hDm0rA9nAbktiGElzLMWnD7bJyJDMo2 1dGjAL+LY8fdBNv1UQHez+LG+sqaBHzrAJhV9JZXXk05QXzW2I15kL1f4vdTHsHDJe3M 0vRw921i5l1csxOATczl343sR0FKxDZswn0nWItF5aUBRln/joQdvjW5f9YtDlXvv9Dj vGnkMwI7iXlIzJspMiX7NQWsIbYZ+r49MPDmpGwjAwbcpTzfJxVuBNCPzZXv+PyzdB0o Y+OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iqAZgFcG; spf=pass (google.com: domain of mptcp+bounces-2350-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2350-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id p23si170828plq.104.2021.11.02.13.49.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Nov 2021 13:49:17 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2350-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iqAZgFcG; spf=pass (google.com: domain of mptcp+bounces-2350-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2350-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.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 sjc.edge.kernel.org (Postfix) with ESMTPS id D9E963E0F3C for ; Tue, 2 Nov 2021 20:49:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C401F2C9F; Tue, 2 Nov 2021 20:49:15 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (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 03CA82C99 for ; Tue, 2 Nov 2021 20:49:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635886153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+JHPVm5wZ7wGH+K5/qQcd2F9D+r7HEUoydqmDVBXi/Q=; b=iqAZgFcGYqauHb4fSBO82FJl+yrIeRVTDgujB7htLS+nXc+HNiIegTLTPR5/WFikEV9Xc7 d2YWXCWBuaJaO4rocZj3PsC3bJdoXdGkhfpep6WsNLsNKrqEU6ADmnBOfk/RbhdMLxFb8f ZtDBREBWCSl2VjHNFkPIreSBqDMS6mg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-545-N-DIix38MMyezzMnQYqJuw-1; Tue, 02 Nov 2021 16:49:07 -0400 X-MC-Unique: N-DIix38MMyezzMnQYqJuw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A7456100C661 for ; Tue, 2 Nov 2021 20:49:06 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFD8F60CC9 for ; Tue, 2 Nov 2021 20:49:05 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-net 2/2] mptcp: use delegate action to schedule 3rd ack retrans Date: Tue, 2 Nov 2021 21:48:59 +0100 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Scheduling a delack in mptcp_established_options_mp() is not a good idea: such function is called by tcp_send_ack() and the pending delayed ack will be cleared shortly after by the tcp_event_ack_sent() call in __tcp_transmit_skb(). Instead use the mptcp delegated action infrastructure to schedule the delayed ack after the current bh processing completes. Additionally moves the schedule_3rdack_retransmission() helper into protocol.c to avoid making it visible in a different compilation unit. Fixes: ec3edaa7ca6ce02f ("mptcp: Add handling of outgoing MP_JOIN requests") Signed-off-by: Paolo Abeni --- v1 -> v2: - fix wrong delegated action scheduling (Mat) --- net/mptcp/options.c | 33 ++++++++--------------------- net/mptcp/protocol.c | 50 ++++++++++++++++++++++++++++++++++++-------- net/mptcp/protocol.h | 17 ++++++++------- 3 files changed, 59 insertions(+), 41 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 2ca077fdf10a..fe98e4f475ba 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -422,29 +422,6 @@ bool mptcp_syn_options(struct sock *sk, const struct s= k_buff *skb, return false; } =20 -/* MP_JOIN client subflow must wait for 4th ack before sending any data: - * TCP can't schedule delack timer before the subflow is fully established. - * MPTCP uses the delack timer to do 3rd ack retransmissions - */ -static void schedule_3rdack_retransmission(struct sock *sk) -{ - struct inet_connection_sock *icsk =3D inet_csk(sk); - struct tcp_sock *tp =3D tcp_sk(sk); - unsigned long timeout; - - /* reschedule with a timeout above RTT, as we must look only for drop */ - if (tp->srtt_us) - timeout =3D usecs_to_jiffies(tp->srtt_us >> (3-1)); - else - timeout =3D TCP_TIMEOUT_INIT; - timeout +=3D jiffies; - - WARN_ON_ONCE(icsk->icsk_ack.pending & ICSK_ACK_TIMER); - icsk->icsk_ack.pending |=3D ICSK_ACK_SCHED | ICSK_ACK_TIMER; - icsk->icsk_ack.timeout =3D timeout; - sk_reset_timer(sk, &icsk->icsk_delack_timer, timeout); -} - static void clear_3rdack_retransmission(struct sock *sk) { struct inet_connection_sock *icsk =3D inet_csk(sk); @@ -527,7 +504,15 @@ static bool mptcp_established_options_mp(struct sock *= sk, struct sk_buff *skb, *size =3D TCPOLEN_MPTCP_MPJ_ACK; pr_debug("subflow=3D%p", subflow); =20 - schedule_3rdack_retransmission(sk); + /* we can use the full delegate action helper only from BH context + * If we are in process context - sk is flushing the backlog at + * socket lock release time - just set the appropriate flag, will + * be handled by the release callback + */ + if (sock_owned_by_user(sk)) + set_bit(MPTCP_DELEGATE_ACK, &subflow->delegated_status); + else + mptcp_subflow_delegate(subflow, MPTCP_DELEGATE_ACK); return true; } return false; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1671fc9184c2..1ee3530ac2a3 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1618,7 +1618,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk) if (!xmit_ssk) goto out; if (xmit_ssk !=3D ssk) { - mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk)); + mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk), MPTCP_DELEGATE_SEN= D); goto out; } =20 @@ -2971,7 +2971,7 @@ void __mptcp_check_push(struct sock *sk, struct sock = *ssk) if (xmit_ssk =3D=3D ssk) __mptcp_subflow_push_pending(sk, ssk); else if (xmit_ssk) - mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk)); + mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk), MPTCP_DELEGATE_SEND= ); } else { set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->flags); } @@ -3021,18 +3021,50 @@ static void mptcp_release_cb(struct sock *sk) __mptcp_update_rmem(sk); } =20 +/* MP_JOIN client subflow must wait for 4th ack before sending any data: + * TCP can't schedule delack timer before the subflow is fully established. + * MPTCP uses the delack timer to do 3rd ack retransmissions + */ +static void schedule_3rdack_retransmission(struct sock *ssk) +{ + struct inet_connection_sock *icsk =3D inet_csk(ssk); + struct tcp_sock *tp =3D tcp_sk(ssk); + unsigned long timeout; + + if (mptcp_subflow_ctx(ssk)->fully_established) + return; + + /* reschedule with a timeout above RTT, as we must look only for drop */ + if (tp->srtt_us) + timeout =3D usecs_to_jiffies(tp->srtt_us >> (3-1)); + else + timeout =3D TCP_TIMEOUT_INIT; + timeout +=3D jiffies; + + WARN_ON_ONCE(icsk->icsk_ack.pending & ICSK_ACK_TIMER); + icsk->icsk_ack.pending |=3D ICSK_ACK_SCHED | ICSK_ACK_TIMER; + icsk->icsk_ack.timeout =3D timeout; + sk_reset_timer(ssk, &icsk->icsk_delack_timer, timeout); +} + void mptcp_subflow_process_delegated(struct sock *ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); struct sock *sk =3D subflow->conn; =20 - mptcp_data_lock(sk); - if (!sock_owned_by_user(sk)) - __mptcp_subflow_push_pending(sk, ssk); - else - set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->flags); - mptcp_data_unlock(sk); - mptcp_subflow_delegated_done(subflow); + if (test_bit(MPTCP_DELEGATE_SEND, &subflow->delegated_status)) { + mptcp_data_lock(sk); + if (!sock_owned_by_user(sk)) + __mptcp_subflow_push_pending(sk, ssk); + else + set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->flags); + mptcp_data_unlock(sk); + mptcp_subflow_delegated_done(subflow, MPTCP_DELEGATE_SEND); + } + if (test_bit(MPTCP_DELEGATE_ACK, &subflow->delegated_status)) { + schedule_3rdack_retransmission(ssk); + mptcp_subflow_delegated_done(subflow, MPTCP_DELEGATE_ACK); + } } =20 static int mptcp_hash(struct sock *sk) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 46691acdea24..f6f4054e19ee 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -387,6 +387,7 @@ struct mptcp_delegated_action { DECLARE_PER_CPU(struct mptcp_delegated_action, mptcp_delegated_actions); =20 #define MPTCP_DELEGATE_SEND 0 +#define MPTCP_DELEGATE_ACK 1 =20 /* MPTCP subflow context */ struct mptcp_subflow_context { @@ -493,23 +494,23 @@ static inline void mptcp_add_pending_subflow(struct m= ptcp_sock *msk, =20 void mptcp_subflow_process_delegated(struct sock *ssk); =20 -static inline void mptcp_subflow_delegate(struct mptcp_subflow_context *su= bflow) +static inline void mptcp_subflow_delegate(struct mptcp_subflow_context *su= bflow, int action) { struct mptcp_delegated_action *delegated; bool schedule; =20 + /* the caller held the subflow bh socket lock */ + lockdep_assert_in_softirq(); + /* The implied barrier pairs with mptcp_subflow_delegated_done(), and * ensures the below list check sees list updates done prior to status * bit changes */ - if (!test_and_set_bit(MPTCP_DELEGATE_SEND, &subflow->delegated_status)) { + if (!test_and_set_bit(action, &subflow->delegated_status)) { /* still on delegated list from previous scheduling */ if (!list_empty(&subflow->delegated_node)) return; =20 - /* the caller held the subflow bh socket lock */ - lockdep_assert_in_softirq(); - delegated =3D this_cpu_ptr(&mptcp_delegated_actions); schedule =3D list_empty(&delegated->head); list_add_tail(&subflow->delegated_node, &delegated->head); @@ -534,16 +535,16 @@ mptcp_subflow_delegated_next(struct mptcp_delegated_a= ction *delegated) =20 static inline bool mptcp_subflow_has_delegated_action(const struct mptcp_s= ubflow_context *subflow) { - return test_bit(MPTCP_DELEGATE_SEND, &subflow->delegated_status); + return !!READ_ONCE(subflow->delegated_status); } =20 -static inline void mptcp_subflow_delegated_done(struct mptcp_subflow_conte= xt *subflow) +static inline void mptcp_subflow_delegated_done(struct mptcp_subflow_conte= xt *subflow, int action) { /* pairs with mptcp_subflow_delegate, ensures delegate_node is updated be= fore * touching the status bit */ smp_wmb(); - clear_bit(MPTCP_DELEGATE_SEND, &subflow->delegated_status); + clear_bit(action, &subflow->delegated_status); } =20 int mptcp_is_enabled(const struct net *net); --=20 2.26.3