From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH v4 29/37] nptl: Move the internal thread priority protection symbols into libc
Date: Fri, 16 Apr 2021 11:23:46 +0200 [thread overview]
Message-ID: <54a191e2d23a371c5f7c1ca55761f9adff6c909f.1618564630.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1618564630.git.fweimer@redhat.com>
This is a prerequisite for moving the mutex implementation.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
nptl/Makefile | 2 +-
nptl/Versions | 5 +++++
nptl/pthreadP.h | 16 ++++++++++------
nptl/tpp.c | 6 +++++-
4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/nptl/Makefile b/nptl/Makefile
index feb79e0e7b..d595598cb8 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -94,6 +94,7 @@ routines = \
pthread_setschedparam \
pthread_setspecific \
pthread_sigmask \
+ tpp \
unwind \
shared-only-routines = forward
@@ -214,7 +215,6 @@ libpthread-routines = \
sem_timedwait \
sem_unlink \
sem_wait \
- tpp \
vars \
version \
diff --git a/nptl/Versions b/nptl/Versions
index b14f76aa41..f51110da8d 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -120,6 +120,7 @@ libc {
GLIBC_PRIVATE {
__futex_abstimed_wait64;
__futex_abstimed_wait_cancelable64;
+ __init_sched_fifo_prio;
__libc_alloca_cutoff;
__libc_cleanup_pop_restore;
__libc_cleanup_push_defer;
@@ -143,13 +144,17 @@ libc {
__pthread_cleanup_upto;
__pthread_cond_destroy; # Used by the C11 threads.
__pthread_cond_init; # Used by the C11 threads.
+ __pthread_current_priority;
__pthread_exit;
__pthread_force_elision;
__pthread_getattr_default_np;
__pthread_key_delete;
__pthread_keys;
__pthread_setcancelstate;
+ __pthread_tpp_change_priority;
__pthread_unwind;
+ __sched_fifo_max_prio;
+ __sched_fifo_min_prio;
}
}
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 2c59a1dc84..5cd5d69c53 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -231,12 +231,16 @@ rtld_hidden_proto (__nptl_set_robust_list_avail)
#endif
/* Thread Priority Protection. */
-extern int __sched_fifo_min_prio attribute_hidden;
-extern int __sched_fifo_max_prio attribute_hidden;
-extern void __init_sched_fifo_prio (void) attribute_hidden;
-extern int __pthread_tpp_change_priority (int prev_prio, int new_prio)
- attribute_hidden;
-extern int __pthread_current_priority (void) attribute_hidden;
+extern int __sched_fifo_min_prio;
+libc_hidden_proto (__sched_fifo_min_prio)
+extern int __sched_fifo_max_prio;
+libc_hidden_proto (__sched_fifo_max_prio)
+extern void __init_sched_fifo_prio (void);
+libc_hidden_proto (__init_sched_fifo_prio)
+extern int __pthread_tpp_change_priority (int prev_prio, int new_prio);
+libc_hidden_proto (__pthread_tpp_change_priority)
+extern int __pthread_current_priority (void);
+libc_hidden_proto (__pthread_current_priority)
/* The library can run in debugging mode where it performs a lot more
tests. */
diff --git a/nptl/tpp.c b/nptl/tpp.c
index 8b7d9a2d23..7f58a75731 100644
--- a/nptl/tpp.c
+++ b/nptl/tpp.c
@@ -25,9 +25,10 @@
#include <stdlib.h>
#include <atomic.h>
-
int __sched_fifo_min_prio = -1;
+libc_hidden_data_def (__sched_fifo_min_prio)
int __sched_fifo_max_prio = -1;
+libc_hidden_data_def (__sched_fifo_max_prio)
/* We only want to initialize __sched_fifo_min_prio and __sched_fifo_max_prio
once. The standard solution would be similar to pthread_once, but then
@@ -47,6 +48,7 @@ __init_sched_fifo_prio (void)
atomic_store_relaxed (&__sched_fifo_min_prio,
__sched_get_priority_min (SCHED_FIFO));
}
+libc_hidden_def (__init_sched_fifo_prio)
int
__pthread_tpp_change_priority (int previous_prio, int new_prio)
@@ -155,6 +157,7 @@ __pthread_tpp_change_priority (int previous_prio, int new_prio)
return result;
}
+libc_hidden_def (__pthread_tpp_change_priority)
int
__pthread_current_priority (void)
@@ -193,3 +196,4 @@ __pthread_current_priority (void)
return result;
}
+libc_hidden_def (__pthread_current_priority)
--
2.30.2
next prev parent reply other threads:[~2021-04-16 9:23 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 9:20 [PATCH v4 00/37] libpthread: Remove NPTL forwarders Florian Weimer
2021-04-16 9:20 ` [PATCH v4 01/37] nptl: Move pthread_mutex_consistent into libc Florian Weimer
2021-04-16 9:20 ` [PATCH v4 02/37] nptl: Move __pthread_cleanup_routine " Florian Weimer
2021-04-16 9:20 ` [PATCH v4 03/37] nptl: Move legacy unwinding implementation " Florian Weimer
2021-04-16 9:20 ` [PATCH v4 04/37] nptl: Move legacy cancelation handling into libc as compat symbols Florian Weimer
2021-04-16 9:20 ` [PATCH v4 05/37] nptl: Remove longjmp, siglongjmp from libpthread Florian Weimer
2021-04-16 9:20 ` [PATCH v4 06/37] x86: Restore compile-time check for shadow stack pointer in longjmp Florian Weimer
2021-04-16 9:20 ` [PATCH v4 07/37] nptl: Move __pthread_cleanup_upto into libc Florian Weimer
2021-04-16 9:20 ` [PATCH v4 08/37] nptl: Move pthread_once and __pthread_once " Florian Weimer
2021-04-16 9:21 ` [PATCH v4 09/37] nptl: Move __pthread_unwind_next " Florian Weimer
2021-04-16 9:21 ` [PATCH v4 10/37] csu: Move calling main out of __libc_start_main_impl Florian Weimer
2021-04-16 9:21 ` [PATCH v4 11/37] nptl: Move internal __nptl_nthreads variable into libc Florian Weimer
2021-04-16 9:21 ` [PATCH v4 12/37] nptl_db: Introduce DB_MAIN_ARRAY_VARIABLE Florian Weimer
2021-04-16 9:21 ` [PATCH v4 13/37] nptl: Move __pthread_keys global variable into libc Florian Weimer
2021-04-16 9:21 ` [PATCH v4 14/37] nptl: Move __nptl_deallocate_tsd " Florian Weimer
2021-04-16 9:21 ` [PATCH v4 15/37] nptl: Move pthread_exit " Florian Weimer
2021-04-16 9:22 ` [PATCH v4 16/37] nptl: Move pthread_setcancelstate " Florian Weimer
2021-04-16 9:22 ` [PATCH v4 17/37] nptl: Move pthread_setcanceltype " Florian Weimer
2021-04-16 9:22 ` [PATCH v4 18/37] nptl: Invoke the set_robust_list system call directly in fork Florian Weimer
2021-04-16 9:22 ` [PATCH v4 19/37] dlfcn: Failures after dlmopen should not terminate process [BZ #24772] Florian Weimer
2021-04-16 9:22 ` [PATCH v4 20/37] dlfcn: dlerror needs to call free from the base namespace [BZ #24773] Florian Weimer
2021-04-16 9:22 ` [PATCH v4 21/37] Remove pthread_key_create-related internals from libc-lock.h Florian Weimer
2021-04-16 9:22 ` [PATCH v4 22/37] elf: Introduce __tls_init_tp for second-phase TCB initialization Florian Weimer
2021-04-16 9:22 ` [PATCH v4 23/37] nptl: Move part of TCB initialization from libpthread to __tls_init_tp Florian Weimer
2021-04-16 9:22 ` [PATCH v4 24/37] nptl: Move pthread_key_create, __pthread_key_create into libc Florian Weimer
2021-04-16 9:23 ` [PATCH v4 25/37] nptl: Move pthread_getspecific, __pthread_getspecific " Florian Weimer
2021-04-16 9:23 ` [PATCH v4 26/37] nptl: Move pthread_setspecific, __pthread_setspecific " Florian Weimer
2021-04-16 9:23 ` [PATCH v4 27/37] nptl: Move pthread_key_delete " Florian Weimer
2021-04-16 9:23 ` [PATCH v4 28/37] nptl: Move rwlock functions with forwarders " Florian Weimer
2021-04-16 9:23 ` Florian Weimer [this message]
2021-04-16 9:23 ` [PATCH v4 30/37] pthread: Introduce __pthread_early_init Florian Weimer
2021-04-16 9:23 ` [PATCH v4 31/37] nptl: Move internal symbol __mutex_aconf into libc Florian Weimer
2021-04-16 9:24 ` [PATCH v4 32/37] nptl: pthread_mutex_lock, pthread_mutex_unock single-threaded optimization Florian Weimer
2021-04-16 9:24 ` [PATCH v4 33/37] x86: Remove low-level lock optimization Florian Weimer
2021-04-16 9:24 ` [PATCH v4 34/37] nptl: Move core mutex functions into libc Florian Weimer
2021-04-16 9:24 ` [PATCH v4 35/37] nptl: Move core condition variable " Florian Weimer
2021-04-16 9:24 ` [PATCH v4 36/37] nptl: Move setxid broadcast implementation " Florian Weimer
2021-04-16 9:24 ` [PATCH v4 37/37] nptl: Remove remnants of the libc/libpthread forwarder interface Florian Weimer
2021-04-21 11:47 ` [PATCH v4 00/37] libpthread: Remove NPTL forwarders Florian Weimer
2021-04-21 13:42 ` H.J. Lu
2021-04-22 7:35 ` Szabolcs Nagy
2021-04-22 7:58 ` Florian Weimer
2021-04-22 8:56 ` Szabolcs Nagy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54a191e2d23a371c5f7c1ca55761f9adff6c909f.1618564630.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).