|
 |
25845f |
commit 93a6d0820430bfe3d09695a1376c07abf6d2214f
|
|
|
25845f |
Author: Roland McGrath <roland@hack.frob.com>
|
|
|
25845f |
Date: Fri Jun 20 19:50:16 2014 -0700
|
|
|
25845f |
|
|
|
25845f |
Clean up stack-coloring macros.
|
|
|
25845f |
|
|
|
25845f |
Conflicts:
|
|
|
25845f |
sysdeps/x86_64/nptl/Makefile
|
|
|
25845f |
|
|
|
25845f |
File change was applied to nptl/sysdeps/x86_64/Makefile instead.
|
|
|
25845f |
|
|
|
25845f |
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
|
|
|
25845f |
index 2c126fd4ae447b25..0fba6ce3474e8b35 100644
|
|
|
25845f |
--- a/nptl/allocatestack.c
|
|
|
25845f |
+++ b/nptl/allocatestack.c
|
|
|
25845f |
@@ -30,6 +30,7 @@
|
|
|
25845f |
#include <list.h>
|
|
|
25845f |
#include <lowlevellock.h>
|
|
|
25845f |
#include <kernel-features.h>
|
|
|
25845f |
+#include <stack-aliasing.h>
|
|
|
25845f |
|
|
|
25845f |
|
|
|
25845f |
#ifndef NEED_SEPARATE_REGISTER_STACK
|
|
|
25845f |
diff --git a/nptl/stack-aliasing.h b/nptl/stack-aliasing.h
|
|
|
25845f |
new file mode 100644
|
|
|
25845f |
index 0000000000000000..526b54e18f7e0a27
|
|
|
25845f |
--- /dev/null
|
|
|
25845f |
+++ b/nptl/stack-aliasing.h
|
|
|
25845f |
@@ -0,0 +1,29 @@
|
|
|
25845f |
+/* Define macros for stack address aliasing issues for NPTL. Stub version.
|
|
|
25845f |
+ Copyright (C) 2014 Free Software Foundation, Inc.
|
|
|
25845f |
+ This file is part of the GNU C Library.
|
|
|
25845f |
+
|
|
|
25845f |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
25845f |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
25845f |
+ License as published by the Free Software Foundation; either
|
|
|
25845f |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
25845f |
+
|
|
|
25845f |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
25845f |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
25845f |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
25845f |
+ Lesser General Public License for more details.
|
|
|
25845f |
+
|
|
|
25845f |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
25845f |
+ License along with the GNU C Library; if not, see
|
|
|
25845f |
+ <http://www.gnu.org/licenses/>. */
|
|
|
25845f |
+
|
|
|
25845f |
+/* This is a number of bytes (less than a page) by which to "color" the
|
|
|
25845f |
+ starting stack address of new threads. This number is multiplied by the
|
|
|
25845f |
+ number of threads created so far and then truncated modulo page size,
|
|
|
25845f |
+ to get a roughly even distribution of values for different threads. */
|
|
|
25845f |
+#define COLORING_INCREMENT 0
|
|
|
25845f |
+
|
|
|
25845f |
+/* This is a number of bytes that is an alignment that should be avoided
|
|
|
25845f |
+ when choosing the exact size of a new thread's stack. If the size
|
|
|
25845f |
+ chosen is aligned to this, an extra page will be added to render the
|
|
|
25845f |
+ size off-aligned. */
|
|
|
25845f |
+#define MULTI_PAGE_ALIASING 0
|
|
|
25845f |
diff --git a/nptl/sysdeps/x86_64/Makefile b/nptl/sysdeps/x86_64/Makefile
|
|
|
25845f |
index d34dea709b363d2a..e2c47764e6e38c36 100644
|
|
|
25845f |
--- a/nptl/sysdeps/x86_64/Makefile
|
|
|
25845f |
+++ b/nptl/sysdeps/x86_64/Makefile
|
|
|
25845f |
@@ -18,10 +18,3 @@
|
|
|
25845f |
ifeq ($(subdir),csu)
|
|
|
25845f |
gen-as-const-headers += tcb-offsets.sym
|
|
|
25845f |
endif
|
|
|
25845f |
-
|
|
|
25845f |
-ifeq ($(subdir),nptl)
|
|
|
25845f |
-# P4s have problems with 4M aliasing. We disturb the allocation of stacks
|
|
|
25845f |
-# just enough so the subsequent allocations do not use stack address
|
|
|
25845f |
-# (mod 4M) == 0.
|
|
|
25845f |
-CFLAGS-pthread_create.c += -DMULTI_PAGE_ALIASING=65536
|
|
|
25845f |
-endif
|
|
|
25845f |
diff --git a/sysdeps/i386/i686/stack-aliasing.h b/sysdeps/i386/i686/stack-aliasing.h
|
|
|
25845f |
new file mode 100644
|
|
|
25845f |
index 0000000000000000..1e35ceb2061d60f9
|
|
|
25845f |
--- /dev/null
|
|
|
25845f |
+++ b/sysdeps/i386/i686/stack-aliasing.h
|
|
|
25845f |
@@ -0,0 +1,28 @@
|
|
|
25845f |
+/* Define macros for stack address aliasing issues for NPTL. i686 version.
|
|
|
25845f |
+ Copyright (C) 2014 Free Software Foundation, Inc.
|
|
|
25845f |
+ This file is part of the GNU C Library.
|
|
|
25845f |
+
|
|
|
25845f |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
25845f |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
25845f |
+ License as published by the Free Software Foundation; either
|
|
|
25845f |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
25845f |
+
|
|
|
25845f |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
25845f |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
25845f |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
25845f |
+ Lesser General Public License for more details.
|
|
|
25845f |
+
|
|
|
25845f |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
25845f |
+ License along with the GNU C Library; if not, see
|
|
|
25845f |
+ <http://www.gnu.org/licenses/>. */
|
|
|
25845f |
+
|
|
|
25845f |
+/* It turns out that stack coloring is in general not good on P4s. Some
|
|
|
25845f |
+ applications will benefit. We will probably have a configuration option
|
|
|
25845f |
+ at some point. To enable coloring, set this to 128. */
|
|
|
25845f |
+#define COLORING_INCREMENT 0
|
|
|
25845f |
+
|
|
|
25845f |
+/* What is useful is to avoid the 64k aliasing problem which reliably
|
|
|
25845f |
+ happens if all stacks use sizes which are a multiple of 64k. Tell
|
|
|
25845f |
+ the stack allocator to disturb this by allocation one more page if
|
|
|
25845f |
+ necessary. */
|
|
|
25845f |
+#define MULTI_PAGE_ALIASING 65536
|
|
|
25845f |
diff --git a/sysdeps/x86_64/stack-aliasing.h b/sysdeps/x86_64/stack-aliasing.h
|
|
|
25845f |
new file mode 100644
|
|
|
25845f |
index 0000000000000000..2efdacb3b4c44c40
|
|
|
25845f |
--- /dev/null
|
|
|
25845f |
+++ b/sysdeps/x86_64/stack-aliasing.h
|
|
|
25845f |
@@ -0,0 +1 @@
|
|
|
25845f |
+#include <sysdeps/i386/i686/stack-aliasing.h>
|