| Message ID | 20210107201448.1152301-5-richard.henderson@linaro.org |
|---|---|
| State | Accepted |
| Commit | dfbd0b873a85021c083d9b4b84630c3732645963 |
| Headers | show |
| Series | tcg patch queue | expand |
> We do not need or want to be allocating page sized quanta. > > 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> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > 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 01787df74c..8adc651259 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); Hi Richard, this doesn't work really well. The _aligned_malloc parameters are swapped. ptr = _aligned_malloc(size, alignment) is correct. With best regards, Volker > 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)
On Sun, Jan 10, 2021 at 3:19 PM Volker Rümelin <vr_qemu@t-online.de> wrote: > > > We do not need or want to be allocating page sized quanta. > > > > 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> > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > > --- > > 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 01787df74c..8adc651259 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); > > Hi Richard, > > this doesn't work really well. The _aligned_malloc parameters are swapped. ptr = _aligned_malloc(size, alignment) is correct. > > With best regards, > Volker > > > 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) > > Dos this the cause of this failure? https://cirrus-ci.com/task/6055645751279616?command=test#L593 MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} G_TEST_SRCDIR=C:/Users/ContainerAdministrator/AppData/Local/Temp/cirrus-ci-build/tests G_TEST_BUILDDIR=C:/Users/ContainerAdministrator/AppData/Local/Temp/cirrus-ci-build/build/tests tests/test-qht.exe --tap -k ERROR test-qht - too few tests run (expected 2, got 0) make: *** [Makefile.mtest:256: run-test-30] Error 1 -- 此致 礼 罗勇刚 Yours sincerely, Yonggang Luo -- 此致 礼 罗勇刚 Yours sincerely, Yonggang Luo <div dir="ltr"><br><br>On Sun, Jan 10, 2021 at 3:19 PM Volker Rümelin <<a href="mailto:vr_qemu@t-online.de">vr_qemu@t-online.de</a>> wrote:<br>><br>> > We do not need or want to be allocating page sized quanta.<br>> ><br>> > Reviewed-by: Philippe Mathieu-Daudé <<a href="mailto:f4bug@amsat.org">f4bug@amsat.org</a>><br>> > Reviewed-by: Stefan Weil <<a href="mailto:sw@weilnetz.de">sw@weilnetz.de</a>><br>> > Message-Id: <<a href="mailto:20201018164836.1149452-1-richard.henderson@linaro.org">20201018164836.1149452-1-richard.henderson@linaro.org</a>><br>> > Signed-off-by: Philippe Mathieu-Daudé <<a href="mailto:philmd@redhat.com">philmd@redhat.com</a>><br>> > Signed-off-by: Richard Henderson <<a href="mailto:richard.henderson@linaro.org">richard.henderson@linaro.org</a>><br>> > ---<br>> > util/oslib-win32.c | 11 ++++-------<br>> > 1 file changed, 4 insertions(+), 7 deletions(-)<br>> ><br>> > diff --git a/util/oslib-win32.c b/util/oslib-win32.c<br>> > index 01787df74c..8adc651259 100644<br>> > --- a/util/oslib-win32.c<br>> > +++ b/util/oslib-win32.c<br>> > @@ -39,6 +39,7 @@<br>> > #include "trace.h"<br>> > #include "qemu/sockets.h"<br>> > #include "qemu/cutils.h"<br>> > +#include <malloc.h><br>> > <br>> > /* this must come after including "trace.h" */<br>> > #include <shlobj.h><br>> > @@ -56,10 +57,8 @@ void *qemu_try_memalign(size_t alignment, size_t size)<br>> > {<br>> > void *ptr;<br>> > <br>> > - if (!size) {<br>> > - abort();<br>> > - }<br>> > - ptr = VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE);<br>> > + g_assert(size != 0);<br>> > + ptr = _aligned_malloc(alignment, size);<br>><br>> Hi Richard,<br>><br>> this doesn't work really well. The _aligned_malloc parameters are swapped. ptr = _aligned_malloc(size, alignment) is correct.<br>><br>> With best regards,<br>> Volker<br>><br>> > trace_qemu_memalign(alignment, size, ptr);<br>> > return ptr;<br>> > }<br>> > @@ -93,9 +92,7 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared)<br>> > void qemu_vfree(void *ptr)<br>> > {<br>> > trace_qemu_vfree(ptr);<br>> > - if (ptr) {<br>> > - VirtualFree(ptr, 0, MEM_RELEASE);<br>> > - }<br>> > + _aligned_free(ptr);<br>> > }<br>> > <br>> > void qemu_anon_ram_free(void *ptr, size_t size)<br>><br>><br><br>Dos this the cause of this failure?<br><a href="https://cirrus-ci.com/task/6055645751279616?command=test#L593" target="_blank">https://cirrus-ci.com/task/6055645751279616?command=test#L593</a><br><br><br>MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} G_TEST_SRCDIR=C:/Users/ContainerAdministrator/AppData/Local/Temp/cirrus-ci-build/tests G_TEST_BUILDDIR=C:/Users/ContainerAdministrator/AppData/Local/Temp/cirrus-ci-build/build/tests tests/test-qht.exe --tap -k<br>ERROR test-qht - too few tests run (expected 2, got 0)<br>make: *** [Makefile.mtest:256: run-test-30] Error 1<br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo<div class="gmail-yj6qo"></div><div class="gmail-adL"><br></div><br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo</div>
diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 01787df74c..8adc651259 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)