From nobody Wed Apr 1 09:06:32 2026 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 9936E37F758 for ; Wed, 1 Apr 2026 04:52:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775019143; cv=none; b=f5w636nlts/dCBtRoZMItgXZ1G+RNxZYpKrDWgrcySYaOHmZ00cHZWb4vCZKlOC/zfLuDUAxsrRgDKJNAc/ITQ9rKd7/XPb0WzFoQmtXwCaaLa0CuEZEmfkODhpMcL+dKoZYIumPDnd220yuzz1K9mSxAjApA/qNrhFURhyKrhg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775019143; c=relaxed/simple; bh=IIW5MGp1erBt6CogygoK15lk/eSdIFNLr1/sdWWPNc4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PKY4hMKfKZzKwcRATDMqYLdZs80uCiNoKpQJtANnlAmK4Fj2OQHLcQ+Jo370OypqFNH/xPk1r54bFWjo5Iwdvn0GB1CxSk092/XMbzgnbzKox6U3fOexz+rT7+6RPCz1pIytiRAWLirm0kyklgl8aqK9YD2JdQKdD7rwGW6ZWdE= 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=GfOkbqPR; arc=none smtp.client-ip=209.85.128.74 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="GfOkbqPR" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4839fc4cef6so4412575e9.0 for ; Tue, 31 Mar 2026 21:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775019140; x=1775623940; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=AK7C9g36qtD1NdTgAM1Qfb35mHUC8CgKZhIzjTXpWYU=; b=GfOkbqPR+DXANHT8HDdZfvXPRcaYwKQYrIqODehdl5B2RjhMpWL/AW2EyGeiepjIPd KVy5IYiVhA8rsIs1HXcHHvbroWi56GGoHKxEooL7Cmi+yVu3phW4sTa+MYn/MoOsOXcK 9SkyD5Pi0TGPu4bDecc/MAHaMzc5IdhoMqEghZ13FMBSQU/feDRTrfw4lMObMSANpyFR RSrvP0OGPA3DvkxUJyof7oOwJVUBIZLyMXalpL0K0KHOTHVgadgdAN0vQcfZci+lr8HO HQcJfncjvI4/z54xvH5c010RjvwklJW9/r5bUfKcM7syMlO8QHoKEJ2p9v7MUtOd1pYO h0XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775019140; x=1775623940; h=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; bh=AK7C9g36qtD1NdTgAM1Qfb35mHUC8CgKZhIzjTXpWYU=; b=iyjhnhmjPKECh3LtDh0v44nxuGcQkW6SJfil90R11l2GnbLRSYLMaqPsvVCNLRZN42 TRQlyAisS0KRw0xVLN2bVig3O7zZ6qLumaHcj51mKHyb48HnJS/Rkqqa+umKo5DGpq6E GDpNPeyweMnfhwU1WC3Cm9zkeUnTcg5Conx9IWZzcq8bESYpJJ0l/ArckoE5U2l4v5JK imstO78AjSXIilhGjV5CU6wU9zVhkrecDqWUbDQCpOMJD/H8AnInSiVOBz4UmKXh+wkt BmzM7rbCkfuXrKhDUH0vAAjhn3H74Wz7O5Am+W2L3qksCZIzuV58DbfWyhAtHlCl+Znq pGrw== X-Forwarded-Encrypted: i=1; AJvYcCUG+1n1FddBLPreygipaR8jITwVZNgeG8uTkk/6mRCojUJadibb6PW9eWb6Upa8WHPzVOdFe1xKhRZffDo=@vger.kernel.org X-Gm-Message-State: AOJu0YxNf8fS3tfge/mGIogn3WWcpb3aBVGEt/oaMXNhF3oDUi3wCmM9 FIx9Rm09JLREpgVImjeCuwIYsqt7azryv3BfTDCHjvhr59jczYxJfkAL/veqkwUYwpQ3xhbDHol QC7s4c+UUJ5oi+UZ16Lk9HQ== X-Received: from wmoq6.prod.google.com ([2002:a05:600c:46c6:b0:486:fbd8:2af6]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:c04a:b0:485:fbd2:f72 with SMTP id 5b1f17b1804b1-4888356610dmr23580735e9.1.1775019139978; Tue, 31 Mar 2026 21:52:19 -0700 (PDT) Date: Wed, 1 Apr 2026 05:50:59 +0100 In-Reply-To: <20260401045100.3394299-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: <20260401045100.3394299-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.1118.gaef5881109-goog Message-ID: <20260401045100.3394299-2-vdonnefort@google.com> Subject: [PATCH v2 1/2] tracing: Non-consuming read for trace remotes with an offline CPU From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org Cc: kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When a trace_buffer is created while a CPU is offline, this CPU is cleared from the trace_buffer CPU mask, preventing the creation of a non-consuming iterator (ring_buffer_iter). For trace remotes, it means the iterator fails to be allocated (-ENOMEM) even though there are available ring buffers in the trace_buffer. For non-consuming reads of trace remotes, skip missing ring_buffer_iter to allow reading the available ring buffers. Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c index 0d78e5f5fe98..d6c3f94d67cd 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -282,6 +282,14 @@ static void trace_remote_put(struct trace_remote *remo= te) trace_remote_try_unload(remote); } =20 +static bool trace_remote_has_cpu(struct trace_remote *remote, int cpu) +{ + if (cpu =3D=3D RING_BUFFER_ALL_CPUS) + return true; + + return ring_buffer_poll_remote(remote->trace_buffer, cpu) =3D=3D 0; +} + static void __poll_remote(struct work_struct *work) { struct delayed_work *dwork =3D to_delayed_work(work); @@ -324,6 +332,10 @@ static int __alloc_ring_buffer_iter(struct trace_remot= e_iterator *iter, int cpu) iter->rb_iters[cpu] =3D ring_buffer_read_start(iter->remote->trace_buffe= r, cpu, GFP_KERNEL); if (!iter->rb_iters[cpu]) { + /* This CPU isn't part of trace_buffer. Skip it */ + if (!trace_remote_has_cpu(iter->remote, cpu)) + continue; + __free_ring_buffer_iter(iter, RING_BUFFER_ALL_CPUS); return -ENOMEM; } @@ -347,10 +359,10 @@ static struct trace_remote_iterator if (ret) return ERR_PTR(ret); =20 - /* Test the CPU */ - ret =3D ring_buffer_poll_remote(remote->trace_buffer, cpu); - if (ret) + if (!trace_remote_has_cpu(remote, cpu)) { + ret =3D -ENODEV; goto err; + } =20 iter =3D kzalloc_obj(*iter); if (iter) { @@ -361,6 +373,7 @@ static struct trace_remote_iterator =20 switch (type) { case TRI_CONSUMING: + ring_buffer_poll_remote(remote->trace_buffer, cpu); INIT_DELAYED_WORK(&iter->poll_work, __poll_remote); schedule_delayed_work(&iter->poll_work, msecs_to_jiffies(remote->poll_m= s)); break; @@ -476,6 +489,9 @@ __peek_event(struct trace_remote_iterator *iter, int cp= u, u64 *ts, unsigned long return ring_buffer_peek(iter->remote->trace_buffer, cpu, ts, lost_events= ); case TRI_NONCONSUMING: rb_iter =3D __get_rb_iter(iter, cpu); + if (!rb_iter) + return NULL; + rb_evt =3D ring_buffer_iter_peek(rb_iter, ts); if (!rb_evt) return NULL; --=20 2.53.0.1118.gaef5881109-goog From nobody Wed Apr 1 09:06:32 2026 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (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 C4C27381AE8 for ; Wed, 1 Apr 2026 04:52:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775019144; cv=none; b=p+jwO9MQT66K28zjDsGYSiNx3YIcmOChyHsoPpF2DmrvJzwCOeNKTH3hT9rgY4aDKQr3+UTn0rQselb0vhqDm1mgXFL6U5etNth+BtJOPSQTbCL/rhkJdmTFO4cGyWxJ/kO3ZBxXBvv4PIKoD9xQKV/xCeQTnoZkKTdA4reiMyc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775019144; c=relaxed/simple; bh=LW18+NpzYrBxvjmlql75o7yvp1CeXooy51NbJveuitk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=G5PiJKUZvAg2m+2HXh0lFGTg11hslsba1BZne8Dxy5MlbW65SABaKrxEKp0bHfEzrGhH6RQQjK7VfzVJ032Xmg38osWlVOWdGrs042waPIwZNe3QqaV7LGMVK5HCGcsO03vDpwWXTCPWxu/UDlPb6VWfHIs8XGBgeuG67ymuES4= 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=EHwUeYeC; arc=none smtp.client-ip=209.85.221.73 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="EHwUeYeC" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-43cff5bc312so1856381f8f.1 for ; Tue, 31 Mar 2026 21:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775019141; x=1775623941; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=lorCFtW6iLrswzeXANX4hHFPPPnND3TRCNrbzm4C2wU=; b=EHwUeYeCmdsyL+3WDb2ZiLZ1QHEhXNVd4+6F4HGY/OyEbuVtkcK4hsfLNOIOxWYbcD NjYGReyGWG0jdRAXP9J5w/Ad5IzOqQI8dakmWQVXeGIGy0lTuKQVuudUN9fZpAQCNiq2 dTN46fHbVqvmO86eBe0QtVZuts51IX4DsUQyeRqk8L1dnLkOCgA0ZfsLioTwBtB7JiLq yS3D/YViSDD1/SZ15fqUs2mT0uWYRp+imgz5R5NC5ZnKbwzhun3wtMcPdnzmCYdYlGje nAUqMdBDS4D7mWCgUB9DMI++mGwpSCNwfXn+7wC06LhPWJVYNv1SQzXDXQFlQ+Uff0EF 5ouQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775019141; x=1775623941; h=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; bh=lorCFtW6iLrswzeXANX4hHFPPPnND3TRCNrbzm4C2wU=; b=SZi19bjhJdELqXzl4Yp6cE+aMkSjmXxxpOOlvCtKXHGZtgclLCHJFDGeLEZQfHOMg+ FRzuBrWygxUh/naVenYTyMp8dYWJnS80SmzPi5MKrUDZ0FAn7TIVFW6zJZC4TYqTTckg VkHEUp7VPeLAqTk8Rslw+UDmEArTqC4BJkxWhDf6pPViv7Ohhyt/02dtOLXBJZUDNv7w 3W+cTqajBJVUlZRqrAPeyQWcIm6d7eT432NFCuPbLtna8xj1nEAVMHiqaJxKrrPxgbhL 3GRNZ+y6IDlocrBdq3xaQ15m/E8eMKfXteA0mTHj/CQpo7325b6yXtoX24APeb47X5FC Iuqg== X-Forwarded-Encrypted: i=1; AJvYcCWj/QMp2ZmaSk+A4X0DFcK4ybjL8/Ll8+ALozkXl4XLHBblq889SDdm9IwDdC8QlLHKGlP88hhd3xzr5s4=@vger.kernel.org X-Gm-Message-State: AOJu0YxVwDNgaCCXgVEGyTNHqh2OtqjN+ERZaEp7268AmO66n6uDlO1v zFJvnFhT1n6PtTphI8ZDjzVBCn+KWhf+kMCYH0g1w6q5hLSgDW5jPVJBLakh3ZGABXBd+xedkTI iDxtloTdYLPL3BeoNGxlDQQ== X-Received: from wmps7.prod.google.com ([2002:a05:600c:3187:b0:488:8019:449e]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:19d0:b0:485:3ff1:d5c5 with SMTP id 5b1f17b1804b1-488835629ffmr30649845e9.7.1775019141201; Tue, 31 Mar 2026 21:52:21 -0700 (PDT) Date: Wed, 1 Apr 2026 05:51:00 +0100 In-Reply-To: <20260401045100.3394299-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: <20260401045100.3394299-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.1118.gaef5881109-goog Message-ID: <20260401045100.3394299-3-vdonnefort@google.com> Subject: [PATCH v2 2/2] tracing: selftests: Extend hotplug testing for trace remotes From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org Cc: kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The hotplug testing only tries reading a trace remote buffer, loaded before a CPU is offline. Extend this testing to cover: * A trace remote buffer loaded after a CPU is offline. * A trace remote buffer loaded before a CPU is online. Because of these added test cases, move the hotplug testing into a separate hotplug.tc file. Signed-off-by: Vincent Donnefort diff --git a/tools/testing/selftests/ftrace/test.d/remotes/functions b/tool= s/testing/selftests/ftrace/test.d/remotes/functions index 97a09d564a34..05224fac3653 100644 --- a/tools/testing/selftests/ftrace/test.d/remotes/functions +++ b/tools/testing/selftests/ftrace/test.d/remotes/functions @@ -24,12 +24,21 @@ setup_remote_test() =20 assert_loaded() { - grep -q "(loaded)" buffer_size_kb + grep -q "(loaded)" buffer_size_kb || return 1 } =20 assert_unloaded() { - grep -q "(unloaded)" buffer_size_kb + grep -q "(unloaded)" buffer_size_kb || return 1 +} + +reload_remote() +{ + echo 0 > tracing_on + clear_trace + assert_unloaded + echo 1 > tracing_on + assert_loaded } =20 dump_trace_pipe() @@ -79,10 +88,12 @@ get_cpu_ids() sed -n 's/^processor\s*:\s*\([0-9]\+\).*/\1/p' /proc/cpuinfo } =20 -get_page_size() { +get_page_size() +{ sed -ne 's/^.*data.*size:\([0-9][0-9]*\).*/\1/p' events/header_page } =20 -get_selftest_event_size() { +get_selftest_event_size() +{ sed -ne 's/^.*field:.*;.*size:\([0-9][0-9]*\);.*/\1/p' events/*/selfte= st/format | awk '{s+=3D$1} END {print s}' } diff --git a/tools/testing/selftests/ftrace/test.d/remotes/hotplug.tc b/too= ls/testing/selftests/ftrace/test.d/remotes/hotplug.tc new file mode 100644 index 000000000000..145617eb8061 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/hotplug.tc @@ -0,0 +1,88 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test trace remote read with an offline CPU +# requires: remotes/test + +. $TEST_DIR/remotes/functions + +hotunplug_one_cpu() +{ + [ "$(get_cpu_ids | wc -l)" -ge 2 ] || return 1 + + for cpu in $(get_cpu_ids); do + echo 0 > /sys/devices/system/cpu/cpu$cpu/online || return 1 + break + done + + echo $cpu +} + +# Check non-consuming and consuming read +check_read() +{ + for i in $(seq 1 8); do + echo $i > write_event + done + + check_trace 1 8 trace + + output=3D$(dump_trace_pipe) + check_trace 1 8 $output + rm $output +} + +test_hotplug() +{ + echo 0 > trace + assert_loaded + + # + # Test a trace buffer containing an offline CPU + # + + cpu=3D$(hotunplug_one_cpu) || exit_unsupported + trap "echo 1 > /sys/devices/system/cpu/cpu$cpu/online" EXIT + + check_read + + # + # Test a trace buffer with a missing CPU + # + + reload_remote + + check_read + + # + # Test a trace buffer with a CPU added later + # + + echo 1 > /sys/devices/system/cpu/cpu$cpu/online + trap "" EXIT + assert_loaded + + check_read + + # Test if the ring-buffer for the newly added CPU is both writable and + # readable + for i in $(seq 1 8); do + taskset -c $cpu echo $i > write_event + done + + cd per_cpu/cpu$cpu/ + + check_trace 1 8 trace + + output=3D$(dump_trace_pipe) + check_trace 1 8 $output + rm $output + + cd - +} + +if [ -z "$SOURCE_REMOTE_TEST" ]; then + set -e + + setup_remote_test + test_hotplug +fi diff --git a/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/hotpl= ug.tc b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/hotplug.tc new file mode 100644 index 000000000000..580ec32c8f81 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/hotplug.tc @@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor trace read with an offline CPU +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=3D1 +. $TEST_DIR/remotes/hotplug.tc + +set -e +setup_remote "hypervisor" +test_hotplug diff --git a/tools/testing/selftests/ftrace/test.d/remotes/trace.tc b/tools= /testing/selftests/ftrace/test.d/remotes/trace.tc index 170f7648732a..bc9377a70e8d 100644 --- a/tools/testing/selftests/ftrace/test.d/remotes/trace.tc +++ b/tools/testing/selftests/ftrace/test.d/remotes/trace.tc @@ -58,11 +58,7 @@ test_trace() # =20 # Ensure the writer is not on the reader page by reloading the buffer - echo 0 > tracing_on - echo 0 > trace - assert_unloaded - echo 1 > tracing_on - assert_loaded + reload_remote =20 # Ensure ring-buffer overflow by emitting events from the same CPU for cpu in $(get_cpu_ids); do @@ -96,27 +92,6 @@ test_trace() =20 cd - > /dev/null done - - # - # Test with hotplug - # - - [ "$(get_cpu_ids | wc -l)" -ge 2 ] || return 0 - - echo 0 > trace - - for cpu in $(get_cpu_ids); do - echo 0 > /sys/devices/system/cpu/cpu$cpu/online || return 0 - break - done - - for i in $(seq 1 8); do - echo $i > write_event - done - - check_trace 1 8 trace - - echo 1 > /sys/devices/system/cpu/cpu$cpu/online } =20 if [ -z "$SOURCE_REMOTE_TEST" ]; then diff --git a/tools/testing/selftests/ftrace/test.d/remotes/trace_pipe.tc b/= tools/testing/selftests/ftrace/test.d/remotes/trace_pipe.tc index 669a7288ed7c..7f7b7b79c490 100644 --- a/tools/testing/selftests/ftrace/test.d/remotes/trace_pipe.tc +++ b/tools/testing/selftests/ftrace/test.d/remotes/trace_pipe.tc @@ -92,31 +92,6 @@ test_trace_pipe() rm $output cd - > /dev/null done - - # - # Test interaction with hotplug - # - - [ "$(get_cpu_ids | wc -l)" -ge 2 ] || return 0 - - echo 0 > trace - - for cpu in $(get_cpu_ids); do - echo 0 > /sys/devices/system/cpu/cpu$cpu/online || return 0 - break - done - - for i in $(seq 1 8); do - echo $i > write_event - done - - output=3D$(dump_trace_pipe) - - check_trace 1 8 $output - - rm $output - - echo 1 > /sys/devices/system/cpu/cpu$cpu/online } =20 if [ -z "$SOURCE_REMOTE_TEST" ]; then --=20 2.53.0.1118.gaef5881109-goog