* [PATCH v3] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign
@ 2020-10-18 16:48 Richard Henderson
2020-10-18 16:53 ` Stefan Weil
2020-10-18 18:34 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 4+ messages in thread
From: Richard Henderson @ 2020-10-18 16:48 UTC (permalink / raw)
To: qemu-devel; +Cc: sw
We do not need or want to be allocating page sized quanta.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
v3: Include <malloc.h>; use g_assert not assert.
---
util/oslib-win32.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index e99debfb8d..29dd05d59d 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -39,6 +39,7 @@
#include "trace.h"
#include "qemu/sockets.h"
#include "qemu/cutils.h"
+#include <malloc.h>
/* this must come after including "trace.h" */
#include <shlobj.h>
@@ -56,10 +57,8 @@ void *qemu_try_memalign(size_t alignment, size_t size)
{
void *ptr;
- if (!size) {
- abort();
- }
- ptr = VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE);
+ g_assert(size != 0);
+ ptr = _aligned_malloc(alignment, size);
trace_qemu_memalign(alignment, size, ptr);
return ptr;
}
@@ -93,9 +92,7 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared)
void qemu_vfree(void *ptr)
{
trace_qemu_vfree(ptr);
- if (ptr) {
- VirtualFree(ptr, 0, MEM_RELEASE);
- }
+ _aligned_free(ptr);
}
void qemu_anon_ram_free(void *ptr, size_t size)
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign
2020-10-18 16:48 [PATCH v3] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign Richard Henderson
@ 2020-10-18 16:53 ` Stefan Weil
2020-10-18 18:34 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 4+ messages in thread
From: Stefan Weil @ 2020-10-18 16:53 UTC (permalink / raw)
To: Richard Henderson, qemu-devel
Am 18.10.20 um 18:48 schrieb Richard Henderson:
> We do not need or want to be allocating page sized quanta.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> v3: Include <malloc.h>; use g_assert not assert.
> ---
> util/oslib-win32.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/util/oslib-win32.c b/util/oslib-win32.c
> index e99debfb8d..29dd05d59d 100644
> --- a/util/oslib-win32.c
> +++ b/util/oslib-win32.c
> @@ -39,6 +39,7 @@
> #include "trace.h"
> #include "qemu/sockets.h"
> #include "qemu/cutils.h"
> +#include <malloc.h>
>
> /* this must come after including "trace.h" */
> #include <shlobj.h>
> @@ -56,10 +57,8 @@ void *qemu_try_memalign(size_t alignment, size_t size)
> {
> void *ptr;
>
> - if (!size) {
> - abort();
> - }
> - ptr = VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE);
> + g_assert(size != 0);
> + ptr = _aligned_malloc(alignment, size);
> trace_qemu_memalign(alignment, size, ptr);
> return ptr;
> }
> @@ -93,9 +92,7 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared)
> void qemu_vfree(void *ptr)
> {
> trace_qemu_vfree(ptr);
> - if (ptr) {
> - VirtualFree(ptr, 0, MEM_RELEASE);
> - }
> + _aligned_free(ptr);
> }
>
> void qemu_anon_ram_free(void *ptr, size_t size)
Thanks.
Reviewed-by: Stefan Weil <sw@weilnetz.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign
2020-10-18 16:48 [PATCH v3] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign Richard Henderson
2020-10-18 16:53 ` Stefan Weil
@ 2020-10-18 18:34 ` Philippe Mathieu-Daudé
2020-10-18 18:38 ` Richard Henderson
1 sibling, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-18 18:34 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: sw
On 10/18/20 6:48 PM, Richard Henderson wrote:
> We do not need or want to be allocating page sized quanta.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> v3: Include <malloc.h>; use g_assert not assert.
> ---
> util/oslib-win32.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/util/oslib-win32.c b/util/oslib-win32.c
> index e99debfb8d..29dd05d59d 100644
> --- a/util/oslib-win32.c
> +++ b/util/oslib-win32.c
> @@ -39,6 +39,7 @@
> #include "trace.h"
> #include "qemu/sockets.h"
> #include "qemu/cutils.h"
> +#include <malloc.h>
>
> /* this must come after including "trace.h" */
> #include <shlobj.h>
> @@ -56,10 +57,8 @@ void *qemu_try_memalign(size_t alignment, size_t size)
> {
> void *ptr;
>
> - if (!size) {
> - abort();
> - }
> - ptr = VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE);
> + g_assert(size != 0);
"The alignment value, which must be an integer power of 2.",
so maybe:
g_assert(size != 0 && is_power_of_2(alignment));
Regardless:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> + ptr = _aligned_malloc(alignment, size);
> trace_qemu_memalign(alignment, size, ptr);
> return ptr;
> }
> @@ -93,9 +92,7 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared)
> void qemu_vfree(void *ptr)
> {
> trace_qemu_vfree(ptr);
> - if (ptr) {
> - VirtualFree(ptr, 0, MEM_RELEASE);
> - }
> + _aligned_free(ptr);
> }
>
> void qemu_anon_ram_free(void *ptr, size_t size)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign
2020-10-18 18:34 ` Philippe Mathieu-Daudé
@ 2020-10-18 18:38 ` Richard Henderson
0 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2020-10-18 18:38 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: sw
On 10/18/20 11:34 AM, Philippe Mathieu-Daudé wrote:
>> + g_assert(size != 0);
>
> "The alignment value, which must be an integer power of 2.",
> so maybe:
>
> g_assert(size != 0 && is_power_of_2(alignment));
This is also true of posix_memalign. If we are going to add this, we should
also assert in the other qemu_try_memalign.
r~
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-18 18:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-18 16:48 [PATCH v3] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign Richard Henderson
2020-10-18 16:53 ` Stefan Weil
2020-10-18 18:34 ` Philippe Mathieu-Daudé
2020-10-18 18:38 ` Richard Henderson
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).