From ac4fea75379467dde9065825d3f15da3b86e9ad8 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 23 Nov 2022 09:22:19 +0100 Subject: Revert "masm: Treat Android as generic Posix regarding mmap and friends" This reverts commit ffecc122d785de9c4c5defd8724526b8dd4982dc. It turns out that madvise() only fails when given MADV_WILLNEED as argument on the affected devices. MADV_WILLNEED is indeed optional. Since commit 2034e10c9378364ecc7aa1af27505562d86688de we do not crash on a failed MADV_WILLNEED anymore. Therefore, we can re-enable the linux code path for android. Pick-to: 6.4 6.2 5.15 Task-number: QTBUG-107774 Task-number: QTBUG-106864 Task-number: QTBUG-106269 Change-Id: If67a38e4fc206bd5d5ed0ef8bf66ededd09d8f59 Reviewed-by: Fabian Kosmale --- src/3rdparty/masm/wtf/OSAllocatorPosix.cpp | 23 +++++++---------------- src/qml/memory/qv4mm.cpp | 2 +- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp index b61782ff82..a8990a92b4 100644 --- a/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp +++ b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp @@ -36,16 +36,7 @@ #include #include -// Android does not really behave like linux here. -// For example, madvise() randomly fails if we pass MADV_WILLNEED or MADV_DONTNEED. -// Treat it as generic Posix. -#if OS(LINUX) && !defined(__ANDROID__) -#define NON_ANDROID_LINUX 1 -#else -#define NON_ANDROID_LINUX 0 -#endif - -#if NON_ANDROID_LINUX +#if OS(LINUX) #include #ifndef MFD_CLOEXEC #define MFD_CLOEXEC 0x0001U @@ -94,7 +85,7 @@ static int memfdForUsage(size_t bytes, OSAllocator::Usage usage) close(fd); return -1; } -#elif NON_ANDROID_LINUX +#elif OS(LINUX) static int memfdForUsage(size_t bytes, OSAllocator::Usage usage) { UNUSED_PARAM(bytes); @@ -113,7 +104,7 @@ void* OSAllocator::reserveUncommitted(size_t bytes, Usage usage, bool writable, void* result = mmap(0, bytes, PROT_NONE, MAP_LAZY | MAP_PRIVATE | MAP_ANON, -1, 0); if (result == MAP_FAILED) CRASH(); -#elif NON_ANDROID_LINUX +#elif OS(LINUX) UNUSED_PARAM(writable); UNUSED_PARAM(executable); int fd = memfdForUsage(bytes, usage); @@ -159,7 +150,7 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo #if OS(DARWIN) int fd = usage; -#elif NON_ANDROID_LINUX +#elif OS(LINUX) int fd = memfdForUsage(bytes, usage); if (fd != -1) flags &= ~MAP_ANON; @@ -207,7 +198,7 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo mmap(static_cast(result) + bytes - pageSize(), pageSize(), PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANON, fd, 0); } -#if NON_ANDROID_LINUX +#if OS(LINUX) if (fd != -1) close(fd); #endif @@ -225,7 +216,7 @@ void OSAllocator::commit(void* address, size_t bytes, bool writable, bool execut protection |= PROT_EXEC; if (MAP_FAILED == mmap(address, bytes, protection, MAP_FIXED | MAP_PRIVATE | MAP_ANON, -1, 0)) CRASH(); -#elif NON_ANDROID_LINUX +#elif OS(LINUX) int protection = PROT_READ; if (writable) protection |= PROT_WRITE; @@ -257,7 +248,7 @@ void OSAllocator::decommit(void* address, size_t bytes) #if OS(QNX) // Use PROT_NONE and MAP_LAZY to decommit the pages. mmap(address, bytes, PROT_NONE, MAP_FIXED | MAP_LAZY | MAP_PRIVATE | MAP_ANON, -1, 0); -#elif NON_ANDROID_LINUX +#elif OS(LINUX) while (madvise(address, bytes, MADV_DONTNEED)) { if (errno != EAGAIN) CRASH(); diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp index cbcfc4ca0d..3add05b95e 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -138,7 +138,7 @@ struct MemorySegment { size_t pageSize = WTF::pageSize(); size = (size + pageSize - 1) & ~(pageSize - 1); -#if (!defined(Q_OS_LINUX) && !defined(Q_OS_WIN)) || defined(Q_OS_ANDROID) +#if !defined(Q_OS_LINUX) && !defined(Q_OS_WIN) // Linux and Windows zero out pages that have been decommitted and get committed again. // unfortunately that's not true on other OSes (e.g. BSD based ones), so zero out the // memory before decommit, so that we can be sure that all chunks we allocate will be -- cgit v1.2.3