From nobody Mon Feb 9 08:29:39 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp690549jap; Thu, 11 Nov 2021 07:14:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJx2ITVRTAuyrJIV7H2SZgu+zARaAcZ4JDdkyKDzzQ0MkpGl39tGMPaMdYpeNrW8A8TSVW37 X-Received: by 2002:a65:6643:: with SMTP id z3mr5100166pgv.16.1636643680433; Thu, 11 Nov 2021 07:14:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636643680; cv=none; d=google.com; s=arc-20160816; b=zXCpUL2O4dRatcMw/oBgHQ6jU4FqwGjOshnNi1zQXeTkiOnodwmdwknorVww+vyKrn a5il6VmJIwdEeNjagFwXzrT9CUCsVSp9sMafEX7WI3vY+VcmtkirFvGhrxJSW6Iy5ji/ TzfH4UD/NsOcN9v4y/i1Ur/5cKKhdAXLHOqZEAXU6PIpugKOti68eSzMOlKgl84mcOal S0qY2FiYHdc44rN2QT0ikFikSrdgy2+dOb++7bPjtAm1uWICtknWnlf1lXm3WtqyE+EJ 0Ky6t/SYlrQQzXi8IQyJWvrMdYskvjpQETgyO/FX6girrcdN9llGW2tHUBGAaukSOe5Q 3xRw== 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=pVpQYWN+cceFE/qcx/S1wSWvAs/WwIvABpsCyMkEOO8=; b=039EeOL8+c+NtFE98qeJGnWqld2aa7qL8DIez7NsoqCMMrqlcroGUQ4J1IlGbwM0F9 ko8RkK4P4luuRwuhNJ+/xcuZVDF7WNK/9Nzv4/iDdCc8r5OY9R0KowThwlRUr1hH3Zwt 9qOJSMT8N5Chr+J7BIbn1y6O1MZGd6YnFVNPD04Wu//Do+hsKylP3U1/BuKYm9af+jpb 6MSFA1S5axg0j2Kitae7c3P0v/UEwLz6bJslR7qKq29H7/ApEretNmptesuYQ6bbb5UR Ir86LMIGFfo7F2ic2PpdnByrYb9FobCD/xydQaO5Zwv4Fpscy/Z0V55R3Xj/48EIVZPc owPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2419-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2419-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id u12si4685439pfc.163.2021.11.11.07.14.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Nov 2021 07:14:40 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2419-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; spf=pass (google.com: domain of mptcp+bounces-2419-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2419-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 E39F53E103B for ; Thu, 11 Nov 2021 15:14:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 192E12C82; Thu, 11 Nov 2021 15:14:39 +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 DFDB82C81 for ; Thu, 11 Nov 2021 15:14:37 +0000 (UTC) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1mlBme-0000N6-7d; Thu, 11 Nov 2021 16:14:36 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH v2 mptcp-next 3/4] mptcp: add SIOCINQ, OUTQ and OUTQNSD ioctls Date: Thu, 11 Nov 2021 16:14:17 +0100 Message-Id: <20211111151418.17276-4-fw@strlen.de> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211111151418.17276-1-fw@strlen.de> References: <20211111151418.17276-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) Signed-off-by: Florian Westphal --- net/mptcp/protocol.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 61047d04e849..1c4604283b00 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 @@ -3260,6 +3261,58 @@ 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); + int answ; + bool slow; + + switch (cmd) { + case SIOCINQ: + if (sk->sk_state =3D=3D TCP_LISTEN) + return -EINVAL; + + lock_sock(sk); + if (skb_queue_empty(&msk->receive_queue)) + __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, @@ -3272,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