Skip to contentSkip to conversation

autoconf: Check for MAP_SHARED_VALIDATE

PATCH In review Robert Elliott 3 participants 10 messages Feb 14, 2019 – Feb 15, 2019 libnvdimm: non-volatile memory device

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 autoconf: Check for MAP_SHARED_VALIDATE

Some ndctl tests use two new mmap() flags named MAP_SHARED_VALIDATE and MAP_SYNC that were added by linux kernel-4.15, intended to be defined for applications by sys/mman.h. However, these do not exist unless the distro has glibc-2.28.

In addition to the existing check for MAP_SYNC, check that MAP_SHARED_VALIDATE is provided.

Fixes 94679e6b78aa ("ndctl, test: check availability of MAP_SYNC for poison test")
---
 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
configure.ac +3 -2
index d27a2b1..efbdcde 100644
@@ -103,12 +103,13 @@ AS_IF([test "x$enable_test" = "xyes"],
 AM_CONDITIONAL([ENABLE_TEST], [test "x$enable_test" = "xyes"])
 
 AC_CHECK_DECLS([BUS_MCEERR_AR], [enable_bus_mc_err=yes], [], [[#include <signal.h>]])
+AC_CHECK_DECLS([MAP_SHARED_VALIDATE], [enable_map_shared_validate=yes], [], [[#include <sys/mman.h>]])
 AC_CHECK_DECLS([MAP_SYNC], [enable_map_sync=yes], [], [[#include <sys/mman.h>]])
 
-AS_IF([test "x$enable_bus_mc_err" = "xyes" -a "x$enable_map_sync" = "xyes"],
+AS_IF([test "x$enable_bus_mc_err" = "xyes" -a "x$enable_map_sync" = "xyes" -a "x$enable_map_shared_validate" = "xyes"],
 	[AC_DEFINE([ENABLE_POISON], [1], [ndctl test poison support])])
 AM_CONDITIONAL([ENABLE_POISON],
-	[test "x$enable_bus_mc_err" = "xyes" -a "x$enable_map_sync" = "xyes"])
+	[test "x$enable_bus_mc_err" = "xyes" -a "x$enable_map_sync" = "xyes" -a "x$enable_map_shared_validate" = "xyes"])
 
 PKG_CHECK_MODULES([KMOD], [libkmod])
 PKG_CHECK_MODULES([UDEV], [libudev])
Signature · 6 lines
2.20.1

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
#1 lore raw

PATCH 2/2 autoconf: print more possible package names for keyutils.h

The distro package names providing keyutils.h are inconsistent, so print more than just one suggestion:
keyutils-libs-devel (Red Hat)
keyutils-devel (SUSE)
libkeyutils-dev (Ubuntu)

Fixes 86b078b44275 ("ndctl: add passphrase management commands")
---
 configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
configure.ac +1 -2
index efbdcde..6c26934 100644
@@ -171,8 +171,7 @@ AC_ARG_WITH([keyutils],
 
 if test "x$with_keyutils" = "xyes"; then
 	AC_CHECK_HEADERS([keyutils.h],,[
-		AC_MSG_ERROR([keyutils.h not found, consider installing
-			      keyutils-libs-devel.])
+		AC_MSG_ERROR([keyutils.h not found, consider installing the keyutils library development package (variously named keyutils-libs-devel, keyutils-devel, or libkeyutils-dev).])
 		])
 fi
 AS_IF([test "x$with_keyutils" = "xyes"],
Signature · 6 lines
2.20.1

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Reviewed-by on v1 2/2
#2 lore raw

Re: [ndctl PATCH 2/2] autoconf: print more possible package names for keyutils.h

Quoted 9 lines · Robert Elliott

The distro package names providing keyutils.h are inconsistent, so print more than just one suggestion:
keyutils-libs-devel (Red Hat)
keyutils-devel (SUSE)
libkeyutils-dev (Ubuntu)

Fixes 86b078b44275 ("ndctl: add passphrase management commands")

Looks good to me.

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

#3 lore raw
In reply to Robert Elliott
Quoted 11 lines · Robert Elliott

Some ndctl tests use two new mmap() flags named MAP_SHARED_VALIDATE and MAP_SYNC that were added by linux kernel-4.15, intended to be defined for applications by sys/mman.h. However, these do not exist unless the distro has glibc-2.28.

In addition to the existing check for MAP_SYNC, check that MAP_SHARED_VALIDATE is provided.

Fixes 94679e6b78aa ("ndctl, test: check availability of MAP_SYNC for poison test")

Does this really fix anything? How can a system have MAP_SYNC without MAP_SHARED_VALIDATE?
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

#4 lore raw
Quoted 16 lines

-----Original Message-----
From: Dan Williams [mailto:[email protected]]
Sent: Thursday, February 14, 2019 10:54 AM
To: Elliott, Robert (Persistent Memory) <[email protected]>
Cc: linux-nvdimm <[email protected]>
Subject: Re: [ndctl PATCH 1/2] autoconf: Check for MAP_SHARED_VALIDATE

Quoted 6 lines · Robert Elliott

Some ndctl tests use two new mmap() flags named MAP_SHARED_VALIDATE and MAP_SYNC that were added by linux kernel-4.15, intended to be defined for applications by sys/mman.h. However, these do not exist unless the distro has glibc-2.28.

Quoted 8 lines
Quoted 5 lines

In addition to the existing check for MAP_SYNC, check that MAP_SHARED_VALIDATE is provided.

Fixes 94679e6b78aa ("ndctl, test: check availability of MAP_SYNC for poison test")

Does this really fix anything? How can a system have MAP_SYNC without MAP_SHARED_VALIDATE?

In glibc, MAP_SHARED_VALIDATE went into all architectures while MAP_SYNC did not - these are left out:
alpha hppa mips powerpc sparc tile

Checking both provides a breadcrumb about whether it's an overall glibc version problem or an architecture-specific problem.

BTW, the glibc patches at git://sourceware.org/git/glibc.git are these on 2018-02-06:

    e76def72eb74 ("Add MAP_SYNC from Linux 4.15.")
    92669d6ee3f2 ("Add MAP_SHARED_VALIDATE from Linux 4.15.")

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

#5 lore raw
Quoted 30 lines · Robert (Persistent Memory)
Quoted 17 lines

-----Original Message-----
From: Dan Williams [mailto:[email protected]]
Sent: Thursday, February 14, 2019 10:54 AM
To: Elliott, Robert (Persistent Memory) <[email protected]>
Cc: linux-nvdimm <[email protected]>
Subject: Re: [ndctl PATCH 1/2] autoconf: Check for MAP_SHARED_VALIDATE

Quoted 6 lines · Robert Elliott

Some ndctl tests use two new mmap() flags named MAP_SHARED_VALIDATE and MAP_SYNC that were added by linux kernel-4.15, intended to be defined for applications by sys/mman.h. However, these do not exist unless the distro has glibc-2.28.

Quoted 8 lines
Quoted 5 lines

In addition to the existing check for MAP_SYNC, check that MAP_SHARED_VALIDATE is provided.

Fixes 94679e6b78aa ("ndctl, test: check availability of MAP_SYNC for poison test")

Does this really fix anything? How can a system have MAP_SYNC without MAP_SHARED_VALIDATE?

In glibc, MAP_SHARED_VALIDATE went into all architectures while MAP_SYNC did not - these are left out:
alpha hppa mips powerpc sparc tile

Quoted 7 lines

Checking both provides a breadcrumb about whether it's an overall glibc version problem or an architecture-specific problem.

BTW, the glibc patches at git://sourceware.org/git/glibc.git are these on 2018-02-06:

    e76def72eb74 ("Add MAP_SYNC from Linux 4.15.")
    92669d6ee3f2 ("Add MAP_SHARED_VALIDATE from Linux 4.15.")

Ah, thanks for the clarification. Lets roll these details into the changelog.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

#6 lore raw

PATCH v2 1/3 autoconf: print more possible package names for <keyutils.h>

In reply to Robert Elliott

The distro package names providing <keyutils.h> are inconsistent, so print more than just one suggestion:
keyutils-libs-devel (Red Hat)
keyutils-devel (SUSE)
libkeyutils-dev (Ubuntu)

Fixes 86b078b44275 ("ndctl: add passphrase management commands")
---
 configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
configure.ac +1 -2
index d27a2b1..8e57a53 100644
@@ -170,8 +170,7 @@ AC_ARG_WITH([keyutils],
 
 if test "x$with_keyutils" = "xyes"; then
 	AC_CHECK_HEADERS([keyutils.h],,[
-		AC_MSG_ERROR([keyutils.h not found, consider installing
-			      keyutils-libs-devel.])
+		AC_MSG_ERROR([keyutils.h not found, consider installing the keyutils library development package (variously named keyutils-libs-devel, keyutils-devel, or libkeyutils-dev).])
 		])
 fi
 AS_IF([test "x$with_keyutils" = "xyes"],
Signature · 6 lines
2.20.1

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
#7 lore raw

PATCH v2 2/3 autoconf: Check for MAP_SHARED_VALIDATE and kernel/glibc conflicts

Some ndctl tests use two new mmap() flags named MAP_SHARED_VALIDATE and MAP_SYNC that were added by linux kernel-4.15, intended to be defined for applications by sys/mman.h. However, these do not always exist; the distro must have glibc-2.28 and the architecture must support MAP_SYNC.

In glibc-2.28, MAP_SHARED_VALIDATE was incorporated for all architectures while MAP_SYNC was left out for these:
alpha hppa mips powerpc sparc tile

See these git://sourceware.org/git/glibc.git commits on 2018-02-06:

    e76def72eb74 ("Add MAP_SYNC from Linux 4.15.")
    92669d6ee3f2 ("Add MAP_SHARED_VALIDATE from Linux 4.15.")

Expand the current check for MAP_SYNC to check both MAP_SHARED_VALIDATE and MAP_SYNC in <linux/mman.h> and <sys/mman.h> and suggest remedies for each possible combination of results:

    kernel  glibc  where defined?
      4.14   2.17  neither
      4.14   2.18  neither
      4.15   2.17  <linux/mman.h>
      4.15   2.18  <sys/mman.h> and <linux/mman.h>
Fixes 94679e6b78aa ("ndctl, test: check availability of MAP_SYNC for poison test")
---
 configure.ac | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)
configure.ac +20 -2
index 8e57a53..6dca96e 100644
@@ -103,12 +103,30 @@ AS_IF([test "x$enable_test" = "xyes"],
 AM_CONDITIONAL([ENABLE_TEST], [test "x$enable_test" = "xyes"])
 
 AC_CHECK_DECLS([BUS_MCEERR_AR], [enable_bus_mc_err=yes], [], [[#include <signal.h>]])
+AC_CHECK_DECLS([MAP_SHARED_VALIDATE], [kernel_map_shared_validate=yes], [], [[#include <linux/mman.h>]])
+AC_CHECK_DECLS([MAP_SYNC], [kernel_map_sync=yes], [], [[#include <linux/mman.h>]])
+AS_UNSET([ac_cv_have_decl_MAP_SHARED_VALIDATE])
+AS_UNSET([ac_cv_have_decl_MAP_SYNC])
+AC_CHECK_DECLS([MAP_SHARED_VALIDATE], [enable_map_shared_validate=yes], [], [[#include <sys/mman.h>]])
 AC_CHECK_DECLS([MAP_SYNC], [enable_map_sync=yes], [], [[#include <sys/mman.h>]])
 
-AS_IF([test "x$enable_bus_mc_err" = "xyes" -a "x$enable_map_sync" = "xyes"],
+if test "x$kernel_map_shared_validate" = "xyes" -a "x$enable_map_shared_validate" != "xyes" ; then
+	AC_MSG_WARN([MAP_SHARED_VALIDATE supported by kernel but not by <sys/mman.h>, consider installing glibc-2.28 or later.])
+fi
+if test "x$kernel_map_shared_validate" != "xyes" -a "x$enable_map_shared_validate" != "xyes" ; then
+	AC_MSG_WARN([MAP_SHARED_VALIDATE not supported by kernel, consider installing kernel-4.15 or later.])
+fi
+if test "x$kernel_map_sync" = "xyes" -a "x$enable_map_sync" != "xyes" ; then
+	AC_MSG_WARN([MAP_SYNC supported by kernel but not by <sys/mman.h>, consider installing glibc-2.28 or later.])
+fi
+if test "x$kernel_map_sync" != "xyes" -a "x$enable_map_sync" != "xyes" ; then
+	AC_MSG_WARN([MAP_SYNC not supported by kernel or architecture, consider installing kernel-4.15 or later.])
+fi
+
+AS_IF([test "x$enable_bus_mc_err" = "xyes" -a "x$enable_map_sync" = "xyes" -a "x$enable_map_shared_validate" = "xyes"],
 	[AC_DEFINE([ENABLE_POISON], [1], [ndctl test poison support])])
 AM_CONDITIONAL([ENABLE_POISON],
-	[test "x$enable_bus_mc_err" = "xyes" -a "x$enable_map_sync" = "xyes"])
+	[test "x$enable_bus_mc_err" = "xyes" -a "x$enable_map_sync" = "xyes" -a "x$enable_map_shared_validate" = "xyes"])
 
 PKG_CHECK_MODULES([KMOD], [libkmod])
 PKG_CHECK_MODULES([UDEV], [libudev])
Signature · 6 lines
2.20.1

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
#8 lore raw

PATCH v2 3/3 ndctl, test: Make tests using MAP_SYNC only include <sys/mman.h>

In reply to Robert Elliott

The kernel-4.15 mmap() manpage defines that MAP_SHARED_VALIDATE and MAP_SYNC are provided to applications by <sys/mman.h>. This requires glibc-2.28 and architecture support.

Although they are also available via <linux/mman.h>, that is not the defined API.

Make tests using it (currently only dax-poison) rely on <sys/mman.h> by removing inclusion of <linux/mman.h>.

Fixes e6a1d12d4a6e2 ("ndctl: autoconf detect BUS_MCEERR_AR")
---
 test/dax-poison.c | 1 -
 1 file changed, 1 deletion(-)
test/dax-poison.c +0 -1
index a25bf0b..69bb161 100644
@@ -5,7 +5,6 @@
 #include <signal.h>
 #include <setjmp.h>
 #include <sys/mman.h>
-#include <linux/mman.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
Signature · 6 lines
2.20.1

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Reviewed-by on v2 1/3
#9 lore raw

Re: [ndctl PATCH v2 1/3] autoconf: print more possible package names for <keyutils.h>

In reply to Robert Elliott
Quoted 9 lines · Robert Elliott

The distro package names providing <keyutils.h> are inconsistent, so print more than just one suggestion:
keyutils-libs-devel (Red Hat)
keyutils-devel (SUSE)
libkeyutils-dev (Ubuntu)

Fixes 86b078b44275 ("ndctl: add passphrase management commands")

V2

Quoted 25 lines
---
 configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
configure.ac +1 -2
index d27a2b1..8e57a53 100644
@@ -170,8 +170,7 @@ AC_ARG_WITH([keyutils],
 
 if test "x$with_keyutils" = "xyes"; then
 	AC_CHECK_HEADERS([keyutils.h],,[
-		AC_MSG_ERROR([keyutils.h not found, consider installing
-			      keyutils-libs-devel.])
+		AC_MSG_ERROR([keyutils.h not found, consider installing the keyutils library development package (variously named keyutils-libs-devel, keyutils-devel, or libkeyutils-dev).])
 		])
 fi
 AS_IF([test "x$with_keyutils" = "xyes"],
Signature · 6 lines
2.20.1

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm