| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 24 Aug 2022 12:45:10 +0300
From: Adrian Hunter <adrian.hunter@...el.com>
To: Ian Rogers <irogers@...gle.com>,
Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Jiri Olsa <jolsa@...nel.org>,
Namhyung Kim <namhyung@...nel.org>,
Thomas Gleixner <tglx@...utronix.de>,
Darren Hart <dvhart@...radead.org>,
Davidlohr Bueso <dave@...olabs.net>,
André Almeida <andrealmeid@...lia.com>,
Nathan Chancellor <nathan@...nel.org>,
Nick Desaulniers <ndesaulniers@...gle.com>,
Tom Rix <trix@...hat.com>, Weiguo Li <liwg06@...mail.com>,
Athira Rajeev <atrajeev@...ux.vnet.ibm.com>,
Thomas Richter <tmricht@...ux.ibm.com>,
Ravi Bangoria <ravi.bangoria@....com>,
Dario Petrillo <dario.pk1@...il.com>,
Hewenliang <hewenliang4@...wei.com>,
yaowenbin <yaowenbin1@...wei.com>,
Wenyu Liu <liuwenyu7@...wei.com>,
Song Liu <songliubraving@...com>,
Andrii Nakryiko <andrii@...nel.org>,
Dave Marchevsky <davemarchevsky@...com>,
Leo Yan <leo.yan@...aro.org>,
Kim Phillips <kim.phillips@....com>,
Pavithra Gurushankar <gpavithrasha@...il.com>,
Alexandre Truong <alexandre.truong@....com>,
Quentin Monnet <quentin@...valent.com>,
William Cohen <wcohen@...hat.com>,
Andres Freund <andres@...razel.de>,
Adrian Hunter <adrian.hunter@...el.com>,
Martin Liška <mliska@...e.cz>,
Colin Ian King <colin.king@...el.com>,
James Clark <james.clark@....com>,
Fangrui Song <maskray@...gle.com>,
Stephane Eranian <eranian@...gle.com>,
Kajol Jain <kjain@...ux.ibm.com>,
Alexey Bayduraev <alexey.v.bayduraev@...ux.intel.com>,
Riccardo Mancini <rickyman7@...il.com>,
Andi Kleen <ak@...ux.intel.com>,
Masami Hiramatsu <mhiramat@...nel.org>,
Zechuan Chen <chenzechuan1@...wei.com>,
Jason Wang <wangborong@...rlc.com>,
Christophe JAILLET <christophe.jaillet@...adoo.fr>,
Remi Bernon <rbernon@...eweavers.com>,
linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org,
bpf@...r.kernel.org, llvm@...ts.linux.dev
Subject: Re: [PATCH v2 01/18] perf mutex: Wrapped usage of mutex and cond
On 24/08/22 01:09, Ian Rogers wrote:
> From: Pavithra Gurushankar <gpavithrasha@...il.com>
>
> Added a new header file mutex.h that wraps the usage of
> pthread_mutex_t and pthread_cond_t. By abstracting these it is
> possible to introduce error checking.
>
> Signed-off-by: Pavithra Gurushankar <gpavithrasha@...il.com>
> Signed-off-by: Ian Rogers <irogers@...gle.com>
> ---
> tools/perf/util/Build | 1 +
> tools/perf/util/mutex.c | 97 +++++++++++++++++++++++++++++++++++++++++
> tools/perf/util/mutex.h | 43 ++++++++++++++++++
> 3 files changed, 141 insertions(+)
> create mode 100644 tools/perf/util/mutex.c
> create mode 100644 tools/perf/util/mutex.h
>
> diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> index 9dfae1bda9cc..8fd6dc8de521 100644
> --- a/tools/perf/util/Build
> +++ b/tools/perf/util/Build
> @@ -143,6 +143,7 @@ perf-y += branch.o
> perf-y += mem2node.o
> perf-y += clockid.o
> perf-y += list_sort.o
> +perf-y += mutex.o
>
> perf-$(CONFIG_LIBBPF) += bpf-loader.o
> perf-$(CONFIG_LIBBPF) += bpf_map.o
> diff --git a/tools/perf/util/mutex.c b/tools/perf/util/mutex.c
> new file mode 100644
> index 000000000000..d12cf0714268
> --- /dev/null
> +++ b/tools/perf/util/mutex.c
> @@ -0,0 +1,97 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include "mutex.h"
> +
> +#include "debug.h"
> +#include <linux/string.h>
> +#include <errno.h>
> +
> +static void check_err(const char *fn, int err)
> +{
> + char sbuf[STRERR_BUFSIZE];
> +
> + if (err == 0)
> + return;
> +
> + pr_err("%s error: '%s'", fn, str_error_r(err, sbuf, sizeof(sbuf)));
pr_err() does not add '\n' so it needs to be in the format string.
> +}
> +
> +#define CHECK_ERR(err) check_err(__func__, err)
> +
> +void mutex_init(struct mutex *mtx, bool pshared)
> +{
> + pthread_mutexattr_t attr;
> +
> + CHECK_ERR(pthread_mutexattr_init(&attr));
> +
> +#ifndef NDEBUG
> + /* In normal builds enable error checking, such as recursive usage. */
> + CHECK_ERR(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK));
> +#endif
> + if (pshared)
> + pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
> +
> + CHECK_ERR(pthread_mutex_init(&mtx->lock, &attr));
> + CHECK_ERR(pthread_mutexattr_destroy(&attr));
> +}
> +
> +void mutex_destroy(struct mutex *mtx)
> +{
> + CHECK_ERR(pthread_mutex_destroy(&mtx->lock));
> +}
> +
> +void mutex_lock(struct mutex *mtx)
> +{
> + CHECK_ERR(pthread_mutex_lock(&mtx->lock));
> +}
> +
> +void mutex_unlock(struct mutex *mtx)
> +{
> + CHECK_ERR(pthread_mutex_unlock(&mtx->lock));
> +}
> +
> +bool mutex_trylock(struct mutex *mtx)
> +{
> + int ret = pthread_mutex_trylock(&mtx->lock);
> +
> + if (ret == 0)
> + return true; /* Lock acquired. */
> +
> + if (ret == EBUSY)
> + return false; /* Lock busy. */
> +
> + /* Print error. */
> + CHECK_ERR(ret);
> + return false;
> +}
> +
> +void cond_init(struct cond *cnd, bool pshared)
> +{
> + pthread_condattr_t attr;
> +
> + CHECK_ERR(pthread_condattr_init(&attr));
> + if (pshared)
> + CHECK_ERR(pthread_condattr_setpshared(&attr, PTHREAD_PROCESS_SHARED));
> +
> + CHECK_ERR(pthread_cond_init(&cnd->cond, &attr));
> + CHECK_ERR(pthread_condattr_destroy(&attr));
> +}
> +
> +void cond_destroy(struct cond *cnd)
> +{
> + CHECK_ERR(pthread_cond_destroy(&cnd->cond));
> +}
> +
> +void cond_wait(struct cond *cnd, struct mutex *mtx)
> +{
> + CHECK_ERR(pthread_cond_wait(&cnd->cond, &mtx->lock));
> +}
> +
> +void cond_signal(struct cond *cnd)
> +{
> + CHECK_ERR(pthread_cond_signal(&cnd->cond));
> +}
> +
> +void cond_broadcast(struct cond *cnd)
> +{
> + CHECK_ERR(pthread_cond_broadcast(&cnd->cond));
> +}
> diff --git a/tools/perf/util/mutex.h b/tools/perf/util/mutex.h
> new file mode 100644
> index 000000000000..952276ad83bd
> --- /dev/null
> +++ b/tools/perf/util/mutex.h
> @@ -0,0 +1,43 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef __PERF_MUTEX_H
> +#define __PERF_MUTEX_H
> +
> +#include <pthread.h>
> +#include <stdbool.h>
> +
> +/*
> + * A wrapper around the mutex implementation that allows perf to error check
> + * usage, etc.
> + */
> +struct mutex {
> + pthread_mutex_t lock;
> +};
> +
> +/* A wrapper around the condition variable implementation. */
> +struct cond {
> + pthread_cond_t cond;
> +};
Do these definitions need to be in the header?
What about just:
struct mutex;
struct cond;
and put the defintions in mutex.c.
> +
> +/*
> + * Initialize the mtx struct, if pshared is set then specify the process-shared
> + * rather than default process-private attribute.
> + */
> +void mutex_init(struct mutex *mtx, bool pshared);
> +void mutex_destroy(struct mutex *mtx);
> +
> +void mutex_lock(struct mutex *mtx);
> +void mutex_unlock(struct mutex *mtx);
> +bool mutex_trylock(struct mutex *mtx);
> +
> +/*
> + * Initialize the cond struct, if pshared is set then specify the process-shared
> + * rather than default process-private attribute.
> + */
> +void cond_init(struct cond *cnd, bool pshared);
> +void cond_destroy(struct cond *cnd);
> +
> +void cond_wait(struct cond *cnd, struct mutex *mtx);
> +void cond_signal(struct cond *cnd);
> +void cond_broadcast(struct cond *cnd);
> +
> +#endif /* __PERF_MUTEX_H */
Powered by blists - more mailing lists