Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 5.0 compat: Use totalram_pages() 

totalram_pages() was converted to an atomic variable in 5.0:

https://patchwork.kernel.org/patch/10652795/

Its value should now be read though the totalram_pages() helper
function.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #8263
This commit is contained in:
Tony Hutter 2019-01-10 14:28:10 -08:00 committed by Brian Behlendorf
parent 77e50c3070
commit 031cea17a3
4 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/kernel-totalram-pages-func.m4 Normal file
View File

@ -0,0 +1,18 @@
dnl #
dnl # Linux 5.0: totalram_pages is no longer a global variable, and must be
dnl # read via the totalram_pages() helper function.
dnl #
AC_DEFUN([ZFS_AC_KERNEL_TOTALRAM_PAGES_FUNC], [
AC_MSG_CHECKING([whether totalram_pages() exists])
ZFS_LINUX_TRY_COMPILE([
#include <linux/mm.h>
],[
unsigned long pages __attribute__ ((unused));
pages = totalram_pages();
],[
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_TOTALRAM_PAGES_FUNC, 1, [kernel has totalram_pages()])
],[
AC_MSG_RESULT(no)
])
])

1
config/kernel.m4
View File

@ -163,6 +163,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ZFS_AC_KERNEL_USERNS_CAPABILITIES ZFS_AC_KERNEL_USERNS_CAPABILITIES
ZFS_AC_KERNEL_IN_COMPAT_SYSCALL ZFS_AC_KERNEL_IN_COMPAT_SYSCALL
ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64 ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64
ZFS_AC_KERNEL_TOTALRAM_PAGES_FUNC
AS_IF([test "$LINUX_OBJ" != "$LINUX"], [ AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
KERNEL_MAKE="$KERNEL_MAKE O=$LINUX_OBJ" KERNEL_MAKE="$KERNEL_MAKE O=$LINUX_OBJ"

8
include/spl/sys/vmsystm.h
View File

@ -33,8 +33,14 @@
#include <sys/types.h> #include <sys/types.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#ifdef HAVE_TOTALRAM_PAGES_FUNC
#define zfs_totalram_pages totalram_pages()
#else
#define zfs_totalram_pages totalram_pages
#endif
#define membar_producer() smp_wmb() #define membar_producer() smp_wmb()
#define physmem totalram_pages #define physmem zfs_totalram_pages
#define freemem (nr_free_pages() + \ #define freemem (nr_free_pages() + \
global_page_state(NR_INACTIVE_FILE) + \ global_page_state(NR_INACTIVE_FILE) + \
global_page_state(NR_INACTIVE_ANON) + \ global_page_state(NR_INACTIVE_ANON) + \

4
module/zfs/arc.c
View File

@ -4821,9 +4821,9 @@ arc_all_memory(void)
{ {
#ifdef _KERNEL #ifdef _KERNEL
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
return (ptob(totalram_pages - totalhigh_pages)); return (ptob(zfs_totalram_pages - totalhigh_pages));
#else #else
return (ptob(totalram_pages)); return (ptob(zfs_totalram_pages));
#endif /* CONFIG_HIGHMEM */ #endif /* CONFIG_HIGHMEM */
#else #else
return (ptob(physmem) / 2); return (ptob(physmem) / 2);