Commit e5a26a40 authored by Beau Belgrave's avatar Beau Belgrave Committed by Steven Rostedt (Google)
Browse files

tracing/user_events: Split header into uapi and kernel 

The UAPI parts need to be split out from the kernel parts of user_events
now that other parts of the kernel will reference it. Do so by moving
the existing include/linux/user_events.h into
include/uapi/linux/user_events.h.

Link: https://lkml.kernel.org/r/20230328235219.203-2-beaub@linux.microsoft.com



Signed-off-by: default avatarBeau Belgrave <beaub@linux.microsoft.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 80a76994

include/linux/user_events.h

+6 −46
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2021, Microsoft Corporation.

 * Copyright (c) 2022, Microsoft Corporation.

 *

 * Authors:

 *   Beau Belgrave <beaub@linux.microsoft.com>

 */

#ifndef _UAPI_LINUX_USER_EVENTS_H

#define _UAPI_LINUX_USER_EVENTS_H



#include <linux/types.h>

#include <linux/ioctl.h>

#ifndef _LINUX_USER_EVENTS_H

#define _LINUX_USER_EVENTS_H



#ifdef __KERNEL__

#include <linux/uio.h>

#else

#include <sys/uio.h>

#endif

#include <uapi/linux/user_events.h>



#define USER_EVENTS_SYSTEM "user_events"

#define USER_EVENTS_PREFIX "u:"



/* Create dynamic location entry within a 32-bit value */

#define DYN_LOC(offset, size) ((size) << 16 | (offset))



/*

 * Describes an event registration and stores the results of the registration.

 * This structure is passed to the DIAG_IOCSREG ioctl, callers at a minimum

 * must set the size and name_args before invocation.

 */

struct user_reg {



	/* Input: Size of the user_reg structure being used */

	__u32 size;



	/* Input: Pointer to string with event name, description and flags */

	__u64 name_args;



	/* Output: Bitwise index of the event within the status page */

	__u32 status_bit;



	/* Output: Index of the event to use when writing data */

	__u32 write_index;

} __attribute__((__packed__));



#define DIAG_IOC_MAGIC '*'



/* Requests to register a user_event */

#define DIAG_IOCSREG _IOWR(DIAG_IOC_MAGIC, 0, struct user_reg*)



/* Requests to delete a user_event */

#define DIAG_IOCSDEL _IOW(DIAG_IOC_MAGIC, 1, char*)



#endif /* _UAPI_LINUX_USER_EVENTS_H */
 
#endif /* _LINUX_USER_EVENTS_H */

include/uapi/linux/user_events.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * Copyright (c) 2021-2022, Microsoft Corporation.

 *

 * Authors:

 *   Beau Belgrave <beaub@linux.microsoft.com>

 */

#ifndef _UAPI_LINUX_USER_EVENTS_H

#define _UAPI_LINUX_USER_EVENTS_H



#include <linux/types.h>

#include <linux/ioctl.h>



#define USER_EVENTS_SYSTEM "user_events"

#define USER_EVENTS_PREFIX "u:"



/* Create dynamic location entry within a 32-bit value */

#define DYN_LOC(offset, size) ((size) << 16 | (offset))



/*

 * Describes an event registration and stores the results of the registration.

 * This structure is passed to the DIAG_IOCSREG ioctl, callers at a minimum

 * must set the size and name_args before invocation.

 */

struct user_reg {



	/* Input: Size of the user_reg structure being used */

	__u32 size;



	/* Input: Pointer to string with event name, description and flags */

	__u64 name_args;



	/* Output: Bitwise index of the event within the status page */

	__u32 status_bit;



	/* Output: Index of the event to use when writing data */

	__u32 write_index;

} __attribute__((__packed__));



#define DIAG_IOC_MAGIC '*'



/* Request to register a user_event */

#define DIAG_IOCSREG _IOWR(DIAG_IOC_MAGIC, 0, struct user_reg *)



/* Request to delete a user_event */

#define DIAG_IOCSDEL _IOW(DIAG_IOC_MAGIC, 1, char *)



#endif /* _UAPI_LINUX_USER_EVENTS_H */

kernel/trace/trace_events_user.c

+0 −5
Original line number Diff line number Diff line
@@ -19,12 +19,7 @@ 
#include <linux/tracefs.h>

#include <linux/types.h>

#include <linux/uaccess.h>

/* Reminder to move to uapi when everything works */

#ifdef CONFIG_COMPILE_TEST

#include <linux/user_events.h>

#else

#include <uapi/linux/user_events.h>

#endif

#include "trace.h"

#include "trace_dynevent.h"