2.1 --- a/tests/dstest_exec.cc Tue Apr 26 23:15:30 2022 +0200
2.2 +++ b/tests/dstest_exec.cc Sun May 01 01:07:25 2022 +0200
2.3 @@ -24,6 +24,8 @@
2.4 #include <l4/sys/factory.h>
2.5 #include <l4/sys/task.h>
2.6 #include <l4/sys/thread.h>
2.7 +#include <l4/util/elf.h>
2.8 +#include <l4/util/util.h>
2.9
2.10 #include <fsclient/client.h>
2.11 #include <ipc/cap_alloc.h>
2.12 @@ -32,6 +34,8 @@
2.13 #include <mem/memory_utils.h>
2.14 #include <systypes/fcntl.h>
2.15
2.16 +#include <map>
2.17 +
2.18 #include <stdio.h>
2.19 #include <stdlib.h>
2.20 #include <string.h>
2.21 @@ -39,67 +43,271 @@
2.22 #include <pthread-l4.h>
2.23 #include <pthread.h>
2.24
2.25 -#include "system_pager_interface.h"
2.26 -#include "system_pager_server.h"
2.27 +#include "pager_object_interface.h"
2.28 +#include "pager_object_server.h"
2.29
2.30
2.31
2.32 -/* A simple system pager. */
2.33 +/* Region data structures. */
2.34
2.35 -class ExecPager : public SystemPager
2.36 +class Region
2.37 {
2.38 public:
2.39 - l4_addr_t buf, buf_start;
2.40 - unsigned int buf_log2size;
2.41 + l4_addr_t start;
2.42 + unsigned int log2size;
2.43 + l4_umword_t flags;
2.44 + l4_addr_t map_start;
2.45 +
2.46 + explicit Region()
2.47 + : start(0), log2size(0), flags(0), map_start(0)
2.48 + {
2.49 + }
2.50 +
2.51 + explicit Region(l4_addr_t start, unsigned int log2size, l4_umword_t flags,
2.52 + l4_addr_t map_start)
2.53 + : start(start), log2size(log2size), flags(flags), map_start(map_start)
2.54 + {
2.55 + }
2.56 +};
2.57 +
2.58 +typedef std::map<l4_addr_t, Region> Regions;
2.59 +
2.60 +
2.61 +
2.62 +/* A simple system pager also acting as a region mapper. */
2.63 +
2.64 +class ExecPager : public PagerObject
2.65 +{
2.66 +protected:
2.67 + Regions _regions;
2.68 +
2.69 +public:
2.70 + virtual void add(Region region)
2.71 + {
2.72 + _regions[region.map_start] = region;
2.73 + }
2.74 +
2.75 + /* Notification methods. */
2.76
2.77 virtual long exception(l4_exc_regs_t regs,
2.78 l4_snd_fpage_t *region);
2.79
2.80 virtual long page_fault(l4_umword_t pfa, l4_umword_t pc,
2.81 l4_snd_fpage_t *region);
2.82 +
2.83 + /* Region manager/mapper methods. */
2.84 +
2.85 + virtual long attach(address_t *start, offset_t size, map_flags_t flags,
2.86 + l4_cap_idx_t ds, address_t offset, unsigned char align);
2.87 +
2.88 };
2.89
2.90 +/* Handle a general exception. */
2.91 +
2.92 long ExecPager::exception(l4_exc_regs_t regs, l4_snd_fpage_t *region)
2.93 {
2.94 (void) region;
2.95
2.96 printf("exception(...) -> pfa = %lx, pc = %lx\n", l4_utcb_exc_pfa(®s), l4_utcb_exc_pc(®s));
2.97 +
2.98 + printf("r15 = %lx\n", regs.r15);
2.99 + printf("r14 = %lx\n", regs.r14);
2.100 + printf("r13 = %lx\n", regs.r13);
2.101 + printf("r12 = %lx\n", regs.r12);
2.102 + printf("r11 = %lx\n", regs.r11);
2.103 + printf("r10 = %lx\n", regs.r10);
2.104 + printf("r9 = %lx\n", regs.r9);
2.105 + printf("r8 = %lx\n", regs.r8);
2.106 + printf("rdi = %lx\n", regs.rdi);
2.107 + printf("rsi = %lx\n", regs.rsi);
2.108 + printf("rbp = %lx\n", regs.rbp);
2.109 + printf("pfa = %lx\n", regs.pfa);
2.110 + printf("rbx = %lx\n", regs.rbx);
2.111 + printf("rdx = %lx\n", regs.rdx);
2.112 + printf("rcx = %lx\n", regs.rcx);
2.113 + printf("rax = %lx\n", regs.rax);
2.114 + printf("trapno = %lx\n", regs.trapno);
2.115 + printf("err = %lx\n", regs.err);
2.116 + printf("ip = %lx\n", regs.ip);
2.117 + printf("flags = %lx\n", regs.flags);
2.118 + printf("sp = %lx\n", regs.sp);
2.119 + printf("ss = %lx\n", regs.ss);
2.120 + printf("fs_base = %lx\n", regs.fs_base);
2.121 + printf("gs_base = %lx\n", regs.gs_base);
2.122 +
2.123 return L4_EOK;
2.124 }
2.125
2.126 +/* Handle a page fault using any configured regions. */
2.127 +
2.128 long ExecPager::page_fault(l4_umword_t pfa, l4_umword_t pc, l4_snd_fpage_t *region)
2.129 {
2.130 l4_umword_t addr = pfa & ~7UL, flags = pfa & 7;
2.131
2.132 - printf("page_fault(%lx, %lx) -> %lx (%lx)...\n", pfa, pc, addr, flags);
2.133 +#if 0
2.134 + printf("page_fault(%lx, %lx) -> %lx (%lx) -> ", pfa, pc, addr, flags);
2.135 +#endif
2.136 +
2.137 + Regions::iterator it = _regions.upper_bound(addr);
2.138 +
2.139 + if (it != _regions.begin())
2.140 + it--;
2.141 + else
2.142 + {
2.143 + printf("not mapped!\n");
2.144 + return -L4_ENOMEM;
2.145 + }
2.146 +
2.147 + Region &r = it->second;
2.148
2.149 - if ((addr >= buf_start) && (addr < buf_start + (1UL << buf_log2size)))
2.150 + if ((addr >= r.map_start) && (addr < r.map_start + (1UL << r.log2size)))
2.151 {
2.152 - region->fpage = l4_fpage(buf, buf_log2size, L4_FPAGE_RX);
2.153 - region->snd_base = buf_start;
2.154 + l4_addr_t page_addr = trunc(addr, L4_PAGESIZE);
2.155 +
2.156 + region->fpage = l4_fpage(r.start + (page_addr - r.map_start), L4_PAGESHIFT, r.flags);
2.157 + region->snd_base = page_addr;
2.158 +
2.159 +#if 0
2.160 + printf("%lx...%lx from %lx...%lx size %d rights %x\n",
2.161 + r.map_start, region->snd_base,
2.162 + r.start, l4_fpage_memaddr(region->fpage),
2.163 + l4_fpage_size(region->fpage),
2.164 + l4_fpage_rights(region->fpage));
2.165 + printf("%lx -> ", addr);
2.166 +
2.167 + for (unsigned int i = 0; i < sizeof(l4_umword_t); i++)
2.168 + printf("%02x", *((unsigned char *)(r.start + (addr - r.map_start) + i)));
2.169 +
2.170 + printf("\n");
2.171 +#endif
2.172
2.173 return L4_EOK;
2.174 }
2.175
2.176 +#if 0
2.177 + printf("not mapped!\n");
2.178 +#endif
2.179 +
2.180 return -L4_ENOMEM;
2.181 }
2.182
2.183 +/* Attach a region for provision when page faults occur. This is required in
2.184 + the initialisation of a program by the C library which requires a region
2.185 + mapper. */
2.186 +
2.187 +long ExecPager::attach(address_t *start, offset_t size, map_flags_t flags,
2.188 + l4_cap_idx_t ds, address_t offset, unsigned char align)
2.189 +{
2.190 +#if 0
2.191 + printf("attach(%lx, %ld, %lx, ..., %lx, %d)\n", *start, size, flags, offset, align);
2.192 +#endif
2.193 +
2.194 + if (align < L4_PAGESHIFT)
2.195 + align = L4_PAGESHIFT;
2.196 +
2.197 + offset_t increment = 1UL << align;
2.198 + offset_t region_size = round(size, increment);
2.199 +
2.200 + /* Either attempt to find an address for the specified region, starting from
2.201 + any indicated address. */
2.202 +
2.203 + if (flags & L4RE_RM_F_SEARCH_ADDR)
2.204 + {
2.205 + address_t region_start = trunc(*start, increment);
2.206 + Regions::iterator it = _regions.upper_bound(*start);
2.207 +
2.208 + if (!region_start)
2.209 + region_start += increment;
2.210 +
2.211 +#if 0
2.212 + printf("-> search from %lx -> %lx...\n", *start, region_start);
2.213 +#endif
2.214 +
2.215 + /* Before last known region. */
2.216 +
2.217 + while (it != _regions.end())
2.218 + {
2.219 + Regions::iterator next = it;
2.220 + Region &r = it->second;
2.221 + address_t start_limit;
2.222 + address_t end_limit = r.map_start;
2.223 +
2.224 + /* Consider any preceding region. If no such region exists, choose an
2.225 + address at the start of memory. */
2.226 +
2.227 + if (it == _regions.begin())
2.228 + start_limit = L4_PAGESIZE;
2.229 + else
2.230 + {
2.231 + it--;
2.232 + Region &pr = it->second;
2.233 + start_limit = pr.map_start + (1UL << pr.log2size);
2.234 + it = next;
2.235 + }
2.236 +
2.237 + /* Test against the limits. */
2.238 +
2.239 + if (region_start < start_limit)
2.240 + region_start = round(start_limit, increment);
2.241 +
2.242 + /* Investigate subsequent regions if not enough space exists between the
2.243 + preceding region (or start of memory) and the current region. */
2.244 +
2.245 + if ((region_start + region_size) > end_limit)
2.246 + {
2.247 + it++;
2.248 + if (it == _regions.end())
2.249 + return -L4_ENOMEM;
2.250 + }
2.251 + else
2.252 + break;
2.253 + }
2.254 +
2.255 + /* Attach the provided dataspace.
2.256 + NOTE: This is only done in this implementation to support the paging
2.257 + mechanism. In a region mapper residing within the actual task, the
2.258 + dataspace's map operation would be invoked to obtain mappings. */
2.259 +
2.260 + l4_addr_t ds_start;
2.261 +
2.262 + long err = ipc_attach_dataspace(ds, size, (void **) &ds_start);
2.263 +
2.264 + if (err)
2.265 + return err;
2.266 +
2.267 + l4_touch_rw((const void *) ds_start, size);
2.268 +
2.269 +#if 0
2.270 + printf("-> added region for %lx size %ld (%d)\n", region_start, region_size, page_order(region_size));
2.271 +#endif
2.272 +
2.273 + add(Region(ds_start, page_order(region_size), flags & L4RE_DS_F_RIGHTS_MASK, region_start));
2.274 +
2.275 + *start = region_start;
2.276 + return L4_EOK;
2.277 + }
2.278 +
2.279 + /* Or attempt to add the specified region at a specific address. */
2.280 +
2.281 + else
2.282 + {
2.283 + // NOTE: To be implemented.
2.284 +
2.285 + return -L4_ENOMEM;
2.286 + }
2.287 +}
2.288 +
2.289
2.290
2.291 static ExecPager exec_pager;
2.292
2.293 -static void init_pager(ipc_server_config_type *config, l4_addr_t buf,
2.294 - unsigned int buf_log2size, l4_addr_t buf_start)
2.295 +static void init_pager(ipc_server_config_type *config)
2.296 {
2.297 - exec_pager.buf = buf;
2.298 - exec_pager.buf_log2size = buf_log2size;
2.299 - exec_pager.buf_start = buf_start;
2.300 -
2.301 ipc_server_init_config(config);
2.302
2.303 - config->expected_items = SystemPager_expected_items;
2.304 - config->handler = (ipc_server_handler_type) handle_SystemPager;
2.305 - config->handler_obj = static_cast<SystemPager *>(&exec_pager);
2.306 + config->expected_items = PagerObject_expected_items;
2.307 + config->handler = (ipc_server_handler_type) handle_PagerObject;
2.308 + config->handler_obj = static_cast<PagerObject *>(&exec_pager);
2.309 }
2.310
2.311 static long start_pager(ipc_server_config_type *config, pthread_t thread)
2.312 @@ -128,13 +336,6 @@
2.313
2.314
2.315
2.316 -static offset_t find_region_size(offset_t size)
2.317 -{
2.318 - return 1 << page_order(size);
2.319 -}
2.320 -
2.321 -
2.322 -
2.323 /* Capability mapping definitions for the new task. */
2.324
2.325 struct mapped_cap
2.326 @@ -197,34 +398,60 @@
2.327 return 1;
2.328 }
2.329
2.330 - /* Copy the entire payload to a new dataspace. */
2.331 + /* Copy the payload regions to new dataspaces.
2.332 + NOTE: This should be directed by the ELF metadata. */
2.333
2.334 - char *buf;
2.335 + char *program_buf;
2.336 offset_t nread;
2.337 - offset_t region_size = find_region_size(4000000);
2.338 - l4re_ds_t region_ds;
2.339 + offset_t program_region_contents = 0x28466;
2.340 + offset_t program_region_size = round(program_region_contents, L4_PAGESIZE);
2.341 + l4re_ds_t program_region_ds;
2.342
2.343 - err = ipc_allocate_align(region_size, L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RWX,
2.344 - page_order(4000000), (void **) &buf, ®ion_ds);
2.345 + err = ipc_allocate_align(program_region_size, L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RWX,
2.346 + L4_PAGESHIFT, (void **) &program_buf, &program_region_ds);
2.347
2.348 if (err)
2.349 {
2.350 - printf("Could not reserve memory.\n");
2.351 + printf("Could not reserve program memory.\n");
2.352 return 1;
2.353 }
2.354
2.355 - printf("Reading from file into %p.\n", buf);
2.356 -
2.357 - nread = client_read(file, buf, 4000000);
2.358 + nread = client_read(file, program_buf, program_region_contents);
2.359
2.360 - printf("Read %ld from file.\n", nread);
2.361 + printf("Read %ld from file into %p.\n", nread, program_buf);
2.362
2.363 - if (memcmp(buf + 0xae3, "\x31\xed", 2))
2.364 + if (memcmp(program_buf + 0xae3, "\x31\xed", 2))
2.365 {
2.366 printf("Did not find expected instructions at start.\n");
2.367 return 1;
2.368 }
2.369
2.370 + offset_t data_region_start = 0x102a360;
2.371 + offset_t data_region_size = round(0x8068, L4_PAGESIZE);
2.372 + offset_t data_region_base = trunc(data_region_start, L4_PAGESIZE);
2.373 + offset_t data_region_offset = data_region_start - data_region_base;
2.374 +
2.375 + char *data_buf;
2.376 + offset_t data_region_contents = 0x2058;
2.377 + l4re_ds_t data_region_ds;
2.378 +
2.379 + err = ipc_allocate_align(data_region_size, L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RW,
2.380 + L4_PAGESHIFT, (void **) &data_buf, &data_region_ds);
2.381 +
2.382 + if (err)
2.383 + {
2.384 + printf("Could not reserve data memory.\n");
2.385 + return 1;
2.386 + }
2.387 +
2.388 + memset(data_buf, 0, data_region_size);
2.389 +
2.390 + client_seek(file, 0x29360, SEEK_SET);
2.391 + nread = client_read(file, data_buf + data_region_offset, data_region_contents);
2.392 +
2.393 + printf("Read %ld from file into %p in region %p with size %ld for %lx.\n",
2.394 + nread, data_buf + data_region_offset, data_buf, data_region_size, data_region_base);
2.395 +
2.396 /* UTCB location and size. */
2.397
2.398 l4_addr_t utcb_start = Utcb_area_start;
2.399 @@ -235,15 +462,134 @@
2.400 if (utcb_log2size < L4_PAGESHIFT)
2.401 utcb_log2size = L4_PAGESHIFT;
2.402
2.403 + l4_fpage_t utcb_fpage = l4_fpage(utcb_start, utcb_log2size, 0);
2.404 +
2.405 /* KIP allocation. */
2.406
2.407 l4_addr_t kip_start = (l4_addr_t) l4re_kip();
2.408
2.409 printf("KIP at %lx.\n", kip_start);
2.410
2.411 - /* Create a new task and thread. */
2.412 + /* Stack allocation. */
2.413 +
2.414 + l4_addr_t stack_buf;
2.415 + offset_t stack_size = 16 * L4_PAGESIZE;
2.416 + l4_addr_t stack_region_base = 0x8000000 - stack_size;
2.417 + l4re_ds_t stack_ds;
2.418 +
2.419 + err = ipc_allocate_align(stack_size, L4RE_RM_F_SEARCH_ADDR | L4RE_RM_F_RW,
2.420 + L4_PAGESHIFT, (void **) &stack_buf, &stack_ds);
2.421 +
2.422 + if (err)
2.423 + {
2.424 + printf("Could not reserve stack.\n");
2.425 + return 1;
2.426 + }
2.427 +
2.428 + /* Populate stack with additional capabilities. */
2.429 +
2.430 + l4re_env_cap_entry_t *stack_env_cap = (l4re_env_cap_entry_t *) (stack_buf + stack_size);
2.431 +
2.432 + /* Special invalid/terminating environment capability entry. */
2.433 +
2.434 + *(--stack_env_cap) = l4re_env_cap_entry_t();
2.435 +
2.436 + printf("Stack region end: %p\n", stack_env_cap);
2.437 +
2.438 + l4_addr_t caps_start = (l4_addr_t) stack_env_cap;
2.439 + l4_umword_t *stack_element = (l4_umword_t *) stack_env_cap;
2.440 +
2.441 + /* Loader flags, debugging flags, and the KIP capability index.
2.442 + See: generate_l4aux in Remote_app_model */
2.443 +
2.444 + *(--stack_element) = 0;
2.445 + *(--stack_element) = 0;
2.446 + *(--stack_element) = 0x14 << L4_CAP_SHIFT;
2.447 +
2.448 + printf("Stack L4 aux elements: %p / %lx\n", stack_element, ((l4_addr_t) stack_element - stack_buf) + stack_region_base);
2.449 +
2.450 + /* Populate stack with standard capabilities. */
2.451 +
2.452 + l4re_env_t *env = (l4re_env_t *) stack_element;
2.453 +
2.454 + env--;
2.455 + env->factory = L4_BASE_FACTORY_CAP;
2.456 + env->main_thread = L4_BASE_THREAD_CAP;
2.457 + env->log = L4_BASE_LOG_CAP;
2.458 + env->scheduler = L4_BASE_SCHEDULER_CAP;
2.459 + env->rm = 0x11 << L4_CAP_SHIFT;
2.460 + env->mem_alloc = 0x12 << L4_CAP_SHIFT;
2.461 + env->first_free_cap = 0x15;
2.462 + env->caps = (l4re_env_cap_entry_t *) (caps_start - stack_buf) + stack_region_base;
2.463 + env->utcb_area = utcb_fpage;
2.464 + env->first_free_utcb = utcb_start + L4_UTCB_OFFSET;
2.465 +
2.466 + /* Populate stack with AUXV and environment pointer. */
2.467 +
2.468 + stack_element = (l4_umword_t *) env;
2.469 +
2.470 + printf("Stack L4 env elements: %p / %lx\n", stack_element, ((l4_addr_t) stack_element - stack_buf) + stack_region_base);
2.471
2.472 - l4_fpage_t utcb_fpage = l4_fpage(utcb_start, utcb_log2size, 0);
2.473 + /* AUXV NULL. */
2.474 +
2.475 + *(--stack_element) = 0;
2.476 + *(--stack_element) = 0;
2.477 +
2.478 + /* L4Re global environment pointer. */
2.479 +
2.480 + *(--stack_element) = ((l4_addr_t) env - stack_buf) + stack_region_base;
2.481 + *(--stack_element) = 0xf1;
2.482 +
2.483 + /* Apparently required entries. */
2.484 +
2.485 + *(--stack_element) = L4_PAGESIZE;
2.486 + *(--stack_element) = AT_PAGESZ;
2.487 +
2.488 + *(--stack_element) = 0;
2.489 + *(--stack_element) = AT_UID;
2.490 +
2.491 + *(--stack_element) = 0;
2.492 + *(--stack_element) = AT_EUID;
2.493 +
2.494 + *(--stack_element) = 0;
2.495 + *(--stack_element) = AT_GID;
2.496 +
2.497 + *(--stack_element) = 0;
2.498 + *(--stack_element) = AT_EGID;
2.499 +
2.500 + char *stack_envp = (char *) stack_element;
2.501 +
2.502 + printf("Stack L4 envp: %p / %lx\n", stack_element, ((l4_addr_t) stack_element - stack_buf) + stack_region_base);
2.503 +
2.504 + /* Populate stack with argument values. */
2.505 +
2.506 + char *stack_arg = stack_envp;
2.507 +
2.508 + stack_arg = (char *) trunc((offset_t) stack_arg - strlen(argv[1]) - 1, sizeof(l4_umword_t));
2.509 +
2.510 + memset(stack_arg, 0, stack_envp - stack_arg);
2.511 + memcpy(stack_arg, argv[1], strlen(argv[1]));
2.512 +
2.513 + printf("Stack L4 program argument: %p / %lx\n", stack_arg, ((l4_addr_t) stack_arg - stack_buf) + stack_region_base);
2.514 +
2.515 + /* Populate stack with the environment pointer. */
2.516 +
2.517 + stack_element = (l4_umword_t *) stack_arg;
2.518 +
2.519 + *(--stack_element) = (l4_umword_t) ((l4_addr_t) stack_envp - stack_buf) + stack_region_base;
2.520 +
2.521 + /* Populate stack with argument pointers and count. */
2.522 + /* NOTE: Just one argument currently. */
2.523 +
2.524 + *(--stack_element) = (l4_umword_t) ((l4_addr_t) stack_arg - stack_buf) + stack_region_base;
2.525 + *(--stack_element) = 1;
2.526 +
2.527 + printf("Stack L4 start: %p / %lx\n", stack_element, ((l4_addr_t) stack_element - stack_buf) + stack_region_base);
2.528 + printf("%ld %lx %lx\n", stack_element[0], stack_element[1], stack_element[2]);
2.529 +
2.530 + l4_addr_t stack_start = ((l4_addr_t) stack_element - stack_buf) + stack_region_base;
2.531 +
2.532 + /* Create a new task and thread. */
2.533
2.534 err = l4_error(l4_factory_create_task(l4re_env()->factory, task, utcb_fpage));
2.535
2.536 @@ -270,7 +616,11 @@
2.537 pthread_attr_init(&attr);
2.538 pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
2.539
2.540 - init_pager(&config, (l4_addr_t) buf, page_order(file->size), 0x1000000);
2.541 + init_pager(&config);
2.542 +
2.543 + exec_pager.add(Region((l4_addr_t) program_buf, page_order(program_region_size), L4_FPAGE_RX, 0x1000000));
2.544 + exec_pager.add(Region((l4_addr_t) data_buf, page_order(data_region_size), L4_FPAGE_RW, data_region_base));
2.545 + exec_pager.add(Region((l4_addr_t) stack_buf, page_order(stack_size), L4_FPAGE_RW, stack_region_base));
2.546
2.547 err = pthread_create(&pager_thread, &attr, ipc_server_start_mainloop, &config);
2.548
2.549 @@ -288,15 +638,25 @@
2.550 return 1;
2.551 }
2.552
2.553 - /* Map the pager capability into the region manager/mapper slot. */
2.554 + /* Define capability mappings for the new task. */
2.555
2.556 - err = l4_error(l4_task_map(task, L4RE_THIS_TASK_CAP,
2.557 - l4_obj_fpage(config.server, 0, L4_CAP_FPAGE_RWS),
2.558 - l4_map_obj_control(0x10 << L4_CAP_SHIFT, L4_MAP_ITEM_MAP)));
2.559 + struct mapped_cap mapped_caps[] = {
2.560 + {config.server, L4_CAP_FPAGE_RWS, 0x10 << L4_CAP_SHIFT},
2.561 + {config.server, L4_CAP_FPAGE_RWS, 0x11 << L4_CAP_SHIFT},
2.562 + {task, L4_CAP_FPAGE_RWS, L4_BASE_TASK_CAP},
2.563 + {thread, L4_CAP_FPAGE_RWS, L4_BASE_THREAD_CAP},
2.564 + {l4re_env()->factory, L4_CAP_FPAGE_RWS, L4_BASE_FACTORY_CAP},
2.565 + {l4re_env()->log, L4_CAP_FPAGE_RWS, L4_BASE_LOG_CAP},
2.566 + {l4re_env()->scheduler, L4_CAP_FPAGE_RWS, L4_BASE_SCHEDULER_CAP},
2.567 + {l4re_env()->mem_alloc, L4_CAP_FPAGE_RWS, 0x12 << L4_CAP_SHIFT},
2.568 + {L4_INVALID_CAP, 0, 0},
2.569 + };
2.570 +
2.571 + err = map_capabilities(task, mapped_caps);
2.572
2.573 if (err)
2.574 {
2.575 - printf("Could not map pager capability into task.\n");
2.576 + printf("Could not capabilities into task.\n");
2.577 return 1;
2.578 }
2.579
2.580 @@ -312,25 +672,6 @@
2.581 return 1;
2.582 }
2.583
2.584 - /* Define capability mappings for the new task. */
2.585 -
2.586 - struct mapped_cap mapped_caps[] = {
2.587 - {task, L4_CAP_FPAGE_RWS, L4_BASE_TASK_CAP},
2.588 - {thread, L4_CAP_FPAGE_RWS, L4_BASE_THREAD_CAP},
2.589 - {l4re_env()->factory, L4_CAP_FPAGE_RWS, L4_BASE_FACTORY_CAP},
2.590 - {l4re_env()->log, L4_CAP_FPAGE_RWS, L4_BASE_LOG_CAP},
2.591 - {l4re_env()->scheduler, L4_CAP_FPAGE_RWS, L4_BASE_SCHEDULER_CAP},
2.592 - {L4_INVALID_CAP, 0, 0},
2.593 - };
2.594 -
2.595 - err = map_capabilities(task, mapped_caps);
2.596 -
2.597 - if (err)
2.598 - {
2.599 - printf("Could not capabilities into task.\n");
2.600 - return 1;
2.601 - }
2.602 -
2.603 /* Configure the thread with the region manager acting as pager and exception
2.604 handler. The UTCB will be situated at an address supported by a dataspace
2.605 attached to the new task. */
2.606 @@ -349,25 +690,13 @@
2.607 return 1;
2.608 }
2.609
2.610 - /* Map the payload into the new task. */
2.611 -
2.612 - printf("Map %p with size %ld (2 ** %d).\n", buf, file->size, page_order(file->size));
2.613 -
2.614 - l4_fpage_t payload_fpage = l4_fpage((l4_addr_t) buf, page_order(file->size), L4_FPAGE_RX);
2.615 -
2.616 - err = l4_error(l4_task_map(task, L4RE_THIS_TASK_CAP, payload_fpage, 0x1000000));
2.617 -
2.618 - if (err)
2.619 - {
2.620 - printf("Could not map payload into task.\n");
2.621 - return 1;
2.622 - }
2.623 -
2.624 /* Start the new thread. */
2.625
2.626 printf("Schedule thread...\n");
2.627
2.628 - err = l4_error(l4_thread_ex_regs(thread, 0x1000ae3, 0x2000000 /* stack top */, 0));
2.629 + printf("Stack at 0x%lx mapped to region at 0x%lx.\n", stack_start, stack_region_base);
2.630 +
2.631 + err = l4_error(l4_thread_ex_regs(thread, 0x1000ae3, stack_start, 0));
2.632
2.633 if (err)
2.634 {