From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.179 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792741928; b=p7yY2783al59x2vx3B4tD5Z3XX6/cSMWHupKL0PiUlnqkFkmGqE1sUSHToAs5ulegnjr kPH3ef/oL/SBGNFNzwp3C/a1NdL+sgkNQWlZlp0LQ1iWbFK+Lek+LKk8dtjeKlnT7tukh SfPNSeMJzoPfK8g/Q04K5gPBYNWI16NOJKzgNisA4WDwxoUcyBsPhOhqBo/1wKgXKhqhz jI16X7G2c3YD9r2bI3u8eHGqTpenUn+oSJxIviq9WE/ip3O1kYPiMNLZZ9LU4wW2mHbdD vcm9oz2V+Q+NItdA8ID7SjlzkckC3+Raz5u/qPBiS/omliyo8TaDq5kmIsbnvqbQUiQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792741928; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=AoK1tSvrGC/yGpo34e5d7pEB1O9R0LQE99Bs7YS2fkw=; b=4l9T2Wf4y+U7ymjthFf9Rle0PyQm4Tc+vRRL87B+lMAic8SUDp6mTN8zzw9AbYgEOnVZ uBC7odws5SAE3HILUhYFdlQ8pt4sJzuM8JTgjJve1YyOBfuN0kFd0R08Rk7E73Gui1YH7 hT5seR0jDqjCckwkzhh9GIQytAVftWu8rk/PYVDj7yIqF6nPQPxkDvijAAseRFeGxBYGk UiaS5BjY0TGq5bs3v2ds8KUoGgkRqggYS8ZI2Zicy8HM4P8HyVOm5+OyUk8SzZvock8Jh x2ibYUNZo8uLuWqUVED2Sb9heBjb4rJC0DoFQsLm+yCxWI+evukp+dhq5yes+zyPX+Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=IOEHbJ0G; arc=none smtp.remote-ip=209.85.214.179 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 801A9606A33C for ; Fri, 23 Oct 2026 07:52:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 801A9606A33C 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, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=IOEHbJ0G Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2e985106c0cso4564365ad.2 for ; Fri, 23 Oct 2026 00:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792741928; x=1793346728; 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=AoK1tSvrGC/yGpo34e5d7pEB1O9R0LQE99Bs7YS2fkw=; b=IOEHbJ0GK6CyDIYFu66ks56gp1EDP6hYuKuo1M4Y4Kg4DlyBLNf3vwbFxLYiylq70o vvKWL7qSHSPrQ9mnv/L82dfPicGFc5UpTiFI1XbG++KR3UJRFLV+SSWtCF5L2UvQGxBb e3HkDvZrllKcsuUqTA9Z9w87zhqEo2Vj8tmAWzxjW6UCH+k+F1XAqgp5tMqiDK6ZN846 AhL4lQeyMEq+C3OZOSKCw0AbuAGbGf3GMUYtsMnLEZMEz6ZPUfkL3CdKtPR9wbOOup/E saHcAsqnUAjTWjqZbAJ3jOWpm8lf7EUhzHhdKv8G5UPZbMm0/fD8v4UpYneqnf5RGoEa vaMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792741928; x=1793346728; 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=AoK1tSvrGC/yGpo34e5d7pEB1O9R0LQE99Bs7YS2fkw=; b=P2qO/QcYYD9qYIye1Qih22IWtC7NVivSiYhExbO9w1nRh73UC0VcalEkcamU9z44bY jf71Uvsi+paCl5BqL9N7U4E86CTuDoSKF9uJ5boRiMolbrqcLW8Y0nVSBKXOgZeSIawe 7eRo0L5J5T1WioZYbBMKhrIk18rB1KRCd5YNqzuSObbjph5sAcfqkeu9rKIN8MvA00G3 vtjHnlVpgymRprOJG6Sr7+t6sBQVMalC5GSHf7yd5+DCQorPzh1DnQmOhOGX1tB6LG+V QRCJUm8XBO/p2wLgf7IhND+lL2+Qny/vxsFqga1iosts/2vWF5AeP0uNHVyCg4ANGbwK 6fsA== X-Forwarded-Encrypted: i=1; AKwUvBxmKOz0DzPfPqAJ4VuvJnY0oMeXC2Vzf9qdsKZbT/0OA5vS0hID6UWJ27HEDQNXtPqzWyaG3yDZy/ou9szX9w==@lists.linux.dev X-Gm-Message-State: AFq9FYIpAYh2PERLMK3ihPcRArtqpeARylFmAmVf/HrbZ806RnI81tnW kd7hMuiX8yjJnkbMFfCHuYazfJY2KmFX5NlLA8BievLk2W+6bW7I0T1c X-Gm-Gg: AYBFou21KO+94fUTC2VIqMB+7m8BSM2a7maPf8F/7qtYaZ0jC+hHG8alZIK4HN1Pwyy GqkS12Ao+aPrEqXWqzYosMJEp25l4FpNQPn7Ru68bL7btluwi8W04YD270seK+XnxqOq9lN0pnT ygcETyxZMLCZIEqGBQfECV/s8fsgZIyu3x9e6FDXgcfVIkQ1QX3HJTkzYOAqAWzLJJ+c6CSUhcQ 07JwIj7fJKqx3LIMnr5w+YxxzejaF0xeTP3Il4fPdtyA90teeOLhMmEGZgpASwwJ6RPERnNPIwI /fy5WC/ACxag0bIZNqHJ1K1xrSMwEjdc3zCfNQvFX+UhIF68jcuhSo3UShWg5KvX/T73dttc/I7 XFsLeew+MMkeIJxeJf4UTpVkemZloHL10w7L6oEW94f9/ZUPjLI3Q2ZmKOyc3uvUI2TY0rntnCY 1mFqDtnRolwtPk368gRpLt37Pqsrvg45yiyYB+UAdzLvI6anxgMVC/kqALTjq3KQcpuiRo68JKb EYwFmoV6UJAazTZCNhzvM557avgGKfSjJr/3XweLh7+5un4GNd6LhjlBA== X-Received: by 2002:a17:902:e948:b0:2dd:9b53:f9ba with SMTP id d9443c01a7336-2ea7cf5c3d5mr16703675ad.1.1792741927509; Fri, 23 Oct 2026 00:52:07 -0700 (PDT) Received: from gmail.com ([185.220.236.117]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ea7b368c90sm7208265ad.29.2026.10.23.00.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2026 00:52:07 -0700 (PDT) From: Jia Jia To: netdev@vger.kernel.org Cc: stefanha@redhat.com, sgarzare@redhat.com, bobbyeshleman@meta.com, 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, kvm@vger.kernel.org, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH net-next v5 4/5] vsock/virtio: coalesce native RX write-space notifications Date: Fri, 23 Oct 2026 15:51:39 +0800 Message-Id: <20261023075140.9613-5-physicalmtea@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261023075140.9613-1-physicalmtea@gmail.com> References: <20261023075140.9613-1-physicalmtea@gmail.com> X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Each received packet can update peer credit and call sk_write_space(). A writer cannot consume that credit while the virtio RX worker retains the socket lock, so repeated native write-space notifications in one RX batch are unnecessary. This patch coalesces write-space notifications on the native AF_VSOCK path; data-ready remains per-packet here. The batching patch establishes batch ownership before its first packet. This lets this patch record a pending notification for that packet and flush it even if the packet immediately ends the batch. Deliver it while holding the socket lock to preserve the callback context of the existing receive path. A following patch changes that timing together with data-ready handling. Capture the native write-space callback before socket publication and access it through AF_VSOCK helpers. Sockmap can change the protocol, write-space callback, and psock marker without the socket lock. Serialize each batch eligibility check with sk_callback_lock; if a packet boundary observes a replacement, finish the batch and use the regular per-packet path. Packets admitted on the native path use the saved native callback at batch finish. Reloading a current sockmap callback would not synchronize its invocation with teardown; a wrapper seen before teardown need not forward the native wakeup after its psock is gone. Signed-off-by: Jia Jia --- include/linux/virtio_vsock.h | 4 +- include/net/af_vsock.h | 7 +++ net/vmw_vsock/af_vsock.c | 16 +++++ net/vmw_vsock/virtio_transport_common.c | 78 +++++++++++++++++-------- 4 files changed, 81 insertions(+), 24 deletions(-) diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index 748633aa0cc81..bf28e8e32e280 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -287,12 +287,14 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, * Initialize a batch to zero before use. A non-empty batch owns @sk's socket * lock and the reference returned by vsock_find_connected_socket_net(). The * caller retains both until it calls virtio_transport_rx_batch_finish(). An - * empty batch owns neither. + * empty batch owns neither. A pending native write-space notification belongs + * to the lock holder and is delivered by virtio_transport_rx_batch_finish(). */ struct virtio_transport_rx_batch { struct sock *sk; unsigned int pkts; size_t bytes; + bool write_space_pending; }; static inline bool diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index 5549298c1ec6b..b76ab565ea58b 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -63,6 +63,11 @@ struct vsock_sock { u32 peer_shutdown; bool sent_request; bool ignore_connecting_rst; + /* + * Captured before the socket is published. This identifies AF_VSOCK's + * native write-space callback after a consumer has replaced it. + */ + void (*native_write_space)(struct sock *sk); /* Protected by lock_sock(sk) */ u64 buffer_size; @@ -78,6 +83,8 @@ s64 vsock_stream_has_data(struct vsock_sock *vsk); s64 vsock_stream_has_space(struct vsock_sock *vsk); struct sock *vsock_create_connected(struct sock *parent); void vsock_data_ready(struct sock *sk); +bool vsock_write_space_is_native(const struct sock *sk); +void vsock_call_native_write_space(struct sock *sk); /**** TRANSPORT ****/ diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 44cee74519555..e39567990539f 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->native_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); @@ -1122,6 +1123,21 @@ void vsock_data_ready(struct sock *sk) } EXPORT_SYMBOL_GPL(vsock_data_ready); +bool vsock_write_space_is_native(const struct sock *sk) +{ + const struct vsock_sock *vsk = vsock_sk(sk); + + return READ_ONCE(sk->sk_write_space) == + READ_ONCE(vsk->native_write_space); +} +EXPORT_SYMBOL_GPL(vsock_write_space_is_native); + +void vsock_call_native_write_space(struct sock *sk) +{ + vsock_sk(sk)->native_write_space(sk); +} +EXPORT_SYMBOL_GPL(vsock_call_native_write_space); + /* Dummy callback required by sockmap. * See unconditional call of saved_close() in sock_map_close(). */ diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index f83e5b2edce35..af26344678e41 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1865,31 +1865,55 @@ virtio_transport_rx_batch_can_continue(struct virtio_transport *t, !virtio_transport_rx_buf_full(vvs); } -/* The caller holds sk's socket lock. */ +/* The caller holds sk's socket and callback locks. */ static bool -virtio_transport_rx_batch_can_receive(struct virtio_transport *t, - struct sock *sk, u32 len) +__virtio_transport_rx_batch_can_receive(struct virtio_transport *t, + struct sock *sk, u32 len) { if (!virtio_transport_rx_batch_can_continue(t, sk, len)) return false; /* - * Sockmap can replace sk_prot and publish a psock without the socket lock. - * Check both at each packet boundary; a boundary that sees a replacement - * returns to the existing per-packet path. + * Sockmap can replace sk_prot or sk_write_space, and publish a psock, + * without the socket lock. Coalescing is safe only for the native + * write-space callback, so a boundary that sees a replacement returns to + * the existing per-packet path. */ return READ_ONCE(sk->sk_prot) == sk->sk_prot_creator && + vsock_write_space_is_native(sk) && !virtio_transport_sock_has_psock(sk); } +/* + * Sockmap teardown restores the native protocol and write-space callback + * under sk_callback_lock. Serialize each packet admission check with those + * updates. + */ +static bool +virtio_transport_rx_batch_can_receive(struct virtio_transport *t, + struct sock *sk, u32 len) +{ + bool batchable; + + read_lock_bh(&sk->sk_callback_lock); + batchable = __virtio_transport_rx_batch_can_receive(t, sk, len); + read_unlock_bh(&sk->sk_callback_lock); + + return batchable; +} + /* * The caller holds sk's socket lock. If @batchable is non-NULL, update it * after processing @skb to say whether a native STREAM/RW batch can continue. + * When @batch is non-NULL, record a native write-space notification for batch + * finish. A writer cannot consume the updated credit until this lock is + * released. */ static void virtio_transport_recv_pkt_locked(struct virtio_transport *t, struct sk_buff *skb, struct sock *sk, - struct net *net, bool *batchable) + struct net *net, bool *batchable, + struct virtio_transport_rx_batch *batch) { struct virtio_vsock_hdr *hdr = virtio_vsock_hdr(skb); struct vsock_sock *vsk = vsock_sk(sk); @@ -1921,8 +1945,12 @@ virtio_transport_recv_pkt_locked(struct virtio_transport *t, if (vsk->local_addr.svm_cid != VMADDR_CID_ANY) vsk->local_addr.svm_cid = le64_to_cpu(hdr->dst_cid); - if (space_available) - sk->sk_write_space(sk); + if (space_available) { + if (batch) + batch->write_space_pending = true; + else + sk->sk_write_space(sk); + } switch (sk->sk_state) { case TCP_LISTEN: @@ -1947,7 +1975,7 @@ virtio_transport_recv_pkt_locked(struct virtio_transport *t, } if (batchable) - *batchable = virtio_transport_rx_batch_can_receive(t, sk, 0); + *batchable = virtio_transport_rx_batch_can_continue(t, sk, 0); } /* We are under the virtio-vsock's vsock->rx_lock or vhost-vsock's vq->mutex @@ -1991,7 +2019,7 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, goto free_pkt; lock_sock(sk); - virtio_transport_recv_pkt_locked(t, skb, sk, net, NULL); + virtio_transport_recv_pkt_locked(t, skb, sk, net, NULL, NULL); release_sock(sk); @@ -2008,20 +2036,31 @@ EXPORT_SYMBOL_GPL(virtio_transport_recv_pkt); /* * Release an active RX batch. A non-empty batch holds the socket lock and the - * reference returned by vsock_find_connected_socket_net(). An empty batch - * holds neither. + * reference returned by vsock_find_connected_socket_net(). Deliver any + * deferred native write-space notification while holding the lock, preserving + * the callback context of the regular receive path. An empty batch holds + * neither. */ void virtio_transport_rx_batch_finish(struct virtio_transport_rx_batch *batch) { + bool write_space_pending = batch->write_space_pending; struct sock *sk = batch->sk; batch->sk = NULL; batch->pkts = 0; batch->bytes = 0; + batch->write_space_pending = false; if (!sk) return; + /* + * The packet was admitted with the native callback. Do not reload a current + * callback here: sockmap can replace or remove its wrapper independently. + */ + if (write_space_pending) + vsock_call_native_write_space(sk); + release_sock(sk); sock_put(sk); } @@ -2080,7 +2119,8 @@ virtio_transport_rx_batch_process(struct virtio_transport *t, return; } - virtio_transport_recv_pkt_locked(t, skb, batch->sk, net, &batchable); + virtio_transport_recv_pkt_locked(t, skb, batch->sk, net, &batchable, + batch); if (!batchable) { virtio_transport_rx_batch_finish(batch); return; @@ -2158,16 +2198,8 @@ void virtio_transport_recv_pkt_batch(struct virtio_transport *t, } lock_sock(sk); - /* - * Serialize initial admission with sockmap's callback updates. Later - * packet boundaries recheck native state and end a batch when they - * observe a replacement. - */ - read_lock_bh(&sk->sk_callback_lock); batchable = virtio_transport_rx_batch_can_receive(t, sk, len); - read_unlock_bh(&sk->sk_callback_lock); if (!batchable) { - /* State or receive-buffer failures keep the regular lookup path. */ if (!virtio_transport_rx_batch_can_continue(t, sk, len)) { release_sock(sk); sock_put(sk); @@ -2176,7 +2208,7 @@ void virtio_transport_recv_pkt_batch(struct virtio_transport *t, virtio_transport_trace_recv_pkt(hdr, &src, &dst); if (virtio_transport_recv_pkt_set_owner(skb, sk)) - virtio_transport_recv_pkt_locked(t, skb, sk, net, NULL); + virtio_transport_recv_pkt_locked(t, skb, sk, net, NULL, NULL); else kfree_skb(skb); -- 2.53.0