Skip to content

Commit 2304c64

Browse files
willdeaconmstsirkin
authored andcommitted
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: Stefano Garzarella <[email protected]> Signed-off-by: Will Deacon <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent 03a92f0 commit 2304c64

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

drivers/vhost/vsock.c

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

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

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
@@ -261,7 +261,7 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *
261261
if (!zcopy)
262262
skb_len += payload_len;
263263

264-
skb = virtio_vsock_alloc_skb(skb_len, GFP_KERNEL);
264+
skb = virtio_vsock_alloc_linear_skb(skb_len, GFP_KERNEL);
265265
if (!skb)
266266
return NULL;
267267

0 commit comments

Comments
 (0)