From patchwork Fri Dec 2 23:51:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 29154 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1131370wrr; Fri, 2 Dec 2022 16:05:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf4m18SzoE8JOf0Tl5ljPttYOfN/VtXG0Q2xDSuY+63ge71fqqZrtAzwWgADfAxWe44YhQt1 X-Received: by 2002:a17:907:a4c3:b0:7c0:7c22:d70d with SMTP id vq3-20020a170907a4c300b007c07c22d70dmr20983485ejc.707.1670025929919; Fri, 02 Dec 2022 16:05:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670025929; cv=none; d=google.com; s=arc-20160816; b=eJDE1WThi3C0JqFeVXVFMIlTJUnLkYTjZPqvWqXrojyezW5bw4GgtTI6V/uLn1xYlw krxYAlSQL57hF8mHPSa71/TLePo2M2Ua9xOyZeJ9bIVUODG2ULwcJvoVhNMzp84m6mP6 MvZWPkmLzHcMjlvddwdihuzcTta7/TulyKmnFk9W3QNwqBLkk/zVcKHrDrcxCFleWK7i flJaqTpCq0mkr7qgQpinRPV+w0pIJLHAi/AwXCY8hpgeumQRz/t2apnWHUsePP43LWJE o2IRCNkQ1VqfffmkiGYvf9Bg8uoXzmwE/kemaHI1YwBnFRXy+FG+Ej7hI6BqYUDPAhll O1vA== 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=m8qQ+s4TuaKyMcuxL8qzKu0ZFh+WWsegCUvbsniM9Iw=; b=Y7KZdGcRXauSV0Zl40o7CuyRDqkqR6PmYp2xlz25RjIafNMG6TfbZQpDrJo5fUHtcn zwXPcDd6l6/rEUn2CbteUtWoIT4ucBcA8FFmDKb4EThvKWTAX1+iNOcNhMSrPIteiD2T GAKMKng4ncEcy7Mj3/h846DRpGy74wmEIp7qwtDV7XhhsU4x3yZ6gaBR2ltGGQEhE7UB qdvT90dfFfof+5XJ3PTsdFT0tJAfuo9d5Mcwvk+aRUCJTKUwn6O5UkU0dpTc89gdqP4B Wfy4eYwh9i7Rw+HZ9kn18d3udgbc8pFcY7GEVZBph737u2wdr8FbLa6ql5JshSUWz8AK /1KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=aALFhkQH; 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 fd16-20020a056402389000b00463f8aad371si6874898edb.239.2022.12.02.16.04.57; Fri, 02 Dec 2022 16:05:29 -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=aALFhkQH; 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 S234969AbiLBXwW (ORCPT + 99 others); Fri, 2 Dec 2022 18:52:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234790AbiLBXvs (ORCPT ); Fri, 2 Dec 2022 18:51:48 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A2329FA47E; Fri, 2 Dec 2022 15:51:47 -0800 (PST) Received: from W11-BEAU-MD.localdomain (unknown [76.135.50.127]) by linux.microsoft.com (Postfix) with ESMTPSA id 52AF020B83FB; Fri, 2 Dec 2022 15:51:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 52AF020B83FB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1670025107; bh=m8qQ+s4TuaKyMcuxL8qzKu0ZFh+WWsegCUvbsniM9Iw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aALFhkQHru69SpQDhPZSD0bZqRCTh2vyu8qDE31w+WHlHZEzAQuTtpJjPZi/2n3o2 oYm4jf3MHY5Y0QEXz2fy5oud+W+ADkfihp5/4igiqIxBsV2cLexFkJ3O2M+famXGVj 9G1v5uCtB/phbqLKKYSqsz0aJEGXChxBcXndouCs= 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 11/11] tracing/user_events: Limit global user_event count Date: Fri, 2 Dec 2022 15:51:38 -0800 Message-Id: <20221202235138.450-12-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?1751149109731733872?= X-GMAIL-MSGID: =?utf-8?q?1751149109731733872?= Operators want to be able to ensure enough tracepoints exist on the system for kernel components as well as for user components. Since there are only up to 64K events, by default allow up to half to be used by user events. Add a boot parameter (user_events_max=%d) and a kernel sysctl parameter (kernel.user_events_max) to set a global limit that is honored among all groups on the system. This ensures hard limits can be setup to prevent user processes from consuming all event IDs on the system. Signed-off-by: Beau Belgrave --- kernel/trace/trace_events_user.c | 57 ++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index ae8727560538..7253f1dd49b7 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include "trace.h" #include "trace_dynevent.h" @@ -61,6 +62,12 @@ struct user_event_group { /* Group for init_user_ns mapping, top-most group */ static struct user_event_group *init_group; +/* Max allowed events for the whole system */ +static unsigned int max_user_events = 32768; + +/* Current number of events on the whole system */ +static unsigned int current_user_events; + /* * Stores per-event properties, as users register events * within a file a user_event might be created if it does not @@ -1247,6 +1254,11 @@ static int destroy_user_event(struct user_event *user) kfree(EVENT_NAME(user)); kfree(user); + if (current_user_events > 0) + current_user_events--; + else + pr_alert("BUG: Bad current_user_events\n"); + return ret; } @@ -1732,6 +1744,11 @@ static int user_event_parse(struct user_event_group *group, char *name, mutex_lock(&event_mutex); + if (current_user_events >= max_user_events) { + ret = -EMFILE; + goto put_user_lock; + } + ret = user_event_trace_register(user); if (ret) @@ -1743,6 +1760,7 @@ static int user_event_parse(struct user_event_group *group, char *name, dyn_event_init(&user->devent, &user_event_dops); dyn_event_add(&user->devent, &user->call); hash_add(group->register_table, &user->node, key); + current_user_events++; mutex_unlock(&event_mutex); @@ -2369,6 +2387,43 @@ static int create_user_tracefs(void) return -ENODEV; } +static int __init set_max_user_events(char *str) +{ + if (!str) + return 0; + + if (kstrtouint(str, 0, &max_user_events)) + return 0; + + return 1; +} +__setup("user_events_max=", set_max_user_events); + +static int set_max_user_events_sysctl(struct ctl_table *table, int write, + void *buffer, size_t *lenp, loff_t *ppos) +{ + int ret; + + mutex_lock(&event_mutex); + + ret = proc_douintvec(table, write, buffer, lenp, ppos); + + mutex_unlock(&event_mutex); + + return ret; +} + +static struct ctl_table user_event_sysctls[] = { + { + .procname = "user_events_max", + .data = &max_user_events, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = set_max_user_events_sysctl, + }, + {} +}; + static int __init trace_events_user_init(void) { int ret; @@ -2398,6 +2453,8 @@ static int __init trace_events_user_init(void) if (dyn_event_register(&user_event_dops)) pr_warn("user_events could not register with dyn_events\n"); + register_sysctl_init("kernel", user_event_sysctls); + return 0; }