* [PATCH v2] uio_hv_generic: Add a check for HV_NIC for send, receive buffers setup
@ 2025-01-02 14:52 Naman Jain
2025-01-08 5:26 ` Michael Kelley
0 siblings, 1 reply; 3+ messages in thread
From: Naman Jain @ 2025-01-02 14:52 UTC (permalink / raw)
To: K . Y . Srinivasan, Haiyang Zhang, Wei Liu, Dexuan Cui,
Greg Kroah-Hartman
Cc: linux-hyperv, linux-kernel, Saurabh Sengar
Receive and send buffer allocation was originally introduced to support
DPDK's networking use case. These buffer sizes were further increased to
meet DPDK performance requirements. However, these large buffers are
unnecessary for any other UIO use cases.
Restrict the allocation of receive and send buffers only for HV_NIC device
type, saving 47 MB of memory per device.
While at it, fix some of the syntax related issues in the touched code
which are reported by "--strict" option of checkpatch.
Signed-off-by: Naman Jain <namjain@linux.microsoft.com>
---
Changes since v1:
https://lore.kernel.org/all/20241125125015.1500-1-namjain@linux.microsoft.com/
Rephrased commit msg as per Saurabh's suggestion.
---
drivers/uio/uio_hv_generic.c | 86 ++++++++++++++++++------------------
1 file changed, 43 insertions(+), 43 deletions(-)
diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c
index 3976360d0096..1b19b5647495 100644
--- a/drivers/uio/uio_hv_generic.c
+++ b/drivers/uio/uio_hv_generic.c
@@ -296,51 +296,51 @@ hv_uio_probe(struct hv_device *dev,
pdata->info.mem[MON_PAGE_MAP].size = PAGE_SIZE;
pdata->info.mem[MON_PAGE_MAP].memtype = UIO_MEM_LOGICAL;
- pdata->recv_buf = vzalloc(RECV_BUFFER_SIZE);
- if (pdata->recv_buf == NULL) {
- ret = -ENOMEM;
- goto fail_free_ring;
+ if (channel->device_id == HV_NIC) {
+ pdata->recv_buf = vzalloc(RECV_BUFFER_SIZE);
+ if (!pdata->recv_buf) {
+ ret = -ENOMEM;
+ goto fail_free_ring;
+ }
+
+ ret = vmbus_establish_gpadl(channel, pdata->recv_buf,
+ RECV_BUFFER_SIZE, &pdata->recv_gpadl);
+ if (ret) {
+ if (!pdata->recv_gpadl.decrypted)
+ vfree(pdata->recv_buf);
+ goto fail_close;
+ }
+
+ /* put Global Physical Address Label in name */
+ snprintf(pdata->recv_name, sizeof(pdata->recv_name),
+ "recv:%u", pdata->recv_gpadl.gpadl_handle);
+ pdata->info.mem[RECV_BUF_MAP].name = pdata->recv_name;
+ pdata->info.mem[RECV_BUF_MAP].addr = (uintptr_t)pdata->recv_buf;
+ pdata->info.mem[RECV_BUF_MAP].size = RECV_BUFFER_SIZE;
+ pdata->info.mem[RECV_BUF_MAP].memtype = UIO_MEM_VIRTUAL;
+
+ pdata->send_buf = vzalloc(SEND_BUFFER_SIZE);
+ if (!pdata->send_buf) {
+ ret = -ENOMEM;
+ goto fail_close;
+ }
+
+ ret = vmbus_establish_gpadl(channel, pdata->send_buf,
+ SEND_BUFFER_SIZE, &pdata->send_gpadl);
+ if (ret) {
+ if (!pdata->send_gpadl.decrypted)
+ vfree(pdata->send_buf);
+ goto fail_close;
+ }
+
+ snprintf(pdata->send_name, sizeof(pdata->send_name),
+ "send:%u", pdata->send_gpadl.gpadl_handle);
+ pdata->info.mem[SEND_BUF_MAP].name = pdata->send_name;
+ pdata->info.mem[SEND_BUF_MAP].addr = (uintptr_t)pdata->send_buf;
+ pdata->info.mem[SEND_BUF_MAP].size = SEND_BUFFER_SIZE;
+ pdata->info.mem[SEND_BUF_MAP].memtype = UIO_MEM_VIRTUAL;
}
- ret = vmbus_establish_gpadl(channel, pdata->recv_buf,
- RECV_BUFFER_SIZE, &pdata->recv_gpadl);
- if (ret) {
- if (!pdata->recv_gpadl.decrypted)
- vfree(pdata->recv_buf);
- goto fail_close;
- }
-
- /* put Global Physical Address Label in name */
- snprintf(pdata->recv_name, sizeof(pdata->recv_name),
- "recv:%u", pdata->recv_gpadl.gpadl_handle);
- pdata->info.mem[RECV_BUF_MAP].name = pdata->recv_name;
- pdata->info.mem[RECV_BUF_MAP].addr
- = (uintptr_t)pdata->recv_buf;
- pdata->info.mem[RECV_BUF_MAP].size = RECV_BUFFER_SIZE;
- pdata->info.mem[RECV_BUF_MAP].memtype = UIO_MEM_VIRTUAL;
-
- pdata->send_buf = vzalloc(SEND_BUFFER_SIZE);
- if (pdata->send_buf == NULL) {
- ret = -ENOMEM;
- goto fail_close;
- }
-
- ret = vmbus_establish_gpadl(channel, pdata->send_buf,
- SEND_BUFFER_SIZE, &pdata->send_gpadl);
- if (ret) {
- if (!pdata->send_gpadl.decrypted)
- vfree(pdata->send_buf);
- goto fail_close;
- }
-
- snprintf(pdata->send_name, sizeof(pdata->send_name),
- "send:%u", pdata->send_gpadl.gpadl_handle);
- pdata->info.mem[SEND_BUF_MAP].name = pdata->send_name;
- pdata->info.mem[SEND_BUF_MAP].addr
- = (uintptr_t)pdata->send_buf;
- pdata->info.mem[SEND_BUF_MAP].size = SEND_BUFFER_SIZE;
- pdata->info.mem[SEND_BUF_MAP].memtype = UIO_MEM_VIRTUAL;
-
pdata->info.priv = pdata;
pdata->device = dev;
base-commit: 3d6fbc065983fabd3fcfef4d66c9cf8a587f9ddc
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH v2] uio_hv_generic: Add a check for HV_NIC for send, receive buffers setup
2025-01-02 14:52 [PATCH v2] uio_hv_generic: Add a check for HV_NIC for send, receive buffers setup Naman Jain
@ 2025-01-08 5:26 ` Michael Kelley
2025-01-08 7:28 ` Wei Liu
0 siblings, 1 reply; 3+ messages in thread
From: Michael Kelley @ 2025-01-08 5:26 UTC (permalink / raw)
To: Naman Jain, K . Y . Srinivasan, Haiyang Zhang, Wei Liu,
Dexuan Cui, Greg Kroah-Hartman
Cc: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org,
Saurabh Sengar
From: Naman Jain <namjain@linux.microsoft.com> Sent: Thursday, January 2, 2025 6:53 AM
>
> Receive and send buffer allocation was originally introduced to support
> DPDK's networking use case. These buffer sizes were further increased to
> meet DPDK performance requirements. However, these large buffers are
> unnecessary for any other UIO use cases.
> Restrict the allocation of receive and send buffers only for HV_NIC device
> type, saving 47 MB of memory per device.
>
> While at it, fix some of the syntax related issues in the touched code
> which are reported by "--strict" option of checkpatch.
>
> Signed-off-by: Naman Jain <namjain@linux.microsoft.com>
> ---
> Changes since v1:
> https://lore.kernel.org/all/20241125125015.1500-1-namjain@linux.microsoft.com/
> Rephrased commit msg as per Saurabh's suggestion.
> ---
> drivers/uio/uio_hv_generic.c | 86 ++++++++++++++++++------------------
> 1 file changed, 43 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c
> index 3976360d0096..1b19b5647495 100644
> --- a/drivers/uio/uio_hv_generic.c
> +++ b/drivers/uio/uio_hv_generic.c
> @@ -296,51 +296,51 @@ hv_uio_probe(struct hv_device *dev,
> pdata->info.mem[MON_PAGE_MAP].size = PAGE_SIZE;
> pdata->info.mem[MON_PAGE_MAP].memtype = UIO_MEM_LOGICAL;
>
> - pdata->recv_buf = vzalloc(RECV_BUFFER_SIZE);
> - if (pdata->recv_buf == NULL) {
> - ret = -ENOMEM;
> - goto fail_free_ring;
> + if (channel->device_id == HV_NIC) {
> + pdata->recv_buf = vzalloc(RECV_BUFFER_SIZE);
> + if (!pdata->recv_buf) {
> + ret = -ENOMEM;
> + goto fail_free_ring;
> + }
> +
> + ret = vmbus_establish_gpadl(channel, pdata->recv_buf,
> + RECV_BUFFER_SIZE, &pdata->recv_gpadl);
> + if (ret) {
> + if (!pdata->recv_gpadl.decrypted)
> + vfree(pdata->recv_buf);
> + goto fail_close;
> + }
> +
> + /* put Global Physical Address Label in name */
> + snprintf(pdata->recv_name, sizeof(pdata->recv_name),
> + "recv:%u", pdata->recv_gpadl.gpadl_handle);
> + pdata->info.mem[RECV_BUF_MAP].name = pdata->recv_name;
> + pdata->info.mem[RECV_BUF_MAP].addr = (uintptr_t)pdata->recv_buf;
> + pdata->info.mem[RECV_BUF_MAP].size = RECV_BUFFER_SIZE;
> + pdata->info.mem[RECV_BUF_MAP].memtype = UIO_MEM_VIRTUAL;
> +
> + pdata->send_buf = vzalloc(SEND_BUFFER_SIZE);
> + if (!pdata->send_buf) {
> + ret = -ENOMEM;
> + goto fail_close;
> + }
> +
> + ret = vmbus_establish_gpadl(channel, pdata->send_buf,
> + SEND_BUFFER_SIZE, &pdata->send_gpadl);
> + if (ret) {
> + if (!pdata->send_gpadl.decrypted)
> + vfree(pdata->send_buf);
> + goto fail_close;
> + }
> +
> + snprintf(pdata->send_name, sizeof(pdata->send_name),
> + "send:%u", pdata->send_gpadl.gpadl_handle);
> + pdata->info.mem[SEND_BUF_MAP].name = pdata->send_name;
> + pdata->info.mem[SEND_BUF_MAP].addr = (uintptr_t)pdata-
> >send_buf;
> + pdata->info.mem[SEND_BUF_MAP].size = SEND_BUFFER_SIZE;
> + pdata->info.mem[SEND_BUF_MAP].memtype = UIO_MEM_VIRTUAL;
> }
>
> - ret = vmbus_establish_gpadl(channel, pdata->recv_buf,
> - RECV_BUFFER_SIZE, &pdata->recv_gpadl);
> - if (ret) {
> - if (!pdata->recv_gpadl.decrypted)
> - vfree(pdata->recv_buf);
> - goto fail_close;
> - }
> -
> - /* put Global Physical Address Label in name */
> - snprintf(pdata->recv_name, sizeof(pdata->recv_name),
> - "recv:%u", pdata->recv_gpadl.gpadl_handle);
> - pdata->info.mem[RECV_BUF_MAP].name = pdata->recv_name;
> - pdata->info.mem[RECV_BUF_MAP].addr
> - = (uintptr_t)pdata->recv_buf;
> - pdata->info.mem[RECV_BUF_MAP].size = RECV_BUFFER_SIZE;
> - pdata->info.mem[RECV_BUF_MAP].memtype = UIO_MEM_VIRTUAL;
> -
> - pdata->send_buf = vzalloc(SEND_BUFFER_SIZE);
> - if (pdata->send_buf == NULL) {
> - ret = -ENOMEM;
> - goto fail_close;
> - }
> -
> - ret = vmbus_establish_gpadl(channel, pdata->send_buf,
> - SEND_BUFFER_SIZE, &pdata->send_gpadl);
> - if (ret) {
> - if (!pdata->send_gpadl.decrypted)
> - vfree(pdata->send_buf);
> - goto fail_close;
> - }
> -
> - snprintf(pdata->send_name, sizeof(pdata->send_name),
> - "send:%u", pdata->send_gpadl.gpadl_handle);
> - pdata->info.mem[SEND_BUF_MAP].name = pdata->send_name;
> - pdata->info.mem[SEND_BUF_MAP].addr
> - = (uintptr_t)pdata->send_buf;
> - pdata->info.mem[SEND_BUF_MAP].size = SEND_BUFFER_SIZE;
> - pdata->info.mem[SEND_BUF_MAP].memtype = UIO_MEM_VIRTUAL;
> -
> pdata->info.priv = pdata;
> pdata->device = dev;
>
>
> base-commit: 3d6fbc065983fabd3fcfef4d66c9cf8a587f9ddc
> --
> 2.43.0
>
Reviewed-by: Michael Kelley <mhklinux@outlook.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] uio_hv_generic: Add a check for HV_NIC for send, receive buffers setup
2025-01-08 5:26 ` Michael Kelley
@ 2025-01-08 7:28 ` Wei Liu
0 siblings, 0 replies; 3+ messages in thread
From: Wei Liu @ 2025-01-08 7:28 UTC (permalink / raw)
To: Michael Kelley
Cc: Naman Jain, K . Y . Srinivasan, Haiyang Zhang, Wei Liu,
Dexuan Cui, Greg Kroah-Hartman, linux-hyperv@vger.kernel.org,
linux-kernel@vger.kernel.org, Saurabh Sengar
On Wed, Jan 08, 2025 at 05:26:58AM +0000, Michael Kelley wrote:
> From: Naman Jain <namjain@linux.microsoft.com> Sent: Thursday, January 2, 2025 6:53 AM
> >
> > Receive and send buffer allocation was originally introduced to support
> > DPDK's networking use case. These buffer sizes were further increased to
> > meet DPDK performance requirements. However, these large buffers are
> > unnecessary for any other UIO use cases.
> > Restrict the allocation of receive and send buffers only for HV_NIC device
> > type, saving 47 MB of memory per device.
> >
> > While at it, fix some of the syntax related issues in the touched code
> > which are reported by "--strict" option of checkpatch.
> >
> > Signed-off-by: Naman Jain <namjain@linux.microsoft.com>
[...]
>
> Reviewed-by: Michael Kelley <mhklinux@outlook.com>
Applied to hyperv-next. Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-08 7:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-02 14:52 [PATCH v2] uio_hv_generic: Add a check for HV_NIC for send, receive buffers setup Naman Jain
2025-01-08 5:26 ` Michael Kelley
2025-01-08 7:28 ` Wei Liu
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).