hv_sock: fix ARM64 support
Subsystems (6)
PATCH 1/1 hv_sock: fix ARM64 support
VMBUS ring buffers must be page aligned. Therefore, the current value of 24K presents a challenge on ARM64 kernels (with 64K pages). So, use VMBUS_RING_SIZE() to ensure they are always aligned and large enough to hold all of the relevant data.
--- net/vmw_vsock/hyperv_transport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/vmw_vsock/hyperv_transport.c +2 -2
@@ -375,10 +375,10 @@ static void hvs_open_connection(struct vmbus_channel *chan) }else { sndbuf =max_t (int, sk->sk_sndbuf,RINGBUFFER_HVS_SND_SIZE ); sndbuf =min_t (int, sndbuf,RINGBUFFER_HVS_MAX_SIZE ); - sndbuf =ALIGN (sndbuf,HV_HYP_PAGE_SIZE ); + sndbuf =VMBUS_RING_SIZE (sndbuf); rcvbuf =max_t (int, sk->sk_rcvbuf,RINGBUFFER_HVS_RCV_SIZE ); rcvbuf =min_t (int, rcvbuf,RINGBUFFER_HVS_MAX_SIZE ); - rcvbuf =ALIGN (rcvbuf,HV_HYP_PAGE_SIZE ); + rcvbuf =VMBUS_RING_SIZE (rcvbuf); } chan->max_pkt_size =HVS_MAX_PKT_SIZE ;
Signature · 1 line
2.54.0
Stefano Garzarella
maintainerQuoted 6 lines · Hamza Mahfooz
VMBUS ring buffers must be page aligned. Therefore, the current value of 24K presents a challenge on ARM64 kernels (with 64K pages). So, use
VMBUS_RING_SIZE()to ensure they are always aligned and large enough to hold all of the relevant data.
mmm, this is the first time I've seen this address used for stable. Even after searching in the log, I don't see anyone else who's used it. Where did you get it from?
From Documentation/process/stable-kernel-rules.rst :
To have a patch you submit for mainline inclusion later automatically picked up for stable trees, add this tag in the sign-off area::
The patch LGTM.
Thanks,
Stefano
Quoted 28 lines
Fixes 77ffe33363c0 ("hv_sock: use HV_HYP_PAGE_SIZE for Hyper-V communication")Tested-by Dexuan Cui <[email protected]>Reviewed-by Dexuan Cui <[email protected]>Signed-off-by Hamza Mahfooz <[email protected]>---
net/vmw_vsock/hyperv_transport.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)net/vmw_vsock/hyperv_transport.c +2
-2@@ -375,10 +375,10 @@ static void hvs_open_connection(struct vmbus_channel *chan) }else { sndbuf =max_t (int, sk->sk_sndbuf,RINGBUFFER_HVS_SND_SIZE ); sndbuf =min_t (int, sndbuf,RINGBUFFER_HVS_MAX_SIZE ); - sndbuf =ALIGN (sndbuf,HV_HYP_PAGE_SIZE ); + sndbuf =VMBUS_RING_SIZE (sndbuf); rcvbuf =max_t (int, sk->sk_rcvbuf,RINGBUFFER_HVS_RCV_SIZE ); rcvbuf =min_t (int, rcvbuf,RINGBUFFER_HVS_MAX_SIZE ); - rcvbuf =ALIGN (rcvbuf,HV_HYP_PAGE_SIZE ); + rcvbuf =VMBUS_RING_SIZE (rcvbuf); } chan->max_pkt_size =HVS_MAX_PKT_SIZE ;Signature · 1 line
2.54.0
Quoted 12 lines · Stefano Garzarella
Quoted 6 lines · Hamza Mahfooz
VMBUS ring buffers must be page aligned. Therefore, the current value of 24K presents a challenge on ARM64 kernels (with 64K pages). So, use
VMBUS_RING_SIZE()to ensure they are always aligned and large enough to hold all of the relevant data.mmm, this is the first time I've seen this address used for stable. Even after searching in the log, I don't see anyone else who's used it. Where did you get it from?
Quoted 6 lines
From
Documentation/process/stable-kernel-rules.rst:To have a patch you submit for mainline inclusion later automatically
picked up for stable trees, add this tag in the sign-off area::
Ya, that is the address I intended to Cc, not sure how I ended up mangling it though.
Quoted 36 lines
The patch LGTM.
Thanks,
StefanoQuoted 28 lines
Fixes 77ffe33363c0 ("hv_sock: use HV_HYP_PAGE_SIZE for Hyper-V communication")Tested-by Dexuan Cui <[email protected]>Reviewed-by Dexuan Cui <[email protected]>Signed-off-by Hamza Mahfooz <[email protected]>---
net/vmw_vsock/hyperv_transport.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)net/vmw_vsock/hyperv_transport.c +2
-2@@ -375,10 +375,10 @@ static void hvs_open_connection(struct vmbus_channel *chan) }else { sndbuf =max_t (int, sk->sk_sndbuf,RINGBUFFER_HVS_SND_SIZE ); sndbuf =min_t (int, sndbuf,RINGBUFFER_HVS_MAX_SIZE ); - sndbuf =ALIGN (sndbuf,HV_HYP_PAGE_SIZE ); + sndbuf =VMBUS_RING_SIZE (sndbuf); rcvbuf =max_t (int, sk->sk_rcvbuf,RINGBUFFER_HVS_RCV_SIZE ); rcvbuf =min_t (int, rcvbuf,RINGBUFFER_HVS_MAX_SIZE ); - rcvbuf =ALIGN (rcvbuf,HV_HYP_PAGE_SIZE ); + rcvbuf =VMBUS_RING_SIZE (rcvbuf); } chan->max_pkt_size =HVS_MAX_PKT_SIZE ;Signature · 1 line
2.54.0