From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 B380641E6C9 for ; Fri, 16 Oct 2026 08:14:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792138488; cv=none; b=hOVshI2sA/eSYPtJBRJsnmUUZXVnHKu4sPaqiZpE0Ay/UlIcfoMIyQQPRo17QWD+FBAyA70UoY8ZVbZSmHGR3NfGwrIp3vIQdRS3M6CgDPsLnNCp82xo4EZVSECoaGp+gHM9kpmxosygcZWKl3pMzNOXxCFm1TWK4AjvGA5MQV0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792138488; c=relaxed/simple; bh=6URY0D6oYme6xz01rwrlqB2zCECHzV8y7FzNmRlu6EY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=V1pWI2afA2WqXbZuYULLsV4FqLWyEI1fLIRVb7e3ZojVbN+lB5NEJ9q0M5yMA905N8FedXZ/sjW8lIKvPzTeAc/526hYLv1Yk/eva5pX3e9ZijmLZki+FuRzkXsFa7eYdJSSfyGuw7sw04fquGom1/zpQIIo80U+gYLJqt6dLfs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Pt8MuYQb; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=Lzc/A7Ga; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Pt8MuYQb"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="Lzc/A7Ga" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1792138485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=56RICpgwGhNm6LSWh8AoomM8aDXtuq7tL8RIbQGojuE=; b=Pt8MuYQbhHj7TvfVcvWHxchQziLBqNcClk6qcUDPztE/+5VhVYm0WDI9miUwx9pu+yfSTv 7ovdWINGBNE69kHTnOPuOJNhIPZkuUXOOnqFhgy4jadeSq1PCU9vi0RJJ7RS/QxeTz32gK EJjBzeVx83jYkD5YabZAfSUOrNGSqlQ= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-466-BQQOUpP8OEGfVVTUMCOdIA-1; Fri, 16 Oct 2026 08:14:42 +0000 X-MC-Unique: BQQOUpP8OEGfVVTUMCOdIA-1 X-Mimecast-MFC-AGG-ID: BQQOUpP8OEGfVVTUMCOdIA_1792138481 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4994d67d0e3so20139525e9.2 for ; Fri, 16 Oct 2026 01:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1792138481; x=1792743281; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=56RICpgwGhNm6LSWh8AoomM8aDXtuq7tL8RIbQGojuE=; b=Lzc/A7Gamz+gQPJhr4UEKRx2WeSl3HpfGfE3m2fkB5kNU2Si/Q1+3tNYW2cUBaJZ15 dfK+eIU0Ut9JdMoBR2fy/d2D1tovzOMLnPftfh+42Yd0SBHTjG+wnX/JYqjSavCfqV+C 5htEfdRGJ96STAmEY2GshKIjiX5jXdR5M7G+OGjHd17Xy3omGYxFYj+ZkyOX3M/4JsHT SWQsTMuq4tfWzW5dD/5shyKKfTsFxVT8RXa9sE3hJ0jM3Rijs97ZPWekGuYOeiMfkrs8 0LmWgDOwB06H8VvDeFc1b24hvCLPPTGujNSGzkeVrVViL/r8zz+Ror4N+BjrRNPPSap8 Ktwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792138481; x=1792743281; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=56RICpgwGhNm6LSWh8AoomM8aDXtuq7tL8RIbQGojuE=; b=e5LP1ddA0bZOQO0RToeydxUHpTOVt5gwnjxbtnQWsFRxXA6S++lAyAf9H03yD4kmAl IyNvzvkAppysLnPS27xAYkVwR/COgpalXbJbqdc74saM16oYpn9LimH8VcBNmRw6O7PC QlNSUUaaQQgbIQMFGnuadHZa5s0T1friFikE7amOty+TbWY03hXgjEDUx3XdHJRDICxX zuJblN4SumYtEP+GfyNM2iU22wGh3ww4M5D11vVtxNAIiYgT/HRFUBbkXgdr62T5tV7l ADgyPWGzMEffZey4cHwKbtbNHiZrgywZtO6tsLC3U/Jyb/ha4f2B4jbOjbAgDCfirtut KMEQ== X-Gm-Message-State: AFq9FYJ1RZT87iISClg4f7C2MZzztmFVF7M4Xm4sFiVo8U2oMdoB0tnk 5ZtSbK1ZmTVPrPIKWlDhiYpCZtjQ4MxNjxmTw+3JKfI63Jor5NoP2hmb9uXrPcu0qtPYTJMTUWO 5vJgGUC+ugLuxdu9GaSta/rA3BuERR83FAeXg5g1PEYY1/OHyqUswItBO+w== X-Gm-Gg: AYBFou05nkDDbYzYDSjN9wARWbcwbcsNlDkxDFRn/rtJHypKchsu4aX2Ex6re1uQtw5 xaRLK5X90Xea6OZ7vuUXdObCiKEgr0uwmafyILphwRwROCOEfNcHUIxjFPNghGSFJdb+i8TtyGm 36VX/V/RGx+6AHjZOKkTCZ+UUOVxoD9NDiYLUMCQOBur2rl35D6WF7kF7zVA1E5jjdQ362xykBr NA9mzRkA3mI0IYwJ2ihd6oKV+Rmg3JLkw5lWtldRF3gBSxa8FY/wNDs6VmYyWPMXumuL67+HwT+ 21V6qT6vZleF78qbLqAxnZxtK3dD578dkvIayi2EkdpbZkX0vu8RwE6PNSqYfet9jrkpSggdHqw 8vS8S X-Received: by 2002:a05:600c:19cf:b0:4a0:168f:d962 with SMTP id 5b1f17b1804b1-4a18e44363dmr423676055e9.3.1792138481259; Fri, 16 Oct 2026 01:14:41 -0700 (PDT) X-Received: by 2002:a05:600c:19cf:b0:4a0:168f:d962 with SMTP id 5b1f17b1804b1-4a18e44363dmr423675585e9.3.1792138480725; Fri, 16 Oct 2026 01:14:40 -0700 (PDT) Received: from sgarzare-redhat ([80.116.137.133]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48dfd47104csm3835450f8f.8.2026.10.16.01.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2026 01:14:39 -0700 (PDT) Date: Fri, 16 Oct 2026 10:14:37 +0200 From: Stefano Garzarella To: David Carlier Cc: netdev@vger.kernel.org, bobbyeshleman@gmail.com, davem@davemloft.net, edumazet@kernel.org, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH net-next v2 1/2] vsock: support SO_INQ on stream sockets Message-ID: References: <20261015154334.3217358-1-devnexen@gmail.com> <20261015154334.3217358-2-devnexen@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20261015154334.3217358-2-devnexen@gmail.com> On Thu, Oct 15, 2026 at 04:43:33PM +0100, David Carlier wrote: >SO_INQ makes recvmsg() return the bytes left in the receive queue in an >SCM_INQ cmsg, saving a SIOCINQ call per receive. AF_UNIX stream sockets >support it, AF_VSOCK fails with ENOPROTOOPT. > >Add it for SOCK_STREAM, reusing the hint already computed for io_uring. >As with TCP_INQ, 1 is reported once the stream is finished so the caller >reads again and sees EOF, and accepted sockets inherit the setting from >the listener. No cmsg is sent when the transport cannot report the queue >length. > >SOCK_SEQPACKET is refused, as on AF_UNIX: its transport callback counts >messages, not bytes. > >Signed-off-by: David Carlier >--- > include/net/af_vsock.h | 1 + > net/vmw_vsock/af_vsock.c | 111 +++++++++++++++++++++++++++++---------- > 2 files changed, 84 insertions(+), 28 deletions(-) > >diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h >index 5549298c1ec6..e8481f12312e 100644 >--- a/include/net/af_vsock.h >+++ b/include/net/af_vsock.h >@@ -68,6 +68,7 @@ struct vsock_sock { > u64 buffer_size; > u64 buffer_min_size; > u64 buffer_max_size; >+ bool recvmsg_inq; > > /* Private to transport. */ > void *trans; >diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >index 1c2d1cea67f4..186ed57fd797 100644 >--- a/net/vmw_vsock/af_vsock.c >+++ b/net/vmw_vsock/af_vsock.c >@@ -984,6 +984,7 @@ static struct sock *__vsock_create(struct net *net, > vsk->buffer_size = psk->buffer_size; > vsk->buffer_min_size = psk->buffer_min_size; > vsk->buffer_max_size = psk->buffer_max_size; >+ vsk->recvmsg_inq = psk->recvmsg_inq; > security_sk_clone(parent, sk); > } else { > vsk->trusted = ns_capable_noaudit(&init_user_ns, CAP_NET_ADMIN); >@@ -2014,6 +2015,66 @@ static void vsock_update_buffer_size(struct vsock_sock *vsk, > vsk->buffer_size = val; > } > >+static bool vsock_custom_sockopt(int optname) Looking at the other function, what about vsock_sol_socket_custom()? >+{ >+ switch (optname) { >+ case SO_ZEROCOPY: >+ case SO_INQ: >+ return true; >+ default: >+ return false; >+ } >+} >+ >+static int vsock_sol_socket_setsockopt(struct sock *sk, int optname, >+ sockptr_t optval, unsigned int optlen) >+{ >+ struct vsock_sock *vsk = vsock_sk(sk); >+ int err = 0; >+ int val; >+ >+ /* Use 'int' type here, because variable to nit: why not using at least 80 columns for this comment? >+ * set these options usually has this type. >+ */ >+ if (optlen < sizeof(val)) >+ return -EINVAL; >+ >+ if (copy_from_sockptr(&val, optval, sizeof(val))) >+ return -EFAULT; >+ >+ if (val < 0 || val > 1) >+ return -EINVAL; What about adding an helper with this code, and call it after checks for each SO_, in this way using SO_INQ on sock_dgram with 2 will return -ENOPROTOOPT. Oh wait, we can use COPY_IN and duplicate the check in each place or add an helper just for that. >+ >+ lock_sock(sk); >+ >+ switch (optname) { >+ case SO_ZEROCOPY: >+ if (vsk->transport && !vsock_msgzerocopy_allow(vsk->transport)) { >+ err = -EOPNOTSUPP; >+ break; >+ } >+ >+ sock_valbool_flag(sk, SOCK_ZEROCOPY, val); >+ break; >+ >+ case SO_INQ: >+ if (sk->sk_type != SOCK_STREAM) { >+ err = -ENOPROTOOPT; >+ break; >+ } >+ >+ vsk->recvmsg_inq = val; >+ break; >+ >+ default: >+ err = -ENOPROTOOPT; >+ break; >+ } >+ >+ release_sock(sk); >+ return err; >+} Now it's much better, but we should not mix a refactoring with a new feature, so please split this patch in 2 patches, first one introducing vsock_sol_socket_setsockopt() just for SO_ZEROCOPY, second one introducing SO_INQ handling. In this way, if we have to backport a fix to SO_ZEROCOPY handling in a stable branch, we can do it easily. The rest LGTM, Stefano >+ > static int vsock_connectible_setsockopt(struct socket *sock, > int level, > int optname, >@@ -2045,36 +2106,16 @@ static int vsock_connectible_setsockopt(struct socket *sock, > sk = sock->sk; > vsk = vsock_sk(sk); > >- lock_sock(sk); >- >- transport = vsk->transport; >- > if (level == SOL_SOCKET) { >- int zerocopy; >- >- if (optname != SO_ZEROCOPY) { >- release_sock(sk); >+ if (!vsock_custom_sockopt(optname)) > return sock_setsockopt(sock, level, optname, optval, optlen); >- } >- >- /* Use 'int' type here, because variable to >- * set this option usually has this type. >- */ >- COPY_IN(zerocopy); > >- if (zerocopy < 0 || zerocopy > 1) { >- err = -EINVAL; >- goto exit; >- } >+ return vsock_sol_socket_setsockopt(sk, optname, optval, optlen); >+ } > >- if (transport && !vsock_msgzerocopy_allow(transport)) { >- err = -EOPNOTSUPP; >- goto exit; >- } >+ lock_sock(sk); > >- sock_valbool_flag(sk, SOCK_ZEROCOPY, zerocopy); >- goto exit; >- } >+ transport = vsk->transport; > > switch (optname) { > case SO_VM_SOCKETS_BUFFER_SIZE: >@@ -2581,6 +2622,7 @@ __vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, > struct sock *sk; > struct vsock_sock *vsk; > const struct vsock_transport *transport; >+ bool do_cmsg = false; > int err; > > sk = sock->sk; >@@ -2637,13 +2679,26 @@ __vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, > err = __vsock_seqpacket_recvmsg(sk, msg, len, flags); > > out: >- /* Seqpacket has_data counts messages, while io_uring treats msg_inq as >- * a byte length when sizing retries, so only streams report a hint. >+ /* Seqpacket has_data counts messages, while SCM_INQ reports bytes and >+ * io_uring treats msg_inq as a byte length when sizing retries, so >+ * only streams report it. > */ >- if (msg->msg_get_inq && err >= 0 && sk->sk_type == SOCK_STREAM) >+ if ((vsk->recvmsg_inq || msg->msg_get_inq) && err >= 0 && >+ sk->sk_type == SOCK_STREAM) { > msg->msg_inq = vsock_stream_inq_hint(sk); > >+ /* A negative hint means the transport could not tell. SCM_INQ >+ * has no encoding for that, so report nothing. >+ */ >+ do_cmsg = vsk->recvmsg_inq && msg->msg_inq >= 0; >+ } >+ > release_sock(sk); >+ >+ if (do_cmsg) >+ put_cmsg(msg, SOL_SOCKET, SCM_INQ, sizeof(msg->msg_inq), >+ &msg->msg_inq); >+ > return err; > } > >-- >2.55.0 >