Skip to content

Commit afc4529

Browse files
swati-shaDavid Holmes
authored and
David Holmes
committed
8346834: Tests failing with -XX:+UseNUMA due to "NUMA support disabled" warning
Reviewed-by: dholmes, sjohanss
1 parent a3be97e commit afc4529

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

src/hotspot/os/linux/os_linux.cpp

+11-7
Original file line numberDiff line numberDiff line change
@@ -4477,15 +4477,15 @@ void os::Linux::numa_init() {
44774477
// bitmask when externally configured to run on all or fewer nodes.
44784478

44794479
if (!Linux::libnuma_init()) {
4480-
disable_numa("Failed to initialize libnuma");
4480+
disable_numa("Failed to initialize libnuma", true);
44814481
} else {
44824482
Linux::set_configured_numa_policy(Linux::identify_numa_policy());
44834483
if (Linux::numa_max_node() < 1) {
4484-
disable_numa("Only a single NUMA node is available");
4484+
disable_numa("Only a single NUMA node is available", false);
44854485
} else if (Linux::is_bound_to_single_mem_node()) {
4486-
disable_numa("The process is bound to a single NUMA node");
4486+
disable_numa("The process is bound to a single NUMA node", true);
44874487
} else if (Linux::mem_and_cpu_node_mismatch()) {
4488-
disable_numa("The process memory and cpu node configuration does not match");
4488+
disable_numa("The process memory and cpu node configuration does not match", true);
44894489
} else {
44904490
LogTarget(Info,os) log;
44914491
LogStream ls(log);
@@ -4527,11 +4527,15 @@ void os::Linux::numa_init() {
45274527
}
45284528
}
45294529

4530-
void os::Linux::disable_numa(const char* reason) {
4530+
void os::Linux::disable_numa(const char* reason, bool warning) {
45314531
if ((UseNUMA && FLAG_IS_CMDLINE(UseNUMA)) ||
45324532
(UseNUMAInterleaving && FLAG_IS_CMDLINE(UseNUMAInterleaving))) {
4533-
// Only issue a warning if the user explicitly asked for NUMA support
4534-
log_warning(os)("NUMA support disabled: %s", reason);
4533+
// Only issue a message if the user explicitly asked for NUMA support
4534+
if (warning) {
4535+
log_warning(os)("NUMA support disabled: %s", reason);
4536+
} else {
4537+
log_info(os)("NUMA support disabled: %s", reason);
4538+
}
45354539
}
45364540
FLAG_SET_ERGO(UseNUMA, false);
45374541
FLAG_SET_ERGO(UseNUMAInterleaving, false);

src/hotspot/os/linux/os_linux.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class os::Linux {
193193
private:
194194
static void numa_init();
195195

196-
static void disable_numa(const char* reason);
196+
static void disable_numa(const char* reason, bool warning);
197197
typedef int (*sched_getcpu_func_t)(void);
198198
typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
199199
typedef int (*numa_node_to_cpus_v2_func_t)(int node, void *mask);

test/jdk/ProblemList.txt

-2
Original file line numberDiff line numberDiff line change
@@ -724,8 +724,6 @@ javax/swing/plaf/synth/7158712/bug7158712.java 8324782 macosx-all
724724

725725
# jdk_jdi
726726

727-
com/sun/jdi/ProcessAttachTest.java 8346827 linux-all
728-
com/sun/jdi/ReattachStressTest.java 8346827 linux-all
729727
com/sun/jdi/RepStep.java 8043571 generic-all
730728

731729
com/sun/jdi/InvokeHangTest.java 8218463 linux-all

0 commit comments

Comments
 (0)