Commit 2304c64a authored by Will Deacon's avatar Will Deacon Committed by Michael S. Tsirkin
Browse files

vsock/virtio: Rename virtio_vsock_alloc_skb() 



In preparation for nonlinear allocations for large SKBs, rename
virtio_vsock_alloc_skb() to virtio_vsock_alloc_linear_skb() to indicate
that it returns linear SKBs unconditionally and switch all callers over
to this new interface for now.

No functional change.

Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Message-Id: <20250717090116.11987-6-will@kernel.org>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 03a92f03

drivers/vhost/vsock.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ vhost_vsock_alloc_skb(struct vhost_virtqueue *vq, 
		return NULL;



	/* len contains both payload and hdr */

	skb = virtio_vsock_alloc_skb(len, GFP_KERNEL);

	skb = virtio_vsock_alloc_linear_skb(len, GFP_KERNEL);

	if (!skb)

		return NULL;

include/linux/virtio_vsock.h

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ static inline void virtio_vsock_skb_rx_put(struct sk_buff *skb, u32 len) 
	skb_put(skb, len);

}



static inline struct sk_buff *virtio_vsock_alloc_skb(unsigned int size, gfp_t mask)

static inline struct sk_buff *

virtio_vsock_alloc_linear_skb(unsigned int size, gfp_t mask)

{

	struct sk_buff *skb;

net/vmw_vsock/virtio_transport.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static void virtio_vsock_rx_fill(struct virtio_vsock *vsock) 
	vq = vsock->vqs[VSOCK_VQ_RX];



	do {

		skb = virtio_vsock_alloc_skb(total_len, GFP_KERNEL);

		skb = virtio_vsock_alloc_linear_skb(total_len, GFP_KERNEL);

		if (!skb)

			break;

net/vmw_vsock/virtio_transport_common.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info * 
	if (!zcopy)

		skb_len += payload_len;



	skb = virtio_vsock_alloc_skb(skb_len, GFP_KERNEL);

	skb = virtio_vsock_alloc_linear_skb(skb_len, GFP_KERNEL);

	if (!skb)

		return NULL;