From nobody Mon Feb 9 13:35:15 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp7705266jap; Tue, 16 Nov 2021 05:59:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJyX8UgOXKGTfwIBSBebRt3fFgc3IJE1R6pksIcjeWX6SXFpkIpLG46Yl9Z740CaT6kRF9Zn X-Received: by 2002:a17:902:b588:b0:143:b732:834 with SMTP id a8-20020a170902b58800b00143b7320834mr31663945pls.22.1637071174876; Tue, 16 Nov 2021 05:59:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637071174; cv=none; d=google.com; s=arc-20160816; b=ue8fvreEmYcXz71n8ZDBUvZBTgbgHT+/YmsBJxztNS7dywpRrbFd2HFX0YQoS0wD3l CK4pjwrS3/6fuLGWKTmgaqVvBS/0/c3roonLzjecd5jHC//e48tnXQrFUkEJiBGnYxhP aVXSxY5skEHJ0bH5pA2yxXc8LqxAtqNgDy2Mz3/4XD+RGtmATB1vvtwDLQuaRueZvRT/ csP0NMKpzalVwXuoR9x/7zAE1K6qQ1mgKXe8CcUPLx+rXd+li38xU/PRREUFs9BGrWsd 0U2IQX4ivrlk/BVRvbo1Z0LdSeFF967LG0ezQWk4Q1sE+y5iBZzfkZmFDO9vAt6WPwk/ l8iw== 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=WZ2iK+2TQsbAa8fzWbhzHileWHjxK3oIDWVH502VOpY=; b=hCM8G4dtnNdeGzBAzjKtmbcTUavriNd0mAQbRBSO7NiKouR5hOIVzAI45pn5Voc5Ft 2g1fL6Lqw1RyoxUhnPhi6zfGGmjLpICcJUK2ytTGfkZkqEixSjKnfwYPQS4sTl9lIShV oLYlBbv/VAzK6WFA58Oj8ILJJhbpPr1aTpV1m2vevT64N1PXsqN8voIIA/dGSdLBtwjS 9u1557wdLIYq3tB6Atv8svGVHl15SYnb77o8HhAnJlwaYWonMbh5ofTxdVmudAqDYHjX 56WAjj9tadR/cedL/8hSdR3p6CwPPlsKogigK7u4XJ1Fe2JzDQOX28vBMijmmiqWiPa3 /olg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2449-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2449-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id 193si29696907pgc.15.2021.11.16.05.59.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Nov 2021 05:59:34 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2449-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2449-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2449-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 sjc.edge.kernel.org (Postfix) with ESMTPS id 9AE7A3E1020 for ; Tue, 16 Nov 2021 13:59:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 64D0C2C88; Tue, 16 Nov 2021 13:59:33 +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 415802C85 for ; Tue, 16 Nov 2021 13:59:32 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1mmyzi-0003Tq-EL; Tue, 16 Nov 2021 14:59:30 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH mptcp-next v3 3/4] mptcp: add SIOCINQ, OUTQ and OUTQNSD ioctls Date: Tue, 16 Nov 2021 14:48:03 +0100 Message-Id: <20211116134804.30090-4-fw@strlen.de> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211116134804.30090-1-fw@strlen.de> References: <20211116134804.30090-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" 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 --- net/mptcp/protocol.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4aaa458d846c..3ab6628ea2b2 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 @@ -3261,6 +3262,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, @@ -3273,6 +3325,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.32.0