TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-11 05:24:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Strong error testing on buddy allocator

Browse Source
This commit is contained in:
Baptiste Wicht 2018-03-28 15:23:21 +02:00
parent 2b5344319f
commit e1871c01bb
1 changed files with 72 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
kernel/include/buddy_allocator.hpp
View File

@ -65,22 +65,69 @@ public:
} }
} }
/*!
* \brief Compute the actual memory that will be reserved to
* allocate for this number of pages.
*/
size_t necessary_size(size_t pages){
if(pages <= max_block){
auto l = level(pages);
return level_size(l) * Unit;
} else if(pages <= max_block * static_bitmap::bits_per_word){
auto l = word_level(pages);
return word_level_size(l) * Unit;
} else {
//TODO Complete allocation for bigger blocks
return 0;
}
}
/*! /*!
* \brief Allocate memory for the given amount of pages * \brief Allocate memory for the given amount of pages
*/ */
size_t allocate(size_t pages){ size_t allocate(size_t pages){
if(pages > max_block){ if(pages <= max_block){
if(pages > max_block * static_bitmap::bits_per_word){ // 1. In the easy case, at most one block of the highest
logging::logf(logging::log_level::ERROR, "buddy: Impossible to allocate more than 33M block:%u\n", pages); // level will be used
//TODO Implement larger allocation
auto l = level(pages);
auto index = bitmaps[l].set_bit();
if(index == static_bitmap::npos){
logging::logf(logging::log_level::ERROR, "buddy: There is no free bit pages:%u level:%u index:%u address:%h\n", pages, l, index);
return 0; return 0;
} else { }
auto address = block_start(l, index);
if(address + level_size(l) * Unit >= last_address){
logging::logf(logging::log_level::ERROR, "buddy: Address too high pages:%u level:%u index:%u address:%h\n", pages, l, index, address);
return 0;
}
mark_used(l, index);
return address;
} else if(pages <= max_block * static_bitmap::bits_per_word){
// 2. In the more complex case, several contiguous
// bits are used to form a bigger block, only
// within a single word
// Select a level for which a whole word can hold the necessary pages // Select a level for which a whole word can hold the necessary pages
auto l = word_level(pages); auto l = word_level(pages);
auto index = bitmaps[l].set_word(); auto index = bitmaps[l].set_word();
if(index == static_bitmap::npos){
logging::logf(logging::log_level::ERROR, "buddy: There is no free word pages:%u level:%u index:%u address:%h\n", pages, l, index);
return 0;
}
auto address = block_start(l, index); auto address = block_start(l, index);
if(address + level_size(l) >= last_address){ if(address + word_level_size(l) * Unit >= last_address){
logging::logf(logging::log_level::ERROR, "buddy: Address too high level:%u index:%u address:%h\n", l, index, address); logging::logf(logging::log_level::ERROR, "buddy: Address too high level:%u index:%u address:%h\n", l, index, address);
return 0; return 0;
} }
@ -91,21 +138,15 @@ public:
} }
return address; return address;
}
} else { } else {
auto l = level(pages); // 3 In the most complex case, several contiguous
auto index = bitmaps[l].set_bit(); // words are needed to form a bigger block
auto address = block_start(l, index);
if(address + level_size(l) >= last_address){ logging::logf(logging::log_level::ERROR, "buddy: Impossible to allocate more than 33M block:%u\n", pages);
logging::logf(logging::log_level::ERROR, "buddy: Address too high pages:%u level:%u index:%u address:%h\n", pages, l, index, address);
//TODO Implement larger allocation
return 0; return 0;
} }
mark_used(l, index);
return address;
}
} }
/*! /*!
@ -142,6 +183,13 @@ public:
return pow(2, level); return pow(2, level);
} }
/*!
* \brief The size of the given level
*/
static size_t word_level_size(size_t level){
return static_bitmap::bits_per_word * pow(2, level);
}
private: private:
/*! /*!
* \brief Returns the level to use for the given amount of pages * \brief Returns the level to use for the given amount of pages