* [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements
@ 2020-10-21 17:38 Philippe Mathieu-Daudé
2020-10-21 17:38 ` [PATCH v5 1/2] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-21 17:38 UTC (permalink / raw)
To: Richard Henderson, qemu-devel
Cc: Paolo Bonzini, Philippe Mathieu-Daudé, Stefan Weil
- Use _aligned_malloc for qemu_try_memalign on win32
- Assert qemu_try_memalign() alignment is a power of 2
Since v4:
- Drop superfluous assert (Richard)
Philippe Mathieu-Daudé (1):
util/oslib: Assert qemu_try_memalign() alignment is a power of 2
Richard Henderson (1):
util/oslib-win32: Use _aligned_malloc for qemu_try_memalign
util/oslib-posix.c | 2 ++
util/oslib-win32.c | 12 +++++-------
2 files changed, 7 insertions(+), 7 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v5 1/2] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign
2020-10-21 17:38 [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements Philippe Mathieu-Daudé
@ 2020-10-21 17:38 ` Philippe Mathieu-Daudé
2020-10-21 17:38 ` [PATCH v5 2/2] util/oslib: Assert qemu_try_memalign() alignment is a power of 2 Philippe Mathieu-Daudé
2020-12-16 19:24 ` [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements Richard Henderson
2 siblings, 0 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-21 17:38 UTC (permalink / raw)
To: Richard Henderson, qemu-devel
Cc: Paolo Bonzini, Philippe Mathieu-Daudé,
Philippe Mathieu-Daudé,
Stefan Weil
From: Richard Henderson <richard.henderson@linaro.org>
We do not need or want to be allocating page sized quanta.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20201018164836.1149452-1-richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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 e99debfb8dd..29dd05d59d7 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.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v5 2/2] util/oslib: Assert qemu_try_memalign() alignment is a power of 2
2020-10-21 17:38 [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements Philippe Mathieu-Daudé
2020-10-21 17:38 ` [PATCH v5 1/2] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign Philippe Mathieu-Daudé
@ 2020-10-21 17:38 ` Philippe Mathieu-Daudé
2020-12-16 19:24 ` [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements Richard Henderson
2 siblings, 0 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-21 17:38 UTC (permalink / raw)
To: Richard Henderson, qemu-devel
Cc: Paolo Bonzini, Philippe Mathieu-Daudé, Stefan Weil
qemu_try_memalign() expects a power of 2 alignment:
- posix_memalign(3):
The address of the allocated memory will be a multiple of alignment,
which must be a power of two and a multiple of sizeof(void *).
- _aligned_malloc()
The alignment value, which must be an integer power of 2.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
util/oslib-posix.c | 2 ++
util/oslib-win32.c | 1 +
2 files changed, 3 insertions(+)
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index f15234b5c03..3e022d7206b 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -200,6 +200,8 @@ void *qemu_try_memalign(size_t alignment, size_t size)
if (alignment < sizeof(void*)) {
alignment = sizeof(void*);
+ } else {
+ g_assert(is_power_of_2(alignment));
}
#if defined(CONFIG_POSIX_MEMALIGN)
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 29dd05d59d7..72e4ee910ce 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -58,6 +58,7 @@ void *qemu_try_memalign(size_t alignment, size_t size)
void *ptr;
g_assert(size != 0);
+ g_assert(is_power_of_2(alignment));
ptr = _aligned_malloc(alignment, size);
trace_qemu_memalign(alignment, size, ptr);
return ptr;
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements
2020-10-21 17:38 [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements Philippe Mathieu-Daudé
2020-10-21 17:38 ` [PATCH v5 1/2] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign Philippe Mathieu-Daudé
2020-10-21 17:38 ` [PATCH v5 2/2] util/oslib: Assert qemu_try_memalign() alignment is a power of 2 Philippe Mathieu-Daudé
@ 2020-12-16 19:24 ` Richard Henderson
2021-01-05 0:06 ` Richard Henderson
2 siblings, 1 reply; 6+ messages in thread
From: Richard Henderson @ 2020-12-16 19:24 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Paolo Bonzini, Stefan Weil
On 10/21/20 12:38 PM, Philippe Mathieu-Daudé wrote:
> - Use _aligned_malloc for qemu_try_memalign on win32
> - Assert qemu_try_memalign() alignment is a power of 2
>
> Since v4:
> - Drop superfluous assert (Richard)
>
> Philippe Mathieu-Daudé (1):
> util/oslib: Assert qemu_try_memalign() alignment is a power of 2
>
> Richard Henderson (1):
> util/oslib-win32: Use _aligned_malloc for qemu_try_memalign
>
> util/oslib-posix.c | 2 ++
> util/oslib-win32.c | 12 +++++-------
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
Ping.
r~
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements
2020-12-16 19:24 ` [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements Richard Henderson
@ 2021-01-05 0:06 ` Richard Henderson
2021-01-05 9:56 ` Paolo Bonzini
0 siblings, 1 reply; 6+ messages in thread
From: Richard Henderson @ 2021-01-05 0:06 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Paolo Bonzini, Stefan Weil
On 12/16/20 9:24 AM, Richard Henderson wrote:
> On 10/21/20 12:38 PM, Philippe Mathieu-Daudé wrote:
>> - Use _aligned_malloc for qemu_try_memalign on win32
>> - Assert qemu_try_memalign() alignment is a power of 2
>>
>> Since v4:
>> - Drop superfluous assert (Richard)
>>
>> Philippe Mathieu-Daudé (1):
>> util/oslib: Assert qemu_try_memalign() alignment is a power of 2
>>
>> Richard Henderson (1):
>> util/oslib-win32: Use _aligned_malloc for qemu_try_memalign
>>
>> util/oslib-posix.c | 2 ++
>> util/oslib-win32.c | 12 +++++-------
>> 2 files changed, 7 insertions(+), 7 deletions(-)
>>
>
> Ping.
Ping2. Shall I just queue this to tcg-next?
r~
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements
2021-01-05 0:06 ` Richard Henderson
@ 2021-01-05 9:56 ` Paolo Bonzini
0 siblings, 0 replies; 6+ messages in thread
From: Paolo Bonzini @ 2021-01-05 9:56 UTC (permalink / raw)
To: Richard Henderson, Philippe Mathieu-Daudé, qemu-devel; +Cc: Stefan Weil
On 05/01/21 01:06, Richard Henderson wrote:
> On 12/16/20 9:24 AM, Richard Henderson wrote:
>> On 10/21/20 12:38 PM, Philippe Mathieu-Daudé wrote:
>>> - Use _aligned_malloc for qemu_try_memalign on win32
>>> - Assert qemu_try_memalign() alignment is a power of 2
>>>
>>> Since v4:
>>> - Drop superfluous assert (Richard)
>>>
>>> Philippe Mathieu-Daudé (1):
>>> util/oslib: Assert qemu_try_memalign() alignment is a power of 2
>>>
>>> Richard Henderson (1):
>>> util/oslib-win32: Use _aligned_malloc for qemu_try_memalign
>>>
>>> util/oslib-posix.c | 2 ++
>>> util/oslib-win32.c | 12 +++++-------
>>> 2 files changed, 7 insertions(+), 7 deletions(-)
>>>
>>
>> Ping.
>
> Ping2. Shall I just queue this to tcg-next?
Yes, just go ahead. util/ is everybody's land, maintainers are supposed
to know what they're doing. :)
Paolo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-05 10:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-21 17:38 [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements Philippe Mathieu-Daudé
2020-10-21 17:38 ` [PATCH v5 1/2] util/oslib-win32: Use _aligned_malloc for qemu_try_memalign Philippe Mathieu-Daudé
2020-10-21 17:38 ` [PATCH v5 2/2] util/oslib: Assert qemu_try_memalign() alignment is a power of 2 Philippe Mathieu-Daudé
2020-12-16 19:24 ` [PATCH v5 0/2] util/oslib: qemu_try_memalign() improvements Richard Henderson
2021-01-05 0:06 ` Richard Henderson
2021-01-05 9:56 ` Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.