From patchwork Fri Dec 2 23:51:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 29149 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1126695wrr; Fri, 2 Dec 2022 15:52:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf5A4vJiWL1TPp4NPNI2P9C0w/26yjFPvBVGm+hKF9PT4lfz4CXQJ1C+oAZI/udVajN4UnmO X-Received: by 2002:a62:b402:0:b0:56e:8f96:6b2e with SMTP id h2-20020a62b402000000b0056e8f966b2emr75445294pfn.18.1670025156326; Fri, 02 Dec 2022 15:52:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670025156; cv=none; d=google.com; s=arc-20160816; b=MUfoKU4hZCcJrk2rewkWLNjuLMhGGUSWt3Bsp5+695MYbvhmwu3xAwI93eYCYBlTgV BjVKQRq+Db6wHSOTxKPJnTtCOdUaaM0YeuHhqUHSsHctq6/42Ir4lEvV3qs+0JMwC4p1 v3aQqWfozIy9xMXqU6rjdakrw/3Jidxce4pwtf2HQ8nU6aEe6nTjlyoR+oGgxC5GSYHs XTSqejCsiGfuk9uemXil3dTD3pEzcJunSb4M86b8eOBkUI2zfkMr6ZuG1jiLDvaBf4PX WnI3kNoSfdkXxVCFQZKhTqotBCUQ1eJXhHe3rPoWm138wAv5SF8yrh4VtnNlNkTEBwFi wMvg== 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=dmkEXknb1A0Qhw2AWPTXryudmpuAFo4IqxhDoe6dNiw=; b=bDo6+bVRMmhQLCfAv4m0mW8s3p0ktzcO6I1EZ6K16tNckTwx8wsxS5FPWSZdjaxa/U IZJC2ZUoYPcCWcXitKFulhNo4eBDKg1ahmP4K9ER+eipzM9d6sbkTh4p78bcWf+AHKCS eSaQ2b/MAncyCfrAx8AjlSEi1HLZQZMGrWylyoN0IchPWfWtCgNMeiQc25bLC7Nl0EGS KKHWa1PejTP2cHhRGpzbTu60MnlhxgkAkEShly/Mqeehr5mx1EC/FtmM9dESqiRJcLdC kDDq5McsakEwBKfnBHrAs1OY65NR3q7sKvmJZhD5EdBHzyoR29uyLq73NLXufzN/l3dY DGwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b="r080/P+S"; 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 q3-20020a63cc43000000b004781e385185si8790728pgi.548.2022.12.02.15.52.22; Fri, 02 Dec 2022 15:52:36 -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="r080/P+S"; 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 S234557AbiLBXwB (ORCPT + 99 others); Fri, 2 Dec 2022 18:52:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234620AbiLBXvr (ORCPT ); Fri, 2 Dec 2022 18:51:47 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B097BFC816; Fri, 2 Dec 2022 15:51:46 -0800 (PST) Received: from W11-BEAU-MD.localdomain (unknown [76.135.50.127]) by linux.microsoft.com (Postfix) with ESMTPSA id 597F320B83F0; Fri, 2 Dec 2022 15:51:46 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 597F320B83F0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1670025106; bh=dmkEXknb1A0Qhw2AWPTXryudmpuAFo4IqxhDoe6dNiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r080/P+SSv74MWBv75cdJS0pI8JjJr8n1Cf9kYgN+7TxQtPhwPeCOhITXdsoxx6SI TG/Z/rllO1WQMcLl3V1mHrvTMtW67Jaox/vdCokvILjdBKBhfsuvZpiB59oXa2yR0e Vyl7MFykgTwe1joQbdxEpLlQse8rM/BY7BZn/BhU= 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 Cc: linux-trace-devel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 08/11] tracing/user_events: Use write ABI in example Date: Fri, 2 Dec 2022 15:51:35 -0800 Message-Id: <20221202235138.450-9-beaub@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221202235138.450-1-beaub@linux.microsoft.com> References: <20221202235138.450-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?1751148298591377552?= X-GMAIL-MSGID: =?utf-8?q?1751148298591377552?= The ABI has changed to use a remote write approach. Update the example to show the expected use of this new ABI. Also remove debugfs path and use tracefs to ensure example works in more environments. Signed-off-by: Beau Belgrave --- samples/user_events/example.c | 47 +++++++---------------------------- 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/samples/user_events/example.c b/samples/user_events/example.c index d06dc24156ec..28165a096697 100644 --- a/samples/user_events/example.c +++ b/samples/user_events/example.c @@ -9,51 +9,28 @@ #include #include #include +#include #include #include #include -#include -#include #include -#if __BITS_PER_LONG == 64 -#define endian_swap(x) htole64(x) -#else -#define endian_swap(x) htole32(x) -#endif +const char *data_file = "/sys/kernel/tracing/user_events_data"; +int enabled = 0; -/* Assumes debugfs is mounted */ -const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; -const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; - -static int event_status(long **status) -{ - int fd = open(status_file, O_RDONLY); - - *status = mmap(NULL, sysconf(_SC_PAGESIZE), PROT_READ, - MAP_SHARED, fd, 0); - - close(fd); - - if (*status == MAP_FAILED) - return -1; - - return 0; -} - -static int event_reg(int fd, const char *command, long *index, long *mask, - int *write) +static int event_reg(int fd, const char *command, int *write, int *enabled) { struct user_reg reg = {0}; reg.size = sizeof(reg); + reg.enable_bit = 31; + reg.enable_size = sizeof(*enabled); + reg.enable_addr = (__u64)enabled; reg.name_args = (__u64)command; if (ioctl(fd, DIAG_IOCSREG, ®) == -1) return -1; - *index = reg.status_bit / __BITS_PER_LONG; - *mask = endian_swap(1L << (reg.status_bit % __BITS_PER_LONG)); *write = reg.write_index; return 0; @@ -62,17 +39,12 @@ static int event_reg(int fd, const char *command, long *index, long *mask, int main(int argc, char **argv) { int data_fd, write; - long index, mask; - long *status_page; struct iovec io[2]; __u32 count = 0; - if (event_status(&status_page) == -1) - return errno; - data_fd = open(data_file, O_RDWR); - if (event_reg(data_fd, "test u32 count", &index, &mask, &write) == -1) + if (event_reg(data_fd, "test u32 count", &write, &enabled) == -1) return errno; /* Setup iovec */ @@ -80,13 +52,12 @@ int main(int argc, char **argv) io[0].iov_len = sizeof(write); io[1].iov_base = &count; io[1].iov_len = sizeof(count); - ask: printf("Press enter to check status...\n"); getchar(); /* Check if anyone is listening */ - if (status_page[index] & mask) { + if (enabled) { /* Yep, trace out our data */ writev(data_fd, (const struct iovec *)io, 2);