From ea9c0e20ba1f68f2f6fb8aa59d6d7633d3af4409 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Wed, 18 Dec 2013 16:13:29 +0100 Subject: [PATCH] part_blk: increase ep stack size and bulk buffer * Increase entrypoint stack size for part_blk server, since it crashes on 64 bit * Consider packet alignment in bulk buffer size calculation of test-blk-cli --- os/src/server/part_blk/main.cc | 2 +- os/src/test/blk/cli/main.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/os/src/server/part_blk/main.cc b/os/src/server/part_blk/main.cc index b6a589b9a3..f644a3a184 100644 --- a/os/src/server/part_blk/main.cc +++ b/os/src/server/part_blk/main.cc @@ -42,7 +42,7 @@ int main() return 1; } - enum { STACK_SIZE = 512 * sizeof(Genode::size_t) }; + enum { STACK_SIZE = 1024 * sizeof(Genode::size_t) }; static Cap_connection cap; static Rpc_entrypoint ep(&cap, STACK_SIZE, "part_ep"); static Block::Root block_root(&ep, env()->heap(), receiver); diff --git a/os/src/test/blk/cli/main.cc b/os/src/test/blk/cli/main.cc index 1a18821785..8d1ae6292d 100644 --- a/os/src/test/blk/cli/main.cc +++ b/os/src/test/blk/cli/main.cc @@ -69,7 +69,8 @@ class Test { return bulk + sizeof(Block::Session::Tx_policy::Ack_queue) + - sizeof(Block::Session::Tx_policy::Submit_queue); + sizeof(Block::Session::Tx_policy::Submit_queue) + + (1 << Block::Packet_descriptor::PACKET_ALIGNMENT) - 1; } void _ack_avail(unsigned) { ack_avail(); }