From nobody Fri Sep 25 21:40:26 2026 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68EEF51E443 for ; Tue, 8 Sep 2026 09:09:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.70 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788858585; cv=none; b=h0rDYUlY+Mr0DK8595Qy5f4zx9g/ri7y/cJGsPhUZgolrCqD91bGvoic8KpFUbti9mfC0coN+5h0tyWW9ylyqb8c4mRs7IT8nUtwXmIrbt/zLp89oV51A+dKpytD8QURYNxvZHdL6qKno4uKmSk9GKg/Csa2BfS8SXigTvyrl5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788858585; c=relaxed/simple; bh=p3zxjl8ilnmwnpnClhmv1lhN3YDJUhyC84MjPboOZ1U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Rxmr0SSkaFuPN/rEMYJ0LrFoZqX+40S94OtziLmIqRnsL8LzI4uxo91s2HfsX7hwyll2te9Y/p1QtUDloRhkm6taLFcB6+tF0rr0McjKiogpIKGBRGErRfJWXfum2JTQbxy0cXTgcIiMWAVIHI6LBhY/BAIp8L0wCoxhgYGbYmY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=rUaLFt3A; arc=none smtp.client-ip=209.85.128.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rUaLFt3A" Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-49545071724so36164635e9.0 for ; Tue, 08 Sep 2026 02:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788858581; x=1789463381; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=xlqGezA/G2NBw7aCDWm+M8LEXnlo9JX1bDlA7KCRjqc=; b=rUaLFt3AMfIurdgKG1L8I6QO9ZjzK+Vhg4JuFawU461AO6KhABhWZObVwyYnUybbuL hGIfLuT+c3it/Y+2I4UY12r9B/Jp5bNm3RMCh1ttkmVjYl2OKxuwfdHKmdZiOlKJUMXR jSrnwkh8M8FvU4FcEkRgGXo60LOJIzS4K53bSbDMSwss0i1s7M7qcipayB0DpsrmkwGS 08lJ5waAaUyEEYm4nM1WnhS7qJa330ECEFJsiNX4DGUKCZFlyXdPESR7+aT5nw3lpv8R L0QAKCily8BbsrBeYlB9kCZaT3rHRVjEWsxZndZccaP78A2avYm36DiJoPWFpxsDlrNz GKqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788858581; x=1789463381; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=xlqGezA/G2NBw7aCDWm+M8LEXnlo9JX1bDlA7KCRjqc=; b=SzLcTOnEvXAR9seiNItXxU5VhMTEC45OM6FtbKoakB2Lvcf5WEfcubTfzp1TL05xEU pSXdbp7rqgWj4BpJB/CNRRVdbssSV5D7YZRSeGRiZ6Wg/0OsR30ZdaAXmzWgfLafcvZP NlQHjg3eFVyd7sthB7El1qHf4/DdH+6S9oOL7RAfU0RoCZ+A4Joe1Pb/cjpdGuVeo75z KqdJ84smR25W2qlYIeN2logu4ORMvJTGs0ApOCzsOLCyBbkAiifQqzTfCOFukl9WrbcZ R3dz9bjOENP4Ppngyd9H90TufA2cbvoeVjsJbch6bCaab0reyLv6yjjNXva+ny/B7Yl/ 7yhw== X-Forwarded-Encrypted: i=1; AKwUvBykJU10SrzbuxyOd+uHzAMy5DwmNNiqYp++nMCnU7oBuDav2mzPClUtuIAaO7hAUMJ/hLaoYTG6DjxPw0E=@vger.kernel.org X-Gm-Message-State: AFuF++mSkqJ0CGjP+44CwAzV1Vrn3Ku11lxcZUXR6ox4AepnvkNWB5ib BHqHMkDlj0LqysCIyKW+oEnob60mAtp9wcudIvBgEp+0MXkr+xNP6Gnb9tYZpN/s6oHV1KuFt6G ZBbo6rJGspi2XI8YDmDAikA== X-Received: from wmnv20.prod.google.com ([2002:a05:600c:4454:b0:49b:51c5:e9b2]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3e06:b0:49c:fc6c:be1b with SMTP id 5b1f17b1804b1-49cfc6cc0e9mr221475155e9.33.1788858581136; Tue, 08 Sep 2026 02:09:41 -0700 (PDT) Date: Tue, 8 Sep 2026 10:09:35 +0100 In-Reply-To: <20260908090937.838544-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260908090937.838544-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.979.g7e5102b832-goog Message-ID: <20260908090937.838544-2-vdonnefort@google.com> Subject: [PATCH v2 1/3] ring-buffer: Rename ring_buffer_size() to ring_buffer_capacity() From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, linux-trace-kernel@vger.kernel.org Cc: mathieu.desnoyers@efficios.com, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since commit 8a5f63637890 ("ring-buffer: Fix subbuf resize race with ring buffer readers"), "capacity" refers to the memory available for events (excluding subbuffer headers) while "size" refers to the raw allocation. ring_buffer_size() actually calculates this event capacity. Rename it to ring_buffer_capacity() to align with this convention. Signed-off-by: Vincent Donnefort --- include/linux/ring_buffer.h | 2 +- kernel/trace/ring_buffer.c | 13 +++++++++---- kernel/trace/trace.c | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index afc7daa6ee7d..9e23ab66176b 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -165,7 +165,7 @@ void ring_buffer_iter_reset(struct ring_buffer_iter *it= er); int ring_buffer_iter_empty(struct ring_buffer_iter *iter); bool ring_buffer_iter_dropped(struct ring_buffer_iter *iter); =20 -unsigned long ring_buffer_size(struct trace_buffer *buffer, int cpu); +unsigned long ring_buffer_capacity(struct trace_buffer *buffer, int cpu); unsigned long ring_buffer_max_event_size(struct trace_buffer *buffer); =20 void ring_buffer_reset_cpu(struct trace_buffer *buffer, int cpu); diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 9c03a555a6ba..cd1ee3ca6f46 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -6547,18 +6547,23 @@ void ring_buffer_iter_advance(struct ring_buffer_it= er *iter) EXPORT_SYMBOL_GPL(ring_buffer_iter_advance); =20 /** - * ring_buffer_size - return the size of the ring buffer (in bytes) + * ring_buffer_capacity - return the capacity of the ring buffer (in bytes) * @buffer: The ring buffer. - * @cpu: The CPU to get ring buffer size from. + * @cpu: The CPU to get ring buffer capacity from. + * + * Capacity is the total memory available for recording event data in the + * ring buffer. It excludes subbuffer headers. + * + * Returns the capacity in bytes, or 0 if the CPU is not set in the buffer= mask. */ -unsigned long ring_buffer_size(struct trace_buffer *buffer, int cpu) +unsigned long ring_buffer_capacity(struct trace_buffer *buffer, int cpu) { if (!cpumask_test_cpu(cpu, buffer->cpumask)) return 0; =20 return rb_subbuf_capacity(buffer) * buffer->buffers[cpu]->nr_pages; } -EXPORT_SYMBOL_GPL(ring_buffer_size); +EXPORT_SYMBOL_GPL(ring_buffer_capacity); =20 /** * ring_buffer_max_event_size - return the max data size of an event diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 8658cad53cb5..f0251788ec75 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4712,9 +4712,9 @@ void trace_set_buffer_entries(struct array_buffer *bu= f, unsigned long val) static void update_buffer_entries(struct array_buffer *buf, int cpu) { if (cpu =3D=3D RING_BUFFER_ALL_CPUS) { - trace_set_buffer_entries(buf, ring_buffer_size(buf->buffer, 0)); + trace_set_buffer_entries(buf, ring_buffer_capacity(buf->buffer, 0)); } else { - per_cpu_ptr(buf->data, cpu)->entries =3D ring_buffer_size(buf->buffer, c= pu); + per_cpu_ptr(buf->data, cpu)->entries =3D ring_buffer_capacity(buf->buffe= r, cpu); } } =20 @@ -8476,7 +8476,7 @@ int allocate_trace_buffer(struct trace_array *tr, str= uct array_buffer *buf, int =20 /* Allocate the first page for all buffers */ trace_set_buffer_entries(&tr->array_buffer, - ring_buffer_size(tr->array_buffer.buffer, 0)); + ring_buffer_capacity(tr->array_buffer.buffer, 0)); =20 return 0; } --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 21:40:26 2026 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6445D51FCBA for ; Tue, 8 Sep 2026 09:09:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788858586; cv=none; b=ZlM6g27VsujpuSvyhKSU2fHWsrVVTR4F75iKfsyJdCnz/uUB8D3O98naRBJnyMvTKFHBVmCH32hDe7pDZaTAiilSkRBe+U+CTw0hLmY+DrEMP6pt3IPGYi1w3R/QOJhYDaUJv9GUkKju9CC9Q8oThYBo2aLjEXNSgvo0VUakyEE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788858586; c=relaxed/simple; bh=WcDaN6hHiVluvOA2lS8pubL4eTLiYDYeTnKPFd3Fs44=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VGtahgtjmIlfU1VPcVpSqmDKXVWPfModJRV/ajmK7U/gk9olExWStWHUSn8Youz4sYc9DNxzcMbWsKrv/z0NkoiuIpzI+TXgM3EaVK0+deVK3Ho+Qc8o1nAPRb4v6RrL4NuxgAAYtzBnBlERPfuiEuY65OQ84XT4dxvfFNitXaQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=n96DMwxF; arc=none smtp.client-ip=209.85.128.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="n96DMwxF" Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4994aebe932so56970635e9.3 for ; Tue, 08 Sep 2026 02:09:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788858583; x=1789463383; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=WJHTU/SBkLLmpaJ4t49Bu1+HFXy4GBXkX7+X7MengXI=; b=n96DMwxFEpvCgLbWzjwYyyKgEULvdxW3zR7LqpqkmQJnNV4XJ2j90uj1Q9VQCpOqAW ncq4I9QlDmAVl9cx1kGjWyUuzjQ6QlW2Ukll69ySusSuSp5/eRUmzq5VyAUn1Xsp8LAP xIqQnT/GAMdluqT1WO004fMkXNE0qrheHzhrXfnr8/U1DRHyaS3B8Pwk4khU5Jd5V7lp CU1iAn9qsYmk6pLW2+vPOplczXmVEVd8gqR3gQdovDY89MVJgY7wV/NWFhgsIAM844Tb 9vzQNUfLBpaGb6kvauu91WzttjEZE3WLRzyJf2tYQV4p+6HBUIf3KQJaOVZSrfckQaXe SATg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788858583; x=1789463383; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=WJHTU/SBkLLmpaJ4t49Bu1+HFXy4GBXkX7+X7MengXI=; b=ci7gnWT3OYT+xpIQIFwsZ8B7lFAolt4wSQ3qkvL3636Jw+8Vwnki63s1huEG0P9FSk EWAeP+kxoXb0KrulnST99aVdnMoJf84k/CPdlW+DFrgH6kHydaZFGP3hJYz8l0UjtF43 JWupJi5Me1JRU09d0fOkQtkigdJXBlqE+zINYvnTTUwUTHSMj9df+hetLxQo9Nd5c3KO VXt1fdLdKzJmHEQ/ipAQ7lcL3hbzRL8jL1nSIo7TZ+6VzrJdK//McSN0IkRzH72P3Jb5 xbSgi3WiO9+HAim7BlXBnaHQFXOcz374HigxpK/GHO/et5Zs4mzW7H54NWx4P4zupfW0 3sSA== X-Forwarded-Encrypted: i=1; AKwUvBwRXE+v57rZg98hLFVLLAjgfQHaG/4S5yvFJUa3jQdZoy7CEdSOBZdBUKJ7DkChRO55Ia0S0h4T21rQlUc=@vger.kernel.org X-Gm-Message-State: AFuF++mqsSnJuhc/xbzn/I7zrQPPO8pc8Iq31N1PcB03VcblSmj9KHSW MpxPmnrjfQHzR6jTOnbR5baiUosdTdD0tcSDdgvkCUdniTC5wKF1G+aX9K/Gm7ZBlwleZvJZu0j 1eKXKXWlH8EbMbG0dApFThA== X-Received: from wmpo33.prod.google.com ([2002:a05:600c:33a1:b0:499:58e2:b51f]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8b6d:b0:499:a277:e8b5 with SMTP id 5b1f17b1804b1-49cf7fdd67emr540341955e9.3.1788858582425; Tue, 08 Sep 2026 02:09:42 -0700 (PDT) Date: Tue, 8 Sep 2026 10:09:36 +0100 In-Reply-To: <20260908090937.838544-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260908090937.838544-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.979.g7e5102b832-goog Message-ID: <20260908090937.838544-3-vdonnefort@google.com> Subject: [PATCH v2 2/3] tracing: Rename trace_array::entries to capacity From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, linux-trace-kernel@vger.kernel.org Cc: mathieu.desnoyers@efficios.com, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since commit 8a5f63637890 ("ring-buffer: Fix subbuf resize race with ring buffer readers"), "capacity" refers to the memory available for events, while "entries" refers to the number of events in a ring buffer. As a consequence, rename trace_array::entries to capacity to align with this convention and avoid any confusion. Rename also the helper functions trace_set_buffer_entries and update_buffer_entries. Signed-off-by: Vincent Donnefort --- kernel/trace/trace.c | 26 +++++++++++++------------- kernel/trace/trace.h | 4 ++-- kernel/trace/trace_snapshot.c | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f0251788ec75..400d7a97e745 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4701,20 +4701,20 @@ int tracer_init(struct tracer *t, struct trace_arra= y *tr) return t->init(tr); } =20 -void trace_set_buffer_entries(struct array_buffer *buf, unsigned long val) +void trace_set_buffer_capacity(struct array_buffer *buf, unsigned long val) { int cpu; =20 for_each_tracing_cpu(cpu) - per_cpu_ptr(buf->data, cpu)->entries =3D val; + per_cpu_ptr(buf->data, cpu)->capacity =3D val; } =20 -static void update_buffer_entries(struct array_buffer *buf, int cpu) +static void update_buffer_capacity(struct array_buffer *buf, int cpu) { if (cpu =3D=3D RING_BUFFER_ALL_CPUS) { - trace_set_buffer_entries(buf, ring_buffer_capacity(buf->buffer, 0)); + trace_set_buffer_capacity(buf, ring_buffer_capacity(buf->buffer, 0)); } else { - per_cpu_ptr(buf->data, cpu)->entries =3D ring_buffer_capacity(buf->buffe= r, cpu); + per_cpu_ptr(buf->data, cpu)->capacity =3D ring_buffer_capacity(buf->buff= er, cpu); } } =20 @@ -4770,12 +4770,12 @@ static int __tracing_resize_ring_buffer(struct trac= e_array *tr, goto out_start; } =20 - update_buffer_entries(&tr->snapshot_buffer, cpu); + update_buffer_capacity(&tr->snapshot_buffer, cpu); =20 out: #endif /* CONFIG_TRACER_SNAPSHOT */ =20 - update_buffer_entries(&tr->array_buffer, cpu); + update_buffer_capacity(&tr->array_buffer, cpu); out_start: tracing_start_tr(tr); return ret; @@ -5694,8 +5694,8 @@ tracing_entries_read(struct file *filp, char __user *= ubuf, for_each_tracing_cpu(cpu) { /* fill in the size from first enabled cpu */ if (size =3D=3D 0) - size =3D per_cpu_ptr(tr->array_buffer.data, cpu)->entries; - if (size !=3D per_cpu_ptr(tr->array_buffer.data, cpu)->entries) { + size =3D per_cpu_ptr(tr->array_buffer.data, cpu)->capacity; + if (size !=3D per_cpu_ptr(tr->array_buffer.data, cpu)->capacity) { buf_size_same =3D 0; break; } @@ -5711,7 +5711,7 @@ tracing_entries_read(struct file *filp, char __user *= ubuf, } else r =3D sprintf(buf, "X\n"); } else - r =3D sprintf(buf, "%lu\n", per_cpu_ptr(tr->array_buffer.data, cpu)->ent= ries >> 10); + r =3D sprintf(buf, "%lu\n", per_cpu_ptr(tr->array_buffer.data, cpu)->cap= acity >> 10); =20 mutex_unlock(&trace_types_lock); =20 @@ -5758,7 +5758,7 @@ tracing_total_entries_read(struct file *filp, char __= user *ubuf, =20 mutex_lock(&trace_types_lock); for_each_tracing_cpu(cpu) { - size +=3D per_cpu_ptr(tr->array_buffer.data, cpu)->entries >> 10; + size +=3D per_cpu_ptr(tr->array_buffer.data, cpu)->capacity >> 10; if (!tr->ring_buffer_expanded) expanded_size +=3D trace_buf_size >> 10; } @@ -8475,8 +8475,8 @@ int allocate_trace_buffer(struct trace_array *tr, str= uct array_buffer *buf, int } =20 /* Allocate the first page for all buffers */ - trace_set_buffer_entries(&tr->array_buffer, - ring_buffer_capacity(tr->array_buffer.buffer, 0)); + trace_set_buffer_capacity(&tr->array_buffer, + ring_buffer_capacity(tr->array_buffer.buffer, 0)); =20 return 0; } diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 5e76f94e7a80..d3d7e88d6172 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -191,7 +191,7 @@ struct trace_array; struct trace_array_cpu { local_t disabled; =20 - unsigned long entries; + unsigned long capacity; unsigned long saved_latency; unsigned long critical_start; unsigned long critical_end; @@ -730,7 +730,7 @@ ssize_t tracing_nsecs_read(unsigned long *ptr, char __u= ser *ubuf, ssize_t tracing_nsecs_write(unsigned long *ptr, const char __user *ubuf, size_t cnt, loff_t *ppos); =20 -void trace_set_buffer_entries(struct array_buffer *buf, unsigned long val); +void trace_set_buffer_capacity(struct array_buffer *buf, unsigned long val= ); =20 /* * Should be used after trace_array_get(), trace_types_lock diff --git a/kernel/trace/trace_snapshot.c b/kernel/trace/trace_snapshot.c index 07b43c9863a2..d7308f3b505f 100644 --- a/kernel/trace/trace_snapshot.c +++ b/kernel/trace/trace_snapshot.c @@ -142,18 +142,18 @@ int resize_buffer_duplicate_size(struct array_buffer = *trace_buf, if (cpu_id =3D=3D RING_BUFFER_ALL_CPUS) { for_each_tracing_cpu(cpu) { ret =3D ring_buffer_resize(trace_buf->buffer, - per_cpu_ptr(size_buf->data, cpu)->entries, cpu); + per_cpu_ptr(size_buf->data, cpu)->capacity, cpu); if (ret < 0) break; - per_cpu_ptr(trace_buf->data, cpu)->entries =3D - per_cpu_ptr(size_buf->data, cpu)->entries; + per_cpu_ptr(trace_buf->data, cpu)->capacity =3D + per_cpu_ptr(size_buf->data, cpu)->capacity; } } else { ret =3D ring_buffer_resize(trace_buf->buffer, - per_cpu_ptr(size_buf->data, cpu_id)->entries, cpu_id); + per_cpu_ptr(size_buf->data, cpu_id)->capacity, cpu_id); if (ret =3D=3D 0) - per_cpu_ptr(trace_buf->data, cpu_id)->entries =3D - per_cpu_ptr(size_buf->data, cpu_id)->entries; + per_cpu_ptr(trace_buf->data, cpu_id)->capacity =3D + per_cpu_ptr(size_buf->data, cpu_id)->capacity; } =20 return ret; @@ -193,7 +193,7 @@ void free_snapshot(struct trace_array *tr) */ ring_buffer_subbuf_order_set(tr->snapshot_buffer.buffer, 0); ring_buffer_resize(tr->snapshot_buffer.buffer, 1, RING_BUFFER_ALL_CPUS); - trace_set_buffer_entries(&tr->snapshot_buffer, 1); + trace_set_buffer_capacity(&tr->snapshot_buffer, 1); tracing_reset_online_cpus(&tr->snapshot_buffer); tr->allocated_snapshot =3D false; } --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 21:40:26 2026 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51BED521219 for ; Tue, 8 Sep 2026 09:09:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.70 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788858587; cv=none; b=JYFk8w7IUza90utTOER7HwrZrIMbI42CrdR3p2RiVew99DFTmYL+oOdaco/gN6E+O1qQXGpStzDXajFm35weyOLDHI0Qc93JhcEg5bJ0qKvexZKL55XFKByYvQDQzQPMqKZA6Fqs6olqPMhLQ8jSV3kg/pdEctRfLNTX0kefMO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788858587; c=relaxed/simple; bh=94iWMjTIwc0TonrLV6eGBag3QwHv2vDmbqxBkMi2cSQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qAw9LOHOCC2PPNHK1/LrIuqZMiah+JcB6jrr3YClXWsg7Z0xRpRplRtEoh+/0CxdrXL/O1H3m5f4a0dbSqMBL7cE/N+eRtB4npU9h/Q9AtiGNI77VlWe2fmqLvFm09FB4BQokeQRCSA8if7/qoaTdizEToVqQ/z/wZb5GlyR1Y8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=vFvrTHkt; arc=none smtp.client-ip=209.85.221.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vFvrTHkt" Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48439eea716so2949501f8f.2 for ; Tue, 08 Sep 2026 02:09:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788858583; x=1789463383; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=boy6Bccw47o3amNkT4CAs/pFHV7Gzoaqb7AJB1HcaIk=; b=vFvrTHktKvSCZHDzAtE3OFzcgu2fUDhy8s4G7hmy3OinJIDdqUgY9GMgZ2Gq1pU9wC 2KaY7YyP/K+F9CGcC8M6rnRtkoaX4G9Kc00fwXb8M+qzeFtwMUG5TDfEgaXdM3GLKPxX i9REI/tLocISSf8bxonLZgn8E6xU8mWIp19Loghw8U5q+ogOJOBxhl8U1T1K/TQvj6cn +OhX8v7ygqGj+SajFpgnN0TNfYrhlQTolj+uvloFdNJmDxu9VZof/KF9FRPH1RyU6WH7 q1/aOJUWreWC6iuotngz4X7/35UTemGIIPe54kylsukCcLjgJ/h8ENx87t/GaFs1J0z4 0LSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788858583; x=1789463383; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=boy6Bccw47o3amNkT4CAs/pFHV7Gzoaqb7AJB1HcaIk=; b=fX6ev0nR8qj+SBflgre7I8WyMCAs+bKECaxQfUYLzAXq9SySj3sKE73NYvyKMykvFg /0/yxNWCwMIlpFPVxHlSqjblIxE7WnTaInfBBubmN/QxVEU05VKcTvYIfghNmNiRSyip kJDr0gaRVKMoqwb0OmMO1UCbaMg24fU/RI+60vwgMEuJSHBtm41qLr0481SWBJC5tTE6 cytfXfF5w0hFeoALI9+cSKjtEACk5Vs7k05GxjWcX/KZKBWxZbp8vq9sH8LH9p2mh+Aa Np2JCEArHfPjWdBAfo+AHMHozze3w6gaJ9xAHDqJG9JoNhT4MX2lCGIR+wlf6SwTMxbk Hb7g== X-Forwarded-Encrypted: i=1; AKwUvBzJlfkuxKQ/lcQlaYHrEA7FLLALuGKQhq2Y3h8bxR5BmrT1wSXMBvzKEKknXWAb7XUsZ4CcmKUEyxgnhpk=@vger.kernel.org X-Gm-Message-State: AFuF++mPMPVMkm/Wukc3Y1dP9ZZ5lE/wvyvrxDL5UP0lFgnziNl1kEdZ 04A58yj40TyMbATVG4o01SMLvC3NFEw6RyVLy+BxegB99oF2RNqPBTQ5Z033tju/bSkRUvGGdu4 +1zGOGmGQLGl+ojMVyD3jDg== X-Received: from wmby25-n2.prod.google.com ([2002:a05:600c:c059:20b0:499:dd82:8175]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600d:4449:20b0:49d:3a:e576 with SMTP id 5b1f17b1804b1-49d003ae639mr149520405e9.5.1788858583494; Tue, 08 Sep 2026 02:09:43 -0700 (PDT) Date: Tue, 8 Sep 2026 10:09:37 +0100 In-Reply-To: <20260908090937.838544-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260908090937.838544-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.979.g7e5102b832-goog Message-ID: <20260908090937.838544-4-vdonnefort@google.com> Subject: [PATCH v2 3/3] tracing: Rename tracing_entries_fops to tracing_capacity_fops From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, linux-trace-kernel@vger.kernel.org Cc: mathieu.desnoyers@efficios.com, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since commit 8a5f63637890 ("ring-buffer: Fix subbuf resize race with ring buffer readers"), "capacity" refers to the memory available for events, while "entries" refers to the number of events in a ring buffer. As a consequence, rename trace_array::entries to capacity to align with this convention. While at it, rename also tracing_total_entries_fops. It is the aggragate of all ring buffer capacities. Signed-off-by: Vincent Donnefort --- kernel/trace/trace.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 400d7a97e745..780c4987032b 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5672,8 +5672,7 @@ tracing_syscall_buf_write(struct file *filp, const ch= ar __user *ubuf, } =20 static ssize_t -tracing_entries_read(struct file *filp, char __user *ubuf, - size_t cnt, loff_t *ppos) +tracing_capacity_read(struct file *filp, char __user *ubuf, size_t cnt, lo= ff_t *ppos) { struct inode *inode =3D file_inode(filp); struct trace_array *tr =3D inode->i_private; @@ -5720,8 +5719,7 @@ tracing_entries_read(struct file *filp, char __user *= ubuf, } =20 static ssize_t -tracing_entries_write(struct file *filp, const char __user *ubuf, - size_t cnt, loff_t *ppos) +tracing_capacity_write(struct file *filp, const char __user *ubuf, size_t = cnt, loff_t *ppos) { struct inode *inode =3D file_inode(filp); struct trace_array *tr =3D inode->i_private; @@ -5748,8 +5746,7 @@ tracing_entries_write(struct file *filp, const char _= _user *ubuf, } =20 static ssize_t -tracing_total_entries_read(struct file *filp, char __user *ubuf, - size_t cnt, loff_t *ppos) +tracing_total_capacity_read(struct file *filp, char __user *ubuf, size_t c= nt, loff_t *ppos) { struct trace_array *tr =3D filp->private_data; char buf[64]; @@ -6600,10 +6597,10 @@ static const struct file_operations tracing_pipe_fo= ps =3D { .release =3D tracing_release_pipe, }; =20 -static const struct file_operations tracing_entries_fops =3D { +static const struct file_operations tracing_capacity_fops =3D { .open =3D tracing_open_generic_tr, - .read =3D tracing_entries_read, - .write =3D tracing_entries_write, + .read =3D tracing_capacity_read, + .write =3D tracing_capacity_write, .llseek =3D generic_file_llseek, .release =3D tracing_release_generic_tr, }; @@ -6623,9 +6620,9 @@ static const struct file_operations tracing_buffer_me= ta_fops =3D { .release =3D tracing_seq_release, }; =20 -static const struct file_operations tracing_total_entries_fops =3D { +static const struct file_operations tracing_total_capacity_fops =3D { .open =3D tracing_open_generic_tr, - .read =3D tracing_total_entries_read, + .read =3D tracing_total_capacity_read, .llseek =3D generic_file_llseek, .release =3D tracing_release_generic_tr, }; @@ -7653,7 +7650,7 @@ tracing_init_tracefs_percpu(struct trace_array *tr, l= ong cpu) tr, cpu, &tracing_stats_fops); =20 trace_create_cpu_file("buffer_size_kb", TRACE_MODE_WRITE, d_cpu, - tr, cpu, &tracing_entries_fops); + tr, cpu, &tracing_capacity_fops); =20 if (tr->range_addr_start) trace_create_cpu_file("buffer_meta", TRACE_MODE_READ, d_cpu, @@ -8954,10 +8951,10 @@ init_tracer_tracefs(struct trace_array *tr, struct = dentry *d_tracer) tr, &tracing_pipe_fops); =20 trace_create_file("buffer_size_kb", writable_mode, d_tracer, - tr, &tracing_entries_fops); + tr, &tracing_capacity_fops); =20 trace_create_file("buffer_total_size_kb", TRACE_MODE_READ, d_tracer, - tr, &tracing_total_entries_fops); + tr, &tracing_total_capacity_fops); =20 trace_create_file("trace_clock", writable_mode, d_tracer, tr, &trace_clock_fops); --=20 2.55.0.979.g7e5102b832-goog