From nobody Mon Feb 9 16:50:57 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp1110624jap; Fri, 3 Dec 2021 14:35:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKQf3nwQxnHwvz13vQ9TL/dZ0rkSY9XvEM+TJC7sl/Lw55+rZSq8bGfTz/LhZdN4a3M3WZ X-Received: by 2002:ac8:4d87:: with SMTP id a7mr23727569qtw.410.1638570954816; Fri, 03 Dec 2021 14:35:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638570954; cv=none; d=google.com; s=arc-20160816; b=jdUo/+3CN1wqudADA/A4dhzsV6ugSs2X2/q27M5HJDr1mNXU3Qs2Zl3albGlAlwSC5 Ngc/bYTcaWxDqxWEoQW3U5+EJh6hobagdDo70vihwynFrn5JgwV5VziAEYyHH8YyS5lp MQzWlurW2TfUEhyDp3kS4Enn1AYRY265Lj2lrnFYfXyPpP7XYMVh4FRljYeUYJFg4tUS kJZ1MM4QTLGpY8iHS4yTQ7mHfMQpkDR/Xy57VoyAYEDUvohuf7LFASD8TThM26LhBUTr LLk3tyv+3Dg333G3QYtdnE1tbuU+mj7pciOXvAyEfZWDyHhUZ1z2RLzw5J3ZkoSn1skm AsEw== 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=k1yBghti5p5mqzq3o9gZIONElVXqX9iyU1Ukzbmgy7I=; b=F7m7HaTpQPzF2PXqoB9PiPcey7h1Yk+VWbnTSsD23qPQliEL/pIZGhbbvvDcANr2yt ViZ9U6hbBdsVTfgAQCB5A+kbSmPuRvHsu2BpL8UJRwn6n3Ld3P5Wrs22+Cg1oVZFQdUk FBEYqVMLKJaj66BMqSnPq2HsMzN+UvZ2YRW80Tsl3gwLmYmWPunuiAUfS3M6mXJXXka2 3CxFt1vh1kGPGikXLzYnEqgdb1nHvbJ94FVc2iDV2W5F4zSiydLItnuDgjdzBu9iyCyO L1fe9Y8NYlPfpGaCOd5xggvjc3ZAjrTnuqptxSYqDii0wRJ9RhqLjQyRRpPvLvUEDrTC 43tw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2627-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2627-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id d14si4524732qtx.484.2021.12.03.14.35.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Dec 2021 14:35:54 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2627-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2627-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2627-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (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 ewr.edge.kernel.org (Postfix) with ESMTPS id 605F91C0E5C for ; Fri, 3 Dec 2021 22:35:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6D1672CAE; Fri, 3 Dec 2021 22:35:51 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 CF48B2C9D for ; Fri, 3 Dec 2021 22:35:49 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10187"; a="235802942" X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="235802942" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 14:35:47 -0800 X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="460185306" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.18.88]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 14:35:47 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Florian Westphal , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 03/10] mptcp: add SIOCINQ, OUTQ and OUTQNSD ioctls Date: Fri, 3 Dec 2021 14:35:34 -0800 Message-Id: <20211203223541.69364-4-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211203223541.69364-1-mathew.j.martineau@linux.intel.com> References: <20211203223541.69364-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 Allows to query in-sequence data ready for read(), total bytes in write queue and total bytes in write queue that have not yet been sent. v2: remove unneeded READ_ONCE() (Paolo Abeni) v3: check for new data unconditionally in SIOCINQ ioctl (Mat Martineau) Signed-off-by: Florian Westphal Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index ffc8068aaad0..943f74e804bd 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -22,6 +22,7 @@ #endif #include #include +#include #include "protocol.h" #include "mib.h" =20 @@ -3211,6 +3212,57 @@ static int mptcp_forward_alloc_get(const struct sock= *sk) return sk->sk_forward_alloc + mptcp_sk(sk)->rmem_fwd_alloc; } =20 +static int mptcp_ioctl_outq(const struct mptcp_sock *msk, u64 v) +{ + const struct sock *sk =3D (void *)msk; + u64 delta; + + if (sk->sk_state =3D=3D TCP_LISTEN) + return -EINVAL; + + if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) + return 0; + + delta =3D msk->write_seq - v; + if (delta > INT_MAX) + delta =3D INT_MAX; + + return (int)delta; +} + +static int mptcp_ioctl(struct sock *sk, int cmd, unsigned long arg) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + bool slow; + int answ; + + switch (cmd) { + case SIOCINQ: + if (sk->sk_state =3D=3D TCP_LISTEN) + return -EINVAL; + + lock_sock(sk); + __mptcp_move_skbs(msk); + answ =3D mptcp_inq_hint(sk); + release_sock(sk); + break; + case SIOCOUTQ: + slow =3D lock_sock_fast(sk); + answ =3D mptcp_ioctl_outq(msk, READ_ONCE(msk->snd_una)); + unlock_sock_fast(sk, slow); + break; + case SIOCOUTQNSD: + slow =3D lock_sock_fast(sk); + answ =3D mptcp_ioctl_outq(msk, msk->snd_nxt); + unlock_sock_fast(sk, slow); + break; + default: + return -ENOIOCTLCMD; + } + + return put_user(answ, (int __user *)arg); +} + static struct proto mptcp_prot =3D { .name =3D "MPTCP", .owner =3D THIS_MODULE, @@ -3223,6 +3275,7 @@ static struct proto mptcp_prot =3D { .shutdown =3D mptcp_shutdown, .destroy =3D mptcp_destroy, .sendmsg =3D mptcp_sendmsg, + .ioctl =3D mptcp_ioctl, .recvmsg =3D mptcp_recvmsg, .release_cb =3D mptcp_release_cb, .hash =3D mptcp_hash, --=20 2.34.1