1.1 --- a/tests/dstest_exec.cc Tue Apr 26 23:15:30 2022 +0200
1.2 +++ b/tests/dstest_exec.cc Sun May 01 01:07:25 2022 +0200
1.3 @@ -24,6 +24,8 @@
1.4 #include <l4/sys/factory.h>
1.5 #include <l4/sys/task.h>
1.6 #include <l4/sys/thread.h>
1.7 +#include <l4/util/elf.h>
1.8 +#include <l4/util/util.h>
1.9
1.10 #include <fsclient/client.h>
1.11 #include <ipc/cap_alloc.h>
1.12 @@ -32,6 +34,8 @@
1.13 #include <mem/memory_utils.h>
1.14 #include <systypes/fcntl.h>
1.15
1.16 +#include <map>
1.17 +
1.18 #include <stdio.h>
1.19 #include <stdlib.h>
1.20 #include <string.h>
1.21 @@ -39,67 +43,271 @@
1.22 #include <pthread-l4.h>
1.23 #include <pthread.h>
1.24
1.25 -#include "system_pager_interface.h"
1.26 -#include "system_pager_server.h"
1.27 +#include "pager_object_interface.h"
1.28 +#include "pager_object_server.h"
1.29
1.30
1.31
1.32 -/* A simple system pager. */
1.33 +/* Region data structures. */
1.34
1.35 -class ExecPager : public SystemPager
1.36 +class Region
1.37 {
1.38 public:
1.39 - l4_addr_t buf, buf_start;
1.40 - unsigned int buf_log2size;
1.41 + l4_addr_t start;
1.42 + unsigned int log2size;
1.43 + l4_umword_t flags;
1.44 + l4_addr_t map_start;
1.45 +
1.46 + explicit Region()
1.47 + : start(0), log2size(0), flags(0), map_start(0)
1.48 + {
1.49 + }
1.50 +
1.51 + explicit Region(l4_addr_t start, unsigned int log2size, l4_umword_t flags,
1.52 + l4_addr_t map_start)
1.53 + : start(start), log2size(log2size), flags(flags), map_start(map_start)
1.54 + {
1.55 + }
1.56 +};
1.57 +
1.58 +typedef std::map<l4_addr_t, Region> Regions;
1.59 +
1.60 +
1.61 +
1.62 +/* A simple system pager also acting as a region mapper. */
1.63 +
1.64 +class ExecPager : public PagerObject
1.65 +{
1.66 +protected:
1.67 + Regions _regions;
1.68 +
1.69 +public:
1.70 + virtual void add(Region region)
1.71 + {
1.72 + _regions[region.map_start] = region;
1.73 + }
1.74 +
1.75 + /* Notification methods. */
1.76
1.77 virtual long exception(l4_exc_regs_t regs,
1.78 l4_snd_fpage_t *region);
1.79
1.80 virtual long page_fault(l4_umword_t pfa, l4_umword_t pc,
1.81 l4_snd_fpage_t *region);
1.82 +
1.83 + /* Region manager/mapper methods. */
1.84 +
1.85 + virtual long attach(address_t *start, offset_t size, map_flags_t flags,
1.86 + l4_cap_idx_t ds, address_t offset, unsigned char align);
1.87 +
1.88 };
1.89
1.90 +/* Handle a general exception. */
1.91 +
1.92 long ExecPager::exception(l4_exc_regs_t regs, l4_snd_fpage_t *region)
1.93 {
1.94 (void) region;
1.95
1.96 printf("exception(...) -> pfa = %lx, pc = %lx\n", l4_utcb_exc_pfa(®s), l4_utcb_exc_pc(®s));
1.97 +
1.98 + printf("r15 = %lx\n", regs.r15);
1.99 + printf("r14 = %lx\n", regs.r14);
1.100 + printf("r13 = %lx\n", regs.r13);
1.101 + printf("r12 = %lx\n", regs.r12);
1.102 + printf("r11 = %lx\n", regs.r11);
1.103 + printf("r10 = %lx\n", regs.r10);
1.104 + printf("r9 = %lx\n", regs.r9);
1.105 + printf("r8 = %lx\n", regs.r8);
1.106 + printf("rdi = %lx\n", regs.rdi);
1.107 + printf("rsi = %lx\n", regs.rsi);
1.108 + printf("rbp = %lx\n", regs.rbp);
1.109 + printf("pfa = %lx\n", regs.pfa);
1.110 + printf("rbx = %lx\n", regs.rbx);
1.111 + printf("rdx = %lx\n", regs.rdx);
1.112 + printf("rcx = %lx\n", regs.rcx);
1.113 + printf("rax = %lx\n", regs.rax);
1.114 + printf("trapno = %lx\n", regs.trapno);
1.115 + printf("err = %lx\n", regs.err);
1.116 + printf("ip = %lx\n", regs.ip);
1.117 + printf("flags = %lx\n", regs.flags);
1.118 + printf("sp = %lx\n", regs.sp);
1.119 + printf("ss = %lx\n", regs.ss);
1.120 + printf("fs_base = %lx\n", regs.fs_base);
1.121 + printf("gs_base = %lx\n", regs.gs_base);
1.122 +
1.123 return L4_EOK;
1.124 }
1.125
1.126 +/* Handle a page fault using any configured regions. */
1.127 +
1.128 long ExecPager::page_fault(l4_umword_t pfa, l4_umword_t pc, l4_snd_fpage_t *region)
1.129 {
1.130 l4_umword_t addr = pfa & ~7UL, flags = pfa & 7;
1.131
1.132 - printf("page_fault(%lx, %lx) -> %lx (%lx)...\n", pfa, pc, addr, flags);
1.133 +#if 0
1.134 + printf("page_fault(%lx, %lx) -> %lx (%lx) -> ", pfa, pc, addr, flags);
1.135 +#endif
1.136 +
1.137 + Regions::iterator it = _regions.upper_bound(addr);
1.138 +
1.139 + if (it != _regions.begin())
1.140 + it--;
1.141 + else
1.142 + {
1.143 + printf("not mapped!\n");
1.144 + return -L4_ENOMEM;
1.145 + }
1.146 +
1.147 + Region &r = it->second;
1.148
1.149 - if ((addr >= buf_start) && (addr < buf_start + (1UL << buf_log2size)))
1.150 + if ((addr >= r.map_start) && (addr < r.map_start + (1UL << r.log2size)))
1.151 {
1.152 - region->fpage = l4_fpage(buf, buf_log2size, L4_FPAGE_RX);
1.153 - region->snd_base = buf_start;
1.154 + l4_addr_t page_addr = trunc(addr, L4_PAGESIZE);
1.155 +
1.156 + region->fpage = l4_fpage(r.start + (page_addr - r.map_start), L4_PAGESHIFT, r.flags);
1.157 + region->snd_base = page_addr;
1.158 +
1.159 +#if 0
1.160 + printf("%lx...%lx from %lx...%lx size %d rights %x\n",
1.161 + r.map_start, region->snd_base,
1.162 + r.start, l4_fpage_memaddr(region->fpage),
1.163 + l4_fpage_size(region->fpage),
1.164 + l4_fpage_rights(region->fpage));
1.165 + printf("%lx -> ", addr);
1.166 +
1.167 + for (unsigned int i = 0; i < sizeof(l4_umword_t); i++)
1.168 + printf("%02x", *((unsigned char *)(r.start + (addr - r.map_start) + i)));
1.169 +
1.170 + printf("\n");
1.171 +#endif
1.172
1.173 return L4_EOK;
1.174 }
1.175
1.176 +#if 0
1.177 + printf("not mapped!\n");
1.178 +#endif
1.179 +
1.180 return -L4_ENOMEM;
1.181 }
1.182
1.183 +/* Attach a region for provision when page faults occur. This is required in
1.184 + the initialisation of a program by the C library which requires a region
1.185 + mapper. */
1.186 +
1.187 +long ExecPager::attach(address_t *start, offset_t size, map_flags_t flags,
1.188 + l4_cap_idx_t ds, address_t offset, unsigned char align)
1.189 +{
1.190 +#if 0
1.191 + printf("attach(%lx, %ld, %lx, ..., %lx, %d)\n", *start, size, flags, offset, align);
1.192 +#endif
1.193 +
1.194 + if (align < L4_PAGESHIFT)
1.195 + align = L4_PAGESHIFT;
1.196 +
1.197 + offset_t increment = 1UL << align;
1.198 + offset_t region_size = round(size, increment);
1.199 +
1.200 + /* Either attempt to find an address for the specified region, starting from
1.201 + any indicated address. */
1.202 +
1.203 + if (flags & L4RE_RM_F_SEARCH_ADDR)
1.204 + {
1.205 + address_t region_start = trunc(*start, increment);
1.206 + Regions::iterator it = _regions.upper_bound(*start);
1.207 +
1.208 + if (!region_start)
1.209 + region_start += increment;
1.210 +
1.211 +#if 0
1.212 + printf("-> search from %lx -> %lx...\n", *start, region_start);
1.213 +#endif
1.214 +
1.215 + /* Before last known region. */
1.216 +
1.217 + while (it != _regions.end())
1.218 + {
1.219 + Regions::iterator next = it;
1.220 + Region &r = it->second;
1.221 + address_t start_limit;
1.222 + address_t end_limit = r.map_start;
1.223 +
1.224 + /* Consider any preceding region. If no such region exists, choose an
1.225 + address at the start of memory. */
1.226 +
1.227 + if (it == _regions.begin())
1.228 + start_limit = L4_PAGESIZE;
1.229 + else
1.230 + {
1.231 + it--;
1.232 + Region &pr = it->second;
1.233 + start_limit = pr.map_start + (1UL << pr.log2size);
1.234 + it = next;
1.235 + }
1.236 +
1.237 + /* Test against the limits. */
1.238 +
1.239 + if (region_start < start_limit)
1.240 + region_start = round(start_limit, increment);
1.241 +
1.242 + /* Investigate subsequent regions if not enough space exists between the
1.243 + preceding region (or start of memory) and the current region. */
1.244 +
1.245 + if ((region_start + region_size) > end_limit)
1.246 + {
1.247 + it++;
1.248 + if (it == _regions.end())
1.249 + return -L4_ENOMEM;
1.250 + }
1.251 + else
1.252 + break;
1.253 + }
1.254 +
1.255 + /* Attach the provided dataspace.
1.256 + NOTE: This is only done in this implementation to support the paging
1.257 + mechanism. In a region mapper residing within the actual task, the
1.258 + dataspace's map operation would be invoked to obtain mappings. */
1.259 +
1.260 + l4_addr_t ds_start;
1.261 +
1.262 + long err = ipc_attach_dataspace(ds, size, (void **) &ds_start);
1.263 +
1.264 + if (err)
1.265 + return err;
1.266 +
1.267 + l4_touch_rw((const void *) ds_start, size);
1.268 +
1.269 +#if 0
1.270 + printf("-> added region for %lx size %ld (%d)\n", region_start, region_size, page_order(region_size));
1.271 +#endif
1.272 +
1.273 + add(Region(ds_start, page_order(region_size), flags & L4RE_DS_F_RIGHTS_MASK, region_start));
1.274 +
1.275 + *start = region_start;
1.276 + return L4_EOK;
1.277 + }
1.278 +
1.279 + /* Or attempt to add the specified region at a specific address. */
1.280 +
1.281 + else
1.282 + {
1.283 + // NOTE: To be implemented.
1.284 +
1.285 + return -L4_ENOMEM;
1.286 + }
1.287 +}
1.288 +
1.289
1.290
1.291 static ExecPager exec_pager;
1.292
1.293 -static void init_pager(ipc_server_config_type *config, l4_addr_t buf,
1.294 - unsigned int buf_log2size, l4_addr_t buf_start)
1.295 +static void init_pager(ipc_server_config_type *config)
1.296 {
1.297 - exec_pager.buf = buf;
1.298 - exec_pager.buf_log2size = buf_log2size;
1.299 - exec_pager.buf_start = buf_start;
1.300 -
1.301 ipc_server_init_config(config);
1.302
1.303 - config->expected_items = SystemPager_expected_items;
1.304 - config->handler = (ipc_server_handler_type) handle_SystemPager;
1.305 - config->handler_obj = static_cast<SystemPager *>(&exec_pager);
1.306 + config->expected_items = PagerObject_expected_items;
1.307 + config->handler = (ipc_server_handler_type) handle_PagerObject;
1.308 + config->handler_obj = static_cast<PagerObject *>(&exec_pager);
1.309 }
1.310
1.311 static long start_pager(ipc_server_config_type *config, pthread_t thread)
1.312 @@ -128,13 +336,6 @@
1.313
1.314
1.315
1.316 -static offset_t find_region_size(offset_t size)
1.317 -{
1.318 - return 1 << page_order(size);
1.319 -}
1.320 -
1.321 -
1.322 -
1.323 /* Capability mapping definitions for the new task. */
1.324
1.325 struct mapped_cap
1.326 @@ -197,34 +398,60 @@
1.327 return 1;
1.328 }
1.329
1.330 - /* Copy the entire payload to a new dataspace. */
1.331 + /* Copy the payload regions to new dataspaces.
1.332 + NOTE: This should be directed by the ELF metadata. */
1.333
1.334 - char *buf;
1.335 + char *program_buf;
1.336 offset_t nread;
1.337 - offset_t region_size = find_region_size(4000000);
1.338 - l4re_ds_t region_ds;
1.339 + offset_t program_region_contents = 0x28466;
1.340 + offset_t program_region_size = round(program_region_contents, L4_PAGESIZE);
1.341 + l4re_ds_t program_region_ds;
1.342
1.343 - err = ipc_allocate_align(region_size, L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RWX,
1.344 - page_order(4000000), (void **) &buf, ®ion_ds);
1.345 + err = ipc_allocate_align(program_region_size, L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RWX,
1.346 + L4_PAGESHIFT, (void **) &program_buf, &program_region_ds);
1.347
1.348 if (err)
1.349 {
1.350 - printf("Could not reserve memory.\n");
1.351 + printf("Could not reserve program memory.\n");
1.352 return 1;
1.353 }
1.354
1.355 - printf("Reading from file into %p.\n", buf);
1.356 -
1.357 - nread = client_read(file, buf, 4000000);
1.358 + nread = client_read(file, program_buf, program_region_contents);
1.359
1.360 - printf("Read %ld from file.\n", nread);
1.361 + printf("Read %ld from file into %p.\n", nread, program_buf);
1.362
1.363 - if (memcmp(buf + 0xae3, "\x31\xed", 2))
1.364 + if (memcmp(program_buf + 0xae3, "\x31\xed", 2))
1.365 {
1.366 printf("Did not find expected instructions at start.\n");
1.367 return 1;
1.368 }
1.369
1.370 + offset_t data_region_start = 0x102a360;
1.371 + offset_t data_region_size = round(0x8068, L4_PAGESIZE);
1.372 + offset_t data_region_base = trunc(data_region_start, L4_PAGESIZE);
1.373 + offset_t data_region_offset = data_region_start - data_region_base;
1.374 +
1.375 + char *data_buf;
1.376 + offset_t data_region_contents = 0x2058;
1.377 + l4re_ds_t data_region_ds;
1.378 +
1.379 + err = ipc_allocate_align(data_region_size, L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RW,
1.380 + L4_PAGESHIFT, (void **) &data_buf, &data_region_ds);
1.381 +
1.382 + if (err)
1.383 + {
1.384 + printf("Could not reserve data memory.\n");
1.385 + return 1;
1.386 + }
1.387 +
1.388 + memset(data_buf, 0, data_region_size);
1.389 +
1.390 + client_seek(file, 0x29360, SEEK_SET);
1.391 + nread = client_read(file, data_buf + data_region_offset, data_region_contents);
1.392 +
1.393 + printf("Read %ld from file into %p in region %p with size %ld for %lx.\n",
1.394 + nread, data_buf + data_region_offset, data_buf, data_region_size, data_region_base);
1.395 +
1.396 /* UTCB location and size. */
1.397
1.398 l4_addr_t utcb_start = Utcb_area_start;
1.399 @@ -235,15 +462,134 @@
1.400 if (utcb_log2size < L4_PAGESHIFT)
1.401 utcb_log2size = L4_PAGESHIFT;
1.402
1.403 + l4_fpage_t utcb_fpage = l4_fpage(utcb_start, utcb_log2size, 0);
1.404 +
1.405 /* KIP allocation. */
1.406
1.407 l4_addr_t kip_start = (l4_addr_t) l4re_kip();
1.408
1.409 printf("KIP at %lx.\n", kip_start);
1.410
1.411 - /* Create a new task and thread. */
1.412 + /* Stack allocation. */
1.413 +
1.414 + l4_addr_t stack_buf;
1.415 + offset_t stack_size = 16 * L4_PAGESIZE;
1.416 + l4_addr_t stack_region_base = 0x8000000 - stack_size;
1.417 + l4re_ds_t stack_ds;
1.418 +
1.419 + err = ipc_allocate_align(stack_size, L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RW,
1.420 + L4_PAGESHIFT, (void **) &stack_buf, &stack_ds);
1.421 +
1.422 + if (err)
1.423 + {
1.424 + printf("Could not reserve stack.\n");
1.425 + return 1;
1.426 + }
1.427 +
1.428 + /* Populate stack with additional capabilities. */
1.429 +
1.430 + l4re_env_cap_entry_t *stack_env_cap = (l4re_env_cap_entry_t *) (stack_buf + stack_size);
1.431 +
1.432 + /* Special invalid/terminating environment capability entry. */
1.433 +
1.434 + *(--stack_env_cap) = l4re_env_cap_entry_t();
1.435 +
1.436 + printf("Stack region end: %p\n", stack_env_cap);
1.437 +
1.438 + l4_addr_t caps_start = (l4_addr_t) stack_env_cap;
1.439 + l4_umword_t *stack_element = (l4_umword_t *) stack_env_cap;
1.440 +
1.441 + /* Loader flags, debugging flags, and the KIP capability index.
1.442 + See: generate_l4aux in Remote_app_model */
1.443 +
1.444 + *(--stack_element) = 0;
1.445 + *(--stack_element) = 0;
1.446 + *(--stack_element) = 0x14 << L4_CAP_SHIFT;
1.447 +
1.448 + printf("Stack L4 aux elements: %p / %lx\n", stack_element, ((l4_addr_t) stack_element - stack_buf) + stack_region_base);
1.449 +
1.450 + /* Populate stack with standard capabilities. */
1.451 +
1.452 + l4re_env_t *env = (l4re_env_t *) stack_element;
1.453 +
1.454 + env--;
1.455 + env->factory = L4_BASE_FACTORY_CAP;
1.456 + env->main_thread = L4_BASE_THREAD_CAP;
1.457 + env->log = L4_BASE_LOG_CAP;
1.458 + env->scheduler = L4_BASE_SCHEDULER_CAP;
1.459 + env->rm = 0x11 << L4_CAP_SHIFT;
1.460 + env->mem_alloc = 0x12 << L4_CAP_SHIFT;
1.461 + env->first_free_cap = 0x15;
1.462 + env->caps = (l4re_env_cap_entry_t *) (caps_start - stack_buf) + stack_region_base;
1.463 + env->utcb_area = utcb_fpage;
1.464 + env->first_free_utcb = utcb_start + L4_UTCB_OFFSET;
1.465 +
1.466 + /* Populate stack with AUXV and environment pointer. */
1.467 +
1.468 + stack_element = (l4_umword_t *) env;
1.469 +
1.470 + printf("Stack L4 env elements: %p / %lx\n", stack_element, ((l4_addr_t) stack_element - stack_buf) + stack_region_base);
1.471
1.472 - l4_fpage_t utcb_fpage = l4_fpage(utcb_start, utcb_log2size, 0);
1.473 + /* AUXV NULL. */
1.474 +
1.475 + *(--stack_element) = 0;
1.476 + *(--stack_element) = 0;
1.477 +
1.478 + /* L4Re global environment pointer. */
1.479 +
1.480 + *(--stack_element) = ((l4_addr_t) env - stack_buf) + stack_region_base;
1.481 + *(--stack_element) = 0xf1;
1.482 +
1.483 + /* Apparently required entries. */
1.484 +
1.485 + *(--stack_element) = L4_PAGESIZE;
1.486 + *(--stack_element) = AT_PAGESZ;
1.487 +
1.488 + *(--stack_element) = 0;
1.489 + *(--stack_element) = AT_UID;
1.490 +
1.491 + *(--stack_element) = 0;
1.492 + *(--stack_element) = AT_EUID;
1.493 +
1.494 + *(--stack_element) = 0;
1.495 + *(--stack_element) = AT_GID;
1.496 +
1.497 + *(--stack_element) = 0;
1.498 + *(--stack_element) = AT_EGID;
1.499 +
1.500 + char *stack_envp = (char *) stack_element;
1.501 +
1.502 + printf("Stack L4 envp: %p / %lx\n", stack_element, ((l4_addr_t) stack_element - stack_buf) + stack_region_base);
1.503 +
1.504 + /* Populate stack with argument values. */
1.505 +
1.506 + char *stack_arg = stack_envp;
1.507 +
1.508 + stack_arg = (char *) trunc((offset_t) stack_arg - strlen(argv[1]) - 1, sizeof(l4_umword_t));
1.509 +
1.510 + memset(stack_arg, 0, stack_envp - stack_arg);
1.511 + memcpy(stack_arg, argv[1], strlen(argv[1]));
1.512 +
1.513 + printf("Stack L4 program argument: %p / %lx\n", stack_arg, ((l4_addr_t) stack_arg - stack_buf) + stack_region_base);
1.514 +
1.515 + /* Populate stack with the environment pointer. */
1.516 +
1.517 + stack_element = (l4_umword_t *) stack_arg;
1.518 +
1.519 + *(--stack_element) = (l4_umword_t) ((l4_addr_t) stack_envp - stack_buf) + stack_region_base;
1.520 +
1.521 + /* Populate stack with argument pointers and count. */
1.522 + /* NOTE: Just one argument currently. */
1.523 +
1.524 + *(--stack_element) = (l4_umword_t) ((l4_addr_t) stack_arg - stack_buf) + stack_region_base;
1.525 + *(--stack_element) = 1;
1.526 +
1.527 + printf("Stack L4 start: %p / %lx\n", stack_element, ((l4_addr_t) stack_element - stack_buf) + stack_region_base);
1.528 + printf("%ld %lx %lx\n", stack_element[0], stack_element[1], stack_element[2]);
1.529 +
1.530 + l4_addr_t stack_start = ((l4_addr_t) stack_element - stack_buf) + stack_region_base;
1.531 +
1.532 + /* Create a new task and thread. */
1.533
1.534 err = l4_error(l4_factory_create_task(l4re_env()->factory, task, utcb_fpage));
1.535
1.536 @@ -270,7 +616,11 @@
1.537 pthread_attr_init(&attr);
1.538 pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
1.539
1.540 - init_pager(&config, (l4_addr_t) buf, page_order(file->size), 0x1000000);
1.541 + init_pager(&config);
1.542 +
1.543 + exec_pager.add(Region((l4_addr_t) program_buf, page_order(program_region_size), L4_FPAGE_RX, 0x1000000));
1.544 + exec_pager.add(Region((l4_addr_t) data_buf, page_order(data_region_size), L4_FPAGE_RW, data_region_base));
1.545 + exec_pager.add(Region((l4_addr_t) stack_buf, page_order(stack_size), L4_FPAGE_RW, stack_region_base));
1.546
1.547 err = pthread_create(&pager_thread, &attr, ipc_server_start_mainloop, &config);
1.548
1.549 @@ -288,15 +638,25 @@
1.550 return 1;
1.551 }
1.552
1.553 - /* Map the pager capability into the region manager/mapper slot. */
1.554 + /* Define capability mappings for the new task. */
1.555
1.556 - err = l4_error(l4_task_map(task, L4RE_THIS_TASK_CAP,
1.557 - l4_obj_fpage(config.server, 0, L4_CAP_FPAGE_RWS),
1.558 - l4_map_obj_control(0x10 << L4_CAP_SHIFT, L4_MAP_ITEM_MAP)));
1.559 + struct mapped_cap mapped_caps[] = {
1.560 + {config.server, L4_CAP_FPAGE_RWS, 0x10 << L4_CAP_SHIFT},
1.561 + {config.server, L4_CAP_FPAGE_RWS, 0x11 << L4_CAP_SHIFT},
1.562 + {task, L4_CAP_FPAGE_RWS, L4_BASE_TASK_CAP},
1.563 + {thread, L4_CAP_FPAGE_RWS, L4_BASE_THREAD_CAP},
1.564 + {l4re_env()->factory, L4_CAP_FPAGE_RWS, L4_BASE_FACTORY_CAP},
1.565 + {l4re_env()->log, L4_CAP_FPAGE_RWS, L4_BASE_LOG_CAP},
1.566 + {l4re_env()->scheduler, L4_CAP_FPAGE_RWS, L4_BASE_SCHEDULER_CAP},
1.567 + {l4re_env()->mem_alloc, L4_CAP_FPAGE_RWS, 0x12 << L4_CAP_SHIFT},
1.568 + {L4_INVALID_CAP, 0, 0},
1.569 + };
1.570 +
1.571 + err = map_capabilities(task, mapped_caps);
1.572
1.573 if (err)
1.574 {
1.575 - printf("Could not map pager capability into task.\n");
1.576 + printf("Could not capabilities into task.\n");
1.577 return 1;
1.578 }
1.579
1.580 @@ -312,25 +672,6 @@
1.581 return 1;
1.582 }
1.583
1.584 - /* Define capability mappings for the new task. */
1.585 -
1.586 - struct mapped_cap mapped_caps[] = {
1.587 - {task, L4_CAP_FPAGE_RWS, L4_BASE_TASK_CAP},
1.588 - {thread, L4_CAP_FPAGE_RWS, L4_BASE_THREAD_CAP},
1.589 - {l4re_env()->factory, L4_CAP_FPAGE_RWS, L4_BASE_FACTORY_CAP},
1.590 - {l4re_env()->log, L4_CAP_FPAGE_RWS, L4_BASE_LOG_CAP},
1.591 - {l4re_env()->scheduler, L4_CAP_FPAGE_RWS, L4_BASE_SCHEDULER_CAP},
1.592 - {L4_INVALID_CAP, 0, 0},
1.593 - };
1.594 -
1.595 - err = map_capabilities(task, mapped_caps);
1.596 -
1.597 - if (err)
1.598 - {
1.599 - printf("Could not capabilities into task.\n");
1.600 - return 1;
1.601 - }
1.602 -
1.603 /* Configure the thread with the region manager acting as pager and exception
1.604 handler. The UTCB will be situated at an address supported by a dataspace
1.605 attached to the new task. */
1.606 @@ -349,25 +690,13 @@
1.607 return 1;
1.608 }
1.609
1.610 - /* Map the payload into the new task. */
1.611 -
1.612 - printf("Map %p with size %ld (2 ** %d).\n", buf, file->size, page_order(file->size));
1.613 -
1.614 - l4_fpage_t payload_fpage = l4_fpage((l4_addr_t) buf, page_order(file->size), L4_FPAGE_RX);
1.615 -
1.616 - err = l4_error(l4_task_map(task, L4RE_THIS_TASK_CAP, payload_fpage, 0x1000000));
1.617 -
1.618 - if (err)
1.619 - {
1.620 - printf("Could not map payload into task.\n");
1.621 - return 1;
1.622 - }
1.623 -
1.624 /* Start the new thread. */
1.625
1.626 printf("Schedule thread...\n");
1.627
1.628 - err = l4_error(l4_thread_ex_regs(thread, 0x1000ae3, 0x2000000 /* stack top */, 0));
1.629 + printf("Stack at 0x%lx mapped to region at 0x%lx.\n", stack_start, stack_region_base);
1.630 +
1.631 + err = l4_error(l4_thread_ex_regs(thread, 0x1000ae3, stack_start, 0));
1.632
1.633 if (err)
1.634 {