From patchwork Wed Jan 4 21:42:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 39133 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5371397wrt; Wed, 4 Jan 2023 13:46:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXtOTOC8lZuXeezrOjpaSC8fjvAxKZO0h1//h6hJQrEEUGMz/VvJMwUdnQGcXpMjHsTy9Gbh X-Received: by 2002:a17:906:e98:b0:7c1:39e:db7e with SMTP id p24-20020a1709060e9800b007c1039edb7emr55118853ejf.59.1672868809070; Wed, 04 Jan 2023 13:46:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672868809; cv=none; d=google.com; s=arc-20160816; b=L4p9RtJA5jnfwuuA79DF+7z40LBFRxiBQn0cqQDDTtTbFahf3ZX6vt4GHuvp2hdqAB h9ukOkAcAGGx16ugcBHCYhMr1k1YN0ic7/2d4LtAkfhW2zbXEWbgKE+DQUdN66WOq/uy G24cUnDg9PJP/y4GTHaDQziZIZFy4dP5ZFsIZGXCd7SpjTS2qWr86qAKSLwxLBtUi7uH 2yhuVGQEA3K7O48+1wbFIEKa9q/2stEkKkBtISI+eotI7mFoTt5vMOUR6BvfM+nYQQAK qc9PZUXKCyfHQyOcEvgNtitEwhOyx+ia3uzf3PgOFZq5I3aoDJUFKtYX2yZux1+OC4Qh UZdA== 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=l+g8tERL+UkGrKea5jQZtokpGJZx/dltxljWliH/hjU=; b=XKegLK02u4v5BjOAyHzIffHrv5lZFAF4lAlIuvh9ZSBllEluHO+s89jgG3RW7HrytT jMAzg63krbYWbwMAN9CwnJjj1zo4czdcbv78FoDqCrSV3VeZ/Sa1FBTTKAcUYudsNNkc ujfBsIytH4ne0XijeVreD78/rHznrGvOB+TppxXMDEuutTmlgaP/wv/xIkiUmesDNPuF WTCiw88oRQxXacjvNf0lz6fRYceY8GZKFwwQg4RPyX9P1L1r8T9fE+ZOQ/hz3ntzGgoe 0WVPyDZdo49t7FeAT2+ExOobaUghsQzbe+1rR8D7sxgpjfxu+YjegrqI+BAdsrdIzOaA +fyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=XxKe5828; 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 dm12-20020a170907948c00b007c115fb9d63si31320752ejc.392.2023.01.04.13.46.18; Wed, 04 Jan 2023 13:46:49 -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=XxKe5828; 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 S240293AbjADVna (ORCPT + 99 others); Wed, 4 Jan 2023 16:43:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239580AbjADVmn (ORCPT ); Wed, 4 Jan 2023 16:42:43 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 97B1B1DF0A; Wed, 4 Jan 2023 13:42:39 -0800 (PST) Received: from W11-BEAU-MD.localdomain (unknown [76.135.27.212]) by linux.microsoft.com (Postfix) with ESMTPSA id 1C79D20B493D; Wed, 4 Jan 2023 13:42:39 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1C79D20B493D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1672868559; bh=l+g8tERL+UkGrKea5jQZtokpGJZx/dltxljWliH/hjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XxKe58288RUwQWq/JQYfZ853CRXjSiPjLbpr5qVZmQky7HXMRDacj0zsRAL4ZbsfF V4fAKpokwU9+DM9xrLZOXeiSnYpa6V2hYBN70L9LbKXkGttcpAD15D+wLjS1KRwUre eVYwkhQDk/fmiR3cLWZ5nxPcO/tpAX1g4JGOzTmc= 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 v6 10/11] tracing/user_events: Charge event allocs to cgroups Date: Wed, 4 Jan 2023 13:42:29 -0800 Message-Id: <20230104214230.26349-11-beaub@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230104214230.26349-1-beaub@linux.microsoft.com> References: <20230104214230.26349-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?1754130084371637436?= X-GMAIL-MSGID: =?utf-8?q?1754130084371637436?= Operators need a way to limit how much memory cgroups use. User events need to be included into that accounting. Fix this by using GFP_KERNEL_ACCOUNT for allocations generated by user programs for user_event tracing. Signed-off-by: Beau Belgrave --- kernel/trace/trace_events_user.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index bdda94d4e047..a32694b9dfb6 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -442,7 +442,7 @@ static bool user_event_enabler_dup(struct user_event_enabler *orig, if (unlikely(test_bit(ENABLE_VAL_FREEING_BIT, ENABLE_BITOPS(orig)))) return true; - enabler = kzalloc(sizeof(*enabler), GFP_NOWAIT); + enabler = kzalloc(sizeof(*enabler), GFP_NOWAIT | __GFP_ACCOUNT); if (!enabler) return false; @@ -502,7 +502,7 @@ static struct user_event_mm *user_event_mm_create(struct task_struct *t) struct user_event_mm *user_mm; unsigned long flags; - user_mm = kzalloc(sizeof(*user_mm), GFP_KERNEL); + user_mm = kzalloc(sizeof(*user_mm), GFP_KERNEL_ACCOUNT); if (!user_mm) return NULL; @@ -662,7 +662,7 @@ static struct user_event_enabler if (!user_mm) return NULL; - enabler = kzalloc(sizeof(*enabler), GFP_KERNEL); + enabler = kzalloc(sizeof(*enabler), GFP_KERNEL_ACCOUNT); if (!enabler) goto out; @@ -870,7 +870,7 @@ static int user_event_add_field(struct user_event *user, const char *type, struct ftrace_event_field *field; int validator_flags = 0; - field = kmalloc(sizeof(*field), GFP_KERNEL); + field = kmalloc(sizeof(*field), GFP_KERNEL_ACCOUNT); if (!field) return -ENOMEM; @@ -889,7 +889,7 @@ static int user_event_add_field(struct user_event *user, const char *type, if (strstr(type, "char") != NULL) validator_flags |= VALIDATOR_ENSURE_NULL; - validator = kmalloc(sizeof(*validator), GFP_KERNEL); + validator = kmalloc(sizeof(*validator), GFP_KERNEL_ACCOUNT); if (!validator) { kfree(field); @@ -1175,7 +1175,7 @@ static int user_event_create_print_fmt(struct user_event *user) len = user_event_set_print_fmt(user, NULL, 0); - print_fmt = kmalloc(len, GFP_KERNEL); + print_fmt = kmalloc(len, GFP_KERNEL_ACCOUNT); if (!print_fmt) return -ENOMEM; @@ -1508,7 +1508,7 @@ static int user_event_create(const char *raw_command) raw_command += USER_EVENTS_PREFIX_LEN; raw_command = skip_spaces(raw_command); - name = kstrdup(raw_command, GFP_KERNEL); + name = kstrdup(raw_command, GFP_KERNEL_ACCOUNT); if (!name) return -ENOMEM; @@ -1704,7 +1704,7 @@ static int user_event_parse(struct user_event_group *group, char *name, return 0; } - user = kzalloc(sizeof(*user), GFP_KERNEL); + user = kzalloc(sizeof(*user), GFP_KERNEL_ACCOUNT); if (!user) return -ENOMEM; @@ -1874,7 +1874,7 @@ static int user_events_open(struct inode *node, struct file *file) if (!group) return -ENOENT; - info = kzalloc(sizeof(*info), GFP_KERNEL); + info = kzalloc(sizeof(*info), GFP_KERNEL_ACCOUNT); if (!info) return -ENOMEM; @@ -1927,7 +1927,7 @@ static int user_events_ref_add(struct user_event_file_info *info, size = struct_size(refs, events, count + 1); - new_refs = kzalloc(size, GFP_KERNEL); + new_refs = kzalloc(size, GFP_KERNEL_ACCOUNT); if (!new_refs) return -ENOMEM;