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

modules: use si_mem_available() when possible

Browse Source 
Signed-off-by: Michal Rakowski <michal.rakowski@intel.com>
This commit is contained in:
Michal Rakowski 2020-04-28 23:09:22 +02:00
parent 0621ca59b3
commit 1e9b7a4262
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure.d/1_global_page_state.conf
View File

@ -9,30 +9,39 @@
check() { check() {
cur_name=$(basename $2) cur_name=$(basename $2)
config_file_path=$1 config_file_path=$1
if compile_module $cur_name "global_zone_page_state(1)" "linux/mm.h" if compile_module $cur_name "si_mem_available()" "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_global_zone_page_state(enum zone_stat_item item) static inline unsigned long cas_get_free_mem(void)
{ { return si_mem_available() << PAGE_SHIFT;
return global_zone_page_state(item);
}" ;; }" ;;
"2") "2")
add_function " add_function "
static inline unsigned long cas_global_zone_page_state(enum zone_stat_item item) static inline unsigned long cas_get_free_mem(void)
{ {
return global_page_state(item); return global_zone_page_state(NR_FREE_PAGES) << PAGE_SHIFT;
}" ;;
"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

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_global_zone_page_state(NR_FREE_PAGES) << PAGE_SHIFT; return cas_get_free_mem();
} }
static inline void *env_malloc(size_t size, int flags) static inline void *env_malloc(size_t size, int flags)