From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 B78AC4B44AF for ; Tue, 13 Oct 2026 06:31:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791873098; cv=none; b=Pnbh0of653LHQjKKKwVmsbVcC+dvA5hY3oA5LFCBlRtFY3l8B7bTuxXC18ZhPu8rjQd9VfnzvqQXKf9hEGtvZ4u+7SOEPSFCBtc6PLXPqHKAfAgUKYRQVrr3AWi1Zvw+zRUeb7YXelCWapA78pS5qLozZd/xV2V7kjAk7kILb6M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791873098; c=relaxed/simple; bh=Zg458LzF07n4Bhy5KiIU/3ZzL6a1HDj9LM2QCnTima8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ua0ofR3+UpCe6WtOsITOAT6HU9sr2BbUW+bahO9YkuioyKAMSS8S0XD78u6ZfHobJoleSnpS9NSEfsAulP24fyPoiUbDaPKyk9GN9jBv1bDL/iOiykI5FRdT6axxfgWUo13iaTDabtSvOvWg9NhkFK2g63TGqOa+bwMeOfsk4JY= 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=Q9JCFlgB; arc=none smtp.client-ip=209.85.216.53 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="Q9JCFlgB" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-3aacde0cc0fso970459a91.2 for ; Mon, 12 Oct 2026 23:31:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791873096; x=1792477896; darn=vger.kernel.org; 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=okzwzxdxUbrp2znit6I2Xx1ZmvtO45qgM4jYMaoK7Ts=; b=Q9JCFlgB12j6ww+rxSu0MRQft9NT5TsWX5JmD/RPROnttp7Bl2di/uKAr4R2ryi0RN CFyYUy+vHOU6Ph1BYKvDymYZB7SaozD5/y8BcFRpyI08v2jkop7mxpe3ufdakeAapV5l MIbjVXSP2GFFBo8i+qYhkkjTvavq8b7sAO3HPPoMQcuOVsw5elf1b0oEr0+e8NWSU7Sc nzXCtjwIXnibq3D+/8DmevVncQ+R0dvKfzRPf3HoSFtAFNEkNYfHEjCelzgiD4+PN/7I GmtVdjud5U2hW79KpjnBsU+RH0JcAI22eV6cS9+9VyjKZ6Yc7AB7gYTVOhw65N267wzN WLgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791873096; x=1792477896; 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=okzwzxdxUbrp2znit6I2Xx1ZmvtO45qgM4jYMaoK7Ts=; b=oLi41n8lK9z8XcB7qCbYtm0ZIW08WLZaGSLy2m8eXvka/1EpoLcwYD1NKB1dO/FZSh KUkSHTKBfT2hpVhmknbw2uvGxGOJ0Mw2i1G9SMy1FCLLB6bM9O8ypiTqQxNHT+RAl5Xp +jktGeP8nQk1DVA4C9gEsyNT7tDdjy+AKcT7wuxqLk2mPnf8alG5uZxdlr6roH+s8Kgd ykThWiDfnIhOiK9JZUq1hcUpJSR5D6/mewnhjysuaa+Lc+UdzcTsOtfTPMKj0VJrki7h VKhqkTRgA/FPLXghimpvMbOxoroAddk+F9tibpOdGQoIDeoSy31QJXNIiOyn9rLTYG2S 1arg== X-Forwarded-Encrypted: i=1; AKwUvBzmYa1Ego2HYlXuaId5aO17ZdA+XWoNI7csEh7gz7l9E8Gzc9E0dlJbwgsjPcc1t8tSQl0LpGY=@vger.kernel.org X-Gm-Message-State: AFq9FYJZPlNdxQc/AYUZoJ1mWQlEpsPO1/xXKiZZ5IgneKduzC0cYAdr wmLyZ5ADzeJAg53ZNHBKamegp21a6pbC78GSY4RccXsLFui6LJNjB7ep X-Gm-Gg: AYBFou1kWK9L/QgonA/Kk03h+Fai2RhJkPUB3hNA+bpOQf0nNMJZo6ewX1oUpTBOEY2 oK6O0SbnNqIpt0c5sMeFCR6L1XXe48x0pdWOWQb+29mkY2edk9EMWR460WsoJ9EKbu5wiMk2FjY SLByqPHUztrUzhGg53TzSEKLB/TWbaH3NkJ2rVqRqQJm7/6NOnYUtR4X9N3cPrEz2t5zrnYZ6C5 K9H7Vylhq6umlHazPwvyGLywrf94R23Qxy3sL4CUlSdPBlrWAUq5FKdikmRqP644IRC5hrX7wvk QRXrVzofcxUSpszwoIfd49mdJqUQBjX7Y5XMJpA6SHkIE9BkqMjN31cwFCDXJZL8DG92EW2Nq+p iB5tSR2kNyIbwh+TNWdxyehtlK4xRhYUTSgX7aBNNzB7n+xj8ghBJAwoPlLFT18YAh3ysusTWIP GBZu0yPoZRodugucz6bajW3GlPNgodz8DCV4B/sjdee4GMlXS/IMzI38l/dah0jz+1h7wGew== X-Received: by 2002:a17:90b:1d03:b0:3a8:181a:2bfb with SMTP id 98e67ed59e1d1-3ab3a949a69mr7602301a91.23.1791873095636; Mon, 12 Oct 2026 23:31:35 -0700 (PDT) Received: from gmail.com ([188.253.12.32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3abdd5adaadsm8875770a91.0.2026.10.12.23.31.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2026 23:31:35 -0700 (PDT) From: Jia Jia To: Stefan Hajnoczi , Stefano Garzarella Cc: "Michael S . Tsirkin" , Jason Wang , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Xuan Zhuo , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , virtualization@lists.linux.dev, kvm@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v3 1/4] vsock/virtio: split socket lookup from locked RX processing Date: Tue, 13 Oct 2026 14:31:09 +0800 Message-Id: <20261013063112.168321-2-physicalmtea@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261013063112.168321-1-physicalmtea@gmail.com> References: <20261013063112.168321-1-physicalmtea@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Split virtio_transport_recv_pkt() so socket lookup is separate from the receive state machine that runs under the socket lock. This prepares the receive path for keeping a looked-up socket across multiple packets in a later change. Keep virtio_transport_recv_pkt() on its existing per-packet locking path. Pass the network namespace and decoded address tuple directly to the locked receive path, preserving source validation and failure handling. No functional change intended. Signed-off-by: Jia Jia --- net/vmw_vsock/virtio_transport_common.c | 153 ++++++++++++++---------- 1 file changed, 87 insertions(+), 66 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index f225f53ed4bab..8a930bc42fdc3 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1774,6 +1774,87 @@ static bool virtio_transport_valid_type(u16 type) (type == VIRTIO_VSOCK_TYPE_SEQPACKET); } +static struct sock * +virtio_transport_find_socket(struct sk_buff *skb, struct sockaddr_vm *src, + struct sockaddr_vm *dst, struct net *net) +{ + struct virtio_vsock_hdr *hdr = virtio_vsock_hdr(skb); + struct sock *sk; + + if (!virtio_transport_valid_type(le16_to_cpu(hdr->type))) + return NULL; + + sk = vsock_find_connected_socket_net(src, dst, net); + if (!sk) + sk = vsock_find_bound_socket_net(dst, net); + if (!sk) + return NULL; + + if (virtio_transport_get_type(sk) != le16_to_cpu(hdr->type)) { + sock_put(sk); + return NULL; + } + + return sk; +} + +/* + * The caller holds sk's socket lock and must free skb if this returns true. + */ +static bool +virtio_transport_recv_pkt_locked(struct virtio_transport *t, + struct sk_buff *skb, struct sock *sk, + const struct sockaddr_vm *src, + const struct sockaddr_vm *dst, + struct net *net) +{ + struct vsock_sock *vsk = vsock_sk(sk); + bool space_available; + + /* Listener sockets accept packets from any source and are not assigned to + * a transport. + */ + if (sock_flag(sk, SOCK_DONE) || + (sk->sk_state != TCP_LISTEN && + !vsock_check_source(vsk, &t->transport, src))) { + (void)virtio_transport_reset_no_sock(t, skb, net); + return true; + } + + space_available = virtio_transport_space_update(sk, skb); + + /* Update CID in case it has changed after a transport reset event */ + if (vsk->local_addr.svm_cid != VMADDR_CID_ANY) + vsk->local_addr.svm_cid = dst->svm_cid; + + if (space_available) + sk->sk_write_space(sk); + + switch (sk->sk_state) { + case TCP_LISTEN: + virtio_transport_recv_listen(sk, skb, t); + kfree_skb(skb); + break; + case TCP_SYN_SENT: + virtio_transport_recv_connecting(sk, skb); + kfree_skb(skb); + break; + case TCP_ESTABLISHED: + virtio_transport_recv_connected(sk, skb); + break; + case TCP_CLOSING: + virtio_transport_recv_disconnecting(sk, skb); + kfree_skb(skb); + break; + default: + (void)virtio_transport_reset_no_sock(t, skb, net); + kfree_skb(skb); + break; + } + + return false; +} + /* We are under the virtio-vsock's vsock->rx_lock or vhost-vsock's vq->mutex * lock. */ @@ -1782,9 +1863,8 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, { struct virtio_vsock_hdr *hdr = virtio_vsock_hdr(skb); struct sockaddr_vm src, dst; - struct vsock_sock *vsk; struct sock *sk; - bool space_available; + bool free_pkt; vsock_addr_init(&src, le64_to_cpu(hdr->src_cid), le32_to_cpu(hdr->src_port)); @@ -1800,26 +1880,9 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, le32_to_cpu(hdr->buf_alloc), le32_to_cpu(hdr->fwd_cnt)); - if (!virtio_transport_valid_type(le16_to_cpu(hdr->type))) { - (void)virtio_transport_reset_no_sock(t, skb, net); - goto free_pkt; - } - - /* The socket must be in connected or bound table - * otherwise send reset back - */ - sk = vsock_find_connected_socket_net(&src, &dst, net); + sk = virtio_transport_find_socket(skb, &src, &dst, net); if (!sk) { - sk = vsock_find_bound_socket_net(&dst, net); - if (!sk) { - (void)virtio_transport_reset_no_sock(t, skb, net); - goto free_pkt; - } - } - - if (virtio_transport_get_type(sk) != le16_to_cpu(hdr->type)) { (void)virtio_transport_reset_no_sock(t, skb, net); - sock_put(sk); goto free_pkt; } @@ -1828,59 +1891,17 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, goto free_pkt; } - vsk = vsock_sk(sk); - lock_sock(sk); - - /* Check if sk has been closed or assigned to another transport before - * lock_sock (note: listener sockets are not assigned to any transport) - */ - if (sock_flag(sk, SOCK_DONE) || - (sk->sk_state != TCP_LISTEN && - !vsock_check_source(vsk, &t->transport, &src))) { - (void)virtio_transport_reset_no_sock(t, skb, net); - release_sock(sk); - sock_put(sk); - goto free_pkt; - } - - space_available = virtio_transport_space_update(sk, skb); - - /* Update CID in case it has changed after a transport reset event */ - if (vsk->local_addr.svm_cid != VMADDR_CID_ANY) - vsk->local_addr.svm_cid = dst.svm_cid; - - if (space_available) - sk->sk_write_space(sk); - - switch (sk->sk_state) { - case TCP_LISTEN: - virtio_transport_recv_listen(sk, skb, t); - kfree_skb(skb); - break; - case TCP_SYN_SENT: - virtio_transport_recv_connecting(sk, skb); - kfree_skb(skb); - break; - case TCP_ESTABLISHED: - virtio_transport_recv_connected(sk, skb); - break; - case TCP_CLOSING: - virtio_transport_recv_disconnecting(sk, skb); - kfree_skb(skb); - break; - default: - (void)virtio_transport_reset_no_sock(t, skb, net); - kfree_skb(skb); - break; - } - + free_pkt = virtio_transport_recv_pkt_locked(t, skb, sk, &src, &dst, + net); release_sock(sk); /* Release refcnt obtained when we fetched this socket out of the * bound or connected list. */ sock_put(sk); + if (free_pkt) + kfree_skb(skb); return; free_pkt: -- 2.53.0