github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #631 from robertbaldyga/more-conservative-mem-check

Browse Source 
Restore more conservative free memory calculation method
This commit is contained in:
Robert Baldyga 2021-01-15 21:07:06 +01:00 committed by GitHub
commit a4753f3f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
configure.d/1_global_page_state.conf
View File

@ -7,42 +7,33 @@
. $(dirname $3)/conf_framework . $(dirname $3)/conf_framework
check() { check() {
cur_name=$(basename $2) cur_name=$(basename $2)
config_file_path=$1 config_file_path=$1
if compile_module $cur_name "si_mem_available()" "linux/mm.h" if compile_module $cur_name "global_zone_page_state(1)" "linux/mm.h"
then then
echo $cur_name "1" >> $config_file_path echo $cur_name "1" >> $config_file_path
elif compile_module $cur_name "global_page_state(1)" "linux/mm.h"
elif compile_module $cur_name "global_zone_page_state(1)" "linux/mm.h" then
then echo $cur_name "2" >> $config_file_path
echo $cur_name "2" >> $config_file_path else
elif compile_module $cur_name "global_page_state(1)" "linux/mm.h" echo $cur_name "X" >> $config_file_path
then fi
echo $cur_name "3" >> $config_file_path
else
echo $cur_name "X" >> $config_file_path
fi
} }
apply() { apply() {
case "$1" in case "$1" in
"1") "1")
add_function " add_function "
static inline unsigned long cas_get_free_mem(void) static inline unsigned long cas_global_zone_page_state(enum zone_stat_item item)
{ return si_mem_available() << PAGE_SHIFT; {
}" ;; return global_zone_page_state(item);
}" ;;
"2") "2")
add_function " add_function "
static inline unsigned long cas_get_free_mem(void) static inline unsigned long cas_global_zone_page_state(enum zone_stat_item item)
{ {
return global_zone_page_state(NR_FREE_PAGES) << PAGE_SHIFT; return global_page_state(item);
}" ;; }" ;;
"3")
add_function "
static inline unsigned long cas_get_free_mem(void)
{
return global_page_state(NR_FREE_PAGES) << PAGE_SHIFT;
}" ;;
*) *)
exit 1 exit 1
esac esac

2
modules/cas_cache/ocf_env.h
View File

@ -21,7 +21,7 @@
static inline uint64_t env_get_free_memory(void) static inline uint64_t env_get_free_memory(void)
{ {
return cas_get_free_mem(); return cas_global_zone_page_state(NR_FREE_PAGES) << PAGE_SHIFT;
} }
static inline void *env_malloc(size_t size, int flags) static inline void *env_malloc(size_t size, int flags)