* [PATCH 0/2] Drivers: hv: Specify buffer size using Hyper-V page size
@ 2019-07-25 5:03 Himadri Pandya
2019-07-25 5:03 ` [PATCH 1/2] Drivers: hv: Specify receive " Himadri Pandya
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Himadri Pandya @ 2019-07-25 5:03 UTC (permalink / raw)
To: mikelley, kys, haiyangz, sthemmin, sashal
Cc: linux-hyperv, linux-kernel, Himadri Pandya
recv_buffer and VMbus ring buffers are sized based on guest page size
which Hyper-V assumes to be 4KB. It might not be the case for some
architectures. Hence instead use the Hyper-V page size.
Himadri Pandya (2):
Drivers: hv: Specify receive buffer size using Hyper-V page size
Drivers: hv: util: Specify ring buffer size using Hyper-V page size
drivers/hv/hv_fcopy.c | 3 ++-
drivers/hv/hv_kvp.c | 3 ++-
drivers/hv/hv_snapshot.c | 3 ++-
drivers/hv/hv_util.c | 13 +++++++------
4 files changed, 13 insertions(+), 9 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] Drivers: hv: Specify receive buffer size using Hyper-V page size 2019-07-25 5:03 [PATCH 0/2] Drivers: hv: Specify buffer size using Hyper-V page size Himadri Pandya @ 2019-07-25 5:03 ` Himadri Pandya 2019-07-26 16:07 ` Stephen Hemminger 2019-07-25 5:03 ` [PATCH 2/2] Drivers: hv: util: Specify ring " Himadri Pandya [not found] ` <DM5PR21MB01377E1E6DE541E902A12EEFD7B80@DM5PR21MB0137.namprd21.prod.outlook.com> 2 siblings, 1 reply; 6+ messages in thread From: Himadri Pandya @ 2019-07-25 5:03 UTC (permalink / raw) To: mikelley, kys, haiyangz, sthemmin, sashal Cc: linux-hyperv, linux-kernel, Himadri Pandya The recv_buffer is used to retrieve data from the VMbus ring buffer. VMbus ring buffers are sized based on the guest page size which Hyper-V assumes to be 4KB. But it may be different on some architectures. So use the Hyper-V page size to allocate the recv_buffer and set the maximum size to receive. Signed-off-by: Himadri Pandya <himadri18.07@gmail.com> --- drivers/hv/hv_fcopy.c | 3 ++- drivers/hv/hv_kvp.c | 3 ++- drivers/hv/hv_snapshot.c | 3 ++- drivers/hv/hv_util.c | 8 ++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/hv/hv_fcopy.c b/drivers/hv/hv_fcopy.c index 7e30ae0635cc..08fa4a5de644 100644 --- a/drivers/hv/hv_fcopy.c +++ b/drivers/hv/hv_fcopy.c @@ -13,6 +13,7 @@ #include <linux/workqueue.h> #include <linux/hyperv.h> #include <linux/sched.h> +#include <asm/hyperv-tlfs.h> #include "hyperv_vmbus.h" #include "hv_utils_transport.h" @@ -234,7 +235,7 @@ void hv_fcopy_onchannelcallback(void *context) if (fcopy_transaction.state > HVUTIL_READY) return; - vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE * 2, &recvlen, + vmbus_recvpacket(channel, recv_buffer, HV_HYP_PAGE_SIZE * 2, &recvlen, &requestid); if (recvlen <= 0) return; diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c index 5054d1105236..ae7c028dc5a8 100644 --- a/drivers/hv/hv_kvp.c +++ b/drivers/hv/hv_kvp.c @@ -27,6 +27,7 @@ #include <linux/connector.h> #include <linux/workqueue.h> #include <linux/hyperv.h> +#include <asm/hyperv-tlfs.h> #include "hyperv_vmbus.h" #include "hv_utils_transport.h" @@ -661,7 +662,7 @@ void hv_kvp_onchannelcallback(void *context) if (kvp_transaction.state > HVUTIL_READY) return; - vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE * 4, &recvlen, + vmbus_recvpacket(channel, recv_buffer, HV_HYP_PAGE_SIZE * 4, &recvlen, &requestid); if (recvlen > 0) { diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c index 20ba95b75a94..03b6454268b3 100644 --- a/drivers/hv/hv_snapshot.c +++ b/drivers/hv/hv_snapshot.c @@ -12,6 +12,7 @@ #include <linux/connector.h> #include <linux/workqueue.h> #include <linux/hyperv.h> +#include <asm/hyperv-tlfs.h> #include "hyperv_vmbus.h" #include "hv_utils_transport.h" @@ -297,7 +298,7 @@ void hv_vss_onchannelcallback(void *context) if (vss_transaction.state > HVUTIL_READY) return; - vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE * 2, &recvlen, + vmbus_recvpacket(channel, recv_buffer, HV_HYP_PAGE_SIZE * 2, &recvlen, &requestid); if (recvlen > 0) { diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c index e32681ee7b9f..c2c08f26bd5f 100644 --- a/drivers/hv/hv_util.c +++ b/drivers/hv/hv_util.c @@ -136,7 +136,7 @@ static void shutdown_onchannelcallback(void *context) struct icmsg_hdr *icmsghdrp; vmbus_recvpacket(channel, shut_txf_buf, - PAGE_SIZE, &recvlen, &requestid); + HV_HYP_PAGE_SIZE, &recvlen, &requestid); if (recvlen > 0) { icmsghdrp = (struct icmsg_hdr *)&shut_txf_buf[ @@ -284,7 +284,7 @@ static void timesync_onchannelcallback(void *context) u8 *time_txf_buf = util_timesynch.recv_buffer; vmbus_recvpacket(channel, time_txf_buf, - PAGE_SIZE, &recvlen, &requestid); + HV_HYP_PAGE_SIZE, &recvlen, &requestid); if (recvlen > 0) { icmsghdrp = (struct icmsg_hdr *)&time_txf_buf[ @@ -346,7 +346,7 @@ static void heartbeat_onchannelcallback(void *context) while (1) { vmbus_recvpacket(channel, hbeat_txf_buf, - PAGE_SIZE, &recvlen, &requestid); + HV_HYP_PAGE_SIZE, &recvlen, &requestid); if (!recvlen) break; @@ -390,7 +390,7 @@ static int util_probe(struct hv_device *dev, (struct hv_util_service *)dev_id->driver_data; int ret; - srv->recv_buffer = kmalloc(PAGE_SIZE * 4, GFP_KERNEL); + srv->recv_buffer = kmalloc(HV_HYP_PAGE_SIZE * 4, GFP_KERNEL); if (!srv->recv_buffer) return -ENOMEM; srv->channel = dev->channel; -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Drivers: hv: Specify receive buffer size using Hyper-V page size 2019-07-25 5:03 ` [PATCH 1/2] Drivers: hv: Specify receive " Himadri Pandya @ 2019-07-26 16:07 ` Stephen Hemminger 0 siblings, 0 replies; 6+ messages in thread From: Stephen Hemminger @ 2019-07-26 16:07 UTC (permalink / raw) To: Himadri Pandya Cc: Michael Kelley, KY Srinivasan, Haiyang Zhang, Stephen Hemminger, sashal, linux-hyperv, linux-kernel, himadri18.07 On Wed, 24 Jul 2019 22:03:14 -0700 "Himadri Pandya" <himadrispandya@gmail.com> wrote: > The recv_buffer is used to retrieve data from the VMbus ring buffer. > VMbus ring buffers are sized based on the guest page size which > Hyper-V assumes to be 4KB. But it may be different on some > architectures. So use the Hyper-V page size to allocate the > recv_buffer and set the maximum size to receive. > > Signed-off-by: Himadri Pandya <himadri18.07@gmail.com> If pagesize is 64K, then doing it this way will waste lots of memory. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] Drivers: hv: util: Specify ring buffer size using Hyper-V page size 2019-07-25 5:03 [PATCH 0/2] Drivers: hv: Specify buffer size using Hyper-V page size Himadri Pandya 2019-07-25 5:03 ` [PATCH 1/2] Drivers: hv: Specify receive " Himadri Pandya @ 2019-07-25 5:03 ` Himadri Pandya 2019-07-26 16:06 ` Stephen Hemminger [not found] ` <DM5PR21MB01377E1E6DE541E902A12EEFD7B80@DM5PR21MB0137.namprd21.prod.outlook.com> 2 siblings, 1 reply; 6+ messages in thread From: Himadri Pandya @ 2019-07-25 5:03 UTC (permalink / raw) To: mikelley, kys, haiyangz, sthemmin, sashal Cc: linux-hyperv, linux-kernel, Himadri Pandya VMbus ring buffers are sized based on the 4K page size used by Hyper-V. The Linux guest page size may not be 4K on all architectures so use the Hyper-V page size to specify the ring buffer size. Signed-off-by: Himadri Pandya <himadri18.07@gmail.com> --- drivers/hv/hv_util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c index c2c08f26bd5f..766bd8457346 100644 --- a/drivers/hv/hv_util.c +++ b/drivers/hv/hv_util.c @@ -413,8 +413,9 @@ static int util_probe(struct hv_device *dev, hv_set_drvdata(dev, srv); - ret = vmbus_open(dev->channel, 4 * PAGE_SIZE, 4 * PAGE_SIZE, NULL, 0, - srv->util_cb, dev->channel); + ret = vmbus_open(dev->channel, 4 * HV_HYP_PAGE_SIZE, + 4 * HV_HYP_PAGE_SIZE, NULL, 0, srv->util_cb, + dev->channel); if (ret) goto error; -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] Drivers: hv: util: Specify ring buffer size using Hyper-V page size 2019-07-25 5:03 ` [PATCH 2/2] Drivers: hv: util: Specify ring " Himadri Pandya @ 2019-07-26 16:06 ` Stephen Hemminger 0 siblings, 0 replies; 6+ messages in thread From: Stephen Hemminger @ 2019-07-26 16:06 UTC (permalink / raw) To: Himadri Pandya Cc: Michael Kelley, KY Srinivasan, Haiyang Zhang, Stephen Hemminger, sashal, linux-hyperv, linux-kernel, himadri18.07 On Wed, 24 Jul 2019 22:03:15 -0700 "Himadri Pandya" <himadrispandya@gmail.com> wrote: > VMbus ring buffers are sized based on the 4K page size used by > Hyper-V. The Linux guest page size may not be 4K on all architectures > so use the Hyper-V page size to specify the ring buffer size. > > Signed-off-by: Himadri Pandya <himadri18.07@gmail.com> > --- > drivers/hv/hv_util.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c > index c2c08f26bd5f..766bd8457346 100644 > --- a/drivers/hv/hv_util.c > +++ b/drivers/hv/hv_util.c > @@ -413,8 +413,9 @@ static int util_probe(struct hv_device *dev, > > hv_set_drvdata(dev, srv); > > - ret = vmbus_open(dev->channel, 4 * PAGE_SIZE, 4 * PAGE_SIZE, NULL, > 0, > - srv->util_cb, dev->channel); > + ret = vmbus_open(dev->channel, 4 * HV_HYP_PAGE_SIZE, > + 4 * HV_HYP_PAGE_SIZE, NULL, 0, srv->util_cb, > + dev->channel); > if (ret) > goto error; > hv_util doesn't need lots of buffering. Why not define a fixed value across all architectures. Maybe with some roundup to HV_HYP_PAGE_SIZE. ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <DM5PR21MB01377E1E6DE541E902A12EEFD7B80@DM5PR21MB0137.namprd21.prod.outlook.com>]
* Re: [PATCH 0/2] Drivers: hv: Specify buffer size using Hyper-V page size [not found] ` <DM5PR21MB01377E1E6DE541E902A12EEFD7B80@DM5PR21MB0137.namprd21.prod.outlook.com> @ 2019-10-04 15:29 ` Sasha Levin 0 siblings, 0 replies; 6+ messages in thread From: Sasha Levin @ 2019-10-04 15:29 UTC (permalink / raw) To: Michael Kelley Cc: Himadri Pandya, KY Srinivasan, Haiyang Zhang, Stephen Hemminger, tglx, linux-hyperv, linux-kernel, himadri18.07 On Wed, Sep 04, 2019 at 11:40:21PM +0000, Michael Kelley wrote: >From: Himadri Pandya <himadrispandya@gmail.com> Sent: Wednesday, July 24, 2019 10:03 PM >> >> recv_buffer and VMbus ring buffers are sized based on guest page size >> which Hyper-V assumes to be 4KB. It might not be the case for some >> architectures. Hence instead use the Hyper-V page size. >> >> Himadri Pandya (2): >> Drivers: hv: Specify receive buffer size using Hyper-V page size >> Drivers: hv: util: Specify ring buffer size using Hyper-V page size >> >> drivers/hv/hv_fcopy.c | 3 ++- >> drivers/hv/hv_kvp.c | 3 ++- >> drivers/hv/hv_snapshot.c | 3 ++- >> drivers/hv/hv_util.c | 13 +++++++------ >> 4 files changed, 13 insertions(+), 9 deletions(-) >> >> -- >> 2.17.1 > >Thomas -- can you pick up this patch set in the x86/hyperv branch >of your tip tree along with the other patches to fix wrong page size >assumptions? I've queued these two for hyperv-next, thanks! -- Thanks, Sasha ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-04 15:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-25 5:03 [PATCH 0/2] Drivers: hv: Specify buffer size using Hyper-V page size Himadri Pandya
2019-07-25 5:03 ` [PATCH 1/2] Drivers: hv: Specify receive " Himadri Pandya
2019-07-26 16:07 ` Stephen Hemminger
2019-07-25 5:03 ` [PATCH 2/2] Drivers: hv: util: Specify ring " Himadri Pandya
2019-07-26 16:06 ` Stephen Hemminger
[not found] ` <DM5PR21MB01377E1E6DE541E902A12EEFD7B80@DM5PR21MB0137.namprd21.prod.outlook.com>
2019-10-04 15:29 ` [PATCH 0/2] Drivers: hv: Specify " Sasha Levin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).