Skip to content

Commit 0e3f729

Browse files
dancerjkuba-moo
authored andcommitted
vhost/vsock: Use kvmalloc/kvfree for larger packets.
When copying a large file over sftp over vsock, data size is usually 32kB, and kmalloc seems to fail to try to allocate 32 32kB regions. vhost-5837: page allocation failure: order:4, mode:0x24040c0 Call Trace: [<ffffffffb6a0df64>] dump_stack+0x97/0xdb [<ffffffffb68d6aed>] warn_alloc_failed+0x10f/0x138 [<ffffffffb68d868a>] ? __alloc_pages_direct_compact+0x38/0xc8 [<ffffffffb664619f>] __alloc_pages_nodemask+0x84c/0x90d [<ffffffffb6646e56>] alloc_kmem_pages+0x17/0x19 [<ffffffffb6653a26>] kmalloc_order_trace+0x2b/0xdb [<ffffffffb66682f3>] __kmalloc+0x177/0x1f7 [<ffffffffb66e0d94>] ? copy_from_iter+0x8d/0x31d [<ffffffffc0689ab7>] vhost_vsock_handle_tx_kick+0x1fa/0x301 [vhost_vsock] [<ffffffffc06828d9>] vhost_worker+0xf7/0x157 [vhost] [<ffffffffb683ddce>] kthread+0xfd/0x105 [<ffffffffc06827e2>] ? vhost_dev_set_owner+0x22e/0x22e [vhost] [<ffffffffb683dcd1>] ? flush_kthread_worker+0xf3/0xf3 [<ffffffffb6eb332e>] ret_from_fork+0x4e/0x80 [<ffffffffb683dcd1>] ? flush_kthread_worker+0xf3/0xf3 Work around by doing kvmalloc instead. Fixes: 433fc58 ("VSOCK: Introduce vhost_vsock.ko") Signed-off-by: Junichi Uekawa <[email protected]> Reviewed-by: Stefano Garzarella <[email protected]> Acked-by: Michael S. Tsirkin <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 511cce1 commit 0e3f729

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/vhost/vsock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ vhost_vsock_alloc_pkt(struct vhost_virtqueue *vq,
393393
return NULL;
394394
}
395395

396-
pkt->buf = kmalloc(pkt->len, GFP_KERNEL);
396+
pkt->buf = kvmalloc(pkt->len, GFP_KERNEL);
397397
if (!pkt->buf) {
398398
kfree(pkt);
399399
return NULL;

net/vmw_vsock/virtio_transport_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,7 @@ EXPORT_SYMBOL_GPL(virtio_transport_recv_pkt);
13421342

13431343
void virtio_transport_free_pkt(struct virtio_vsock_pkt *pkt)
13441344
{
1345-
kfree(pkt->buf);
1345+
kvfree(pkt->buf);
13461346
kfree(pkt);
13471347
}
13481348
EXPORT_SYMBOL_GPL(virtio_transport_free_pkt);

0 commit comments

Comments
 (0)