From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy2-f41.google.com (mail-dy2-f41.google.com [74.125.229.41]) (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 F2F9743DEC8 for ; Fri, 2 Oct 2026 07:46:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.229.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790927195; cv=none; b=UjsJSmr/pTLgXL7R1R/4jula5jKcn3xctbVv5FIH/H4kRkSibg3ychY94xj9eEZmzzBhnIeQ6NTJLD0sOh/935RJKhDRHShlyGdSKDCGfGB7lsL1E2OlOopB5U2V6TloRVmiUgvi+gl5cz0P+CmHngjcVkK4zm8SHcplgpYplTk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790927195; c=relaxed/simple; bh=FBRQii2NI78yMqUBxIsy2G3T/ohQ+oFPHl3SWWRfwV4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hRjLMeVHjXlbaBqkyTrjAy93EM6ykOPx6JI0juRq8UaEje3ZmMHeGsK9AOuH1m8GJq+3eMxeZpWl2kmjZo4JF2kOCURHomlcQ9c0PRJ8sGVzbo5zWzYYJ7+yKslckDEc5cg8jDN+MyAP0LMYcG8WIE7nQnu5taG6x/Jed+E0M40= 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=CbRmfB2S; arc=none smtp.client-ip=74.125.229.41 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="CbRmfB2S" Received: by mail-dy2-f41.google.com with SMTP id 5a478bee46e88-34bffc8105eso3322386eec.0 for ; Fri, 02 Oct 2026 00:46:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790927192; x=1791531992; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=/4b3V1d0NnoqdO8NQN0A2YcUSAKEdgt9dIV6PIOtskE=; b=CbRmfB2SO0JlT+vWYd/BvlVgho3WhBkjbfGuR7yvprWgPlEEoU9Bmqf5tr68vAL/FS lItuy3rqPMvZNyBMxaOG2MDxjCjZAicGAiQ2aVRDa+7BWjvX3RZtshuTDbn5DJdHvvEy xHeGowDZWbi5Eg5fX3FQkbCLL7Qge9X+KKQoGaJq69IWGrcTIvlpjznvmI9BT+usJJV7 ECQQj6cBGWAjP5KDqXELwhg2MaTDkU4ZP53qoDV501F4UCyYtcPlRlWYUqiMoRwlMRSb 3Vo0Gb4PDP/LmwffqRuSuYEAJ47l2OYh230pNag5SZjeugegPqT9Ov0mQjw+TaasUJKL 1/0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790927192; x=1791531992; h=content-transfer-encoding:mime-version: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=/4b3V1d0NnoqdO8NQN0A2YcUSAKEdgt9dIV6PIOtskE=; b=ZFqe+wguC/7NsB5sOwok6OeE+iDTum2+9TBNqhYQVcAm2WltSyzgpDzLxeuu887NZF HaWCR6225mcIXB7PswOvCuuot+IxUqPcqfF8KsGXWu0LKev94UDcz61WQlUhvfDkndSq G/ZwnEUP1/X5m0V2H36oCFbPxqe9WHGGlCmhHYPvyAAQIZ6OOW+f33etNGc2147m6omi clOZPL8gKPoEK4PnQj4+GG3kk1LCTzJkMpN9R2jjLosNKFoF+9Dkz66OQ25VmulRnNC0 FS8/a7d12zPnxHGiUuJDVIGwwUNAupusBWSyzFP8zzXqgNZiR6GrMbMay3ogo/xKpfeB X+1Q== X-Forwarded-Encrypted: i=1; AKwUvBx7m3BihWNhnQAnJ6oiVtYwq6O/JkwZO6FMY83mYlJwn0yN6vJjrFKa4BuffANGiJy2DIBZfKYmaYhJ6gg=@vger.kernel.org X-Gm-Message-State: AFq9FYLAWROTTX4AkU7tHJoLlzVrI2gO3wwp7uhURAx8ptm5FPWzWppi Ka50Xpy9wXjXoi1f3gOvCuBHrcA4TNll4+YhgtaAC9ZP7HvkI0apFEDc X-Gm-Gg: AYBFou22okuu76zv+zcexlHZtJ5kQwE2rotGNr8x06m+VFn3H0GpsdPalIubx7qpK3Q fQLOlH1cNIyP4mdR4xGOf3JeMKZOrhm7TtBHiq8uF4fao6w98208K8NjV1b4QZPGFN6ftrRuohY +WErDpCAN63jDWJxttmIjNpqskKZ/QHKQ/38jxIVPP2xPWCuwhbruoDTlR91khkpdgWr/oJAs9D QIaoecKo1xUAdrw2tmhbXLqdsZZSm5GFg8XuA7rhXNhVcPoPwU3Oo2bJXyU439NWCiK84uAzcRd FzVilcI5KWCOtN8uKb6s/li/PTcsnI7zSWx46XmA8nmJItdhYomo5gXqUrsHqLv9v9n/5mWM+Jo Tkne+4yDLD3F4kRfV6gVaJkCnmGooj87yNq6Zr7xB6glPdDQ/p7JPsa2NIN9U8QQtaR/kAdNUaf jmoZhLvUUxIHjHbhwVKhD0Rm+xHUjlQFIAyiiiyFHapVL6pDPEBmtw61rpEBzmqcx0zrwmcg== X-Received: by 2002:a05:693c:83c3:20b0:33b:f5b7:f494 with SMTP id 5a478bee46e88-34f1509e567mr2318820eec.13.1790927191793; Fri, 02 Oct 2026 00:46:31 -0700 (PDT) Received: from dbg-srv ([123.118.75.63]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-34f0672c2d1sm5871618eec.4.2026.10.02.00.46.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2026 00:46:31 -0700 (PDT) From: physicalmtea@gmail.com To: stefanha@redhat.com, sgarzare@redhat.com, mst@redhat.com Cc: 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 Subject: [PATCH 1/5] vsock: split socket lookup from locked RX processing Date: Fri, 2 Oct 2026 07:45:47 +0000 Message-ID: <20261002074551.318789-2-physicalmtea@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jia Jia Split virtio_transport_recv_pkt() so socket lookup is separate from the receive state machine that runs under the socket lock. Keep virtio_transport_recv_pkt() on its existing per-packet locking path. Pass the source and destination addresses used for lookup to the locked receive path so they are decoded only once. Pass the network namespace and decoded address tuple to the locked receive path through a packet context so later extensions remain cleanly encapsulated. Preserve source validation and failure handling. Keep the lookup reference separate from the skb owner reference so a later patch can retain it while processing a bounded run of packets under one socket lock. Signed-off-by: Jia Jia --- net/vmw_vsock/virtio_transport_common.c | 140 ++++++++++++++++-------- 1 file changed, 95 insertions(+), 45 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index f225f53ed..acddb268f 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1774,81 +1774,94 @@ static bool virtio_transport_valid_type(u16 type) (type == VIRTIO_VSOCK_TYPE_SEQPACKET); } -/* We are under the virtio-vsock's vsock->rx_lock or vhost-vsock's vq->mutex - * lock. - */ -void virtio_transport_recv_pkt(struct virtio_transport *t, - struct sk_buff *skb, struct net *net) +static void +virtio_transport_recv_pkt_init_addrs(struct sk_buff *skb, + struct sockaddr_vm *src, + struct sockaddr_vm *dst) { struct virtio_vsock_hdr *hdr = virtio_vsock_hdr(skb); - struct sockaddr_vm src, dst; - struct vsock_sock *vsk; - struct sock *sk; - bool space_available; - vsock_addr_init(&src, le64_to_cpu(hdr->src_cid), + vsock_addr_init(src, le64_to_cpu(hdr->src_cid), le32_to_cpu(hdr->src_port)); - vsock_addr_init(&dst, le64_to_cpu(hdr->dst_cid), + vsock_addr_init(dst, le64_to_cpu(hdr->dst_cid), le32_to_cpu(hdr->dst_port)); +} + +static void +virtio_transport_trace_recv_pkt(struct sk_buff *skb, + const struct sockaddr_vm *src, + const struct sockaddr_vm *dst) +{ + struct virtio_vsock_hdr *hdr = virtio_vsock_hdr(skb); - trace_virtio_transport_recv_pkt(src.svm_cid, src.svm_port, - dst.svm_cid, dst.svm_port, + trace_virtio_transport_recv_pkt(src->svm_cid, src->svm_port, + dst->svm_cid, dst->svm_port, le32_to_cpu(hdr->len), le16_to_cpu(hdr->type), le16_to_cpu(hdr->op), le32_to_cpu(hdr->flags), 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; - } +static struct sock * +virtio_transport_recv_pkt_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; - /* The socket must be in connected or bound table - * otherwise send reset back - */ - sk = vsock_find_connected_socket_net(&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_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)) { - (void)virtio_transport_reset_no_sock(t, skb, net); sock_put(sk); - goto free_pkt; + return NULL; } - if (!skb_set_owner_sk_safe(skb, sk)) { - WARN_ONCE(1, "receiving vsock socket has sk_refcnt == 0\n"); - goto free_pkt; - } + return sk; +} - vsk = vsock_sk(sk); +struct virtio_transport_rx_pkt_ctx { + struct net *net; + const struct sockaddr_vm *src; + const struct sockaddr_vm *dst; +}; - lock_sock(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 virtio_transport_rx_pkt_ctx *ctx) +{ + struct vsock_sock *vsk = vsock_sk(sk); + bool space_available; - /* Check if sk has been closed or assigned to another transport before - * lock_sock (note: listener sockets are not assigned to any transport) + /* Check after acquiring the socket lock. 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); - release_sock(sk); - sock_put(sk); - goto free_pkt; + !vsock_check_source(vsk, &t->transport, ctx->src))) { + (void)virtio_transport_reset_no_sock(t, skb, ctx->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; + vsk->local_addr.svm_cid = ctx->dst->svm_cid; if (space_available) sk->sk_write_space(sk); @@ -1870,17 +1883,54 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, kfree_skb(skb); break; default: - (void)virtio_transport_reset_no_sock(t, skb, net); + (void)virtio_transport_reset_no_sock(t, skb, ctx->net); kfree_skb(skb); break; } + return false; +} + +/* We are under the virtio-vsock's vsock->rx_lock or vhost-vsock's vq->mutex + * lock. + */ +void virtio_transport_recv_pkt(struct virtio_transport *t, + struct sk_buff *skb, struct net *net) +{ + struct sockaddr_vm src, dst; + struct sock *sk; + struct virtio_transport_rx_pkt_ctx ctx; + bool free_pkt; + + virtio_transport_recv_pkt_init_addrs(skb, &src, &dst); + virtio_transport_trace_recv_pkt(skb, &src, &dst); + + sk = virtio_transport_recv_pkt_find_socket(skb, &src, &dst, net); + if (!sk) { + (void)virtio_transport_reset_no_sock(t, skb, net); + goto free_pkt; + } + + if (!skb_set_owner_sk_safe(skb, sk)) { + WARN_ONCE(1, "receiving vsock socket has sk_refcnt == 0\n"); + goto free_pkt; + } + + lock_sock(sk); + ctx = (struct virtio_transport_rx_pkt_ctx) { + .net = net, + .src = &src, + .dst = &dst, + }; + free_pkt = virtio_transport_recv_pkt_locked(t, skb, sk, &ctx); 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