After being merged, user_events become more visible to a wider audience that have concerns with the current API. It is too late to fix this for this release, but instead of a full revert, just mark it as BROKEN (which prevents it from being selected in make config). Then we can work finding a better API. If that fails, then it will need to be completely reverted. To not have the code silently bitrot, still allow building it with COMPILE_TEST. And to prevent the uapi header from being installed, then later changed, and then have an old distro user space see the old version, move the header file out of the uapi directory. Surround the include with CONFIG_COMPILE_TEST to the current location, but when the BROKEN tag is taken off, it will use the uapi directory, and fail to compile. This is a good way to remind us to move the header back.
Showing the changes to kernel (2 of 3 files). Show all
Unified · Split
| @@ -767,6 +767,7 @@ config USER_EVENTS · 766 unmodified lines | |||
| 767 | bool "User trace events" | 767 | bool "User trace events" |
| 768 | select TRACING | 768 | select TRACING |
| 769 | select DYNAMIC_EVENTS | 769 | select DYNAMIC_EVENTS |
| 770 | depends on BROKEN || COMPILE_TEST # API needs to be straighten out | ||
| 770 | help | 771 | help |
| 771 | User trace events are user-defined trace events that | 772 | User trace events are user-defined trace events that |
| 772 | can be used like an existing kernel trace event. User trace | 773 | can be used like an existing kernel trace event. User trace |
| @@ -18,7 +18,12 @@ · 17 unmodified lines | |||
| 18 | #include <linux/tracefs.h> | 18 | #include <linux/tracefs.h> |
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/uaccess.h> | 20 | #include <linux/uaccess.h> |
| 21 | /* Reminder to move to uapi when everything works */ | ||
| 22 | #ifdef CONFIG_COMPILE_TEST | ||
| 23 | #include <linux/user_events.h> | ||
| 24 | #else | ||
| 21 | #include <uapi/linux/user_events.h> | 25 | #include <uapi/linux/user_events.h> |
| 26 | #endif | ||
| 22 | #include "trace.h" | 27 | #include "trace.h" |
| 23 | #include "trace_dynevent.h" | 28 | #include "trace_dynevent.h" |
| 24 | 29 | ||