mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-22 21:32:31 +00:00
Rewrite brk() and sbrk()
This change reduces the .bss memory requirement for all executables by O(64kb). The brk system calls are now fully tested and figured out and might be useful for tiny programs that only target System Five.
This commit is contained in:
Justine Tunney
parent
bc8532688b
commit
5005f2e446
23 changed files with 643 additions and 294 deletions
|
|
@ -17,54 +17,21 @@
|
|||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/struct/sigaction.h"
|
||||
#include "libc/calls/struct/siginfo.h"
|
||||
#include "libc/calls/ucontext.h"
|
||||
#include "libc/dce.h"
|
||||
#include "libc/errno.h"
|
||||
#include "libc/intrin/atomic.h"
|
||||
#include "libc/runtime/memtrack.internal.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/sysv/consts/map.h"
|
||||
#include "libc/sysv/consts/o.h"
|
||||
#include "libc/sysv/consts/prot.h"
|
||||
#include "libc/sysv/consts/sa.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
#include "third_party/xed/x86.h"
|
||||
|
||||
volatile int gotsignal;
|
||||
char testlib_enable_tmp_setup_teardown;
|
||||
|
||||
void ContinueOnError(int sig, siginfo_t *si, void *vctx) {
|
||||
struct XedDecodedInst xedd;
|
||||
struct ucontext *ctx = vctx;
|
||||
xed_decoded_inst_zero_set_mode(&xedd, XED_MACHINE_MODE_LONG_64);
|
||||
xed_instruction_length_decode(&xedd, (void *)ctx->uc_mcontext.rip, 15);
|
||||
ctx->uc_mcontext.rip += xedd.length;
|
||||
gotsignal = sig;
|
||||
}
|
||||
|
||||
noasan bool MemoryExists(char *p) {
|
||||
volatile char c;
|
||||
struct sigaction old[2];
|
||||
struct sigaction sa = {
|
||||
.sa_sigaction = ContinueOnError,
|
||||
.sa_flags = SA_SIGINFO,
|
||||
};
|
||||
gotsignal = 0;
|
||||
sigaction(SIGSEGV, &sa, old + 0);
|
||||
sigaction(SIGBUS, &sa, old + 1);
|
||||
c = atomic_load(p);
|
||||
sigaction(SIGBUS, old + 1, 0);
|
||||
sigaction(SIGSEGV, old + 0, 0);
|
||||
return !gotsignal;
|
||||
}
|
||||
|
||||
TEST(munmap, doesntExist_doesntCare) {
|
||||
EXPECT_SYS(0, 0, munmap(0, FRAMESIZE * 8));
|
||||
if (IsAsan()) {
|
||||
// make sure it didn't unmap the null pointer shadow memory
|
||||
EXPECT_TRUE(MemoryExists((char *)0x7fff8000));
|
||||
EXPECT_TRUE(testlib_memoryexists((char *)0x7fff8000));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -78,27 +45,27 @@ TEST(munmap, test) {
|
|||
char *p;
|
||||
ASSERT_NE(MAP_FAILED, (p = mmap(0, FRAMESIZE, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)));
|
||||
EXPECT_TRUE(MemoryExists(p));
|
||||
EXPECT_TRUE(testlib_memoryexists(p));
|
||||
EXPECT_SYS(0, 0, munmap(p, FRAMESIZE));
|
||||
EXPECT_FALSE(MemoryExists(p));
|
||||
EXPECT_FALSE(testlib_memoryexists(p));
|
||||
}
|
||||
|
||||
TEST(munmap, punchHoleInMemory) {
|
||||
char *p;
|
||||
ASSERT_NE(MAP_FAILED, (p = mmap(0, FRAMESIZE * 3, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 2));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 2));
|
||||
EXPECT_SYS(0, 0, munmap(p + FRAMESIZE, FRAMESIZE));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 2));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 2));
|
||||
EXPECT_SYS(0, 0, munmap(p, FRAMESIZE));
|
||||
EXPECT_SYS(0, 0, munmap(p + FRAMESIZE * 2, FRAMESIZE));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 2));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 2));
|
||||
}
|
||||
|
||||
TEST(munmap, memoryHasHole) {
|
||||
|
|
@ -106,59 +73,59 @@ TEST(munmap, memoryHasHole) {
|
|||
ASSERT_NE(MAP_FAILED, (p = mmap(0, FRAMESIZE * 3, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)));
|
||||
EXPECT_SYS(0, 0, munmap(p + FRAMESIZE, FRAMESIZE));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 2));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 2));
|
||||
EXPECT_SYS(0, 0, munmap(p, FRAMESIZE * 3));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 2));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 2));
|
||||
}
|
||||
|
||||
TEST(munmap, blanketFree) {
|
||||
char *p;
|
||||
ASSERT_NE(MAP_FAILED, (p = mmap(0, FRAMESIZE * 3, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 2));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 2));
|
||||
EXPECT_SYS(0, 0, munmap(p + FRAMESIZE * 0, FRAMESIZE));
|
||||
EXPECT_SYS(0, 0, munmap(p + FRAMESIZE * 2, FRAMESIZE));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 2));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 2));
|
||||
EXPECT_SYS(0, 0, munmap(p, FRAMESIZE * 3));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 2));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 2));
|
||||
}
|
||||
|
||||
TEST(munmap, trimLeft) {
|
||||
char *p;
|
||||
ASSERT_NE(MAP_FAILED, (p = mmap(0, FRAMESIZE * 2, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_SYS(0, 0, munmap(p, FRAMESIZE));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_SYS(0, 0, munmap(p, FRAMESIZE * 2));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
}
|
||||
|
||||
TEST(munmap, trimRight) {
|
||||
char *p;
|
||||
ASSERT_NE(MAP_FAILED, (p = mmap(0, FRAMESIZE * 2, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_SYS(0, 0, munmap(p + FRAMESIZE, FRAMESIZE));
|
||||
EXPECT_TRUE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_TRUE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
EXPECT_SYS(0, 0, munmap(p, FRAMESIZE * 2));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(MemoryExists(p + FRAMESIZE * 1));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 0));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + FRAMESIZE * 1));
|
||||
}
|
||||
|
||||
TEST(munmap, memoryGone) {
|
||||
|
|
@ -174,9 +141,9 @@ TEST(munmap, testTooSmallToUnmapAsan) {
|
|||
char *p;
|
||||
ASSERT_NE(MAP_FAILED, (p = mmap(0, FRAMESIZE, PROT_READ | PROT_WRITE,
|
||||
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)));
|
||||
EXPECT_TRUE(MemoryExists((char *)(((intptr_t)p >> 3) + 0x7fff8000)));
|
||||
EXPECT_TRUE(testlib_memoryexists((char *)(((intptr_t)p >> 3) + 0x7fff8000)));
|
||||
EXPECT_SYS(0, 0, munmap(p, FRAMESIZE));
|
||||
EXPECT_TRUE(MemoryExists((char *)(((intptr_t)p >> 3) + 0x7fff8000)));
|
||||
EXPECT_TRUE(testlib_memoryexists((char *)(((intptr_t)p >> 3) + 0x7fff8000)));
|
||||
}
|
||||
|
||||
TEST(munmap, testLargeEnoughToUnmapAsan) {
|
||||
|
|
@ -195,7 +162,7 @@ TEST(munmap, testLargeEnoughToUnmapAsan) {
|
|||
EXPECT_SYS(0, 0, munmap(p, n));
|
||||
#if 0
|
||||
EXPECT_FALSE(
|
||||
MemoryExists((char *)(((intptr_t)(p + n / 2) >> 3) + 0x7fff8000)));
|
||||
testlib_memoryexists((char *)(((intptr_t)(p + n / 2) >> 3) + 0x7fff8000)));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -207,12 +174,12 @@ TEST(munmap, tinyFile_roundupUnmapSize) {
|
|||
ASSERT_SYS(0, 3, open("doge", O_RDONLY));
|
||||
ASSERT_NE(MAP_FAILED, (p = mmap(0, 5, PROT_READ, MAP_PRIVATE, 3, 0)));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
EXPECT_TRUE(MemoryExists(p));
|
||||
EXPECT_TRUE(testlib_memoryexists(p));
|
||||
// some kernels/versions support this, some don't
|
||||
EXPECT_FALSE(MemoryExists(p + PAGESIZE));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + PAGESIZE));
|
||||
EXPECT_SYS(0, 0, munmap(p, FRAMESIZE));
|
||||
EXPECT_FALSE(MemoryExists(p));
|
||||
EXPECT_FALSE(MemoryExists(p + 5));
|
||||
EXPECT_FALSE(testlib_memoryexists(p));
|
||||
EXPECT_FALSE(testlib_memoryexists(p + 5));
|
||||
}
|
||||
|
||||
TEST(munmap, tinyFile_preciseUnmapSize) {
|
||||
|
|
@ -224,13 +191,13 @@ TEST(munmap, tinyFile_preciseUnmapSize) {
|
|||
ASSERT_NE(MAP_FAILED, (p = mmap(0, 5, PROT_READ, MAP_PRIVATE, 3, 0)));
|
||||
ASSERT_NE(MAP_FAILED, (q = mmap(0, 5, PROT_READ, MAP_PRIVATE, 3, 0)));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
EXPECT_TRUE(MemoryExists(p));
|
||||
EXPECT_TRUE(MemoryExists(q));
|
||||
EXPECT_TRUE(testlib_memoryexists(p));
|
||||
EXPECT_TRUE(testlib_memoryexists(q));
|
||||
EXPECT_SYS(0, 0, munmap(p, 5));
|
||||
EXPECT_FALSE(MemoryExists(p));
|
||||
EXPECT_TRUE(MemoryExists(q));
|
||||
EXPECT_FALSE(testlib_memoryexists(p));
|
||||
EXPECT_TRUE(testlib_memoryexists(q));
|
||||
EXPECT_SYS(0, 0, munmap(q, 5));
|
||||
EXPECT_FALSE(MemoryExists(q));
|
||||
EXPECT_FALSE(testlib_memoryexists(q));
|
||||
}
|
||||
|
||||
// clang-format off
|
||||
|
|
@ -242,14 +209,14 @@ TEST(munmap, tinyFile_mapThriceUnmapOnce) {
|
|||
ASSERT_NE(MAP_FAILED, mmap(p+FRAMESIZE*1, 5, PROT_READ, MAP_PRIVATE|MAP_FIXED, 3, 0));
|
||||
ASSERT_NE(MAP_FAILED, mmap(p+FRAMESIZE*3, 5, PROT_READ, MAP_PRIVATE|MAP_FIXED, 3, 0));
|
||||
ASSERT_SYS(0, 0, close(3));
|
||||
EXPECT_TRUE(MemoryExists(p+FRAMESIZE*0));
|
||||
EXPECT_TRUE(MemoryExists(p+FRAMESIZE*1));
|
||||
EXPECT_FALSE(MemoryExists(p+FRAMESIZE*2));
|
||||
EXPECT_TRUE(MemoryExists(p+FRAMESIZE*3));
|
||||
EXPECT_TRUE(testlib_memoryexists(p+FRAMESIZE*0));
|
||||
EXPECT_TRUE(testlib_memoryexists(p+FRAMESIZE*1));
|
||||
EXPECT_FALSE(testlib_memoryexists(p+FRAMESIZE*2));
|
||||
EXPECT_TRUE(testlib_memoryexists(p+FRAMESIZE*3));
|
||||
EXPECT_SYS(0, 0, munmap(p, FRAMESIZE*5));
|
||||
EXPECT_FALSE(MemoryExists(p+FRAMESIZE*0));
|
||||
EXPECT_FALSE(MemoryExists(p+FRAMESIZE*1));
|
||||
EXPECT_FALSE(MemoryExists(p+FRAMESIZE*2));
|
||||
EXPECT_FALSE(MemoryExists(p+FRAMESIZE*3));
|
||||
EXPECT_FALSE(testlib_memoryexists(p+FRAMESIZE*0));
|
||||
EXPECT_FALSE(testlib_memoryexists(p+FRAMESIZE*1));
|
||||
EXPECT_FALSE(testlib_memoryexists(p+FRAMESIZE*2));
|
||||
EXPECT_FALSE(testlib_memoryexists(p+FRAMESIZE*3));
|
||||
}
|
||||
// clang-format on
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue