From: Martin Doucha <mdoucha@suse.cz>
To: ltp@lists.linux.it
Cc: Nicolai Stange <nstange@suse.de>
Subject: [LTP] [PATCH v2 3/7] lib: Add safe functions for pthread_kill() and mutexes
Date: Fri, 26 May 2023 15:34:31 +0200 [thread overview]
Message-ID: <20230526133435.7369-4-mdoucha@suse.cz> (raw)
In-Reply-To: <20230526133435.7369-1-mdoucha@suse.cz>
Signed-off-by: Martin Doucha <mdoucha@suse.cz>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
---
Changes since v1: None
include/tst_safe_pthread.h | 52 ++++++++++++
lib/safe_pthread.c | 161 +++++++++++++++++++++++++++++++++++++
2 files changed, 213 insertions(+)
diff --git a/include/tst_safe_pthread.h b/include/tst_safe_pthread.h
index 8fb553929..360b561b6 100644
--- a/include/tst_safe_pthread.h
+++ b/include/tst_safe_pthread.h
@@ -52,4 +52,56 @@ int safe_pthread_cancel(const char *file, const int lineno,
#define SAFE_PTHREAD_CANCEL(thread_id) \
safe_pthread_cancel(__FILE__, __LINE__, thread_id);
+int safe_pthread_mutexattr_init(const char *file, const int lineno,
+ pthread_mutexattr_t *attr);
+#define SAFE_PTHREAD_MUTEXATTR_INIT(attr) \
+ safe_pthread_mutexattr_init(__FILE__, __LINE__, (attr))
+
+int safe_pthread_mutexattr_destroy(const char *file, const int lineno,
+ pthread_mutexattr_t *attr);
+#define SAFE_PTHREAD_MUTEXATTR_DESTROY(attr) \
+ safe_pthread_mutexattr_destroy(__FILE__, __LINE__, (attr))
+
+int safe_pthread_mutexattr_settype(const char *file, const int lineno,
+ pthread_mutexattr_t *attr, int type);
+#define SAFE_PTHREAD_MUTEXATTR_SETTYPE(attr, type) \
+ safe_pthread_mutexattr_settype(__FILE__, __LINE__, (attr), (type))
+
+int safe_pthread_mutex_init(const char *file, const int lineno,
+ pthread_mutex_t *mutex, const pthread_mutexattr_t *attr);
+#define SAFE_PTHREAD_MUTEX_INIT(mutex, attr) \
+ safe_pthread_mutex_init(__FILE__, __LINE__, (mutex), (attr))
+
+int safe_pthread_mutex_destroy(const char *file, const int lineno,
+ pthread_mutex_t *mutex);
+#define SAFE_PTHREAD_MUTEX_DESTROY(mutex) \
+ safe_pthread_mutex_destroy(__FILE__, __LINE__, (mutex))
+
+int safe_pthread_mutex_lock(const char *file, const int lineno,
+ pthread_mutex_t *mutex);
+#define SAFE_PTHREAD_MUTEX_LOCK(mutex) \
+ safe_pthread_mutex_lock(__FILE__, __LINE__, (mutex))
+
+/* Terminates the test on any error other than EBUSY */
+int safe_pthread_mutex_trylock(const char *file, const int lineno,
+ pthread_mutex_t *mutex);
+#define SAFE_PTHREAD_MUTEX_TRYLOCK(mutex) \
+ safe_pthread_mutex_trylock(__FILE__, __LINE__, (mutex))
+
+/* Terminates the test on any error other than ETIMEDOUT */
+int safe_pthread_mutex_timedlock(const char *file, const int lineno,
+ pthread_mutex_t *mutex, const struct timespec *abstime);
+#define SAFE_PTHREAD_MUTEX_TIMEDLOCK(mutex, abstime) \
+ safe_pthread_mutex_timedlock(__FILE__, __LINE__, (mutex), (abstime))
+
+int safe_pthread_mutex_unlock(const char *file, const int lineno,
+ pthread_mutex_t *mutex);
+#define SAFE_PTHREAD_MUTEX_UNLOCK(mutex) \
+ safe_pthread_mutex_unlock(__FILE__, __LINE__, (mutex))
+
+int safe_pthread_kill(const char *file, const int lineno,
+ pthread_t thread, int sig);
+#define SAFE_PTHREAD_KILL(thread, sig) \
+ safe_pthread_kill(__FILE__, __LINE__, (thread), (sig))
+
#endif /* TST_SAFE_PTHREAD_H__ */
diff --git a/lib/safe_pthread.c b/lib/safe_pthread.c
index d70bb8707..aeafe014c 100644
--- a/lib/safe_pthread.c
+++ b/lib/safe_pthread.c
@@ -106,3 +106,164 @@ int safe_pthread_barrier_init(const char *file, const int lineno,
return rval;
}
+
+int safe_pthread_mutexattr_init(const char *file, const int lineno,
+ pthread_mutexattr_t *attr)
+{
+ int ret;
+
+ ret = pthread_mutexattr_init(attr);
+
+ if (ret) {
+ tst_brk_(file, lineno, TBROK,
+ "pthread_mutexattr_init(%p) failed: %s",
+ attr, tst_strerrno(ret));
+ }
+
+ return ret;
+}
+
+int safe_pthread_mutexattr_destroy(const char *file, const int lineno,
+ pthread_mutexattr_t *attr)
+{
+ int ret;
+
+ ret = pthread_mutexattr_destroy(attr);
+
+ if (ret) {
+ tst_brk_(file, lineno, TBROK,
+ "pthread_mutexattr_destroy(%p) failed: %s",
+ attr, tst_strerrno(ret));
+ }
+
+ return ret;
+}
+
+int safe_pthread_mutexattr_settype(const char *file, const int lineno,
+ pthread_mutexattr_t *attr, int type)
+{
+ int ret;
+
+ ret = pthread_mutexattr_settype(attr, type);
+
+ if (ret) {
+ tst_brk_(file, lineno, TBROK,
+ "pthread_mutexattr_settype(%p, %d) failed: %s",
+ attr, type, tst_strerrno(ret));
+ }
+
+ return ret;
+}
+
+int safe_pthread_mutex_init(const char *file, const int lineno,
+ pthread_mutex_t *mutex, const pthread_mutexattr_t *attr)
+{
+ int ret;
+
+ ret = pthread_mutex_init(mutex, attr);
+
+ if (ret) {
+ tst_brk_(file, lineno, TBROK,
+ "pthread_mutex_init(%p, %p) failed: %s",
+ mutex, attr, tst_strerrno(ret));
+ }
+
+ return ret;
+}
+
+int safe_pthread_mutex_destroy(const char *file, const int lineno,
+ pthread_mutex_t *mutex)
+{
+ int ret;
+
+ ret = pthread_mutex_destroy(mutex);
+
+ if (ret) {
+ tst_brk_(file, lineno, TBROK,
+ "pthread_mutex_destroy(%p) failed: %s",
+ mutex, tst_strerrno(ret));
+ }
+
+ return ret;
+}
+
+int safe_pthread_mutex_lock(const char *file, const int lineno,
+ pthread_mutex_t *mutex)
+{
+ int ret;
+
+ ret = pthread_mutex_lock(mutex);
+
+ if (ret) {
+ tst_brk_(file, lineno, TBROK,
+ "pthread_mutex_lock(%p) failed: %s",
+ mutex, tst_strerrno(ret));
+ }
+
+ return ret;
+}
+
+int safe_pthread_mutex_trylock(const char *file, const int lineno,
+ pthread_mutex_t *mutex)
+{
+ int ret;
+
+ ret = pthread_mutex_trylock(mutex);
+
+ if (ret && ret != EBUSY) {
+ tst_brk_(file, lineno, TBROK,
+ "pthread_mutex_trylock(%p) failed: %s",
+ mutex, tst_strerrno(ret));
+ }
+
+ return ret;
+}
+
+int safe_pthread_mutex_timedlock(const char *file, const int lineno,
+ pthread_mutex_t *mutex, const struct timespec *abstime)
+{
+ int ret;
+
+ ret = pthread_mutex_timedlock(mutex, abstime);
+
+ if (ret && ret != ETIMEDOUT) {
+ tst_brk_(file, lineno, TBROK,
+ "pthread_mutex_timedlock(%p, {%lld, %ld}) failed: %s",
+ mutex, (long long)abstime->tv_sec, abstime->tv_nsec,
+ tst_strerrno(ret));
+ }
+
+ return ret;
+}
+
+int safe_pthread_mutex_unlock(const char *file, const int lineno,
+ pthread_mutex_t *mutex)
+{
+ int ret;
+
+ ret = pthread_mutex_unlock(mutex);
+
+ if (ret) {
+ tst_brk_(file, lineno, TBROK,
+ "pthread_mutex_unlock(%p) failed: %s",
+ mutex, tst_strerrno(ret));
+ }
+
+ return ret;
+}
+
+int safe_pthread_kill(const char *file, const int lineno,
+ pthread_t thread, int sig)
+{
+ int ret;
+
+ ret = pthread_kill(thread, sig);
+
+ if (ret) {
+ tst_brk_(file, lineno, TBROK,
+ "pthread_kill(..., %d) failed: %s",
+ sig, tst_strerrno(ret));
+ }
+
+ return ret;
+}
--
2.40.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next prev parent reply other threads:[~2023-05-26 13:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 13:34 [LTP] [PATCH v2 0/7] Two AMD SVM vulnerability tests Martin Doucha
2023-05-26 13:34 ` [LTP] [PATCH v2 1/7] KVM: Add VMSAVE/VMLOAD intercept constants Martin Doucha
2023-05-26 13:34 ` [LTP] [PATCH v2 2/7] Add test for CVE 2021-3656 Martin Doucha
2023-05-26 14:07 ` Petr Vorel
2023-05-26 14:10 ` Petr Vorel
2023-05-26 14:14 ` Petr Vorel
2023-05-26 14:27 ` Petr Vorel
2023-05-26 13:34 ` Martin Doucha [this message]
2023-05-26 13:34 ` [LTP] [PATCH v2 4/7] KVM: Add async communication helper functions Martin Doucha
2023-05-29 5:51 ` Petr Vorel
2023-05-29 8:20 ` Martin Doucha
2023-05-29 8:27 ` Petr Vorel
2023-05-26 13:34 ` [LTP] [PATCH v2 5/7] KVM: Allow expected KVM_RUN errors in tst_kvm_run_instance() Martin Doucha
2023-05-26 13:34 ` [LTP] [PATCH v2 6/7] KVM: Add STGI/CLGI intercept constants Martin Doucha
2023-05-29 5:24 ` Petr Vorel
2023-05-26 13:34 ` [LTP] [PATCH v2 7/7] Add KVM test for CPU lockup through malicous SVM guest Martin Doucha
2023-05-29 10:02 ` [LTP] [PATCH v2 0/7] Two AMD SVM vulnerability tests Cyril Hrubis
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=20230526133435.7369-4-mdoucha@suse.cz \
--to=mdoucha@suse.cz \
--cc=ltp@lists.linux.it \
--cc=nstange@suse.de \
/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 NNTP newsgroup(s).