From patchwork Sat Dec 9 22:57:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 176256 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6270460vqy; Sat, 9 Dec 2023 14:57:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IE9kfu6Zrj/Bi+qIAe8TpzVKdqflqcilx261y7xrTINPHCKnSV5nBk8k8U2BRqk5JMnYy8N X-Received: by 2002:a17:90a:c205:b0:286:6cc1:8674 with SMTP id e5-20020a17090ac20500b002866cc18674mr940539pjt.89.1702162620584; Sat, 09 Dec 2023 14:57:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702162620; cv=none; d=google.com; s=arc-20160816; b=NCV4Vig6eXiPfkba7C3QPu75STzundVGn2t2n6ro1w4pcDedV/e8gYDwkKIvO0MX3W 0i/L4cXFlfPNuwinGodxKmhdXf63KhVDOxzBUyOeweXMVfO3pFJBbiPQEzgQqKEsOHx9 qknyPOl66pW2dUDDeihVIzEl7ChnksxQa3wxtHN0Ud75kRpz5pK1OfxWZ5HD+TWb5Hc+ YEvBiQia8NBn857TGvQJchGdw82ItPODcbHoQ1pOYj7J7oPbRc8NqgWENxwD3Dne7S1M MaYxa4JrKFkT5pHCJkcvVskW/wU0s8WXVq5gQzoJTgjFJw7/NxGYDBb8Zhn+dlCTB7MC TITQ== 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 :message-id:subject:cc:to:from:date; bh=uffNspnD1QHG2uDGf8ekyoPfY4kZS7WvUSWAxGUcN6w=; fh=R8JZsVKDlS7lXIAvTNV55bsjlDBI0i4sqiOYXO4tZQA=; b=ux29v0Ht838tDmcrZ+gUCMbdqBq0pa2bRO5LjjzBMO6otuYEcXZ/Kb8cU5AH4tkMTo acXs0kvJU1EKG0ERuzVS6XHwzXqZnmo7X0oaC4wQiPzbLLwbTMsM3FBE16wgbYLVz20w 40xeu5nX7+YJGRLCWqDLxW/Qu/G6uO9XTbzEc6L6Y7UGqhoDa9pvA7Z8a6Che9PHtZGL 1XwogRy+usfny0JEcLVyQJ4Ti5U1CtThg/awZw4X+SRY3PZMUXdkuQOgNy1G4Dyh1QAh 60M4EHCGbR7YzWzrZ/NixTGsU2MO9j2Nfbb9KMwP66B7ztogwksKgde27Pz/B7njRFIZ eEJw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id s16-20020a170902989000b001d066271702si3571140plp.318.2023.12.09.14.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 14:57:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id ABB8380879DC; Sat, 9 Dec 2023 14:56:57 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229925AbjLIW4l (ORCPT + 99 others); Sat, 9 Dec 2023 17:56:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbjLIW4i (ORCPT ); Sat, 9 Dec 2023 17:56:38 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34EA1F9 for ; Sat, 9 Dec 2023 14:56:42 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3089EC433C7; Sat, 9 Dec 2023 22:56:41 +0000 (UTC) Date: Sat, 9 Dec 2023 17:57:16 -0500 From: Steven Rostedt To: LKML , Linux Trace Kernel Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers Subject: [PATCH] tracing: Increase size of trace_marker_raw to max ring buffer entry Message-ID: <20231209175716.09ac455b@gandalf.local.home> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sat, 09 Dec 2023 14:56:57 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784846872350967720 X-GMAIL-MSGID: 1784846872350967720 From: "Steven Rostedt (Google)" There's no reason to give an arbitrary limit to the size of a raw trace marker. Just let it be as big as the size that is allowed by the ring buffer itself. And there's also no reason to artificially break up the write to TRACE_BUF_SIZE, as that's not even used. Signed-off-by: Steven Rostedt (Google) --- [ Depends on: https://lore.kernel.org/linux-trace-kernel/20231209175003.63db40ab@gandalf.local.home/ ] kernel/trace/trace.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index da837119a446..077b20e83e7c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -7351,9 +7351,6 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, return written; } -/* Limit it for now to 3K (including tag) */ -#define RAW_DATA_MAX_SIZE (1024*3) - static ssize_t tracing_mark_raw_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *fpos) @@ -7375,18 +7372,16 @@ tracing_mark_raw_write(struct file *filp, const char __user *ubuf, return -EINVAL; /* The marker must at least have a tag id */ - if (cnt < sizeof(unsigned int) || cnt > RAW_DATA_MAX_SIZE) + if (cnt < sizeof(unsigned int)) return -EINVAL; - if (cnt > TRACE_BUF_SIZE) - cnt = TRACE_BUF_SIZE; - - BUILD_BUG_ON(TRACE_BUF_SIZE >= PAGE_SIZE); - size = sizeof(*entry) + cnt; if (cnt < FAULT_SIZE_ID) size += FAULT_SIZE_ID - cnt; + if (size > ring_buffer_max_event_size(buffer)) + return -EINVAL; + buffer = tr->array_buffer.buffer; event = __trace_buffer_lock_reserve(buffer, TRACE_RAW_DATA, size, tracing_gen_ctx());