From patchwork Tue Nov 15 00:58:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 20112 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2451050wru; Mon, 14 Nov 2022 17:04:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Y52puwzv9tvN8YUanQrDUHfDhvLRP0X+ugDhBjxFsi5QXvCEg/JHRozU05NEWKdFkf86g X-Received: by 2002:a63:ef04:0:b0:46f:188c:3312 with SMTP id u4-20020a63ef04000000b0046f188c3312mr13514529pgh.562.1668474280454; Mon, 14 Nov 2022 17:04:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668474280; cv=none; d=google.com; s=arc-20160816; b=a3fOncWHskFxR0EIrVNrUGZdp+7dCMTfVMQzhThaySZcoUGLFhyW1egB2u40ZME1gE F8a1R3re5OsVdm0gVBwbMLC3hXpro5OPYZXLLN5+MVJgI5SMwsf75Ucu/GCsvE68hnD1 1JZcGdOavks704vVEAriV9YaVsmka4Ym4YuP0iqrpeE633aebjaqUEuNRdEadfgwYX8r 78qERum6FEGVaAa5W+6pmj8Pj7YsAydrfJosnU0gu1ly/y0pcG5TBPJ2fPwYzqMK5Xp0 5VvhKbnouYPN2sKeDbU7Th4+M8KQO+DSo0HB2F43tKTtgDBhufTNWrOBvfO+U0za6N5j 4tLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=I4E3aVZX0lnhRkF9kXic/1+xlwkA1aElztKCxR5PD6s=; b=NlMtfX/MJTYiQnupHr42qjXCzsLabbLd82INNrIQbw4aXJUjieosZMvWTYuukmAWoD T22r7q1859YfqoqwbF5rATdUTNYn4N7j9Tfu5+Pc1D4m9MnbBLdfPsy684ZnPeGKrteI ov/6How6FtmlreHjgL5byrjJt/9DOqWVb7VX5y6KNaLRr14/nK0kdlWVBZUJ9eAG61sZ 4Xw4e8DlECFqqwJPUInHOUbbkjUGMoMUXhIHI8azXBiCxjrLAmA4J93MNbNULzt3YEcS +Tk5KyhHazQ2mnR70xlnxbeMJdpe5B97kkFUK5L/4yvZTyJbDD/tgwczh8M+x0HVDLWw 7o7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=IK+jAyAn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f1-20020a63f741000000b00439ae52c996si10637288pgk.71.2022.11.14.17.04.26; Mon, 14 Nov 2022 17:04:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=IK+jAyAn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237790AbiKOA7P (ORCPT + 99 others); Mon, 14 Nov 2022 19:59:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236608AbiKOA7K (ORCPT ); Mon, 14 Nov 2022 19:59:10 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DC9A9F59C; Mon, 14 Nov 2022 16:59:07 -0800 (PST) Received: from W11-BEAU-MD.localdomain (unknown [76.135.50.127]) by linux.microsoft.com (Postfix) with ESMTPSA id 8185420B6C40; Mon, 14 Nov 2022 16:59:07 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8185420B6C40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1668473947; bh=I4E3aVZX0lnhRkF9kXic/1+xlwkA1aElztKCxR5PD6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IK+jAyAn+X8wvztZ9KhMZTBsgqP8yM68uvoR69h0+SAN5yNlVba8JhzDp/AcLh6nz 0nLxs/Epu4KZCCamPy4xEZgRUMy2ZAxOU9iFLDz2Wrs7Fwm22zqLg/MBlCqUON49t7 haqHwbh/uZm9Z8k8GDqgUc5fEA8G+vAvYN6BMcd8= From: Beau Belgrave To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, dcook@linux.microsoft.com, alanau@linux.microsoft.com Cc: linux-trace-devel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v2 1/7] tracing/user_events: Split header into uapi and kernel Date: Mon, 14 Nov 2022 16:58:56 -0800 Message-Id: <20221115005902.30458-2-beaub@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221115005902.30458-1-beaub@linux.microsoft.com> References: <20221115005902.30458-1-beaub@linux.microsoft.com> MIME-Version: 1.0 X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749522086569332587?= X-GMAIL-MSGID: =?utf-8?q?1749522086569332587?= 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, 56 insertions(+), 49 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..036b360f3d97 100644 --- a/include/linux/user_events.h +++ b/include/linux/user_events.h @@ -1,54 +1,18 @@ -/* 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 +#include + +#ifdef CONFIG_USER_EVENTS #else -#include #endif -#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..7700759a7cd9 --- /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 '*' + +/* 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 */ diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index ae78c2d53c8a..890357b48c37 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"