From patchwork Thu Mar 23 19:06:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 13186000 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E165AC76196 for ; Thu, 23 Mar 2023 19:06:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D6DE6B0078; Thu, 23 Mar 2023 15:06:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 88F616B007E; Thu, 23 Mar 2023 15:06:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68ABC6B007B; Thu, 23 Mar 2023 15:06:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 547386B0075 for ; Thu, 23 Mar 2023 15:06:19 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2D403C07BB for ; Thu, 23 Mar 2023 19:06:19 +0000 (UTC) X-FDA: 80601093678.29.E35476F Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf28.hostedemail.com (Postfix) with ESMTP id 62F27C001C for ; Thu, 23 Mar 2023 19:06:16 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=jaYGG4ug; spf=pass (imf28.hostedemail.com: domain of beaub@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=beaub@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679598376; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OSmDP26J8YzoMhJc3UKK7slznwSGVE3KNwggNF1IdJc=; b=3GD3EJrLDd61BRUHYND8gYOabKVhrOAN+Zb828ClMiUqZw+DL3JSKh7YdWQREObIxNCnZt Dthoh6J8alWM0Zjycgmy01zC4EACX8tRq7bu7ELWiVHtUrhLqN5HRw2k0W5JOMXyEq681v XoquHvTME+K2W/vuhAGa3nCUxPdq+FI= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=jaYGG4ug; spf=pass (imf28.hostedemail.com: domain of beaub@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=beaub@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679598376; a=rsa-sha256; cv=none; b=0y/ARYwAC08d9WZvklpP53jN+2vQ2Z9PW+ZXI99VOWuZlG05ecnJ7vbrGUUPCE6EJMQU1i NusrZu3Z6jXCCCPholYeFOfUY1dx7FMfZrW2o7G06+LBqH2P9Bqq7uGVj4ANaHcvWV9zE/ /6FD342qI/mNxlo067uJtn0kEvyNMYQ= Received: from W11-BEAU-MD.localdomain (unknown [76.135.27.212]) by linux.microsoft.com (Postfix) with ESMTPSA id D122F20FC0E8; Thu, 23 Mar 2023 12:06:14 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D122F20FC0E8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679598375; bh=OSmDP26J8YzoMhJc3UKK7slznwSGVE3KNwggNF1IdJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jaYGG4ugjMVVO4MX7alWaNGDAMI91nFHXJ5k/Q0X58o4L6YtUg810AL+vFiWmibas M263Z25IAH5rp/rDqBuaLHMPJdf3JY6xBtR/+SXdSDxyh2gZZuRrZsMu0+QQyRGdbY H/LunFHwqJyGl6+oj1Z3xaPy0h8onfGLTFLAlA+U= From: Beau Belgrave To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, dcook@linux.microsoft.com, alanau@linux.microsoft.com, brauner@kernel.org, akpm@linux-foundation.org, ebiederm@xmission.com, keescook@chromium.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Subject: [RESEND PATCH v8 01/11] tracing/user_events: Split header into uapi and kernel Date: Thu, 23 Mar 2023 12:06:00 -0700 Message-Id: <20230323190610.251-2-beaub@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230323190610.251-1-beaub@linux.microsoft.com> References: <20230323190610.251-1-beaub@linux.microsoft.com> MIME-Version: 1.0 X-Stat-Signature: 3c4hjgka9qn4a3mjwu6ri3dhbrdyemmb X-Rspam-User: X-Rspamd-Queue-Id: 62F27C001C X-Rspamd-Server: rspam06 X-HE-Tag: 1679598376-278092 X-HE-Meta: U2FsdGVkX1+LUXYwlH9h98NtQOWe2+JMjv4cgo/j8OZ+no2rapK26rMrcqwa3maeiOriaPpbwb+vRpE7FjrnhKdUMYZnOjkFlVL/Ma1uxPaLF1xNJfkuH5dZ/jQxINSwFITG5Hge44d51eyhHIgmJ0AmoSkO96GN1jZB2gFJNEnOeLzZ9e0o5RSfI3TKf+Fve8vyobLnJxGUwngP70QY05hn95/lVSK07Aqqx5xXmZKCndJyIG7oWmyZeE0H4hopCMbXmVzvVaFlFVMbFF5nwgxjqVfrHzRYjzta/3WWcAj3ER/ECokpxSwERinMbW4bOlwL8aFU2ytFd4X86IGOxMZ9pAiAiuMrT+xQaqhs0ZoiA2fcZboVm1tbSb/qqOJRnSeAJ7gEluu0+HlLG4Ja6tX3WrcNm1GIVn1+bKOZmVgKetu9a7tB2YyJKALw2JKXFeRAGGH2wgCx6ik84MbTwGI6n3LqWvWjFaWhkopvxO3isskRBuAZnxnfNOJpLbGXghzPzk0jayyaqbMJGZkqzvdsAOKSOmSiuSBvtceUgwc/nvt7UxoGcO5nD21S+dGPpfK46lhpv2mh87ewC0rLEyL74KwWNvh+BHVf7K42TfAIpEZCQne7EDi4NvIh0uXutfKGOqtgJh5KJ5ohhwLbmIo8ZZRgobwKP+P4+ttORBfvZ21+9IjcCrWYD77HMaFKNUZ3jb80ylDDGupR00f+k/WrboG1EsrjgeVBEhPE29CHUsVdX5Bb4IxckAO5gXy6YaNgPNEob66NwAPKl9+jUweqECZdWdzI8SahiLjNzJCa9UAisrRTLuFFWJAtjVn60B40PtIx6A/yiY4wQLJkuAFB0MWOcIbZofCm8ckGcjMQPq4hu6esg9KL/Dv3h2pXZpvFRoHH3SspsQUf80ZLj+xvB/HafFTGfKr1M01uFDygt+tHTpAcLBDtWz7NCupzo2+NtJZ4juB1zZFOtbe MgAGNxpb MEf9TOMB0IF0/S7n8CW0f1ohsycT0xP1UX4W+T5dVx+r4aLz8jRiwoDsHrVGGxqmDU7Smw9k0Ta36iKQO8owziYwu6xpvvVZAny3rhpCvWVAydflPbUkKDP5hZ6WZGNLrpd4SRSD2sKlyzhQZNvoJ0wlRPx6dpX5VxaYOVxIGB/N2GVtJF93bjbyinTMaf05ba23TibqA0TR/MFdbxt1WJGF3zUUZFkxl4pRAK2FQgzbNKmWu9pmrKtzqTJGc9r5yeB5M7FG02qiYEkmf0+66UXz15rG0MA7u3gV6CJs1r2IcrJw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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. Signed-off-by: Beau Belgrave --- include/linux/user_events.h | 52 ++++---------------------------- include/uapi/linux/user_events.h | 48 +++++++++++++++++++++++++++++ kernel/trace/trace_events_user.c | 5 --- 3 files changed, 54 insertions(+), 51 deletions(-) create mode 100644 include/uapi/linux/user_events.h diff --git a/include/linux/user_events.h b/include/linux/user_events.h index 592a3fbed98e..13689589d36e 100644 --- a/include/linux/user_events.h +++ b/include/linux/user_events.h @@ -1,54 +1,14 @@ -/* 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 */ -#ifndef _UAPI_LINUX_USER_EVENTS_H -#define _UAPI_LINUX_USER_EVENTS_H -#include -#include +#ifndef _LINUX_USER_EVENTS_H +#define _LINUX_USER_EVENTS_H -#ifdef __KERNEL__ -#include -#else -#include -#endif +#include -#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 */ diff --git a/include/uapi/linux/user_events.h b/include/uapi/linux/user_events.h new file mode 100644 index 000000000000..03f92366068d --- /dev/null +++ b/include/uapi/linux/user_events.h @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * Copyright (c) 2021-2022, Microsoft Corporation. + * + * Authors: + * Beau Belgrave + */ +#ifndef _UAPI_LINUX_USER_EVENTS_H +#define _UAPI_LINUX_USER_EVENTS_H + +#include +#include + +#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 */ diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 908e8a13c675..070551480747 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -19,12 +19,7 @@ #include #include #include -/* Reminder to move to uapi when everything works */ -#ifdef CONFIG_COMPILE_TEST #include -#else -#include -#endif #include "trace.h" #include "trace_dynevent.h"