From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3ED914FD28D for ; Wed, 14 Oct 2026 11:57:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791979042; cv=none; b=ZMi9RJohaVkasKDTUfl4UQGiwRgx8fI6p7rB1IFOIqOOUFuFnFg0r9MMrWMhvoWQ/z9yUaIwhShRQOhxBKNtlBTrYX/wWUd5Io8JKr8xBTuY3/uDo5XnAL+20aazIMc3uypvFL4gVApgU7o0CjJRHLW6XSexvCmVOaFOJ95z284= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791979042; c=relaxed/simple; bh=UT+gUDWpvYvdUO59q70uyFIuGW+1dknIwp9YCivhP4c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PVf3TAEdjye7RWRX10B+nkGXHCx23O7aymMM90m0QgSxuU4QgJvivRABVfcJh7bjK3JS6QuqnWS6n6F037U8sgJAKjqYCDZZTngy15EaBDRFiOIYyuPdjbt0SX0BT2ZohZE51ZH94JMUxMRZmbhsUD3KgCjNf3ztaYxGyVpNdYo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cKKM09cX; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cKKM09cX" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-3a706146559so2441219a91.2 for ; Wed, 14 Oct 2026 04:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791979039; x=1792583839; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=DeRAz8u7YOmHATBxCqeG7zchbKWr3JF2MUxcRFYnHbo=; b=cKKM09cXQkFJAXpgNifSi4edexNSZMH6B3kAf+PTgOWlSWUFazkm0Gk+BZRxwcPbJS h6+vgUCl2nXyEjMeBeesZFM0tCkiVKVnypQsugOGVPFUmRgY/zRkuX/OHGbm5/5yc/EZ oui2xiFyEw2DhV5OD37NJrBAPWgk6pfgJ2TOz2sfoAAeUQVCeiJTP7zSXEt13GR4Qg98 4kYyKAxk472Qwudrg2SVSw0Y69jln9VP8Zhktx8Uj/OQjF4uYyHye5HJ2q0ZYijmaGlz c8uBAC35MBn9Jovy/fylK43Y7n7O8oKzPb3KaUNOde8KS5KiVB6hLJnm7d/HF38XEkMN PkvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791979039; x=1792583839; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=DeRAz8u7YOmHATBxCqeG7zchbKWr3JF2MUxcRFYnHbo=; b=tgSQAK+1l50sURPZ8b2TdVpreLif147OPCBx6NnWtFHhQz1+CGIGPHfl9ZFKj33AwY +CtigqwMfEs5SS9pwmemM/2TydgvFecHObRDjUJELvdFEuvs6FOn0p+Brlb9r91xmmwr rk/MztVm0PGEMdQRzNW2OOHxaVxcS3WhOns1qLdGB9HpYKFqF4m0xnyC5QkZX++LYlOp knY3R86+G/16G/sNJvBbtQ4XJA2S7ujN3KQjWKT9kMuaa4Bz1wDezZUi37F3L+sjQkA2 /iGyAaHTDgTOl3EgcOG9zGQ4aag9KNiSdf6cTWT+R9lcci8PdJUsxRCrOTpSSmSJbO+R YDQg== X-Forwarded-Encrypted: i=1; AKwUvBw89v0bAZ3tUnZ6deBBq+uLKLmR2fRV15lUCoOK7wzzXResRHxaPg7m9NyQLhuq0kKdR/RDbfhUFITt0Hh98Q==@lists.linux.dev X-Gm-Message-State: AFq9FYIxCRgFnHeqJAwXizL+F1ZBM/kH+4o4FcCiY7ajRt5ESnAuUQHn GBM/WhfdJPIRqt+a0i22G8wOS3w4Xz/2/Ikg3907VIqf7zWRGTdiQyaN X-Gm-Gg: AYBFou0v9vDFD+JfoufmDX5czQg125EAZaHvdCbf35hnLo2UAggBciGaUhZKxm+AI0D r2UTyjmh/KL638MBIMejD7Fgi1z06v0O3zSHKtT+QpbqaBEWz+YBAqL+SXimc5TCEqsL4AnkxW2 12d4baZyCLz9GJ3ch4kfk7XH8Wxf6Z8XwsMgeBo0Te1QpCHHDLLk8j0DBfOpruio4d7NXS+/Hzr RjS4C4JfIHEgmM6s2P6lwaL7PTsGioHJlu2AHMO0i5kajhSVoyzTzq2lg3PAdssrk528T0a36OR eGDzU5Ij0gbhd6RmSf3P3pXdCTOnp9QYre3zN5QLQWf/SAF7hdCHvYyztrtScD6mbW5M5/6c+Qq cl+gJmQjtuKzjOhln5Iu6NKJxsowGy1yAkiI6xc6Dj80fxEOUJ0/QGDtwOv241CHqZySSkDJd8G 7alGSLXXFbr4lE4ul5lk04FHfxTvkiCK9o6wFL3pa+h8eLmtvXs5wz1JvnqE8Stw9m3saBUQ== X-Received: by 2002:a17:90b:55c3:b0:3ac:3e42:60a2 with SMTP id 98e67ed59e1d1-3ac3e426341mr4595338a91.33.1791979038286; Wed, 14 Oct 2026 04:57:18 -0700 (PDT) Received: from gmail.com ([188.253.12.32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3ac5f24b74csm4795691a91.7.2026.10.14.04.57.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2026 04:57:18 -0700 (PDT) From: Jia Jia To: stefanha@redhat.com, sgarzare@redhat.com Cc: mst@redhat.com, jasowangio@gmail.com, eperezma@redhat.com, xuanzhuo@linux.alibaba.com, davem@davemloft.net, edumazet@kernel.org, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, virtualization@lists.linux.dev, kvm@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bobbyeshleman@gmail.com Subject: [PATCH net-next v4 4/4] vsock/virtio: defer RX notifications until batch unlock Date: Wed, 14 Oct 2026 19:56:40 +0800 Message-Id: <20261014115640.184286-5-physicalmtea@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261014115640.184286-1-physicalmtea@gmail.com> References: <20261014115640.184286-1-physicalmtea@gmail.com> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit An RX batch can make a socket readable while the worker still holds its socket lock. Waking a blocking reader then only moves it to waiting for the same lock. Record the existing low-watermark condition and notify once after release_sock(). Move the coalesced write-space notification after the unlock as well, since both callbacks wake sk_sleep(sk). Deliver write-space before data-ready and keep the lookup reference until both callbacks complete. As with write-space, save the initial sk_data_ready callback and batch only while both saved callbacks remain installed. Sockets with replaced callbacks retain their per-packet behavior. The existing psock-marker check also covers a concurrent sockmap attach: at most the already admitted packet completes on the native path, and the next packet ends the batch. Signed-off-by: Jia Jia --- include/linux/virtio_vsock.h | 1 + include/net/af_vsock.h | 5 ++-- net/vmw_vsock/af_vsock.c | 1 + net/vmw_vsock/virtio_transport_common.c | 35 ++++++++++++++++++------- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index bf077ee0ded88..f1396ca3ad9b5 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -288,6 +288,7 @@ struct virtio_transport_rx_batch { unsigned int pkts; size_t bytes; bool write_space_pending; + bool data_ready_pending; }; void virtio_transport_recv_pkt_batch(struct virtio_transport *t, diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index 9a40960d10cbe..78bab5820f528 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -64,9 +64,10 @@ struct vsock_sock { bool sent_request; bool ignore_connecting_rst; /* - * Initial callback, used to identify replacements and deliver deferred - * write-space notifications. + * Initial callbacks, used to identify replacements and deliver deferred + * notifications. */ + void (*default_data_ready)(struct sock *sk); void (*default_write_space)(struct sock *sk); /* Protected by lock_sock(sk) */ diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index fe7f49da6c4bc..f40659ec29df0 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -958,6 +958,7 @@ static struct sock *__vsock_create(struct net *net, sk->sk_type = type; vsk = vsock_sk(sk); + vsk->default_data_ready = sk->sk_data_ready; vsk->default_write_space = sk->sk_write_space; vsock_addr_init(&vsk->local_addr, VMADDR_CID_ANY, VMADDR_PORT_ANY); vsock_addr_init(&vsk->remote_addr, VMADDR_CID_ANY, VMADDR_PORT_ANY); diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index f4b5f0230493e..8b62b789b71c5 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1588,7 +1588,8 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk, static int virtio_transport_recv_connected(struct sock *sk, - struct sk_buff *skb) + struct sk_buff *skb, + bool *data_ready_pending) { struct virtio_vsock_hdr *hdr = virtio_vsock_hdr(skb); struct vsock_sock *vsk = vsock_sk(sk); @@ -1607,7 +1608,13 @@ virtio_transport_recv_connected(struct sock *sk, vsock_remove_sock(vsk); break; } - vsock_data_ready(sk); + if (!data_ready_pending) { + vsock_data_ready(sk); + } else if (!*data_ready_pending && + (vsock_stream_has_data(vsk) >= sk->sk_rcvlowat || + sock_flag(sk, SOCK_DONE))) { + *data_ready_pending = true; + } return err; case VIRTIO_VSOCK_OP_CREDIT_REQUEST: virtio_transport_send_credit_update(vsk); @@ -1820,6 +1827,7 @@ virtio_transport_recv_pkt_batchable(struct virtio_transport *t, return sk->sk_state == TCP_ESTABLISHED && sk->sk_type == SOCK_STREAM && READ_ONCE(sk->sk_prot) == sk->sk_prot_creator && + READ_ONCE(sk->sk_data_ready) == vsk->default_data_ready && READ_ONCE(sk->sk_write_space) == vsk->default_write_space && !sock_flag(sk, SOCK_DONE) && vsk->transport == &t->transport && @@ -1830,8 +1838,9 @@ virtio_transport_recv_pkt_batchable(struct virtio_transport *t, /* * The caller holds sk's socket lock. Set @batchable if the socket can remain * locked for another ordinary STREAM/RW packet. When @batch is non-NULL, - * record a default write-space notification for batch finish instead of - * delivering it immediately. Return true if the caller must free @skb. + * record default write-space and data-ready notifications for batch finish + * instead of delivering them immediately. Return true if the caller must + * free @skb. */ static bool virtio_transport_recv_pkt_locked(struct virtio_transport *t, @@ -1883,7 +1892,9 @@ virtio_transport_recv_pkt_locked(struct virtio_transport *t, kfree_skb(skb); break; case TCP_ESTABLISHED: - virtio_transport_recv_connected(sk, skb); + virtio_transport_recv_connected(sk, skb, + batch ? + &batch->data_ready_pending : NULL); break; case TCP_CLOSING: virtio_transport_recv_disconnecting(sk, skb); @@ -1957,27 +1968,33 @@ EXPORT_SYMBOL_GPL(virtio_transport_recv_pkt); /* * Finish the RX batch. * For a non-empty batch, the caller holds the socket lock acquired with - * lock_sock(). Deliver any deferred write-space notification while the lock - * is held, then release the lock and the batch's lookup reference. - * An empty batch is a no-op. + * lock_sock(). Release the lock, deliver any deferred write-space and + * data-ready notifications in that order, then drop the batch's lookup + * reference. An empty batch is a no-op. */ void virtio_transport_rx_batch_finish(struct virtio_transport_rx_batch *batch) { bool write_space_pending = batch->write_space_pending; + bool data_ready_pending = batch->data_ready_pending; struct sock *sk = batch->sk; batch->sk = NULL; batch->pkts = 0; batch->bytes = 0; batch->write_space_pending = false; + batch->data_ready_pending = false; if (!sk) return; + release_sock(sk); + if (write_space_pending) vsock_sk(sk)->default_write_space(sk); - release_sock(sk); + if (data_ready_pending) + vsock_sk(sk)->default_data_ready(sk); + sock_put(sk); } EXPORT_SYMBOL_GPL(virtio_transport_rx_batch_finish); -- 2.53.0