From nobody Mon Feb 9 15:08:18 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a17:907:7811:b0:6d8:2910:9a8 with SMTP id la17csp2185452ejc; Thu, 24 Mar 2022 06:58:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgnbJEgoK9aNtEIc61KriATsWC5F+Gw/qfsKCBjbz8TGO0IsrbOo9k+460Lyij2UWDz120 X-Received: by 2002:a17:902:8bcc:b0:14f:2294:232e with SMTP id r12-20020a1709028bcc00b0014f2294232emr5820323plo.105.1648130310948; Thu, 24 Mar 2022 06:58:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648130310; cv=none; d=google.com; s=arc-20160816; b=PxBkp0r5fV3I92/hOzQr5DqtDUmhf2Je+A4aEMoN4x32Ju/8s9TO/4MMtbQcoklut6 q3R+TYlBSDXbTSerDUZUqbVMuTK3MLYGbJFVrmPI4Dg4CY/vsfjsG80rWnK96WwRa9E9 eiNrkJdmQ663RMlQgoPNpu5rResjL0AK2oFSuuyWu7j5NDhur/55dxX+6SR9zZQpprZH +BcYkCNUBupmnRduOmU6Xzi8GZf0bdUxGWDg7EtljaFF7csyJyDq82xpe05+t6jhlwOg WL7iQJYjgNcoN46Tzy4hRyM/htzueP0JBA6QROkEmh8jcPWs+z5xm8homctNvFKfwNHS r+0w== 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; bh=9VyM8ZU+SI0v4/S0KbMGqXzP6Al/NPKR+EgkMxtfP2I=; b=Pp06xyJB1Mu1/5BGr9f1JgX/HqkxIx6yyKsAmE8uI5S93Q7IihLImwwRCgfcnp69E+ S/m/Qn4UgUZ+uzJ6HKqI7v5HS3diQGW45H/Sef96v1sLVX5aIhZiJm2tCAA03T5Px/3d Qx2j4vDRV9XyMo17GMGKB9x3akC3+lsWM4GOGBE8OVCbiK5Dx01zMTK83yJWS+oNfSG7 qa3SWaPL5L4fBajML96OMtTEas79qbf40mFnIgWj7ctFJc5/n4HeKIFYU7h/NTogsEuD nyEXOt1ydCVsbzGkbCQ1naRONgIOQg477M7pwlYFhh/TgoT52/FJZ8WpMu+KYqeS4WOV RBrA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4401-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4401-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id s17-20020a170902989100b00153b2d16589si2671673plp.401.2022.03.24.06.58.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Mar 2022 06:58:30 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4401-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-4401-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4401-wpasupplicant.patchew=gmail.com@lists.linux.dev" 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 7AAFC1C0CC4 for ; Thu, 24 Mar 2022 13:58:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0E28B1FC7; Thu, 24 Mar 2022 13:58:25 +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 CFABE1FC0 for ; Thu, 24 Mar 2022 13:58:23 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nXNyo-00070P-6F; Thu, 24 Mar 2022 14:58:22 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp-next 4/4] mptcp: let mptcp listen dump show listen backlog size Date: Thu, 24 Mar 2022 14:57:53 +0100 Message-Id: <20220324135753.25182-5-fw@strlen.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220324135753.25182-1-fw@strlen.de> References: <20220324135753.25182-1-fw@strlen.de> 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" Before: State Recv-Q Send-Q .. LISTEN 0 0 After: LISTEN 0 20 Signed-off-by: Florian Westphal --- net/mptcp/mptcp_diag.c | 10 ++++++++-- net/mptcp/protocol.c | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/net/mptcp/mptcp_diag.c b/net/mptcp/mptcp_diag.c index 6a6dfc7eac33..e1babab45e86 100644 --- a/net/mptcp/mptcp_diag.c +++ b/net/mptcp/mptcp_diag.c @@ -189,8 +189,14 @@ static void mptcp_diag_get_info(struct sock *sk, struc= t inet_diag_msg *r, struct mptcp_sock *msk =3D mptcp_sk(sk); struct mptcp_info *info =3D _info; =20 - r->idiag_rqueue =3D sk_rmem_alloc_get(sk); - r->idiag_wqueue =3D sk_wmem_alloc_get(sk); + if (inet_sk_state_load(sk) =3D=3D TCP_LISTEN) { + r->idiag_rqueue =3D READ_ONCE(sk->sk_ack_backlog); + r->idiag_wqueue =3D READ_ONCE(sk->sk_max_ack_backlog); + } else { + r->idiag_rqueue =3D sk_rmem_alloc_get(sk); + r->idiag_wqueue =3D sk_wmem_alloc_get(sk); + } + if (!info) return; =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d3887f628b54..a29cfc4c44a1 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3589,8 +3589,11 @@ static int mptcp_listen(struct socket *sock, int bac= klog) =20 err =3D ssock->ops->listen(ssock, backlog); inet_sk_state_store(sock->sk, inet_sk_state_load(ssock->sk)); - if (!err) + if (!err) { mptcp_copy_inaddrs(sock->sk, ssock->sk); + WRITE_ONCE(sock->sk->sk_max_ack_backlog, + READ_ONCE(ssock->sk->sk_max_ack_backlog)); + } =20 unlock: release_sock(sock->sk); --=20 2.34.1