samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FROMGIT: vsock/virtio: Rename virtio_vsock_skb_rx_put()

Browse Source 
In preparation for using virtio_vsock_skb_rx_put() when populating SKBs
on the vsock TX path, rename virtio_vsock_skb_rx_put() to
virtio_vsock_skb_put().

No functional change.

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Will Deacon <will@kernel.org>
Message-Id: <20250717090116.11987-9-will@kernel.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 8a5c2992b0bda3ef65fdd3835210c2301603c53e
 git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost)
Bug: 421244320
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I4455bdbd484e54fdcf75f9169c71c835bfac1e16
This commit is contained in:
Will Deacon
2025-07-17 10:01:15 +01:00
committed by Isaac Manjarres
parent b2fe83cd4d
commit 080548dfc3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/vhost/vsock.c
View File

@@ -376,7 +376,7 @@ vhost_vsock_alloc_skb(struct vhost_virtqueue *vq,
return NULL; return NULL;
} }
virtio_vsock_skb_rx_put(skb, payload_len); virtio_vsock_skb_put(skb, payload_len);
if (skb_copy_datagram_from_iter(skb, 0, &iov_iter, payload_len)) { if (skb_copy_datagram_from_iter(skb, 0, &iov_iter, payload_len)) {
vq_err(vq, "Failed to copy %zu byte payload\n", payload_len); vq_err(vq, "Failed to copy %zu byte payload\n", payload_len);

2
include/linux/virtio_vsock.h
View File

@@ -47,7 +47,7 @@ static inline void virtio_vsock_skb_clear_tap_delivered(struct sk_buff *skb)
VIRTIO_VSOCK_SKB_CB(skb)->tap_delivered = false; VIRTIO_VSOCK_SKB_CB(skb)->tap_delivered = false;
} }
static inline void virtio_vsock_skb_rx_put(struct sk_buff *skb, u32 len) static inline void virtio_vsock_skb_put(struct sk_buff *skb, u32 len)
{ {
DEBUG_NET_WARN_ON_ONCE(skb->len); DEBUG_NET_WARN_ON_ONCE(skb->len);

2
net/vmw_vsock/virtio_transport.c
View File

@@ -572,7 +572,7 @@ static void virtio_transport_rx_work(struct work_struct *work)
} }
if (payload_len) if (payload_len)
virtio_vsock_skb_rx_put(skb, payload_len); virtio_vsock_skb_put(skb, payload_len);
virtio_transport_deliver_tap_pkt(skb); virtio_transport_deliver_tap_pkt(skb);
virtio_transport_recv_pkt(&virtio_transport, skb); virtio_transport_recv_pkt(&virtio_transport, skb);