From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793166170; b=RmvblHD2FVktR+LW0zI4O/uKL7pg7YhQvesR0tlCP6RObvh3TUP3oLDQb2YGC+opf5Fv ixOnSpbzPmya2okJlpieUsdwKXbbTqiVfE4iVyvA7mH+Fq/2HG3q7jUktNHOYgXj9xYY/ 4hqWz6YHqOw9aUxeBopM1sFY2ZbnI3PZbHDP6P5wPjD0g1wo+EpRnyuWgVjU3+hbhJU6w UILg7SOPQ8OeLXkz4R/1N+3BQxjYqGubbEGc6CrBuXvDYwMNLe1jQr0PBpMYY3tKulXWY dkKDBK+WVPuxUqQCqHDzR5Y+XWu0oXqc2vxZ8pLCTkTa/NzQYQ44+WE3l41seWWQjgQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793166170; h=Received:DKIM-Signature:Subject:To:Cc:From:Date:Message-ID: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=rfOdKJlvd3ADj45RUKVSJVBLe1l0XivDWwPK1Faa45g=; b=v+es5Dfl6JkiV/wCKqV4yH7nYOw4JGlL805N1oMkYb+p3V733jhkOv32KSJcB0JERqCI PGa98Bkj9zldpey3RZGCKbKlJW1/S2891BVhds+3s2WUDDwHY8IrB6vIUKsCZ1jWvbVxF bxihPeGdVJ/04JS1505xiDHMG6pHUeA/Kh9efQMefcoCqGEoQHmfnHqaOtwtaIHGezFsP 9lAfZcPi3lWJyzcEah+WsWv2DEB6Acm9sFzO8l7QN3sI0EoBJctLoNVtfwvqrfoE04Z53 vJTdJZxHuYK/P3dTo2sEO9ziCOozKeoE77iQv+cuGXFieUti8gza/v0vY/Q1cSjjAww== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="wPeU/L/N"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5748606A31D for ; Wed, 28 Oct 2026 05:42:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=wPeU/L/N Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE6AF1F01825; Wed, 28 Oct 2026 05:42:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793166169; bh=rfOdKJlvd3ADj45RUKVSJVBLe1l0XivDWwPK1Faa45g=; h=Subject:To:Cc:From:Date; b=wPeU/L/NeGtxEOxOWo1cSD3Rfv1ogf1nj4uGrr8BGoRJAlonN5To0hjmNg1djkIyY 6Ujks2yBFIDG901ob7EumUovbmxyvqrpbDGjzMjFMLMVj/x830JMJj+6I4Jl/Jbb0N 3ZKwOtrhbyxsx/R6qIfYk5jjLSkrdtvj3XyOXjA4= Subject: FAILED: patch "[PATCH] tracing: Add the bucket size to expr_field_str()" failed to apply to 6.1-stable tree To: donggeunyoo.kernel@gmail.com,rostedt@goodmis.org Cc: From: Date: Wed, 28 Oct 2026 06:42:34 +0100 Message-ID: <2026102834-acetone-donor-4480@gregkh> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x c027ed03bc03a0e82fc368eaad657584a4480c7a # git commit -s git send-email --to '' --in-reply-to '2026102834-acetone-donor-4480@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c027ed03bc03a0e82fc368eaad657584a4480c7a Mon Sep 17 00:00:00 2001 From: Donggeun Yoo Date: Mon, 14 Sep 2026 14:34:41 +0900 Subject: [PATCH] tracing: Add the bucket size to expr_field_str() expr_field_str() renders a HIST_FIELD_FL_BUCKET field as "pid.buckets", dropping the count, and parse_field() rejects that spelling. get_hist_field_flags() returns the bare string "buckets" and keeps the count in hist_field->buckets. hist_field_print() appends it, expr_field_str() never did. Nothing reaches it today, since .buckets is refused on a value and no expression can carry one, but the next patch renders histogram keys with expr_field_str(), where a .buckets key is legal. Append the count, as hist_field_print() does. Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260914053443.981201-3-donggeunyoo.kernel@gmail.com Fixes: de9a48a360b7 ("tracing: Add linear buckets to histogram logic") Signed-off-by: Donggeun Yoo Assisted-by: Claude:claude-fable-5 Signed-off-by: Steven Rostedt diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index a3eae5c1344a..91a550411e8a 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1754,6 +1754,9 @@ static bool expr_field_str(struct hist_field *field, struct seq_buf *s) seq_buf_printf(s, ".%s", flags_str); } + if (field->buckets) + seq_buf_printf(s, "=%lu", field->buckets); + return !seq_buf_has_overflowed(s); }