minhtrannhat/os161
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging in 2.0.2.

Browse Source
This commit is contained in:
Geoffrey Challen
2017-01-09 22:37:50 -05:00
parent a0406ec181
commit 50cf3276e7
118 changed files with 1350 additions and 3158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

298
userland/testbin/sbrktest/sbrktest.c
View File

@@ -35,7 +35,6 @@
#include <unistd.h>
#include <err.h>
#include <errno.h>
#include <test161/test161.h>
#define _PATH_RANDOM "random:"
@@ -63,7 +62,7 @@ geti(void)
break;
}
else if ((ch=='\b' || ch==127) && digits>0) {
tprintf("\b \b");
printf("\b \b");
val = val/10;
digits--;
}
@@ -142,7 +141,7 @@ static
void
say(const char *msg)
{
/* Use one write so it's atomic (tprintf usually won't be) */
/* Use one write so it's atomic (printf usually won't be) */
write(STDOUT_FILENO, msg, strlen(msg));
}
@@ -195,9 +194,9 @@ checkpage(volatile void *baseptr, unsigned pageoffset, bool neednl)
val = ((unsigned long)i ^ (unsigned long)pageoffset);
if (pl[i] != val) {
if (neednl) {
tprintf("\n");
printf("\n");
}
tprintf("FAILED: data mismatch at offset %lu of page "
printf("FAILED: data mismatch at offset %lu of page "
"at 0x%lx: %lu vs. %lu\n",
(unsigned long) (i*sizeof(unsigned long)),
(unsigned long)(uintptr_t)pl,
@@ -242,9 +241,9 @@ checkpagelight(volatile void *baseptr, unsigned pageoffset, bool neednl)
pl = (volatile unsigned long *)pageptr;
if (pl[0] != pageoffset) {
if (neednl) {
tprintf("\n");
printf("\n");
}
tprintf("FAILED: data mismatch at offset 0 of page "
printf("FAILED: data mismatch at offset 0 of page "
"at 0x%lx: %lu vs. %u\n",
(unsigned long)(uintptr_t)pl,
pl[0], pageoffset);
@@ -272,37 +271,6 @@ dosbrk(ssize_t size)
return p;
}
////////////////////////////////////////////////////////////
// fork a child that segfaults
typedef void (*segfault_fn)(void);
static
void
expect_segfault(segfault_fn func)
{
int status;
int result;
pid_t pid = dofork();
if (pid == 0) {
func(); // This exits
} else {
result = waitpid(pid, &status, 0);
if (result == -1) {
err(1, "waitpid");
}
else if (WIFSIGNALED(status)) {
if (WTERMSIG(status) != 11) {
errx(1, "child: Signal %d", WTERMSIG(status));
}
}
else {
errx(1, "child exited, expected segfault");
}
}
}
////////////////////////////////////////////////////////////
// align the heap
@@ -349,13 +317,14 @@ test1(void)
{
void *p;
tprintf("Allocating a page...\n");
printf("Allocating a page...\n");
p = dosbrk(PAGE_SIZE);
markpage(p, 0);
if (checkpage(p, 0, false)) {
errx(1, "FAILED: data corrupt");
}
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk test 1.\n");
}
/*
@@ -369,7 +338,7 @@ test2(void)
op = dosbrk(0);
tprintf("Allocating a page...\n");
printf("Allocating a page...\n");
p = dosbrk(PAGE_SIZE);
if (p != op) {
errx(1, "FAILED: sbrk grow didn't return the old break "
@@ -382,7 +351,7 @@ test2(void)
p = dosbrk(0);
tprintf("Freeing the page...\n");
printf("Freeing the page...\n");
q = dosbrk(-PAGE_SIZE);
if (q != p) {
errx(1, "FAILED: sbrk shrink didn't return the old break "
@@ -393,7 +362,8 @@ test2(void)
errx(1, "FAILED: sbrk shrink didn't restore the heap "
"(got %p, expected %p", q, op);
}
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk test 2.\n");
}
/*
@@ -412,7 +382,7 @@ test3(void)
op = dosbrk(0);
tprintf("Allocating %u pages...\n", num);
printf("Allocating %u pages...\n", num);
p = dosbrk(PAGE_SIZE * num);
if (p != op) {
errx(1, "FAILED: sbrk grow didn't return the old break "
@@ -433,7 +403,7 @@ test3(void)
p = dosbrk(0);
tprintf("Freeing the pages...\n");
printf("Freeing the pages...\n");
q = dosbrk(-PAGE_SIZE * num);
if (q != p) {
errx(1, "FAILED: sbrk shrink didn't return the old break "
@@ -444,7 +414,8 @@ test3(void)
errx(1, "FAILED: sbrk shrink didn't restore the heap "
"(got %p, expected %p", q, op);
}
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk test 3.\n");
}
/*
@@ -464,7 +435,7 @@ test4(void)
op = dosbrk(0);
tprintf("Allocating %u pages...\n", num);
printf("Allocating %u pages...\n", num);
p = dosbrk(PAGE_SIZE * num);
if (p != op) {
errx(1, "FAILED: sbrk grow didn't return the old break "
@@ -483,7 +454,7 @@ test4(void)
exit(1);
}
tprintf("Freeing the pages one at a time...\n");
printf("Freeing the pages one at a time...\n");
for (i=num; i-- > 0; ) {
(void)dosbrk(-PAGE_SIZE);
for (j=0; j<i; j++) {
@@ -503,7 +474,8 @@ test4(void)
errx(1, "FAILED: sbrk shrink didn't restore the heap "
"(got %p, expected %p", q, op);
}
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk test 4.\n");
}
////////////////////////////////////////////////////////////
@@ -515,75 +487,51 @@ test4(void)
*/
static
void
test5_helper(void)
test5(void)
{
void *p;
p = dosbrk(0);
tprintf("This should produce fatal signal 11 (SIGSEGV).\n");
printf("This should produce fatal signal 11 (SIGSEGV).\n");
((long *)p)[10] = 0;
errx(1, "FAILED: I didn't crash");
}
static
void
test5(void)
{
expect_segfault(test5_helper);
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
}
/*
* Allocates a page and checks that the next page past it is not
* valid. (Crashes when successful.)
*/
static
void
test6_helper(void)
test6(void)
{
void *p;
(void)dosbrk(PAGE_SIZE);
p = dosbrk(0);
tprintf("This should produce fatal signal 11 (SIGSEGV).\n");
printf("This should produce fatal signal 11 (SIGSEGV).\n");
((long *)p)[10] = 0;
errx(1, "FAILED: I didn't crash");
}
static
void
test6(void)
{
expect_segfault(test6_helper);
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
}
/*
* Allocates and frees a page and checks that the page freed is no
* longer valid. (Crashes when successful.)
*/
static
void
test7_helper(void)
test7(void)
{
void *p;
(void)dosbrk(PAGE_SIZE);
(void)dosbrk(-PAGE_SIZE);
p = dosbrk(0);
tprintf("This should produce fatal signal 11 (SIGSEGV).\n");
printf("This should produce fatal signal 11 (SIGSEGV).\n");
((long *)p)[10] = 0;
errx(1, "FAILED: I didn't crash");
}
static
void
test7(void)
{
expect_segfault(test7_helper);
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
}
/*
* Allocates some pages, frees half of them, and checks that the page
* past the new end of the heap is no longer valid. (Crashes when
@@ -591,26 +539,18 @@ test7(void)
*/
static
void
test8_helper(void)
test8(void)
{
void *p;
(void)dosbrk(PAGE_SIZE * 12);
(void)dosbrk(-PAGE_SIZE * 6);
p = dosbrk(0);
tprintf("This should produce fatal signal 11 (SIGSEGV).\n");
printf("This should produce fatal signal 11 (SIGSEGV).\n");
((long *)p)[10] = 0;
errx(1, "FAILED: I didn't crash");
}
static
void
test8(void)
{
expect_segfault(test8_helper);
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
}
////////////////////////////////////////////////////////////
// heap size
@@ -648,38 +588,38 @@ test9(void)
#define HUGESIZE (1024 * 1024 * 1024) /* 1G */
tprintf("Checking how much memory we can allocate:\n");
printf("Checking how much memory we can allocate:\n");
for (size = HUGESIZE; (p = sbrk(size)) == (void *)-1; size = size/2) {
tprintf(" %9lu bytes: failed\n", (unsigned long) size);
printf(" %9lu bytes: failed\n", (unsigned long) size);
}
tprintf(" %9lu bytes: succeeded\n", (unsigned long) size);
tprintf("Passed sbrk test 9 (part 1/5)\n");
printf(" %9lu bytes: succeeded\n", (unsigned long) size);
printf("Passed sbrk test 9 (part 1/5)\n");
tprintf("Touching each page.\n");
printf("Touching each page.\n");
pages = size / PAGE_SIZE;
dot = pages / 64;
for (i=0; i<pages; i++) {
markpagelight(p, i);
if (dot > 0) {
TEST161_LPROGRESS_N(i, dot);
if (dot > 0 && i % dot == 0) {
printf(".");
}
}
if (dot > 0) {
printf("\n");
}
tprintf("Testing each page.\n");
printf("Testing each page.\n");
bad = false;
for (i=0; i<pages; i++) {
if (checkpagelight(p, i, dot > 0)) {
if (dot > 0) {
tprintf("\n");
printf("\n");
}
warnx("FAILED: data corrupt");
bad = true;
}
if (dot > 0) {
TEST161_LPROGRESS_N(i, dot);
if (dot > 0 && i % dot == 0) {
printf(".");
}
}
if (dot > 0) {
@@ -688,20 +628,19 @@ test9(void)
if (bad) {
exit(1);
}
tprintf("Passed sbrk test 9 (part 2/5)\n");
printf("Passed sbrk test 9 (part 2/5)\n");
tprintf("Freeing the memory.\n");
printf("Freeing the memory.\n");
(void)dosbrk(-size);
tprintf("Passed sbrk test 9 (part 3/5)\n");
printf("Passed sbrk test 9 (part 3/5)\n");
tprintf("Allocating the memory again.\n");
printf("Allocating the memory again.\n");
(void)dosbrk(size);
tprintf("Passed sbrk test 9 (part 4/5)\n");
printf("Passed sbrk test 9 (part 4/5)\n");
tprintf("And really freeing it.\n");
printf("And really freeing it.\n");
(void)dosbrk(-size);
tprintf("Passed sbrk test 9 (all)\n");
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk test 9 (all)\n");
}
/*
@@ -716,16 +655,16 @@ test10(void)
unsigned i, n;
bool bad;
tprintf("Allocating all of memory one page at a time:\n");
printf("Allocating all of memory one page at a time:\n");
op = dosbrk(0);
n = 0;
while ((p = sbrk(PAGE_SIZE)) != (void *)-1) {
markpagelight(op, n);
n++;
}
tprintf("Got %u pages (%zu bytes).\n", n, (size_t)PAGE_SIZE * n);
printf("Got %u pages (%zu bytes).\n", n, (size_t)PAGE_SIZE * n);
tprintf("Now freeing them.\n");
printf("Now freeing them.\n");
bad = false;
for (i=0; i<n; i++) {
if (checkpagelight(op, n - i - 1, false)) {
@@ -737,14 +676,14 @@ test10(void)
if (bad) {
exit(1);
}
tprintf("Freed %u pages.\n", n);
printf("Freed %u pages.\n", n);
p = dosbrk(0);
if (p != op) {
errx(1, "FAILURE: break did not return to original value");
}
tprintf("Now let's see if I can allocate another page.\n");
printf("Now let's see if I can allocate another page.\n");
p = dosbrk(PAGE_SIZE);
markpage(p, 0);
if (checkpage(p, 0, false)) {
@@ -752,8 +691,7 @@ test10(void)
}
(void)dosbrk(-PAGE_SIZE);
tprintf("Passed sbrk test 10.\n");
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk test 10.\n");
}
////////////////////////////////////////////////////////////
@@ -769,34 +707,37 @@ test11(void)
unsigned i;
bool bad;
tprintf("Allocating %u pages (%zu bytes).\n", num,
printf("Allocating %u pages (%zu bytes).\n", num,
(size_t)PAGE_SIZE * num);
p = dosbrk(num * PAGE_SIZE);
tprintf("Touching the pages.\n");
printf("Touching the pages.\n");
for (i=0; i<num; i++) {
markpagelight(p, i);
TEST161_LPROGRESS_N(i, 4);
if (i % 4 == 0) {
printf(".");
}
}
tprintf("\n");
printf("\n");
tprintf("Checking the pages.\n");
printf("Checking the pages.\n");
bad = false;
for (i=0; i<num; i++) {
if (checkpagelight(p, i, true)) {
warnx("FAILED: data corrupt");
bad = true;
}
TEST161_LPROGRESS_N(i, 4);
if (i % 4 == 0) {
printf(".");
}
}
printf("\n");
if (bad) {
exit(1);
}
tprintf("Now NOT freeing the pages. They should get freed on exit.\n");
tprintf("If not, you'll notice pretty quickly.\n");
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Now NOT freeing the pages. They should get freed on exit.\n");
printf("If not, you'll notice pretty quickly.\n");
}
////////////////////////////////////////////////////////////
@@ -815,7 +756,7 @@ test12(void)
pid_t pid;
void *p;
tprintf("Forking...\n");
printf("Forking...\n");
pid = dofork();
if (pid == 0) {
/* child */
@@ -837,8 +778,7 @@ test12(void)
}
say("Parent done.\n");
dowait(pid);
tprintf("Passed sbrk test 12.\n");
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk test 12.\n");
}
/*
@@ -851,14 +791,14 @@ test13(void)
pid_t pid;
void *p;
tprintf("Allocating a page...\n");
printf("Allocating a page...\n");
p = dosbrk(PAGE_SIZE);
markpage(p, 0);
if (checkpage(p, 0, false)) {
errx(1, "FAILED: data corrupt before forking");
}
tprintf("Forking...\n");
printf("Forking...\n");
pid = dofork();
if (pid == 0) {
/* child */
@@ -871,8 +811,7 @@ test13(void)
errx(1, "FAILED: data corrupt in parent");
}
dowait(pid);
tprintf("Passed sbrk test 13.\n");
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk test 13.\n");
}
/*
@@ -885,21 +824,21 @@ test14(void)
pid_t pid;
void *p;
tprintf("Allocating a page...\n");
printf("Allocating a page...\n");
p = dosbrk(PAGE_SIZE);
markpage(p, 0);
if (checkpage(p, 0, false)) {
errx(1, "FAILED: data corrupt before forking");
}
tprintf("Forking...\n");
printf("Forking...\n");
pid = dofork();
if (pid == 0) {
/* child */
if (checkpage(p, 0, false)) {
errx(1, "FAILED: data corrupt in child");
}
tprintf("Child freeing a page...\n");
printf("Child freeing a page...\n");
dosbrk(-PAGE_SIZE);
exit(0);
}
@@ -907,8 +846,7 @@ test14(void)
if (checkpage(p, 0, false)) {
errx(1, "FAILED: data corrupt in parent after child ran");
}
tprintf("Passed sbrk test 14.\n");
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk test 14.\n");
}
/*
@@ -925,7 +863,7 @@ test15(void)
unsigned i;
void *p;
tprintf("Allocating %u pages...\n", num);
printf("Allocating %u pages...\n", num);
p = dosbrk(PAGE_SIZE * num);
for (i=0; i<num; i++) {
markpage(p, i);
@@ -936,7 +874,7 @@ test15(void)
}
}
tprintf("Freeing one page...\n");
printf("Freeing one page...\n");
(void)dosbrk(-PAGE_SIZE);
num--;
for (i=0; i<num; i++) {
@@ -945,7 +883,7 @@ test15(void)
}
}
tprintf("Allocating two pages...\n");
printf("Allocating two pages...\n");
(void)dosbrk(PAGE_SIZE * 2);
markpage(p, num++);
markpage(p, num++);
@@ -955,7 +893,7 @@ test15(void)
}
}
tprintf("Forking...\n");
printf("Forking...\n");
pid = dofork();
if (pid == 0) {
/* child */
@@ -1009,9 +947,7 @@ test15(void)
}
(void)dosbrk(-PAGE_SIZE * num);
tprintf("Passed sbrk test 15.\n");
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk test 15.\n");
}
////////////////////////////////////////////////////////////
@@ -1031,7 +967,7 @@ stresstest(unsigned long seed, bool large)
bool bad, neg;
srandom(seed);
tprintf("Seeded random number generator with %lu.\n", seed);
printf("Seeded random number generator with %lu.\n", seed);
op = dosbrk(0);
@@ -1063,12 +999,14 @@ stresstest(unsigned long seed, bool large)
}
for (j=0; j<num; j++) {
if (checkpagelight(op, j, true)) {
tprintf("\n");
printf("\n");
warnx("FAILED: data corrupt on page %u", j);
bad = true;
}
}
TEST161_LPROGRESS_N(i, dot);
if (i % dot == 0) {
printf(".");
}
}
printf("\n");
if (bad) {
@@ -1077,8 +1015,7 @@ stresstest(unsigned long seed, bool large)
}
dosbrk(-(num * PAGE_SIZE));
tprintf("Passed sbrk %s stress test.\n", large ? "large" : "small");
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
printf("Passed sbrk %s stress test.\n", large ? "large" : "small");
}
static
@@ -1099,7 +1036,7 @@ static
void
test18(void)
{
tprintf("Enter random seed: ");
printf("Enter random seed: ");
stresstest(geti(), false);
}
@@ -1121,65 +1058,10 @@ static
void
test21(void)
{
tprintf("Enter random seed: ");
printf("Enter random seed: ");
stresstest(geti(), true);
}
static
void
test22(void)
{
int i;
void *p, *q;
int num = 10;
int num_pages = 5 * 1024; // 20MB
p = dosbrk(num_pages * PAGE_SIZE);
q = dosbrk(0);
if ((unsigned int)q - (unsigned int)p != (unsigned int)(num_pages*PAGE_SIZE)) {
errx(1, "Heap size not equal to expected size: p=0x%x q=0x%x", (unsigned int)p, (unsigned int)q);
}
// Just touch the last 10 pages
for (i = 0; i < num; i++) {
markpage(p, num_pages-(i+1));
}
// Check the last 10 pages
for (i = 0; i < num; i++) {
if (checkpage(p, num_pages-(i+1), false)) {
errx(1, "FAILED: data corrupt");
}
}
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
}
static
void
test23(void)
{
// Make sure sbrk is freeing memory. This allocates, in total, just over 4M
// of memory, but moves the heap breakpoint in such a way that only one page
// should ever be required. This test doesn't make much sense to run with
// more than 4M or with swap enabled.
void *start;
int num_pages = 1030;
int num;
start = dosbrk(PAGE_SIZE);
for (num = 1; num <= num_pages; num++) {
TEST161_LPROGRESS(num);
start = dosbrk(num*PAGE_SIZE);
markpagelight(start, num-1);
checkpagelight(start, num-1, true);
dosbrk(-(num*PAGE_SIZE));
}
success(TEST161_SUCCESS, SECRET, "/testbin/sbrktest");
}
////////////////////////////////////////////////////////////
// main
@@ -1209,8 +1091,6 @@ static const struct {
{ 19, "Large stress test", test19 },
{ 20, "Randomized large stress test", test20 },
{ 21, "Large stress test with particular seed", test21 },
{ 22, "Large sbrk test", test22 },
{ 23, "Allocate 4MB in total, but free pages in between", test23 },
};
static const unsigned numtests = sizeof(tests) / sizeof(tests[0]);
@@ -1248,12 +1128,12 @@ main(int argc, char *argv[])
while (1) {
if (menu) {
for (j=0; j<numtests; j++) {
tprintf(" %2d %s\n", tests[j].num,
printf(" %2d %s\n", tests[j].num,
tests[j].desc);
}
menu = false;
}
tprintf("sbrktest: ");
printf("sbrktest: ");
tn = geti();
if (tn < 0) {
break;