LU-16699 osc: Prefer NR_ZONE_WRITE_PENDING

Linux commit v4.7-5966-g5a1c84b404a7
 mm: remove reclaim and compaction retry approximations

Introduced NR_ZONE_WRITE_PENDING which should be used
in mod_zone_page_state.

Older kernels should fallback to NR_UNSTABLE_NFS
or NR_WRITEBACK.

Lustre-change: https://review.whamcloud.com/50499
Lustre-commit: d4094475c990d6ee8bf9e6e32a93f7c86a78f57a

Test-Parameters: trivial
HPE-bug-id: LUS-11559
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I90f22d4bd56f5986eaa5d4a042a2c8ed31fbf752
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Neil Brown <neilb@suse.de>
Reviewed-by: Qian Yingjin <qian@ddn.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/52526
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 83390ae..9b2a8d4 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -740,6 +740,28 @@ AC_DEFUN([LIBCFS_RHASHTABLE_INSERT_FAST], [
 ]) # LIBCFS_RHASHTABLE_INSERT_FAST
 
 #
+# LIBCFS_HAVE_NR_ZONE_WRITE_PENDING
+#
+# kernel v4.7-5966-g5a1c84b404a7
+# mm: remove reclaim and compaction retry approximations
+#
+AC_DEFUN([LIBCFS_SRC_HAVE_NR_ZONE_WRITE_PENDING], [
+       LB2_LINUX_TEST_SRC([nr_zone_write_pending_exists], [
+               #include <linux/mmzone.h>
+       ],[
+               enum zone_stat_item item = NR_ZONE_WRITE_PENDING;
+               (void)item;
+       ],[-Werror])
+])
+AC_DEFUN([LIBCFS_HAVE_NR_ZONE_WRITE_PENDING], [
+       AC_MSG_CHECKING([if NR_ZONE_WRITE_PENDING is available])
+       LB2_LINUX_TEST_RESULT([nr_zone_write_pending_exists], [
+               AC_DEFINE(HAVE_NR_ZONE_WRITE_PENDING, 1,
+                       [NR_ZONE_WRITE_PENDING is still in use.])
+       ])
+]) # LIBCFS_HAVE_NR_ZONE_WRITE_PENDING
+
+#
 # Kernel version 4.7-rc1 commit 8f6fd83c6c5ec66a4a70c728535ddcdfef4f3697
 # added 3rd arg to rhashtable_walk_init
 #
@@ -2120,6 +2142,7 @@ AC_DEFUN([LIBCFS_PROG_LINUX_SRC], [
        LIBCFS_SRC_RHASHTABLE_INSERT_FAST
        LIBCFS_SRC_RHASHTABLE_WALK_INIT_3ARG
        # 4.8
+       LIBCFS_SRC_HAVE_NR_ZONE_WRITE_PENDING
        LIBCFS_SRC_RHASHTABLE_LOOKUP
        LIBCFS_SRC_RHLTABLE
        LIBCFS_SRC_STACKTRACE_OPS
@@ -2249,6 +2272,7 @@ AC_DEFUN([LIBCFS_PROG_LINUX_RESULTS], [
        LIBCFS_RHASHTABLE_INSERT_FAST
        LIBCFS_RHASHTABLE_WALK_INIT_3ARG
        # 4.8
+       LIBCFS_HAVE_NR_ZONE_WRITE_PENDING
        LIBCFS_RHASHTABLE_LOOKUP
        LIBCFS_RHLTABLE
        LIBCFS_STACKTRACE_OPS

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index 7731d93..99873da 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -905,7 +905,9 @@ void osc_lru_unreserve(struct client_obd *cli, unsigned long npages)
 /* Old kernels use a separate counter for unstable pages,
  * newer kernels treat them like any other writeback.
  */
-#define NR_WRITEBACK NR_UNSTABLE_NFS
+#define NR_ZONE_WRITE_PENDING          ((enum zone_stat_item)NR_UNSTABLE_NFS)
+#elif !defined(HAVE_NR_ZONE_WRITE_PENDING)
+#define NR_ZONE_WRITE_PENDING          ((enum zone_stat_item)NR_WRITEBACK)
 #endif
 
 static inline void unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
@@ -932,7 +934,7 @@ static inline void unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
                }
 
                if (count > 0) {
-                       mod_zone_page_state(zone, NR_WRITEBACK,
+                       mod_zone_page_state(zone, NR_ZONE_WRITE_PENDING,
                                            factor * count);
                        count = 0;
                }
@@ -940,7 +942,8 @@ static inline void unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
                ++count;
        }
        if (count > 0)
-               mod_zone_page_state(zone, NR_WRITEBACK, factor * count);
+               mod_zone_page_state(zone, NR_ZONE_WRITE_PENDING,
+                                   factor * count);
 
        EXIT;
 }