From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0BC1245106F for ; Fri, 22 May 2026 14:35:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779460506; cv=none; b=ito1pWKEEgKezb1gQEzFSmZNiA5a0WHtos8ukfTV60aZIzIL0Bq+kLFoyiRH9or2dGOVYd9VRzc3vP0ZyAxI0DZx6j6GaQuF9fr+Pon2MlYuTtnMi3uBD+ICUrR7lYKhyfkVndX5mqOwbjgBWNpf6qG/WH/DCOzEepwlS+f/iJk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779460506; c=relaxed/simple; bh=gwvlT/lbA79VyFOYkidlTTqu6RBkMgG7kbw9GDUEKD8=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=b2oePVXfShARo+xe5f+9rphJ55cpbbYrVpIC9QDn1tdkRbGKHrhSvhY4O5Y2In9QDwO2CkJWA40JICPvr3LJ3uP/wgO5CEdqbSIzWKbHhAP+C3FH9sjTvcuy7FD1KppffRm6ZXJh2qHchrrVVj5muLj2c14XCiKS+LeFjR+aVLg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H81glnre; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H81glnre" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA3E11F00A3D; Fri, 22 May 2026 14:35:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779460503; bh=bhb0AJjPF1bypb3xLG8icThue8VlQwGjbSGE6pWziVE=; h=Date:From:To:Cc:Subject:References; b=H81glnrebRGk16EiHBMWWn7diHvZ9rhFyHrrKKIj0xvGJhaQPjEicg62E0YAevyIN Mw6tINoMugggDR8fn6An6GZ22J5jxdN1VS6r3OvRl8EC6F2OyVpNgfj1m0CJgNWEMM ynePZKHGAugm1+JYEmk/ETvLFe9a6tANk1Mwo3R47d8zVG99Z29qY8/BaQhxzczjrZ zGaKhB3fqqEcElN5Db5mn5D9aRAF8SwRolFFn8DXFYMlougf7+fu1noZPYwr++kRXl cq8ehfVgVjfFDNaRqx1mTJAudjYVMsoMpeAaevJNyvLFWg5MUCCeSoXD9qJaSZ1DZ8 Qz+snkPEFh6yw== Received: from rostedt by gandalf with local (Exim 4.99.2) (envelope-from ) id 1wQQyF-000000066D8-1qsO; Fri, 22 May 2026 10:35:27 -0400 Message-ID: <20260522143527.293032377@kernel.org> User-Agent: quilt/0.69 Date: Fri, 22 May 2026 10:35:23 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton Subject: [for-next][PATCH 15/15] tracing: Move trace_iterator_increment() into trace_find_next_entry_inc() References: <20260522143508.298439732@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 From: Steven Rostedt trace_iterator_increment() is only called from trace_find_next_entry_inc(). It's a small enough function that really doesn't need to be separated. Move the code from trace_iterator_increment() into trace_find_next_entry_inc() and remove trace_iterator_increment(). Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Link: https://patch.msgid.link/20260521095026.20c9799d@gandalf.local.home Signed-off-by: Steven Rostedt --- kernel/trace/trace.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 4218c174460b..ae527c419508 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2338,15 +2338,6 @@ void trace_last_func_repeats(struct trace_array *tr, __buffer_unlock_commit(buffer, event); } -static void trace_iterator_increment(struct trace_iterator *iter) -{ - struct ring_buffer_iter *buf_iter = trace_buffer_iter(iter, iter->cpu); - - iter->idx++; - if (buf_iter) - ring_buffer_iter_advance(buf_iter); -} - static struct trace_entry * peek_next_entry(struct trace_iterator *iter, int cpu, u64 *ts, unsigned long *lost_events) @@ -2676,11 +2667,17 @@ struct trace_entry *trace_find_next_entry(struct trace_iterator *iter, /* Find the next real entry, and increment the iterator to the next entry */ void *trace_find_next_entry_inc(struct trace_iterator *iter) { + struct ring_buffer_iter *buf_iter; + iter->ent = __find_next_entry(iter, &iter->cpu, &iter->lost_events, &iter->ts); - if (iter->ent) - trace_iterator_increment(iter); + if (iter->ent) { + iter->idx++; + buf_iter = trace_buffer_iter(iter, iter->cpu); + if (buf_iter) + ring_buffer_iter_advance(buf_iter); + } return iter->ent ? iter : NULL; } -- 2.53.0