From nobody Fri Dec 19 18:48:07 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 7253A5397 for ; Thu, 26 Jan 2023 21:05:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674767144; 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=pDRBzCFRHH1GXnlJO6Osp+We/1BGVcbJduTyiThQn4A=; b=CIY7XGm8AxRYZ1DswGWr935Xafc4GPZ2iRRpL4GASATLPAZMVEN54YI4gdvZKq+QHG4/x6 LzNzi27yxvp7l9Z/CU8skfJg/k7K2/RWXF4mC1LWb2Sv36u67+1MQ/loJNaxvT06SCyDkr /ADkGBs9FjEpuQH5WgFnCMMxtUz0iGk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-621-XTJbHs_kNveTKzTgH7Eyhg-1; Thu, 26 Jan 2023 16:05:40 -0500 X-MC-Unique: XTJbHs_kNveTKzTgH7Eyhg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F7CD877CA1 for ; Thu, 26 Jan 2023 21:05:40 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9561492C14 for ; Thu, 26 Jan 2023 21:05:39 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v3 mptcp-next 01/15] mptcp: use mptcp_schedule_work() instead of open-codying it Date: Thu, 26 Jan 2023 22:05:06 +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 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" The helper additionally take cares of checking the msk status before taking action. That is functionally irrelevant because the worker itself does nothing if the msk is in CLOSE state. Just remove a few dups line of code. Signed-off-by: Paolo Abeni --- net/mptcp/subflow.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index beaec843f5ca..bd53d83ef2c9 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1207,17 +1207,12 @@ static void mptcp_subflow_discard_data(struct sock = *ssk, struct sk_buff *skb, /* sched mptcp worker to remove the subflow if no more data is pending */ static void subflow_sched_work_if_closed(struct mptcp_sock *msk, struct so= ck *ssk) { - struct sock *sk =3D (struct sock *)msk; - if (likely(ssk->sk_state !=3D TCP_CLOSE)) return; =20 if (skb_queue_empty(&ssk->sk_receive_queue) && - !test_and_set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags)) { - sock_hold(sk); - if (!schedule_work(&msk->work)) - sock_put(sk); - } + !test_and_set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags)) + mptcp_schedule_work((struct sock *)msk); } =20 static bool subflow_can_fallback(struct mptcp_subflow_context *subflow) --=20 2.39.1