Skip to content

Commit 74ea618

Browse files
willdeacongregkh
authored andcommitted
vsock/virtio: Rename virtio_vsock_alloc_skb()
[Upstream commit 2304c64] 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: Stefano Garzarella <sgarzare@redhat.com> Signed-off-by: Will Deacon <will@kernel.org> Message-Id: <20250717090116.11987-6-will@kernel.org> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Heitor Alves de Siqueira <halves@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ca82ab9 commit 74ea618

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

drivers/vhost/vsock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ vhost_vsock_alloc_skb(struct vhost_virtqueue *vq,
349349
return NULL;
350350

351351
/* len contains both payload and hdr */
352-
skb = virtio_vsock_alloc_skb(len, GFP_KERNEL);
352+
skb = virtio_vsock_alloc_linear_skb(len, GFP_KERNEL);
353353
if (!skb)
354354
return NULL;
355355

include/linux/virtio_vsock.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ static inline void virtio_vsock_skb_rx_put(struct sk_buff *skb, u32 len)
5252
skb_put(skb, len);
5353
}
5454

55-
static inline struct sk_buff *virtio_vsock_alloc_skb(unsigned int size, gfp_t mask)
55+
static inline struct sk_buff *
56+
virtio_vsock_alloc_linear_skb(unsigned int size, gfp_t mask)
5657
{
5758
struct sk_buff *skb;
5859

net/vmw_vsock/virtio_transport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ static void virtio_vsock_rx_fill(struct virtio_vsock *vsock)
316316
vq = vsock->vqs[VSOCK_VQ_RX];
317317

318318
do {
319-
skb = virtio_vsock_alloc_skb(total_len, GFP_KERNEL);
319+
skb = virtio_vsock_alloc_linear_skb(total_len, GFP_KERNEL);
320320
if (!skb)
321321
break;
322322

net/vmw_vsock/virtio_transport_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *
263263
if (!zcopy)
264264
skb_len += payload_len;
265265

266-
skb = virtio_vsock_alloc_skb(skb_len, GFP_KERNEL);
266+
skb = virtio_vsock_alloc_linear_skb(skb_len, GFP_KERNEL);
267267
if (!skb)
268268
return NULL;
269269

0 commit comments

Comments
 (0)