From nobody Wed Apr 1 08:59:50 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.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 A3F6635B138 for ; Wed, 1 Apr 2026 02:51:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775011922; cv=none; b=GYta6sxqP9alGcBuCvwN2tzNsvsjnQn4AjwS+EYNcebFz+x/5ZL0ITKje/XlDJerdH09rRbzWHkf3CotOtVGQGezQoNaMLV+ap6mKPH+9fo4/2fJAqVlZDSg2gV8HZPUtMzIHY5uGMXUAUJp4wSG2xPZLwNslGfCtAa/gvKoMIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775011922; c=relaxed/simple; bh=Xrq4aUL1JXkGE55doELayakGSYFvldPCKQqMYlmSfgE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cgzaQgEV/KvKUrwFn2NAu4rEUJWurAZATv9sNNIr8G/HkyU0n3lqRLlLBfEUc5klwoNHhyKy8+G8sh3nITm9liU/7GddEDDSzIrc/IAP7dzedcwfyJMytcKqo5Ywo/ZjBR3SckhE9M6ZpH2O3qLywQEimsLC2AgQw+4LFtdWdnw= 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=X3vzetFv; arc=none smtp.client-ip=209.85.128.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="X3vzetFv" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-486fa07f2bbso39685135e9.2 for ; Tue, 31 Mar 2026 19:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775011914; x=1775616714; 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=Eca4DbOW8XwXrqOV4vR/pp7c+WdGwg7Dl0/8lIXWnzc=; b=X3vzetFvus37+1WAhyXaIuY8EtRRAdKlqHXIltzJ/mdCWiNHSds9zEI5Sz0MIAqU6J UvlTO3ugl1/jPOUC18oNtKYzpf7ep0V8r9g20EmT7bgPK2IOmDHPkI1DEe+ijeBtbdEP o+FafTT3nAdSN95u+m0lIl0zj95t81RQ48ZCxzNSJJ1r3H+waNWskLaSyfPRzhDQvMR9 BN99zrGrGCR2Lh/qwjeeDoAd8DFgRA4RqmNui+PdXkAkw1MJp7hQnLUvB5/ChtSBAiHq pk6tQK9JnFq163ORvTClEX6bhabC82SxNl/p3E18PaC4YhMO9VlhvWVwrmp5I08Y/N3/ welg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775011914; x=1775616714; 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=Eca4DbOW8XwXrqOV4vR/pp7c+WdGwg7Dl0/8lIXWnzc=; b=X10IzIgjvX6TbvW7d8grdh4Uo9TvHUqSmUS0SKxuPHlSmvUNmrrP4xJmJVDUxVdFun 3qGkUY1YzrusQcXK3PQmKWBRds4yNKN3Wj/4gNYefQ5AFeKXA43lsQ5J4pycXZdk5NOX PULmJFPpYSSVff6qooGeZQvG/0EBVnujuWgwlfsOtNoJvVSwRMSVt/l8YpSPDGHXbyxE iASPg5vvhq6CIiEvzk0tJEIoJInlSiIRPjKryVk4HA2mbIVt/omNunrqpAqUxXYg0dh0 AlHsa/bgJoiabjRH1Icv/7/jVWMw2UpZwfbyr8+GfGAbPvq6QofKBs76scyUHqQFd2OY lMaw== X-Forwarded-Encrypted: i=1; AJvYcCWYhzBIvhaYbl73qSCUgP36aUwiwEydMbBB853mp+R792SgD24wufrdXs3+QKTfYXs7BwcVF6tuC7nnQhE=@vger.kernel.org X-Gm-Message-State: AOJu0YyUKUBzT3xozponNqAMibTLPyOQU0jyZcQeRAYEgTTiW+KHDgqo GeVTBm0haJbYyrVJ2/kgIFT6sv0a7FqzAMmBDX7OXfNJaoTnuuIvQnECcLMJF/jMpqy93mhmQEp DK90xDKhITFTkjp45CJr49w== X-Received: from wmow3.prod.google.com ([2002:a05:600c:4743:b0:485:2ef1:a59b]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600d:8:b0:486:ffa3:594 with SMTP id 5b1f17b1804b1-488835b760amr22907075e9.23.1775011914540; Tue, 31 Mar 2026 19:51:54 -0700 (PDT) Date: Wed, 1 Apr 2026 03:50:02 +0100 In-Reply-To: <20260401025003.3258729-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: <20260401025003.3258729-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.1118.gaef5881109-goog Message-ID: <20260401025003.3258729-2-vdonnefort@google.com> Subject: [PATCH 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..39d5414c1723 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) { @@ -476,6 +488,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 08:59:50 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.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 7D88E3603E8 for ; Wed, 1 Apr 2026 02:51:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775011925; cv=none; b=jokSo9jVlRqlNat7r+WATyK0XsLKt2b4cjvHtYDCOEewoWbrQ6VmfyNSAwx/LIxEx0H0cVudnXPr+Pnr25kdMqICIKQnxlD/QlEFRARTzPV+1tTEfNpRlsX7rPk5rOvevfNh2cemWqJm2ZzD+1DY0JVV64mNbMXEBd4LAT1k7f8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775011925; c=relaxed/simple; bh=yMu7TwDCFAicnPOSC8XrvduiYSxhPfl1xo2L4vBOzsU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KeycfKgiEDdcJ6Is+K+tC16syabxpe1N4zxyDpCKGPvdEsSe3ncaobD6uGS8tVvYEZvENilcLQcMM6zQctmoZZ0ZNTFWJISSqvC1H50wZ4O3OYTh1PwNffIlginSOU9BWDxSwNnLtj6GuIqUMHUwvdRJn3LY6v0RxZo0UdxZL30= 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=iTYPcstZ; arc=none smtp.client-ip=209.85.128.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="iTYPcstZ" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4853466655dso44343705e9.3 for ; Tue, 31 Mar 2026 19:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775011916; x=1775616716; 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=r9mEmKXXXp5DUWLJ3YSbv4wAXPQyMGZDr6RS8OuOv5I=; b=iTYPcstZfCpzE+Q0FflIbD5TWHce9vugONcSSVYQrkKK2jU1bYRoHfeW7GJtg/5IJO a1f3WPmQZ5qhQJsgPhgKAoLPhUxOXWJ3/Yjr+Eck8pzwMylMr7ZYDgR5ssyPdOIub+Am OxKMZzgFm2qmyjlXwKcYkex2PJlEvJ1kFHjV3ffbqHRvDa15FLNm5FJjC/D+eDnZRGCa zfYaAqy4uqTrqnD9eMcrx2fbfeBexQFprFrLaWoC8I0+c2AkhBwcw/3lsQokh+duS8K2 wOQTFZeEqAVBCnQg3t3VBB5TTcweyBN8kxBLJg2p38BIHFYTuekS5Oeygacee9EPdOq3 mJ3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775011916; x=1775616716; 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=r9mEmKXXXp5DUWLJ3YSbv4wAXPQyMGZDr6RS8OuOv5I=; b=MO/hKcZRecxz/Oxzsu61gJqTkbTrN0TCefS5T6PbBHLalG39s1envn+tY0sOsij1IS 16NieFsgxb3Akv9cZwnlkZnlW/rRark5cTL0csXSK+YyUd7/R07NeDtlow1lFrPZRfAT +NCdaznkwUKNNgMM5LRmgSMX+/l9i3cmtXIwQj3N2A3ainsiSQtspgAWCDPg2tMc+F4j zTlRSIxHffMPSt9M5ipHQfqFmC37qDQm7vWjXRIbssdERoSKERmDsR4kf/OJHVmTEuns X2dcFK7lJAXwkBTBO52H/UGPkAmLuLWyB9B8RSpo47qFZnUd+2AUGbCFL/Qp8eFMOUot KaeQ== X-Forwarded-Encrypted: i=1; AJvYcCX5mmSri1BUcvYaq/SDe6rWXHbgSSsie0jjfPVa6rRtgG72r9D0jaRQOI7TqKwwQSLLRD2ERjmknpSJxiU=@vger.kernel.org X-Gm-Message-State: AOJu0YyqZB6pCiXmDbZAOR5IyZ7rsytkP8zqLj57+hEfMfH9tBXNlK5n 3209cz2oyo51j7YU0OMhmYm1XiADfG8O2fgDq63CStGBRaO/Z5ebk0pgI/iLLz7786JvCjq8B/1 C781I0P6rW7D9ISdvDErW3w== X-Received: from wmgi18.prod.google.com ([2002:a05:600c:2d92:b0:487:3739:c5c4]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3e05:b0:485:3a27:a961 with SMTP id 5b1f17b1804b1-488832f6248mr30158105e9.0.1775011915777; Tue, 31 Mar 2026 19:51:55 -0700 (PDT) Date: Wed, 1 Apr 2026 03:50:03 +0100 In-Reply-To: <20260401025003.3258729-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: <20260401025003.3258729-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.1118.gaef5881109-goog Message-ID: <20260401025003.3258729-3-vdonnefort@google.com> Subject: [PATCH 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..ca531a0336dc 100644 --- a/tools/testing/selftests/ftrace/test.d/remotes/functions +++ b/tools/testing/selftests/ftrace/test.d/remotes/functions @@ -32,6 +32,15 @@ assert_unloaded() grep -q "(unloaded)" buffer_size_kb } =20 +reload_remote() +{ + echo 0 > tracing_on + clear_trace + assert_unloaded + echo 1 > tracing_on + assert_loaded +} + dump_trace_pipe() { output=3D$(mktemp $TMPDIR/remote_test.XXXXXX) @@ -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..86b55824d631 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/hotplug.tc @@ -0,0 +1,86 @@ +#!/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 + + 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 + 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