| 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
| ||
|
Message-ID: <Y4lCLfQrjyRtLmDM@iweiny-desk3>
Date: Thu, 1 Dec 2022 16:09:17 -0800
From: Ira Weiny <ira.weiny@...el.com>
To: Steven Rostedt <rostedt@...dmis.org>
CC: Dan Williams <dan.j.williams@...el.com>,
Alison Schofield <alison.schofield@...el.com>,
Vishal Verma <vishal.l.verma@...el.com>,
"Ben Widawsky" <bwidawsk@...nel.org>,
Jonathan Cameron <Jonathan.Cameron@...wei.com>,
Davidlohr Bueso <dave@...olabs.net>,
"Dave Jiang" <dave.jiang@...el.com>,
<linux-kernel@...r.kernel.org>, <linux-cxl@...r.kernel.org>
Subject: Re: [PATCH V2 02/11] cxl/mem: Implement Get Event Records command
On Thu, Dec 01, 2022 at 12:38:49PM -0500, Steven Rostedt wrote:
> On Wed, 30 Nov 2022 16:27:10 -0800
> ira.weiny@...el.com wrote:
>
[snip]
> > +
> > +/*
> > + * CXL rev 3.0 section 8.2.9.2.2; Table 8-49
> > + */
> > +enum cxl_event_log_type {
> > + CXL_EVENT_TYPE_INFO = 0x00,
> > + CXL_EVENT_TYPE_WARN,
> > + CXL_EVENT_TYPE_FAIL,
> > + CXL_EVENT_TYPE_FATAL,
> > + CXL_EVENT_TYPE_MAX
> > +};
> > +
> > +static inline const char *cxl_event_log_type_str(enum cxl_event_log_type type)
> > +{
> > + switch (type) {
> > + case CXL_EVENT_TYPE_INFO:
> > + return "Informational";
> > + case CXL_EVENT_TYPE_WARN:
> > + return "Warning";
> > + case CXL_EVENT_TYPE_FAIL:
> > + return "Failure";
> > + case CXL_EVENT_TYPE_FATAL:
> > + return "Fatal";
> > + default:
> > + break;
> > + }
> > + return "<unknown>";
> > +}
>
> So you are using this in a TP_printk() section, which means perf and
> trace-cmd have no idea how to parse it. Can I recommend instead having:
>
> #define cxl_event_log_type_str(type) \
> __print_symbolic(type, \
> { CXL_EVENT_TYPE_INFO, "Informational" }, \
> { CXL_EVENT_TYPE_WARN, "Warning" }, \
> { CXL_EVENT_TYPE_FAIL, "Failure" }, \
> { CXL_EVENT_TYPE_FATAL, "Fatal" })
>
> #ifndef CREATE_TRACE_POINTS
> static inline const char *__cxl_event_log_type_str(enum cxl_event_log_type type,
> struct trace_print_flags *symbols)
> {
> for (; symbols->mask >= 0; symbols++) {
> if (type == symbols->mask)
> return symbols->name;
> }
> return "<unknown>";
> }
> #define __print_symbolic(value, symbol_array...) \
> ({ \
> static const struct trace_print_flags symbols[] = \
> { symbol_array, { -1, NULL }}; \
> __cxl_event_log_type_str(value, symbols); \
> })
> #endif
>
> Note, I did not even try to compile the above. But it should be close to
> working.
Dropping that into cxlmem.h does not compile. I've given it another go but
because I use cxl_event_log_type_str() in a file where trace points are used
CREATE_TRACE_POINTS is defined and I get the following error.
|| drivers/cxl/core/mbox.c: In function ‘cxl_mem_get_records_log’:
drivers/cxl/cxlmem.h|386 col 7| error: implicit declaration of function ‘__print_symbolic’; did you mean ‘sprint_symbol’? [-Werror=implicit-function-declaration]
|| 386 | __print_symbolic(type, \
|| | ^~~~~~~~~~~~~~~~
I got it to work with the patch below on top of this one.[3] But it is kind of
ugly. The only way I could get __print_symbolic() to be defined was to
redefine it in mbox.c.[1] Then throw it in it's own header as in [3]
NOTE that patch [2] which I think _should_ work on top of patch [1] does not.
I can't understand why.
>
> This way, the cxl_event_log_type_str() for trace events will be converted
> into the __print_symbolic() which can be parsed by perf and trace-cmd. For
> all other use cases, it is converted into the function above to return the
> string.
I would like to have this support. I really tried to share this code a while
back. What you have is seems nicer than what I remember coming up with but it
is still a bit hacky IMO. And I'm afraid of how fragile this seems right now.
At this point I'm just going to define cxl_event_log_type_str() separate from
the __print_symbolic() in the trace code. Comment that they should both be
updated if changed and move forward.
Thanks for the suggestion but I think it is going to be more complicated than
it is worth. At least for mere mortals such as myself.
Ira
[1]
For mbox.c I have to have the special redefinition of __print_symbolic() in the
c file itself. Code including cxlmem.h without CREATE_TRACE_POINTS defined
(like pci.c) works just fine with what you had.
commit 43a30047962312be2e532dff542d47a132949c08
Author: Ira Weiny <ira.weiny@...el.com>
Date: Thu Dec 1 13:50:14 2022 -0800
squash: Redefine __print_symbolic to have a central define of the log string print function.
diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index 63ee0fd5f4c2..55938d530a21 100644
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -4,12 +4,30 @@
#include <linux/security.h>
#include <linux/debugfs.h>
#include <linux/mutex.h>
-#include <cxlmem.h>
#include <cxl.h>
#define CREATE_TRACE_POINTS
+/* Must be after CREATE_TRACE_POINTS */
+#include <cxlmem.h>
#include <trace/events/cxl.h>
+static inline const char *__cxl_event_log_type_str(enum cxl_event_log_type type,
+ const struct trace_print_flags *symbols)
+{
+ for (; symbols->mask >= 0; symbols++) {
+ if (type == symbols->mask)
+ return symbols->name;
+ }
+ return "<unknown>";
+}
+
+#define __print_symbolic(value, symbol_array...) \
+ ({ \
+ static const struct trace_print_flags symbols[] = \
+ { symbol_array, { -1, NULL }}; \
+ __cxl_event_log_type_str(value, symbols); \
+ })
+
#include "core.h"
static bool cxl_raw_allow_all;
diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
index a701a2e9bcba..34e7d8ae6cfd 100644
--- a/drivers/cxl/cxlmem.h
+++ b/drivers/cxl/cxlmem.h
@@ -381,23 +381,32 @@ enum cxl_event_log_type {
CXL_EVENT_TYPE_MAX
};
-static inline const char *cxl_event_log_type_str(enum cxl_event_log_type type)
+#define cxl_event_log_type_str(type) \
+ __print_symbolic(type, \
+ { CXL_EVENT_TYPE_INFO, "Informational" }, \
+ { CXL_EVENT_TYPE_WARN, "Warning" }, \
+ { CXL_EVENT_TYPE_FAIL, "Failure" }, \
+ { CXL_EVENT_TYPE_FATAL, "Fatal" })
+
+#ifndef CREATE_TRACE_POINTS
+static inline const char *__cxl_event_log_type_str(enum cxl_event_log_type type,
+ const struct trace_print_flags *symbols)
{
- switch (type) {
- case CXL_EVENT_TYPE_INFO:
- return "Informational";
- case CXL_EVENT_TYPE_WARN:
- return "Warning";
- case CXL_EVENT_TYPE_FAIL:
- return "Failure";
- case CXL_EVENT_TYPE_FATAL:
- return "Fatal";
- default:
- break;
- }
- return "<unknown>";
+ for (; symbols->mask >= 0; symbols++) {
+ if (type == symbols->mask)
+ return symbols->name;
+ }
+ return "<unknown>";
}
+#define __print_symbolic(value, symbol_array...) \
+ ({ \
+ static const struct trace_print_flags symbols[] = \
+ { symbol_array, { -1, NULL }}; \
+ __cxl_event_log_type_str(value, symbols); \
+ })
+#endif
+
struct cxl_mbox_get_partition_info {
__le64 active_volatile_cap;
__le64 active_persistent_cap;
[2]
Why can't this work? Why does the undef of CREATE_TRACE_POINTS not work?
I've also tried to include __cxl_event_log_type_str() and this redefintion of
__print_symbolic() in trace/events/cxl.h and that does not work.
I'm also worried this somehow breaks the support you want. But I'm still not
sure how the trace headers and multiple passes work.
commit ad08110d2432fb24d4513fe9e75bb9be94870e6f
Author: Ira Weiny <ira.weiny@...el.com>
Date: Thu Dec 1 15:01:05 2022 -0800
squash: broken!
diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index 55938d530a21..04117afe9fbf 100644
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -7,26 +7,10 @@
#include <cxl.h>
#define CREATE_TRACE_POINTS
-/* Must be after CREATE_TRACE_POINTS */
-#include <cxlmem.h>
#include <trace/events/cxl.h>
-static inline const char *__cxl_event_log_type_str(enum cxl_event_log_type type,
- const struct trace_print_flags *symbols)
-{
- for (; symbols->mask >= 0; symbols++) {
- if (type == symbols->mask)
- return symbols->name;
- }
- return "<unknown>";
-}
-
-#define __print_symbolic(value, symbol_array...) \
- ({ \
- static const struct trace_print_flags symbols[] = \
- { symbol_array, { -1, NULL }}; \
- __cxl_event_log_type_str(value, symbols); \
- })
+#undef CREATE_TRACE_POINTS
+#include <cxlmem.h>
#include "core.h"
[3]
This seems to be the cleanest thing I have gotten to work. Work == compiles
and trace points still print the strings.
commit c04f87639164737605c9ff503f8060b901c1b83a
Author: Ira Weiny <ira.weiny@...el.com>
Date: Thu Dec 1 13:50:14 2022 -0800
squash: Redefine __print_symbolic to have a central define of the log string print function.
diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index 63ee0fd5f4c2..31a65106e93c 100644
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -4,12 +4,19 @@
#include <linux/security.h>
#include <linux/debugfs.h>
#include <linux/mutex.h>
-#include <cxlmem.h>
#include <cxl.h>
#define CREATE_TRACE_POINTS
+/* Must be after CREATE_TRACE_POINTS */
+#include <cxlmem.h>
#include <trace/events/cxl.h>
+/*
+ * Must be included explicitly after trace header
+ * because CREATE_TRACE_POINTS can't be undefined for cxlmem.h???
+ */
+#include <cxl_event_log.h>
+
#include "core.h"
static bool cxl_raw_allow_all;
diff --git a/drivers/cxl/cxl_event_log.h b/drivers/cxl/cxl_event_log.h
new file mode 100644
index 000000000000..e8357bfeecdf
--- /dev/null
+++ b/drivers/cxl/cxl_event_log.h
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright(c) 2020 Intel Corporation. All rights reserved. */
+
+/*
+ * Redefine __print_symbolic() from the trace code to be used in regular C code
+ * This compliments the define of cxl_event_log_type_str() in cxlmem.h
+ */
+static inline const char *__cxl_event_log_type_str(enum cxl_event_log_type type,
+ const struct trace_print_flags *symbols)
+{
+ for (; symbols->mask >= 0; symbols++) {
+ if (type == symbols->mask)
+ return symbols->name;
+ }
+ return "<unknown>";
+}
+
+#define __print_symbolic(value, symbol_array...) \
+ ({ \
+ static const struct trace_print_flags symbols[] = \
+ { symbol_array, { -1, NULL }}; \
+ __cxl_event_log_type_str(value, symbols); \
+ })
diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
index a701a2e9bcba..15222a0ceb3f 100644
--- a/drivers/cxl/cxlmem.h
+++ b/drivers/cxl/cxlmem.h
@@ -381,22 +381,16 @@ enum cxl_event_log_type {
CXL_EVENT_TYPE_MAX
};
-static inline const char *cxl_event_log_type_str(enum cxl_event_log_type type)
-{
- switch (type) {
- case CXL_EVENT_TYPE_INFO:
- return "Informational";
- case CXL_EVENT_TYPE_WARN:
- return "Warning";
- case CXL_EVENT_TYPE_FAIL:
- return "Failure";
- case CXL_EVENT_TYPE_FATAL:
- return "Fatal";
- default:
- break;
- }
- return "<unknown>";
-}
+#define cxl_event_log_type_str(type) \
+ __print_symbolic(type, \
+ { CXL_EVENT_TYPE_INFO, "Informational" }, \
+ { CXL_EVENT_TYPE_WARN, "Warning" }, \
+ { CXL_EVENT_TYPE_FAIL, "Failure" }, \
+ { CXL_EVENT_TYPE_FATAL, "Fatal" })
+
+#ifndef CREATE_TRACE_POINTS
+#include "cxl_event_log.h"
+#endif
struct cxl_mbox_get_partition_info {
__le64 active_volatile_cap;
Powered by blists - more mailing lists