Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[5.0] fix disabling EOS VM OC subjective limits in tests #2055

Merged
merged 1 commit into from
Jan 8, 2024
Merged

[5.0] fix disabling EOS VM OC subjective limits in tests #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <vector>
#include <string>

#include <fc/reflect/reflect.hpp>
#include <fc/io/raw.hpp>

#include <sys/resource.h>

Expand All @@ -25,6 +25,34 @@ struct config {
std::optional<size_t> generated_code_size_limit {16u*1024u*1024u};
};

}}}
//work around unexpected std::optional behavior
template <typename DS>
inline DS& operator>>(DS& ds, eosio::chain::eosvmoc::config& cfg) {
fc::raw::pack(ds, cfg.cache_size);
fc::raw::pack(ds, cfg.threads);

auto better_optional_unpack = [&]<typename T>(std::optional<T>& t) {
bool b; fc::raw::unpack( ds, b );
if(b) { t = T(); fc::raw::unpack( ds, *t ); }
else { t.reset(); }
};
better_optional_unpack(cfg.cpu_limit);
better_optional_unpack(cfg.vm_limit);
better_optional_unpack(cfg.stack_size_limit);
better_optional_unpack(cfg.generated_code_size_limit);

return ds;
}

template <typename DS>
inline DS& operator<<(DS& ds, const eosio::chain::eosvmoc::config& cfg) {
fc::raw::pack(ds, cfg.cache_size);
fc::raw::pack(ds, cfg.threads);
fc::raw::pack(ds, cfg.cpu_limit);
fc::raw::pack(ds, cfg.vm_limit);
fc::raw::pack(ds, cfg.stack_size_limit);
fc::raw::pack(ds, cfg.generated_code_size_limit);
return ds;
}

FC_REFLECT(eosio::chain::eosvmoc::config, (cache_size)(threads)(cpu_limit)(vm_limit)(stack_size_limit)(generated_code_size_limit))
}}}
17 changes: 13 additions & 4 deletions unittests/eosvmoc_limits_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@ void limit_not_violated_test(const eosvmoc::config& eosvmoc_config) {
);
}

static eosvmoc::config make_eosvmoc_config_without_limits() {
eosvmoc::config cfg;
cfg.cpu_limit.reset();
cfg.vm_limit.reset();
cfg.stack_size_limit.reset();
cfg.generated_code_size_limit.reset();
return cfg;
}

// test all limits are not set for tests
BOOST_AUTO_TEST_CASE( limits_not_set ) { try {
validating_tester chain;
Expand All @@ -85,13 +94,13 @@ BOOST_AUTO_TEST_CASE( limits_not_set ) { try {
// test limits are not enforced unless limits in eosvmoc_config
// are modified
BOOST_AUTO_TEST_CASE( limits_not_enforced ) { try {
eosvmoc::config eosvmoc_config;
eosvmoc::config eosvmoc_config = make_eosvmoc_config_without_limits();
limit_not_violated_test(eosvmoc_config);
} FC_LOG_AND_RETHROW() }

// test VM limit are checked
BOOST_AUTO_TEST_CASE( vm_limit ) { try {
eosvmoc::config eosvmoc_config;
eosvmoc::config eosvmoc_config = make_eosvmoc_config_without_limits();

// set vm_limit to a small value such that it is exceeded
eosvmoc_config.vm_limit = 64u*1024u*1024u;
Expand All @@ -104,7 +113,7 @@ BOOST_AUTO_TEST_CASE( vm_limit ) { try {

// test stack size limit is checked
BOOST_AUTO_TEST_CASE( stack_limit ) { try {
eosvmoc::config eosvmoc_config;
eosvmoc::config eosvmoc_config = make_eosvmoc_config_without_limits();

// The stack size of the compiled WASM in the test is 104.
// Set stack_size_limit one less than the actual needed stack size
Expand All @@ -118,7 +127,7 @@ BOOST_AUTO_TEST_CASE( stack_limit ) { try {

// test generated code size limit is checked
BOOST_AUTO_TEST_CASE( generated_code_size_limit ) { try {
eosvmoc::config eosvmoc_config;
eosvmoc::config eosvmoc_config = make_eosvmoc_config_without_limits();

// The generated code size of the compiled WASM in the test is 36856.
// Set generated_code_size_limit to the actual generated code size
Expand Down