From be350eab93035f0a83e107ce73e1687e39a04206 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Mon, 21 Jul 2025 20:44:42 +0100 Subject: [PATCH] Revert "ANDROID: Make vsock virtio packet buff size configurable" This reverts commit f465fb7e1af29c5f6da1cd77b44f5d02e0ad5eeb. Now that vsock is more careful with its page allocations, overriding this option doesn't achieve an awful lot. Bug: 421244320 Bug: 149494272 Signed-off-by: Will Deacon Change-Id: I3ff4e92407f97f547528da459c1dad3519eb8b04 --- include/linux/virtio_vsock.h | 3 +-- net/vmw_vsock/virtio_transport_common.c | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index f6c2a136216f..24e9dc62dc8b 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -137,8 +137,7 @@ static inline size_t virtio_vsock_skb_len(struct sk_buff *skb) */ #define VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE SKB_WITH_OVERHEAD(1024 * 4) #define VIRTIO_VSOCK_MAX_BUF_SIZE 0xFFFFFFFFUL -#define VIRTIO_VSOCK_MAX_PKT_BUF_SIZE virtio_transport_max_vsock_pkt_buf_size -extern uint virtio_transport_max_vsock_pkt_buf_size; +#define VIRTIO_VSOCK_MAX_PKT_BUF_SIZE (1024 * 64) enum { VSOCK_VQ_RX = 0, /* for host to guest data */ diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 6f61d0e51c4d..790d968a8e5e 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -29,10 +29,6 @@ static void virtio_transport_cancel_close_work(struct vsock_sock *vsk, bool cancel_timeout); -uint virtio_transport_max_vsock_pkt_buf_size = 64 * 1024; -module_param(virtio_transport_max_vsock_pkt_buf_size, uint, 0444); -EXPORT_SYMBOL_GPL(virtio_transport_max_vsock_pkt_buf_size); - static const struct virtio_transport * virtio_transport_get_ops(struct vsock_sock *vsk) {