From patchwork Fri Dec 2 23:51:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beau Belgrave X-Patchwork-Id: 29155 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1132740wrr; Fri, 2 Dec 2022 16:09:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf6fQPiR0KM2Ll7yYXnf5OYDlYLpauk49pBylE/LmAlh2ZKHRayq3eqIg0fYF4XGMsJdPv1T X-Received: by 2002:a17:906:8156:b0:7c0:8fe9:cd0a with SMTP id z22-20020a170906815600b007c08fe9cd0amr15513303ejw.348.1670026153388; Fri, 02 Dec 2022 16:09:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670026153; cv=none; d=google.com; s=arc-20160816; b=bxgSAhOf5P9dIy7XUXc4WO99yEESTuNOqhBJCu6vFd8ZlH8LDHDYtN2mb5atAvMO24 D4x6rRCbz6IYJmApQJ5HANzYofgH4gOmVRjX6JoQCmwOT6KhkG2veTNw01UGVSzaSmTn 1R1S+Cu0BzsB2jQEk3EaPHup1HZrTvknVk63Z2cxuKgUGuRzl/7dthKtDhN60KxTsbO2 c6W47pFs8oN+sNtj4MxzGGZhs5lgIc5rAM7mSQ5k0HzDY11jSoq1D49gjbhumVgda7e9 V5P5DygmO0uOEdOKTgawTHetzj0u8Tw6Jy+KU8SDFApjn1Z5t+modWVRbKdoxxTHJJGP p+wA== 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=4B+hoTP7POnFUmX9nsdG4gX/u7USendWfPsG/2q1TRM=; b=YkQnfib9/MOoIpcaytEeCtiNz/1MhoGPBBPf3FoOZOKvpz1z0c+QahVHJ3bpvmeoe4 MgX9fntYOnx5URzyhDksvvjKAu2IrKKRljsWIN9GapTxZj0f7lrNH5CHJyiHbqlN149l Scz4vmRd8kiNpE4nIOz1cvI4d24wDWHISBCLug6P1zZGbRr0wcRYxgy5fBMbD/Pi9RJ3 qQhw00F7dE4z3PRC3qu7ozeLuEyrhpUD/Z/ApXSTZtrdmtVnMo49N2qMAIVV7TPhhqt7 KrReTT/5P8ibspLF+d93bS8ufzInPTWgWrR+cAlIkrTV7FYm+GCs1Zg/51s7JHkj2c/1 OSKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=UHft+uRf; 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 a3-20020a17090680c300b007b29a6b7bd2si5571948ejx.662.2022.12.02.16.08.36; Fri, 02 Dec 2022 16:09:13 -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=UHft+uRf; 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 S234948AbiLBXwO (ORCPT + 99 others); Fri, 2 Dec 2022 18:52:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229606AbiLBXvr (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 55ABAFC80B; 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 07F2520B83F9; Fri, 2 Dec 2022 15:51:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 07F2520B83F9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1670025107; bh=4B+hoTP7POnFUmX9nsdG4gX/u7USendWfPsG/2q1TRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UHft+uRfhXKxPnFXYQUhCMd+8OV+qLCcBPxlX5WYNdtajIUYDinmASwJtEajr0pCY GZbvJy4WwBFF1bCal/RwaQFFf6QhXK+biiV4uRJ96l0lehjBV5/B4Jkl6fS9lX7MNM MUdGAXuDoPbX0yzWenDm96Eaaen+zhaxkqd0ygD8= 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 10/11] tracing/user_events: Charge event allocs to cgroups Date: Fri, 2 Dec 2022 15:51:37 -0800 Message-Id: <20221202235138.450-11-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?1751149343594179810?= X-GMAIL-MSGID: =?utf-8?q?1751149343594179810?= 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 3fdf5c79c1e5..ae8727560538 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_KERNEL); + enabler = kzalloc(sizeof(*enabler), GFP_KERNEL_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 = kmalloc(sizeof(*user_mm), GFP_KERNEL); + user_mm = kmalloc(sizeof(*user_mm), GFP_KERNEL_ACCOUNT); if (!user_mm) return NULL; @@ -652,7 +652,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; @@ -860,7 +860,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; @@ -879,7 +879,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); @@ -1165,7 +1165,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; @@ -1498,7 +1498,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; @@ -1692,7 +1692,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; @@ -1861,7 +1861,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; @@ -1914,7 +1914,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;