3e29e1971b
Commit dcdc12e added compatibility code to treat NR_SLAB_RECLAIMABLE_B
as if it were the same as NR_SLAB_RECLAIMABLE. However, the new value
is in bytes while the old value was in pages which means they are not
interchangeable.
The only place the reclaimable slab size is used is as a component of
the calculation done by arc_free_memory(). This function returns the
amount of memory the ARC considers to be free or reclaimable at little
cost. Rather than switch to a new interface to get this value it has
been removed it from the calculation. It is normally a minor component
compared to the number of inactive or free pages, and removing it
aligns the behavior with the FreeBSD version of arc_free_memory().
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Coleman Kane <ckane@colemankane.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #10834
129 lines
3.7 KiB
Plaintext
129 lines
3.7 KiB
Plaintext
dnl #
|
|
dnl # 4.8 API change
|
|
dnl #
|
|
dnl # 75ef71840539 mm, vmstat: add infrastructure for per-node vmstats
|
|
dnl # 599d0c954f91 mm, vmscan: move LRU lists to node
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_SRC_GLOBAL_NODE_PAGE_STATE], [
|
|
ZFS_LINUX_TEST_SRC([global_node_page_state], [
|
|
#include <linux/mm.h>
|
|
#include <linux/vmstat.h>
|
|
],[
|
|
(void) global_node_page_state(0);
|
|
])
|
|
])
|
|
|
|
AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_NODE_PAGE_STATE], [
|
|
AC_MSG_CHECKING([whether global_node_page_state() exists])
|
|
ZFS_LINUX_TEST_RESULT([global_node_page_state], [
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(ZFS_GLOBAL_NODE_PAGE_STATE, 1,
|
|
[global_node_page_state() exists])
|
|
],[
|
|
AC_MSG_RESULT(no)
|
|
])
|
|
])
|
|
|
|
dnl #
|
|
dnl # 4.14 API change
|
|
dnl #
|
|
dnl # c41f012ade0b mm: rename global_page_state to global_zone_page_state
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_SRC_GLOBAL_ZONE_PAGE_STATE], [
|
|
ZFS_LINUX_TEST_SRC([global_zone_page_state], [
|
|
#include <linux/mm.h>
|
|
#include <linux/vmstat.h>
|
|
],[
|
|
(void) global_zone_page_state(0);
|
|
])
|
|
])
|
|
|
|
AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE], [
|
|
AC_MSG_CHECKING([whether global_zone_page_state() exists])
|
|
ZFS_LINUX_TEST_RESULT([global_zone_page_state], [
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(ZFS_GLOBAL_ZONE_PAGE_STATE, 1,
|
|
[global_zone_page_state() exists])
|
|
],[
|
|
AC_MSG_RESULT(no)
|
|
])
|
|
])
|
|
|
|
dnl #
|
|
dnl # Create a define and autoconf variable for an enum member
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_ENUM_MEMBER], [
|
|
AC_MSG_CHECKING([whether enum $2 contains $1])
|
|
AS_IF([AC_TRY_COMMAND(
|
|
"${srcdir}/scripts/enum-extract.pl" "$2" "$3" | egrep -qx $1)],[
|
|
AC_MSG_RESULT([yes])
|
|
AC_DEFINE(m4_join([_], [ZFS_ENUM], m4_toupper($2), $1), 1,
|
|
[enum $2 contains $1])
|
|
m4_join([_], [ZFS_ENUM], m4_toupper($2), $1)=1
|
|
],[
|
|
AC_MSG_RESULT([no])
|
|
])
|
|
])
|
|
|
|
dnl #
|
|
dnl # Sanity check helpers
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_ERROR],[
|
|
AC_MSG_RESULT(no)
|
|
AC_MSG_RESULT([$1 in either node_stat_item or zone_stat_item: $2])
|
|
ZFS_LINUX_TEST_ERROR([global page state])
|
|
])
|
|
|
|
AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK], [
|
|
enum_check_a="m4_join([_], [$ZFS_ENUM_NODE_STAT_ITEM], $1)"
|
|
enum_check_b="m4_join([_], [$ZFS_ENUM_ZONE_STAT_ITEM], $1)"
|
|
AS_IF([test -n "$enum_check_a" -a -n "$enum_check_b"],[
|
|
ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_ERROR([$1], [DUPLICATE])
|
|
])
|
|
AS_IF([test -z "$enum_check_a" -a -z "$enum_check_b"],[
|
|
ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_ERROR([$1], [NOT FOUND])
|
|
])
|
|
])
|
|
|
|
dnl #
|
|
dnl # Ensure the config tests are finding one and only one of each enum.
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY], [
|
|
AC_MSG_CHECKING([whether global_page_state enums are sane])
|
|
|
|
ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_FILE_PAGES])
|
|
ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_INACTIVE_ANON])
|
|
ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_INACTIVE_FILE])
|
|
|
|
AC_MSG_RESULT(yes)
|
|
])
|
|
|
|
AC_DEFUN([ZFS_AC_KERNEL_SRC_GLOBAL_PAGE_STATE], [
|
|
ZFS_AC_KERNEL_SRC_GLOBAL_NODE_PAGE_STATE
|
|
ZFS_AC_KERNEL_SRC_GLOBAL_ZONE_PAGE_STATE
|
|
])
|
|
|
|
dnl #
|
|
dnl # enum members in which we're interested
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE], [
|
|
ZFS_AC_KERNEL_GLOBAL_NODE_PAGE_STATE
|
|
ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE
|
|
|
|
ZFS_AC_KERNEL_ENUM_MEMBER([NR_FILE_PAGES],
|
|
[node_stat_item], [$LINUX/include/linux/mmzone.h])
|
|
ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_ANON],
|
|
[node_stat_item], [$LINUX/include/linux/mmzone.h])
|
|
ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE],
|
|
[node_stat_item], [$LINUX/include/linux/mmzone.h])
|
|
|
|
ZFS_AC_KERNEL_ENUM_MEMBER([NR_FILE_PAGES],
|
|
[zone_stat_item], [$LINUX/include/linux/mmzone.h])
|
|
ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_ANON],
|
|
[zone_stat_item], [$LINUX/include/linux/mmzone.h])
|
|
ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE],
|
|
[zone_stat_item], [$LINUX/include/linux/mmzone.h])
|
|
|
|
ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY
|
|
])
|