From patchwork Mon Jun 5 23:38:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 103516 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3021836vqr; Mon, 5 Jun 2023 16:45:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ph//Q64L7KtBOfH+TIc45pydNX4udh+uz17snXU9ih/lO5ko/eIpXBwVcA72CFAYte/Cd X-Received: by 2002:a17:90b:104d:b0:256:2efc:270e with SMTP id gq13-20020a17090b104d00b002562efc270emr256409pjb.5.1686008701321; Mon, 05 Jun 2023 16:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686008701; cv=none; d=google.com; s=arc-20160816; b=YoRVWFo1WXTwr5541evUr45K9a0OzfAa5vybetTwP/d4cQ856ZL0t15YVmT0tQl9CR oeGTmupn6vSW8/1r6khxUBVTWCPeHQGw5gFIdWjUqrMz0ZMrxdFuJIfiSl8lCJMH1xa6 Q1TcST/Nhb6XSDCjRkUNr7HYl6rFNYtvQpwZKPBf9FeJ2Qgy8HdKCXYLquiW3TDhzugO eOdYqVc+BJRfOVFYPzMFxJ4lgHnTeMpvIixO/25RCvM65Lk7pzMEMFyhsUSiDJ8O30tl rqLdbB/2Bmg4QXQaF2JqK2FY/UEVij7uzBgkQ223T79vtXJtDOw55eYMMGR/V/CyZmUD biEg== 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=LgcGhn17kzfhccWPtaNXHZP5pGnU21mKIjrxJNC4SUo=; b=rAh1Slj089i3tfW3nYywNkdnzNdKxbgvALWk+ExIW0syS5XdosjGlubmIWw+RY9m8x qhc9HYZ7+ENdIPLnGNr9S9UMzvKqY1pVPfJHlwl4Dw8idIsAILuJpASoqEEye9SGekBg ZXiL1GT1wrxFJpTGL98IIGcGvi7/Dd/kcy3IBjP7k+CmWvKqCDz/IMSyCIKMlVc0a2P5 oE0bdAt4LHI9TtNTk/BOjqwrTrZyVSCU8hYUX6n61Gjap/rnNKCW8nVCZ5oL6b2TQ5fA TlP2wgu1eCXRumbcxAXdUi44vls1VoN+FwzdIpPHlimX5WTF9f/8C6axFdi9shaPhaBv iMLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=OiTxQnr6; 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 j14-20020a636e0e000000b00541bf36f2d2si6220013pgc.208.2023.06.05.16.44.49; Mon, 05 Jun 2023 16:45:01 -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; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=OiTxQnr6; 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 S233540AbjFEXjK (ORCPT + 99 others); Mon, 5 Jun 2023 19:39:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233442AbjFEXjH (ORCPT ); Mon, 5 Jun 2023 19:39:07 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 56CF4EE; Mon, 5 Jun 2023 16:39:06 -0700 (PDT) Received: from W11-BEAU-MD.localdomain (unknown [76.135.27.212]) by linux.microsoft.com (Postfix) with ESMTPSA id BFC6720BCFD0; Mon, 5 Jun 2023 16:39:05 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com BFC6720BCFD0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1686008345; bh=LgcGhn17kzfhccWPtaNXHZP5pGnU21mKIjrxJNC4SUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OiTxQnr6civO9QCUdf6WEYpmc+w/Ffs7Ci59nbZ8m6t+DzXS8IL+y0jaYqlo98hBk MOjmFiFFRUnEqTGV739nkDY0GWStanfvV49m0pYm7XwzKcj/eCczG7EswUgEMIHHXO 5raoeOpsXnu8XExtOZdKqBptj8RyCnNlSBzTszhw= From: Beau Belgrave To: rostedt@goodmis.org, mhiramat@kernel.org Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, ast@kernel.org, dcook@linux.microsoft.com Subject: [PATCH v2 1/5] tracing/user_events: Store register flags on events Date: Mon, 5 Jun 2023 16:38:56 -0700 Message-Id: <20230605233900.2838-2-beaub@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230605233900.2838-1-beaub@linux.microsoft.com> References: <20230605233900.2838-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,T_SCC_BODY_TEXT_LINE,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?1767908259613690579?= X-GMAIL-MSGID: =?utf-8?q?1767908259613690579?= 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. Signed-off-by: Beau Belgrave --- 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 b1ecd7677642..34aa0a5d8e2a 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; }; @@ -163,7 +164,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); @@ -809,7 +810,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, " "); @@ -823,7 +825,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) @@ -1587,7 +1589,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); @@ -1748,7 +1750,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; @@ -1819,6 +1821,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); @@ -2117,7 +2121,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);