From patchwork Tue Feb 21 21:11:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 13148398 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 D8A0CC64ED6 for ; Tue, 21 Feb 2023 21:11:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B3136B0072; Tue, 21 Feb 2023 16:11:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 289036B0073; Tue, 21 Feb 2023 16:11:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 157786B0074; Tue, 21 Feb 2023 16:11:52 -0500 (EST) 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 EEFBC6B0073 for ; Tue, 21 Feb 2023 16:11:51 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B726E1A03AE for ; Tue, 21 Feb 2023 21:11:51 +0000 (UTC) X-FDA: 80492546022.03.51339DF Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf10.hostedemail.com (Postfix) with ESMTP id 051D1C0007 for ; Tue, 21 Feb 2023 21:11:49 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=QZ3afmGF; spf=pass (imf10.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=1677013910; 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=IDyroHq7edJ9YvBWdjQsgxakkclH1TqyDMyffdKCCIJ0ccvcktWvm6+FoPYxIu+pdWM3Vh RTYyrPD/v3v7bojepoeNa8azLqhl0Hs4tGnwR6nLAeXAyKOAVwIwS3Hmq57aRTz4ZprAAc ANlHgi7R2x01dvWMSIqIIWlAVhpTbeo= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=QZ3afmGF; spf=pass (imf10.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=1677013910; a=rsa-sha256; cv=none; b=RUuKb4Vclw1qhm06FJrR0Dsp3Nv1Un/wKbUSJfDo+Qv9I41G0Ad5hueEewYsr9xvmhgKB8 iCHRQOExUWjQKvs5x9FYt/5wCADVFlJfQRzsu/jETk7N7KXrM/f+0kZw4KBsXSHeHAyXzg pkxuhZYM2QD8DNjksOrgO7oampjGPgQ= Received: from W11-BEAU-MD.localdomain (unknown [76.135.27.212]) by linux.microsoft.com (Postfix) with ESMTPSA id 9DD01209A93B; Tue, 21 Feb 2023 13:11:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9DD01209A93B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1677013908; bh=OSmDP26J8YzoMhJc3UKK7slznwSGVE3KNwggNF1IdJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QZ3afmGFFO8UhimsjFdIx0E4RrHMJCg4heN+JTPjRV3GYLMekM7QXuMqXGKy5udcd Gaz2yWH8+42tekNvGACHxjUfQkGUos9QOD1o2avfJqKBV3+9EcfLpjpSWqwGMf5vz0 NDjm2lpVRVRRrKTG+YHJmaySM45/b0AJDcHG1bXU= 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-trace-devel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v8 01/11] tracing/user_events: Split header into uapi and kernel Date: Tue, 21 Feb 2023 13:11:33 -0800 Message-Id: <20230221211143.574-2-beaub@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230221211143.574-1-beaub@linux.microsoft.com> References: <20230221211143.574-1-beaub@linux.microsoft.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 051D1C0007 X-Rspam-User: X-Stat-Signature: xychjh6s6b7fogufhcde4j19iie8q7gt X-HE-Tag: 1677013909-39677 X-HE-Meta: U2FsdGVkX1/uvE2Y2PFTlpkUuhZrPrAMQ780z56IwrUPixLyxl5vd7YatVA+wQ7uGbk633ybZCUwIz3+oOZ4cBe4cVwee/nHI7O2JYsUk/VJLt/KO1ZT/Q7yUL+wVh5vqfzj5X8RSZ3W1yj8mQMs7QyC8nH02kMAJuwEJq5EtzNqLIhc9fHFX7PxHgMXLMZjyLYmPW0MjFQfZfMWpFoW08modIk9wANoGEw8WaxreE/F0Fzrjh06vojN5mEU8jp6O8KkZ+6Iq60DLpTxJe+kRBQntz5ZNUv1t+kD2bYeBQPV2a4b50H5M0z6TMsZGehZN8FnDiwLURE1nC8WvxjTZhvp6TXNYdtgfkaCNKMLoxXZDpUynhqCaLeWLEUSDdS+y8WCq6bdWOY7aZpeofcc7ib9MoWQdKPLByBC3MmpSoCRrBxvRW+g5fPmcfjhWQ3h41JfArlIbhcRQj8Z06dQV+unw7+Bp+kG4DqWhwBNyomZD5NAOv7hfB6ktaSXKSkfI8ZtVmesRR9wA/WcCJVEb9ylgV0IIWa/YtfuorNrkuy8JIxxD7DseCNa8OBMsUZhYqhjvzVmqc9ZFraN02V88cPsLTWg0OxtxAtguAQdqcfnt0uZjcXZ+inO+u2YcYGGijPBPz/FMAUStPzp2FlRx7pbREIWmurSbRrXDutObd117ljUwfvty5waAXY/UwiqcfeSzkv877ZuaIqvWYSAQgTGewuYDZqvL3capAa/k0PbVn0WzfkQg2yRmf7G/v0d1e4F8H8xrUcDBmnxhx9V6Agg9H1x9E0JV4aXK0+j3SG2ivZnfhXJYqNFcdOyGhEBkITVIvYKcGOAaT2W1TWV9xfDn24P/nB9C6/Tlr7qoh4cbqBrANL21ZuklWdP6hFIuPIYWEXAQ2bOYJV+X236wJDdix/8949p/PV2peHa2cjc3RnB4gq9sfy5aFK8aH5fBjG2pvwVR4FQO+pVKu+ P4D70iui CToUvEThaHW55SUkFM1hGbZgkTdyWaNmSVOuwNXFDVcCHk5BAMG0/wGfPylJcVVZ2jk9w2RGSkZ6QSJdjBXFRg9QDp9cTEQnJk+77yAQGe9k2PNqGjviUrpaibo5JRT4UhExFOssRtBLjtZB38C7pqa952XwGp+cZvbKmFk/jDJfKOnINCCnIhu/HjkowYt9M5DfRw1BMEc6yFzNGfs8B3aODsQAnEuqDtMtSGwA9XAHs2040mNfV5d8fQEVBNGSn3ZlZRMrF0JZ766+iBWgMvXQ8c+8m7sVDA9Tai5zgU7ukwKY= 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"