Commit 061dc93e authored by Boqun Feng's avatar Boqun Feng Committed by Wei Liu

Driver: hv: util: Use VMBUS_RING_SIZE() for ringbuffer sizes

For a Hyper-V vmbus, the size of the ringbuffer has two requirements:

1) it has to take one PAGE_SIZE for the header

2) it has to be PAGE_SIZE aligned so that double-mapping can work

VMBUS_RING_SIZE() could calculate a correct ringbuffer size which
fulfills both requirements, therefore use it to make sure vmbus work
when PAGE_SIZE != HV_HYP_PAGE_SIZE (4K).

Note that since the argument for VMBUS_RING_SIZE() is the size of
payload (data part), so it will be minus 4k (the size of header when
PAGE_SIZE = 4k) than the original value to keep the ringbuffer total
size unchanged when PAGE_SIZE = 4k.
Signed-off-by: default avatarBoqun Feng <boqun.feng@gmail.com>
Cc: Michael Kelley <mikelley@microsoft.com>
Reviewed-by: default avatarMichael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20200916034817.30282-11-boqun.feng@gmail.comSigned-off-by: default avatarWei Liu <wei.liu@kernel.org>
parent d02a2699
...@@ -461,6 +461,9 @@ static void heartbeat_onchannelcallback(void *context) ...@@ -461,6 +461,9 @@ static void heartbeat_onchannelcallback(void *context)
} }
} }
#define HV_UTIL_RING_SEND_SIZE VMBUS_RING_SIZE(3 * HV_HYP_PAGE_SIZE)
#define HV_UTIL_RING_RECV_SIZE VMBUS_RING_SIZE(3 * HV_HYP_PAGE_SIZE)
static int util_probe(struct hv_device *dev, static int util_probe(struct hv_device *dev,
const struct hv_vmbus_device_id *dev_id) const struct hv_vmbus_device_id *dev_id)
{ {
...@@ -491,8 +494,8 @@ static int util_probe(struct hv_device *dev, ...@@ -491,8 +494,8 @@ static int util_probe(struct hv_device *dev,
hv_set_drvdata(dev, srv); hv_set_drvdata(dev, srv);
ret = vmbus_open(dev->channel, 4 * HV_HYP_PAGE_SIZE, ret = vmbus_open(dev->channel, HV_UTIL_RING_SEND_SIZE,
4 * HV_HYP_PAGE_SIZE, NULL, 0, srv->util_cb, HV_UTIL_RING_RECV_SIZE, NULL, 0, srv->util_cb,
dev->channel); dev->channel);
if (ret) if (ret)
goto error; goto error;
...@@ -551,8 +554,8 @@ static int util_resume(struct hv_device *dev) ...@@ -551,8 +554,8 @@ static int util_resume(struct hv_device *dev)
return ret; return ret;
} }
ret = vmbus_open(dev->channel, 4 * HV_HYP_PAGE_SIZE, ret = vmbus_open(dev->channel, HV_UTIL_RING_SEND_SIZE,
4 * HV_HYP_PAGE_SIZE, NULL, 0, srv->util_cb, HV_UTIL_RING_RECV_SIZE, NULL, 0, srv->util_cb,
dev->channel); dev->channel);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment