From patchwork Thu Jun 15 13:05:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 108534 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp652283vqr; Thu, 15 Jun 2023 06:55:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6m6FC5CCVAZhfbXNmLq7NncdyMewtYauvK3CvOCwoI5TodnXQPH6ENUrBMvV9kaO6tKX74 X-Received: by 2002:a05:6808:1b11:b0:39a:664c:9761 with SMTP id bx17-20020a0568081b1100b0039a664c9761mr16244222oib.29.1686837350918; Thu, 15 Jun 2023 06:55:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686837350; cv=none; d=google.com; s=arc-20160816; b=hzLt+x3beDP1bUy9X0nsp+CYkviwdfVpIB9wWefqbvTsH/kjbBhqZH8LoPDhNCsI2w JtugG4GS3jQko00bvjZRMUl0ZcoS3oViSM8bSdr9DJZmf9YzQLDZpqzQvZkU4V40et1R KYavwztqieRe1RzI0kQX9pG7ex9BZzznwSyH+HMaT/PswqgNLGSUUNciuAt7JZs82Ngf /YSZlAKEg2M1qlFZrXC3vo3TKibar/ji3X5ZfG7cUInWkZJsZy2vNh8rp24H9OhmW7ry 7YK+KEdMKW2Ab2wYRG73CVEc+F7hb9z7isWdy4hS52Py4RlNcfHuubPAQ99kmD4n56Qe +Vew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=9Aw3Ma5JovjDjUXawsslhDw58tqERZSUYj+uRxW8r7w=; b=sBAv/QmNlxfD4sqnaxSyGiaaX5Ftx0nx0ThctAXswqZwGq43fMPqvG8FAuuZidlpfl HI5GAWipo4uEttKfhVzMt9CWMDNSPtcTM/asUBtwoDVMkcCfk7LBZhLOOKdmfdY5M/lq rRv6SB5l7A12QN3+HC05UdzNtzBKyuz62ihJmlf6O5Mb2hyOaLiC4OMFK3VAtCi721xH ylUK3Awyp8IyWNg4YgLf92e6jqR0F/FC3B+DHJLWz9bUUVyKXoZ++9PEa09aZG0GCYGG Ce9s0sX6seyXxstijOD91/8wwn6bplygbm/llc+eYjboioOci7JIIGO3U5GCZ08k6SBR mPBg== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k6-20020a634b46000000b0053fb3688fadsi9720552pgl.144.2023.06.15.06.55.35; Thu, 15 Jun 2023 06:55:50 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344364AbjFONhC (ORCPT + 99 others); Thu, 15 Jun 2023 09:37:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344374AbjFONgV (ORCPT ); Thu, 15 Jun 2023 09:36:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E534358E for ; Thu, 15 Jun 2023 06:35:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DE6B863B6C for ; Thu, 15 Jun 2023 13:34:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBD5DC433C8; Thu, 15 Jun 2023 13:34:17 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1q9n7A-000TqK-2p; Thu, 15 Jun 2023 09:34:16 -0400 Message-ID: <20230615133416.688476874@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 15 Jun 2023 09:05:41 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Beau Belgrave Subject: [for-linus][PATCH 10/15] tracing/user_events: Store register flags on events References: <20230615130531.200384328@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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?1768777161846641926?= X-GMAIL-MSGID: =?utf-8?q?1768777161846641926?= From: Beau Belgrave Currently we don't have any available flags for user processes to use to indicate options for user_events. We will soon have a flag to indicate the event should or should not auto-delete once it's not being used by anyone. Add a reg_flags field to user_events and parameters to existing functions to allow for this in future patches. Link: https://lkml.kernel.org/r/20230614163336.5797-2-beaub@linux.microsoft.com Signed-off-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_user.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index cf6d4c02c363..629823e21447 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -87,6 +87,7 @@ struct user_event { struct list_head validators; refcount_t refcnt; int min_size; + int reg_flags; char status; }; @@ -165,7 +166,7 @@ typedef void (*user_event_func_t) (struct user_event *user, struct iov_iter *i, static int user_event_parse(struct user_event_group *group, char *name, char *args, char *flags, - struct user_event **newuser); + struct user_event **newuser, int reg_flags); static struct user_event_mm *user_event_mm_get(struct user_event_mm *mm); static struct user_event_mm *user_event_mm_get_all(struct user_event *user); @@ -810,7 +811,8 @@ static struct list_head *user_event_get_fields(struct trace_event_call *call) * Upon success user_event has its ref count increased by 1. */ static int user_event_parse_cmd(struct user_event_group *group, - char *raw_command, struct user_event **newuser) + char *raw_command, struct user_event **newuser, + int reg_flags) { char *name = raw_command; char *args = strpbrk(name, " "); @@ -824,7 +826,7 @@ static int user_event_parse_cmd(struct user_event_group *group, if (flags) *flags++ = '\0'; - return user_event_parse(group, name, args, flags, newuser); + return user_event_parse(group, name, args, flags, newuser, reg_flags); } static int user_field_array_size(const char *type) @@ -1588,7 +1590,7 @@ static int user_event_create(const char *raw_command) mutex_lock(&group->reg_mutex); - ret = user_event_parse_cmd(group, name, &user); + ret = user_event_parse_cmd(group, name, &user, 0); if (!ret) refcount_dec(&user->refcnt); @@ -1751,7 +1753,7 @@ static int user_event_trace_register(struct user_event *user) */ static int user_event_parse(struct user_event_group *group, char *name, char *args, char *flags, - struct user_event **newuser) + struct user_event **newuser, int reg_flags) { int ret; u32 key; @@ -1846,6 +1848,8 @@ static int user_event_parse(struct user_event_group *group, char *name, if (ret) goto put_user_lock; + user->reg_flags = reg_flags; + /* Ensure we track self ref and caller ref (2) */ refcount_set(&user->refcnt, 2); @@ -2144,7 +2148,7 @@ static long user_events_ioctl_reg(struct user_event_file_info *info, return ret; } - ret = user_event_parse_cmd(info->group, name, &user); + ret = user_event_parse_cmd(info->group, name, &user, reg.flags); if (ret) { kfree(name);