/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Mar 19 17:33:49 UTC 2014
changeset 7d844153dc95 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7d844153dc95
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Mar 18 12:32:37 2014 +0000
S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
S8026887: Make issues due to failed large pages allocations easier to debug
2014-03-17 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* NEWS: Updated.
* patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch,
* patches/openjdk/8013057-detect_mmap_commit_failures.patch,
* patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch:
Backports to improve mmap failure output.
changeset 975cb4907b2e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=975cb4907b2e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Mar 19 17:33:09 2014 +0000
PR1714: Update PaX support to detect running PaX kernel and use newer tools
2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1714: Update PaX support to detect running PaX
kernel and use newer tools
* Makefile.am:
(clean-local): Remove clean-icedtea, clean-icedtea-debug
and clean-icedtea-ecj; pulled in by dependents.
(.PHONY): Add clean-runnable-icedtea, clean-runnable-icedtea-debug
and clean-runnable-icedtea-ecj.
(runnable-icedtea): Depend on icedtea and pax-mark-vm.
(clean-runnable-icedtea): Clean stamp.
(icedtea-against-icedtea): Depend on runnable-icedtea rather
than icedtea and pax-mark-vm.
(clean-icedtea-against-icedtea): Depend on clean-runnable-icedtea rather
than clean-pax-mark-vm.
(runnable-icedtea-debug): Depend on icedtea-debug and pax-mark-vm-debug.
(clean-runnable-icedtea-debug): Clean stamp.
(icedtea-debug-against-icedtea): Depend on runnable-icedtea-debug rather
than icedtea-debug and pax-mark-vm-debug.
(clean-icedtea-debug-against-icedtea): Depend on clean-runnable-icedtea-debug
rather than clean-pax-mark-vm.
(add-archive): Depend on runnable-icedtea as the target executes java.
(add-archive-debug): Likewise with runnable-icedtea-debug.
(check-crypto): Depend on runnable-icedtea as the target executes java.
(check-crypto-debug): Likewise with runnable-icedtea-debug.
(runnable-icedtea-ecj): Depend on icedtea-ecj and pax-mark-vm-ecj.
(clean-runnable-icedtea-ecj): Clean stamp.
(icedtea-against-ecj): Depend on runnable-icedtea-ecj rather
than icedtea-ecj and pax-mark-vm-ecj.
(clean-icedtea-against-ecj): Depend on clean-runnable-icedtea-ecj
rather than clean-pax-mark-vm.
(add-archive-ecj): Depend on runnable-icedtea-ecj as the target executes java.
(check-crypto-boot): Depend on runnable-icedtea-ecj as the target executes java.
* NEWS: Updated.
* acinclude.m4:
(IT_HAS_PAX): New macro to detect whether the running
kernel uses PaX.
(IT_WITH_PAX): Rewritten to search for PaX tools -
currently paxmark.sh, paxctl-ng, chpax and paxctl -
and fail if a tool isn't found and a PaX kernel is
being used.
diffstat:
ChangeLog | 52 +
Makefile.am | 66 +-
NEWS | 7 +
acinclude.m4 | 95 +-
patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch | 29 +
patches/openjdk/8013057-detect_mmap_commit_failures.patch | 867 ++++++++++
patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch | 81 +
7 files changed, 1144 insertions(+), 53 deletions(-)
diffs (truncated from 1348 to 500 lines):
diff -r 963a9ab43d7f -r 975cb4907b2e ChangeLog
--- a/ChangeLog Thu Jan 30 21:38:08 2014 +0000
+++ b/ChangeLog Wed Mar 19 17:33:09 2014 +0000
@@ -1,3 +1,55 @@
+2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1714: Update PaX support to detect running PaX
+ kernel and use newer tools
+ * Makefile.am:
+ (clean-local): Remove clean-icedtea, clean-icedtea-debug
+ and clean-icedtea-ecj; pulled in by dependents.
+ (.PHONY): Add clean-runnable-icedtea, clean-runnable-icedtea-debug
+ and clean-runnable-icedtea-ecj.
+ (runnable-icedtea): Depend on icedtea and pax-mark-vm.
+ (clean-runnable-icedtea): Clean stamp.
+ (icedtea-against-icedtea): Depend on runnable-icedtea rather
+ than icedtea and pax-mark-vm.
+ (clean-icedtea-against-icedtea): Depend on clean-runnable-icedtea rather
+ than clean-pax-mark-vm.
+ (runnable-icedtea-debug): Depend on icedtea-debug and pax-mark-vm-debug.
+ (clean-runnable-icedtea-debug): Clean stamp.
+ (icedtea-debug-against-icedtea): Depend on runnable-icedtea-debug rather
+ than icedtea-debug and pax-mark-vm-debug.
+ (clean-icedtea-debug-against-icedtea): Depend on clean-runnable-icedtea-debug
+ rather than clean-pax-mark-vm.
+ (add-archive): Depend on runnable-icedtea as the target executes java.
+ (add-archive-debug): Likewise with runnable-icedtea-debug.
+ (check-crypto): Depend on runnable-icedtea as the target executes java.
+ (check-crypto-debug): Likewise with runnable-icedtea-debug.
+ (runnable-icedtea-ecj): Depend on icedtea-ecj and pax-mark-vm-ecj.
+ (clean-runnable-icedtea-ecj): Clean stamp.
+ (icedtea-against-ecj): Depend on runnable-icedtea-ecj rather
+ than icedtea-ecj and pax-mark-vm-ecj.
+ (clean-icedtea-against-ecj): Depend on clean-runnable-icedtea-ecj
+ rather than clean-pax-mark-vm.
+ (add-archive-ecj): Depend on runnable-icedtea-ecj as the target executes java.
+ (check-crypto-boot): Depend on runnable-icedtea-ecj as the target executes java.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_HAS_PAX): New macro to detect whether the running
+ kernel uses PaX.
+ (IT_WITH_PAX): Rewritten to search for PaX tools -
+ currently paxmark.sh, paxctl-ng, chpax and paxctl -
+ and fail if a tool isn't found and a PaX kernel is
+ being used.
+
+2014-03-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches.
+ * NEWS: Updated.
+ * patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch,
+ * patches/openjdk/8013057-detect_mmap_commit_failures.patch,
+ * patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch:
+ Backports to improve mmap failure output.
+
2014-01-30 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add 1.11.15 release notes.
diff -r 963a9ab43d7f -r 975cb4907b2e Makefile.am
--- a/Makefile.am Thu Jan 30 21:38:08 2014 +0000
+++ b/Makefile.am Wed Mar 19 17:33:09 2014 +0000
@@ -630,7 +630,10 @@
patches/windows-jdk-sizecalc.patch \
patches/shark_fixes_from_8003868.patch \
patches/8003992_support_6.patch \
- patches/shark-drop_compile_method_arg_following_7083786.patch
+ patches/shark-drop_compile_method_arg_following_7083786.patch \
+ patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch \
+ patches/openjdk/8013057-detect_mmap_commit_failures.patch \
+ patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -966,8 +969,8 @@
fi
clean-local: clean-tests $(PULSE_JAVA_CLEAN_TARGET) \
- clean-icedtea clean-icedtea-debug clean-icedtea-ecj clean-extract clean-ports \
- clean-overlay clean-native-ecj clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
+ clean-extract clean-ports clean-overlay clean-native-ecj \
+ clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \
clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \
@@ -1011,7 +1014,8 @@
clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts \
clean-download-hotspot clean-tests clean-tapset-report jtregcheck clean-pax-mark-vm \
clean-pax-mark-vm-debug clean-pax-mark-vm-ecj clean-check-crypto clean-check-crypto-debug \
- clean-check-crypto-boot clean-cryptocheck
+ clean-check-crypto-boot clean-cryptocheck clean-runnable-icedtea clean-runnable-icedtea-debug \
+ clean-runnable-icedtea-ecj
env:
@echo 'unset JAVA_HOME'
@@ -1720,31 +1724,44 @@
rm -rf $(DEBUG_BUILD_OUTPUT_DIR)
rm -f stamps/icedtea-debug.stamp
-stamps/icedtea-against-icedtea.stamp: stamps/icedtea.stamp \
+stamps/runnable-icedtea.stamp: stamps/icedtea.stamp stamps/pax-mark-vm.stamp
+ mkdir -p stamps
+ touch $@
+
+clean-runnable-icedtea: clean-icedtea clean-pax-mark-vm
+ rm -f stamps/runnable-icedtea.stamp
+
+stamps/icedtea-against-icedtea.stamp: stamps/runnable-icedtea.stamp \
stamps/add-jamvm.stamp stamps/add-cacao.stamp stamps/add-zero.stamp \
stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp \
- stamps/add-tzdata-support.stamp stamps/add-archive.stamp stamps/pax-mark-vm.stamp \
- stamps/check-crypto.stamp
+ stamps/add-tzdata-support.stamp stamps/add-archive.stamp stamps/check-crypto.stamp
mkdir -p stamps
touch $@
clean-icedtea-against-icedtea: clean-add-jamvm clean-add-zero clean-add-cacao \
clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support \
- clean-add-archive clean-pax-mark-vm clean-check-crypto
+ clean-add-archive clean-check-crypto clean-runnable-icedtea
rm -f stamps/icedtea-against-icedtea.stamp
-stamps/icedtea-debug-against-icedtea.stamp: stamps/icedtea-debug.stamp \
+stamps/runnable-icedtea-debug.stamp: stamps/icedtea-debug.stamp stamps/pax-mark-vm-debug.stamp
+ mkdir -p stamps
+ touch $@
+
+clean-runnable-icedtea-debug: clean-icedtea-debug clean-pax-mark-vm-debug
+ rm -f stamps/runnable-icedtea-debug.stamp
+
+stamps/icedtea-debug-against-icedtea.stamp: stamps/runnable-icedtea-debug.stamp \
stamps/add-jamvm-debug.stamp stamps/add-cacao-debug.stamp \
stamps/add-zero-debug.stamp stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \
stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp stamps/add-archive-debug.stamp \
- stamps/pax-mark-vm-debug.stamp stamps/check-crypto-debug.stamp
+ stamps/check-crypto-debug.stamp
mkdir -p stamps
touch $@
clean-icedtea-debug-against-icedtea: clean-add-zero-debug \
clean-add-jamvm-debug clean-add-cacao-debug clean-add-systemtap-debug \
clean-add-pulseaudio-debug clean-add-nss-debug clean-add-tzdata-support-debug \
- clean-add-archive-debug clean-pax-mark-vm-debug clean-check-crypto-debug
+ clean-add-archive-debug clean-runnable-icedtea-debug clean-check-crypto-debug
rm -f stamps/icedtea-debug-against-icedtea.stamp
stamps/add-systemtap.stamp: stamps/icedtea.stamp
@@ -1986,7 +2003,7 @@
fi
rm -f stamps/add-tzdata-support-debug.stamp
-stamps/add-archive.stamp: stamps/icedtea.stamp
+stamps/add-archive.stamp: stamps/runnable-icedtea.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
@@ -2002,7 +2019,7 @@
rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
rm -f stamps/add-archive.stamp
-stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
+stamps/add-archive-debug.stamp: stamps/runnable-icedtea-debug.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
@@ -2036,7 +2053,7 @@
clean-pax-mark-vm-debug:
rm -f stamps/pax-mark-vm-debug.stamp
-stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
+stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/runnable-icedtea.stamp
if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
@@ -2046,7 +2063,7 @@
clean-check-crypto:
rm -f stamps/check-crypto.stamp
-stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
+stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/runnable-icedtea-debug.stamp
if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
@@ -2075,14 +2092,21 @@
rm -rf $(ECJ_BUILD_OUTPUT_DIR)
rm -f stamps/icedtea-ecj.stamp
-stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp stamps/add-systemtap-ecj.stamp \
- stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp \
- stamps/add-archive-ecj.stamp stamps/pax-mark-vm-ecj.stamp stamps/check-crypto-boot.stamp
+stamps/runnable-icedtea-ecj.stamp: stamps/icedtea-ecj.stamp stamps/pax-mark-vm-ecj.stamp
mkdir -p stamps
touch $@
+clean-runnable-icedtea-ecj: clean-icedtea-ecj clean-pax-mark-vm-ecj
+ rm -f stamps/runnable-icedtea-ecj.stamp
+
+stamps/icedtea-against-ecj.stamp: stamps/runnable-icedtea-ecj.stamp stamps/add-systemtap-ecj.stamp \
+ stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp \
+ stamps/add-archive-ecj.stamp stamps/check-crypto-boot.stamp
+ mkdir -p stamps
+ touch $@
+
clean-icedtea-against-ecj: clean-add-systemtap-ecj clean-add-pulseaudio-ecj clean-add-nss-ecj \
- clean-add-tzdata-support-ecj clean-add-archive-ecj clean-pax-mark-vm-ecj clean-check-crypto-boot
+ clean-add-tzdata-support-ecj clean-add-archive-ecj clean-runnable-icedtea-ecj clean-check-crypto-boot
rm -f stamps/icedtea-against-ecj.stamp
stamps/add-systemtap-ecj.stamp: stamps/icedtea-ecj.stamp
@@ -2205,7 +2229,7 @@
fi
rm -f stamps/add-tzdata-support-ecj.stamp
-stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp
+stamps/add-archive-ecj.stamp: stamps/runnable-icedtea-ecj.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
@@ -2230,7 +2254,7 @@
clean-pax-mark-vm-ecj:
rm -f stamps/pax-mark-vm-ecj.stamp
-stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-ecj.stamp
+stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/runnable-icedtea-ecj.stamp
if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
diff -r 963a9ab43d7f -r 975cb4907b2e NEWS
--- a/NEWS Thu Jan 30 21:38:08 2014 +0000
+++ b/NEWS Wed Mar 19 17:33:09 2014 +0000
@@ -14,6 +14,13 @@
New in release 1.14.0 (201X-XX-XX):
+* Backports
+ - S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
+ - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
+ - S8026887: Make issues due to failed large pages allocations easier to debug
+* Bug fixes
+ - PR1714: Update PaX support to detect running PaX kernel and use newer tools
+
New in release 1.11.15 (2014-01-21):
* Security fixes
diff -r 963a9ab43d7f -r 975cb4907b2e acinclude.m4
--- a/acinclude.m4 Thu Jan 30 21:38:08 2014 +0000
+++ b/acinclude.m4 Wed Mar 19 17:33:09 2014 +0000
@@ -2139,48 +2139,79 @@
AM_CONDITIONAL([VM_SUPPORTS_XBOOTCLASSPATH], test x"${it_cv_xbootclasspath_works}" = "xyes")
])
+AC_DEFUN_ONCE([IT_HAS_PAX],
+[
+ AC_MSG_CHECKING([if a PaX kernel is in use])
+ if cat /proc/self/status | grep '^PaX' >&AS_MESSAGE_LOG_FD 2>&1; then
+ pax_active=yes;
+ else
+ pax_active=no;
+ fi
+ AC_MSG_RESULT([${pax_active}])
+ AM_CONDITIONAL([USING_PAX], test x"${pax_active}" = "xyes")
+])
+
AC_DEFUN_ONCE([IT_WITH_PAX],
[
- AC_MSG_CHECKING([for pax utility to use])
+ AC_REQUIRE([IT_HAS_PAX])
+ PAX_DEFAULT=/usr/sbin/paxmark.sh
+ AC_MSG_CHECKING([if a PaX utility was specified])
AC_ARG_WITH([pax],
[AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
[
- PAX_COMMAND=${withval}
- if test "x${PAX_COMMAND}" = "xno"; then
- PAX_COMMAND="not specified"
+ if test "x${withval}" = "xyes"; then
+ PAX_COMMAND=no
+ else
+ PAX_COMMAND="${withval}"
fi
],
[
+ PAX_COMMAND=no
+ ])
+ AC_MSG_RESULT(${PAX_COMMAND})
+ if test "x${PAX_COMMAND}" == "xno"; then
+ PAX_COMMAND=${PAX_DEFAULT}
+ fi
+ AC_MSG_CHECKING([if $PAX_COMMAND is a valid executable file])
+ if test -x "${PAX_COMMAND}" && test -f "${PAX_COMMAND}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PAX_COMMAND=""
+ AC_PATH_PROG(PAX_COMMAND, "paxmark.sh")
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl-ng")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "chpax")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ if test "x${pax_active}" = "xyes"; then
+ AC_MSG_ERROR("No PaX utility found and running on a PaX kernel.")
+ else
+ AC_MSG_WARN("No PaX utility found.")
+ fi
+ fi
+ fi
+ if test -z "${PAX_COMMAND}"; then
PAX_COMMAND="not specified"
- ])
- case "x${PAX_COMMAND}" in
- xchpax)
- case "${host_cpu}" in
- i?86)
- PAX_COMMAND_ARGS="-msp"
- ;;
- *)
- PAX_COMMAND_ARGS="-m"
- ;;
- esac
- ;;
- xpaxctl)
- case "${host_cpu}" in
- i?86)
- PAX_COMMAND_ARGS="-msp"
- ;;
- *)
- PAX_COMMAND_ARGS="-m"
- ;;
- esac
- ;;
- *)
- PAX_COMMAND="not specified"
- PAX_COMMAND_ARGS="not specified"
- ;;
- esac
+ PAX_COMMAND_ARGS="not specified"
+ else
+ AC_MSG_CHECKING([which options to pass to ${PAX_COMMAND}])
+ case "${host_cpu}" in
+ i?86)
+ PAX_COMMAND_ARGS="-msp"
+ ;;
+ *)
+ PAX_COMMAND_ARGS="-m"
+ ;;
+ esac
+ AC_MSG_RESULT(${PAX_COMMAND_ARGS})
+ fi
AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
- AC_MSG_RESULT(${PAX_COMMAND})
AC_SUBST(PAX_COMMAND)
AC_SUBST(PAX_COMMAND_ARGS)
])
diff -r 963a9ab43d7f -r 975cb4907b2e patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch Wed Mar 19 17:33:09 2014 +0000
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User iveresov
+# Date 1331583127 25200
+# Mon Mar 12 13:12:07 2012 -0700
+# Node ID 3f0dff7a9cf590ef3e5d7f2dcf6c8247b65c9d10
+# Parent 3442eb7ef2d216d6bf655d537929a2d31a76a321
+7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
+Summary: Don't attempt to uncommit SHM-based large pages
+Reviewed-by: kvn
+
+diff -r 3442eb7ef2d2 -r 3f0dff7a9cf5 src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Jan 14 20:24:44 2014 -0500
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Mon Mar 12 13:12:07 2012 -0700
+@@ -2568,7 +2568,14 @@
+ }
+
+ void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) {
+- commit_memory(addr, bytes, alignment_hint, false);
++ // This method works by doing an mmap over an existing mmaping and effectively discarding
++ // the existing pages. However it won't work for SHM-based large pages that cannot be
++ // uncommitted at all. We don't do anything in this case to avoid creating a segment with
++ // small pages on top of the SHM segment. This method always works for small pages, so we
++ // allow that in any case.
++ if (alignment_hint <= (size_t)os::vm_page_size() || !UseSHM) {
++ commit_memory(addr, bytes, alignment_hint, false);
++ }
+ }
+
+ void os::numa_make_global(char *addr, size_t bytes) {
diff -r 963a9ab43d7f -r 975cb4907b2e patches/openjdk/8013057-detect_mmap_commit_failures.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/8013057-detect_mmap_commit_failures.patch Wed Mar 19 17:33:09 2014 +0000
@@ -0,0 +1,867 @@
+# HG changeset patch
+# User dcubed
+# Date 1394474985 0
+# Mon Mar 10 18:09:45 2014 +0000
+# Node ID cbdd11a54b82eb7731d16abbc6df3c9b4d42c78b
+# Parent 3f0dff7a9cf590ef3e5d7f2dcf6c8247b65c9d10
+8013057: assert(_needs_gc || SafepointSynchronize::is_at_safepoint()) failed: only read at safepoint
+Summary: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory(). Add os::commit_memory_or_exit(). Also tidy up some NMT accounting and some mmap() return value checking.
+Reviewed-by: zgu, stefank, dholmes, dsamersoff
+
+diff -r 3f0dff7a9cf5 -r cbdd11a54b82 src/os/bsd/vm/os_bsd.cpp
+--- openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp Mon Mar 12 13:12:07 2012 -0700
++++ openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp Mon Mar 10 18:09:45 2014 +0000
+@@ -2762,6 +2762,13 @@
+ }
+ }
+
++static void warn_fail_commit_memory(char* addr, size_t size, bool exec,
++ int err) {
++ warning("INFO: os::commit_memory(" PTR_FORMAT ", " SIZE_FORMAT
++ ", %d) failed; error='%s' (errno=%d)", addr, size, exec,
++ strerror(err), err);
++}
++
+ // NOTE: Bsd kernel does not really reserve the pages for us.
+ // All it does is to check if there are enough free pages
+ // left at the time of mmap(). This could be a potential
+@@ -2770,12 +2777,22 @@
+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
+ #ifdef __OpenBSD__
+ // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
+- return ::mprotect(addr, size, prot) == 0;
++ if (::mprotect(addr, size, prot) == 0) {
++ return true;
++ }
+ #else
+ uintptr_t res = (uintptr_t) ::mmap(addr, size, prot,
+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
+- return res != (uintptr_t) MAP_FAILED;
++ if (res != (uintptr_t) MAP_FAILED) {
++ return true;
++ }
+ #endif
++
++ // Warn about any commit errors we see in non-product builds just
++ // in case mmap() doesn't work as described on the man page.
++ NOT_PRODUCT(warn_fail_commit_memory(addr, size, exec, errno);)
++
++ return false;
+ }
+
+ #ifndef _ALLBSD_SOURCE
+@@ -2803,9 +2820,27 @@
+ }
+ #endif
+
++ // alignment_hint is ignored on this OS
+ return commit_memory(addr, size, exec);
+ }
+
++void os::commit_memory_or_exit(char* addr, size_t size, bool exec,
++ const char* mesg) {
++ assert(mesg != NULL, "mesg must be specified");
++ if (!pd_commit_memory(addr, size, exec)) {
++ // add extra info in product mode for vm_exit_out_of_memory():
++ PRODUCT_ONLY(warn_fail_commit_memory(addr, size, exec, errno);)
++ vm_exit_out_of_memory(size, mesg);
++ }
++}
++
++void os::commit_memory_or_exit(char* addr, size_t size,
++ size_t alignment_hint, bool exec,
++ const char* mesg) {
++ // alignment_hint is ignored on this OS
++ pd_commit_memory_or_exit(addr, size, exec, mesg);
++}
++
+ void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
+ #ifndef _ALLBSD_SOURCE
+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
+@@ -2970,7 +3005,7 @@
+ }
+
+ bool os::create_stack_guard_pages(char* addr, size_t size) {
+- return os::commit_memory(addr, size);
++ return os::commit_memory(addr, size, !ExecMem);
+ }
+
+ // If this is a growable mapping, remove the guard pages entirely by
+@@ -4467,7 +4502,7 @@
+
+ if (!UseMembar) {
+ address mem_serialize_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+- guarantee( mem_serialize_page != NULL, "mmap Failed for memory serialize page");
++ guarantee( mem_serialize_page != MAP_FAILED, "mmap Failed for memory serialize page");
+ os::set_memory_serialize_page( mem_serialize_page );
+
+ #ifndef PRODUCT
+diff -r 3f0dff7a9cf5 -r cbdd11a54b82 src/os/bsd/vm/perfMemory_bsd.cpp
+--- openjdk/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp Mon Mar 12 13:12:07 2012 -0700
++++ openjdk/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp Mon Mar 10 18:09:45 2014 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
More information about the distro-pkg-dev
mailing list